diff --git a/libempathy/empathy-chatroom.c b/libempathy/empathy-chatroom.c
index cb39455..e955ea3 100644
--- a/libempathy/empathy-chatroom.c
+++ b/libempathy/empathy-chatroom.c
@@ -40,6 +40,10 @@ typedef struct {
    * as it's not created in the dispatcher. At some point it should be
    * automatically created by tp-glib */
   TpChannel *tp_channel;
+  gchar *subject;
+  guint members_count;
+  gboolean invite_only;
+  gboolean need_password;
 } EmpathyChatroomPriv;
 
 
@@ -60,7 +64,11 @@ enum {
 	PROP_NAME,
 	PROP_AUTO_CONNECT,
   PROP_FAVORITE,
-  PROP_TP_CHANNEL
+  PROP_TP_CHANNEL,
+  PROP_SUBJECT,
+  PROP_MEMBERS_COUNT,
+  PROP_NEED_PASSWORD,
+  PROP_INVITE_ONLY
 };
 
 G_DEFINE_TYPE (EmpathyChatroom, empathy_chatroom, G_TYPE_OBJECT);
@@ -131,6 +139,56 @@ empathy_chatroom_class_init (EmpathyChatroomClass *klass)
         G_PARAM_STATIC_NICK |
         G_PARAM_STATIC_BLURB));
 
+  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));
 }
 
@@ -192,6 +250,18 @@ chatroom_get_property (GObject    *object,
   case PROP_TP_CHANNEL:
     g_value_set_object (value, priv->tp_channel);
     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;
@@ -241,6 +311,22 @@ chatroom_set_property (GObject      *object,
 
     priv->tp_channel = g_value_dup_object (value);
     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;
@@ -424,3 +510,116 @@ empathy_chatroom_equal (gconstpointer v1,
 	return empathy_account_equal (account_a, account_b) && !tp_strdiff (room_a,
       room_b);
 }
+
+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 a4eecc0..508a7c2 100644
--- a/libempathy/empathy-chatroom.h
+++ b/libempathy/empathy-chatroom.h
@@ -67,6 +67,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);
 
diff --git a/libempathy/empathy-tp-roomlist.c b/libempathy/empathy-tp-roomlist.c
index e73f6cb..28136d5 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));
@@ -425,7 +453,7 @@ empathy_tp_roomlist_is_listing (EmpathyTpRoomlist *list)
 }
 
 void
-empathy_tp_roomlist_start (EmpathyTpRoomlist *list)
+empathy_tp_roomlist_start (EmpathyTpRoomlist *list, tp_cli_channel_type_room_list_callback_for_list_rooms callback)
 {
 	EmpathyTpRoomlistPriv *priv = GET_PRIV (list);
 
@@ -433,7 +461,7 @@ empathy_tp_roomlist_start (EmpathyTpRoomlist *list)
 	g_return_if_fail (TP_IS_CHANNEL (priv->channel));
 
 	tp_cli_channel_type_room_list_call_list_rooms (priv->channel, -1,
-						       NULL, NULL, NULL, NULL);
+						       callback, NULL, NULL, NULL);
 }
 
 void
