diff -r f8285df97c70 -r f6d4e67becd9 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Thu May 01 22:44:16 2008 +0000
+++ b/pidgin/gtkconv.c	Fri May 02 01:28:43 2008 +0000
@@ -4458,7 +4458,7 @@
 	GdkRectangle oneline;
 	int height, diff;
 	int pad_top, pad_inside, pad_bottom;
-	int max_height = gtkconv->tab_cont->allocation.height / 2;
+	int max_height = (gtkconv->imhtml->allocation.height + gtkconv->entry->allocation.height) / 2;
 
 	pad_top = gtk_text_view_get_pixels_above_lines(GTK_TEXT_VIEW(gtkconv->entry));
 	pad_bottom = gtk_text_view_get_pixels_below_lines(GTK_TEXT_VIEW(gtkconv->entry));