* leak fixes; free both list and its elements when we call modest_account_mgr_account...
[modest] / src / maemo / modest-main-window.c
index 712bf38..0204e87 100644 (file)
@@ -31,8 +31,9 @@
 #include <gtk/gtktreeviewcolumn.h>
 #include <tny-account-store-view.h>
 #include <tny-simple-list.h>
+#include <tny-maemo-conic-device.h>
 #include "modest-hildon-includes.h"
-
+#include "modest-defs.h"
 #include <string.h>
 
 #include "widgets/modest-main-window.h"
@@ -44,6 +45,7 @@
 #include "modest-widget-memory.h"
 #include "modest-window-priv.h"
 #include "modest-main-window-ui.h"
+#include "modest-main-window-ui-dimming.h"
 #include "modest-account-mgr.h"
 #include "modest-tny-account.h"
 #include "modest-conf.h"
 #include "modest-mail-operation.h"
 #include "modest-icon-names.h"
 #include "modest-progress-bar-widget.h"
+#include "modest-text-utils.h"
+#include "modest-ui-dimming-manager.h"
+#include "maemo/modest-osso-state-saving.h"
+
+#ifdef MODEST_HILDON_VERSION_0
+#include <hildon-widgets/hildon-program.h>
+#else
+#include <hildon/hildon-program.h>
+#endif /*MODEST_HILDON_VERSION_0*/
+
+#define MODEST_MAIN_WINDOW_ACTION_GROUP_ADDITIONS "ModestMainWindowActionAdditions"
+
+#define XALIGN 0.5
+#define YALIGN 0.5
+#define XSPACE 1
+#define YSPACE 0
 
 /* 'private'/'protected' functions */
 static void modest_main_window_class_init    (ModestMainWindowClass *klass);
@@ -63,19 +81,23 @@ static gboolean modest_main_window_window_state_event (GtkWidget *widget,
                                                           gpointer userdata);
 
 static void connect_signals (ModestMainWindow *self);
