* Fixes NB@63545
[modest] / src / maemo / modest-main-window.c
index 7202d4f..285a937 100644 (file)
 #include <gtk/gtktreeviewcolumn.h>
 #include <tny-account-store-view.h>
 #include <tny-simple-list.h>
+#include <tny-list.h>
+#include <tny-iterator.h>
 #include <tny-maemo-conic-device.h>
+#include <tny-error.h>
 #include "modest-hildon-includes.h"
 #include "modest-defs.h"
 #include <string.h>
-
+#include "widgets/modest-header-view-priv.h"
 #include "widgets/modest-main-window.h"
 #include "widgets/modest-msg-edit-window.h"
 #include "widgets/modest-account-view-window.h"
@@ -48,6 +51,7 @@
 #include "modest-main-window-ui-dimming.h"
 #include "modest-account-mgr.h"
 #include "modest-tny-account.h"
+#include "modest-tny-folder.h"
 #include "modest-conf.h"
 #include <modest-maemo-utils.h>
 #include "modest-tny-platform-factory.h"
 #include "modest-text-utils.h"
 #include "modest-ui-dimming-manager.h"
 #include "maemo/modest-osso-state-saving.h"
+#include "modest-text-utils.h"
+#include "modest-signal-mgr.h"
 
-#ifdef MODEST_HILDON_VERSION_0
+#ifdef MODEST_HAVE_HILDON0_WIDGETS
 #include <hildon-widgets/hildon-program.h>
 #else
 #include <hildon/hildon-program.h>
-#endif /*MODEST_HILDON_VERSION_0*/
+#endif /*MODEST_HAVE_HILDON0_WIDGETS*/
 
 #define MODEST_MAIN_WINDOW_ACTION_GROUP_ADDITIONS "ModestMainWindowActionAdditions"
 
 #define XALIGN 0.5
-#define YALIGN 0.5
+#define YALIGN 0.0
 #define XSPACE 1
 #define YSPACE 0
 
 /* 'private'/'protected' functions */
-static void modest_main_window_class_init    (ModestMainWindowClass *klass);
-static void modest_main_window_init          (ModestMainWindow *obj);
-static void modest_main_window_finalize      (GObject *obj);
+static void modest_main_window_class_init  (ModestMainWindowClass *klass);
+static void modest_main_window_init        (ModestMainWindow *obj);
+static void modest_main_window_finalize    (GObject *obj);
+
 static gboolean modest_main_window_window_state_event (GtkWidget *widget, 
                                                           GdkEventWindowState *event, 
                                                           gpointer userdata);
 
 static void connect_signals (ModestMainWindow *self);
 
-static void restore_settings (ModestMainWindow *self);
+static void modest_main_window_disconnect_signals (ModestWindow *self);
+
+static void restore_settings (ModestMainWindow *self, 
+                             gboolean do_folder_view_too);
+
 static void save_state (ModestWindow *self);
 
+static void
+update_menus (ModestMainWindow* self);
+
 static void modest_main_window_show_toolbar   (ModestWindow *window,
                                               gboolean show_toolbar);
 
 static void cancel_progressbar (GtkToolButton *toolbutton,
                                ModestMainWindow *self);
 
-static void         on_queue_changed                     (ModestMailOperationQueue *queue,
-                                                         ModestMailOperation *mail_op,
-                                                         ModestMailOperationQueueNotification type,
-                                                         ModestMainWindow *self);
+static void on_queue_changed   (ModestMailOperationQueue *queue,
+                               ModestMailOperation *mail_op,
+                               ModestMailOperationQueueNotification type,
+                               ModestMainWindow *self);
+
+static gboolean on_zoom_minus_plus_not_implemented (ModestWindow *window);
 
