Get the basic mail browser window working. No message contents yet.

svn path=/branches/kill-bonobo/; revision=36946

9 files changed, 474 insertions, 73 deletions

diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c
index 9334a82aff..04ea6e1208 100644
--- a/mail/e-mail-browser.c
+++ b/mail/e-mail-browser.c
@@ -24,6 +24,9 @@
 #include <glib/gi18n.h>
 #include <camel/camel-folder.h>
 
+#include "e-util/e-util.h"
+#include "e-util/gconf-bridge.h"
+
 #include "mail/e-mail-reader.h"
 #include "mail/e-mail-shell-module.h"
 #include "mail/em-folder-tree-model.h"
@@ -34,10 +37,18 @@
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_MAIL_BROWSER, EMailBrowserPrivate))
 
+#define MAIL_BROWSER_GCONF_PREFIX "/apps/evolution/mail/mail_browser"
+
 struct _EMailBrowserPrivate {
 	GtkUIManager *ui_manager;
 	EShellModule *shell_module;
 	GtkActionGroup *action_group;
+	EMFormatHTMLDisplay *html_display;
+
+	GtkWidget *main_menu;
+	GtkWidget *main_toolbar;
+	GtkWidget *message_list;
+	GtkWidget *statusbar;
 };
 
 enum {
@@ -48,6 +59,132 @@ enum {
 
 static gpointer parent_class;
 
+/* This is too trivial to put in a file.
+ * It gets merged with the EMailReader UI. */
+static const gchar *ui =
+"<ui>"
+"  <menubar name='main-menu'>"
+"    <menu action='file-menu'>"
+"      <placeholder name='file-actions'/>"
+"      <placeholder name='print-actions'/>"
+"      <separator/>"
+"      <menuitem action='close'/>"
+"    </menu>"
+"  </menubar>"
+"</ui>";
+
+static void
+action_close_cb (GtkAction *action,
+                 EMailBrowser *browser)
+{
+	gtk_widget_destroy (GTK_WIDGET (browser));
+}
+
+static GtkActionEntry mail_browser_entries[] = {
+
+	{ "close",
+	  GTK_STOCK_CLOSE,
+	  NULL,
+	  NULL,
+	  N_("Close this window"),
+	  G_CALLBACK (action_close_cb) },
+
+	/*** Menus ***/
+
+	{ "file-menu",
+	  NULL,
+	  N_("_File"),
+	  NULL,
+	  NULL,
+	  NULL },
+
+	{ "edit-menu",
+	  NULL,
+	  N_("_Edit"),
+	  NULL,
+	  NULL,
+	  NULL },
+
+	{ "view-menu",
+	  NULL,
+	  N_("_View"),
+	  NULL,
+	  NULL,
+	  NULL }
+};
+
+static void
+mail_browser_menu_item_select_cb (EMailBrowser *browser,
+                                  GtkWidget *menu_item)
+{
+	GtkAction *action;
+	GtkStatusbar *statusbar;
+	gchar *tooltip = NULL;
+	guint context_id;
+	gpointer data;
+
+	action = g_object_get_data (G_OBJECT (menu_item), "action");
+	g_return_if_fail (GTK_IS_ACTION (action));
+
+	data = g_object_get_data (G_OBJECT (menu_item), "context-id");
+	context_id = GPOINTER_TO_UINT (data);
+
+	g_object_get (action, "tooltip", &tooltip, NULL);
+
+	if (tooltip == NULL)
+		return;
+
+	statusbar = GTK_STATUSBAR (browser->priv->statusbar);
+	gtk_statusbar_push (statusbar, context_id, tooltip);
+}
+
+static void
+mail_browser_menu_item_deselect_cb (EMailBrowser *browser,
+                                    GtkWidget *menu_item)
+{
+	GtkStatusbar *statusbar;
+	guint context_id;
+	gpointer data;
+
+	data = g_object_get_data (G_OBJECT (menu_item), "context-id");
+	context_id = GPOINTER_TO_UINT (data);
+
+	statusbar = GTK_STATUSBAR (browser->priv->statusbar);
+	gtk_statusbar_pop (statusbar, context_id);
+}
+
+static void
+mail_browser_connect_proxy_cb (EMailBrowser *browser,
+                               GtkAction *action,
+                               GtkWidget *proxy)
+{
+	GtkStatusbar *statusbar;
+	guint context_id;
+
+	if (!GTK_IS_MENU_ITEM (proxy))
+		return;
+
+	statusbar = GTK_STATUSBAR (browser->priv->statusbar);
+	context_id = gtk_statusbar_get_context_id (statusbar, G_STRFUNC);
+
+	g_object_set_data_full (
+		G_OBJECT (proxy),
+		"action", g_object_ref (action),
+		(GDestroyNotify) g_object_unref);
+
+	g_object_set_data (
+		G_OBJECT (proxy), "context-id",
+		GUINT_TO_POINTER (context_id));
+
+	g_signal_connect_swapped (
+		proxy, "select",
+		G_CALLBACK (mail_browser_menu_item_select_cb), browser);
+
+	g_signal_connect_swapped (
+		proxy, "deselect",
+		G_CALLBACK (mail_browser_menu_item_deselect_cb), browser);
+}
+
 static void
 mail_browser_set_shell_module (EMailBrowser *browser,
                                EShellModule *shell_module)
@@ -119,6 +256,31 @@ mail_browser_dispose (GObject *object)
 		priv->action_group = NULL;
 	}
 
+	if (priv->html_display != NULL) {
+		g_object_unref (priv->html_display);
+		priv->html_display = NULL;
+	}
+
+	if (priv->main_menu != NULL) {
+		g_object_unref (priv->main_menu);
+		priv->main_menu = NULL;
+	}
+
+	if (priv->main_toolbar != NULL) {
+		g_object_unref (priv->main_toolbar);
+		priv->main_toolbar = NULL;
+	}
+
+	if (priv->message_list != NULL) {
+		g_object_unref (priv->message_list);
+		priv->message_list = NULL;
+	}
+
+	if (priv->statusbar != NULL) {
+		g_object_unref (priv->statusbar);
+		priv->statusbar = NULL;
+	}
+
 	/* Chain up to parent's dispose() method. */
 	G_OBJECT_CLASS (parent_class)->dispose (object);
 }
