diff -r ce44d0f8095d -r a762eb005b9c pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Thu May 24 11:38:43 2007 +0000
+++ b/pidgin/gtkconv.c	Thu May 24 18:40:51 2007 +0000
@@ -7714,6 +7714,11 @@
 
 	gtkconv = PIDGIN_CONVERSATION(conv);
 
+	if (gtkconv->u.im->typing_timer != 0) {
+		g_source_remove(gtkconv->u.im->typing_timer);
+		gtkconv->u.im->typing_timer = 0;
+	}
+
 	stop_anim(NULL, gtkconv);
 }
 static void