-static void restore_sizes (ModestMainWindow *self);
-static void save_sizes (ModestMainWindow *self);
+
+static void restore_settings (ModestMainWindow *self, gboolean do_folder_view_too);
+static void save_state (ModestWindow *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_account_update                 (TnyAccountStore *account_store, 
-                                              gchar *account_name,
+                                              const gchar *account_name,
                                               gpointer user_data);
 
 static gboolean on_inner_widgets_key_pressed  (GtkWidget *widget,
@@ -87,9 +109,36 @@ static void on_configuration_key_changed      (ModestConf* conf,
                                               ModestConfEvent event, 
                                               ModestMainWindow *self);
 
-static void 
-set_toolbar_mode (ModestMainWindow *self, 
-                 ModestToolBarModes mode);
+static void set_toolbar_mode                  (ModestMainWindow *self, 
+                                              ModestToolBarModes mode);
+
+static gboolean set_toolbar_transfer_mode     (ModestMainWindow *self); 
+
+static void on_show_account_action_activated      (GtkAction *action,
+                                                  gpointer user_data);
+
+static void on_refresh_account_action_activated   (GtkAction *action,
+                                                  gpointer user_data);
+
+static void on_send_receive_csm_activated         (GtkMenuItem *item,
+                                                  gpointer user_data);
+
+static void
+_on_msg_count_changed (ModestHeaderView *header_view,
+                      TnyFolder *folder,
+                      TnyFolderChange *change,
+                      ModestMainWindow *main_window);
+
+static void
+modest_main_window_cleanup_queue_error_signals (ModestMainWindow *self);
+
+
+static GtkWidget * create_empty_view (void);
+
+static gchar * 
+translate_func (const gchar *msgid,
+               const gchar *domain_name);
+
 
 /* list my signals */
 enum {
@@ -98,13 +147,13 @@ enum {
        LAST_SIGNAL
 };
 
-
 typedef struct _ModestMainWindowPrivate ModestMainWindowPrivate;
 struct _ModestMainWindowPrivate {
        GtkWidget *msg_paned;
        GtkWidget *main_paned;
        GtkWidget *main_vbox;
        GtkWidget *contents_widget;
+       GtkWidget *empty_view;
 
        /* Progress observers */
        GtkWidget        *progress_bar;
@@ -115,17 +164,32 @@ struct _ModestMainWindowPrivate {
        GtkWidget   *cancel_toolitem;
        GtkWidget   *sort_toolitem;
        GtkWidget   *refresh_toolitem;
+       ModestToolBarModes current_toolbar_mode;
+
+       /* Merge ids used to add/remove accounts to the ViewMenu*/
+       GByteArray *merge_ids;
 
        /* On-demand widgets */
        GtkWidget *accounts_popup;
        GtkWidget *details_widget;
 
+       /* Optimized view enabled */
+       gboolean optimized_view;
+
+       /* Optimized view enabled */
+       gboolean send_receive_in_progress;
 
        ModestHeaderView *header_view;
        ModestFolderView *folder_view;
 
        ModestMainWindowStyle style;
        ModestMainWindowContentsStyle contents_style;
+
+       guint progress_bar_timeout;
+
+       /* Signal handler UIDs */
+       gint queue_changed_handler_uid; 
+       GList *queue_err_signals;
 };
 #define MODEST_MAIN_WINDOW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
                                                 MODEST_TYPE_MAIN_WINDOW, \
@@ -146,15 +210,35 @@ static GtkWindowClass *parent_class = NULL;
 
 
 /* Private actions */
+/* This is the context sensitive menu: */
 static const GtkActionEntry modest_folder_view_action_entries [] = {
 
        /* Folder View CSM actions */
-       { "FolderViewCSMNewFolder", NULL, N_("FIXME: New Folder"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_new_folder) },
+       { "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_("FIXME: Paste"), NULL, NULL, NULL },
-       { "FolderViewCSMDeleteFolder", NULL, N_("FIXME: Delete"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_delete_folder) },
-       { "FolderViewCSMSearchMessages", NULL, N_("mcen_me_inbox_search"), NULL, NULL, NULL },
-       { "FolderViewCSMHelp", NULL, N_("mcen_me_inbox_help"), NULL, NULL, NULL },
+       { "FolderViewCSMPasteMsgs", NULL, N_("mcen_me_inbox_paste"), NULL, NULL, NULL },
+       { "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) },
+};
+
+static const GtkActionEntry modest_header_view_action_entries [] = {
+
+       /* Header View CSM actions */
+       { "HeaderViewCSMOpen",          NULL,  N_("mcen_me_inbox_open"),        NULL,       NULL, G_CALLBACK (modest_ui_actions_on_open) },
+       { "HeaderViewCSMReply",         NULL,  N_("mcen_me_inbox_reply"),       NULL,      NULL, G_CALLBACK (modest_ui_actions_on_reply) },
+       { "HeaderViewCSMReplyAll",      NULL,  N_("mcen_me_inbox_replytoall"),  NULL,      NULL, G_CALLBACK (modest_ui_actions_on_reply_all) },
+       { "HeaderViewCSMForward",       NULL,  N_("mcen_me_inbox_forward"),     NULL,      NULL, G_CALLBACK (modest_ui_actions_on_forward) },
+       { "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 },
+       { "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 },
 };
 
 /************************************************************************/
@@ -188,16 +272,15 @@ modest_main_window_class_init (ModestMainWindowClass *klass)
 {
        GObjectClass *gobject_class;
        gobject_class = (GObjectClass*) klass;
-       ModestWindowClass *modest_window_class;
-
-       modest_window_class = (ModestWindowClass *) klass;
+       ModestWindowClass *modest_window_class = (ModestWindowClass *) klass;
 
        parent_class            = g_type_class_peek_parent (klass);
        gobject_class->finalize = modest_main_window_finalize;
 
-       modest_window_class->show_toolbar_func = modest_main_window_show_toolbar;
-
        g_type_class_add_private (gobject_class, sizeof(ModestMainWindowPrivate));
+       
+       modest_window_class->show_toolbar_func = modest_main_window_show_toolbar;
+       modest_window_class->save_state_func = save_state;
 }
 
 static void
@@ -207,6 +290,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;
@@ -215,12 +299,17 @@ modest_main_window_init (ModestMainWindow *obj)
        priv->contents_widget  = NULL;
        priv->accounts_popup  = NULL;
        priv->details_widget  = NULL;
-
+       priv->empty_view  = NULL;
        priv->progress_widgets  = NULL;
        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;
 }
 
 static void
@@ -230,8 +319,22 @@ modest_main_window_finalize (GObject *obj)
 
        priv = MODEST_MAIN_WINDOW_GET_PRIVATE(obj);
 
+       modest_main_window_cleanup_queue_error_signals ((ModestMainWindow *) obj);
+
        g_slist_free (priv->progress_widgets);
 
+       g_byte_array_free (priv->merge_ids, TRUE);
+
+       if (priv->progress_bar_timeout > 0) {
+               g_source_remove (priv->progress_bar_timeout);
+               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);
 }
 
@@ -261,9 +364,8 @@ modest_main_window_get_child_widget (ModestMainWindow *self,
 }
 
 
-
 static void
-restore_sizes (ModestMainWindow *self)
+restore_settings (ModestMainWindow *self, gboolean do_folder_view_too)
 {
        ModestConf *conf;
        ModestMainWindowPrivate *priv;
@@ -271,29 +373,44 @@ restore_sizes (ModestMainWindow *self)
        priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
 
        conf = modest_runtime_get_conf ();
-       
-       modest_widget_memory_restore (conf, G_OBJECT(priv->main_paned),
-                                     "modest-main-paned");
+
+       modest_widget_memory_restore (conf, G_OBJECT(self),
+                                     MODEST_CONF_MAIN_WINDOW_KEY);
+
        modest_widget_memory_restore (conf, G_OBJECT(priv->header_view),
-                                     "header-view");
-       modest_widget_memory_restore (conf, G_OBJECT(self), 
-                                     "modest-main-window");
+                                     MODEST_CONF_HEADER_VIEW_KEY);
+
+       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);
+
+       /* We need to force a redraw here in order to get the right
+          position of the horizontal paned separator */
+       gtk_widget_show (GTK_WIDGET (self));
 }
 
 
 static void
-save_sizes (ModestMainWindow *self)
+save_state (ModestWindow *window)
 {
        ModestConf *conf;
+       ModestMainWindow* self = MODEST_MAIN_WINDOW(window);
        ModestMainWindowPrivate *priv;
                
        priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
        conf = modest_runtime_get_conf ();
        
-       modest_widget_memory_save (conf,G_OBJECT(self), "modest-main-window");
-       modest_widget_memory_save (conf, G_OBJECT(priv->main_paned),
-                                  "modest-main-paned");
-       modest_widget_memory_save (conf, G_OBJECT(priv->header_view), "header-view");
+       modest_widget_memory_save (conf,G_OBJECT(self), 
+                                  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->folder_view), 
+                                  MODEST_CONF_FOLDER_VIEW_KEY);
 }
 
 static void
@@ -311,23 +428,164 @@ wrap_in_scrolled_window (GtkWidget *win, GtkWidget *widget)
 static gboolean
 on_delete_event (GtkWidget *widget, GdkEvent  *event, ModestMainWindow *self)
 {
-       save_sizes (self);
+       modest_window_save_state (MODEST_WINDOW(self));
        return FALSE;
 }
 
+typedef struct
+{
+       ModestMainWindow *self;
+       TnySendQueue *queue;
+       TnyHeader *header;
+} OnResponseInfo;
+
+static void
+on_response (GtkDialog *dialog, gint arg1, gpointer user_data)
+{
+       OnResponseInfo *info = (OnResponseInfo *) user_data;
+       ModestMainWindow *self = info->self;
+       TnyHeader *header = info->header;
+       TnySendQueue *queue = info->queue;
+
+       if (arg1 == GTK_RESPONSE_YES) {
+               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);
+       }
+
+       g_object_unref (queue);
+       g_object_unref (header);
+       g_object_unref (self);
+
+       gtk_widget_destroy (GTK_WIDGET (dialog));
+       g_slice_free (OnResponseInfo, info);
+}
+
+
+static void
+on_sendqueue_error_happened (TnySendQueue *self, TnyHeader *header, TnyMsg *msg, GError *err, ModestMainWindow *user_data)
+{
+       if (header) {
+               gchar *str = g_strdup_printf ("%s. Do you want to remove the message (%s)?",
+                       err->message, tny_header_get_subject (header));
+               OnResponseInfo *info = g_slice_new (OnResponseInfo);
+               GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (user_data), 0,
+                       GTK_MESSAGE_ERROR, GTK_BUTTONS_YES_NO, str);
+               g_free (str);
+               info->queue = g_object_ref (self);
+               info->self = g_object_ref (user_data);
+               info->header = g_object_ref (header);
+               g_signal_connect (G_OBJECT (dialog), "response",
+                       G_CALLBACK (on_response), info);
+               gtk_widget_show_all (dialog);
+       }
+}
+
+typedef struct {
+       TnySendQueue *queue;
+       guint signal;
+} QueueErrorSignal;
+
+static void
+modest_main_window_cleanup_queue_error_signals (ModestMainWindow *self)
+{
+       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;
+}
 
 static void
-on_connection_changed (TnyDevice *device, gboolean online, ModestMainWindow *self)
+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): */
-       if (online) {
-               do_send_receive (MODEST_WINDOW (self));
+
+       TnyDevice *device = tny_account_store_get_device (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;
+               
+       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 ();
+       
+       /* 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);
        }
+
+       modest_account_mgr_free_account_names (account_names);
+       account_names = NULL;
+       
+       modest_ui_actions_do_send_receive (NULL, MODEST_WINDOW (self));
+}
+
+static void
+_folder_view_csm_menu_activated (GtkWidget *widget, gpointer user_data)
+{
+       g_return_if_fail (MODEST_IS_MAIN_WINDOW (user_data));
+
+       /* Update dimmed */     
+       modest_window_check_dimming_rules_group (MODEST_WINDOW (user_data), "ModestMenuDimmingRules");  
 }
 
+static void
+_header_view_csm_menu_activated (GtkWidget *widget, gpointer user_data)
+{
+       g_return_if_fail (MODEST_IS_MAIN_WINDOW (user_data));
+
+       /* Update visibility */
 
+       /* Update dimmed */     
+       modest_window_check_dimming_rules_group (MODEST_WINDOW (user_data), "ModestMenuDimmingRules");  
+}
 
 static void
 connect_signals (ModestMainWindow *self)
@@ -338,7 +596,7 @@ connect_signals (ModestMainWindow *self)
        
        priv = MODEST_MAIN_WINDOW_GET_PRIVATE(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);
@@ -347,12 +605,13 @@ connect_signals (ModestMainWindow *self)
        g_signal_connect (G_OBJECT(priv->folder_view), "folder-display-name-changed",
                          G_CALLBACK(modest_ui_actions_on_folder_display_name_changed), 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);
        /* header view */
-/*     g_signal_connect (G_OBJECT(priv->header_view), "status_update", */
-/*                       G_CALLBACK(modest_ui_actions_on_header_status_update), self); */
        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",
@@ -361,67 +620,180 @@ connect_signals (ModestMainWindow *self)
                          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);
