diff -r 15804a3ac8c4 -r af5d1cd07c4e pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Thu Sep 04 03:43:32 2008 +0000
+++ b/pidgin/gtkconv.c	Thu Sep 04 04:05:54 2008 +0000
@@ -7183,6 +7183,14 @@
 			pidgin_conv_update_buddy_icon(conv);
 		}
 	}
+
+	/* Make the tabs show/hide correctly */
+	for (l = pidgin_conv_windows_get_list(); l != NULL; l = l->next) {
+		PidginWindow *win = l->data;
+		if (pidgin_conv_window_get_gtkconv_count(win) == 1)
+			gtk_notebook_set_show_tabs(GTK_NOTEBOOK(win->notebook),
+						   GPOINTER_TO_INT(value) == 0);
+	}
 }
 
 static void