Index: calendar/gui/e-day-view.c
===================================================================
--- calendar/gui/e-day-view.c	(revision 34528)
+++ calendar/gui/e-day-view.c	(working copy)
@@ -7157,9 +7157,8 @@
 	switch (event->type) {
 	case GDK_KEY_PRESS:
 		tooltip_destroy (day_view, item);
-		if (event && event->key.keyval == GDK_Return) {
+		if (!E_TEXT (item)->preedit_len && event && event->key.keyval == GDK_Return) {
 			day_view->resize_event_num = -1;
-			day_view->resize_event_num = -1;
 
 			/* We set the keyboard focus to the EDayView, so the
 			   EText item loses it and stops the edit. */
Index: calendar/gui/e-week-view.c
===================================================================
--- calendar/gui/e-week-view.c	(revision 34528)
+++ calendar/gui/e-week-view.c	(working copy)
@@ -3045,7 +3045,7 @@
 	switch (gdkevent->type) {
 	case GDK_KEY_PRESS:
 		tooltip_destroy (week_view, item);
-		if (gdkevent && gdkevent->key.keyval == GDK_Return) {
+		if (!E_TEXT (item)->preedit_len && gdkevent && gdkevent->key.keyval == GDK_Return) {
 			/* We set the keyboard focus to the EDayView, so the
 			   EText item loses it and stops the edit. */
 			gtk_widget_grab_focus (GTK_WIDGET (week_view));
Index: calendar/ChangeLog
===================================================================
--- calendar/ChangeLog	(revision 34528)
+++ calendar/ChangeLog	(working copy)
@@ -1,3 +1,11 @@
+2007-11-13  Suresh Chandrasekharan <suresh.chandrasekharan@sun.com>
+
+	** Fixes bug #264404
+
+	* gui/e-day-view.c (e_day_view_on_text_item_event):
+	* gui/e-week-view.c (e_week_view_on_text_item_event):
+	Pass down Enter if in  preedit-mode.
+
 2007-11-12  Andre Klapper  <a9016009@gmx.de>
 
 	** Fix for bug #496248
