diff --git a/libempathy/empathy-chatroom.c b/libempathy/empathy-chatroom.c
index ef89994..8ffd8a5 100644
--- a/libempathy/empathy-chatroom.c
+++ b/libempathy/empathy-chatroom.c
@@ -37,6 +37,10 @@ typedef struct {
 	gboolean   auto_connect;
 	gboolean favorite;
 	EmpathyTpChat *tp_chat;
+	gchar *subject;
+	guint members_count;
+	gboolean invite_only;
+	gboolean need_password;
 } EmpathyChatroomPriv;
 
 
@@ -58,6 +62,10 @@ enum {
 	PROP_AUTO_CONNECT,
 	PROP_FAVORITE,
 	PROP_TP_CHAT,
+	PROP_SUBJECT,
+	PROP_MEMBERS_COUNT,
+	PROP_NEED_PASSWORD,
+	PROP_INVITE_ONLY
 };
 
 G_DEFINE_TYPE (EmpathyChatroom, empathy_chatroom, G_TYPE_OBJECT);
@@ -123,6 +131,56 @@ empathy_chatroom_class_init (EmpathyChatroomClass *klass)
 							      EMPATHY_TYPE_TP_CHAT,
 							      G_PARAM_READWRITE));
 
+  g_object_class_install_property (object_class,
+      PROP_SUBJECT,
+      g_param_spec_string ("subject",
+        "Subject",
+        "The chatroom's subject",
+        "",
+        G_PARAM_READWRITE |
+        G_PARAM_CONSTRUCT |
+        G_PARAM_STATIC_NAME |
+        G_PARAM_STATIC_NICK |
+        G_PARAM_STATIC_BLURB));
+
+  g_object_class_install_property (object_class,
+      PROP_MEMBERS_COUNT,
+      g_param_spec_uint ("members-count",
+        "Members count",
+        "The chatroom's members count",
+        0,
+        G_MAXUINT,
+        0,
+        G_PARAM_READWRITE |
+        G_PARAM_CONSTRUCT |
+        G_PARAM_STATIC_NAME |
+        G_PARAM_STATIC_NICK |
+        G_PARAM_STATIC_BLURB));
+
+  g_object_class_install_property (object_class,
+      PROP_INVITE_ONLY,
+      g_param_spec_boolean ("invite-only",
+        "Invite Only",
+        "The chatroom is invite only",
+        FALSE,
+        G_PARAM_READWRITE |
+        G_PARAM_CONSTRUCT |
+        G_PARAM_STATIC_NAME |
+        G_PARAM_STATIC_NICK |
+        G_PARAM_STATIC_BLURB));
+
+  g_object_class_install_property (object_class,
+      PROP_NEED_PASSWORD,
+      g_param_spec_boolean ("need-password",
+        "Password Needed",
+        "The chatroom is password protected",
+        FALSE,
+        G_PARAM_READWRITE |
+        G_PARAM_CONSTRUCT |
+        G_PARAM_STATIC_NAME |
+        G_PARAM_STATIC_NICK |
+        G_PARAM_STATIC_BLURB));
+
 	g_type_class_add_private (object_class, sizeof (EmpathyChatroomPriv));
 }
 
@@ -175,12 +233,24 @@ chatroom_get_property (GObject    *object,
 	case PROP_AUTO_CONNECT:
 		g_value_set_boolean (value, priv->auto_connect);
 		break;
-  case PROP_FAVORITE:
-    g_value_set_boolean (value, priv->favorite);
-    break;
+	case PROP_FAVORITE:
+		g_value_set_boolean (value, priv->favorite);
+		break;
 	case PROP_TP_CHAT:
 		g_value_set_object (value, priv->tp_chat);
 		break;
+  case PROP_SUBJECT:
+    g_value_set_string (value, priv->subject);
+    break;
+  case PROP_MEMBERS_COUNT:
+    g_value_set_uint (value, priv->members_count);
+    break;
+  case PROP_INVITE_ONLY:
+    g_value_set_boolean (value, priv->invite_only);
+    break;
+  case PROP_NEED_PASSWORD:
+    g_value_set_boolean (value, priv->need_password);
+    break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
 		break;
@@ -238,6 +308,22 @@ chatroom_set_property (GObject      *object,
 		}
 		break;
 	}
