diff -urN gaim-0.75.99-20040318cvs.orig/src/gtkconv.c gaim-0.75.99-20040318cvs/src/gtkconv.c
--- gaim-0.75.99-20040318cvs.orig/src/gtkconv.c	2004-03-16 10:31:48.000000000 -1000
+++ gaim-0.75.99-20040318cvs/src/gtkconv.c	2004-03-16 12:50:59.689509499 -1000
@@ -1390,6 +1390,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;
 				}