diff -r 7c7acc54590e -r 3de06f2e0daa pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Sun Jul 12 20:48:50 2009 +0000
+++ b/pidgin/gtkconv.c	Tue Jul 28 20:52:33 2009 +0000
@@ -7013,12 +7013,20 @@
 		icon = purple_conv_im_get_icon(PURPLE_CONV_IM(conv));
 
 		if (icon == NULL)
+		{
+			gtk_widget_set_size_request(gtkconv->u.im->icon_container,
+			                            -1, BUDDYICON_SIZE_MIN);
 			return;
+		}
 
 		data = purple_buddy_icon_get_data(icon, &len);
 
 		if (data == NULL)
+		{
+			gtk_widget_set_size_request(gtkconv->u.im->icon_container,
+			                            -1, BUDDYICON_SIZE_MIN);
 			return;
+		}
 	}
 
 	loader = gdk_pixbuf_loader_new();