diff --git a/libempathy/empathy-tp-roomlist.h b/libempathy/empathy-tp-roomlist.h
index 9f45b7f..98c5a0e 100644
--- a/libempathy/empathy-tp-roomlist.h
+++ b/libempathy/empathy-tp-roomlist.h
@@ -51,7 +51,7 @@ struct _EmpathyTpRoomlistClass {
 GType              empathy_tp_roomlist_get_type   (void) G_GNUC_CONST;
 EmpathyTpRoomlist *empathy_tp_roomlist_new        (McAccount *account);
 gboolean           empathy_tp_roomlist_is_listing (EmpathyTpRoomlist *list);
-void               empathy_tp_roomlist_start      (EmpathyTpRoomlist *list);
+void               empathy_tp_roomlist_start      (EmpathyTpRoomlist *list, tp_cli_channel_type_room_list_callback_for_list_rooms callback);
 void               empathy_tp_roomlist_stop       (EmpathyTpRoomlist *list);
 
 G_END_DECLS
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index 49bfe3d..f86b62e 100644
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -178,6 +178,11 @@ static void     main_window_notify_compact_contact_list_cb     (EmpathyConf
 static void     main_window_notify_sort_criterium_cb           (EmpathyConf              *conf,
 								const gchar              *key,
 								EmpathyMainWindow        *window);
+static void     main_window_chatroom_join_cb                   (TpConnection *connection,
+								TpChannel *channel,
+								const GError *error,
+								gpointer user_data,
+								GObject *weak_object);
 
 static void
 main_window_flash_stop (EmpathyMainWindow *window)
@@ -738,13 +743,38 @@ main_window_favorite_chatroom_join (EmpathyChatroom *chatroom)
 						    TP_IFACE_CHANNEL_TYPE_TEXT,
 						    TP_HANDLE_TYPE_ROOM,
 						    room, TRUE,
-						    NULL, NULL, NULL, NULL);
+						    main_window_chatroom_join_cb,
+						    NULL, NULL, NULL);
 		g_object_unref (connection);
 	}
 	g_object_unref (mc);
 }
 
 static void
+main_window_chatroom_join_cb (TpConnection *connection,
+			      TpChannel *channel,
+			      const GError *error,
+			      gpointer window,
+			      GObject *weak_object)
+{
+	if (error) {
+		GtkWidget *dialog;
+		
+		dialog = gtk_message_dialog_new (NULL, 0,
+						 GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
+						 _("Unable to join chatroom"));
+		gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+							  "Error: %s", error->message);
+
+		g_signal_connect (dialog, "response",
+				  G_CALLBACK (gtk_widget_destroy),
+				  NULL);
+		gtk_window_present (GTK_WINDOW (dialog));
+	}
+
+}
+
+static void
 main_window_chat_quit_cb (GtkWidget         *widget,
 			  EmpathyMainWindow *window)
 {
diff --git a/src/empathy-main-window.glade b/src/empathy-main-window.glade
index 737105d..cab4ceb 100644
--- a/src/empathy-main-window.glade
+++ b/src/empathy-main-window.glade
@@ -174,7 +174,7 @@
                     <child>
                       <widget class="GtkMenuItem" id="room_join_new">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Join _New...</property>
+                        <property name="label" translatable="yes">_Join...</property>
                         <property name="use_underline">True</property>
                       </widget>
                     </child>
diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c
index 4a1fb90..3ec3748 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,14 @@ typedef struct {
 } EmpathyNewChatroomDialog;
 
 enum {
+	COL_NEED_PASSWORD_PIX,
+	COL_INVITE_ONLY_PIX,
 	COL_NAME,
 	COL_ROOM,
+	COL_MEMBERS,
+	COL_TOOL_TIP,
+	COL_NEED_PASSWORD,
+	COL_INVITE_ONLY,
 	COL_COUNT
 };
 
@@ -111,7 +113,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 gboolean new_chatroom_dialog_entry_server_focus_out_cb       (GtkWidget               *widget,
+								     GdkEventFocus           *event,
+								     EmpathyNewChatroomDialog *dialog);
+static void     new_chatroom_dialog_expander_browse_activate_cb     (GtkWidget               *widget,
 								     EmpathyNewChatroomDialog *dialog);
 
 static EmpathyNewChatroomDialog *dialog_p = NULL;
@@ -142,11 +147,7 @@ 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,
+				       "expander_browse", &dialog->expander_browse,
 				       "treeview", &dialog->treeview,
 				       "button_join", &dialog->button_join,
 				       NULL);
@@ -158,8 +159,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 (glade);
@@ -183,8 +185,10 @@ empathy_new_chatroom_dialog_show (GtkWindow *parent)
 	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 ();
@@ -193,7 +197,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",
@@ -250,12 +254,19 @@ 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 */
+				    G_TYPE_BOOLEAN,      /* Invite */
+				    G_TYPE_BOOLEAN);     /* Password */
 
 	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);