-static void on_account_update                 (TnyAccountStore *account_store, 
-                                              const gchar *account_name,
-                                              gpointer user_data);
+static void
+on_account_inserted (TnyAccountStore *accoust_store,
+                     TnyAccount *account,
+                     gpointer user_data);
+
+static void
+on_account_removed (TnyAccountStore *accoust_store,
+                    TnyAccount *account,
+                    gpointer user_data);
+
+static void
+on_account_changed (ModestAccountMgr* mgr,
+                    const gchar* account,
+                    gpointer user_data);
 
 static gboolean on_inner_widgets_key_pressed  (GtkWidget *widget,
                                               GdkEventKey *event,
@@ -106,7 +133,8 @@ static gboolean on_inner_widgets_key_pressed  (GtkWidget *widget,
 
 static void on_configuration_key_changed      (ModestConf* conf, 
                                               const gchar *key, 
-                                              ModestConfEvent event, 
+                                              ModestConfEvent event,
+                                              ModestConfNotificationId id,
                                               ModestMainWindow *self);
 
 static void set_toolbar_mode                  (ModestMainWindow *self, 
@@ -129,9 +157,30 @@ _on_msg_count_changed (ModestHeaderView *header_view,
                       TnyFolderChange *change,
                       ModestMainWindow *main_window);
 
+static void
+modest_main_window_cleanup_queue_error_signals (ModestMainWindow *self);
+
 
 static GtkWidget * create_empty_view (void);
 
+static gboolean
+on_folder_view_focus_in (GtkWidget *widget,
+                        GdkEventFocus *event,
+                        gpointer userdata);
+static gboolean
+on_header_view_focus_in (GtkWidget *widget,
+                        GdkEventFocus *event,
+                        gpointer userdata);
+static void 
+modest_main_window_on_folder_selection_changed (ModestFolderView *folder_view,
+                                               TnyFolderStore *folder_store, 
+                                               gboolean selected,
+                                               ModestMainWindow *main_window);
+                                               
+static void
+set_at_least_one_account_visible(ModestMainWindow *self);
+
+
 /* list my signals */
 enum {
        /* MY_SIGNAL_1, */
@@ -148,8 +197,8 @@ struct _ModestMainWindowPrivate {
        GtkWidget *empty_view;
 
        /* Progress observers */
-       GtkWidget        *progress_bar;
-       GSList           *progress_widgets;
+       GtkWidget   *progress_bar;
+       GSList      *progress_widgets;
 
        /* Tollbar items */
        GtkWidget   *progress_toolitem;
@@ -180,7 +229,10 @@ struct _ModestMainWindowPrivate {
        guint progress_bar_timeout;
 
        /* Signal handler UIDs */
-       gint queue_changed_handler_uid; 
+       GList *queue_err_signals;
+       GSList *sighandlers;
+       
+       ModestConfNotificationId notification_id;
 };
 #define MODEST_MAIN_WINDOW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
                                                 MODEST_TYPE_MAIN_WINDOW, \
@@ -207,7 +259,7 @@ static const GtkActionEntry modest_folder_view_action_entries [] = {
        /* Folder View CSM actions */
        { "FolderViewCSMNewFolder", NULL, N_("mcen_ti_new_folder"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_new_folder) },
        { "FolderViewCSMRenameFolder", NULL, N_("mcen_me_user_renamefolder"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_rename_folder) },
-       { "FolderViewCSMPasteMsgs", NULL, N_("mcen_me_inbox_paste"), NULL, NULL, NULL },
+       { "FolderViewCSMPasteMsgs", NULL, N_("mcen_me_inbox_paste"), NULL, NULL,  G_CALLBACK (modest_ui_actions_on_paste)},
        { "FolderViewCSMDeleteFolder", NULL, N_("mcen_me_inbox_delete"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_delete_folder) },
        { "FolderViewCSMSearchMessages", NULL, N_("mcen_me_inbox_search"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_search_messages) },
        { "FolderViewCSMHelp", NULL, N_("mcen_me_inbox_help"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_help) },
@@ -223,13 +275,13 @@ static const GtkActionEntry modest_header_view_action_entries [] = {
        { "HeaderViewCSMCut",           NULL,  N_("mcen_me_inbox_cut"),         "<CTRL>X", NULL, G_CALLBACK (modest_ui_actions_on_cut) },
        { "HeaderViewCSMCopy",          NULL,  N_("mcen_me_inbox_copy"),        "<CTRL>C", NULL, G_CALLBACK (modest_ui_actions_on_copy) },
        { "HeaderViewCSMPaste",         NULL,  N_("mcen_me_inbox_paste"),       "<CTRL>V", NULL, G_CALLBACK (modest_ui_actions_on_paste) },
-       { "HeaderViewCSMDelete",        NULL,  N_("mcen_me_inbox_delete"),      NULL,      NULL, G_CALLBACK (modest_ui_actions_on_delete) },
-       { "HeaderViewCSMCancelSending", NULL,  N_("mcen_me_outbox_cancelsend"), NULL,      NULL, NULL },
+       { "HeaderViewCSMDelete",        NULL,  N_("mcen_me_inbox_delete"),      NULL,      NULL, G_CALLBACK (modest_ui_actions_on_delete_message) },
+       { "HeaderViewCSMCancelSending", NULL,  N_("mcen_me_outbox_cancelsend"), NULL,      NULL, G_CALLBACK (modest_ui_actions_cancel_send) },
        { "HeaderViewCSMHelp",          NULL,  N_("mcen_me_inbox_help"),        NULL,      NULL, G_CALLBACK (modest_ui_actions_on_help) },
 };
 
 static const GtkToggleActionEntry modest_main_window_toggle_action_entries [] = {
-       { "ToolbarToggleView", MODEST_STOCK_SPLIT_VIEW, N_("gqn_toolb_rss_fldonoff"), "<CTRL>t", NULL, G_CALLBACK (modest_ui_actions_toggle_folders_view), FALSE },
+       { "ToggleFolders",     MODEST_STOCK_SPLIT_VIEW, N_("mcen_me_inbox_hidefolders"), "<CTRL>t", NULL, G_CALLBACK (modest_ui_actions_toggle_folders_view), TRUE },
 };
 
 /************************************************************************/
@@ -272,6 +324,9 @@ modest_main_window_class_init (ModestMainWindowClass *klass)
        
        modest_window_class->show_toolbar_func = modest_main_window_show_toolbar;
        modest_window_class->save_state_func = save_state;
+       modest_window_class->zoom_minus_func = on_zoom_minus_plus_not_implemented;
+       modest_window_class->zoom_plus_func = on_zoom_minus_plus_not_implemented;
+       modest_window_class->disconnect_signals_func = modest_main_window_disconnect_signals;
 }
 
 static void
@@ -281,6 +336,7 @@ modest_main_window_init (ModestMainWindow *obj)
 
        priv = MODEST_MAIN_WINDOW_GET_PRIVATE(obj);
 
+       priv->queue_err_signals = NULL;
        priv->msg_paned    = NULL;
        priv->main_paned   = NULL;      
        priv->main_vbox    = NULL;
@@ -294,12 +350,12 @@ modest_main_window_init (ModestMainWindow *obj)
        priv->progress_bar = NULL;
        priv->current_toolbar_mode = TOOLBAR_MODE_NORMAL;
        priv->style  = MODEST_MAIN_WINDOW_STYLE_SPLIT;
-       priv->contents_style  = MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS;
+       priv->contents_style  = -1; /* invalid contents style. We need this to select it for the first time */
        priv->merge_ids = NULL;
        priv->optimized_view  = FALSE;
        priv->send_receive_in_progress  = FALSE;
        priv->progress_bar_timeout = 0;
-       priv->queue_changed_handler_uid = 0;
+       priv->sighandlers = NULL;
 }
 
 static void
@@ -309,6 +365,18 @@ modest_main_window_finalize (GObject *obj)
 
        priv = MODEST_MAIN_WINDOW_GET_PRIVATE(obj);
 
+       if (priv->notification_id) {
+               modest_conf_forget_namespace (modest_runtime_get_conf (),
+                                             MODEST_CONF_NAMESPACE,
+                                             priv->notification_id);
+       }
+       
+       /* Sanity check: shouldn't be needed, the window mgr should
+          call this function before */
+       modest_main_window_disconnect_signals (MODEST_WINDOW (obj));
+
+       modest_main_window_cleanup_queue_error_signals ((ModestMainWindow *) obj);
+
        g_slist_free (priv->progress_widgets);
 
        g_byte_array_free (priv->merge_ids, TRUE);
@@ -318,11 +386,6 @@ modest_main_window_finalize (GObject *obj)
                priv->progress_bar_timeout = 0;
        }
 
-       /* Disconnect signal handlers */
-       if (priv->queue_changed_handler_uid)
-               g_signal_handler_disconnect (modest_runtime_get_mail_operation_queue (),
-                                            priv->queue_changed_handler_uid);
-
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
@@ -353,7 +416,7 @@ modest_main_window_get_child_widget (ModestMainWindow *self,
 
 
 static void
-restore_settings (ModestMainWindow *self)
+restore_settings (ModestMainWindow *self, gboolean do_folder_view_too)
 {
        ModestConf *conf;
        ModestMainWindowPrivate *priv;
@@ -364,10 +427,14 @@ restore_settings (ModestMainWindow *self)
 
        modest_widget_memory_restore (conf, G_OBJECT(self),
                                      MODEST_CONF_MAIN_WINDOW_KEY);
+
        modest_widget_memory_restore (conf, G_OBJECT(priv->header_view),
                                      MODEST_CONF_HEADER_VIEW_KEY);
-       modest_widget_memory_restore (conf, G_OBJECT(priv->folder_view),
+
+       if (do_folder_view_too)
+               modest_widget_memory_restore (conf, G_OBJECT(priv->folder_view),
                                      MODEST_CONF_FOLDER_VIEW_KEY);
+
        modest_widget_memory_restore (conf, G_OBJECT(priv->main_paned),
                                      MODEST_CONF_MAIN_PANED_KEY);
 
@@ -391,12 +458,288 @@ save_state (ModestWindow *window)
                                   MODEST_CONF_MAIN_WINDOW_KEY);
        modest_widget_memory_save (conf, G_OBJECT(priv->main_paned), 
                                   MODEST_CONF_MAIN_PANED_KEY);
-       modest_widget_memory_save (conf, G_OBJECT(priv->header_view), 
-                                  MODEST_CONF_HEADER_VIEW_KEY);
+       //      modest_widget_memory_save (conf, G_OBJECT(priv->header_view), 
+       //                         MODEST_CONF_HEADER_VIEW_KEY);
        modest_widget_memory_save (conf, G_OBJECT(priv->folder_view), 
                                   MODEST_CONF_FOLDER_VIEW_KEY);
 }
 
+static gint
+compare_display_names (ModestAccountData *a,
+                      ModestAccountData *b)
+{
+       return strcmp (a->display_name, b->display_name);
+}
+
+static void
+update_menus (ModestMainWindow* self)
+{      
+       GSList *account_names, *iter, *accounts;
+       ModestMainWindowPrivate *priv;
+       ModestWindowPrivate *parent_priv;
+       ModestAccountMgr *mgr;
+       gint i, num_accounts;
+       GtkActionGroup *action_group;
+       GList *groups;
+       gchar *default_account;
+       GtkWidget *send_receive_button, *item;
+       GtkAction *send_receive_all = NULL;
+
+       priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self);
+       parent_priv = MODEST_WINDOW_GET_PRIVATE (self);
+
+       /* Get enabled account IDs */
+       mgr = modest_runtime_get_account_mgr ();
+       account_names = modest_account_mgr_account_names (mgr, TRUE);
+       iter = account_names;
+       accounts = NULL;
+
+       while (iter) {
+               ModestAccountData *account_data = 
+                       modest_account_mgr_get_account_data (mgr, (gchar*) iter->data);
+               accounts = g_slist_prepend (accounts, account_data);
+
+               iter = iter->next;
+       }
+       modest_account_mgr_free_account_names (account_names);
+       account_names = NULL;
+
+       /* Order the list of accounts by its display name */
+       accounts = g_slist_sort (accounts, (GCompareFunc) compare_display_names);
+       num_accounts = g_slist_length (accounts);
+
+       send_receive_all = gtk_ui_manager_get_action (parent_priv->ui_manager, 
+                                                     "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveAllMenu");
+       gtk_action_set_visible (send_receive_all, num_accounts > 1);
+
+       /* Delete old send&receive popup items. We can not just do a
+          menu_detach because it does not work well with
+          tap_and_hold */
+       if (priv->accounts_popup)
+               gtk_container_foreach (GTK_CONTAINER (priv->accounts_popup), 
+                                      (GtkCallback) gtk_widget_destroy, NULL);
+
+       /* Delete old entries in the View menu. Do not free groups, it
+          belongs to Gtk+ */
+       groups = gtk_ui_manager_get_action_groups (parent_priv->ui_manager);
+       while (groups) {
+               if (!strcmp (MODEST_MAIN_WINDOW_ACTION_GROUP_ADDITIONS,
+                            gtk_action_group_get_name (GTK_ACTION_GROUP (groups->data)))) {
+                       gtk_ui_manager_remove_action_group (parent_priv->ui_manager, 
+                                                           GTK_ACTION_GROUP (groups->data));
+                       groups = NULL;
+                       /* Remove uis */
+                       if (priv->merge_ids) {
+                               for (i = 0; i < priv->merge_ids->len; i++)
+                                       gtk_ui_manager_remove_ui (parent_priv->ui_manager, priv->merge_ids->data[i]);
+                               g_byte_array_free (priv->merge_ids, TRUE);
+                       }
+                       /* We need to call this in order to ensure
+                          that the new actions are added in the right
+                          order (alphabetical */
+                       gtk_ui_manager_ensure_update (parent_priv->ui_manager);
+               } else 
+                       groups = g_list_next (groups);
+       }
+       priv->merge_ids = g_byte_array_sized_new (num_accounts);
+
+       /* Get send receive button */
+       send_receive_button = gtk_ui_manager_get_widget (parent_priv->ui_manager,
+                                                         "/ToolBar/ToolbarSendReceive");
+
+       /* Create the menu */
+       if (num_accounts > 1) {
+               if (!priv->accounts_popup)
+                       priv->accounts_popup = gtk_menu_new ();
+               item = gtk_menu_item_new_with_label (_("mcen_me_toolbar_sendreceive_all"));
+               gtk_menu_shell_append (GTK_MENU_SHELL (priv->accounts_popup), GTK_WIDGET (item));
+               g_signal_connect (G_OBJECT (item), 
+                                 "activate", 
+                                 G_CALLBACK (on_send_receive_csm_activated),
+                                 NULL);
+               item = gtk_separator_menu_item_new ();
+               gtk_menu_shell_prepend (GTK_MENU_SHELL (priv->accounts_popup), GTK_WIDGET (item));
+       }
+
+       /* Create a new action group */
+       default_account = modest_account_mgr_get_default_account (mgr);
+       action_group = gtk_action_group_new (MODEST_MAIN_WINDOW_ACTION_GROUP_ADDITIONS);
+       for (i = 0; i < num_accounts; i++) {
+               gchar *display_name = NULL;
+               
+               ModestAccountData *account_data = (ModestAccountData *) g_slist_nth_data (accounts, i);
+
+               /* Create display name. The UI specification specifies a different format string 
+                * to use for the default account, though both seem to be "%s", so 
+                * I don't see what the point is. murrayc. */
+               if (default_account && account_data->account_name && 
+                       !(strcmp (default_account, account_data->account_name) == 0)) {
+                       display_name = g_strdup_printf (_("mcen_me_toolbar_sendreceive_default"), 
+                                                       account_data->display_name);
+               }
+               else {
+                       display_name = g_strdup_printf (_("mcen_me_toolbar_sendreceive_mailbox_n"), 
+                                                       account_data->display_name);
+               }
+
+               /* Create action and add it to the action group. The
+                  action name must be the account name, this way we
+                  could know in the handlers the account to show */
+               if(account_data && account_data->account_name) {
+                       gchar* item_name, *refresh_action_name;
+                       guint8 merge_id = 0;
+                       GtkAction *view_account_action, *refresh_account_action;
+
+                       view_account_action = gtk_action_new (account_data->account_name,
+                                                             display_name, NULL, NULL);
+                       gtk_action_group_add_action (action_group, view_account_action);
+
+                       /* Add ui from account data. We allow 2^9-1 account
+                          changes in a single execution because we're
+                          downcasting the guint to a guint8 in order to use a
+                          GByteArray. It should be enough. */
+                       item_name = g_strconcat (account_data->account_name, "Menu", NULL);
+                       merge_id = (guint8) gtk_ui_manager_new_merge_id (parent_priv->ui_manager);
+                       priv->merge_ids = g_byte_array_append (priv->merge_ids, &merge_id, 1);
+                       gtk_ui_manager_add_ui (parent_priv->ui_manager,
+                                              merge_id,
+                                              "/MenuBar/ViewMenu/ViewMenuAdditions",
+                                              item_name,
+                                              account_data->account_name,
+                                              GTK_UI_MANAGER_MENUITEM,
+                                              FALSE);
+
+                       /* Connect the action signal "activate" */
+                       g_signal_connect (G_OBJECT (view_account_action),
+                                         "activate",
+                                         G_CALLBACK (on_show_account_action_activated),
+                                         self);
+
+                       /* Create the items for the Tools->Send&Receive submenu */
+                       refresh_action_name = g_strconcat ("SendReceive", account_data->account_name, NULL);
+                       refresh_account_action = gtk_action_new ((const gchar*) refresh_action_name, 
+                                                                display_name, NULL, NULL);
+                       printf("DEBUG: %s: menu display_name=%s\n", __FUNCTION__, display_name);
+                       gtk_action_group_add_action (action_group, refresh_account_action);
+
+                       merge_id = (guint8) gtk_ui_manager_new_merge_id (parent_priv->ui_manager);
+                       priv->merge_ids = g_byte_array_append (priv->merge_ids, &merge_id, 1);
+                       gtk_ui_manager_add_ui (parent_priv->ui_manager, 
+                                              merge_id,
+                                              "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsMenuAdditions",
+                                              item_name,
+                                              refresh_action_name,
+                                              GTK_UI_MANAGER_MENUITEM,
+                                              FALSE);
+                       g_free (refresh_action_name);
+
+                       g_signal_connect_data (G_OBJECT (refresh_account_action), 
+                                              "activate", 
+                                              G_CALLBACK (on_refresh_account_action_activated), 
+                                              g_strdup (account_data->account_name),
+                                              (GClosureNotify) g_free,
+                                              0);
+
+                       /* Create item and add it to the send&receive
+                          CSM. If there is only one account then
+                          it'll be no menu */
+                       if (priv->accounts_popup) {
+                               GtkWidget *label = gtk_label_new(NULL);
+                               gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+                               if (default_account && (strcmp(account_data->account_name, default_account) == 0))
+                               {
+                                       gchar *escaped = g_markup_printf_escaped ("<b>%s</b>", display_name);
+                                       gtk_label_set_markup (GTK_LABEL (label), escaped);
+                                       g_free (escaped);
+                               }
+                               else
+                               {
+                                       gtk_label_set_text (GTK_LABEL (label), display_name);
+                               }
+
+                               item = gtk_menu_item_new ();
+                               gtk_container_add (GTK_CONTAINER (item), label);
+
+                               gtk_menu_shell_prepend (GTK_MENU_SHELL (priv->accounts_popup), GTK_WIDGET (item));
+                               g_signal_connect_data (G_OBJECT (item), 
+                                                      "activate", 
+                                                      G_CALLBACK (on_send_receive_csm_activated),
+                                                      g_strdup (account_data->account_name),
+                                                      (GClosureNotify) g_free,
+                                                      0);
+                       }
+                       g_free (item_name);
+               }
+
+               /* Frees */
+               g_free (display_name);
+       }
+
+       gtk_ui_manager_insert_action_group (parent_priv->ui_manager, action_group, 1);
+
+       /* We cannot do this in the loop above because this relies on the action
+        * group being inserted. This makes the default account appear in bold.
+        * I agree it is a rather ugly way, but I don't see another possibility. armin. */
+       for (i = 0; i < num_accounts; i++) {
+               ModestAccountData *account_data = (ModestAccountData *) g_slist_nth_data (accounts, i);
+
+               if(account_data->account_name && default_account &&
+                  strcmp (account_data->account_name, default_account) == 0) {
+                       gchar *item_name = g_strconcat (account_data->account_name, "Menu", NULL);
+
+                       gchar *path = g_strconcat ("/MenuBar/ViewMenu/ViewMenuAdditions/", item_name, NULL);
+                       GtkWidget *item = gtk_ui_manager_get_widget (parent_priv->ui_manager, path);
+                       g_free(path);
+
+                       if (item) {
+                               GtkWidget *child = gtk_bin_get_child (GTK_BIN (item));
+                               if (GTK_IS_LABEL (child)) {
+                                       const gchar *cur_name = gtk_label_get_text (GTK_LABEL (child));
+                                       gchar *bold_name = g_markup_printf_escaped("<b>%s</b>", cur_name);
+                                       gtk_label_set_markup (GTK_LABEL (child), bold_name);
+                                       g_free (bold_name);
+                               }
+                       }
+
+                       path = g_strconcat("/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsMenuAdditions/", item_name, NULL);
+                       item = gtk_ui_manager_get_widget (parent_priv->ui_manager, path);
+                       g_free (path);
+
+                       if (item) {
+                               GtkWidget *child = gtk_bin_get_child (GTK_BIN (item));
+                               if (GTK_IS_LABEL (child)) {
+                                       const gchar *cur_name = gtk_label_get_text (GTK_LABEL (child));
+                                       gchar *bold_name = g_markup_printf_escaped("<b>%s</b>", cur_name);
+                                       gtk_label_set_markup (GTK_LABEL (child), bold_name);
+                                       g_free (bold_name);
+                               }
+                       }
+
+                       g_free(item_name);
+               }
+
+               modest_account_mgr_free_account_data (mgr, account_data);
+       }
+
+       if (priv->accounts_popup) {
+               /* Mandatory in order to view the menu contents */
+               gtk_widget_show_all (priv->accounts_popup);
+
+               /* Setup tap_and_hold just if was not done before*/
+               if (!gtk_menu_get_attach_widget (GTK_MENU (priv->accounts_popup)))
+                       gtk_widget_tap_and_hold_setup (send_receive_button, priv->accounts_popup, NULL, 0);
+       }
+
+       /* Frees */
+       g_slist_free (accounts);
+       g_free (default_account);
+
+
+       /* Make sure that at least one account is viewed if there are any 
+        * accounts, for instance when adding the first account: */
+       set_at_least_one_account_visible (self);
+}
+
 static void
 wrap_in_scrolled_window (GtkWidget *win, GtkWidget *widget)
 {
@@ -409,67 +752,165 @@ wrap_in_scrolled_window (GtkWidget *win, GtkWidget *widget)
 }
 
 
-static gboolean
-on_delete_event (GtkWidget *widget, GdkEvent  *event, ModestMainWindow *self)
-{
-       modest_window_save_state (MODEST_WINDOW(self));
-       return FALSE;
-}
+/* static gboolean */
+/* on_delete_event (GtkWidget *widget, GdkEvent  *event, ModestMainWindow *self) */
+/* { */
+/*     modest_window_save_state (MODEST_WINDOW(self)); */
+/*     return FALSE; */
+/* } */
 
+/* static void */
+/* on_sendqueue_error_happened (TnySendQueue *self, TnyHeader *header, TnyMsg *msg, GError *err, ModestMainWindow *user_data) */
+/* { */
+/*     if (err) { */
+/*             printf ("DEBUG: %s: err->code=%d, err->message=%s\n", __FUNCTION__, err->code, err->message); */
+
+/*             if (err->code == TNY_ACCOUNT_ERROR_TRY_CONNECT_USER_CANCEL) */
+/*                     /\* Don't show waste the user's time by showing him a dialog telling him */
+/*                      * that he has just cancelled something: *\/ */
+/*                     return; */
+/*     } */
+
+/*     /\* Get the server name: *\/ */
+/*     const gchar* server_name = NULL; */
+       
+/*     TnyCamelTransportAccount* server_account = tny_camel_send_queue_get_transport_account ( */
+/*             TNY_CAMEL_SEND_QUEUE (self)); */
+/*     if (server_account) { */
+/*             server_name = tny_account_get_hostname (TNY_ACCOUNT (server_account)); */
+                       
+/*             g_object_unref (server_account); */
+/*             server_account = NULL; */
+/*     } */
+       
+/*     if (!server_name) */
+/*             server_name = _("Unknown Server");       */
+
+/*     /\* Show the appropriate message text for the GError: *\/ */
+/*     gchar *message = NULL; */
+/*     if (err) { */
+/*             switch (err->code) { */
+/*                     case TNY_TRANSPORT_ACCOUNT_ERROR_SEND_HOST_LOOKUP_FAILED: */
+/*                             message = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), server_name); */
+/*                             break; */
+/*                     case TNY_TRANSPORT_ACCOUNT_ERROR_SEND_SERVICE_UNAVAILABLE: */
+/*                             message = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), server_name); */
+/*                             break; */
+/*                     case TNY_TRANSPORT_ACCOUNT_ERROR_SEND_AUTHENTICATION_NOT_SUPPORTED: */
+/*                             /\* TODO: This logical ID seems more suitable for a wrong username or password than for a  */
+/*                              * wrong authentication method. The user is unlikely to guess at the real cause. */
+/*                              *\/ */
+/*                             message = g_strdup_printf (_("eemev_ni_ui_smtp_authentication_fail_error"), server_name); */
+/*                             break; */
+/*                     case TNY_TRANSPORT_ACCOUNT_ERROR_SEND: */
+/*                             /\* TODO: Tinymail is still sending this sometimes when it should  */
+/*                              * send TNY_ACCOUNT_ERROR_TRY_CONNECT_USER_CANCEL. *\/ */
+/*                     default: */
+/*                             message = g_strdup (_("emev_ib_ui_smtp_send_error")); */
+/*                             break; */
+/*             } */
+/*     } else { */
+/*             message = g_strdup (_("emev_ib_ui_smtp_send_error")); */
+/*     } */
+       
+/*     modest_maemo_show_information_note_and_forget (GTK_WINDOW (user_data), message); */
+/*     g_free (message); */
+       
+/*     /\* TODO: Offer to remove the message, to avoid messages in future? *\/ */
+/*     /\* */
+/*     TnyFolder *outbox = tny_send_queue_get_outbox (queue); */
+/*     tny_folder_remove_msg (outbox, header, NULL); */
+/*     tny_folder_sync (outbox, TRUE, NULL); */
+/*     g_object_unref (outbox); */
+/*     *\/ */
+/* } */
+
+typedef struct {
+       TnySendQueue *queue;
+       guint signal;
+} QueueErrorSignal;
 
 static void
-on_account_store_connecting_finished (TnyAccountStore *store, ModestMainWindow *self)
+modest_main_window_cleanup_queue_error_signals (ModestMainWindow *self)
 {
-       /* When going online, do the equivalent of pressing the send/receive button, 
-        * as per the specification:
-        * (without the check for >0 accounts, though that is not specified): */
+       ModestMainWindowPrivate *priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self);
+
+       GList *oerrsignals = priv->queue_err_signals;
+       while (oerrsignals) {
+               QueueErrorSignal *esignal = (QueueErrorSignal *) oerrsignals->data;
+               g_signal_handler_disconnect (esignal->queue, esignal->signal);
+               g_slice_free (QueueErrorSignal, esignal);
+               oerrsignals = g_list_next (oerrsignals);
+       }
+       g_list_free (priv->queue_err_signals);
+       priv->queue_err_signals = NULL;
+}
 
-       TnyDevice *device = tny_account_store_get_device (store);
+/* static void */
+/* on_account_store_connecting_finished (TnyAccountStore *store, ModestMainWindow *self) */
+/* { */
+/*     ModestMainWindowPrivate *priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self); */
+
+/*     /\* When going online, do the equivalent of pressing the send/receive button,  */
+/*      * as per the specification: */
+/*      * (without the check for >0 accounts, though that is not specified): *\/ */
+
+/*     TnyDevice *device = tny_account_store_get_device (store); */
+
+/*     /\* modest_folder_view_update_model (MODEST_FOLDER_VIEW (priv->folder_view), store); *\/ */
        
-       /* Check that we are really online.
-        * This signal should not be emitted when we are not connected, 
-        * but it seems to happen sometimes: */
-        if (!tny_device_is_online (device))
-               return;
+/*     /\* Check that we are really online. */
+/*      * This signal should not be emitted when we are not connected,  */
+/*      * but it seems to happen sometimes: *\/ */
+/*      if (!tny_device_is_online (device)) */
+/*             return; */
                
-       const gchar *iap_id = tny_maemo_conic_device_get_current_iap_id (TNY_MAEMO_CONIC_DEVICE (device));
-       printf ("DEBUG: %s: connection id=%s\n", __FUNCTION__, iap_id);
+/*     const gchar *iap_id = tny_maemo_conic_device_get_current_iap_id (TNY_MAEMO_CONIC_DEVICE (device)); */
+/*     printf ("DEBUG: %s: connection id=%s\n", __FUNCTION__, iap_id); */
        
-       /* Stop the existing send queues: */
-       modest_runtime_remove_all_send_queues ();
+/*     /\* Stop the existing send queues: *\/ */
+/*     modest_runtime_remove_all_send_queues (); */
        
-       /* Create the send queues again, using the appropriate transport accounts 
-        * for this new connection.
-        * This could be the first time that they are created if this is the first 
-        * connection. */
-       /* TODO: Does this really destroy the TnySendQueues and their threads
-        * We do not want 2 TnySendQueues to exist with the same underlying 
-        * outbox directory. */
-       GSList *account_names = modest_account_mgr_account_names (
-               modest_runtime_get_account_mgr(), 
-               TRUE /* enabled accounts only */);
-       GSList *iter = account_names;
-       while (iter) {
-               const gchar *account_name = (const gchar*)(iter->data);
-                       if (account_name) {
-                       TnyTransportAccount *account = TNY_TRANSPORT_ACCOUNT (
-                               modest_tny_account_store_get_transport_account_for_open_connection
-                                                (modest_runtime_get_account_store(), account_name));
-                       if (account) {
-                               printf ("debug: %s:\n  Transport account for %s: %s\n", __FUNCTION__, account_name, 
-                                       tny_account_get_id(TNY_ACCOUNT(account)));
-                               modest_runtime_get_send_queue (account);
-                       }
-               }
+/*     /\* Create the send queues again, using the appropriate transport accounts  */
+/*      * for this new connection. */
+/*      * This could be the first time that they are created if this is the first  */
+/*      * connection. *\/ */
+/*     /\* TODO: Does this really destroy the TnySendQueues and their threads */
+/*      * We do not want 2 TnySendQueues to exist with the same underlying  */
+/*      * outbox directory. *\/ */
+
+/*     modest_main_window_cleanup_queue_error_signals (self); */
+
+/*     GSList *account_names = modest_account_mgr_account_names ( */
+/*             modest_runtime_get_account_mgr(),  */
+/*             TRUE /\* enabled accounts only *\/); */
+/*     GSList *iter = account_names; */
+/*     while (iter) { */
+/*             const gchar *account_name = (const gchar*)(iter->data); */
+/*                     if (account_name) { */
+/*                     TnyTransportAccount *account = TNY_TRANSPORT_ACCOUNT ( */
+/*                             modest_tny_account_store_get_transport_account_for_open_connection */
+/*                                              (modest_runtime_get_account_store(), account_name)); */
+/*                     if (account) { */
+/*                             /\* Q: Is this the first location where the send-queues are requested? *\/ */
+/*                             QueueErrorSignal *esignal = g_slice_new (QueueErrorSignal); */
+/*                             printf ("debug: %s:\n  Transport account for %s: %s\n", __FUNCTION__, account_name,  */
+/*                                     tny_account_get_id(TNY_ACCOUNT(account))); */
+/*                             esignal->queue = TNY_SEND_QUEUE (modest_runtime_get_send_queue (account)); */
+/*                             esignal->signal = g_signal_connect (G_OBJECT (esignal->queue), "error-happened", */
+/*                                     G_CALLBACK (on_sendqueue_error_happened), self); */
+/*                             priv->queue_err_signals = g_list_prepend (priv->queue_err_signals, esignal); */
+/*                     } */
+/*             } */
                
-               iter = g_slist_next (iter);
-       }
-       
-       g_slist_free (account_names);
-       
+/*             iter = g_slist_next (iter); */
+/*     } */
+
+/*     modest_account_mgr_free_account_names (account_names); */
+/*     account_names = NULL; */
        
-       modest_ui_actions_do_send_receive (NULL, MODEST_WINDOW (self));
-}
+/*     modest_ui_actions_do_send_receive (NULL, MODEST_WINDOW (self)); */
+/* } */
 
 static void
 _folder_view_csm_menu_activated (GtkWidget *widget, gpointer user_data)
@@ -492,6 +933,16 @@ _header_view_csm_menu_activated (GtkWidget *widget, gpointer user_data)
 }
 
 static void
