--- evolution-2.7.3/widgets/text/e-text.c.replicated_cjk_input	2006-07-06 09:57:22.000000000 -0400
+++ evolution-2.7.3/widgets/text/e-text.c	2006-07-06 09:58:27.000000000 -0400
@@ -1498,7 +1498,8 @@
 	}
 
 
-	insert_preedit_text (text);
+	if (text->im_context_signals_registered)
+		insert_preedit_text (text);
 
 	if (!pango_layout_get_text (text->layout))
 		return;
@@ -2212,7 +2213,8 @@
 									      G_SIGNAL_MATCH_DATA,
                                                                              0, 0, NULL,
                                                                              NULL, save_text);
-                                       save_text->im_context_signals_registered = FALSE;
+					save_text->im_context_signals_registered = FALSE;
+					reset_layout (save_text);
                                 }
 
 				if (text->im_context) {