diff --git a/ChangeLog b/ChangeLog
index 7a24e7d74b..5109339d9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktextview.c (gtk_text_view_key_press_event): Reset 
+	im context before committing \n or \t.
+
 2005-09-02  Alexander Larsson  <alexl@redhat.com>
 
 	* gtk/gtkfilechooserdefault.c: (shortcuts_add_volumes),
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7a24e7d74b..5109339d9f 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-09-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktextview.c (gtk_text_view_key_press_event): Reset 
+	im context before committing \n or \t.
+
 2005-09-02  Alexander Larsson  <alexl@redhat.com>
 
 	* gtk/gtkfilechooserdefault.c: (shortcuts_add_volumes),
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 6f5aa59202..d8c4376468 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -3881,6 +3881,7 @@ gtk_text_view_key_press_event (GtkWidget *widget, GdkEventKey *event)
       /* this won't actually insert the newline if the cursor isn't
        * editable
        */
+      gtk_text_view_reset_im_context (text_view);
       gtk_text_view_commit_text (text_view, "\n");
 
       obscure = TRUE;
@@ -3896,6 +3897,7 @@ gtk_text_view_key_press_event (GtkWidget *widget, GdkEventKey *event)
        */
       if (text_view->accepts_tab && text_view->editable)
 	{
+	  gtk_text_view_reset_im_context (text_view);
 	  gtk_text_view_commit_text (text_view, "\t");
 	  obscure = TRUE;
 	}