+modest_main_window_disconnect_signals (ModestWindow *self)
+{      
+       ModestMainWindowPrivate *priv;  
+       priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+
+       modest_signal_mgr_disconnect_all_and_destroy (priv->sighandlers);
+       priv->sighandlers = NULL;       
+}
+
+static void
 connect_signals (ModestMainWindow *self)
 {      
        ModestWindowPrivate *parent_priv;
@@ -502,69 +953,78 @@ connect_signals (ModestMainWindow *self)
        parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
 
        /* folder view */
-       g_signal_connect (G_OBJECT(priv->folder_view), "key-press-event",
-                         G_CALLBACK(on_inner_widgets_key_pressed), self);
-       g_signal_connect (G_OBJECT(priv->folder_view), "folder_selection_changed",
-                         G_CALLBACK(modest_ui_actions_on_folder_selection_changed), self);
-       g_signal_connect (G_OBJECT(priv->folder_view), "folder-display-name-changed",
-                         G_CALLBACK(modest_ui_actions_on_folder_display_name_changed), self);
+       
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,
+                                                      G_OBJECT(priv->folder_view), "key-press-event",
+                                                      G_CALLBACK(on_inner_widgets_key_pressed), self);
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->folder_view), "folder_selection_changed",
+                                                      G_CALLBACK(modest_main_window_on_folder_selection_changed), self);
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->folder_view), "folder-display-name-changed",
+                                                      G_CALLBACK(modest_ui_actions_on_folder_display_name_changed), self);
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (priv->folder_view), "focus-in-event", 
+                                                      G_CALLBACK (on_folder_view_focus_in), self);
 
        /* Folder view CSM */
        menu = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/FolderViewCSM");
        gtk_widget_tap_and_hold_setup (GTK_WIDGET (priv->folder_view), menu, NULL, 0);