@@ -276,24 +287,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_PIX,
+		                                           NULL);
+	gtk_tree_view_append_column (view, column);
+
+	column = gtk_tree_view_column_new_with_attributes (_(" "),
+		                                           cell,
+		                                           "stock-id", COL_NEED_PASSWORD_PIX,
+		                                           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
@@ -315,19 +359,19 @@ 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);
+		gtk_widget_show (dialog->expander_browse);
 
 	}
 	else if (strcmp (protocol, "local-xmpp") == 0) {
 		gtk_widget_set_sensitive (dialog->entry_server, FALSE);
-		gtk_widget_show (dialog->vbox_browse);		
+		gtk_widget_show (dialog->expander_browse);		
 	}
 	else if (strcmp (protocol, "irc") == 0) {
 		gtk_widget_set_sensitive (dialog->entry_server, FALSE);
-		gtk_widget_show (dialog->vbox_browse);		
+		gtk_widget_show (dialog->expander_browse);		
 	} else {
 		gtk_widget_set_sensitive (dialog->entry_server, TRUE);
-		gtk_widget_show (dialog->vbox_browse);
+		gtk_widget_show (dialog->expander_browse);
 	}
 
 	room = gtk_entry_get_text (GTK_ENTRY (dialog->entry_room));
@@ -392,24 +436,35 @@ new_chatroom_dialog_new_room_cb (EmpathyTpRoomlist        *room_list,
 				 EmpathyChatroom          *chatroom,
 				 EmpathyNewChatroomDialog *dialog)
 {
-	GtkTreeView      *view;
-	GtkTreeSelection *selection;
 	GtkListStore     *store;
 	GtkTreeIter       iter;
+	gchar            *members;
+	gchar            *tool_tip;
 
 	DEBUG ("New chatroom listed: %s (%s)",
 		empathy_chatroom_get_name (chatroom),
 		empathy_chatroom_get_room (chatroom));
 
 	/* Add to model */
-	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_PIX, (empathy_chatroom_get_need_password (chatroom) ? GTK_STOCK_DIALOG_AUTHENTICATION : NULL),
+			    COL_INVITE_ONLY_PIX, (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,
+			    COL_NEED_PASSWORD, empathy_chatroom_get_need_password (chatroom),
+			    COL_INVITE_ONLY, empathy_chatroom_get_invite_only (chatroom),
 			    -1);
 }
 
