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