+
+       /* 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);
+       
        /* window */
        g_signal_connect (G_OBJECT(self), "delete-event", G_CALLBACK(on_delete_event), self);
        g_signal_connect (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 */
-       g_signal_connect (G_OBJECT (modest_runtime_get_mail_operation_queue ()),
-                         "queue-changed",
-                         G_CALLBACK (on_queue_changed),
-                         self);
+       priv->queue_changed_handler_uid = 
+               g_signal_connect (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), 
+                         "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),
+                         "account_update", G_CALLBACK (on_account_update),
                          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_device()), "connection_changed",
-                         G_CALLBACK(on_connection_changed), self);
+       g_signal_connect (G_OBJECT(modest_runtime_get_account_store()), 
+                         "connecting-finished",
+                         G_CALLBACK(on_account_store_connecting_finished), self);
 }
 
+#if 0
 /** Idle handler, to send/receive at startup .*/
 gboolean
 sync_accounts_cb (ModestMainWindow *win)
 {
-       do_send_receive (MODEST_WINDOW(win));
+       modest_ui_actions_do_send_receive (NULL, MODEST_WINDOW (win));
        return FALSE; /* Do not call this idle handler again. */
 }
+#endif
+
+static void on_hildon_program_is_topmost_notify(GObject *self,
+       GParamSpec *propert_param, gpointer user_data)
+{
+       HildonProgram *app = HILDON_PROGRAM (self);
+       
+       /*
+       ModestWindow* self = MODEST_WINDOW(user_data);
+       */
+       
+       /* Note that use of hildon_program_set_can_hibernate() 
+        * is generally referred to as "setting the killable flag", 
+        * though hibernation does not seem equal to death.
+        * murrayc */
+                
+       if (hildon_program_get_is_topmost (app)) {
+               /* Prevent hibernation when the progam comes to the foreground,
+                * because hibernation should only happen when the application 
+                * is in the background: */
+               hildon_program_set_can_hibernate (app, FALSE);
+       } else {
+               /* Allow hibernation if the program has gone to the background: */
+               
+               /* However, prevent hibernation while the settings are being changed: */
+               const gboolean hibernation_prevented = 
+                       modest_window_mgr_get_hibernation_is_prevented (
+       modest_runtime_get_window_mgr ()); 
+       
+               if (hibernation_prevented)
+                       hildon_program_set_can_hibernate (app, FALSE);
+               else {
+                       /* Allow hibernation, after saving the state: */
+                       modest_osso_save_state();
+                       hildon_program_set_can_hibernate (app, TRUE);
+               }
+       }
+       
+}
+
+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);
+
+       /* 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));
+       }
+}
+
+/* Debugging */
+/* static void  */
+/* on_window_destroy (ModestWindow *window,  */
+/*                ModestWindowMgr *self) */
+/* { */
+/*     ModestMainWindow *mw = NULL;     */
+/*     ModestMainWindowPrivate *priv = NULL; */
+
+/*     mw  = MODEST_MAIN_WINDOW (window); */
+/*     priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); */
 
+/*     g_print ("\tMW: %d\n", ((GObject*)mw)->ref_count); */
+/*     g_print ("\tHV: %d\n", ((GObject*)priv->header_view)->ref_count); */
+/*     g_print ("\tFV: %d\n", ((GObject*)priv->folder_view)->ref_count); */
+/* } */
 
-ModestWindow*
+ModestWindow *
 modest_main_window_new (void)
 {
-       ModestMainWindow *self; 
-       ModestMainWindowPrivate *priv;
-       ModestWindowPrivate *parent_priv;
-       GtkWidget *folder_win;
-       GtkActionGroup *action_group;
+       ModestMainWindow *self = NULL;  
+       ModestMainWindowPrivate *priv = NULL;
+       ModestWindowPrivate *parent_priv = NULL;
+       GtkWidget *folder_win = NULL;
+       ModestDimmingRulesGroup *menu_rules_group = NULL;
+       ModestDimmingRulesGroup *toolbar_rules_group = NULL;
+       GtkActionGroup *action_group = NULL;
        GError *error = NULL;
-       TnyFolderStoreQuery *query;
-       GdkPixbuf *window_icon;
-       ModestConf *conf;
-       GtkAction *action;
+       GdkPixbuf *window_icon = NULL; 
+       ModestConf *conf = NULL;
+       GtkAction *action = NULL;
 
        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);
 
        parent_priv->ui_manager = gtk_ui_manager_new();