-       g_signal_connect (G_OBJECT(priv->folder_view), "tap-and-hold",
-                         G_CALLBACK(_folder_view_csm_menu_activated),
-                         self);
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, G_OBJECT(priv->folder_view), "tap-and-hold",
+                                                      G_CALLBACK(_folder_view_csm_menu_activated),
+                                                      self);
        /* header view */
-       g_signal_connect (G_OBJECT(priv->header_view), "header_selected",
-                         G_CALLBACK(modest_ui_actions_on_header_selected), self);
-       g_signal_connect (G_OBJECT(priv->header_view), "header_activated",
-                         G_CALLBACK(modest_ui_actions_on_header_activated), self);
-       g_signal_connect (G_OBJECT(priv->header_view), "item_not_found",
-                         G_CALLBACK(modest_ui_actions_on_item_not_found), self);
-       g_signal_connect (G_OBJECT(priv->header_view), "key-press-event",
-                         G_CALLBACK(on_inner_widgets_key_pressed), self);
-       g_signal_connect (G_OBJECT(priv->header_view), "msg_count_changed",
-                         G_CALLBACK(_on_msg_count_changed), self);
-
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->header_view), "header_selected",
+                                                      G_CALLBACK(modest_ui_actions_on_header_selected), self);
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->header_view), "header_activated",
+                                                      G_CALLBACK(modest_ui_actions_on_header_activated), self);
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->header_view), "item_not_found",
+                                                      G_CALLBACK(modest_ui_actions_on_item_not_found), self);
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->header_view), "key-press-event",
+                                                      G_CALLBACK(on_inner_widgets_key_pressed), self);
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->header_view), "msg_count_changed",
+                                                      G_CALLBACK(_on_msg_count_changed), self);
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (priv->header_view), "focus-in-event",
+                                                      G_CALLBACK (on_header_view_focus_in), self);
+       
        /* Header view CSM */
        menu = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/HeaderViewCSM");
        gtk_widget_tap_and_hold_setup (GTK_WIDGET (priv->header_view), menu, NULL, 0);
-       g_signal_connect (G_OBJECT(priv->header_view), "tap-and-hold",
-                         G_CALLBACK(_header_view_csm_menu_activated),
-                         self);
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->header_view), "tap-and-hold",
+                                                      G_CALLBACK(_header_view_csm_menu_activated),
+                                                      self);
        
        /* window */
-       g_signal_connect (G_OBJECT(self), "delete-event", G_CALLBACK(on_delete_event), self);
-       g_signal_connect (G_OBJECT (self), "window-state-event",
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (self), "window-state-event",
                          G_CALLBACK (modest_main_window_window_state_event),
                          NULL);
-       g_signal_connect (G_OBJECT(self), "delete-event", G_CALLBACK(on_delete_event), self);
        
        /* Mail Operation Queue */
-       priv->queue_changed_handler_uid = 
-               g_signal_connect (G_OBJECT (modest_runtime_get_mail_operation_queue ()),
-                                 "queue-changed", G_CALLBACK (on_queue_changed), self);
-
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (modest_runtime_get_mail_operation_queue ()),
+                                                      "queue-changed", G_CALLBACK (on_queue_changed), self);
+       
        /* Track changes in the device name */
-       g_signal_connect (G_OBJECT(modest_runtime_get_conf ()),
-                         "key_changed", G_CALLBACK (on_configuration_key_changed), 
-                         self);
-
+       priv->notification_id =  modest_conf_listen_to_namespace (modest_runtime_get_conf (), 
+                                                                 MODEST_CONF_NAMESPACE);
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(modest_runtime_get_conf ()),
+                                                      "key_changed", G_CALLBACK (on_configuration_key_changed), 
+                                                      self);
+       
        /* Track account changes. We need to refresh the toolbar */
-       g_signal_connect (G_OBJECT (modest_runtime_get_account_store ()),
-                         "account_update", G_CALLBACK (on_account_update),
-                         self);
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (modest_runtime_get_account_store ()),
+                                                      "account_inserted", G_CALLBACK (on_account_inserted),
+                                                      self);
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (modest_runtime_get_account_store ()),
+                                                      "account_removed", G_CALLBACK (on_account_removed),
+                                                      self);
+
+       /* We need to refresh the send & receive menu to change the bold
+        * account when the default account changes. */
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (modest_runtime_get_account_mgr ()),
+                                                      "account_changed", G_CALLBACK (on_account_changed),
+                                                      self);
 
        /* Account store */
-       g_signal_connect (G_OBJECT (modest_runtime_get_account_store()), 
-                         "password_requested",
-                         G_CALLBACK (modest_ui_actions_on_password_requested), self);
-                         
-       /* Device */
-       g_signal_connect (G_OBJECT(modest_runtime_get_account_store()), 
-                         "connecting-finished",
-                         G_CALLBACK(on_account_store_connecting_finished), self);
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (modest_runtime_get_account_store()), 
+                                                      "password_requested",
+                                                      G_CALLBACK (modest_ui_actions_on_password_requested), self);
 }
 
 #if 0
@@ -615,9 +1075,61 @@ static void on_hildon_program_is_topmost_notify(GObject *self,
        
 }
 
+static void
+modest_main_window_on_show (GtkWidget *self, gpointer user_data)
+{
+       GtkWidget *folder_win = (GtkWidget *) user_data;
+       ModestMainWindowPrivate *priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+       
+       priv->folder_view = MODEST_FOLDER_VIEW (modest_platform_create_folder_view (NULL));
+       wrap_in_scrolled_window (folder_win, GTK_WIDGET(priv->folder_view));
+/*     wrap_in_scrolled_window (priv->contents_widget, GTK_WIDGET(priv->header_view)); */
+
+       gtk_widget_show (GTK_WIDGET (priv->folder_view));
+
+       /* Connect signals */
+       connect_signals ((ModestMainWindow*)self);
+
+       /* Set account store */
+       tny_account_store_view_set_account_store (TNY_ACCOUNT_STORE_VIEW (priv->folder_view),
+                                                 TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()));
+
+       /* Load previous osso state, for instance if we are being restored from 
+        * hibernation:  */
+       modest_osso_load_state ();
 
+       /* Restore window & widget settings */
+       
+       restore_settings (MODEST_MAIN_WINDOW(self), TRUE);
+
+       /* The UI spec wants us to show a connection dialog when the application is 
+        * started by the user, if there is no connection.
+        * Do this before showing the account wizard, 
+        * because wizard needs a connection to discover capabilities. */
+        modest_platform_connect_and_wait (GTK_WINDOW (self), NULL);
+        
+       /* Check if accounts exist and show the account wizard if not */
+       gboolean accounts_exist = 
+               modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE);
 
-ModestWindow*
+       if (!accounts_exist) {
+               /* This is necessary to have the main window shown behind the dialog 
+               It's an ugly hack... jschmid */
+               gtk_widget_show_all(GTK_WIDGET(self));
+               modest_ui_actions_on_accounts (NULL, MODEST_WINDOW(self));
+       } else {
+               GSList *accounts;
+               GtkAction *send_receive_all;
+               ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (self);
+               accounts = modest_account_mgr_account_names (modest_runtime_get_account_mgr (), TRUE);
+               send_receive_all = gtk_ui_manager_get_action (parent_priv->ui_manager, 
+                                                             "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveAllMenu");
+               gtk_action_set_visible (send_receive_all, g_slist_length (accounts) > 1);
+               modest_account_mgr_free_account_names (accounts);
+       }
+}
+
+ModestWindow *
 modest_main_window_new (void)
 {
        ModestMainWindow *self = NULL;  
@@ -628,11 +1140,10 @@ modest_main_window_new (void)
        ModestDimmingRulesGroup *toolbar_rules_group = NULL;
        GtkActionGroup *action_group = NULL;
        GError *error = NULL;
-       TnyFolderStoreQuery *query = NULL;
-       GdkPixbuf *window_icon = NULL; 
        ModestConf *conf = NULL;
        GtkAction *action = NULL;
-
+       GdkPixbuf *window_icon;
+       
        self  = MODEST_MAIN_WINDOW(g_object_new(MODEST_TYPE_MAIN_WINDOW, NULL));
        priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
        parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
@@ -643,8 +1154,8 @@ modest_main_window_new (void)
        action_group = gtk_action_group_new ("ModestMainWindowActions");
        gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE);
 
-       menu_rules_group = modest_dimming_rules_group_new ("ModestMenuDimmingRules");
-       toolbar_rules_group = modest_dimming_rules_group_new ("ModestToolbarDimmingRules");
+       menu_rules_group = modest_dimming_rules_group_new ("ModestMenuDimmingRules", FALSE);
+       toolbar_rules_group = modest_dimming_rules_group_new ("ModestToolbarDimmingRules", TRUE);
 
        /* Add common actions */
        gtk_action_group_add_actions (action_group,
@@ -716,36 +1227,29 @@ modest_main_window_new (void)
        gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
                                      modest_conf_get_bool (conf, MODEST_CONF_SHOW_TOOLBAR_FULLSCREEN, NULL));
        hildon_window_set_menu (HILDON_WINDOW (self), GTK_MENU (parent_priv->menubar));
+       gtk_widget_show (parent_priv->menubar);
 
        /* Get device name */
        modest_maemo_utils_get_device_name ();
 
-       /* folder view */
-       query = NULL; 
-
-       /* tny_folder_store_query_new ();
-
-       tny_folder_store_query_add_item (query, NULL,
-                                        TNY_FOLDER_STORE_QUERY_OPTION_SUBSCRIBED);
-       */
-
-       priv->folder_view = MODEST_FOLDER_VIEW(modest_folder_view_new (query));
-       if (!priv->folder_view)
-               g_printerr ("modest: cannot instantiate folder view\n");
-       /* g_object_unref (G_OBJECT (query)); */
-
-       modest_folder_view_set_style (priv->folder_view,
-                                     MODEST_FOLDER_VIEW_STYLE_SHOW_ONE);
-
        /* header view */
-       priv->header_view  =
-               MODEST_HEADER_VIEW(modest_header_view_new (NULL, MODEST_HEADER_VIEW_STYLE_DETAILS));
+       priv->header_view =
+               MODEST_HEADER_VIEW (modest_header_view_new (NULL, MODEST_HEADER_VIEW_STYLE_DETAILS));
        if (!priv->header_view)
                g_printerr ("modest: cannot instantiate header view\n");
        modest_header_view_set_style (priv->header_view, MODEST_HEADER_VIEW_STYLE_TWOLINES);
