diff -r a42896c9bcd2 -r 9ed9a52e3be7 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Sun May 04 20:44:08 2008 +0000
+++ b/pidgin/gtkconv.c	Mon May 05 00:00:25 2008 +0000
@@ -4486,7 +4486,7 @@
 	 * prevent scrolling when the second line is a continuation of the first line, or
 	 * is the beginning of a new paragraph. */
 	min_height = min_lines * (oneline.height + MAX(pad_inside, pad_top + pad_bottom));
-	height = CLAMP(height, min_height, max_height);
+	height = CLAMP(height, MIN(min_height, max_height), max_height);
 
 	diff = height - gtkconv->entry->allocation.height;
 	if (ABS(diff) < oneline.height / 2)