+       parent_priv->ui_dimming_manager = modest_ui_dimming_manager_new();
+
        action_group = gtk_action_group_new ("ModestMainWindowActions");
        gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE);
+       gtk_action_group_set_translate_func (action_group, (GtkTranslateFunc) translate_func, GETTEXT_PACKAGE, g_free);
+
+       menu_rules_group = modest_dimming_rules_group_new ("ModestMenuDimmingRules");
+       toolbar_rules_group = modest_dimming_rules_group_new ("ModestToolbarDimmingRules");
 
        /* Add common actions */
        gtk_action_group_add_actions (action_group,
@@ -434,11 +806,21 @@ modest_main_window_new (void)
                                      G_N_ELEMENTS (modest_folder_view_action_entries),
                                      self);
 
+       gtk_action_group_add_actions (action_group,
+                                     modest_header_view_action_entries,
+                                     G_N_ELEMENTS (modest_header_view_action_entries),
+                                     self);
+
        gtk_action_group_add_toggle_actions (action_group,
                                             modest_toggle_action_entries,
                                             G_N_ELEMENTS (modest_toggle_action_entries),
                                             self);
 
+       gtk_action_group_add_toggle_actions (action_group,
+                                            modest_main_window_toggle_action_entries,
+                                            G_N_ELEMENTS (modest_main_window_toggle_action_entries),
+                                            self);
+
        gtk_ui_manager_insert_action_group (parent_priv->ui_manager, action_group, 0);
        g_object_unref (action_group);
 
@@ -451,6 +833,22 @@ modest_main_window_new (void)
                error = NULL;
        }
 
+       /* Add common dimming rules */
+       modest_dimming_rules_group_add_rules (menu_rules_group, 
+                                             modest_main_window_menu_dimming_entries,
+                                             G_N_ELEMENTS (modest_main_window_menu_dimming_entries),
+                                             self);
+       modest_dimming_rules_group_add_rules (toolbar_rules_group, 
+                                             modest_main_window_toolbar_dimming_entries,
+                                             G_N_ELEMENTS (modest_main_window_toolbar_dimming_entries),
+                                             self);
+
+       /* Insert dimming rules group for this window */
+       modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, menu_rules_group);
+       modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, toolbar_rules_group);
+       g_object_unref (menu_rules_group);
+       g_object_unref (toolbar_rules_group);
+       
        /* Add accelerators */
        gtk_window_add_accel_group (GTK_WINDOW (self), 
                                    gtk_ui_manager_get_accel_group (parent_priv->ui_manager));
@@ -468,27 +866,21 @@ modest_main_window_new (void)
                                      modest_conf_get_bool (conf, MODEST_CONF_SHOW_TOOLBAR_FULLSCREEN, NULL));
        hildon_window_set_menu (HILDON_WINDOW (self), GTK_MENU (parent_priv->menubar));
 
-       /* folder view */
-       query = 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);
-
        /* Get device name */
        modest_maemo_utils_get_device_name ();
 
        /* 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);
+
+       /* Empty view */ 
+       priv->empty_view = create_empty_view ();
+                
        /* Create scrolled windows */
        folder_win = gtk_scrolled_window_new (NULL, NULL);
        priv->contents_widget = gtk_scrolled_window_new (NULL, NULL);
@@ -499,14 +891,10 @@ modest_main_window_new (void)
                                        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));
-
        /* paned */
        priv->main_paned = gtk_hpaned_new ();
-       gtk_paned_add1 (GTK_PANED(priv->main_paned), folder_win);
-       gtk_paned_add2 (GTK_PANED(priv->main_paned), priv->contents_widget);
-       gtk_widget_show (GTK_WIDGET(priv->header_view));
+       gtk_paned_pack1 (GTK_PANED(priv->main_paned), folder_win, TRUE, TRUE);
+       gtk_paned_pack2 (GTK_PANED(priv->main_paned), priv->contents_widget, TRUE, TRUE);
        gtk_tree_view_columns_autosize (GTK_TREE_VIEW(priv->header_view));
 
        /* putting it all together... */
@@ -514,22 +902,28 @@ modest_main_window_new (void)
        gtk_box_pack_start (GTK_BOX(priv->main_vbox), priv->main_paned, TRUE, TRUE,0);
 
        gtk_container_add (GTK_CONTAINER(self), priv->main_vbox);
-       restore_sizes (MODEST_MAIN_WINDOW(self));
 
        /* Set window icon */
        window_icon = modest_platform_get_icon (MODEST_APP_ICON);
        gtk_window_set_icon (GTK_WINDOW (self), window_icon);
        
-       /* Connect signals */
-       connect_signals (self);
+       HildonProgram *app = hildon_program_get_instance ();
+       hildon_program_add_window (app, HILDON_WINDOW (self));
+       
+       g_signal_connect (G_OBJECT(app), "notify::is-topmost",
+               G_CALLBACK (on_hildon_program_is_topmost_notify), 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 ()));
+       g_signal_connect (G_OBJECT(self), "show",
+                         G_CALLBACK (modest_main_window_on_show), folder_win);
+               
+
+       restore_settings (MODEST_MAIN_WINDOW(self), FALSE);
+
+/*     { */
+/*             g_signal_connect (self, "destroy",  */
+/*                               G_CALLBACK (on_window_destroy), self); */
+/*     } */
 
-       /* do send & receive when we are idle */
-       g_idle_add ((GSourceFunc)sync_accounts_cb, self);
-       
        return MODEST_WINDOW(self);
 }
 
