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