+       modest_widget_memory_restore (modest_runtime_get_conf (), G_OBJECT(priv->header_view),
+                                     MODEST_CONF_HEADER_VIEW_KEY);
+
+       /* Other style properties of header view */
+       g_object_set (G_OBJECT (priv->header_view), 
+                     "rules-hint", FALSE,
+                     NULL);
+       /* gtk_widget_show (priv->header_view); */
 
        /* Empty view */ 
        priv->empty_view = create_empty_view ();
+       gtk_widget_show (priv->empty_view);
                 
        /* Create scrolled windows */
        folder_win = gtk_scrolled_window_new (NULL, NULL);
@@ -756,9 +1260,7 @@ modest_main_window_new (void)
        gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->contents_widget),
                                        GTK_POLICY_NEVER,
                                        GTK_POLICY_AUTOMATIC);
-
-       wrap_in_scrolled_window (folder_win, GTK_WIDGET(priv->folder_view));
-       wrap_in_scrolled_window (priv->contents_widget, GTK_WIDGET(priv->header_view));
+       /* gtk_widget_show (priv->contents_widget); */
 
        /* paned */
        priv->main_paned = gtk_hpaned_new ();
@@ -769,63 +1271,32 @@ modest_main_window_new (void)
        /* putting it all together... */
        priv->main_vbox = gtk_vbox_new (FALSE, 6);
        gtk_box_pack_start (GTK_BOX(priv->main_vbox), priv->main_paned, TRUE, TRUE,0);
-
-       gtk_container_add (GTK_CONTAINER(self), priv->main_vbox);
-
-       /* Set window icon */
-       window_icon = modest_platform_get_icon (MODEST_APP_ICON);
-       gtk_window_set_icon (GTK_WINDOW (self), window_icon);
+       gtk_widget_show (priv->main_vbox);
        
-       /* Connect signals */
-       connect_signals (self);
-
-       /* Set account store */
-       tny_account_store_view_set_account_store (TNY_ACCOUNT_STORE_VIEW (priv->folder_view),
-                                                 TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()));
-
-       /* Check if accounts exist and show the account wizard if not */
-       gboolean accounts_exist = 
-               modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE);
-       
-       if (!accounts_exist)
-       {
-                       /* This is necessary to have the main window shown behind the dialog 
-                       It's an ugly hack... jschmid */
-                       gtk_widget_show_all(GTK_WIDGET(self));
-                       modest_ui_actions_on_accounts (NULL, MODEST_WINDOW(self));
-       }
-       
-       /* Do send & receive when we are idle */
-       /* TODO: Enable this again. I have commented it out because, 
-        * at least in scratchbox, this can cause us to start a second 
-        * update (in response to a connection change) when we are already 
-        * doing an update (started here, at startup). Tinymail doesn't like that.
-        * murrayc.
-        */
-       /* g_idle_add ((GSourceFunc)sync_accounts_cb, self); */
+       gtk_container_add (GTK_CONTAINER(self), priv->main_vbox);
        
        HildonProgram *app = hildon_program_get_instance ();
        hildon_program_add_window (app, HILDON_WINDOW (self));
        
-       /* Register HildonProgram  signal handlers: */
-       /* These are apparently deprecated, according to the 
-        * "HildonApp/HildonAppView to HildonProgram/HildonWindow migration guide",
-        * though the API reference does not mention that:
-        *
-       g_signal_connect (G_OBJECT(app), "topmost_status_lose",
-               G_CALLBACK (on_hildon_program_save_state), self);
-       g_signal_connect (G_OBJECT(app), "topmost_status_acquire",
-               G_CALLBACK (on_hildon_program_status_acquire), self);
-    */
        g_signal_connect (G_OBJECT(app), "notify::is-topmost",
                G_CALLBACK (on_hildon_program_is_topmost_notify), self);
+
+       g_signal_connect (G_OBJECT(self), "show",
+                         G_CALLBACK (modest_main_window_on_show), folder_win);
                
-       /* Load previous osso state, for instance if we are being restored from 
-        * hibernation:  */
-       modest_osso_load_state();
+       /* Set window icon */
+       window_icon = modest_platform_get_icon (MODEST_APP_ICON);
+       if (window_icon) {
+               gtk_window_set_icon (GTK_WINDOW (self), window_icon);
+               g_object_unref (window_icon);
+       }
 
-       /* Restore window & widget settings */
-       restore_settings (MODEST_MAIN_WINDOW(self));
+       /* Dont't restore settings here, 
+        * because it requires a gtk_widget_show(), 
+        * and we don't want to do that until later,
+        * so that the UI is not visible for non-menu D-Bus activation.
+        */
+       /* restore_settings (MODEST_MAIN_WINDOW(self), FALSE); */
 
        return MODEST_WINDOW(self);
 }
@@ -860,6 +1331,7 @@ modest_main_window_set_style (ModestMainWindow *self,
        ModestMainWindowPrivate *priv;
        ModestWindowPrivate *parent_priv;
        GtkAction *action;
+       gboolean active;
 
        g_return_if_fail (MODEST_IS_MAIN_WINDOW (self));
 
@@ -870,8 +1342,17 @@ modest_main_window_set_style (ModestMainWindow *self,
        if (priv->style == style)
                return;
 
-       /* Get toggle button */
-       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarToggleView");
+       /* Get toggle button and update the state if needed. This will
+         happen only when the set_style is not invoked from the UI,
+         for example when it's called from widget memory */
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToggleFolders");
+       active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
+       if ((active && style == MODEST_MAIN_WINDOW_STYLE_SIMPLE) ||
+          (!active && style == MODEST_MAIN_WINDOW_STYLE_SPLIT)) {
+              g_signal_handlers_block_by_func (action, modest_ui_actions_toggle_folders_view, self);
+              gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), !active);
+              g_signal_handlers_unblock_by_func (action, modest_ui_actions_toggle_folders_view, self);
+       }
 
        priv->style = style;
        switch (style) {
@@ -883,10 +1364,6 @@ modest_main_window_set_style (ModestMainWindow *self,
                /* Reparent the contents widget to the main vbox */
                gtk_widget_reparent (priv->contents_widget, priv->main_vbox);
 
-               g_signal_handlers_block_by_func (action, modest_ui_actions_toggle_folders_view, self);
-               gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE);
-               g_signal_handlers_unblock_by_func (action, modest_ui_actions_toggle_folders_view, self);
-
                break;
        case MODEST_MAIN_WINDOW_STYLE_SPLIT:
                /* Remove header view */
@@ -897,10 +1374,6 @@ modest_main_window_set_style (ModestMainWindow *self,
                gtk_paned_add2 (GTK_PANED (priv->main_paned), priv->contents_widget);
                gtk_container_add (GTK_CONTAINER (priv->main_vbox), priv->main_paned);
 
-               g_signal_handlers_block_by_func (action, modest_ui_actions_toggle_folders_view, self);
-               gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), FALSE);
-               g_signal_handlers_unblock_by_func (action, modest_ui_actions_toggle_folders_view, self);
-
                break;
        default:
                g_return_if_reached ();
@@ -991,264 +1464,88 @@ modest_main_window_show_toolbar (ModestWindow *self,
        
                priv->progress_toolitem = GTK_WIDGET (gtk_tool_item_new ());
                priv->cancel_toolitem = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarCancel");
-               priv->refresh_toolitem = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarSendReceive");
-               priv->sort_toolitem = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarSort");
-               gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (priv->progress_toolitem), TRUE);
-               gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->progress_toolitem), TRUE);
-               gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (priv->cancel_toolitem), FALSE);
-               gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->cancel_toolitem), FALSE);
-
-               /* Add ProgressBar (Transfer toolbar) */ 
-               priv->progress_bar = modest_progress_bar_widget_new ();
-               gtk_widget_set_no_show_all (priv->progress_bar, TRUE);
-               placeholder = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ProgressBarView");
-               insert_index = gtk_toolbar_get_item_index(GTK_TOOLBAR (parent_priv->toolbar), GTK_TOOL_ITEM(placeholder));
-               gtk_container_add (GTK_CONTAINER (priv->progress_toolitem), priv->progress_bar);
-               gtk_toolbar_insert(GTK_TOOLBAR(parent_priv->toolbar), GTK_TOOL_ITEM (priv->progress_toolitem), insert_index);
-               
-               /* Connect cancel 'clicked' signal to abort progress mode */
-               g_signal_connect(priv->cancel_toolitem, "clicked",
-                                G_CALLBACK(cancel_progressbar),
-                                self);
-               
-               /* Add it to the observers list */
-               priv->progress_widgets = g_slist_prepend(priv->progress_widgets, priv->progress_bar);
-
-               /* Add to window */
-               hildon_window_add_toolbar (HILDON_WINDOW (self), 
-                                          GTK_TOOLBAR (parent_priv->toolbar));
-
-               /* Set reply button tap and hold menu */
-               reply_button = gtk_ui_manager_get_widget (parent_priv->ui_manager, 
-                                                         "/ToolBar/ToolbarMessageReply");
-               menu = gtk_ui_manager_get_widget (parent_priv->ui_manager,
-                                                 "/ToolbarReplyCSM");
-               gtk_widget_tap_and_hold_setup (GTK_WIDGET (reply_button), menu, NULL, 0);
-
-               /* Set send & receive button tap and hold menu */
-               on_account_update (TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()),
-                                  NULL, self);
-       }
-
-       if (show_toolbar) {
-               /* Quick hack: this prevents toolbar icons "dance" when progress bar show status is changed */ 
-               /* TODO: resize mode migth be GTK_RESIZE_QUEUE, in order to avoid unneccesary shows */
-               gtk_container_set_resize_mode (GTK_CONTAINER(parent_priv->toolbar), GTK_RESIZE_IMMEDIATE);
-
-               gtk_widget_show (GTK_WIDGET (parent_priv->toolbar));
-               set_toolbar_mode (MODEST_MAIN_WINDOW(self), TOOLBAR_MODE_NORMAL);
-       } else
-               gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar));
-
-}
-
-static gint
-compare_display_names (ModestAccountData *a,
-                      ModestAccountData *b)
-{
-       return strcmp (a->display_name, b->display_name);
-}
-
-static void 
-on_account_update (TnyAccountStore *account_store, 
-                  const gchar *account_name,
-                  gpointer user_data)
-{
-       GSList *account_names, *iter, *accounts;
-       ModestMainWindow *self;
-       ModestMainWindowPrivate *priv;
-       ModestWindowPrivate *parent_priv;
-       ModestAccountMgr *mgr;
-       gint i, num_accounts;                                   
-       GtkActionGroup *action_group;
-       GList *groups;
-       gchar *default_account;
-       GtkWidget *send_receive_button, *item;
-               
-       self = MODEST_MAIN_WINDOW (user_data);
-       priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self);
-       parent_priv = MODEST_WINDOW_GET_PRIVATE (self);
-
-       /* Get enabled account IDs */
-       mgr = modest_runtime_get_account_mgr ();
-       account_names = modest_account_mgr_account_names (mgr, TRUE);
-       iter = account_names;
-       accounts = NULL;
-
-       while (iter) {
-               ModestAccountData *account_data = 
-                       modest_account_mgr_get_account_data (mgr, (gchar*) iter->data);
-               accounts = g_slist_prepend (accounts, account_data);
-
-               iter = iter->next;
-       }
-       g_slist_free (account_names);
-
-       /* Order the list of accounts by its display name */
-       accounts = g_slist_sort (accounts, (GCompareFunc) compare_display_names);
-       num_accounts = g_slist_length (accounts);
-
-       /* Delete old send&receive popup items. We can not just do a
-          menu_detach because it does not work well with
-          tap_and_hold */
-       if (priv->accounts_popup)
-               gtk_container_foreach (GTK_CONTAINER (priv->accounts_popup), 
-                                      (GtkCallback) gtk_widget_destroy, NULL);
-
-       /* Delete old entries in the View menu. Do not free groups, it
-          belongs to Gtk+ */
-       groups = gtk_ui_manager_get_action_groups (parent_priv->ui_manager);
-       while (groups) {
-               if (!strcmp (MODEST_MAIN_WINDOW_ACTION_GROUP_ADDITIONS,
-                            gtk_action_group_get_name (GTK_ACTION_GROUP (groups->data)))) {
-                       gtk_ui_manager_remove_action_group (parent_priv->ui_manager, 
-                                                           GTK_ACTION_GROUP (groups->data));
-                       groups = NULL;
-                       /* Remove uis */
-                       if (priv->merge_ids) {
-                               for (i = 0; i < priv->merge_ids->len; i++)
-                                       gtk_ui_manager_remove_ui (parent_priv->ui_manager, priv->merge_ids->data[i]);
-                               g_byte_array_free (priv->merge_ids, TRUE);
-                       }
-                       /* We need to call this in order to ensure
-                          that the new actions are added in the right
-                          order (alphabetical */
-                       gtk_ui_manager_ensure_update (parent_priv->ui_manager);
-               } else 
-                       groups = g_list_next (groups);
-       }
-       priv->merge_ids = g_byte_array_sized_new (num_accounts);
-
-       /* Get send receive button */
-       send_receive_button = gtk_ui_manager_get_widget (parent_priv->ui_manager,
-                                                         "/ToolBar/ToolbarSendReceive");
-
-       /* Create the menu */
-       if (num_accounts > 1) {
-               if (!priv->accounts_popup)
-                       priv->accounts_popup = gtk_menu_new ();
-               item = gtk_menu_item_new_with_label (_("mcen_me_toolbar_sendreceive_all"));
-               gtk_menu_shell_append (GTK_MENU_SHELL (priv->accounts_popup), GTK_WIDGET (item));
-               g_signal_connect (G_OBJECT (item), 
-                                 "activate", 
-                                 G_CALLBACK (on_send_receive_csm_activated),
-                                 NULL);
-               item = gtk_separator_menu_item_new ();
-               gtk_menu_shell_append (GTK_MENU_SHELL (priv->accounts_popup), GTK_WIDGET (item));
-       }
-
-       /* Create a new action group */
-       default_account = modest_account_mgr_get_default_account (mgr);
-       action_group = gtk_action_group_new (MODEST_MAIN_WINDOW_ACTION_GROUP_ADDITIONS);
-       for (i = 0; i < num_accounts; i++) {
-               gchar *display_name = NULL;
-               
-               ModestAccountData *account_data = (ModestAccountData *) g_slist_nth_data (accounts, i);
-
-               /* Create display name. The default account is shown differently */
-               if (default_account && account_data->account_name && 
-                       !(strcmp (default_account, account_data->account_name) == 0)) {
-                       display_name = g_strdup_printf (_("mcen_me_toolbar_sendreceive_default"), 
-                                                       account_data->display_name);
-               }
-               else {
-                       display_name = g_strdup_printf (_("mcen_me_toolbar_sendreceive_mailbox_n"), 
-                                                       account_data->display_name);
-               }
+               priv->refresh_toolitem = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarSendReceive");
+               priv->sort_toolitem = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarSort");
+               gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (priv->progress_toolitem), TRUE);
+               gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->progress_toolitem), TRUE);
+               gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (priv->cancel_toolitem), FALSE);
+               gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->cancel_toolitem), FALSE);
 