@@ -561,17 +955,22 @@ modest_main_window_set_style (ModestMainWindow *self,
                              ModestMainWindowStyle style)
 {
        ModestMainWindowPrivate *priv;
+       ModestWindowPrivate *parent_priv;
+       GtkAction *action;
 
        g_return_if_fail (MODEST_IS_MAIN_WINDOW (self));
 
        priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+       parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
 
        /* no change -> nothing to do */
        if (priv->style == style)
                return;
 
-       priv->style = style;
+       /* Get toggle button */
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarToggleView");
 
+       priv->style = style;
        switch (style) {
        case MODEST_MAIN_WINDOW_STYLE_SIMPLE:
                /* Remove main paned */
@@ -581,6 +980,10 @@ 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 */
@@ -590,6 +993,11 @@ modest_main_window_set_style (ModestMainWindow *self,
                /* Reparent the main paned */
                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 ();
@@ -616,6 +1024,8 @@ modest_main_window_get_style (ModestMainWindow *self)
        return priv->style;
 }
 
+
+
 static gboolean
 modest_main_window_window_state_event (GtkWidget *widget, GdkEventWindowState *event, gpointer userdata)
 {
@@ -661,10 +1071,14 @@ modest_main_window_show_toolbar (ModestWindow *self,
        GtkWidget *placeholder = NULL;
        gint insert_index;
 
-       parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
+       g_return_if_fail (MODEST_IS_MAIN_WINDOW (self));
        priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+       parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
+
+       /* Set optimized view status */
+       priv->optimized_view = !show_toolbar;
 
-       if (!parent_priv->toolbar && show_toolbar) {
+       if (!parent_priv->toolbar) {
                parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, 
                                                                  "/ToolBar");
 
@@ -676,8 +1090,8 @@ modest_main_window_show_toolbar (ModestWindow *self,
                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_expand (GTK_TOOL_ITEM (priv->progress_toolitem), FALSE);
-               gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (priv->progress_toolitem), FALSE);
+               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);
 
@@ -689,6 +1103,11 @@ modest_main_window_show_toolbar (ModestWindow *self,
                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);
 
@@ -708,116 +1127,224 @@ modest_main_window_show_toolbar (ModestWindow *self,
                                   NULL, self);
        }
 
-       /* TODO: Why is this sometimes NULL? murrayc */
-       if (parent_priv->toolbar) {
-               if (show_toolbar) {
-                       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));
-       }
+       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);
 }
 
-/*
- * TODO: modify the menu dynamically. Add handlers to each item of the
- * menu when created
- */
 static void 
 on_account_update (TnyAccountStore *account_store, 
-                  gchar *accout_name,
+                  const gchar *account_name,
                   gpointer user_data)
 {
+       GSList *account_names, *iter, *accounts;
        ModestMainWindow *self;
        ModestMainWindowPrivate *priv;
        ModestWindowPrivate *parent_priv;
-       TnyList *account_list;
-       GtkWidget *item, *send_receive_button;
-       TnyIterator *iter;
        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);
 
-       /* If there is no toolbar then exit */
-       if (!parent_priv->toolbar)
-               return;
+       /* Get enabled account IDs */
+       mgr = modest_runtime_get_account_mgr ();
+       account_names = modest_account_mgr_account_names (mgr, TRUE);
+       iter = account_names;
+       accounts = NULL;
 
-       if (priv->accounts_popup && gtk_menu_get_attach_widget (GTK_MENU (priv->accounts_popup)) ) {
-               /* gtk_menu_detach will also unreference the popup, 
-                * so we can forget about this instance, and create a new one later:
-                */
-               gtk_menu_detach (GTK_MENU (priv->accounts_popup));
-               priv->accounts_popup = NULL;
-       }
+       while (iter) {
+               ModestAccountData *account_data = 
+                       modest_account_mgr_get_account_data (mgr, (gchar*) iter->data);
+               accounts = g_slist_prepend (accounts, account_data);
 
-       /* Get accounts */
-       account_list = tny_simple_list_new ();
-       tny_account_store_get_accounts (account_store, 
-                                       account_list, 
-                                       TNY_ACCOUNT_STORE_STORE_ACCOUNTS);
+               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);
+
+       /* 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);
 
-       /* If there is only one account do not show any menu */
-       if (tny_list_get_length (account_list) <= 1)
-               goto free;
-       
        /* Get send receive button */
-       send_receive_button = gtk_ui_manager_get_widget (parent_priv->ui_manager, 
+       send_receive_button = gtk_ui_manager_get_widget (parent_priv->ui_manager,
                                                          "/ToolBar/ToolbarSendReceive");
 
        /* Create the menu */
-       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));
-       item = gtk_separator_menu_item_new ();
-       gtk_menu_shell_append (GTK_MENU_SHELL (priv->accounts_popup), GTK_WIDGET (item));
+       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));
+       }
 
-       iter = tny_list_create_iterator (account_list);
-       mgr = modest_runtime_get_account_mgr ();
+       /* 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);
 
-       do {
-               TnyAccount *acc;
-               const gchar *acc_name;
-               gchar *display_name;
-
-               /* Create tool item */
-               acc = TNY_ACCOUNT (tny_iterator_get_current (iter));
-               acc_name = tny_account_get_name (acc);
-
-               /* Create display name */
-               if (!strcmp (default_account, acc_name))
-                       display_name = g_strdup_printf (_("mcen_me_toolbar_sendreceive_default"), acc_name);
-               else
-                       display_name = g_strdup_printf (_("mcen_me_toolbar_sendreceive_mailbox_n"), acc_name);
+               /* 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);
+               }
 
-               item = gtk_menu_item_new_with_label (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_name) {
+                       gchar* item_name, *refresh_action_name;
+                       guint8 merge_id;
+                       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);
+                       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) {
+                               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);
+               }
 
-               /* Free */
+               /* Frees */
                g_free (display_name);
-               g_object_unref (acc);
-
-               /* Append item */
-               gtk_menu_shell_append (GTK_MENU_SHELL (priv->accounts_popup), GTK_WIDGET (item));
-
-               /* Go to next */
-               tny_iterator_next (iter);
-
-       } while (!tny_iterator_is_done (iter));
-
-       g_object_unref (iter);
-
-       /* Mandatory in order to view the menu contents */
-       gtk_widget_show_all (priv->accounts_popup);
+               modest_account_mgr_free_account_data (mgr, account_data);
+       }
+       gtk_ui_manager_insert_action_group (parent_priv->ui_manager, action_group, 1);
 
