Index: widgets/text/e-text.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/text/e-text.c,v
retrieving revision 1.173
diff -u -p -r1.173 e-text.c
--- widgets/text/e-text.c	21 Jul 2006 05:47:37 -0000	1.173
+++ widgets/text/e-text.c	27 Jul 2006 00:07:25 -0000
@@ -1507,8 +1507,8 @@ e_text_draw (GnomeCanvasItem *item, GdkD
 		}
 	}
 
-
-	insert_preedit_text (text);	
+	if (text->im_context_signals_registered)
+		insert_preedit_text (text);
 
 	if (!pango_layout_get_text (text->layout))
 		return;
@@ -2221,6 +2221,7 @@ e_text_event (GnomeCanvasItem *item, Gdk
                                                                              0, 0, NULL,
                                                                              NULL, save_text);
                                        save_text->im_context_signals_registered = FALSE;
+				       reset_layout (save_text);
                                 }
 
 				if (text->im_context) {
@@ -2249,6 +2250,7 @@ e_text_event (GnomeCanvasItem *item, Gdk
 									      0, 0, NULL,
 									      NULL, text);
 					text->im_context_signals_registered = FALSE;
+					reset_layout (text);
 				} else {
 					save_text = text;
 				}