-               /* Create action and add it to the action group. The
-                  action name must be the account name, this way we
-                  could know in the handlers the account to show */
-               if(account_data->account_name) {
-                       gchar* item_name, *refresh_action_name;
-                       guint8 merge_id;
-                       GtkAction *view_account_action, *refresh_account_action;
+               /* Add ProgressBar (Transfer toolbar) */ 
+               priv->progress_bar = modest_progress_bar_widget_new ();
+               gtk_widget_set_no_show_all (priv->progress_bar, TRUE);
+               placeholder = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ProgressBarView");
+               insert_index = gtk_toolbar_get_item_index(GTK_TOOLBAR (parent_priv->toolbar), GTK_TOOL_ITEM(placeholder));
+               gtk_container_add (GTK_CONTAINER (priv->progress_toolitem), priv->progress_bar);
+               gtk_toolbar_insert(GTK_TOOLBAR(parent_priv->toolbar), GTK_TOOL_ITEM (priv->progress_toolitem), insert_index);
+               
+               /* Connect cancel 'clicked' signal to abort progress mode */
+               g_signal_connect(priv->cancel_toolitem, "clicked",
+                                G_CALLBACK(cancel_progressbar),
+                                self);
+               
+               /* Add it to the observers list */
+               priv->progress_widgets = g_slist_prepend(priv->progress_widgets, priv->progress_bar);
 
-                       view_account_action = gtk_action_new (account_data->account_name,
-                                                             display_name, NULL, NULL);
-                       gtk_action_group_add_action (action_group, view_account_action);
+               /* Add to window */
+               hildon_window_add_toolbar (HILDON_WINDOW (self), 
+                                          GTK_TOOLBAR (parent_priv->toolbar));
 
-                       /* Add ui from account data. We allow 2^9-1 account
-                          changes in a single execution because we're
-                          downcasting the guint to a guint8 in order to use a
-                          GByteArray, it should be enough */
-                       item_name = g_strconcat (account_data->account_name, "Menu", NULL);
-                       merge_id = (guint8) gtk_ui_manager_new_merge_id (parent_priv->ui_manager);
-                       priv->merge_ids = g_byte_array_append (priv->merge_ids, &merge_id, 1);
-                       gtk_ui_manager_add_ui (parent_priv->ui_manager,
-                                              merge_id,
-                                              "/MenuBar/ViewMenu/ViewMenuAdditions",
-                                              item_name,
-                                              account_data->account_name,
-                                              GTK_UI_MANAGER_MENUITEM,
-                                              FALSE);
-       
-                       /* Connect the action signal "activate" */
-                       g_signal_connect (G_OBJECT (view_account_action),
-                                         "activate",
-                                         G_CALLBACK (on_show_account_action_activated),
-                                         self);
+               /* Set reply button tap and hold menu */
+               reply_button = gtk_ui_manager_get_widget (parent_priv->ui_manager, 
+                                                         "/ToolBar/ToolbarMessageReply");
+               menu = gtk_ui_manager_get_widget (parent_priv->ui_manager,
+                                                 "/ToolbarReplyCSM");
+               gtk_widget_tap_and_hold_setup (GTK_WIDGET (reply_button), menu, NULL, 0);
 
-                       /* Create the items for the Tools->Send&Receive submenu */
-                       refresh_action_name = g_strconcat ("SendReceive", account_data->account_name, NULL);
-                       refresh_account_action = gtk_action_new ((const gchar*) refresh_action_name, 
-                                                                display_name, NULL, NULL);
-                       gtk_action_group_add_action (action_group, refresh_account_action);
+               /* Set send & receive button tap and hold menu */
+               update_menus (MODEST_MAIN_WINDOW (self));
+       }
 
-                       merge_id = (guint8) gtk_ui_manager_new_merge_id (parent_priv->ui_manager);
-                       priv->merge_ids = g_byte_array_append (priv->merge_ids, &merge_id, 1);
-                       gtk_ui_manager_add_ui (parent_priv->ui_manager, 
-                                              merge_id,
-                                              "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsMenuAdditions",
-                                              item_name,
-                                              refresh_action_name,
-                                              GTK_UI_MANAGER_MENUITEM,
-                                              FALSE);
-                       g_free (refresh_action_name);
+       if (show_toolbar) {
+               /* Quick hack: this prevents toolbar icons "dance" when progress bar show status is changed */ 
+               /* TODO: resize mode migth be GTK_RESIZE_QUEUE, in order to avoid unneccesary shows */
+               gtk_container_set_resize_mode (GTK_CONTAINER(parent_priv->toolbar), GTK_RESIZE_IMMEDIATE);
 
-                       g_signal_connect_data (G_OBJECT (refresh_account_action), 
-                                              "activate", 
-                                              G_CALLBACK (on_refresh_account_action_activated), 
-                                              g_strdup (account_data->account_name),
-                                              (GClosureNotify) g_free,
-                                              0);
+               gtk_widget_show (GTK_WIDGET (parent_priv->toolbar));
+               set_toolbar_mode (MODEST_MAIN_WINDOW(self), TOOLBAR_MODE_NORMAL);
+       } else
+               gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar));
 
-                       /* Create item and add it to the send&receive
-                          CSM. If there is only one account then
-                          it'll be no menu */
-                       if (priv->accounts_popup) {
-                               item = gtk_menu_item_new_with_label (display_name);
-                               gtk_menu_shell_append (GTK_MENU_SHELL (priv->accounts_popup), GTK_WIDGET (item));
-                               g_signal_connect_data (G_OBJECT (item), 
-                                                      "activate", 
-                                                      G_CALLBACK (on_send_receive_csm_activated),
-                                                      g_strdup (account_data->account_name),
-                                                      (GClosureNotify) g_free,
-                                                      0);
-                       }
-                       g_free (item_name);
-               }
+}
 
-               /* Frees */
-               g_free (display_name);
-               modest_account_mgr_free_account_data (mgr, account_data);
-       }
-       gtk_ui_manager_insert_action_group (parent_priv->ui_manager, action_group, 1);
+static void
+on_account_inserted (TnyAccountStore *accoust_store,
+                     TnyAccount *account,
+                     gpointer user_data)
+{
+       update_menus (MODEST_MAIN_WINDOW (user_data));
+}
 
-       if (priv->accounts_popup) {
-               /* Mandatory in order to view the menu contents */
-               gtk_widget_show_all (priv->accounts_popup);
+static void
+on_account_changed (ModestAccountMgr* mgr,
+                    const gchar* account,
+                    gpointer user_data)
+{
+       gchar *default_account = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr ());
 
-               /* Setup tap_and_hold just if was not done before*/
-               if (!gtk_menu_get_attach_widget (GTK_MENU (priv->accounts_popup)))
-                       gtk_widget_tap_and_hold_setup (send_receive_button, priv->accounts_popup, NULL, 0);
-       }
+       /* Actually, we only want to know when another account has become
+        * the default account, but there is no default_account_changed
+        * signal in ModestAccountMgr. */
+       if(strcmp(account, default_account) == 0)
+               update_menus (MODEST_MAIN_WINDOW (user_data));
 
-       /* Frees */
-       g_slist_free (accounts);
        g_free (default_account);
 }
 
+static void
+on_account_removed (TnyAccountStore *accoust_store,
+                     TnyAccount *account,
+                     gpointer user_data)
+{
+       update_menus (MODEST_MAIN_WINDOW (user_data));
+}
+
 /* 
  * This function manages the key events used to navigate between
  * header and folder views (when the window is in split view)
@@ -1305,25 +1602,49 @@ create_empty_view (void)
 }
 
 static GtkWidget *
-create_details_widget (TnyAccount *account)
+create_details_widget (GtkWidget *styled_widget, TnyAccount *account)
 {
+       /* TODO: Clean up this function. It's a mess, with lots of copy/paste. murrayc. */
+       
        GtkWidget *vbox;
+       GtkWidget *label_w;
        gchar *label;
+       gchar *gray_color_markup;
 
        vbox = gtk_vbox_new (FALSE, 0);
 
+       /* Obtain the secondary text color. We need a realized widget, that's why 
+          we get styled_widget from outside */
+#ifndef MODEST_HAVE_HILDON0_WIDGETS
+       GdkColor color;
+       gtk_style_lookup_color (styled_widget->style, "SecondaryTextColor", &color);
+       gray_color_markup = modest_text_utils_get_color_string (&color);
+#else
+       // gray_color_markup is freed below
+       gray_color_markup = g_strdup ("#BBBBBB");
+#endif 
        /* Account description: */
        