@@ -429,15 +484,6 @@ new_chatroom_dialog_listing_cb (EmpathyTpRoomlist        *room_list,
 		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
@@ -466,12 +512,16 @@ new_chatroom_dialog_model_selection_changed (GtkTreeSelection         *selection
 	GtkTreeIter   iter;
 	gchar        *room = NULL;
 	gchar        *server = NULL;
+	gboolean      invite_only = FALSE;
 
 	if (!gtk_tree_selection_get_selected (selection, &model, &iter)) {
 		return;
 	}
 
-	gtk_tree_model_get (model, &iter, COL_ROOM, &room, -1);
+	gtk_tree_model_get (model, &iter,
+		COL_ROOM, &room,
+		COL_INVITE_ONLY, &invite_only,
+		-1);
 	server = strstr (room, "@");
 	if (server) {
 		*server = '\0';
@@ -481,6 +531,11 @@ new_chatroom_dialog_model_selection_changed (GtkTreeSelection         *selection
 	gtk_entry_set_text (GTK_ENTRY (dialog->entry_server), server ? server : "");
 	gtk_entry_set_text (GTK_ENTRY (dialog->entry_room), room ? room : "");
 
+	if (invite_only)
+		gtk_widget_set_sensitive (dialog->button_join, FALSE);
+	else
+		gtk_widget_set_sensitive (dialog->button_join, TRUE);
+
 	g_free (room);
 }
 
@@ -536,11 +591,34 @@ new_chatroom_dialog_entry_changed_cb (GtkWidget                *entry,
 }
 
 static void
+new_chatroom_dialog_roomlist_start_cb (TpChannel *proxy,
+                                       const GError *error,
+                                       gpointer user_data,
+                                       GObject *weak_object)
+{
+	g_print("CALLBACK");
+	if (error) {
+		GtkWidget *dialog;
+		
+		dialog = gtk_message_dialog_new (NULL, 0,
+						 GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
+						 _("Unable to list chatrooms"));
+		gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+							  "Error: %s", error->message);
+
+		g_signal_connect (dialog, "response",
+				  G_CALLBACK (gtk_widget_destroy),
+				  NULL);
+		gtk_window_present (GTK_WINDOW (dialog));
+	}
+}
+
+static void
 new_chatroom_dialog_browse_start (EmpathyNewChatroomDialog *dialog)
 {
 	new_chatroom_dialog_model_clear (dialog);
 	if (dialog->room_list) {
-		empathy_tp_roomlist_start (dialog->room_list);
+		empathy_tp_roomlist_start (dialog->room_list, new_chatroom_dialog_roomlist_start_cb);
 	}
 }
 
@@ -556,22 +634,32 @@ 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 = gtk_expander_get_expanded (GTK_EXPANDER (widget));
 
-	toggled = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
-	
-	if (toggled) {
-		new_chatroom_dialog_browse_start (dialog);
-	} else {
+	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 = 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.glade b/src/empathy-new-chatroom-dialog.glade
index 98984f7..43813b8 100644
--- a/src/empathy-new-chatroom-dialog.glade
+++ b/src/empathy-new-chatroom-dialog.glade
@@ -5,28 +5,26 @@
   <widget 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">
       <widget class="GtkVBox" id="dialog-vbox4">
         <property name="visible">True</property>
-        <property name="spacing">6</property>
         <child>
           <widget 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>
               <widget 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>
@@ -39,31 +37,28 @@
                     <property name="can_focus">True</property>
                     <property name="tooltip" 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>
                   </widget>
                   <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>
+                    <property name="x_options">GTK_FILL</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkToggleButton" id="togglebutton_refresh">
+                  <widget 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="response_id">0</property>
+                    <property name="mnemonic_widget">entry_room</property>
                   </widget>
                   <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"></property>
                   </packing>
                 </child>
                 <child>
@@ -75,23 +70,9 @@
                   </widget>
                   <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"></property>
-                  </packing>
-                </child>
-                <child>
-                  <widget 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>
-                  </widget>
-                  <packing>
-                    <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
                     <property name="x_options">GTK_FILL</property>
                     <property name="y_options"></property>
                   </packing>
@@ -123,50 +104,18 @@
                   </packing>
                 </child>
               </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+              </packing>
             </child>
             <child>
-              <widget class="GtkVBox" id="vbox_browse">
+              <widget class="GtkExpander" id="expander_browse">
                 <property name="visible">True</property>
-                <property name="spacing">6</property>
-                <child>
-                  <widget class="GtkHBox" id="hbox_status">
-                    <property name="visible">True</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <widget class="GtkHBox" id="hbox35">
-                        <property name="visible">True</property>
-                        <property name="spacing">3</property>
-                        <child>
-                          <widget class="GtkImage" id="image_status">
-                            <property name="visible">True</property>
-                            <property name="icon_size">2</property>
-                            <property name="icon_name">gtk-find</property>
-                          </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget 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>
-                          </widget>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                  </widget>
-                </child>
+                <property name="can_focus">True</property>
                 <child>
                   <widget 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>
@@ -177,13 +126,19 @@
                       <widget class="GtkTreeView" id="treeview">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="tooltip" 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>
                       </widget>
                     </child>
                   </widget>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="label1">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Room List</property>
+                  </widget>
                   <packing>
-                    <property name="position">1</property>
+                    <property name="type">label_item</property>
                   </packing>
                 </child>
               </widget>
@@ -193,8 +148,6 @@
             </child>
           </widget>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -207,7 +160,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>
                 <property name="response_id">-7</property>
               </widget>
@@ -232,7 +185,7 @@
                         <child>
                           <widget class="GtkImage" id="image4">
                             <property name="visible">True</property>
-                            <property name="stock">gtk-execute</property>
+                            <property name="stock">gtk-jump-to</property>
                           </widget>
                           <packing>
                             <property name="expand">False</property>
@@ -242,7 +195,7 @@
                         <child>
                           <widget 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>
                           </widget>
                           <packing>
