--- src/gtkconv.c.orig	2004-06-03 15:10:57.000000000 +0900
+++ src/gtkconv.c	2004-06-03 15:11:59.000000000 +0900
@@ -1478,6 +1478,11 @@
 				if (!(event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)) &&
 					gaim_prefs_get_bool("/gaim/gtk/conversations/enter_sends"))
 				{
+					if (gtk_im_context_filter_keypress (GTK_TEXT_VIEW (entry)->im_context, event))
+					{
+						GTK_TEXT_VIEW (entry)->need_im_reset = TRUE;
+						return TRUE;
+					}
 					send_cb(NULL, conv);
 					return TRUE;
 				}