-       /* Setup tap_and_hold */
-       gtk_widget_tap_and_hold_setup (send_receive_button, priv->accounts_popup, NULL, 0);
+       if (priv->accounts_popup) {
+               /* Mandatory in order to view the menu contents */
+               gtk_widget_show_all (priv->accounts_popup);
 
- free:
+               /* 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);
+       }
 
-       /* Free */
-       g_object_unref (account_list);
+       /* Frees */
+       g_slist_free (accounts);
+       g_free (default_account);
 }
 
 /* 
@@ -862,6 +1389,20 @@ set_alignment (GtkWidget *widget,
 }
 
 static GtkWidget *
+create_empty_view (void)
+{
+       GtkLabel *label = NULL;
+       GtkWidget *align = NULL;
+
+       align = gtk_alignment_new(XALIGN, YALIGN, XSPACE, YSPACE);
+       label = GTK_LABEL(gtk_label_new (_("mcen_ia_nomessages")));
+       gtk_label_set_justify (label, GTK_JUSTIFY_CENTER);      
+       gtk_container_add (GTK_CONTAINER (align), GTK_WIDGET(label));
+
+       return GTK_WIDGET(align);
+}
+
+static GtkWidget *
 create_details_widget (TnyAccount *account)
 {
        GtkWidget *vbox;
@@ -869,63 +1410,85 @@ create_details_widget (TnyAccount *account)
 
        vbox = gtk_vbox_new (FALSE, 0);
 
-       /* Account description */
-       if (!strcmp (tny_account_get_id (account), MODEST_LOCAL_FOLDERS_ACCOUNT_ID)) {
-               gchar *device_name;
-
+       /* Account description: */
+       
+       if (modest_tny_account_is_virtual_local_folders (account)) {
+               /* Local folders: */
+       
                /* Get device name */
-               device_name = modest_conf_get_string (modest_runtime_get_conf(),
+               gchar *device_name = modest_conf_get_string (modest_runtime_get_conf(),
                                                      MODEST_CONF_DEVICE_NAME, NULL);
    
-               label = g_strdup_printf ("%s: %s",
-                                        _("mcen_fi_localroot_description"),
+               label = g_strdup_printf (_("mcen_fi_localroot_description"),
                                         device_name);
                gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (label), FALSE, FALSE, 0);
                g_free (device_name);
                g_free (label);
-       } else if (!strcmp (tny_account_get_id (account), MODEST_MMC_ACCOUNT_ID)) {
-               /* TODO: MMC ? */
-               gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("FIXME: MMC ?"), FALSE, FALSE, 0);
        } else {
-               GString *proto;
-
-               /* Put proto in uppercase */
-               proto = g_string_new (tny_account_get_proto (account));
-               proto = g_string_ascii_up (proto);
-
-               label = g_strdup_printf ("%s %s: %s", 
-                                        proto->str,
-                                        _("mcen_fi_remoteroot_account"),
-                                        tny_account_get_name (account));
-               gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (label), FALSE, FALSE, 0);
-               g_string_free (proto, TRUE);
-               g_free (label);
+               if(!strcmp (tny_account_get_id (account), MODEST_MMC_ACCOUNT_ID)) {
+                       gtk_box_pack_start (GTK_BOX (vbox), 
+                               gtk_label_new (tny_account_get_name (account)), 
+                               FALSE, FALSE, 0);
+               } else {
+                       /* Other accounts, such as IMAP and POP: */
+                       
+                       GString *proto;
+                       gchar *tmp;
+       
+                       /* Put proto in uppercase */
+                       proto = g_string_new (tny_account_get_proto (account));
+                       proto = g_string_ascii_up (proto);
+                       
+                       /* 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));
+                       g_free (tmp);
+
+                       gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (label), FALSE, FALSE, 0);
+                       g_string_free (proto, TRUE);
+                       g_free (label);
+               }
        }
 
        /* Message count */
+       TnyFolderStore *folder_store = TNY_FOLDER_STORE (account);
        label = g_strdup_printf ("%s: %d", _("mcen_fi_rootfolder_messages"), 
-                                modest_tny_account_get_message_count (account));
+                                modest_tny_folder_store_get_message_count (folder_store));
        gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (label), FALSE, FALSE, 0);
        g_free (label);
 
        /* Folder count */
        label = g_strdup_printf ("%s: %d", _("mcen_fi_rootfolder_folders"), 
-                                modest_tny_account_get_folder_count (account));
+                                modest_tny_folder_store_get_folder_count (folder_store));
        gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (label), FALSE, FALSE, 0);
        g_free (label);
 
        /* Size / Date */
-       if (!strcmp (tny_account_get_id (account), MODEST_LOCAL_FOLDERS_ACCOUNT_ID)) {
+       if (modest_tny_account_is_virtual_local_folders (account)) {
                /* FIXME: format size */
                label = g_strdup_printf ("%s: %d", _("mcen_fi_rootfolder_size"), 
-                                        modest_tny_account_get_local_size (account));
+                                        modest_tny_folder_store_get_local_size (folder_store));
                gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (label), FALSE, FALSE, 0);
                g_free (label);
-       } else if (!strcmp (tny_account_get_id (account), MODEST_MMC_ACCOUNT_ID)) {
-               gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("FIXME: MMC ?"), FALSE, FALSE, 0);
-       } else {
-               label = g_strdup_printf ("%s: %s", _("mcen_ti_lastupdated"), "08/08/08");
+       } else if (TNY_IS_ACCOUNT(folder_store)) {
+               TnyAccount *account = TNY_ACCOUNT(folder_store);
+               
+               time_t last_updated;
+               gchar *last_updated_string;
+               /* Get last updated from configuration */
+               last_updated = modest_account_mgr_get_int (modest_runtime_get_account_mgr (), 
+                                                         tny_account_get_id (account), 
+                                                         MODEST_ACCOUNT_LAST_UPDATED, 
+                                                         TRUE);
+               if (last_updated > 0) 
+                       last_updated_string = modest_text_utils_get_display_date(last_updated);
+               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);
+               g_free (last_updated_string);
                g_free (label);
        }
 
@@ -936,12 +1499,79 @@ create_details_widget (TnyAccount *account)
 }
 
 void 
