diff -r 8e9d4dfd09da -r 615d1409985d pidgin/gtkconv.c --- a/pidgin/gtkconv.c Wed Dec 12 00:15:23 2007 +0000 +++ b/pidgin/gtkconv.c Wed Dec 12 01:53:00 2007 +0000 @@ -4349,7 +4349,7 @@ pad_bottom = gtk_text_view_get_pixels_below_lines(GTK_TEXT_VIEW(gtkconv->entry)); pad_inside = gtk_text_view_get_pixels_inside_wrap(GTK_TEXT_VIEW(gtkconv->entry)); - height = (oneline.height + pad_top + pad_bottom) * (lines + 1); + height = (oneline.height + pad_top + pad_bottom) * MAX(lines, 2); height += (oneline.height + pad_inside) * (wrapped_lines - lines); gtkconv->auto_resize = TRUE;