+  case PROP_SUBJECT:
+    empathy_chatroom_set_subject (EMPATHY_CHATROOM (object),
+        g_value_get_string (value));
+    break;
+  case PROP_MEMBERS_COUNT:
+    empathy_chatroom_set_members_count (EMPATHY_CHATROOM (object),
+        g_value_get_uint (value));
+    break;
+  case PROP_NEED_PASSWORD:
+    empathy_chatroom_set_need_password (EMPATHY_CHATROOM (object),
+        g_value_get_boolean (value));
+    break;
+  case PROP_INVITE_ONLY:
+    empathy_chatroom_set_invite_only (EMPATHY_CHATROOM (object),
+        g_value_get_boolean (value));
+    break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
 		break;
@@ -432,3 +518,116 @@ empathy_chatroom_get_tp_chat (EmpathyChatroom *chatroom) {
 
 	return priv->tp_chat;
 }
+
+const gchar *
+empathy_chatroom_get_subject (EmpathyChatroom *chatroom)
+{
+  EmpathyChatroomPriv *priv;
+
+  g_return_val_if_fail (EMPATHY_IS_CHATROOM (chatroom), NULL);
+
+  priv = GET_PRIV (chatroom);
+
+  return priv->subject;
+}
+
+void
+empathy_chatroom_set_subject (EmpathyChatroom *chatroom,
+                              const gchar *subject)
+{
+  EmpathyChatroomPriv *priv;
+
+  g_return_if_fail (EMPATHY_IS_CHATROOM (chatroom));
+
+  priv = GET_PRIV (chatroom);
+
+  g_free (priv->subject);
+  priv->subject = NULL;
+
+  if (subject)
+    priv->subject = g_strdup (subject);
+
+  g_object_notify (G_OBJECT (chatroom), "subject");
+}
+
+guint
+empathy_chatroom_get_members_count (EmpathyChatroom *chatroom)
+{
+  EmpathyChatroomPriv *priv;
+
+  g_return_val_if_fail (EMPATHY_IS_CHATROOM (chatroom), 0);
+
+  priv = GET_PRIV (chatroom);
+
+  return priv->members_count;
+}
+
+void
+empathy_chatroom_set_members_count (EmpathyChatroom *chatroom,
+                                    guint count)
+{
+  EmpathyChatroomPriv *priv;
+
+  g_return_if_fail (EMPATHY_IS_CHATROOM (chatroom));
+
+  priv = GET_PRIV (chatroom);
+
+  priv->members_count = count;
+
+  g_object_notify (G_OBJECT (chatroom), "members-count");
+}
+
+gboolean
+empathy_chatroom_get_need_password (EmpathyChatroom *chatroom)
+{
+  EmpathyChatroomPriv *priv;
+
+  g_return_val_if_fail (EMPATHY_IS_CHATROOM (chatroom), FALSE);
+
+  priv = GET_PRIV (chatroom);
+
+  return priv->need_password;
+}
+
+void
+empathy_chatroom_set_need_password (EmpathyChatroom *chatroom,
+                                    gboolean need_password)
+{
+  EmpathyChatroomPriv *priv;
+
+  g_return_if_fail (EMPATHY_IS_CHATROOM (chatroom));
+
+  priv = GET_PRIV (chatroom);
+
+  priv->need_password = need_password;
+
+  g_object_notify (G_OBJECT (chatroom), "need-password");
+}
+
+gboolean
+empathy_chatroom_get_invite_only (EmpathyChatroom *chatroom)
+{
+  EmpathyChatroomPriv *priv;
+
+  g_return_val_if_fail (EMPATHY_IS_CHATROOM (chatroom), FALSE);
+
+  priv = GET_PRIV (chatroom);
+
+  return priv->invite_only;
+}
+
+void
+empathy_chatroom_set_invite_only (EmpathyChatroom *chatroom,
+                                  gboolean invite_only)
+{
+  EmpathyChatroomPriv *priv;
+
+  g_return_if_fail (EMPATHY_IS_CHATROOM (chatroom));
+
+  priv = GET_PRIV (chatroom);
+
+  priv->invite_only = invite_only;
+
+  g_object_notify (G_OBJECT (chatroom), "invite-only");
+}
+
diff --git a/libempathy/empathy-chatroom.h b/libempathy/empathy-chatroom.h
index 3261c8d..08e3bc1 100644
--- a/libempathy/empathy-chatroom.h
+++ b/libempathy/empathy-chatroom.h
@@ -69,6 +69,18 @@ void            empathy_chatroom_set_name         (EmpathyChatroom *chatroom,
 gboolean        empathy_chatroom_get_auto_connect (EmpathyChatroom *chatroom);
 void            empathy_chatroom_set_auto_connect (EmpathyChatroom *chatroom,
 						   gboolean         auto_connect);
+const gchar *   empathy_chatroom_get_subject      (EmpathyChatroom *chatroom);
+void            empathy_chatroom_set_subject      (EmpathyChatroom *chatroom,
+						   const gchar     *subject);
+guint           empathy_chatroom_get_members_count (EmpathyChatroom *chatroom);
+void            empathy_chatroom_set_members_count (EmpathyChatroom *chatroom,
+						    guint            count);
+gboolean        empathy_chatroom_get_need_password (EmpathyChatroom *chatroom);
+void            empathy_chatroom_set_need_password (EmpathyChatroom *chatroom,
+						    gboolean         need_password);
+gboolean        empathy_chatroom_get_invite_only  (EmpathyChatroom *chatroom);
+void            empathy_chatroom_set_invite_only  (EmpathyChatroom *chatroom,
+						   gboolean         invite_only);
 gboolean        empathy_chatroom_equal            (gconstpointer    v1,
 						   gconstpointer    v2);
 EmpathyTpChat * empathy_chatroom_get_tp_chat      (EmpathyChatroom *chatroom);
diff --git a/libempathy/empathy-tp-roomlist.c b/libempathy/empathy-tp-roomlist.c
index a1583c0..fc2526f 100644
--- a/libempathy/empathy-tp-roomlist.c
+++ b/libempathy/empathy-tp-roomlist.c
@@ -122,6 +122,10 @@ tp_roomlist_got_rooms_cb (TpChannel       *channel,
 	for (i = 0; i < rooms->len; i++) {
 		const GValue *room_name_value;
 		const GValue *handle_name_value;
+		const GValue *room_members_value;
+		const GValue *room_subject_value;
+		const GValue *room_invite_value;
+		const GValue *room_password_value;
 		GValueArray  *room_struct;
 		guint         handle;
 		const gchar  *channel_type;
@@ -134,6 +138,10 @@ tp_roomlist_got_rooms_cb (TpChannel       *channel,
 		info = g_value_get_boxed (g_value_array_get_nth (room_struct, 2));
 		room_name_value = g_hash_table_lookup (info, "name");
 		handle_name_value = g_hash_table_lookup (info, "handle-name");
+		room_subject_value = g_hash_table_lookup (info, "subject");
+		room_members_value = g_hash_table_lookup (info, "members");
+		room_invite_value = g_hash_table_lookup (info, "invite-only");
+		room_password_value = g_hash_table_lookup (info, "password");
 
 		if (tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_TEXT)) {
 			continue;
@@ -146,6 +154,26 @@ tp_roomlist_got_rooms_cb (TpChannel       *channel,
 						   g_value_get_string (room_name_value));
 		}
 
+		if (room_members_value != NULL) {
+			empathy_chatroom_set_members_count (chatroom,
+						   g_value_get_uint (room_members_value));
+		}
+
+		if (room_subject_value != NULL) {
+			empathy_chatroom_set_subject (chatroom,
+						   g_value_get_string (room_subject_value));
+		}
+
+		if (room_invite_value != NULL) {
+			empathy_chatroom_set_invite_only (chatroom,
+						   g_value_get_boolean (room_invite_value));
+		}
+
+		if (room_password_value != NULL) {
+			empathy_chatroom_set_need_password (chatroom,
+						   g_value_get_boolean (room_password_value));
+		}
+
 		if (handle_name_value != NULL) {
 			empathy_chatroom_set_room (chatroom,
 						   g_value_get_string (handle_name_value));
diff --git a/src/empathy-main-window.ui b/src/empathy-main-window.ui
index 4aa2254..cd45bc7 100644
--- a/src/empathy-main-window.ui
+++ b/src/empathy-main-window.ui
@@ -88,7 +88,7 @@
         <child>
           <object class="GtkAction" id="room_join_new">
             <property name="name">room_join_new</property>
-            <property name="label" translatable="yes">Join _New...</property>
+            <property name="label" translatable="yes">_Join...</property>
           </object>
         </child>
         <child>
diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c
index 75ab742..da3112f 100644
--- a/src/empathy-new-chatroom-dialog.c
+++ b/src/empathy-new-chatroom-dialog.c
@@ -59,13 +59,9 @@ typedef struct {
 	GtkWidget         *account_chooser;
 	GtkWidget         *label_server;
 	GtkWidget         *entry_server;
-	GtkWidget         *togglebutton_refresh;
 	GtkWidget         *label_room;
 	GtkWidget         *entry_room;
-	GtkWidget         *vbox_browse;
-	GtkWidget         *image_status;
-	GtkWidget         *label_status;
-	GtkWidget         *hbox_status;
+	GtkWidget         *expander_browse;
 	GtkWidget         *throbber;
 	GtkWidget         *treeview;
 	GtkTreeModel      *model;
@@ -74,8 +70,12 @@ typedef struct {
 } EmpathyNewChatroomDialog;
 
 enum {
+	COL_NEED_PASSWORD,
+	COL_INVITE_ONLY,
 	COL_NAME,
 	COL_ROOM,
+	COL_MEMBERS,
+	COL_TOOL_TIP,
 	COL_COUNT
 };
 
@@ -111,7 +111,10 @@ static void     new_chatroom_dialog_browse_start                    (EmpathyNewC
 static void     new_chatroom_dialog_browse_stop                     (EmpathyNewChatroomDialog *dialog);
 static void     new_chatroom_dialog_entry_server_activate_cb        (GtkWidget               *widget,
 								     EmpathyNewChatroomDialog *dialog);
-static void     new_chatroom_dialog_togglebutton_refresh_toggled_cb (GtkWidget               *widget,
+static void     new_chatroom_dialog_expander_browse_activate_cb     (GtkWidget               *widget,
+								     EmpathyNewChatroomDialog *dialog);
+static gboolean new_chatroom_dialog_entry_server_focus_out_cb       (GtkWidget               *widget,
+								     GdkEventFocus           *event,
 								     EmpathyNewChatroomDialog *dialog);
 
 static EmpathyNewChatroomDialog *dialog_p = NULL;
@@ -140,13 +143,9 @@ empathy_new_chatroom_dialog_show (GtkWindow *parent)
 				       "label_room", &dialog->label_room,
 				       "entry_server", &dialog->entry_server,
 				       "entry_room", &dialog->entry_room,
-				       "togglebutton_refresh", &dialog->togglebutton_refresh,
-				       "vbox_browse", &dialog->vbox_browse,
-				       "image_status", &dialog->image_status,
-				       "label_status", &dialog->label_status,
-				       "hbox_status", &dialog->hbox_status,
 				       "treeview", &dialog->treeview,
 				       "button_join", &dialog->button_join,
+				       "expander_browse", &dialog->expander_browse,
 				       NULL);
 	g_free (filename);
 
@@ -155,8 +154,9 @@ empathy_new_chatroom_dialog_show (GtkWindow *parent)
 			      "new_chatroom_dialog", "destroy", new_chatroom_dialog_destroy_cb,
 			      "entry_server", "changed", new_chatroom_dialog_entry_changed_cb,
 			      "entry_server", "activate", new_chatroom_dialog_entry_server_activate_cb,
+			      "entry_server", "focus-out-event", new_chatroom_dialog_entry_server_focus_out_cb,
 			      "entry_room", "changed", new_chatroom_dialog_entry_changed_cb,
-			      "togglebutton_refresh", "toggled", new_chatroom_dialog_togglebutton_refresh_toggled_cb,
+			      "expander_browse", "activate", new_chatroom_dialog_expander_browse_activate_cb,
 			      NULL);
 
 	g_object_unref (gui);
@@ -179,9 +179,10 @@ empathy_new_chatroom_dialog_show (GtkWindow *parent)
 	dialog->throbber = ephy_spinner_new ();
 	ephy_spinner_set_size (EPHY_SPINNER (dialog->throbber), GTK_ICON_SIZE_LARGE_TOOLBAR);
 	gtk_widget_show (dialog->throbber);
-
-	gtk_box_pack_start (GTK_BOX (dialog->hbox_status), dialog->throbber, 
-			    FALSE, FALSE, 0);
+	gtk_table_attach (GTK_TABLE (dialog->table_info),
+			  dialog->throbber,
+			  2, 3, 0, 1,
+			  0, 0, 0, 0);
 
 	/* Account chooser for custom */
 	dialog->account_chooser = empathy_account_chooser_new ();
@@ -190,7 +191,7 @@ empathy_new_chatroom_dialog_show (GtkWindow *parent)
 					    NULL);
 	gtk_table_attach_defaults (GTK_TABLE (dialog->table_info),
 				   dialog->account_chooser,
-				   1, 3, 0, 1);
+				   1, 2, 0, 1);
 	gtk_widget_show (dialog->account_chooser);
 
 	g_signal_connect (GTK_COMBO_BOX (dialog->account_chooser), "changed",
@@ -247,12 +248,17 @@ new_chatroom_dialog_model_setup (EmpathyNewChatroomDialog *dialog)
 
 	/* Store/Model */
 	store = gtk_list_store_new (COL_COUNT,
-				    G_TYPE_STRING,       /* Image */
-				    G_TYPE_STRING,       /* Text */
-				    G_TYPE_STRING);      /* Room */
+				    G_TYPE_STRING,       /* Invite */
+				    G_TYPE_STRING,       /* Password */
+				    G_TYPE_STRING,       /* Name */
+				    G_TYPE_STRING,       /* Room */
+				    G_TYPE_STRING,       /* Member count */
+				    G_TYPE_STRING);      /* Tool tip */
 
 	dialog->model = GTK_TREE_MODEL (store);
 	gtk_tree_view_set_model (view, dialog->model);
+	gtk_tree_view_set_tooltip_column (view, COL_TOOL_TIP);
+	gtk_tree_view_set_search_column (view, COL_NAME);
 
 	/* Selection */
 	selection = gtk_tree_view_get_selection (view);
@@ -273,24 +279,57 @@ new_chatroom_dialog_model_add_columns (EmpathyNewChatroomDialog *dialog)
 	GtkTreeView       *view;
 	GtkTreeViewColumn *column;
 	GtkCellRenderer   *cell;
+        gint               width, height;
+
+	gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &width, &height);
 
 	view = GTK_TREE_VIEW (dialog->treeview);
-	gtk_tree_view_set_headers_visible (view, FALSE);
+
+	cell = gtk_cell_renderer_pixbuf_new ();
+	g_object_set (cell,
+		      "width", width,
+		      "height", height,
+		      "stock-size", GTK_ICON_SIZE_MENU,
+		      NULL);
+	column = gtk_tree_view_column_new_with_attributes (_(" "),
+		                                           cell,
+		                                           "stock-id", COL_INVITE_ONLY,
+		                                           NULL);
+	gtk_tree_view_append_column (view, column);
+
+	column = gtk_tree_view_column_new_with_attributes (_(" "),
+		                                           cell,
+		                                           "stock-id", COL_NEED_PASSWORD,
+		                                           NULL);
+	gtk_tree_view_append_column (view, column);
 
 	cell = gtk_cell_renderer_text_new ();
 	g_object_set (cell,
 		      "xpad", (guint) 4,
-		      "ypad", (guint) 1,
+		      "ypad", (guint) 2,
 		      "ellipsize", PANGO_ELLIPSIZE_END,
 		      NULL);
 
-	column = gtk_tree_view_column_new_with_attributes (_("Chat Rooms"),
+	column = gtk_tree_view_column_new_with_attributes (_("Chat Room"),
 		                                           cell,
 		                                           "text", COL_NAME,
 		                                           NULL);
 
 	gtk_tree_view_column_set_expand (column, TRUE);
 	gtk_tree_view_append_column (view, column);
+
+	cell = gtk_cell_renderer_text_new ();
+	g_object_set (cell,
+		      "xpad", (guint) 4,
+		      "ypad", (guint) 2,
+		      "ellipsize", PANGO_ELLIPSIZE_END,
+		      "alignment", PANGO_ALIGN_RIGHT,
+		      NULL);
+	column = gtk_tree_view_column_new_with_attributes (_("Members"),
+		                                           cell,
+		                                           "text", COL_MEMBERS,
+		                                           NULL);
+	gtk_tree_view_append_column (view, column);
 }
 
 static void
@@ -312,19 +351,15 @@ new_chatroom_dialog_update_widgets (EmpathyNewChatroomDialog *dialog)
 	/* hardcode here known protocols */
 	if (strcmp (protocol, "jabber") == 0) {
 		gtk_widget_set_sensitive (dialog->entry_server, TRUE);
-		gtk_widget_show (dialog->vbox_browse);
-
 	}
 	else if (strcmp (protocol, "local-xmpp") == 0) {
 		gtk_widget_set_sensitive (dialog->entry_server, FALSE);
-		gtk_widget_show (dialog->vbox_browse);		
 	}
 	else if (strcmp (protocol, "irc") == 0) {
 		gtk_widget_set_sensitive (dialog->entry_server, FALSE);
-		gtk_widget_show (dialog->vbox_browse);		
-	} else {
+	}
+	else {
 		gtk_widget_set_sensitive (dialog->entry_server, TRUE);
-		gtk_widget_show (dialog->vbox_browse);
 	}
 
 	room = gtk_entry_get_text (GTK_ENTRY (dialog->entry_room));
@@ -356,7 +391,7 @@ new_chatroom_dialog_account_changed_cb (GtkComboBox             *combobox,
 	account = empathy_account_chooser_get_account (account_chooser);
 	dialog->room_list = empathy_tp_roomlist_new (account);
 
-	if (dialog->room_list)	{
+	if (dialog->room_list) {
 		g_signal_connect (dialog->room_list, "destroy",
 				  G_CALLBACK (new_chatroom_dialog_roomlist_destroy_cb),
 				  dialog);
@@ -393,6 +428,8 @@ new_chatroom_dialog_new_room_cb (EmpathyTpRoomlist        *room_list,
 	GtkTreeSelection *selection;
 	GtkListStore     *store;
 	GtkTreeIter       iter;
+	gchar            *members;
+	gchar            *tool_tip;
 
 	DEBUG ("New chatroom listed: %s (%s)",
 		empathy_chatroom_get_name (chatroom),
@@ -402,11 +439,22 @@ new_chatroom_dialog_new_room_cb (EmpathyTpRoomlist        *room_list,
 	view = GTK_TREE_VIEW (dialog->treeview);
 	selection = gtk_tree_view_get_selection (view);
 	store = GTK_LIST_STORE (dialog->model);
+	members = g_strdup_printf ("%d", empathy_chatroom_get_members_count (chatroom));
+	tool_tip = g_strdup_printf ("<b>%s</b>\nInvite required: %s\nPassword required: %s\nMembers: %s", 
+			empathy_chatroom_get_name (chatroom),
+			empathy_chatroom_get_invite_only (chatroom) ? _("Yes") : _("No"),
+			empathy_chatroom_get_need_password (chatroom) ? _("Yes") : _("No"),
+			members
+			);
 
 	gtk_list_store_append (store, &iter);
 	gtk_list_store_set (store, &iter,
+			    COL_NEED_PASSWORD, (empathy_chatroom_get_need_password (chatroom) ? GTK_STOCK_DIALOG_AUTHENTICATION : NULL),
+			    COL_INVITE_ONLY, (empathy_chatroom_get_invite_only (chatroom) ? GTK_STOCK_INDEX : NULL),
 			    COL_NAME, empathy_chatroom_get_name (chatroom),
 			    COL_ROOM, empathy_chatroom_get_room (chatroom),
+			    COL_MEMBERS, members,
+			    COL_TOOL_TIP, tool_tip,
 			    -1);
 }
 
@@ -425,16 +473,6 @@ new_chatroom_dialog_listing_cb (EmpathyTpRoomlist        *room_list,
 	} else {
 		ephy_spinner_stop (EPHY_SPINNER (dialog->throbber));
 	}
-
-	/* Update the refresh toggle button */
-	g_signal_handlers_block_by_func (dialog->togglebutton_refresh,
-					 new_chatroom_dialog_togglebutton_refresh_toggled_cb,
-					 dialog);
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->togglebutton_refresh),
-				      listing);
-	g_signal_handlers_unblock_by_func (dialog->togglebutton_refresh,
-					   new_chatroom_dialog_togglebutton_refresh_toggled_cb,
-					   dialog);
 }
 
 static void
@@ -542,22 +580,35 @@ static void
 new_chatroom_dialog_entry_server_activate_cb (GtkWidget                *widget,
 					      EmpathyNewChatroomDialog  *dialog)
 {
-	new_chatroom_dialog_togglebutton_refresh_toggled_cb (dialog->togglebutton_refresh, 
-							     dialog);
+	new_chatroom_dialog_browse_start (dialog);
 }
 
 static void
-new_chatroom_dialog_togglebutton_refresh_toggled_cb (GtkWidget               *widget,
-						     EmpathyNewChatroomDialog *dialog)
+new_chatroom_dialog_expander_browse_activate_cb (GtkWidget               *widget,
+						 EmpathyNewChatroomDialog *dialog)
 {
-	gboolean toggled;
+	gboolean expanded;
 
-	toggled = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
-	
-	if (toggled) {
-		new_chatroom_dialog_browse_start (dialog);
-	} else {
+	expanded = gtk_expander_get_expanded (GTK_EXPANDER (widget));
+	if (expanded) {
 		new_chatroom_dialog_browse_stop (dialog);
+		gtk_window_set_resizable (GTK_WINDOW (dialog->window), FALSE);
+	} else {
+		new_chatroom_dialog_browse_start (dialog);
+		gtk_window_set_resizable (GTK_WINDOW (dialog->window), TRUE);
 	}
 }
 
+static gboolean
+new_chatroom_dialog_entry_server_focus_out_cb (GtkWidget               *widget,
+					       GdkEventFocus           *event,
+					       EmpathyNewChatroomDialog *dialog)
+{
+	gboolean expanded;
+
+	expanded = gtk_expander_get_expanded (GTK_EXPANDER (dialog->expander_browse));
+	if (expanded) {
+		new_chatroom_dialog_browse_start (dialog);
+	}
+	return FALSE;
+}
diff --git a/src/empathy-new-chatroom-dialog.ui b/src/empathy-new-chatroom-dialog.ui
index 04927be..ba7a326 100644
--- a/src/empathy-new-chatroom-dialog.ui
+++ b/src/empathy-new-chatroom-dialog.ui
@@ -4,28 +4,26 @@
   <object class="GtkDialog" id="new_chatroom_dialog">
     <property name="visible">True</property>
     <property name="border_width">5</property>
-    <property name="title" translatable="yes">Join New</property>
+    <property name="title" translatable="yes">Join Room</property>
     <property name="role">join_new_chatroom</property>
-    <property name="resizable">False</property>
     <property name="default_width">350</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox4">
         <property name="visible">True</property>
-        <property name="spacing">6</property>
         <child>
           <object class="GtkVBox" id="vbox_widgets">
             <property name="visible">True</property>
             <property name="border_width">5</property>
-            <property name="spacing">18</property>
+            <property name="spacing">5</property>
             <child>
               <object class="GtkTable" id="table_info">
                 <property name="visible">True</property>
                 <property name="n_rows">3</property>
                 <property name="n_columns">3</property>
-                <property name="column_spacing">6</property>
-                <property name="row_spacing">6</property>
+                <property name="column_spacing">5</property>
+                <property name="row_spacing">5</property>
                 <child>
                   <placeholder/>
                 </child>
@@ -38,30 +36,28 @@
                     <property name="can_focus">True</property>
                     <property name="tooltip-text" translatable="yes">Enter the room name to join here or click on one or more rooms in the list.</property>
                     <property name="activates_default">True</property>
-                    <property name="width_chars">32</property>
+                    <property name="width_chars">25</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">3</property>
                     <property name="top_attach">2</property>
                     <property name="bottom_attach">3</property>
-                    <property name="y_options"/>
+                    <property name="x_options">GTK_FILL</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkToggleButton" id="togglebutton_refresh">
+                  <object class="GtkLabel" id="label_room">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">Re_fresh</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">_Room:</property>
                     <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">entry_room</property>
                   </object>
                   <packing>
-                    <property name="left_attach">2</property>
-                    <property name="right_attach">3</property>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
@@ -73,23 +69,9 @@
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
+                    <property name="right_attach">3</property>
                     <property name="top_attach">1</property>
                     <property name="bottom_attach">2</property>
-                    <property name="y_options"/>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label_room">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Room:</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">entry_room</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
                     <property name="x_options">GTK_FILL</property>
                     <property name="y_options"/>
                   </packing>
@@ -121,50 +103,18 @@
                   </packing>
                 </child>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+              </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="vbox_browse">
+              <object class="GtkExpander" id="expander_browse">
                 <property name="visible">True</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkHBox" id="hbox_status">
-                    <property name="visible">True</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkHBox" id="hbox35">
-                        <property name="visible">True</property>
-                        <property name="spacing">3</property>
-                        <child>
-                          <object class="GtkImage" id="image_status">
-                            <property name="visible">True</property>
-                            <property name="icon_size">2</property>
-                            <property name="icon_name">gtk-find</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label_status">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Browse:</property>
-                            <property name="wrap">True</property>
-                          </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                  </object>
-                </child>
+                <property name="can_focus">True</property>
                 <child>
                   <object class="GtkScrolledWindow" id="scrolledwindow2">
+                    <property name="width_request">350</property>
                     <property name="height_request">150</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -175,14 +125,17 @@
                       <object class="GtkTreeView" id="treeview">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="tooltip-text" translatable="yes">This list represents all chat rooms hosted on the server you have entered.</property>
-                        <property name="headers_visible">False</property>
+                        <property name="search_column">0</property>
+                        <property name="show_expanders">False</property>
                       </object>
                     </child>
                   </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel" id="label1">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Room List</property>
+                  </object>
                 </child>
               </object>
               <packing>
@@ -191,8 +144,6 @@
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -205,7 +156,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label">gtk-close</property>
+                <property name="label">gtk-cancel</property>
                 <property name="use_stock">True</property>
               </object>
             </child>
@@ -228,7 +179,7 @@
                         <child>
                           <object class="GtkImage" id="image4">
                             <property name="visible">True</property>
-                            <property name="stock">gtk-execute</property>
+                            <property name="stock">gtk-jump-to</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -238,7 +189,7 @@
                         <child>
                           <object class="GtkLabel" id="label79">
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes">Join</property>
+                            <property name="label" translatable="yes">_Join</property>
                             <property name="use_underline">True</property>
                           </object>
                           <packing>
@@ -265,7 +216,6 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="0">togglebutton_refresh</action-widget>
       <action-widget response="-7">button_cancel</action-widget>
       <action-widget response="-5">button_join</action-widget>
     </action-widgets>