+modest_main_window_notify_send_receive_initied (ModestMainWindow *self)
+{
+       GtkAction *action = NULL;
+       GtkWidget *widget = NULL;
+
+       g_return_if_fail (MODEST_IS_MAIN_WINDOW (self));
+
+        action = modest_window_get_action (MODEST_WINDOW(self), "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveAllMenu");        
+       gtk_action_set_sensitive (action, FALSE);
+/*         action = modest_window_get_action (MODEST_WINDOW(self), "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveCancelSendingMenu"); */
+/*     gtk_action_set_sensitive (action, FALSE); */
+        widget = modest_window_get_action_widget (MODEST_WINDOW(self), "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsMenuAdditions");      
+       gtk_widget_set_sensitive (widget, FALSE);
+} 
+
+void 
+modest_main_window_notify_send_receive_completed (ModestMainWindow *self)
+{
+       GtkAction *action = NULL;
+       GtkWidget *widget = NULL;
+
+       g_return_if_fail (MODEST_IS_MAIN_WINDOW (self));
+
+        action = modest_window_get_action (MODEST_WINDOW(self), "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveAllMenu");        
+       gtk_action_set_sensitive (action, TRUE);
+/*         action = modest_window_get_action (MODEST_WINDOW(self), "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveCancelSendingMenu");    */
+/*     gtk_action_set_sensitive (action, TRUE); */
+        widget = modest_window_get_action_widget (MODEST_WINDOW(self), "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsMenuAdditions");      
+       gtk_widget_set_sensitive (widget, TRUE);
+} 
+
+
+static void
+_on_msg_count_changed (ModestHeaderView *header_view,
+                      TnyFolder *folder,
+                      TnyFolderChange *change,
+                      ModestMainWindow *main_window)
+{
+       printf ("DEBUG: %s\n", __FUNCTION__);
+       gboolean folder_empty = FALSE;
+       TnyFolderChangeChanged changed;
+       
+       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));
+       
+       changed = tny_folder_change_get_changed (change);
+       
+       /* If something changes */
+       if ((changed) & TNY_FOLDER_CHANGE_CHANGED_ALL_COUNT)
+               folder_empty = (tny_folder_change_get_new_all_count (change) == 0);     
+       else
+               folder_empty = (tny_folder_get_all_count (TNY_FOLDER (folder)) == 0);
+       
+       printf ("DEBUG: %s: folder_empty=%d\n", __FUNCTION__, folder_empty);
+
+       /* Set contents style of headers view */
+       if (folder_empty)  {
+               modest_main_window_set_contents_style (main_window,
+                                                      MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY);
+       }
+       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)
 {
        ModestMainWindowPrivate *priv;
-       GtkWidget *content;
-       TnyAccount *account;
 
        g_return_if_fail (MODEST_IS_MAIN_WINDOW (self));
 
@@ -951,15 +1581,22 @@ modest_main_window_set_contents_style (ModestMainWindow *self,
           set if there are details, because it could happen when we're
           selecting different accounts consecutively */
        if ((priv->contents_style == style) &&
-           (priv->contents_style == MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS))
+           (priv->contents_style != MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS))
                return;
 
        /* Remove previous child. Delete it if it was an account
           details widget */
-       content = gtk_bin_get_child (GTK_BIN (priv->contents_widget));
-       if (priv->contents_style != MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS)
-               g_object_ref (content);
-       gtk_container_remove (GTK_CONTAINER (priv->contents_widget), content);
+       GtkWidget *content = gtk_bin_get_child (GTK_BIN (priv->contents_widget));
+       if (content) {
+               if (priv->contents_style == MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS)
+                       g_object_ref (content);
+               else if (priv->contents_style == MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY) {
+                       g_object_ref (priv->empty_view);
+                       gtk_container_remove (GTK_CONTAINER (content), priv->empty_view);
+               }
+               
+               gtk_container_remove (GTK_CONTAINER (priv->contents_widget), content);
+       }
 
        priv->contents_style = style;
 
@@ -968,12 +1605,21 @@ modest_main_window_set_contents_style (ModestMainWindow *self,
                wrap_in_scrolled_window (priv->contents_widget, GTK_WIDGET (priv->header_view));
                break;
        case MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS:
-               /* TODO: show here account details */
-               account = TNY_ACCOUNT (modest_folder_view_get_selected (priv->folder_view));
-               priv->details_widget = create_details_widget (account);
-
-               wrap_in_scrolled_window (priv->contents_widget, 
+       {
+               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));
+
+                       wrap_in_scrolled_window (priv->contents_widget, 
                                         priv->details_widget);
+               }
+               g_object_unref (selected_folderstore);
+               break;
+       }
+       case MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY:
+               wrap_in_scrolled_window (priv->contents_widget, GTK_WIDGET (priv->empty_view));
                break;
        default:
                g_return_if_reached ();
@@ -983,6 +1629,18 @@ 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, 
@@ -1025,62 +1683,135 @@ on_configuration_key_changed (ModestConf* conf,
                g_free (new_text);
                g_list_free (children);
        }
+       g_object_unref (account);
+}
+
+static gboolean
+set_toolbar_transfer_mode (ModestMainWindow *self)
+{
+       ModestMainWindowPrivate *priv = NULL;
+       
+       g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (self), FALSE);
+
+       priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+
+       set_toolbar_mode (self, TOOLBAR_MODE_TRANSFER);
+       
+       if (priv->progress_bar_timeout > 0) {
+               g_source_remove (priv->progress_bar_timeout);
+               priv->progress_bar_timeout = 0;
+       }
+
+       return FALSE;
 }
 
 static void 
 set_toolbar_mode (ModestMainWindow *self, 
                  ModestToolBarModes mode)
 {
-       ModestMainWindowPrivate *priv;
-
+       ModestWindowPrivate *parent_priv = NULL;
+       ModestMainWindowPrivate *priv = NULL;
+       GtkAction *sort_action = NULL, *refresh_action = NULL, *cancel_action = NULL;
+       
        g_return_if_fail (MODEST_IS_MAIN_WINDOW (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");
+       refresh_action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarSendReceive");
+       cancel_action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarCancel");
+
+       /* Sets current toolbar mode */
+       priv->current_toolbar_mode = mode;
+
+       /* Show and hide toolbar items */
        switch (mode) {
        case TOOLBAR_MODE_NORMAL:
-               if (priv->sort_toolitem)
-               gtk_widget_show (priv->sort_toolitem);
-               
-               if (priv->refresh_toolitem)
-                       gtk_widget_show (priv->refresh_toolitem);
-                       
-               if (priv->progress_toolitem)
+               if (sort_action) 
+                       gtk_action_set_visible (sort_action, TRUE);
+               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);
-                       
-               if (priv->cancel_toolitem)
-                       gtk_widget_hide (priv->cancel_toolitem);
+                       gtk_widget_hide (priv->progress_bar);                   
+               
+               if (cancel_action)
+                       gtk_action_set_visible (cancel_action, FALSE);
+
+               /* Hide toolbar if optimized view is enabled */
+               if (priv->optimized_view)
+                       gtk_widget_hide (GTK_WIDGET(parent_priv->toolbar));
                break;
        case TOOLBAR_MODE_TRANSFER:
-               if (priv->sort_toolitem)
-                       gtk_widget_hide (priv->sort_toolitem);
-               
-               if (priv->refresh_toolitem)
-                       gtk_widget_hide (priv->refresh_toolitem);
-               
-               if (priv->progress_toolitem)
+               if (sort_action)
+                       gtk_action_set_visible (sort_action, FALSE);
+               if (refresh_action)
+                       gtk_action_set_visible (refresh_action, FALSE);
+               if (cancel_action)
+                       gtk_action_set_visible (cancel_action, TRUE);
+               if (priv->progress_toolitem) {
                        gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->progress_toolitem), TRUE);
+                       gtk_widget_show (priv->progress_toolitem);
+               }
                if (priv->progress_bar)
-                       gtk_widget_show (priv->progress_bar);
-                       
-               if (priv->cancel_toolitem)
-                       gtk_widget_show (priv->cancel_toolitem);
+                       gtk_widget_show (priv->progress_bar);                   
+
+               /* Show toolbar if it's hiden (optimized view ) */
+               if (priv->optimized_view)
+                       gtk_widget_show (GTK_WIDGET (parent_priv->toolbar));
                break;
        default:
-               if (priv->cancel_toolitem)
-                       gtk_widget_show (priv->sort_toolitem);
-                       
-               if (priv->refresh_toolitem)
-                       gtk_widget_show (priv->refresh_toolitem);
-                       
-               if (priv->progress_bar)
-                       gtk_widget_hide (priv->progress_bar);
-                       
-               if (priv->cancel_toolitem)
-                       gtk_widget_hide (priv->cancel_toolitem);
+               g_return_if_reached ();
+       }
+}
+
+static void
+cancel_progressbar (GtkToolButton *toolbutton,
+                   ModestMainWindow *self)
+{
+       GSList *tmp;
+       ModestMainWindowPrivate *priv;
+       
+       priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+
+       /* Get operation observers and cancel its current operation */
+       tmp = priv->progress_widgets;
+       while (tmp) {
+               modest_progress_object_cancel_current_operation (MODEST_PROGRESS_OBJECT(tmp->data));
+               tmp=g_slist_next(tmp);
+       }
+}
+
+static gboolean
+observers_empty (ModestMainWindow *self)
+{
+       GSList *tmp = NULL;
+       ModestMainWindowPrivate *priv;
+       gboolean is_empty = TRUE;
+       guint pending_ops = 0;
+       priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+       tmp = priv->progress_widgets;
+
+       /* Check all observers */
+       while (tmp && is_empty)  {
+               pending_ops = modest_progress_object_num_pending_operations (MODEST_PROGRESS_OBJECT(tmp->data));
+               is_empty = pending_ops == 0;
+               
+               tmp = g_slist_next(tmp);
        }
+       
+       return is_empty;
 }
 
 static void