@@ -126,6 +288,75 @@ mail_browser_dispose (GObject *object)
 static void
 mail_browser_constructed (GObject *object)
 {
+	EMailBrowserPrivate *priv;
+	EMailReader *reader;
+	GtkAccelGroup *accel_group;
+	GtkActionGroup *action_group;
+	GtkUIManager *ui_manager;
+	GtkWidget *container;
+	GtkWidget *widget;
+
+	priv = E_MAIL_BROWSER_GET_PRIVATE (object);
+
+	reader = E_MAIL_READER (object);
+	action_group = priv->action_group;
+	ui_manager = priv->ui_manager;
+
+	e_mail_reader_init (reader);
+
+	gtk_action_group_add_actions (
+		action_group, mail_browser_entries,
+		G_N_ELEMENTS (mail_browser_entries), object);
+	gtk_ui_manager_insert_action_group (ui_manager, action_group, 0);
+
+	e_load_ui_definition (ui_manager, E_MAIL_READER_UI_DEFINITION);
+	gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, NULL);
+
+	accel_group = gtk_ui_manager_get_accel_group (ui_manager);
+	gtk_window_add_accel_group (GTK_WINDOW (object), accel_group);
+
+	g_signal_connect_swapped (
+		ui_manager, "connect-proxy",
+		G_CALLBACK (mail_browser_connect_proxy_cb), object);
+
+	/* Construct window widgets. */
+
+	widget = gtk_vbox_new (FALSE, 0);
+	gtk_container_add (GTK_CONTAINER (object), widget);
+	gtk_widget_show (widget);
+
+	container = widget;
+
+	/* Create the status bar before connecting proxy widgets. */
+	widget = gtk_statusbar_new ();
+	gtk_box_pack_end (GTK_BOX (container), widget, FALSE, FALSE, 0);
+	priv->statusbar = g_object_ref (widget);
+	gtk_widget_show (widget);
+
+	widget = gtk_ui_manager_get_widget (ui_manager, "/main-menu");
+	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
+	priv->main_menu = g_object_ref (widget);
+	gtk_widget_show (widget);
+
+	widget = gtk_ui_manager_get_widget (ui_manager, "/main-toolbar");
+	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
+	priv->main_toolbar = g_object_ref (widget);
+	gtk_widget_show (widget);
+
+	widget = gtk_scrolled_window_new (NULL, NULL);
+	gtk_scrolled_window_set_policy (
+		GTK_SCROLLED_WINDOW (widget),
+		GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+	gtk_scrolled_window_set_shadow_type (
+		GTK_SCROLLED_WINDOW (widget), GTK_SHADOW_IN);
+	gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
+	gtk_widget_show (widget);
+
+	container = widget;
+
+	widget = GTK_WIDGET (((EMFormatHTML *) priv->html_display)->html);
+	gtk_container_add (GTK_CONTAINER (container), widget);
+	gtk_widget_show (widget);
 }
 
 static GtkActionGroup *