-       if (modest_tny_account_is_virtual_local_folders (account)) {
+       if (modest_tny_account_is_virtual_local_folders (account)
+               || (modest_tny_account_is_memory_card_account (account))) {
+               gchar *tmp;
                /* Local folders: */
        
                /* Get device name */
-               gchar *device_name = modest_conf_get_string (modest_runtime_get_conf(),
+               gchar *device_name = NULL;
+               if (modest_tny_account_is_virtual_local_folders (account))
+                       device_name = modest_conf_get_string (modest_runtime_get_conf(),
                                                      MODEST_CONF_DEVICE_NAME, NULL);
-   
-               label = g_strdup_printf (_("mcen_fi_localroot_description"),
-                                        device_name);
-               gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (label), FALSE, FALSE, 0);
+               else
+                       device_name = g_strdup (tny_account_get_name (account));
+                                                     
+               tmp = g_strdup_printf (_("mcen_fi_localroot_description"), ""); //TODO: Why the ""?
+               label = g_markup_printf_escaped ("<span color='%s'>%s</span>%s",
+                                                gray_color_markup, tmp, device_name);
+               g_free (tmp);
+               label_w = gtk_label_new (NULL);
+               gtk_label_set_markup (GTK_LABEL (label_w), label);
+               gtk_box_pack_start (GTK_BOX (vbox), label_w, FALSE, FALSE, 0);
                g_free (device_name);
                g_free (label);
        } else {
@@ -1344,10 +1665,13 @@ create_details_widget (TnyAccount *account)
                        /* note: mcen_fi_localroot_description is something like "%s account"
                         * however, we should display "%s account: %s"... therefore, ugly tmp */
                        tmp   = g_strdup_printf (_("mcen_fi_remoteroot_account"),proto->str);
-                       label = g_strdup_printf ("%s: %s", tmp,tny_account_get_name (account));
+                       label = g_markup_printf_escaped ("<span color='%s'>%s:</span> %s", 
+                                                        gray_color_markup, tmp, tny_account_get_name (account));
                        g_free (tmp);
 
-                       gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (label), FALSE, FALSE, 0);
+                       label_w = gtk_label_new (NULL);
+                       gtk_label_set_markup (GTK_LABEL (label_w), label);
+                       gtk_box_pack_start (GTK_BOX (vbox), label_w, FALSE, FALSE, 0);
                        g_string_free (proto, TRUE);
                        g_free (label);
                }
@@ -1355,23 +1679,39 @@ create_details_widget (TnyAccount *account)
 
        /* Message count */
        TnyFolderStore *folder_store = TNY_FOLDER_STORE (account);
-       label = g_strdup_printf ("%s: %d", _("mcen_fi_rootfolder_messages"), 
-                                modest_tny_folder_store_get_message_count (folder_store));
-       gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (label), FALSE, FALSE, 0);
+       label = g_markup_printf_escaped ("<span color='%s'>%s:</span> %d", 
+                                        gray_color_markup, _("mcen_fi_rootfolder_messages"), 
+                                        modest_tny_folder_store_get_message_count (folder_store));
+       label_w = gtk_label_new (NULL);
+       gtk_label_set_markup (GTK_LABEL (label_w), label);
+       gtk_box_pack_start (GTK_BOX (vbox), label_w, FALSE, FALSE, 0);
        g_free (label);
 
        /* Folder count */
-       label = g_strdup_printf ("%s: %d", _("mcen_fi_rootfolder_folders"), 
-                                modest_tny_folder_store_get_folder_count (folder_store));
-       gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (label), FALSE, FALSE, 0);
+       label = g_markup_printf_escaped ("<span color='%s'>%s</span>: %d", 
+                                        gray_color_markup, 
+                                        _("mcen_fi_rootfolder_folders"), 
+                                        modest_tny_folder_store_get_folder_count (folder_store));
+       label_w = gtk_label_new (NULL);
+       gtk_label_set_markup (GTK_LABEL (label_w), label);
+       gtk_box_pack_start (GTK_BOX (vbox), label_w, FALSE, FALSE, 0);
        g_free (label);
 
        /* Size / Date */
-       if (modest_tny_account_is_virtual_local_folders (account)) {
-               /* FIXME: format size */
-               label = g_strdup_printf ("%s: %d", _("mcen_fi_rootfolder_size"), 
-                                        modest_tny_folder_store_get_local_size (folder_store));
-               gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (label), FALSE, FALSE, 0);
+       if (modest_tny_account_is_virtual_local_folders (account)
+               || modest_tny_account_is_memory_card_account (account)) {
+
+               gchar *size = modest_text_utils_get_display_size (
+                       modest_tny_folder_store_get_local_size (folder_store));
+               
+               label = g_markup_printf_escaped ("<span color='%s'>%s:</span> %s", 
+                                                gray_color_markup, _("mcen_fi_rootfolder_size"),
+                                                size);
+               g_free (size);
+               
+               label_w = gtk_label_new (NULL);
+               gtk_label_set_markup (GTK_LABEL (label_w), label);
+               gtk_box_pack_start (GTK_BOX (vbox), label_w, FALSE, FALSE, 0);
                g_free (label);
        } else if (TNY_IS_ACCOUNT(folder_store)) {
                TnyAccount *account = TNY_ACCOUNT(folder_store);
@@ -1388,25 +1728,46 @@ create_details_widget (TnyAccount *account)
                else
                        last_updated_string = g_strdup (_("mcen_va_never"));
 
-               label = g_strdup_printf ("%s: %s", _("mcen_ti_lastupdated"), last_updated_string);
-               gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (label), FALSE, FALSE, 0);
+               label = g_markup_printf_escaped ("<span color='%s'>%s:</span> %s", 
+                                                gray_color_markup, _("mcen_ti_lastupdated"), last_updated_string);
+               label_w = gtk_label_new (NULL);
+               gtk_label_set_markup (GTK_LABEL (label_w), label);
+               gtk_box_pack_start (GTK_BOX (vbox), label_w, FALSE, FALSE, 0);
                g_free (last_updated_string);
                g_free (label);
        }
 
+       g_free (gray_color_markup);
+
        /* Set alignment */
        gtk_container_foreach (GTK_CONTAINER (vbox), (GtkCallback) set_alignment, NULL);
 
        return vbox;
 }
 
