diff -Nur -x '*.orig' -x '*~' pidgin-2.5.3/pidgin/gtkprefs.c pidgin-2.5.3.new/pidgin/gtkprefs.c
--- pidgin-2.5.3/pidgin/gtkprefs.c	2009-01-26 00:17:54.106081848 +0800
+++ pidgin-2.5.3.new/pidgin/gtkprefs.c	2009-01-26 00:22:53.322081895 +0800
@@ -1030,6 +1030,7 @@
 	GtkWidget *fontpref;
 	GtkWidget *imhtml;
 	GtkWidget *frame;
+	GtkWidget *scrolledWindow1024x600;
 
 #if GTK_CHECK_VERSION(2,4,0)
 	GtkWidget *hbox;
@@ -1125,6 +1126,15 @@
 	g_signal_connect_after(G_OBJECT(imhtml), "format_function_clear",
 					 G_CALLBACK(formatting_clear_cb), NULL);
 
+	scrolledWindow1024x600 = gtk_scrolled_window_new(NULL,NULL);
+	if (gdk_screen_get_default() != NULL && gdk_screen_get_height(gdk_screen_get_default()) <= 600) {
+	  gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledWindow1024x600),GTK_POLICY_NEVER,GTK_POLICY_AUTOMATIC);
+	} else {
+	  gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledWindow1024x600),GTK_POLICY_NEVER,GTK_POLICY_NEVER);
+	}
+	gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolledWindow1024x600),ret);
+	gtk_widget_show(ret);
+	ret = scrolledWindow1024x600;
 
 	gtk_widget_show(ret);