@@ -138,11 +369,6 @@ mail_browser_get_action_group (EMailReader *reader)
 	return priv->action_group;
 }
 
-static EMFormatHTMLDisplay *
-mail_browser_get_display (EMailReader *reader)
-{
-}
-
 static CamelFolder *
 mail_browser_get_folder (EMailReader *reader)
 {
@@ -158,9 +384,24 @@ mail_browser_get_hide_deleted (EMailReader *reader)
 {
 }
 
+static EMFormatHTMLDisplay *
+mail_browser_get_html_display (EMailReader *reader)
+{
+	EMailBrowserPrivate *priv;
+
+	priv = E_MAIL_BROWSER_GET_PRIVATE (reader);
+
+	return priv->html_display;
+}
+
 static MessageList *
 mail_browser_get_message_list (EMailReader *reader)
 {
+	EMailBrowserPrivate *priv;
+
+	priv = E_MAIL_BROWSER_GET_PRIVATE (reader);
+
+	return MESSAGE_LIST (priv->message_list);
 }
 
 static EMFolderTreeModel *
@@ -211,10 +452,10 @@ static void
 mail_browser_iface_init (EMailReaderIface *iface)
 {
 	iface->get_action_group = mail_browser_get_action_group;
-	iface->get_display = mail_browser_get_display;
 	iface->get_folder = mail_browser_get_folder;
 	iface->get_folder_uri = mail_browser_get_folder_uri;
 	iface->get_hide_deleted = mail_browser_get_hide_deleted;
+	iface->get_html_display = mail_browser_get_html_display;
 	iface->get_message_list = mail_browser_get_message_list;
 	iface->get_tree_model = mail_browser_get_tree_model;
 	iface->get_window = mail_browser_get_window;
@@ -223,10 +464,24 @@ mail_browser_iface_init (EMailReaderIface *iface)
 static void
 mail_browser_init (EMailBrowser *browser)
 {
+	GConfBridge *bridge;
+	const gchar *prefix;
+
 	browser->priv = E_MAIL_BROWSER_GET_PRIVATE (browser);
 
 	browser->priv->ui_manager = gtk_ui_manager_new ();
 	browser->priv->action_group = gtk_action_group_new ("mail-browser");
+	browser->priv->html_display = em_format_html_display_new ();
+
+	/* The message list is a widget, but it is not shown in the browser.
+	 * Unfortunately, the widget is inseparable from its model, and the
+	 * model is all we need. */
+	browser->priv->message_list = message_list_new ();
+	g_object_ref_sink (browser->priv->message_list);
+
+	bridge = gconf_bridge_get ();
+	prefix = "/apps/evolution/mail/mail_browser";
+	gconf_bridge_bind_window_size (bridge, prefix, GTK_WINDOW (browser));
 }
 
 GType
@@ -258,7 +513,7 @@ e_mail_browser_get_type (void)
 			GTK_TYPE_WINDOW, "EMailBrowser", &type_info, 0);
 
 		g_type_add_interface_static (
-			type, E_TYPE_MAIL_BROWSER, &iface_info);
+			type, E_TYPE_MAIL_READER, &iface_info);
 	}
 
 	return type;
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index 112e8e9a80..702bf624f3 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -80,13 +80,13 @@ static void
 action_mail_caret_mode_cb (GtkToggleAction *action,
                            EMailReader *reader)
 {
-	EMFormatHTMLDisplay *display;
+	EMFormatHTMLDisplay *html_display;
 	gboolean active;
 
-	display = e_mail_reader_get_display (reader);
 	active = gtk_toggle_action_get_active (action);
+	html_display = e_mail_reader_get_html_display (reader);
 
-	em_format_html_display_set_caret_mode (display, active);
+	em_format_html_display_set_caret_mode (html_display, active);
 }
 
 static void
