diff -u pidgin-2.5.4/debian/changelog pidgin-2.5.4/debian/changelog
--- pidgin-2.5.4/debian/changelog
+++ pidgin-2.5.4/debian/changelog
@@ -1,3 +1,14 @@
+pidgin (1:2.5.4-2ubuntu2) jaunty; urgency=low
+
+  * 60_1024x600_gtkaccount.c.patch: Add scrolled bars into account dialog
+    when screen height is less than 600
+  * 60_1024x600_gtkpounce.c.patch: Add scrolled bars into pounce window when
+    screen height is less than 600
+  * 60_1024x600_gtkprefs.c.patch: Add scrolled bars into preference window when
+    screen height is less than 600
+
+ -- Ying-Chun Liu (PaulLiu) <paul.liu@canonical.com>  Wed, 25 Feb 2009 16:55:42 +0800
+
 pidgin (1:2.5.4-2ubuntu1) jaunty; urgency=low
 
   * Merge from debian, remaining changes: (LP: #316636)
only in patch2:
unchanged:
--- pidgin-2.5.4.orig/debian/patches/60_1024x600_gtkprefs.c.patch
+++ pidgin-2.5.4/debian/patches/60_1024x600_gtkprefs.c.patch
@@ -0,0 +1,25 @@
+diff -Nur -x '*.orig' -x '*~' pidgin-2.5.4/pidgin/gtkprefs.c pidgin-2.5.4.new/pidgin/gtkprefs.c
+--- pidgin-2.5.4/pidgin/gtkprefs.c	2009-01-13 03:05:39.000000000 +0800
++++ pidgin-2.5.4.new/pidgin/gtkprefs.c	2009-02-26 00:45:15.757275824 +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,13 @@
+ 	g_signal_connect_after(G_OBJECT(imhtml), "format_function_clear",
+ 					 G_CALLBACK(formatting_clear_cb), NULL);
+ 
++	if (gdk_screen_get_default() != NULL && gdk_screen_get_height(gdk_screen_get_default()) <= 600) {
++	  scrolledWindow1024x600 = gtk_scrolled_window_new(NULL,NULL);
++	  gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledWindow1024x600),GTK_POLICY_NEVER,GTK_POLICY_AUTOMATIC);
++	  gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolledWindow1024x600),ret);
++	  gtk_widget_show(ret);
++	  ret = scrolledWindow1024x600;
++	}
+ 
+ 	gtk_widget_show(ret);
+ 
only in patch2:
unchanged:
--- pidgin-2.5.4.orig/debian/patches/60_1024x600_gtkaccount.c.patch
+++ pidgin-2.5.4/debian/patches/60_1024x600_gtkaccount.c.patch
@@ -0,0 +1,37 @@
+diff -Nur -x '*.orig' -x '*~' pidgin-2.5.4/pidgin/gtkaccount.c pidgin-2.5.4.new/pidgin/gtkaccount.c
+--- pidgin-2.5.4/pidgin/gtkaccount.c	2009-01-13 03:05:39.000000000 +0800
++++ pidgin-2.5.4.new/pidgin/gtkaccount.c	2009-02-26 00:33:23.277274038 +0800
+@@ -1461,6 +1461,8 @@
+ 	GtkWidget *dbox;
+ 	GtkWidget *notebook;
+ 	GtkWidget *button;
++	GtkWidget *scrolledWindow1024x600=NULL;
++	GtkWidget *vbox1024x600=NULL;
+ 
+ 	if (accounts_window != NULL && account != NULL &&
+ 		(dialog = g_hash_table_lookup(account_pref_wins, account)) != NULL)
+@@ -1538,8 +1540,22 @@
+ 	gtk_widget_show(dbox);
+ 
+ 	/** Setup the bottom frames. */
+-	add_protocol_options(dialog, dbox);
+-	add_proxy_options(dialog, dbox);
++	if (gdk_screen_get_default() != NULL && gdk_screen_get_height(gdk_screen_get_default()) <= 600) {
++	  scrolledWindow1024x600 = gtk_scrolled_window_new(NULL,NULL);
++	  gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledWindow1024x600),GTK_POLICY_NEVER,GTK_POLICY_AUTOMATIC);
++	  gtk_container_add(GTK_CONTAINER(dbox), scrolledWindow1024x600);
++	  gtk_widget_show(scrolledWindow1024x600);
++	  vbox1024x600 = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER);
++	  gtk_container_set_border_width(GTK_CONTAINER(vbox1024x600), PIDGIN_HIG_BORDER);
++	  gtk_widget_show(vbox1024x600);
++	  gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolledWindow1024x600), vbox1024x600);
++	  add_protocol_options(dialog, vbox1024x600);
++	  add_proxy_options(dialog, vbox1024x600);
++	  dialog->bottom_vbox = vbox1024x600;
++	} else {
++	  add_protocol_options(dialog, dbox);
++	  add_proxy_options(dialog, dbox);
++	}
+ 
+ 	/* Cancel button */
+ 	pidgin_dialog_add_button(GTK_DIALOG(win), GTK_STOCK_CANCEL, G_CALLBACK(cancel_account_prefs_cb), dialog);
only in patch2:
unchanged:
--- pidgin-2.5.4.orig/debian/patches/60_1024x600_gtkpounce.c.patch
+++ pidgin-2.5.4/debian/patches/60_1024x600_gtkpounce.c.patch
@@ -0,0 +1,41 @@
+diff -Nur -x '*.orig' -x '*~' pidgin-2.5.4/pidgin/gtkpounce.c pidgin-2.5.4.new/pidgin/gtkpounce.c
+--- pidgin-2.5.4/pidgin/gtkpounce.c	2009-01-13 03:05:39.000000000 +0800
++++ pidgin-2.5.4.new/pidgin/gtkpounce.c	2009-02-26 00:38:15.445274448 +0800
+@@ -498,6 +498,7 @@
+ 	GPtrArray *sound_widgets;
+ 	GPtrArray *exec_widgets;
+ 	GtkWidget *send_msg_imhtml;
++	GtkWidget *scrolledWindow1024x600 = NULL;
+ 
+ 	g_return_if_fail((cur_pounce != NULL) ||
+ 	                 (account != NULL) ||
+@@ -547,8 +548,14 @@
+ 
+ 	/* Create the vbox that will contain all the prefs stuff. */
+ 	vbox2 = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+-	gtk_box_pack_start(GTK_BOX(vbox1), vbox2, TRUE, TRUE, 0);
+-
++	if (gdk_screen_get_default() != NULL && gdk_screen_get_height(gdk_screen_get_default()) <= 600) {
++	  scrolledWindow1024x600 = gtk_scrolled_window_new(NULL,NULL);
++	  gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledWindow1024x600),GTK_POLICY_NEVER,GTK_POLICY_AUTOMATIC);
++	  gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolledWindow1024x600),vbox2);
++	  gtk_box_pack_start(GTK_BOX(vbox1), scrolledWindow1024x600, TRUE, TRUE, 0);
++	} else {
++	  gtk_box_pack_start(GTK_BOX(vbox1), vbox2, TRUE, TRUE, 0);
++	}
+ 	/* Create the "Pounce on Whom" frame. */
+ 	frame = pidgin_make_frame(vbox2, _("Pounce on Whom"));
+ 
+@@ -1015,6 +1022,12 @@
+ 	}
+ 
+ 	gtk_widget_show(vbox2);
++	if (gdk_screen_get_default() != NULL && gdk_screen_get_height(gdk_screen_get_default()) <= 600) {
++	  gint oldw,oldh;
++	  gtk_widget_show(scrolledWindow1024x600);
++	  gtk_window_get_size(GTK_WINDOW(window),&oldw,&oldh);
++	  gtk_window_resize(GTK_WINDOW (window),oldw,448);
++	}
+ 	gtk_widget_show(window);
+ }
+