@@ -1089,45 +1820,126 @@ on_queue_changed (ModestMailOperationQueue *queue,
                  ModestMailOperationQueueNotification type,
                  ModestMainWindow *self)
 {
-       GSList *tmp;
        ModestMainWindowPrivate *priv;
-       ModestMailOperationId op_id;
+       ModestMailOperationTypeOperation op_type;
        ModestToolBarModes mode;
-       
-       priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+       GSList *tmp;
+       gboolean mode_changed = FALSE;
+/*     ModestMailOperationStatus status; */
 
+       g_return_if_fail (MODEST_IS_MAIN_WINDOW (self));
+       priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+              
        /* Get toolbar mode from operation id*/
-       op_id = modest_mail_operation_get_id (mail_op);
-       switch (op_id) {
-       case MODEST_MAIL_OPERATION_ID_SEND:
-       case MODEST_MAIL_OPERATION_ID_RECEIVE:
+       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:
                mode = TOOLBAR_MODE_TRANSFER;
+               if (priv->current_toolbar_mode == TOOLBAR_MODE_NORMAL)
+                       mode_changed = TRUE;
                break;
        default:
                mode = TOOLBAR_MODE_NORMAL;
                
        }
                
+                      
        /* Add operation observers and change toolbar if neccessary*/
        tmp = priv->progress_widgets;
        switch (type) {
        case MODEST_MAIL_OPERATION_QUEUE_OPERATION_ADDED:
-               if (mode != TOOLBAR_MODE_NORMAL) 
-                       set_toolbar_mode (MODEST_MAIN_WINDOW(self), mode);
-               while (tmp) {
-                       modest_progress_object_add_operation (MODEST_PROGRESS_OBJECT (tmp->data),
-                                                             mail_op);
-                       tmp = g_slist_next (tmp);
+               if (mode == TOOLBAR_MODE_TRANSFER) {
+                       if (mode_changed)
+                               set_toolbar_transfer_mode(self);                    
+                       while (tmp) {
+                               modest_progress_object_add_operation (MODEST_PROGRESS_OBJECT (tmp->data),
+                                                                     mail_op);
+                               tmp = g_slist_next (tmp);
+                       }
                }
                break;
        case MODEST_MAIL_OPERATION_QUEUE_OPERATION_REMOVED:
-               if (mode != TOOLBAR_MODE_NORMAL) 
-                       set_toolbar_mode (MODEST_MAIN_WINDOW(self), TOOLBAR_MODE_NORMAL);
-               while (tmp) {
-                       modest_progress_object_remove_operation (MODEST_PROGRESS_OBJECT (tmp->data),
-                                                                mail_op);
-                       tmp = g_slist_next (tmp);
+               /* Change toolbar mode */
+               if (mode == TOOLBAR_MODE_TRANSFER) {                    
+                       while (tmp) {
+                               modest_progress_object_remove_operation (MODEST_PROGRESS_OBJECT (tmp->data),
+                                                                        mail_op);
+                               tmp = g_slist_next (tmp);
+                       }
+                       
+                       /* If no more operations are being observed, NORMAL mode is enabled again */
+                       if (observers_empty (self)) {
+                               set_toolbar_mode (self, TOOLBAR_MODE_NORMAL);
+                               
+                       }
                }
+
                break;
+       }       
+
+}
+
+static void 
+on_show_account_action_activated  (GtkAction *action,
+                                  gpointer user_data)
+{
+       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);
+
+       /* 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);
+
+       /* Set the new visible & active account */
+       if (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);
        }
+
+       /* Free */
+       modest_account_mgr_free_account_data (mgr, acc_data);
+}
+
+static void
+refresh_account (const gchar *account_name)
+{
+       ModestWindow *win;
+
+       win = MODEST_WINDOW (modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()));
+
+       /* If account_name == NULL, we must update all (option All) */
+       if (!account_name)
+               modest_ui_actions_do_send_receive_all (win);
+       else
+               modest_ui_actions_do_send_receive (account_name, win);
+}
+
+static void 
+on_refresh_account_action_activated  (GtkAction *action,
+                                     gpointer user_data)
+{
+       refresh_account ((const gchar*) user_data);
+}
+
+static void
+on_send_receive_csm_activated (GtkMenuItem *item,
+                              gpointer user_data)
+{
+       refresh_account ((const gchar*) user_data);
+}
+
+static gchar * 
+translate_func (const gchar *msgid,
+               const gchar *domain_name)
+{
+       return _(msgid);
 }