@@ -109,11 +109,11 @@ static void
 action_mail_clipboard_copy_cb (GtkAction *action,
                                EMailReader *reader)
 {
-	EMFormatHTMLDisplay *display;
+	EMFormatHTMLDisplay *html_display;
 	GtkHTML *html;
 
-	display = e_mail_reader_get_display (reader);
-	html = ((EMFormatHTML *) display)->html;
+	html_display = e_mail_reader_get_html_display (reader);
+	html = ((EMFormatHTML *) html_display)->html;
 
 	gtk_html_copy (html);
 }
@@ -246,14 +246,14 @@ static void
 action_mail_flag_clear_cb (GtkAction *action,
                            EMailReader *reader)
 {
-	EMFormatHTMLDisplay *display;
+	EMFormatHTMLDisplay *html_display;
 	MessageList *message_list;
 	CamelFolder *folder;
 	GtkWindow *window;
 	GPtrArray *uids;
 
-	display = e_mail_reader_get_display (reader);
 	folder = e_mail_reader_get_folder (reader);
+	html_display = e_mail_reader_get_html_display (reader);
 	message_list = e_mail_reader_get_message_list (reader);
 	window = e_mail_reader_get_window (reader);
 
@@ -261,21 +261,21 @@ action_mail_flag_clear_cb (GtkAction *action,
 
 	em_utils_flag_for_followup_clear (window, folder, uids);
 
-	em_format_redraw ((EMFormat *) display);
+	em_format_redraw ((EMFormat *) html_display);
 }
 
 static void
 action_mail_flag_completed_cb (GtkAction *action,
                                EMailReader *reader)
 {
-	EMFormatHTMLDisplay *display;
+	EMFormatHTMLDisplay *html_display;
 	MessageList *message_list;
 	CamelFolder *folder;
 	GtkWindow *window;
 	GPtrArray *uids;
 
-	display = e_mail_reader_get_display (reader);
 	folder = e_mail_reader_get_folder (reader);
+	html_display = e_mail_reader_get_html_display (reader);
 	message_list = e_mail_reader_get_message_list (reader);
 	window = e_mail_reader_get_window (reader);
 
@@ -283,7 +283,7 @@ action_mail_flag_completed_cb (GtkAction *action,
 
 	em_utils_flag_for_followup_completed (window, folder, uids);
 
-	em_format_redraw ((EMFormat *) display);
+	em_format_redraw ((EMFormat *) html_display);
 }
 
 static void
@@ -400,11 +400,11 @@ static void
 action_mail_load_images_cb (GtkAction *action,
                             EMailReader *reader)
 {
-	EMFormatHTMLDisplay *display;
+	EMFormatHTMLDisplay *html_display;
 
-	display = e_mail_reader_get_display (reader);
+	html_display = e_mail_reader_get_html_display (reader);
 
-	em_format_html_load_http ((EMFormatHTML *) display);
+	em_format_html_load_http ((EMFormatHTML *) html_display);
 }
 
 static void
@@ -898,33 +898,33 @@ static void
 action_mail_zoom_100_cb (GtkAction *action,
                          EMailReader *reader)
 {
-	EMFormatHTMLDisplay *display;
+	EMFormatHTMLDisplay *html_display;
 
-	display = e_mail_reader_get_display (reader);
+	html_display = e_mail_reader_get_html_display (reader);
 
-	em_format_html_display_zoom_reset (display);
+	em_format_html_display_zoom_reset (html_display);
 }
 
 static void
 action_mail_zoom_in_cb (GtkAction *action,
                         EMailReader *reader)
 {
-	EMFormatHTMLDisplay *display;
+	EMFormatHTMLDisplay *html_display;
 
-	display = e_mail_reader_get_display (reader);
+	html_display = e_mail_reader_get_html_display (reader);
 
-	em_format_html_display_zoom_in (display);
+	em_format_html_display_zoom_in (html_display);
 }
 
 static void
 action_mail_zoom_out_cb (GtkAction *action,
                          EMailReader *reader)
 {
-	EMFormatHTMLDisplay *display;
+	EMFormatHTMLDisplay *html_display;
 
-	display = e_mail_reader_get_display (reader);
+	html_display = e_mail_reader_get_html_display (reader);
 
-	em_format_html_display_zoom_out (display);
+	em_format_html_display_zoom_out (html_display);
 }
 
 static GtkActionEntry mail_reader_entries[] = {
@@ -1548,19 +1548,6 @@ e_mail_reader_get_action_group (EMailReader *reader)
 	return iface->get_action_group (reader);
 }
 
-EMFormatHTMLDisplay *
-e_mail_reader_get_display (EMailReader *reader)
-{
-	EMailReaderIface *iface;
-
-	g_return_val_if_fail (E_IS_MAIL_READER (reader), NULL);
-
-	iface = E_MAIL_READER_GET_IFACE (reader);
-	g_return_val_if_fail (iface->get_display != NULL, NULL);
-
-	return iface->get_display (reader);
-}
-
 CamelFolder *
 e_mail_reader_get_folder (EMailReader *reader)
 {
@@ -1600,6 +1587,19 @@ e_mail_reader_get_hide_deleted (EMailReader *reader)
 	return iface->get_hide_deleted (reader);
 }
 
+EMFormatHTMLDisplay *
+e_mail_reader_get_html_display (EMailReader *reader)
+{
+	EMailReaderIface *iface;
+
+	g_return_val_if_fail (E_IS_MAIL_READER (reader), NULL);
+
+	iface = E_MAIL_READER_GET_IFACE (reader);
+	g_return_val_if_fail (iface->get_html_display != NULL, NULL);
+
+	return iface->get_html_display (reader);
+}
+
 MessageList *
 e_mail_reader_get_message_list (EMailReader *reader)
 {
diff --git a/mail/e-mail-reader.h b/mail/e-mail-reader.h
index 8e14c52c60..2857192fc4 100644
--- a/mail/e-mail-reader.h
+++ b/mail/e-mail-reader.h
@@ -42,6 +42,9 @@
 	(G_TYPE_INSTANCE_GET_INTERFACE \
 	((obj), E_TYPE_MAIL_READER, EMailReaderIface))
 
+/* Basename of the UI definition file. */
+#define E_MAIL_READER_UI_DEFINITION	"evolution-mail-reader.ui"
+
 G_BEGIN_DECLS
 
 typedef struct _EMailReader EMailReader;
@@ -53,11 +56,11 @@ struct _EMailReaderIface {
 	/* XXX This is getting kinda bloated.  Try to reduce. */
 	GtkActionGroup *
 			(*get_action_group)	(EMailReader *reader);
-	EMFormatHTMLDisplay *
-			(*get_display)		(EMailReader *reader);
 	CamelFolder *	(*get_folder)		(EMailReader *reader);
 	const gchar *	(*get_folder_uri)	(EMailReader *reader);
 	gboolean	(*get_hide_deleted)	(EMailReader *reader);
+	EMFormatHTMLDisplay *
+			(*get_html_display)	(EMailReader *reader);
 	MessageList *	(*get_message_list)	(EMailReader *reader);
 	EShellSettings *(*get_shell_settings)	(EMailReader *reader);
 	EMFolderTreeModel *
@@ -69,11 +72,11 @@ GType		e_mail_reader_get_type		(void);
 void		e_mail_reader_init		(EMailReader *reader);
 GtkActionGroup *
 		e_mail_reader_get_action_group	(EMailReader *reader);
-EMFormatHTMLDisplay *
-		e_mail_reader_get_display	(EMailReader *reader);
 CamelFolder *	e_mail_reader_get_folder	(EMailReader *reader);
 const gchar *	e_mail_reader_get_folder_uri	(EMailReader *reader);
 gboolean	e_mail_reader_get_hide_deleted	(EMailReader *reader);
+EMFormatHTMLDisplay *
+		e_mail_reader_get_html_display	(EMailReader *reader);
 MessageList *	e_mail_reader_get_message_list	(EMailReader *reader);
 EShellSettings *e_mail_reader_get_shell_settings(EMailReader *reader);
 EMFolderTreeModel *
diff --git a/mail/e-mail-shell-content.c b/mail/e-mail-shell-content.c
index 271b8b2635..ebde02755e 100644
--- a/mail/e-mail-shell-content.c
+++ b/mail/e-mail-shell-content.c
@@ -376,16 +376,6 @@ mail_shell_content_get_action_group (EMailReader *reader)
 	return e_shell_window_get_action_group (shell_window, "mail");
 }
 
-static EMFormatHTMLDisplay *
-mail_shell_content_get_display (EMailReader *reader)
-{
-	EMailShellContent *mail_shell_content;
-
-	mail_shell_content = E_MAIL_SHELL_CONTENT (reader);
-
-	return e_mail_shell_content_get_preview_format (mail_shell_content);
-}
-
 static CamelFolder *
 mail_shell_content_get_folder (EMailReader *reader)
 {
@@ -417,6 +407,16 @@ mail_shell_content_get_hide_deleted (EMailReader *reader)
 	return TRUE;
 }
 
+static EMFormatHTMLDisplay *
+mail_shell_content_get_html_display (EMailReader *reader)
+{
+	EMailShellContent *mail_shell_content;
+
+	mail_shell_content = E_MAIL_SHELL_CONTENT (reader);
+
+	return e_mail_shell_content_get_preview_format (mail_shell_content);
+}
+
 static MessageList *
 mail_shell_content_get_message_list (EMailReader *reader)
 {
@@ -502,10 +502,10 @@ static void
 mail_shell_content_iface_init (EMailReaderIface *iface)
 {
 	iface->get_action_group = mail_shell_content_get_action_group;
-	iface->get_display = mail_shell_content_get_display;
 	iface->get_folder = mail_shell_content_get_folder;
 	iface->get_folder_uri = mail_shell_content_get_folder_uri;
 	iface->get_hide_deleted = mail_shell_content_get_hide_deleted;
+	iface->get_html_display = mail_shell_content_get_html_display;
 	iface->get_message_list = mail_shell_content_get_message_list;
 	iface->get_tree_model = mail_shell_content_get_tree_model;
 	iface->get_window = mail_shell_content_get_window;
diff --git a/mail/e-mail-shell-module.c b/mail/e-mail-shell-module.c
index a96a22f024..aef48d2636 100644
--- a/mail/e-mail-shell-module.c
+++ b/mail/e-mail-shell-module.c
@@ -37,6 +37,7 @@
 #include "e-mail-shell-module-migrate.h"
 #include "e-mail-shell-module-settings.h"
 
+#include "e-mail-browser.h"
 #include "em-account-prefs.h"
 #include "em-composer-prefs.h"
 #include "em-composer-utils.h"
@@ -611,8 +612,14 @@ mail_shell_module_handle_email_uri_cb (gchar *uri,
 		else
 			em_utils_forward_messages (folder, uids, uri);
 
-	} else
-		/* FIXME Create a EMailBrowser */;
+	} else {
+		GtkWidget *browser;
+
+		/* XXX Should pass in the shell module. */
+		browser = e_mail_browser_new (mail_shell_module);
+		/* FIXME This is incomplete... */
+		gtk_widget_show (browser);
+	}
 
 exit:
 	camel_url_free (url);
diff --git a/mail/evolution-mail.schemas.in b/mail/evolution-mail.schemas.in
index fbebba87cb..246cc79439 100644
--- a/mail/evolution-mail.schemas.in
+++ b/mail/evolution-mail.schemas.in
@@ -730,29 +730,41 @@
       </locale>
     </schema>
 
-    <!-- Message Window -->
+    <!-- Mail Browser -->
 
     <schema>
-      <key>/schemas/apps/evolution/mail/message_window/width</key>
-      <applyto>/apps/evolution/mail/message_window/width</applyto>
+      <key>/schemas/apps/evolution/mail/mail_browser_width</key>
+      <applyto>/apps/evolution/mail/mail_browser_width</applyto>
       <owner>evolution-mail</owner>
       <type>int</type>
       <default>600</default>
       <locale name="C">
-         <short>Message Window default width</short>
-         <long>Default width of the message window.</long>
+         <short>Mail browser width</short>
+         <long>Default width of the mail browser window.</long>
       </locale>
     </schema>
 
     <schema>
-      <key>/schemas/apps/evolution/mail/message_window/height</key>
-      <applyto>/apps/evolution/mail/message_window/height</applyto>
+      <key>/schemas/apps/evolution/mail/mail_browser_height</key>
+      <applyto>/apps/evolution/mail/mail_browser_height</applyto>
       <owner>evolution-mail</owner>
       <type>int</type>
       <default>400</default>
       <locale name="C">
-         <short>Message Window default height</short>
-         <long>Default height of the message window.</long>
+         <short>Mail browser height</short>
+         <long>Default height of the mail browser window.</long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/evolution/mail/mail_browser_maximized</key>
+      <applyto>/apps/evolution/mail/mail_browser_maximized</applyto>
+      <owner>evolution-mail</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+        <short>Mail browser maximized</short>
+        <long>Default maximized state of the mail browser window.</long>
       </locale>
     </schema>
 
diff --git a/shell/e-shell-window-private.c b/shell/e-shell-window-private.c
index 58a1970bc7..a1027e437c 100644
--- a/shell/e-shell-window-private.c
+++ b/shell/e-shell-window-private.c
@@ -173,6 +173,7 @@ e_shell_window_private_init (EShellWindow *shell_window)
 {
 	EShellWindowPrivate *priv = shell_window->priv;
 	GHashTable *loaded_views;
+	GtkAccelGroup *accel_group;
 	GtkToolItem *item;
 	GtkWidget *container;
 	GtkWidget *widget;
@@ -202,9 +203,8 @@ e_shell_window_private_init (EShellWindow *shell_window)
 
 	e_shell_window_actions_init (shell_window);
 
-	gtk_window_add_accel_group (
-		GTK_WINDOW (shell_window),
-		gtk_ui_manager_get_accel_group (priv->ui_manager));
+	accel_group = gtk_ui_manager_get_accel_group (priv->ui_manager);
+	gtk_window_add_accel_group (GTK_WINDOW (shell_window), accel_group);
 
 	g_signal_connect_swapped (
 		priv->ui_manager, "connect-proxy",
diff --git a/ui/Makefile.am b/ui/Makefile.am
index a794a869fb..507b317f93 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -9,6 +9,7 @@ UI_FILES =					\
 	evolution-calendars.ui			\
 	evolution-contacts.ui			\
 	evolution-mail.ui			\
+	evolution-mail-reader.ui		\
 	evolution-memos.ui			\
 	evolution-shell.ui			\
 	evolution-tasks.ui
diff --git a/ui/evolution-mail-reader.ui b/ui/evolution-mail-reader.ui
new file mode 100644
index 0000000000..da6e2872d1
--- /dev/null
+++ b/ui/evolution-mail-reader.ui
@@ -0,0 +1,123 @@
+<ui>
+  <menubar name='main-menu'>
+    <menu action='file-menu'>
+      <placeholder name='file-actions'>
+        <menuitem action='mail-save-as'/>
+      </placeholder>
+      <placeholder name='print-actions'>
+        <menuitem action='mail-print-preview'/>
+        <menuitem action='mail-print'/>
+      </placeholder>
+    </menu>
+    <menu action='edit-menu'>
+      <placeholder name='edit-actions'>
+        <menuitem action='mail-clipboard-copy'/>
+        <separator/>
+        <menuitem action='mail-select-all'/>
+        <separator/>
+        <menuitem action='mail-delete'/>
+        <menuitem action='mail-undelete'/>
+        <separator/>
+        <menuitem action='mail-find'/>
+      </placeholder>
+    </menu>
+    <menu action='view-menu'>
+      <placeholder name='mail-message-list-actions'/>
+      <separator/>
+      <placeholder name='mail-message-view-actions'>
+        <menuitem action='mail-load-images'/>
+        <menuitem action='mail-show-all-headers'/>
+        <menuitem action='mail-caret-mode'/>
+        <menuitem action='mail-show-source'/>
+        <menu action='mail-zoom-menu'>
+          <menuitem action='mail-zoom-in'/>
+          <menuitem action='mail-zoom-out'/>
+          <menuitem action='mail-zoom-100'/>
+        </menu>
+        <separator/>
+        <menu action='mail-encoding-menu'/>
+      </placeholder>
+    </menu>
+    <placeholder name='custom-menus'>
+      <menu action='mail-message-menu'>
+        <menuitem action='mail-message-new'/>
+        <menuitem action='mail-message-post'/>
+        <menuitem action='mail-message-open'/>
+        <menuitem action='mail-message-edit'/>
+        <menuitem action='mail-add-sender'/>
+        <separator/>
+        <menu action='mail-goto-menu'>
+          <menuitem action='mail-next'/>
+          <menuitem action='mail-next-unread'/>
+          <menuitem action='mail-next-important'/>
+          <menuitem action='mail-next-thread'/>
+          <separator/>
+          <menuitem action='mail-previous'/>
+          <menuitem action='mail-previous-unread'/>
+          <menuitem action='mail-previous-important'/>
+        </menu>
+        <menuitem action='mail-reply-sender'/>
+        <menuitem action='mail-reply-list'/>
+        <menuitem action='mail-reply-all'/>
+        <menuitem action='mail-reply-post'/>
+        <menuitem action='mail-forward'/>
+        <menu action='mail-forward-as-menu'>
+          <menuitem action='mail-forward-attached'/>
+          <menuitem action='mail-forward-inline'/>
+          <menuitem action='mail-forward-quoted'/>
+          <separator/>
+          <menuitem action='mail-redirect'/>
+        </menu>
+        <separator/>
+        <menuitem action='mail-copy'/>
+        <menuitem action='mail-move'/>
+        <separator/>
+        <menu action='mail-mark-as-menu'>
+          <menuitem action="mail-mark-read"/>
+          <menuitem action="mail-mark-unread"/>
+          <separator/>
+          <menuitem action="mail-mark-important"/>
+          <menuitem action="mail-mark-unimportant"/>
+          <separator/>
+          <menuitem action="mail-mark-junk"/>
+          <menuitem action="mail-mark-notjunk"/>
+          <separator/>
+          <menuitem action="mail-flag-for-followup"/>
+          <menuitem action="mail-flag-clear"/>
+          <menuitem action="mail-flag-completed"/>
+        </menu>
+        <menuitem action='mail-filters-apply'/>
+        <menuitem action='mail-check-for-junk'/>
+        <separator/>
+        <menu action='mail-create-rule-menu'>
+          <menuitem action='mail-filter-on-subject'/>
+          <menuitem action='mail-filter-on-sender'/>
+          <menuitem action='mail-filter-on-recipients'/>
+          <menuitem action='mail-filter-on-mailing-list'/>
+          <separator/>
+          <menuitem action='mail-search-folder-from-subject'/>
+          <menuitem action='mail-search-folder-from-sender'/>
+          <menuitem action='mail-search-folder-from-recipients'/>
+          <menuitem action='mail-search-folder-from-mailing-list'/>
+        </menu>
+      </menu>
+    </placeholder>
+  </menubar>
+  <toolbar name='main-toolbar'>
+    <placeholder name='mail-toolbar-common'>
+      <toolitem action='mail-reply-sender'/>
+      <toolitem action='mail-reply-all'/>
+      <toolitem action='mail-forward'/>
+      <separator/>
+      <toolitem action='mail-print'/>
+      <toolitem action='mail-delete'/>
+      <toolitem action='mail-mark-junk'/>
+      <toolitem action='mail-mark-notjunk'/>
+    </placeholder>
+    <separator/>
+    <placeholder name='mail-toolbar-navigation'>
+      <toolitem action='mail-previous'/>
+      <toolitem action='mail-next'/>
+    </placeholder>
+  </toolbar>
+</ui>