--- src/fe-gtk/maingui.c.old	2008-04-01 10:53:41.000000000 +0200
+++ src/fe-gtk/maingui.c	2010-02-23 17:06:50.000000000 +0100
@@ -2821,13 +2821,13 @@
 static void
 mg_create_entry (session *sess, GtkWidget *box)
 {
-	GtkWidget *sw, *hbox, *but, *entry;
+	GtkWidget *sw, *hbox, *but, *entry, *mybox;
 	session_gui *gui = sess->gui;
 
 	hbox = gtk_hbox_new (FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (box), hbox, 0, 0, 0);
 
-	gui->nick_box = gtk_hbox_new (FALSE, 0);
+	gui->nick_box = gtk_vbox_new (FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (hbox), gui->nick_box, 0, 0, 0);
 
 	gui->nick_label = but = gtk_button_new_with_label (sess->server->nick);
@@ -2839,7 +2839,7@@
 
 #ifdef USE_GTKSPELL
 	gui->input_box = entry = gtk_text_view_new ();
-	gtk_widget_set_size_request (entry, 0, 1);
+	gtk_widget_set_size_request (entry, 0, -1);
 	gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (entry), GTK_WRAP_NONE);
 	gtk_text_view_set_accepts_tab (GTK_TEXT_VIEW (entry), FALSE);
 	if (prefs.gui_input_spell)
@@ -2852,7 +2852,9 @@
 												GTK_POLICY_NEVER,
 												GTK_POLICY_NEVER);
 	gtk_container_add (GTK_CONTAINER (sw), entry);
-	gtk_container_add (GTK_CONTAINER (hbox), sw);
+	mybox = gtk_vbox_new(FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (mybox), sw, 0, 0, 0);
+	gtk_box_pack_start (GTK_BOX (hbox), mybox, 1, 1, 0);
 #else
 #ifdef USE_LIBSEXY
 	gui->input_box = entry = sexy_spell_entry_new ();