Index: gtk/gtkconv.c
===================================================================
--- gtk/gtkconv.c	(revision 17827)
+++ gtk/gtkconv.c	(working copy)
@@ -6050,9 +6054,9 @@
 	gtkconv->u.im->icon = gtk_image_new_from_pixbuf(scale);
 	gtkconv->auto_resize = TRUE;
 	/* Reset the size request to allow the buddy icon to resize */
-	gtk_widget_set_size_request(gtkconv->lower_hbox, -1, -1);
+	gtk_widget_set_size_request(gtkconv->lower_hbox, -1,
+		MAX(gaim_prefs_get_int("/gaim/gtk/conversations/im/entry_height"), scale_height));
 	g_idle_add(reset_auto_resize_cb, gtkconv);
-	printf("Auto resize true\n");
 	gtk_widget_set_size_request(gtkconv->u.im->icon, scale_width, scale_height);
 	gtk_container_add(GTK_CONTAINER(event), gtkconv->u.im->icon);
 	gtk_widget_show(gtkconv->u.im->icon);