+gboolean
+modest_main_window_send_receive_in_progress (ModestMainWindow *self)
+{
+       ModestMainWindowPrivate *priv = NULL;
+       
+       g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (self), FALSE);
+
+       priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+
+       return priv->send_receive_in_progress;
+}
+
 void 
 modest_main_window_notify_send_receive_initied (ModestMainWindow *self)
 {
        GtkAction *action = NULL;
        GtkWidget *widget = NULL;
-
+       ModestMainWindowPrivate *priv = NULL;
+               
        g_return_if_fail (MODEST_IS_MAIN_WINDOW (self));
+       priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+       
+       priv->send_receive_in_progress  = TRUE;
 
         action = modest_window_get_action (MODEST_WINDOW(self), "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveAllMenu");        
        gtk_action_set_sensitive (action, FALSE);
@@ -1421,8 +1782,12 @@ modest_main_window_notify_send_receive_completed (ModestMainWindow *self)
 {
        GtkAction *action = NULL;
        GtkWidget *widget = NULL;
-
+       ModestMainWindowPrivate *priv = NULL;
+               
        g_return_if_fail (MODEST_IS_MAIN_WINDOW (self));
+       priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+
+       priv->send_receive_in_progress  = FALSE;
 
         action = modest_window_get_action (MODEST_WINDOW(self), "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveAllMenu");        
        gtk_action_set_sensitive (action, TRUE);
@@ -1439,12 +1804,16 @@ _on_msg_count_changed (ModestHeaderView *header_view,
                       TnyFolderChange *change,
                       ModestMainWindow *main_window)
 {
+       printf ("DEBUG: %s\n", __FUNCTION__);
        gboolean folder_empty = FALSE;
-       TnyFolderChangeChanged changed;
+       gboolean all_marked_as_deleted = FALSE;
+       TnyFolderChangeChanged changed; 
+       ModestMainWindowPrivate *priv;
        
        g_return_if_fail (MODEST_IS_MAIN_WINDOW (main_window));
        g_return_if_fail (TNY_IS_FOLDER(folder));
        g_return_if_fail (TNY_IS_FOLDER_CHANGE(change));
+       priv = MODEST_MAIN_WINDOW_GET_PRIVATE (main_window);
        
        changed = tny_folder_change_get_changed (change);
        
@@ -1454,18 +1823,30 @@ _on_msg_count_changed (ModestHeaderView *header_view,
        else
                folder_empty = (tny_folder_get_all_count (TNY_FOLDER (folder)) == 0);
        
+       printf ("DEBUG: %s: folder_empty=%d\n", __FUNCTION__, folder_empty);
+
+/*     Check header removed  (hide marked as DELETED headers) */
+       if (changed & TNY_FOLDER_CHANGE_CHANGED_EXPUNGED_HEADERS) {
+               modest_header_view_refilter (MODEST_HEADER_VIEW(priv->header_view));
+       }
+
+       /* Check if all messages are marked to be deleted */
+       all_marked_as_deleted = modest_header_view_is_empty (header_view);
+       folder_empty = folder_empty || all_marked_as_deleted ;
+       
        /* Set contents style of headers view */
        if (folder_empty)  {
                modest_main_window_set_contents_style (main_window,
                                                       MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY);
+               gtk_widget_grab_focus (GTK_WIDGET (priv->folder_view));
        }
        else {
                modest_main_window_set_contents_style (main_window,
                                                       MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS);
-       }
-       
+       }       
 }
 
+
 void 
 modest_main_window_set_contents_style (ModestMainWindow *self, 
                                       ModestMainWindowContentsStyle style)
@@ -1502,23 +1883,31 @@ modest_main_window_set_contents_style (ModestMainWindow *self,
        switch (priv->contents_style) {
        case MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS:
                wrap_in_scrolled_window (priv->contents_widget, GTK_WIDGET (priv->header_view));
+               modest_maemo_set_thumbable_scrollbar (GTK_SCROLLED_WINDOW(priv->contents_widget),
+                                                     TRUE);
                break;
        case MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS:
        {
-               /* TODO: show here account details */
                TnyFolderStore *selected_folderstore = 
                        modest_folder_view_get_selected (priv->folder_view);
                if (TNY_IS_ACCOUNT (selected_folderstore)) {    
-                       priv->details_widget = create_details_widget (
-                               TNY_ACCOUNT (selected_folderstore));
+                 priv->details_widget = create_details_widget (GTK_WIDGET (self),
+                                                               TNY_ACCOUNT (selected_folderstore));
 
                        wrap_in_scrolled_window (priv->contents_widget, 
                                         priv->details_widget);
                }
+               g_object_unref (selected_folderstore);
+               modest_maemo_set_thumbable_scrollbar (GTK_SCROLLED_WINDOW(priv->contents_widget),
+                                                     FALSE);
+
+               
                break;
        }
        case MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY:
                wrap_in_scrolled_window (priv->contents_widget, GTK_WIDGET (priv->empty_view));
+               modest_maemo_set_thumbable_scrollbar (GTK_SCROLLED_WINDOW(priv->contents_widget),
+                                                     FALSE);
                break;
        default:
                g_return_if_reached ();
@@ -1528,20 +1917,33 @@ modest_main_window_set_contents_style (ModestMainWindow *self,
        gtk_widget_show_all (priv->contents_widget);
 }
 
+ModestMainWindowContentsStyle
+modest_main_window_get_contents_style (ModestMainWindow *self)
+{
+       ModestMainWindowPrivate *priv;
+
+       g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (self), -1);
+
+       priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+       return priv->contents_style;
+}
+
+
 static void 
 on_configuration_key_changed (ModestConf* conf, 
                              const gchar *key, 
-                             ModestConfEvent event, 
+                             ModestConfEvent event,
+                             ModestConfNotificationId id, 
                              ModestMainWindow *self)
 {
-       ModestMainWindowPrivate *priv;
+       ModestMainWindowPrivate *priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
        TnyAccount *account;
 
-       if (!key || strcmp (key, MODEST_CONF_DEVICE_NAME))
+       if (!key || 
+           priv->notification_id != id ||
+           strcmp (key, MODEST_CONF_DEVICE_NAME))
                return;
 
-       priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
-
        if (priv->contents_style != MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS)
                return;
 
@@ -1570,6 +1972,7 @@ on_configuration_key_changed (ModestConf* conf,
                g_free (new_text);
                g_list_free (children);
        }
+       g_object_unref (account);
 }
 
 static gboolean
@@ -1604,6 +2007,10 @@ set_toolbar_mode (ModestMainWindow *self,
        parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
        priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
 
+       /* In case this was called before the toolbar exists: */
+       if (!(parent_priv->toolbar))
+               return;
+
        g_return_if_fail (GTK_IS_TOOLBAR(parent_priv->toolbar)); 
        
        sort_action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarSort");
@@ -1616,16 +2023,16 @@ set_toolbar_mode (ModestMainWindow *self,
        /* Show and hide toolbar items */
        switch (mode) {
        case TOOLBAR_MODE_NORMAL:
-               if (sort_action) 
+               if (sort_action)
                        gtk_action_set_visible (sort_action, TRUE);
-               if (refresh_action) 
+               if (refresh_action)
                        gtk_action_set_visible (refresh_action, TRUE);
                if (priv->progress_toolitem) {
                        gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->progress_toolitem), FALSE);
                        gtk_widget_hide (priv->progress_toolitem);
                }
                if (priv->progress_bar)
-                       gtk_widget_hide (priv->progress_bar);                   
+                       gtk_widget_hide (priv->progress_bar);
                
                if (cancel_action)
                        gtk_action_set_visible (cancel_action, FALSE);
@@ -1646,7 +2053,7 @@ set_toolbar_mode (ModestMainWindow *self,
                        gtk_widget_show (priv->progress_toolitem);
                }
                if (priv->progress_bar)
-                       gtk_widget_show (priv->progress_bar);                   
+                       gtk_widget_show (priv->progress_bar);
 
                /* Show toolbar if it's hiden (optimized view ) */
                if (priv->optimized_view)
@@ -1666,10 +2073,10 @@ cancel_progressbar (GtkToolButton *toolbutton,
        
        priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
 
-       /* Get operation observers and cancel its current operation */
+       /* Get operation observers and cancel all the operations */
        tmp = priv->progress_widgets;
        while (tmp) {
-               modest_progress_object_cancel_current_operation (MODEST_PROGRESS_OBJECT(tmp->data));
+               modest_progress_object_cancel_all_operations (MODEST_PROGRESS_OBJECT(tmp->data));
                tmp=g_slist_next(tmp);
        }
 }
@@ -1707,7 +2114,6 @@ on_queue_changed (ModestMailOperationQueue *queue,
        ModestToolBarModes mode;
        GSList *tmp;
        gboolean mode_changed = FALSE;
-/*     ModestMailOperationStatus status; */
 
        g_return_if_fail (MODEST_IS_MAIN_WINDOW (self));
        priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
@@ -1715,8 +2121,8 @@ on_queue_changed (ModestMailOperationQueue *queue,
        /* Get toolbar mode from operation id*/
        op_type = modest_mail_operation_get_type_operation (mail_op);
        switch (op_type) {
-       case MODEST_MAIL_OPERATION_TYPE_SEND:
        case MODEST_MAIL_OPERATION_TYPE_RECEIVE:
+       case MODEST_MAIL_OPERATION_TYPE_OPEN:
                mode = TOOLBAR_MODE_TRANSFER;
                if (priv->current_toolbar_mode == TOOLBAR_MODE_NORMAL)
                        mode_changed = TRUE;
@@ -1732,8 +2138,9 @@ on_queue_changed (ModestMailOperationQueue *queue,
        switch (type) {
        case MODEST_MAIL_OPERATION_QUEUE_OPERATION_ADDED:
                if (mode == TOOLBAR_MODE_TRANSFER) {
-                       if (mode_changed)
+                       if (mode_changed) {
                                set_toolbar_transfer_mode(self);                    
+                       }
                        while (tmp) {
                                modest_progress_object_add_operation (MODEST_PROGRESS_OBJECT (tmp->data),
                                                                      mail_op);
@@ -1752,8 +2159,7 @@ on_queue_changed (ModestMailOperationQueue *queue,
                        
                        /* If no more operations are being observed, NORMAL mode is enabled again */
                        if (observers_empty (self)) {
-                               set_toolbar_mode (self, TOOLBAR_MODE_NORMAL);
-                               
+                               set_toolbar_mode (self, TOOLBAR_MODE_NORMAL);                           
                        }
                }
 
@@ -1762,33 +2168,62 @@ on_queue_changed (ModestMailOperationQueue *queue,
 
 }
 
-static void 
-on_show_account_action_activated  (GtkAction *action,
-                                  gpointer user_data)
+static void
+set_account_visible(ModestMainWindow *self, const gchar *acc_name)
 {
-       ModestAccountData *acc_data;
-       ModestMainWindow *self;
-       ModestMainWindowPrivate *priv;
-       ModestAccountMgr *mgr;
-       const gchar *acc_name;
-
-       self = MODEST_MAIN_WINDOW (user_data);
-       priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+       ModestMainWindowPrivate *priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
 
        /* Get account data */
-       acc_name = gtk_action_get_name (action);
-       mgr = modest_runtime_get_account_mgr ();
-       acc_data = modest_account_mgr_get_account_data (mgr, acc_name);
+       ModestAccountMgr *mgr = modest_runtime_get_account_mgr ();
+       ModestAccountData *acc_data = modest_account_mgr_get_account_data (mgr, acc_name);
 
        /* Set the new visible & active account */
-       if (acc_data->store_account) { 
+       if (acc_data && acc_data->store_account) { 
                modest_folder_view_set_account_id_of_visible_server_account (priv->folder_view,
                                                                             acc_data->store_account->account_name);
                modest_window_set_active_account (MODEST_WINDOW (self), acc_data->account_name);
        }
+       
+       modest_folder_view_select_first_inbox_or_local (priv->folder_view);
 
        /* Free */
-       modest_account_mgr_free_account_data (mgr, acc_data);
+       if (acc_data)
+               modest_account_mgr_free_account_data (mgr, acc_data);
+}
+
+/* Make sure that at least one account is "viewed": */
+static void
+set_at_least_one_account_visible(ModestMainWindow *self)
+{
+       ModestMainWindowPrivate *priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+       ModestAccountMgr *account_mgr = modest_runtime_get_account_mgr();
+
+       if (!(priv->folder_view)) {
+               /* It is too early to do this. */
+               return; 
+       }
+       
+       const gchar *active_server_account_name = 
+               modest_folder_view_get_account_id_of_visible_server_account (priv->folder_view);        
+       if (!active_server_account_name ||
+               !modest_account_mgr_account_exists (account_mgr, active_server_account_name, TRUE))
+       {
+               gchar* first_modest_name = modest_account_mgr_get_first_account_name (account_mgr);
+               if (first_modest_name) {
+                       set_account_visible (self, first_modest_name);
+                       g_free (first_modest_name);
+               }
+       }
+}
+
+static void 
+on_show_account_action_activated  (GtkAction *action,
+                                  gpointer user_data)
+{
+       ModestMainWindow *self = MODEST_MAIN_WINDOW (user_data);
+
+       const gchar *acc_name = gtk_action_get_name (action);
+       set_account_visible (self, acc_name);
 }
 
 static void
@@ -1803,6 +2238,7 @@ refresh_account (const gchar *account_name)
                modest_ui_actions_do_send_receive_all (win);
        else
                modest_ui_actions_do_send_receive (account_name, win);
+       
 }
 
 static void 
@@ -1818,3 +2254,146 @@ on_send_receive_csm_activated (GtkMenuItem *item,
 {
        refresh_account ((const gchar*) user_data);
 }
+
+static gboolean
+on_zoom_minus_plus_not_implemented (ModestWindow *window)
+{
+       g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (window), FALSE);
+
+       hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_cannot_zoom_here"));
+       return FALSE;
+
+}
+
+static gboolean
+on_folder_view_focus_in (GtkWidget *widget,
+                        GdkEventFocus *event,
+                        gpointer userdata)
+{
+       ModestMainWindow *main_window = NULL;
+       
+       g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (userdata), FALSE);
+       main_window = MODEST_MAIN_WINDOW (userdata);
+       
+       /* Update toolbar dimming state */
+       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window));
+
+       return FALSE;
+}
+
+static gboolean
+on_header_view_focus_in (GtkWidget *widget,
+                        GdkEventFocus *event,
+                        gpointer userdata)
+{
+       ModestMainWindow *main_window = NULL;
+       ModestMainWindowPrivate *priv = NULL;
+
+       g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (userdata), FALSE);
+       main_window = MODEST_MAIN_WINDOW (userdata);
+       priv = MODEST_MAIN_WINDOW_GET_PRIVATE (main_window);
+
+       /* Update toolbar dimming state */
+       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window));
+
+       return FALSE;
+}
+
+static void 
+modest_main_window_on_folder_selection_changed (ModestFolderView *folder_view,
+                                               TnyFolderStore *folder_store, 
+                                               gboolean selected,
+                                               ModestMainWindow *main_window)
+{
+       ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (main_window);
+       GtkAction *action = NULL;
+       gboolean show_reply = TRUE;
+       gboolean show_forward = TRUE;
+       gboolean show_cancel_send = FALSE;
+       gboolean show_clipboard = TRUE;
+       gboolean show_delete = TRUE;
+
+       if (selected) {
+               if (TNY_IS_ACCOUNT (folder_store)) {
+                       show_reply = show_forward = show_cancel_send = show_clipboard = show_delete = FALSE;
+               } else if (TNY_IS_FOLDER (folder_store)) {
+                       if (modest_tny_folder_is_local_folder (TNY_FOLDER (folder_store))) {
+                               TnyFolderType folder_type = modest_tny_folder_get_local_or_mmc_folder_type (
+                                       TNY_FOLDER (folder_store));
+                               switch (folder_type) {
+                               case TNY_FOLDER_TYPE_DRAFTS:
+                                       show_clipboard = show_delete = TRUE;
+                                       show_reply = show_forward = show_cancel_send = FALSE;
+                                       break;
+                               case TNY_FOLDER_TYPE_SENT:
+                                       show_forward = show_clipboard = show_delete = TRUE;
+                                       show_reply = show_cancel_send = FALSE;
+                                       break;
+                               case TNY_FOLDER_TYPE_OUTBOX:
+                                       show_clipboard = show_delete = show_cancel_send = TRUE;
+                                       show_reply = show_forward = FALSE;
+                                       break;
+                               default:
+                                       show_reply = show_forward = show_clipboard = show_delete = TRUE;
+                                       show_cancel_send = FALSE;
+                               }
+                       } else {
+                               show_reply = show_forward = show_clipboard = show_delete = TRUE;
+                               show_cancel_send = FALSE;
+                       }
+               }
+       }
+
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/HeaderViewCSM/HeaderViewCSMReply");
+       gtk_action_set_visible (action, show_reply);
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/HeaderViewCSM/HeaderViewCSMReplyAll");
+       gtk_action_set_visible (action, show_reply);
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/HeaderViewCSM/HeaderViewCSMForward");
+       gtk_action_set_visible (action, show_forward);
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/HeaderViewCSM/HeaderViewCSMCancelSending");
+       gtk_action_set_visible (action, show_cancel_send);
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/HeaderViewCSM/HeaderViewCSMCut");
+       gtk_action_set_visible (action, show_clipboard);
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/HeaderViewCSM/HeaderViewCSMCopy");
+       gtk_action_set_visible (action, show_clipboard);
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/HeaderViewCSM/HeaderViewCSMPaste");
+       gtk_action_set_visible (action, show_clipboard);
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/HeaderViewCSM/HeaderViewCSMDelete");
+       gtk_action_set_visible (action, show_delete);
+
+       /* We finally call to the ui actions handler, after updating properly
+        * the header view CSM */
+       modest_ui_actions_on_folder_selection_changed (folder_view, folder_store, selected, main_window);
+
+}
+
+gboolean 
+modest_main_window_on_msg_view_window_msg_changed (ModestMsgViewWindow *view_window,
+                                                  GtkTreeModel *model,
+                                                  GtkTreeRowReference *row_reference,
+                                                  ModestMainWindow *self)
+{
+       ModestMainWindowPrivate *priv = NULL;
+       GtkTreeModel *header_model = NULL;
+       GtkTreePath *path = NULL;
+
+       g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (view_window), FALSE);
+       g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (self), FALSE);
+       g_return_val_if_fail (gtk_tree_row_reference_valid (row_reference), FALSE);
+
+       priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self);
+       header_model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->header_view));
+
+       /* Do nothing if we changed the folder in the main view */
+       if (header_model != model)
+               return FALSE;
+
+       /* Select the message in the header view */
+       path = gtk_tree_row_reference_get_path (row_reference);
+       gtk_tree_view_set_cursor (GTK_TREE_VIEW (priv->header_view),
+                                 path, NULL, FALSE);
+       gtk_tree_path_free (path);
+
+       return TRUE;
+}
+