* src/widgets/modest-header-view.c:
[modest] / src / modest-ui-actions.c
index baf2176..46fb8e3 100644 (file)
@@ -1,5 +1,5 @@
 /* Copyright (c) 2006, Nokia Corporation
- * All rights reserved.
+ * All rights reserved. 
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
 #include <modest-address-book.h>
 #include "modest-error.h"
 #include "modest-ui-actions.h"
-
+#include "modest-protocol-info.h"
 #include "modest-tny-platform-factory.h"
 #include "modest-platform.h"
+#include "modest-debug.h"
 #include <tny-mime-part.h>
 #include <tny-camel-folder.h>
 #include <tny-camel-imap-folder.h>
 
 #ifdef MODEST_PLATFORM_MAEMO
 #include "maemo/modest-osso-state-saving.h"
-#include "maemo/modest-maemo-utils.h"
 #include "maemo/modest-hildon-includes.h"
+#include "maemo/modest-connection-specific-smtp-window.h"
 #endif /* MODEST_PLATFORM_MAEMO */
+#include <modest-utils.h>
 
 #include "widgets/modest-ui-constants.h"
 #include <widgets/modest-main-window.h>
@@ -63,7 +65,6 @@
 #include <widgets/modest-attachments-view.h>
 #include "widgets/modest-folder-view.h"
 #include "widgets/modest-global-settings-dialog.h"
-#include "modest-connection-specific-smtp-window.h"
 #include "modest-account-mgr-helpers.h"
 #include "modest-mail-operation.h"
 #include "modest-text-utils.h"
@@ -103,6 +104,11 @@ typedef struct _ReplyForwardHelper {
        GtkWidget *parent_window;
 } ReplyForwardHelper;
 
+typedef struct _MoveToHelper {
+       GtkTreeRowReference *reference;
+       GtkWidget *banner;
+} MoveToHelper;
+
 typedef struct _PasteAsAttachmentHelper {
        ModestMsgEditWindow *window;
        GtkWidget *banner;
@@ -121,12 +127,16 @@ static void     do_headers_action     (ModestWindow *win,
 
 static void     open_msg_cb            (ModestMailOperation *mail_op, 
                                        TnyHeader *header, 
+                                       gboolean canceled,
                                        TnyMsg *msg,
+                                       GError *err,
                                        gpointer user_data);
 
 static void     reply_forward_cb       (ModestMailOperation *mail_op, 
                                        TnyHeader *header, 
+                                       gboolean canceled,
                                        TnyMsg *msg,
+                                       GError *err,
                                        gpointer user_data);
 
 static void     reply_forward          (ReplyForwardAction action, ModestWindow *win);
@@ -135,38 +145,97 @@ static void     folder_refreshed_cb    (ModestMailOperation *mail_op,
                                        TnyFolder *folder, 
                                        gpointer user_data);
 
-static void     _on_send_receive_progress_changed (ModestMailOperation  *mail_op, 
-                                                  ModestMailOperationState *state,
-                                                  gpointer user_data);
+static void     on_send_receive_finished (ModestMailOperation  *mail_op, 
+                                         gpointer user_data);
 
-static gboolean
-download_uncached_messages (TnyList *header_list, GtkWindow *win,
-                           gboolean reply_fwd);
+static gint header_list_count_uncached_msgs (TnyList *header_list);
 
+static gboolean connect_to_get_msg (ModestWindow *win,
+                                   gint num_of_uncached_msgs,
+                                   TnyAccount *account);
 
-static gint
-msgs_move_to_confirmation (GtkWindow *win,
-                          TnyFolder *dest_folder,
-                          gboolean delete,
-                          TnyList *headers);
+static gboolean remote_folder_is_pop (TnyFolderStore *folder);
 
+static void     do_create_folder (GtkWindow *window, 
+                                 TnyFolderStore *parent_folder, 
+                                 const gchar *suggested_name);
 
-static void
-run_account_setup_wizard (ModestWindow *win)
+static GtkWidget* get_folder_view_from_move_to_dialog (GtkWidget *move_to_dialog);
+
+static TnyAccount *get_account_from_folder_store (TnyFolderStore *folder_store);
+
+static void transfer_messages_helper (GtkWindow *win,
+                                     TnyFolder *src_folder,
+                                     TnyList *headers,
+                                     TnyFolder *dst_folder);
+
+/*
+ * This function checks whether a TnyFolderStore is a pop account
+ */
+static gboolean
+remote_folder_is_pop (TnyFolderStore *folder)
 {
-       ModestEasysetupWizardDialog *wizard;
+        const gchar *proto = NULL;
+        TnyAccount *account = NULL;
+
+        g_return_val_if_fail (TNY_IS_FOLDER_STORE (folder), FALSE);
        
-       g_return_if_fail (MODEST_IS_WINDOW(win));
+       account = get_account_from_folder_store (folder);
+        proto = tny_account_get_proto (account);
+        g_object_unref (account);
+
+        return (modest_protocol_info_get_transport_store_protocol (proto) == MODEST_PROTOCOL_STORE_POP);
+}
+
+/* FIXME: this should be merged with the similar code in modest-account-view-window */
+/* Show the account creation wizard dialog.
+ * returns: TRUE if an account was created. FALSE if the user cancelled.
+ */
+gboolean
+modest_ui_actions_run_account_setup_wizard (ModestWindow *win)
+{
+       gboolean result = FALSE;        
+       GtkWindow *dialog, *wizard;
+       gint dialog_response;
+
+       /* Show the easy-setup wizard: */       
+       dialog = modest_window_mgr_get_modal (modest_runtime_get_window_mgr());
+       if (dialog) {
+               /* old wizard is active already; 
+                */
+               gtk_window_present (GTK_WINDOW(dialog));
+               return FALSE;
+       }
        
-       wizard = modest_easysetup_wizard_dialog_new ();
-       gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (win));
+
+       /* there is no such wizard yet */       
+       wizard = GTK_WINDOW (modest_platform_get_account_settings_wizard ());
+       modest_window_mgr_set_modal (modest_runtime_get_window_mgr(), wizard);
+
+       /* always present a main window in the background 
+        * we do it here, so we cannot end up with two wizards (as this
+        * function might be called in modest_window_mgr_get_main_window as well */
+       if (!win) 
+               win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(),
+                                                        TRUE);  /* create if not existent */
        
-       /* Don't make this a modal window, because secondary windows will then 
-        * be unusable, freezing the UI: */
-       /* gtk_window_set_modal (GTK_WINDOW (wizard), TRUE); */
+       /* make sure the mainwindow is visible */
+       gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (win));
+       gtk_widget_show_all (GTK_WIDGET(win));
+       gtk_window_present (GTK_WINDOW(win));
        
-       gtk_dialog_run (GTK_DIALOG (wizard));
+       dialog_response = gtk_dialog_run (GTK_DIALOG (wizard));
        gtk_widget_destroy (GTK_WIDGET (wizard));
+       if (gtk_events_pending ())
+               gtk_main_iteration ();
+
+       if (dialog_response == GTK_RESPONSE_CANCEL) {
+               result = FALSE;
+       } else {
+               /* Check whether an account was created: */
+               result = modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE);
+       }
+       return result;
 }
 
 
@@ -213,7 +282,7 @@ get_selected_headers (ModestWindow *win)
                GtkWidget *header_view;         
                
                header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win),
-                                                                  MODEST_WIDGET_TYPE_HEADER_VIEW);
+                                                                  MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
                return modest_header_view_get_selected_headers (MODEST_HEADER_VIEW(header_view));
                
        } else if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
@@ -234,6 +303,35 @@ get_selected_headers (ModestWindow *win)
                return NULL;
 }
 
+static GtkTreeRowReference *
+get_next_after_selected_headers (ModestHeaderView *header_view)
+{
+       GtkTreeSelection *sel;
+       GList *selected_rows, *node;
+       GtkTreePath *path;
+       GtkTreeRowReference *result;
+       GtkTreeModel *model;
+
+       model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view));
+       sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (header_view));
+       selected_rows = gtk_tree_selection_get_selected_rows (sel, NULL);
+
+       if (selected_rows == NULL)
+               return NULL;
+
+       node = g_list_last (selected_rows);
+       path = gtk_tree_path_copy ((GtkTreePath *) node->data);
+       gtk_tree_path_next (path);
+
+       result = gtk_tree_row_reference_new (model, path);
+
+       gtk_tree_path_free (path);
+       g_list_foreach (selected_rows, (GFunc) gtk_tree_path_free, NULL);
+       g_list_free (selected_rows);
+
+       return result;
+}
+
 static void
 headers_action_mark_as_read (TnyHeader *header,
                             ModestWindow *win,
@@ -245,7 +343,7 @@ headers_action_mark_as_read (TnyHeader *header,
 
        flags = tny_header_get_flags (header);
        if (flags & TNY_HEADER_FLAG_SEEN) return;
-       tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN);
+       tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN);
 }
 
 static void
@@ -259,52 +357,25 @@ headers_action_mark_as_unread (TnyHeader *header,
 
        flags = tny_header_get_flags (header);
        if (flags & TNY_HEADER_FLAG_SEEN)  {
-               tny_header_unset_flags (header, TNY_HEADER_FLAG_SEEN);
+               tny_header_unset_flag (header, TNY_HEADER_FLAG_SEEN);
        }
 }
 
-/** A convenience method, because deleting a message is 
- * otherwise complicated, and it's best to change it in one place 
- * when we change it.
- */
-void modest_do_message_delete (TnyHeader *header, ModestWindow *win)
-{
-       ModestMailOperation *mail_op = NULL;
-       mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_DELETE, 
-               win ? G_OBJECT(win) : NULL);
-       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
-                                        mail_op);
-       
-       /* Always delete. TODO: Move to trash still not supported */
-       modest_mail_operation_remove_msg (mail_op, header, FALSE);
-       g_object_unref (G_OBJECT (mail_op));
-}
-
-static void
-headers_action_delete (TnyHeader *header,
-                      ModestWindow *win,
-                      gpointer user_data)
-{
-       modest_do_message_delete (header, win);
-}
-
 /** After deleing a message that is currently visible in a window, 
  * show the next message from the list, or close the window if there are no more messages.
  **/
-void modest_ui_actions_refresh_message_window_after_delete (ModestMsgViewWindow* win)
+void 
+modest_ui_actions_refresh_message_window_after_delete (ModestMsgViewWindow* win)
 {
        /* Close msg view window or select next */
-       if (modest_msg_view_window_last_message_selected (win) &&
-               modest_msg_view_window_first_message_selected (win)) {
-               modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (win));
-       } else {
-               if (!modest_msg_view_window_select_next_message (win)) {
-                       gboolean ret_value;
-                       g_signal_emit_by_name (G_OBJECT (win), "delete-event", NULL, &ret_value);
-               }
+       if (!modest_msg_view_window_select_next_message (win) &&
+           !modest_msg_view_window_select_previous_message (win)) {
+               gboolean ret_value;
+               g_signal_emit_by_name (G_OBJECT (win), "delete-event", NULL, &ret_value);       
        }
 }
 
+
 void
 modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win)
 {
@@ -323,7 +394,7 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win)
        if (MODEST_IS_MAIN_WINDOW (win)) {
                header_view = 
                        modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
-                                                            MODEST_WIDGET_TYPE_HEADER_VIEW);
+                                                            MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
                if (!gtk_widget_is_focus (header_view))
                        return;
        }
@@ -335,31 +406,30 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win)
                        
        /* Check if any of the headers are already opened, or in the process of being opened */
        if (MODEST_IS_MAIN_WINDOW (win)) {
-               gboolean found;
+               gint opened_headers = 0;
+
                iter = tny_list_create_iterator (header_list);
-               found = FALSE;
                mgr = modest_runtime_get_window_mgr ();
-               while (!tny_iterator_is_done (iter) && !found) {
+               while (!tny_iterator_is_done (iter)) {
                        header = TNY_HEADER (tny_iterator_get_current (iter));
                        if (header) {
-                               found =  modest_window_mgr_find_registered_header (mgr, header, NULL);
+                               if (modest_window_mgr_find_registered_header (mgr, header, NULL))
+                                       opened_headers++;
                                g_object_unref (header);
                        }
-
                        tny_iterator_next (iter);
                }
                g_object_unref (iter);
 
-               if (found) {
-                       gchar *num, *msg;
+               if (opened_headers > 0) {
+                       gchar *msg;
 
-                       num = g_strdup_printf ("%d", tny_list_get_length (header_list));
-                       msg = g_strdup_printf (_("mcen_nc_unable_to_delete_n_messages"), num);
+                       msg = g_strdup_printf (_("mcen_nc_unable_to_delete_n_messages"), 
+                                              opened_headers);
 
                        modest_platform_run_information_dialog (GTK_WINDOW (win), (const gchar *) msg);
                        
                        g_free (msg);
-                       g_free (num);
                        g_object_unref (header_list);
                        return;
                }
@@ -380,7 +450,6 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win)
                                           tny_list_get_length(header_list)), desc);
 
        /* Confirmation dialog */
-       printf("DEBUG: %s\n", __FUNCTION__);    
        response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
                                                            message);
        
@@ -391,10 +460,11 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win)
                GtkTreeModel *model = NULL;
                GtkTreeSelection *sel = NULL;
                GList *sel_list = NULL, *tmp = NULL;
-               GtkTreeRowReference *row_reference = NULL;
+               GtkTreeRowReference *next_row_reference = NULL;
+               GtkTreeRowReference *prev_row_reference = NULL;
                GtkTreePath *next_path = NULL;
-               TnyFolder *folder = NULL;
-               GError *err = NULL;
+               GtkTreePath *prev_path = NULL;
+               ModestMailOperation *mail_op = NULL;
 
                /* Find last selected row */                    
                if (MODEST_IS_MAIN_WINDOW (win)) {
@@ -403,67 +473,67 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win)
                        sel_list = gtk_tree_selection_get_selected_rows (sel, &model);
                        for (tmp=sel_list; tmp; tmp=tmp->next) {
                                if (tmp->next == NULL) {
+                                       prev_path = gtk_tree_path_copy((GtkTreePath *) tmp->data);
                                        next_path = gtk_tree_path_copy((GtkTreePath *) tmp->data);
+
+                                       gtk_tree_path_prev (prev_path);
                                        gtk_tree_path_next (next_path);
-                                       row_reference = gtk_tree_row_reference_new (model, next_path);
-                                       gtk_tree_path_free (next_path);
+
+                                       prev_row_reference = gtk_tree_row_reference_new (model, prev_path);
+                                       next_row_reference = gtk_tree_row_reference_new (model, next_path);
                                }
                        }
                }
                
-               /* Remove each header. If it's a view window header_view == NULL */
-               do_headers_action (win, headers_action_delete, header_view);
+               /* Disable window dimming management */
+               modest_window_disable_dimming (MODEST_WINDOW(win));
 
-               /* refresh the header view (removing marked-as-deleted)*/
-               modest_header_view_refilter (MODEST_HEADER_VIEW(header_view)); 
+               /* Remove each header. If it's a view window header_view == NULL */
+               mail_op = modest_mail_operation_new ((GObject *) win);
+               modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
+                                                mail_op);
+               modest_mail_operation_remove_msgs (mail_op, header_list, FALSE);
+               g_object_unref (mail_op);
+               
+               /* Enable window dimming management */
+               if (sel != NULL) {
+                       gtk_tree_selection_unselect_all (sel);
+               }
+               modest_window_enable_dimming (MODEST_WINDOW(win));
                
                if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
                        modest_ui_actions_refresh_message_window_after_delete (MODEST_MSG_VIEW_WINDOW (win));
                        
                        /* Get main window */
                        mgr = modest_runtime_get_window_mgr ();
-                       main_window = modest_window_mgr_get_main_window (mgr);
-               }
-               else {                  
+                       main_window = modest_window_mgr_get_main_window (mgr, FALSE); /* don't create */
+               } else {                        
                        /* Move cursor to next row */
                        main_window = win; 
 
-                       /* Select next row */
-                       if (gtk_tree_row_reference_valid (row_reference)) {
-                               next_path = gtk_tree_row_reference_get_path (row_reference);
+                       /* Select next or previous row */
+                       if (gtk_tree_row_reference_valid (next_row_reference)) {
+/*                             next_path = gtk_tree_row_reference_get_path (row_reference); */
                                gtk_tree_selection_select_path (sel, next_path);
-                               gtk_tree_path_free (next_path);
                        }
-                       if (row_reference != NULL)
-                               gtk_tree_row_reference_free (row_reference);
-               }
-
-               /* Get folder from first header and sync it */
-               iter = tny_list_create_iterator (header_list);
-               header = TNY_HEADER (tny_iterator_get_current (iter));
-               folder = tny_header_get_folder (header);
-               if (TNY_IS_CAMEL_IMAP_FOLDER (folder))
-/*                     tny_folder_sync_async(folder, FALSE, NULL, NULL, NULL); /\* FALSE --> don't expunge *\/ */
-                       tny_folder_sync (folder, FALSE, &err); /* FALSE --> don't expunge */
-/*             else if (TNY_IS_CAMEL_POP_FOLDER (folder)) */
-/*                     tny_folder_sync_async(folder, FALSE, NULL, NULL, NULL); /\* TRUE --> dont expunge *\/ */
-/*                     tny_folder_sync (folder, TRUE, &err); /\* TRUE --> expunge *\/ */
-               else
-                       /* local folders */
-/*                     tny_folder_sync_async(folder, TRUE, NULL, NULL, NULL); /\* TRUE --> expunge *\/ */
-                       tny_folder_sync (folder, TRUE, &err); /* TRUE --> expunge */
+                       else if (gtk_tree_row_reference_valid (prev_row_reference)) {                           
+                               gtk_tree_selection_select_path (sel, prev_path);
+                       }
 
-               if (err != NULL) {
-                       printf ("DEBUG: %s: Error: code=%d, text=%s\n", __FUNCTION__, err->code, err->message);
-                       g_error_free(err);
+                       /* Free */
+                       if (next_row_reference != NULL) 
+                               gtk_tree_row_reference_free (next_row_reference);
+                       if (next_path != NULL) 
+                               gtk_tree_path_free (next_path);                         
+                       if (prev_row_reference != NULL) 
+                               gtk_tree_row_reference_free (prev_row_reference);
+                       if (prev_path != NULL) 
+                               gtk_tree_path_free (prev_path);                         
                }
-
-               g_object_unref (header);
-               g_object_unref (iter);
-               g_object_unref (folder);
                
                /* Update toolbar dimming state */
-               modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window));
+               if (main_window)
+                       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window));
 
                /* Free */
                g_list_foreach (sel_list, (GFunc) gtk_tree_path_free, NULL);
@@ -489,7 +559,7 @@ modest_ui_actions_on_delete_message_or_folder (GtkAction *action, ModestWindow *
        if (MODEST_IS_MAIN_WINDOW (win)) {
                GtkWidget *w;
                w = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
-                                                        MODEST_WIDGET_TYPE_FOLDER_VIEW);
+                                                        MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
                if (gtk_widget_is_focus (w)) {
                        modest_ui_actions_on_delete_folder (action, MODEST_MAIN_WINDOW(win));
                        return;
@@ -498,11 +568,11 @@ modest_ui_actions_on_delete_message_or_folder (GtkAction *action, ModestWindow *
        modest_ui_actions_on_delete_message (action, win);
 }
 
-
-
 void
 modest_ui_actions_on_quit (GtkAction *action, ModestWindow *win)
-{
+{      
+       ModestWindowMgr *mgr = NULL;
+       
 #ifdef MODEST_PLATFORM_MAEMO
        modest_osso_save_state();
 #endif /* MODEST_PLATFORM_MAEMO */
@@ -517,11 +587,16 @@ modest_ui_actions_on_quit (GtkAction *action, ModestWindow *win)
        
        g_debug ("queue has been cleared");
 
+
+       /* Check if there are opened editing windows */ 
+       mgr = modest_runtime_get_window_mgr ();
+       modest_window_mgr_close_all_windows (mgr);
+
        /* note: when modest-tny-account-store is finalized,
           it will automatically set all network connections
           to offline */
 
-       gtk_main_quit ();
+/*     gtk_main_quit (); */
 }
 
 void
@@ -563,62 +638,36 @@ modest_ui_actions_on_add_to_contacts (GtkAction *action, ModestWindow *win)
 }
 
 void
-modest_ui_actions_on_accounts (GtkAction *action, ModestWindow *win)
+modest_ui_actions_on_accounts (GtkAction *action, 
+                              ModestWindow *win)
 {
        /* This is currently only implemented for Maemo */
-#ifdef MODEST_PLATFORM_MAEMO /* Defined in config.h */
-       if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE)) {
-               run_account_setup_wizard (win);
+       if (!modest_account_mgr_has_accounts (modest_runtime_get_account_mgr(), TRUE)) {
+               if (!modest_ui_actions_run_account_setup_wizard (win)) 
+                       g_debug ("%s: wizard was already running", __FUNCTION__);
+               
                return;
-       } else  {
-               /* Show the list of accounts: */
-               GtkDialog *account_win = GTK_DIALOG(modest_account_view_window_new ());
-               gtk_window_set_transient_for (GTK_WINDOW (account_win), GTK_WINDOW (win));
+       } else {
+               /* Show the list of accounts */
+               GtkWindow *account_win = GTK_WINDOW (modest_account_view_window_new ());
+               gtk_window_set_transient_for (account_win, GTK_WINDOW (win));
                
-               /* Don't make this a modal window, because secondary windows will then 
-                * be unusable, freezing the UI: */
-               /* gtk_window_set_modal (GTK_WINDOW (account_win), TRUE); */
-               modest_maemo_show_dialog_and_forget (GTK_WINDOW (win), account_win); 
+               /* The accounts dialog must be modal */
+               modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), account_win);
+               modest_utils_show_dialog_and_forget (GTK_WINDOW (win), GTK_DIALOG (account_win)); 
        }
-#else
-       GtkWidget *dialog, *label;
-       
-       /* Create the widgets */
-       
-       dialog = gtk_dialog_new_with_buttons ("Message",
-                                             GTK_WINDOW(win),
-                                             GTK_DIALOG_DESTROY_WITH_PARENT,
-                                             GTK_STOCK_OK,
-                                             GTK_RESPONSE_NONE,
-                                             NULL);
-       label = gtk_label_new ("Hello World!");
-       
-       /* Ensure that the dialog box is destroyed when the user responds. */
-       
-       g_signal_connect_swapped (dialog, "response", 
-                                 G_CALLBACK (gtk_widget_destroy),
-                                 dialog);
-       
-       /* Add the label, and show everything we've added to the dialog. */
-       
-       gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->vbox),
-                          label);
-       gtk_widget_show_all (dialog);
-#endif /* MODEST_PLATFORM_MAEMO */
 }
 
+#ifdef MODEST_PLATFORM_MAEMO
 static void
 on_smtp_servers_window_hide (GtkWindow* window, gpointer user_data)
 {
-       ModestWindow *main_window = MODEST_WINDOW (user_data);
-       
        /* Save any changes. */
        modest_connection_specific_smtp_window_save_server_accounts (
-                       MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (window), 
-                       modest_window_get_active_account (main_window));
+                       MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (window));
        gtk_widget_destroy (GTK_WIDGET (window));
 }
-
+#endif
 
 
 void
@@ -631,22 +680,10 @@ modest_ui_actions_on_smtp_servers (GtkAction *action, ModestWindow *win)
 #ifdef MODEST_PLATFORM_MAEMO /* Defined in config.h */
        
        /* Create the window if necessary: */
-       const gchar *active_account_name = modest_window_get_active_account (win);
-       
-       /* TODO: Dim the menu item (not in the UI spec)? or show a warning,
-        * or show the default account?
-        * If we show the default account then the account name should be shown in 
-        * the window when we show it. */
-       if (!active_account_name) {
-               g_warning ("%s: No account is active.", __FUNCTION__);
-               return;
-       }
-               
        GtkWidget *specific_window = GTK_WIDGET (modest_connection_specific_smtp_window_new ());
        modest_connection_specific_smtp_window_fill_with_connections (
                MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (specific_window), 
-               modest_runtime_get_account_mgr(), 
-               active_account_name);
+               modest_runtime_get_account_mgr());
 
        /* Show the window: */  
        gtk_window_set_transient_for (GTK_WINDOW (specific_window), GTK_WINDOW (win));
@@ -660,94 +697,95 @@ modest_ui_actions_on_smtp_servers (GtkAction *action, ModestWindow *win)
 }
 
 void
-modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win)
+modest_ui_actions_compose_msg(ModestWindow *win,
+                             const gchar *to_str,
+                             const gchar *cc_str,
+                             const gchar *bcc_str,
+                             const gchar *subject_str,
+                             const gchar *body_str,
+                             GSList *attachments,
+                             gboolean set_as_modified)
 {
-       ModestWindow *msg_win = NULL;
-       TnyMsg *msg = NULL;
-       TnyFolder *folder = NULL;
        gchar *account_name = NULL;
-       gchar *from_str = NULL;
-/*     GError *err = NULL; */
+       TnyMsg *msg = NULL;
        TnyAccount *account = NULL;
-       ModestWindowMgr *mgr;
-       gchar *signature = NULL, *blank_and_signature = NULL;
+       TnyFolder *folder = NULL;
+       gchar *from_str = NULL, *signature = NULL, *body = NULL;
+       gboolean use_signature = FALSE;
+       ModestWindow *msg_win = NULL;
+       ModestAccountMgr *mgr = modest_runtime_get_account_mgr();
+       ModestTnyAccountStore *store = modest_runtime_get_account_store();
 
-       /* if there are no accounts yet, just show the wizard */
-       if (!modest_account_mgr_has_accounts (modest_runtime_get_account_mgr(), TRUE)) {
-                       run_account_setup_wizard (win);
-                       return;
-       }
-       
-       account_name = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr ());
-       if (!account_name)
-               account_name = g_strdup (modest_window_get_active_account (win));
+       account_name = modest_account_mgr_get_default_account(mgr);
        if (!account_name) {
                g_printerr ("modest: no account found\n");
                goto cleanup;
        }
-       
-       account = modest_tny_account_store_get_server_account (modest_runtime_get_account_store(),
-                                                                      account_name,
-                                                                      TNY_ACCOUNT_TYPE_STORE);
+       account = modest_tny_account_store_get_server_account (store, account_name, TNY_ACCOUNT_TYPE_STORE);
        if (!account) {
                g_printerr ("modest: failed to get tnyaccount for '%s'\n", account_name);
                goto cleanup;
        }
-
-       from_str = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(), account_name);
+       folder = modest_tny_account_get_special_folder (account, TNY_FOLDER_TYPE_DRAFTS);
+       if (!folder) {
+               g_printerr ("modest: failed to find Drafts folder\n");
+               goto cleanup;
+       }
+       from_str = modest_account_mgr_get_from_string (mgr, account_name);
        if (!from_str) {
                g_printerr ("modest: failed get from string for '%s'\n", account_name);
                goto cleanup;
        }
 
-       if (modest_account_mgr_get_bool (modest_runtime_get_account_mgr (), account_name,
-                                        MODEST_ACCOUNT_USE_SIGNATURE, FALSE)) {
-               signature = modest_account_mgr_get_string (modest_runtime_get_account_mgr (), account_name,
-                                                          MODEST_ACCOUNT_SIGNATURE, FALSE);
-               blank_and_signature = g_strconcat ("\n", signature, NULL);
-               g_free (signature);
+       signature = modest_account_mgr_get_signature (mgr, account_name, &use_signature);
+       if (body_str != NULL) {
+               body = use_signature ? g_strconcat(body_str, "\n", signature, NULL) : g_strdup(body_str);
        } else {
-               blank_and_signature = g_strdup ("");
+               body = use_signature ? g_strconcat("\n", signature, NULL) : g_strdup("");
        }
 
-       msg = modest_tny_msg_new ("", from_str, "", "", "", blank_and_signature, NULL);
+       msg = modest_tny_msg_new (to_str, from_str, cc_str, bcc_str, subject_str, body, NULL);
        if (!msg) {
                g_printerr ("modest: failed to create new msg\n");
                goto cleanup;
        }
-       
-       folder = modest_tny_account_get_special_folder (account, TNY_FOLDER_TYPE_DRAFTS);
-       if (!folder) {
-               g_printerr ("modest: failed to find Drafts folder\n");
-               goto cleanup;
-       }
-       
 
        /* Create and register edit window */
-       /* This is destroyed by TOOD. */
+       /* This is destroyed by TODO. */
        msg_win = modest_msg_edit_window_new (msg, account_name, FALSE);
-       mgr = modest_runtime_get_window_mgr ();
-       modest_window_mgr_register_window (mgr, msg_win);
+       while (attachments) {
+               modest_msg_edit_window_attach_file_one((ModestMsgEditWindow *)msg_win,
+                                                      attachments->data);
+               attachments = g_slist_next(attachments);
+       }
+       modest_window_mgr_register_window (modest_runtime_get_window_mgr(), msg_win);
+       modest_msg_edit_window_set_modified (MODEST_MSG_EDIT_WINDOW (msg_win), set_as_modified);
 
-       if (win)
-               gtk_window_set_transient_for (GTK_WINDOW (msg_win),
-                                             GTK_WINDOW (win));        
        gtk_widget_show_all (GTK_WIDGET (msg_win));
 
 cleanup:
-       g_free (account_name);
        g_free (from_str);
-       g_free (blank_and_signature);
-       if (msg_win)
-               g_object_unref (msg_win);
-       if (account)
-               g_object_unref (G_OBJECT(account));
-       if (msg)
-               g_object_unref (G_OBJECT(msg));
-       if (folder)
-               g_object_unref (G_OBJECT(folder));
+       g_free (signature);
+       g_free (body);
+       g_free (account_name);
+       if (account) g_object_unref (G_OBJECT(account));
+       if (folder) g_object_unref (G_OBJECT(folder));
+       if (msg_win) g_object_unref (G_OBJECT(msg_win));
+       if (msg) g_object_unref (G_OBJECT(msg));
+}
+
+void
+modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win)
+{
+       /* if there are no accounts yet, just show the wizard */
+       if (!modest_account_mgr_has_accounts (modest_runtime_get_account_mgr(), TRUE))
+               if (!modest_ui_actions_run_account_setup_wizard (win))
+                       return;
+               
+       modest_ui_actions_compose_msg(win, NULL, NULL, NULL, NULL, NULL, NULL, FALSE);
 }
 
+
 gboolean 
 modest_ui_actions_msg_retrieval_check (ModestMailOperation *mail_op,
                                       TnyHeader *header,
@@ -769,10 +807,34 @@ modest_ui_actions_msg_retrieval_check (ModestMailOperation *mail_op,
        return TRUE;
 }
 
+typedef struct {
+       guint idle_handler;
+       gchar *message;
+       GtkWidget *banner;
+} OpenMsgBannerInfo;
+
+gboolean
+open_msg_banner_idle (gpointer userdata)
+{
+       OpenMsgBannerInfo *banner_info = (OpenMsgBannerInfo *) userdata;
+
+       gdk_threads_enter ();
+       banner_info->idle_handler = 0;
+       banner_info->banner = modest_platform_animation_banner (NULL, NULL, banner_info->message);
+       g_object_ref (banner_info->banner);
+       
+       gdk_threads_leave ();
+
+       return FALSE;
+       
+}
+
 static void
 open_msg_cb (ModestMailOperation *mail_op, 
-            TnyHeader *header, 
+            TnyHeader *header,  
+            gboolean canceled,
             TnyMsg *msg, 
+            GError *err,
             gpointer user_data)
 {
        ModestWindowMgr *mgr = NULL;
@@ -781,13 +843,14 @@ open_msg_cb (ModestMailOperation *mail_op,
        TnyFolderType folder_type = TNY_FOLDER_TYPE_UNKNOWN;
        gchar *account = NULL;
        TnyFolder *folder;
+       gboolean open_in_editor = FALSE;
+       OpenMsgBannerInfo *banner_info = (OpenMsgBannerInfo *) user_data;
        
        /* Do nothing if there was any problem with the mail
           operation. The error will be shown by the error_handler of
           the mail operation */
-       if (!modest_ui_actions_msg_retrieval_check (mail_op, header, msg)) {
-               return;
-       }
+       if (!modest_ui_actions_msg_retrieval_check (mail_op, header, msg))
+               goto banner_cleanup;
 
        parent_win = (ModestWindow *) modest_mail_operation_get_source (mail_op);
        folder = tny_header_get_folder (header);
@@ -795,26 +858,80 @@ open_msg_cb (ModestMailOperation *mail_op,
        /* Mark header as read */
        headers_action_mark_as_read (header, MODEST_WINDOW(parent_win), NULL);
 
+       /* Gets folder type (OUTBOX headers will be opened in edit window */
+       if (modest_tny_folder_is_local_folder (folder)) {
+               folder_type = modest_tny_folder_get_local_or_mmc_folder_type (folder);
+               if (folder_type == TNY_FOLDER_TYPE_INVALID)
+                       g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
+       }
+
+               
+       if (folder_type == TNY_FOLDER_TYPE_OUTBOX) {
+               TnyTransportAccount *traccount = NULL;
+               ModestTnyAccountStore *accstore = modest_runtime_get_account_store();
+               traccount = modest_tny_account_store_get_transport_account_from_outbox_header(accstore, header);
+               if (traccount) {
+                       ModestTnySendQueue *send_queue = NULL;
+                       ModestTnySendQueueStatus status;
+                       char *msg_id;
+                       account = g_strdup(modest_tny_account_get_parent_modest_account_name_for_server_account(
+                                                  TNY_ACCOUNT(traccount)));
+                       send_queue = modest_runtime_get_send_queue(traccount);
+                       msg_id = modest_tny_send_queue_get_msg_id (header);
+                       status = modest_tny_send_queue_get_msg_status(send_queue, msg_id);
+                       /* Only open messages in outbox with the editor if they are in Failed state */
+                       if (status == MODEST_TNY_SEND_QUEUE_FAILED) {
+                               open_in_editor = TRUE;
+                       }
+                       g_free(msg_id);
+                       g_object_unref(traccount);
+               } else {
+                       g_warning("Cannot get transport account for message in outbox!!");
+               }
+       } else if (folder_type == TNY_FOLDER_TYPE_DRAFTS) {
+               open_in_editor = TRUE; /* Open in editor if the message is in the Drafts folder */
+       }
+
        /* Get account */
-       account = g_strdup (modest_window_get_active_account (MODEST_WINDOW (parent_win)));
+       if (!account)
+               account = g_strdup (modest_window_get_active_account (MODEST_WINDOW (parent_win)));
        if (!account)
                account = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr());
        
-       /* Gets folder type (OUTBOX headers will be opened in edit window */
-       if (modest_tny_folder_is_local_folder (folder))
-               folder_type = modest_tny_folder_get_local_or_mmc_folder_type (folder);
+       if (open_in_editor) {
+               ModestAccountMgr *mgr = modest_runtime_get_account_mgr ();
+               const gchar *from_header = NULL;
+
+               from_header = tny_header_get_from (header);
 
-       /* If the header is in the drafts folder then open the editor,
-          else the message view window */
-       if ((folder_type == TNY_FOLDER_TYPE_DRAFTS) ||
-           (folder_type == TNY_FOLDER_TYPE_OUTBOX)) {
                /* we cannot edit without a valid account... */
-               if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE)) {
-                       run_account_setup_wizard(parent_win);
-                       goto cleanup;
+               if (!modest_account_mgr_has_accounts(mgr, TRUE)) {
+                       if (!modest_ui_actions_run_account_setup_wizard(parent_win))
+                               goto cleanup;
                }
-               win = modest_msg_edit_window_new (msg, account, TRUE);
                
+               if (from_header) {
+                       GSList *accounts = modest_account_mgr_account_names (mgr, TRUE);
+                       GSList *node = NULL;
+                       for (node = accounts; node != NULL; node = g_slist_next (node)) {
+                               gchar *from = modest_account_mgr_get_from_string (mgr, node->data);
+                               
+                               if (from && (strcmp (from_header, from) == 0)) {
+                                       g_free (account);
+                                       account = g_strdup (node->data);
+                                       g_free (from);
+                                       break;
+                               }
+                               g_free (from);
+                       }
+                       g_slist_foreach (accounts, (GFunc) g_free, NULL);
+                       g_slist_free (accounts);
+               }
+
+               win = modest_msg_edit_window_new (msg, account, TRUE);
+
+
+
        } else {
                gchar *uid = modest_tny_folder_get_header_unique_id (header);
                
@@ -825,7 +942,7 @@ open_msg_cb (ModestMailOperation *mail_op,
                        GtkTreeModel *model;
                        
                        header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(parent_win),
-                                                                          MODEST_WIDGET_TYPE_HEADER_VIEW);
+                                                                          MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
 
                        sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (header_view));
                        sel_list = gtk_tree_selection_get_selected_rows (sel, &model);
@@ -837,17 +954,15 @@ open_msg_cb (ModestMailOperation *mail_op,
                                g_list_foreach (sel_list, (GFunc) gtk_tree_path_free, NULL);
                                g_list_free (sel_list);
                                
-                               win = modest_msg_view_window_new_with_header_model (msg, 
-                                                                                   account,
-                                                                                   (const gchar*) uid,
-                                                                                   model, 
-                                                                                   row_reference);
+                               win = modest_msg_view_window_new_with_header_model (
+                                               msg, account, (const gchar*) uid,
+                                               model, row_reference);
                                gtk_tree_row_reference_free (row_reference);
                        } else {
-                               win = modest_msg_view_window_new (msg, account, (const gchar*) uid);
+                               win = modest_msg_view_window_new_for_attachment (msg, account, (const gchar*) uid);
                        }
                } else {
-                       win = modest_msg_view_window_new (msg, account, (const gchar*) uid);
+                       win = modest_msg_view_window_new_for_attachment (msg, account, (const gchar*) uid);
                }
                g_free (uid);
        }
@@ -857,7 +972,6 @@ open_msg_cb (ModestMailOperation *mail_op,
                mgr = modest_runtime_get_window_mgr ();
                modest_window_mgr_register_window (mgr, win);
                g_object_unref (win);
-               gtk_window_set_transient_for (GTK_WINDOW (win), GTK_WINDOW (parent_win));
                gtk_widget_show_all (GTK_WIDGET(win));
        }
 
@@ -871,6 +985,20 @@ cleanup:
        g_free(account);
        g_object_unref (parent_win);
        g_object_unref (folder);
+banner_cleanup:
+       if (banner_info) {
+               g_free (banner_info->message);
+               if (banner_info->idle_handler > 0) {
+                       g_source_remove (banner_info->idle_handler);
+                       banner_info->idle_handler = 0;
+               }
+               if (banner_info->banner != NULL) {
+                       gtk_widget_destroy (banner_info->banner);
+                       g_object_unref (banner_info->banner);
+                       banner_info->banner = NULL;
+               }
+               g_slice_free (OpenMsgBannerInfo, banner_info);
+       }
 }
 
 void
@@ -878,50 +1006,195 @@ modest_ui_actions_get_msgs_full_error_handler (ModestMailOperation *mail_op,
                                               gpointer user_data)
 {
        const GError *error;
-       GObject *win = modest_mail_operation_get_source (mail_op);
+       GObject *win = NULL;
 
+       win = modest_mail_operation_get_source (mail_op);
        error = modest_mail_operation_get_error (mail_op);
-       printf ("DEBUG: %s: Error: code=%d, text=%s\n", __FUNCTION__, error->code, error->message);
-       if (error->code == MODEST_MAIL_OPERATION_ERROR_MESSAGE_SIZE_LIMIT) {
 
-               modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL,
-                                                       error->message);
-       } else {
-               modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL,
-                                                       _("mail_ni_ui_folder_get_msg_folder_error"));
+       /* Show error */
+       if (error->code == TNY_SYSTEM_ERROR_MEMORY ||
+           error->code == TNY_IO_ERROR_WRITE ||
+           error->code == TNY_IO_ERROR_READ) {
+               ModestMailOperationStatus st = modest_mail_operation_get_status (mail_op);
+               /* If the mail op has been cancelled then it's not an error: don't show any message */
+               if (st != MODEST_MAIL_OPERATION_STATUS_CANCELED) {
+                       modest_platform_information_banner ((GtkWidget *) win,
+                                                           NULL, dgettext("ke-recv",
+                                                                          "cerm_device_memory_full"));
+               }
+       } else if (user_data) {
+               modest_platform_information_banner ((GtkWidget *) win, 
+                                                   NULL, user_data);
        }
 
        if (win)
                g_object_unref (win);
 }
 
-/*
- * This function is used by both modest_ui_actions_on_open and
- * modest_ui_actions_on_header_activated. This way we always do the
- * same when trying to open messages.
+/**
+ * Returns the account a list of headers belongs to. It returns a
+ * *new* reference so don't forget to unref it
  */
+static TnyAccount*
+get_account_from_header_list (TnyList *headers)
+{
+       TnyAccount *account = NULL;
+
+       if (tny_list_get_length (headers) > 0) {
+               TnyIterator *iter = tny_list_create_iterator (headers);
+               TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
+               TnyFolder *folder = tny_header_get_folder (header);
+               account = tny_folder_get_account (folder);
+               g_object_unref (folder);
+               g_object_unref (header);
+               g_object_unref (iter);
+       }
+       return account;
+}
+
+static void 
+foreach_unregister_headers (gpointer data,
+                           gpointer user_data)
+{
+       ModestWindowMgr *mgr = (ModestWindowMgr *) user_data;
+       TnyHeader *header = TNY_HEADER (data);
+
+       modest_window_mgr_unregister_header (mgr, header);
+}
+
 static void
-_modest_ui_actions_open (TnyList *headers, ModestWindow *win)
+open_msgs_performer(gboolean canceled, 
+                   GError *err,
+                   GtkWindow *parent_window,
+                   TnyAccount *account,
+                   gpointer user_data)
 {
-       ModestWindowMgr *mgr = NULL;
-       TnyIterator *iter = NULL;
        ModestMailOperation *mail_op = NULL;
-       TnyList *not_opened_headers = NULL;
-       TnyHeaderFlags flags = 0;
-               
-       /* Look if we already have a message view for each header. If
-          true, then remove the header from the list of headers to
-          open */
-       mgr = modest_runtime_get_window_mgr ();
-       iter = tny_list_create_iterator (headers);
-       not_opened_headers = tny_simple_list_new ();
+       const gchar *proto_name;
+       gchar *error_msg;
+       ModestTransportStoreProtocol proto;
+       TnyList *not_opened_headers;
+       TnyConnectionStatus status;
+       gboolean show_open_draft = FALSE;
+       OpenMsgBannerInfo *banner_info = NULL;
+
+       not_opened_headers = TNY_LIST (user_data);
+
+       status = tny_account_get_connection_status (account);
+       if (err || canceled) {
+               /* Unregister the already registered headers */
+               tny_list_foreach (not_opened_headers, foreach_unregister_headers, 
+                                 modest_runtime_get_window_mgr ());
+               goto clean;
+       }
 
-       while (!tny_iterator_is_done (iter)) {
+       /* Get the error message depending on the protocol */
+       proto_name = tny_account_get_proto (account);
+       if (proto_name != NULL) {
+               proto = modest_protocol_info_get_transport_store_protocol (proto_name);
+       } else {
+               proto = MODEST_PROTOCOL_STORE_MAILDIR;
+       }
+       
+       /* Create the error messages */
+       if (tny_list_get_length (not_opened_headers) == 1) {
+               if (proto == MODEST_PROTOCOL_STORE_POP) {
+                       error_msg = g_strdup (_("emev_ni_ui_pop3_msg_recv_error"));
+               } else if (proto == MODEST_PROTOCOL_STORE_IMAP) {
+                       TnyIterator *iter = tny_list_create_iterator (not_opened_headers);
+                       TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
+                       error_msg = g_strdup_printf (_("emev_ni_ui_imap_message_not_available_in_server"),
+                                                    tny_header_get_subject (header));
+                       g_object_unref (header);
+                       g_object_unref (iter);
+               } else {
+                       TnyHeader *header;
+                       TnyFolder *folder;
+                       TnyIterator *iter;
+                       TnyFolderType folder_type;
 
-               ModestWindow *window = NULL;
-               TnyHeader *header = NULL;
-               gboolean found = FALSE;
+                       iter = tny_list_create_iterator (not_opened_headers);
+                       header = TNY_HEADER (tny_iterator_get_current (iter));
+                       folder = tny_header_get_folder (header);
+                       folder_type = modest_tny_folder_get_local_or_mmc_folder_type (folder);
+                       show_open_draft = (folder_type == TNY_FOLDER_TYPE_DRAFTS);
+                       g_object_unref (folder);
+                       g_object_unref (header);
+                       g_object_unref (iter);
+                       error_msg = g_strdup (_("mail_ni_ui_folder_get_msg_folder_error"));
+               }
+       } else {
+               error_msg = g_strdup (_("mail_ni_ui_folder_get_msg_folder_error"));
+       }
+
+       /* Create the mail operation */
+       mail_op = 
+               modest_mail_operation_new_with_error_handling ((GObject *) parent_window,
+                                                              modest_ui_actions_get_msgs_full_error_handler,
+                                                              error_msg, g_free);
+       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
+                                        mail_op);
+
+       if (show_open_draft) {
+               banner_info = g_slice_new (OpenMsgBannerInfo);
+               banner_info->message = g_strdup (_("mail_ib_opening_draft_message"));
+               banner_info->banner = NULL;
+               banner_info->idle_handler = g_timeout_add (500, open_msg_banner_idle, banner_info);
+       }
+
+       modest_mail_operation_get_msgs_full (mail_op,
+                                            not_opened_headers,
+                                            open_msg_cb,
+                                            banner_info,
+                                            NULL);
+
+       /* Frees */
+ clean:
+       if (mail_op)
+               g_object_unref (mail_op);
+       g_object_unref (not_opened_headers);
+       g_object_unref (account);
+}
+
+/*
+ * This function is used by both modest_ui_actions_on_open and
+ * modest_ui_actions_on_header_activated. This way we always do the
+ * same when trying to open messages.
+ */
+static void
+open_msgs_from_headers (TnyList *headers, ModestWindow *win)
+{
+       ModestWindowMgr *mgr = NULL;
+       TnyIterator *iter = NULL, *iter_not_opened = NULL;
+       TnyList *not_opened_headers = NULL;
+       TnyHeaderFlags flags = 0;
+       TnyAccount *account;
+       gint uncached_msgs = 0;
+               
+       g_return_if_fail (headers != NULL);
+
+       /* Check that only one message is selected for opening */
+       if (tny_list_get_length (headers) != 1) {
+               modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL,
+                                                       _("mcen_ib_select_one_message"));
+               return;
+       }
+
+       mgr = modest_runtime_get_window_mgr ();
+       iter = tny_list_create_iterator (headers);
+
+       /* Get the account */
+       account = get_account_from_header_list (headers);
+       
+       /* Look if we already have a message view for each header. If
+          true, then remove the header from the list of headers to
+          open */
+       not_opened_headers = tny_simple_list_new ();
+       while (!tny_iterator_is_done (iter)) {
+
+               ModestWindow *window = NULL;
+               TnyHeader *header = NULL;
+               gboolean found = FALSE;
                
                header = TNY_HEADER (tny_iterator_get_current (iter));
                if (header)
@@ -950,72 +1223,63 @@ _modest_ui_actions_open (TnyList *headers, ModestWindow *win)
        }
        g_object_unref (iter);
        iter = NULL;
+
+       /* Open each message */
+       if (tny_list_get_length (not_opened_headers) == 0)
+               goto cleanup;
        
        /* If some messages would have to be downloaded, ask the user to 
         * make a connection. It's generally easier to do this here (in the mainloop) 
         * than later in a thread:
         */
        if (tny_list_get_length (not_opened_headers) > 0) {
-               TnyIterator *iter;
-               gboolean found = FALSE;
+               uncached_msgs = header_list_count_uncached_msgs (not_opened_headers);
 
-               iter = tny_list_create_iterator (not_opened_headers);
-               while (!tny_iterator_is_done (iter) && !found) {
-                       TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
-                       if (!(tny_header_get_flags (header) & TNY_HEADER_FLAG_CACHED))
-                               found = TRUE;
-                       else
-                               tny_iterator_next (iter);
+               if (uncached_msgs > 0) {
+                       /* Allways download if we are online. */
+                       if (!tny_device_is_online (modest_runtime_get_device ())) {
+                               gint response;
 
-                       g_object_unref (header);
-               }
-               g_object_unref (iter);
+                               /* If ask for user permission to download the messages */
+                               response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
+                                                                                   ngettext("mcen_nc_get_msg",
+                                                                                            "mcen_nc_get_msgs",
+                                                                                            uncached_msgs));
 
-               if (found && !modest_platform_connect_and_wait (GTK_WINDOW (win), NULL)) {
-                       g_object_unref (not_opened_headers);
-                       return;                 
+                               /* End if the user does not want to continue */
+                               if (response == GTK_RESPONSE_CANCEL)
+                                       goto cleanup;
+                       }
                }
        }
        
        /* Register the headers before actually creating the windows: */
-       TnyIterator *iter_not_opened = tny_list_create_iterator (not_opened_headers);
+       iter_not_opened = tny_list_create_iterator (not_opened_headers);
        while (!tny_iterator_is_done (iter_not_opened)) {
                TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter_not_opened));
                if (header) {
-                       modest_window_mgr_register_header (mgr, header);
+                       modest_window_mgr_register_header (mgr, header, NULL);
                        g_object_unref (header);
                }
-               
                tny_iterator_next (iter_not_opened);
        }
        g_object_unref (iter_not_opened);
        iter_not_opened = NULL;
-       
-       /* Open each message */
-       if (tny_list_get_length (not_opened_headers) > 0) {
-               mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, 
-                                                                        G_OBJECT (win), 
-                                                                        modest_ui_actions_get_msgs_full_error_handler, 
-                                                                        NULL);
-               modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
-               if (tny_list_get_length (not_opened_headers) > 1) {
-                       modest_mail_operation_get_msgs_full (mail_op, 
-                                                            not_opened_headers, 
-                                                            open_msg_cb, 
-                                                            NULL, 
-                                                            NULL);
-               } else {
-                       TnyIterator *iter = tny_list_create_iterator (not_opened_headers);
-                       TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
-                       modest_mail_operation_get_msg (mail_op, header, open_msg_cb, NULL);
-                       g_object_unref (header);
-                       g_object_unref (iter);
-               }
-               g_object_unref (mail_op);
-       }
 
+       /* Connect to the account and perform */
+       if (uncached_msgs > 0) {
+               modest_platform_connect_and_perform ((GtkWindow *) win, TRUE, g_object_ref (account), 
+                                                    open_msgs_performer, g_object_ref (not_opened_headers));
+       } else {
+               /* Call directly the performer, do not need to connect */
+               open_msgs_performer (FALSE, NULL, (GtkWindow *) win, g_object_ref (account),
+                                    g_object_ref (not_opened_headers));
+       }
+cleanup:
        /* Clean */
-       if (not_opened_headers != NULL)
+       if (account)
+               g_object_unref (account);
+       if (not_opened_headers)
                g_object_unref (not_opened_headers);
 }
 
@@ -1030,7 +1294,7 @@ modest_ui_actions_on_open (GtkAction *action, ModestWindow *win)
                return;
 
        /* Open them */
-       _modest_ui_actions_open (headers, win);
+       open_msgs_from_headers (headers, win);
 
        g_object_unref(headers);
 }
@@ -1047,9 +1311,11 @@ free_reply_forward_helper (gpointer data)
 }
 
 static void
-reply_forward_cb (ModestMailOperation *mail_op, 
+reply_forward_cb (ModestMailOperation *mail_op,  
                  TnyHeader *header, 
+                 gboolean canceled,
                  TnyMsg *msg,
+                 GError *err,
                  gpointer user_data)
 {
        TnyMsg *new_msg;
@@ -1060,6 +1326,7 @@ reply_forward_cb (ModestMailOperation *mail_op,
        TnyAccount *account = NULL;
        ModestWindowMgr *mgr = NULL;
        gchar *signature = NULL;
+       gboolean use_signature;
 
        /* If there was any error. The mail operation could be NULL,
           this means that we already have the message downloaded and
@@ -1072,31 +1339,31 @@ reply_forward_cb (ModestMailOperation *mail_op,
 
        from = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(),
                                                   rf_helper->account_name);
-       if (modest_account_mgr_get_bool (modest_runtime_get_account_mgr(),
-                                        rf_helper->account_name,
-                                        MODEST_ACCOUNT_USE_SIGNATURE, FALSE)) {
-               signature = modest_account_mgr_get_string (modest_runtime_get_account_mgr (),
-                                                          rf_helper->account_name,
-                                                          MODEST_ACCOUNT_SIGNATURE, FALSE);
-       }
+       signature = modest_account_mgr_get_signature (modest_runtime_get_account_mgr(), 
+                                                     rf_helper->account_name, 
+                                                     &use_signature);
 
        /* Create reply mail */
        switch (rf_helper->action) {
        case ACTION_REPLY:
                new_msg = 
-                       modest_tny_msg_create_reply_msg (msg, header, from, signature,
+                       modest_tny_msg_create_reply_msg (msg, header, from, 
+                                                        (use_signature) ? signature : NULL,
                                                         rf_helper->reply_forward_type,
                                                         MODEST_TNY_MSG_REPLY_MODE_SENDER);
                break;
        case ACTION_REPLY_TO_ALL:
                new_msg = 
-                       modest_tny_msg_create_reply_msg (msg, header, from, signature, rf_helper->reply_forward_type,
+                       modest_tny_msg_create_reply_msg (msg, header, from, 
+                                                        (use_signature) ? signature : NULL, 
+                                                        rf_helper->reply_forward_type,
                                                         MODEST_TNY_MSG_REPLY_MODE_ALL);
                edit_type = MODEST_EDIT_TYPE_REPLY;
                break;
        case ACTION_FORWARD:
                new_msg = 
-                       modest_tny_msg_create_forward_msg (msg, from, signature, rf_helper->reply_forward_type);
+                       modest_tny_msg_create_forward_msg (msg, from, (use_signature) ? signature : NULL, 
+                                                          rf_helper->reply_forward_type);
                edit_type = MODEST_EDIT_TYPE_FORWARD;
                break;
        default:
@@ -1145,22 +1412,13 @@ cleanup:
        free_reply_forward_helper (rf_helper);
 }
 
-/*
- * Checks a list of headers. If any of them are not currently
- * downloaded (CACHED) then it asks the user for permission to
- * download them.
- *
- * Returns FALSE if the user does not want to download the
- * messages. Returns TRUE if the user allowed the download or if all
- * of them are currently downloaded
+/* Checks a list of headers. If any of them are not currently
+ * downloaded (CACHED) then returns TRUE else returns FALSE.
  */
-static gboolean
-download_uncached_messages (TnyList *header_list, 
-                           GtkWindow *win,
-                           gboolean reply_fwd)
+static gint
+header_list_count_uncached_msgs (TnyList *header_list)
 {
        TnyIterator *iter;
-       gboolean retval;
        gint uncached_messages = 0;
 
        iter = tny_list_create_iterator (header_list);
@@ -1178,29 +1436,34 @@ download_uncached_messages (TnyList *header_list,
        }
        g_object_unref (iter);
 
-       /* Ask for user permission to download the messages */
-       retval = TRUE;
-       if (uncached_messages > 0) {
-               GtkResponseType response;
-               if (reply_fwd)
-                       response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
-                                                                           _("emev_nc_include_original"));
-               else
-                       response =
-                               modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
-                                                                        ngettext("mcen_nc_get_msg",
-                                                                                 "mcen_nc_get_msgs",
-                                                                                 uncached_messages));
-               if (response == GTK_RESPONSE_CANCEL)
-                       retval = FALSE;
-               else {
-                       /* If a download will be necessary, make sure that we have a connection: */
-                       retval = modest_platform_connect_and_wait(win, NULL);   
-               }
-       }
-       return retval;
+       return uncached_messages;
 }
 
+/* Returns FALSE if the user does not want to download the
+ * messages. Returns TRUE if the user allowed the download.
+ */
+static gboolean
+connect_to_get_msg (ModestWindow *win,
+                   gint num_of_uncached_msgs,
+                   TnyAccount *account)
+{
+       GtkResponseType response;
+
+       /* Allways download if we are online. */
+       if (tny_device_is_online (modest_runtime_get_device ()))
+               return TRUE;
+
+       /* If offline, then ask for user permission to download the messages */
+       response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
+                       ngettext("mcen_nc_get_msg",
+                       "mcen_nc_get_msgs",
+                       num_of_uncached_msgs));
+
+       if (response == GTK_RESPONSE_CANCEL)
+               return FALSE;
+
+       return modest_platform_connect_and_wait((GtkWindow *) win, account);
+}
 
 /*
  * Common code for the reply and forward actions
@@ -1219,8 +1482,8 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
 
        /* we need an account when editing */
        if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE)) {
-               run_account_setup_wizard (win);
-               return;
+               if (!modest_ui_actions_run_account_setup_wizard (win))
+                       return;
        }
        
        header_list = get_selected_headers (win);
@@ -1232,10 +1495,24 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
                                     (action == ACTION_FORWARD) ? MODEST_CONF_FORWARD_TYPE : MODEST_CONF_REPLY_TYPE,
                                     NULL);
 
-       /* Check that the messages have been previously downloaded */
-       do_retrieve = (action == ACTION_FORWARD) || (reply_forward_type != MODEST_TNY_MSG_REPLY_TYPE_CITE);
-       if (do_retrieve)
-               continue_download = download_uncached_messages (header_list, GTK_WINDOW (win), TRUE);
+       /* check if we need to download msg before asking about it */
+       do_retrieve = (action == ACTION_FORWARD) ||
+                       (reply_forward_type != MODEST_TNY_MSG_REPLY_TYPE_CITE);
+
+       if (do_retrieve){
+               gint num_of_unc_msgs;
+
+               /* check that the messages have been previously downloaded */
+               num_of_unc_msgs = header_list_count_uncached_msgs(header_list);
+               /* If there are any uncached message ask the user
+                * whether he/she wants to download them. */
+               if (num_of_unc_msgs) {
+                       TnyAccount *account = get_account_from_header_list (header_list);
+                       continue_download = connect_to_get_msg (win, num_of_unc_msgs, account);
+                       g_object_unref (account);
+               }
+       }
+
        if (!continue_download) {
                g_object_unref (header_list);
                return;
@@ -1271,7 +1548,7 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
                        g_printerr ("modest: no message found\n");
                        return;
                } else {
-                       reply_forward_cb (NULL, header, msg, rf_helper);
+                       reply_forward_cb (NULL, header, FALSE, msg, NULL, rf_helper);
                }
                if (header)
                        g_object_unref (header);
@@ -1287,11 +1564,10 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
                if (header) {
                        /* Retrieve messages */
                        if (do_retrieve) {
-                               mail_op = modest_mail_operation_new_with_error_handling (
-                                       MODEST_MAIL_OPERATION_TYPE_RECEIVE, 
-                                       G_OBJECT(win),
-                                       modest_ui_actions_get_msgs_full_error_handler, 
-                                       NULL);
+                               mail_op = 
+                                       modest_mail_operation_new_with_error_handling (G_OBJECT(win),
+                                                                                      modest_ui_actions_get_msgs_full_error_handler, 
+                                                                                      NULL, NULL);
                                modest_mail_operation_queue_add (
                                        modest_runtime_get_mail_operation_queue (), mail_op);
                                
@@ -1304,7 +1580,7 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
                        } else {
                                /* we put a ref here to prevent double unref as the reply
                                 * forward callback unrefs the header at its end */
-                               reply_forward_cb (NULL, header, NULL, rf_helper);
+                               reply_forward_cb (NULL, header, FALSE, NULL, NULL, rf_helper);
                        }
 
 
@@ -1350,7 +1626,7 @@ modest_ui_actions_on_next (GtkAction *action,
 
                header_view = modest_main_window_get_child_widget (
                                MODEST_MAIN_WINDOW(window),
-                               MODEST_WIDGET_TYPE_HEADER_VIEW);
+                               MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
                if (!header_view)
                        return;
        
@@ -1373,7 +1649,7 @@ modest_ui_actions_on_prev (GtkAction *action,
        if (MODEST_IS_MAIN_WINDOW (window)) {
                GtkWidget *header_view;
                header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(window),
-                                                                  MODEST_WIDGET_TYPE_HEADER_VIEW);
+                                                                  MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
                if (!header_view)
                        return;
                
@@ -1394,7 +1670,7 @@ modest_ui_actions_on_sort (GtkAction *action,
        if (MODEST_IS_MAIN_WINDOW (window)) {
                GtkWidget *header_view;
                header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(window),
-                                                                  MODEST_WIDGET_TYPE_HEADER_VIEW);
+                                                                  MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
                if (!header_view) {
                        modest_platform_information_banner (NULL, NULL, _CS("ckdg_ib_nothing_to_sort"));
 
@@ -1408,13 +1684,102 @@ modest_ui_actions_on_sort (GtkAction *action,
 
 static void
 new_messages_arrived (ModestMailOperation *self, 
-                     gint new_messages,
+                     TnyList *new_headers,
                      gpointer user_data)
 {
-       if (new_messages == 0)
-               return;
+       GObject *source;
+       gboolean show_visual_notifications;
+
+       source = modest_mail_operation_get_source (self);
+       show_visual_notifications = (source) ? FALSE : TRUE;
+       if (source)
+               g_object_unref (source);
+
+       /* Notify new messages have been downloaded. If the
+          send&receive was invoked by the user then do not show any
+          visual notification, only play a sound and activate the LED
+          (for the Maemo version) */
+       if (TNY_IS_LIST(new_headers) && (tny_list_get_length (new_headers)) > 0)
+               modest_platform_on_new_headers_received (new_headers, 
+                                                        show_visual_notifications);
+
+}
+
+gboolean
+retrieve_all_messages_cb (GObject *source,
+                         guint num_msgs,
+                         guint retrieve_limit)
+{
+       GtkWindow *window;
+       gchar *msg;
+       gint response;
+
+       window = GTK_WINDOW (source);
+       msg = g_strdup_printf (_("mail_nc_msg_count_limit_exceeded"), 
+                              num_msgs, retrieve_limit);
+
+       /* Ask the user if they want to retrieve all the messages */
+       response = 
+               modest_platform_run_confirmation_dialog_with_buttons (window, msg,
+                                                                     _("mcen_bd_get_all"),
+                                                                     _("mcen_bd_newest_only"));
+       /* Free and return */
+       g_free (msg);
+       return (response == GTK_RESPONSE_ACCEPT) ? TRUE : FALSE;
+}
+
+typedef struct {
+       TnyAccount *account;
+       ModestWindow *win;
+       gchar *account_name;
+} SendReceiveInfo;
+
+static void
+do_send_receive_performer (gboolean canceled, 
+                          GError *err,
+                          GtkWindow *parent_window, 
+                          TnyAccount *account, 
+                          gpointer user_data)
+{
+       ModestMailOperation *mail_op;
+       SendReceiveInfo *info;
+
+       info = (SendReceiveInfo *) user_data;
+
+       if (err || canceled) {
+               goto clean;
+       }
+
+       /* Set send/receive operation in progress */    
+       if (info->win && MODEST_IS_MAIN_WINDOW (info->win)) {
+               modest_main_window_notify_send_receive_initied (MODEST_MAIN_WINDOW (info->win));
+       }
+       
+       mail_op = modest_mail_operation_new_with_error_handling ((info->win) ? G_OBJECT (info->win) : NULL,
+                                                                modest_ui_actions_send_receive_error_handler,
+                                                                NULL, NULL);
 
-       modest_platform_on_new_msg ();
+       if (info->win && MODEST_IS_MAIN_WINDOW (info->win))
+               g_signal_connect (G_OBJECT(mail_op), "operation-finished", 
+                                 G_CALLBACK (on_send_receive_finished), 
+                                 info->win);
+
+       /* Send & receive. */
+       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
+       modest_mail_operation_update_account (mail_op, info->account_name, (info->win) ? FALSE : TRUE,
+                                             (info->win) ? retrieve_all_messages_cb : NULL, 
+                                             new_messages_arrived, info->win);
+       g_object_unref (G_OBJECT (mail_op));
+       
+ clean:
+       /* Frees */
+       if (info->account_name)
+               g_free (info->account_name);
+       if (info->win)
+               g_object_unref (info->win);
+       if (info->account)
+               g_object_unref (info->account);
+       g_slice_free (SendReceiveInfo, info);
 }
 
 /*
@@ -1424,15 +1789,19 @@ new_messages_arrived (ModestMailOperation *self,
  * be more flexible.
  */
 void
-modest_ui_actions_do_send_receive (const gchar *account_name, ModestWindow *win)
+modest_ui_actions_do_send_receive (const gchar *account_name, 
+                                  gboolean force_connection,
+                                  ModestWindow *win)
 {
        gchar *acc_name = NULL;
-       ModestMailOperation *mail_op;
+       SendReceiveInfo *info;
+       ModestTnyAccountStore *acc_store;
 
        /* If no account name was provided then get the current account, and if
           there is no current account then pick the default one: */
        if (!account_name) {
-               acc_name = g_strdup (modest_window_get_active_account(win));
+               if (win)
+                       acc_name = g_strdup (modest_window_get_active_account (win));
                if (!acc_name)
                        acc_name  = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr());
                if (!acc_name) {
@@ -1443,31 +1812,19 @@ modest_ui_actions_do_send_receive (const gchar *account_name, ModestWindow *win)
                acc_name = g_strdup (account_name);
        }
 
-       /* Set send/receive operation in progress */    
-       modest_main_window_notify_send_receive_initied (MODEST_MAIN_WINDOW(win));
-
-       mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE,
-                                                                G_OBJECT (win),
-                                                                modest_ui_actions_send_receive_error_handler,
-                                                                NULL);
+       acc_store = modest_runtime_get_account_store ();
 
-       g_signal_connect (G_OBJECT(mail_op), "progress-changed", 
-                         G_CALLBACK (_on_send_receive_progress_changed), 
-                         win);
+       /* Create the info for the connect and perform */
+       info = g_slice_new (SendReceiveInfo);
+       info->account_name = acc_name;
+       info->win = (win) ? g_object_ref (win) : NULL;
+       info->account = modest_tny_account_store_get_server_account (acc_store, acc_name,
+                                                                    TNY_ACCOUNT_TYPE_STORE);
 
-       /* Send & receive. */
-       /* TODO: The spec wants us to first do any pending deletions, before receiving. */
-       /* Receive and then send. The operation is tagged initially as
-          a receive operation because the account update performs a
-          receive and then a send. The operation changes its type
-          internally, so the progress objects will receive the proper
-          progress information */
-       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
-       modest_mail_operation_update_account (mail_op, acc_name, new_messages_arrived, NULL);
-       g_object_unref (G_OBJECT (mail_op));
-       
-       /* Free */
-       g_free (acc_name);
+       /* Invoke the connect and perform */
+       modest_platform_connect_and_perform ((win) ? GTK_WINDOW (win) : NULL, 
+                                            force_connection, info->account, 
+                                            do_send_receive_performer, info);
 }
 
 
@@ -1497,9 +1854,12 @@ modest_ui_actions_do_cancel_send (const gchar *account_name,
                             MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
                             "modest: could not find send queue for account\n");
        } else {
-               /* Keeep messages in outbox folder */
-               tny_send_queue_cancel (send_queue, FALSE, &error);
-       }       
+               /* Cancel the current send */
+               tny_account_cancel (TNY_ACCOUNT (transport_account));
+
+               /* Suspend all pending messages */
+               tny_send_queue_cancel (send_queue, TNY_SEND_QUEUE_CANCEL_ACTION_SUSPEND, &error);
+       }
 
  frees:
        if (transport_account != NULL) 
@@ -1545,7 +1905,8 @@ modest_ui_actions_cancel_send (GtkAction *action,  ModestWindow *win)
  * updates
  */
 void
-modest_ui_actions_do_send_receive_all (ModestWindow *win)
+modest_ui_actions_do_send_receive_all (ModestWindow *win, 
+                                      gboolean force_connection)
 {
        GSList *account_names, *iter;
 
@@ -1554,7 +1915,7 @@ modest_ui_actions_do_send_receive_all (ModestWindow *win)
 
        iter = account_names;
        while (iter) {                  
-               modest_ui_actions_do_send_receive ((const char*) iter->data, win);
+               modest_ui_actions_do_send_receive ((const char*) iter->data, force_connection, win);
                iter = g_slist_next (iter);
        }
 
@@ -1562,45 +1923,6 @@ modest_ui_actions_do_send_receive_all (ModestWindow *win)
        account_names = NULL;
 }
 
-void 
-modest_do_refresh_current_folder(ModestWindow *win)
-{
-       /* Refresh currently selected folder. Note that if we only
-          want to retreive the headers, then the refresh only will
-          invoke a poke_status over all folders, i.e., only the
-          total/unread count will be updated */
-       if (MODEST_IS_MAIN_WINDOW (win)) {
-               GtkWidget *header_view, *folder_view;
-               TnyFolderStore *folder_store;
-
-               /* Get folder and header view */
-               folder_view = 
-                       modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), 
-                                                            MODEST_WIDGET_TYPE_FOLDER_VIEW);
-
-               folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
-
-               if (folder_store && TNY_IS_FOLDER (folder_store)) {
-                       header_view = 
-                               modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
-                                                                    MODEST_WIDGET_TYPE_HEADER_VIEW);
-               
-                       /* We do not need to set the contents style
-                          because it hasn't changed. We also do not
-                          need to save the widget status. Just force
-                          a refresh */
-                       modest_header_view_set_folder (MODEST_HEADER_VIEW(header_view),
-                                                      TNY_FOLDER (folder_store),
-                                                      folder_refreshed_cb,
-                                                      MODEST_MAIN_WINDOW (win));
-               }
-               
-               if (folder_store)
-                       g_object_unref (folder_store);
-       }
-}
-
-
 /*
  * Handler of the click on Send&Receive button in the main toolbar
  */
@@ -1608,17 +1930,34 @@ void
 modest_ui_actions_on_send_receive (GtkAction *action, ModestWindow *win)
 {
        /* Check if accounts exist */
-       gboolean accounts_exist = 
+       gboolean accounts_exist;
+
+       accounts_exist =
                modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE);
        
        /* If not, allow the user to create an account before trying to send/receive. */
        if (!accounts_exist)
                modest_ui_actions_on_accounts (NULL, win);
+       
+       /* Refresh the current folder. The if is always TRUE it's just an extra check */
+       if (MODEST_IS_MAIN_WINDOW (win)) {
+               GtkWidget *folder_view;
+               TnyFolderStore *folder_store;
 
-       modest_do_refresh_current_folder (win);
+               folder_view = 
+                       modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), 
+                                                            MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
+               if (!folder_view)
+                       return;
+               
+               folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
+       
+               if (folder_store)
+                       g_object_unref (folder_store);
+       }       
        
-       /* Refresh the active account */
-       modest_ui_actions_do_send_receive (NULL, win);
+       /* Refresh the active account. Force the connection if needed */
+       modest_ui_actions_do_send_receive (NULL, TRUE, win);
 }
 
 
@@ -1631,7 +1970,7 @@ modest_ui_actions_toggle_header_list_view (GtkAction *action, ModestMainWindow *
        g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
 
        header_view = modest_main_window_get_child_widget (main_window,
-                                                          MODEST_WIDGET_TYPE_HEADER_VIEW);
+                                                          MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
        if (!header_view)
                return;
 
@@ -1670,7 +2009,7 @@ modest_ui_actions_on_header_selected (ModestHeaderView *header_view,
                        TnyFolder *folder = modest_header_view_get_folder (header_view);
                        GtkWidget *folder_view = 
                                modest_main_window_get_child_widget (main_window,
-                                                                    MODEST_WIDGET_TYPE_FOLDER_VIEW);
+                                                                    MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
                        if (folder != NULL) 
                                modest_folder_view_select_folder (MODEST_FOLDER_VIEW (folder_view), folder, FALSE);
                        gtk_widget_grab_focus (GTK_WIDGET (folder_view));
@@ -1685,15 +2024,6 @@ modest_ui_actions_on_header_selected (ModestHeaderView *header_view,
        if (!gtk_widget_is_focus (GTK_WIDGET(header_view)))
            gtk_widget_grab_focus (GTK_WIDGET(header_view));
 
-       /* Update Main window title */
-       if (gtk_widget_is_focus (GTK_WIDGET(header_view))) {
-               const gchar *subject = tny_header_get_subject (header);
-               if (subject && strlen(subject) > 0)
-                       gtk_window_set_title (GTK_WINDOW (main_window), subject);
-               else
-                       gtk_window_set_title (GTK_WINDOW (main_window), _("mail_va_no_subject"));
-       }
-
        /* Update toolbar dimming state */
        modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window));
 }
@@ -1706,14 +2036,21 @@ modest_ui_actions_on_header_activated (ModestHeaderView *header_view,
        TnyList *headers;
 
        g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
-       
+
        if (!header)
                return;
 
-       headers = tny_simple_list_new ();
-       tny_list_prepend (headers, G_OBJECT (header));
+       if (modest_header_view_count_selected_headers (header_view) > 1) {
+               modest_platform_information_banner (NULL, NULL, _("mcen_ib_select_one_message"));
+               return;
+       }
+
 
-       _modest_ui_actions_open (headers, MODEST_WINDOW (main_window));
+/*     headers = tny_simple_list_new (); */
+/*     tny_list_prepend (headers, G_OBJECT (header)); */
+       headers = modest_header_view_get_selected_headers (header_view);
+
+       open_msgs_from_headers (headers, MODEST_WINDOW (main_window));
 
        g_object_unref (headers);
 }
@@ -1731,10 +2068,20 @@ set_active_account_from_tny_account (TnyAccount *account,
                modest_tny_account_store_get_tny_account_by (modest_runtime_get_account_store (),
                                                             MODEST_TNY_ACCOUNT_STORE_QUERY_ID, 
                                                             server_acc_name);
+       if (!modest_server_account) {
+               g_warning ("%s: could not get tny account\n", __FUNCTION__);
+               return;
+       }
+
+       /* Update active account, but only if it's not a pseudo-account */
+       if ((!modest_tny_account_is_virtual_local_folders(modest_server_account)) &&
+           (!modest_tny_account_is_memory_card_account(modest_server_account))) {
+               const gchar *modest_acc_name = 
+                       modest_tny_account_get_parent_modest_account_name_for_server_account (modest_server_account);
+               if (modest_acc_name)
+                       modest_window_set_active_account (window, modest_acc_name);
+       }
        
-       const gchar *modest_acc_name = 
-               modest_tny_account_get_parent_modest_account_name_for_server_account (modest_server_account);
-       modest_window_set_active_account (window, modest_acc_name);
        g_object_unref (modest_server_account);
 }
 
@@ -1746,29 +2093,28 @@ folder_refreshed_cb (ModestMailOperation *mail_op,
 {
        ModestMainWindow *win = NULL;
        GtkWidget *header_view;
-       TnyFolder *current_folder;
 
        g_return_if_fail (TNY_IS_FOLDER (folder));
 
        win = MODEST_MAIN_WINDOW (user_data);
        header_view = 
-               modest_main_window_get_child_widget(win, MODEST_WIDGET_TYPE_HEADER_VIEW);
+               modest_main_window_get_child_widget(win, MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
 
        if (header_view) {
+               TnyFolder *current_folder;
+
                current_folder = modest_header_view_get_folder (MODEST_HEADER_VIEW (header_view));
                if (current_folder != NULL && folder != current_folder) {
+                       g_object_unref (current_folder);
                        return;
-               }
+               } else if (current_folder)
+                       g_object_unref (current_folder);
        }
 
        /* Check if folder is empty and set headers view contents style */
-       if (tny_folder_get_all_count (folder) == 0) {
-       printf ("DEBUG: %s: tny_folder_get_all_count() returned 0.\n", __FUNCTION__);
+       if (tny_folder_get_all_count (folder) == 0)
                modest_main_window_set_contents_style (win,
                                                       MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY);
-       } else {
-               printf ("DEBUG: %s: tny_folder_get_all_count() returned >0.\n", __FUNCTION__);
-       }
 }
 
 void 
@@ -1783,7 +2129,7 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view,
        g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
 
        header_view = modest_main_window_get_child_widget(main_window,
-                                                         MODEST_WIDGET_TYPE_HEADER_VIEW);
+                                                         MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
        if (!header_view)
                return;
        
@@ -1791,8 +2137,8 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view,
 
        if (TNY_IS_ACCOUNT (folder_store)) {
                if (selected) {
-                       /* Update active account */
                        set_active_account_from_tny_account (TNY_ACCOUNT (folder_store), MODEST_WINDOW (main_window));
+                       
                        /* Show account details */
                        modest_main_window_set_contents_style (main_window, MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS);
                }
@@ -1832,7 +2178,7 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view,
                                                      MODEST_CONF_HEADER_VIEW_KEY);
                } else {
                        /* Update the active account */
-                       modest_window_set_active_account (MODEST_WINDOW (main_window), NULL);
+                       //modest_window_set_active_account (MODEST_WINDOW (main_window), NULL);
                        /* Save only if we're seeing headers */
                        if (modest_main_window_get_contents_style (main_window) ==
                            MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS)
@@ -1863,17 +2209,18 @@ modest_ui_actions_on_item_not_found (ModestHeaderView *header_view,ModestItemTyp
                dialog = gtk_message_dialog_new (GTK_WINDOW (win),
                                                 GTK_DIALOG_MODAL,
                                                 GTK_MESSAGE_WARNING,
-                                                GTK_BUTTONS_OK,
+                                                GTK_BUTTONS_NONE,
                                                 _("The %s you selected cannot be found"),
                                                 item);
+               gtk_dialog_add_button (GTK_DIALOG (dialog),_("mcen_bd_dialog_ok"), GTK_RESPONSE_ACCEPT);
                gtk_dialog_run (GTK_DIALOG(dialog));
        } else {
                dialog = gtk_dialog_new_with_buttons (_("Connection requested"),
                                                      GTK_WINDOW (win),
                                                      GTK_DIALOG_MODAL,
-                                                     GTK_STOCK_CANCEL,
+                                                     _("mcen_bd_dialog_cancel"),
                                                      GTK_RESPONSE_REJECT,
-                                                     GTK_STOCK_OK,
+                                                     _("mcen_bd_dialog_ok"),
                                                      GTK_RESPONSE_ACCEPT,
                                                      NULL);
                txt = g_strdup_printf (_("This %s is not available in offline mode.\n"
@@ -1929,7 +2276,40 @@ modest_ui_actions_on_msg_recpt_activated (ModestMsgView *msgview,
        /* g_message ("%s %s", __FUNCTION__, address); */
 }
 
-void
+static void
+on_save_to_drafts_cb (ModestMailOperation *mail_op, 
+                     TnyMsg *saved_draft,
+                     gpointer user_data)
+{
+       ModestMsgEditWindow *edit_window;
+       ModestMainWindow *win;
+
+       /* FIXME. Make the header view sensitive again. This is a
+        * temporary hack. See modest_ui_actions_on_save_to_drafts()
+        * for details */
+       win = MODEST_MAIN_WINDOW(modest_window_mgr_get_main_window(
+                                        modest_runtime_get_window_mgr(), FALSE));
+       if (win != NULL) {
+               GtkWidget *hdrview = modest_main_window_get_child_widget(
+                       win, MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
+               if (hdrview) gtk_widget_set_sensitive(hdrview, TRUE);
+       }
+
+       edit_window = MODEST_MSG_EDIT_WINDOW (user_data);
+
+       /* It might not be a good idea to do nothing if there was an error,
+        * so let's at least show a generic error banner. */
+       /* TODO error while saving attachment, show "Saving draft failed" banner */
+       if (modest_mail_operation_get_error (mail_op) != NULL) {
+               g_warning ("%s failed: %s\n", __FUNCTION__, (modest_mail_operation_get_error (mail_op))->message);
+               modest_platform_information_banner (NULL, NULL, _("mail_ib_file_operation_failed"));
+       } else {
+               modest_msg_edit_window_set_draft (edit_window, saved_draft);
+       }
+       g_object_unref(edit_window);
+}
+
+gboolean
 modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edit_window)
 {
        TnyTransportAccount *transport_account;
@@ -1937,20 +2317,42 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi
        MsgData *data;
        gchar *account_name, *from;
        ModestAccountMgr *account_mgr;
-       gchar *info_text = NULL;
-
-       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window));
+/*     char *info_text; */
+       gboolean had_error = FALSE;
+       guint64 available_disk, expected_size;
+       gint parts_count;
+       guint64 parts_size;
+       ModestMainWindow *win;
+
+       g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window), FALSE);
        
        data = modest_msg_edit_window_get_msg_data (edit_window);
 
+       /* Check size */
+       available_disk = modest_folder_available_space (NULL);
+       modest_msg_edit_window_get_parts_size (edit_window, &parts_count, &parts_size);
+       expected_size = modest_tny_msg_estimate_size (data->plain_body,
+                                                data->html_body,
+                                                parts_count,
+                                                parts_size);
+
+       if ((available_disk != -1) && expected_size > available_disk) {
+               modest_msg_edit_window_free_msg_data (edit_window, data);
+
+               modest_platform_information_banner (NULL, NULL, dgettext("ke-recv", "cerm_device_memory_full"));
+               return FALSE;
+       }
+
+       account_name = g_strdup (data->account_name);
        account_mgr = modest_runtime_get_account_mgr();
-       account_name = g_strdup(modest_window_get_active_account (MODEST_WINDOW(edit_window)));
+       if (!account_name)
+               account_name = g_strdup(modest_window_get_active_account (MODEST_WINDOW(edit_window)));
        if (!account_name) 
                account_name = modest_account_mgr_get_default_account (account_mgr);
        if (!account_name) {
                g_printerr ("modest: no account found\n");
                modest_msg_edit_window_free_msg_data (edit_window, data);
-               return;
+               return FALSE;
        }
 
        if (!strcmp (account_name, MODEST_LOCAL_FOLDERS_ACCOUNT_ID)) {
@@ -1966,18 +2368,17 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi
                g_printerr ("modest: no transport account found for '%s'\n", account_name);
                g_free (account_name);
                modest_msg_edit_window_free_msg_data (edit_window, data);
-               return;
+               return FALSE;
        }
        from = modest_account_mgr_get_from_string (account_mgr, account_name);
 
        /* Create the mail operation */         
-       mail_operation = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_INFO, G_OBJECT(edit_window));
+       mail_operation = modest_mail_operation_new (NULL);
        modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_operation);
 
        modest_mail_operation_save_to_drafts (mail_operation,
                                              transport_account,
                                              data->draft_msg,
-                                             edit_window,
                                              from,
                                              data->to, 
                                              data->cc, 
@@ -1986,7 +2387,24 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi
                                              data->plain_body, 
                                              data->html_body,
                                              data->attachments,
-                                             data->priority_flags);
+                                             data->images,
+                                             data->priority_flags,
+                                             on_save_to_drafts_cb,
+                                             g_object_ref(edit_window));
+
+       /* Use the main window as the parent of the banner, if the
+          main window does not exist it won't be shown, if the parent
+          window exists then it's properly shown. We don't use the
+          editor window because it could be closed (save to drafts
+          could happen after closing the window */
+       win = (ModestMainWindow *)
+               modest_window_mgr_get_main_window( modest_runtime_get_window_mgr(), FALSE);
+       if (win) {
+               modest_platform_information_banner (GTK_WIDGET (win), 
+                                                   NULL, _CS("sfil_ib_saving"));
+       }
+       modest_msg_edit_window_set_modified (edit_window, FALSE);
+
        /* Frees */
        g_free (from);
        g_free (account_name);
@@ -1995,88 +2413,113 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi
 
        modest_msg_edit_window_free_msg_data (edit_window, data);
 
-       info_text = g_strdup_printf (_("mail_va_saved_to_drafts"), _("mcen_me_folder_drafts"));
-       modest_platform_information_banner (NULL, NULL, info_text);
-       g_free (info_text);
+       /* ** FIXME **
+        * If the drafts folder is selected then make the header view
+        * insensitive while the message is being saved to drafts
+        * (it'll be sensitive again in on_save_to_drafts_cb()). This
+        * is not very clean but it avoids letting the drafts folder
+        * in an inconsistent state: the user could edit the message
+        * being saved and undesirable things would happen.
+        * In the average case the user won't notice anything at
+        * all. In the worst case (the user is editing a really big
+        * file from Drafts) the header view will be insensitive
+        * during the saving process (10 or 20 seconds, depending on
+        * the message). Anyway this is just a quick workaround: once
+        * we find a better solution it should be removed
+        * See NB#65125 (commend #18) for details.
+        */
+       if (!had_error && win != NULL) {
+               ModestFolderView *view = MODEST_FOLDER_VIEW(modest_main_window_get_child_widget(
+                       win, MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW));
+               if (view != NULL) {
+                       TnyFolder *folder = TNY_FOLDER(modest_folder_view_get_selected(view));
+                       if (folder) {
+                               if (modest_tny_folder_is_local_folder(folder)) {
+                                       TnyFolderType folder_type;
+                                       folder_type = modest_tny_folder_get_local_or_mmc_folder_type(folder);
+                                       if (folder_type == TNY_FOLDER_TYPE_DRAFTS) {
+                                               GtkWidget *hdrview = modest_main_window_get_child_widget(
+                                                       win, MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
+                                               if (hdrview) gtk_widget_set_sensitive(hdrview, FALSE);
+                                       }
+                               }
+                       }
+                       if (folder != NULL) g_object_unref(folder);
+               }
+       }
+
+       return !had_error;
 }
 
 /* For instance, when clicking the Send toolbar button when editing a message: */
-void
+gboolean
 modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
 {
-       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window));
+       TnyTransportAccount *transport_account = NULL;
+       gboolean had_error = FALSE;
+       guint64 available_disk, expected_size;
+       gint parts_count;
+       guint64 parts_size;
+
+       g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window), TRUE);
 
        if (!modest_msg_edit_window_check_names (edit_window, TRUE))
-               return;
-       
-       /* Offer the connection dialog, if necessary: */        
-       if (!modest_platform_connect_and_wait (GTK_WINDOW (edit_window), NULL))
-               return;
+               return TRUE;
        
        /* FIXME: Code added just for testing. The final version will
           use the send queue provided by tinymail and some
           classifier */
+       MsgData *data = modest_msg_edit_window_get_msg_data (edit_window);
+
+       /* Check size */
+       available_disk = modest_folder_available_space (NULL);
+       modest_msg_edit_window_get_parts_size (edit_window, &parts_count, &parts_size);
+       expected_size = modest_tny_msg_estimate_size (data->plain_body,
+                                                data->html_body,
+                                                parts_count,
+                                                parts_size);
+
+       if ((available_disk != -1) && expected_size > available_disk) {
+               modest_msg_edit_window_free_msg_data (edit_window, data);
+
+               modest_platform_information_banner (NULL, NULL, dgettext("ke-recv", "cerm_device_memory_full"));
+               return FALSE;
+       }
+
        ModestAccountMgr *account_mgr = modest_runtime_get_account_mgr();
-       gchar *account_name = g_strdup(modest_window_get_active_account (MODEST_WINDOW(edit_window)));
+       gchar *account_name = g_strdup (data->account_name);
+       if (!account_name)
+               account_name = g_strdup(modest_window_get_active_account (MODEST_WINDOW(edit_window)));
+
        if (!account_name) 
                account_name = modest_account_mgr_get_default_account (account_mgr);
                
        if (!account_name) {
+               modest_msg_edit_window_free_msg_data (edit_window, data);
                /* Run account setup wizard */
-               run_account_setup_wizard(MODEST_WINDOW(edit_window));
-               return;
+               if (!modest_ui_actions_run_account_setup_wizard (MODEST_WINDOW(edit_window))) {
+                       return TRUE;
+               }
        }
        
-       MsgData *data = modest_msg_edit_window_get_msg_data (edit_window);
-
-       if (!strcmp (account_name, MODEST_LOCAL_FOLDERS_ACCOUNT_ID)) {
-               account_name = g_strdup (data->account_name);
+       /* Get the currently-active transport account for this modest account: */
+       if (strcmp (account_name, MODEST_LOCAL_FOLDERS_ACCOUNT_ID) != 0) {
+               transport_account = TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_server_account
+                                                         (modest_runtime_get_account_store(),
+                                                          account_name, TNY_ACCOUNT_TYPE_TRANSPORT));
        }
        
-       /* Get the currently-active transport account for this modest account: */
-       TnyTransportAccount *transport_account =
-               TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_transport_account_for_open_connection
-                                     (modest_runtime_get_account_store(),
-                                      account_name));
        if (!transport_account) {
+               modest_msg_edit_window_free_msg_data (edit_window, data);
                /* Run account setup wizard */
-               run_account_setup_wizard(MODEST_WINDOW(edit_window));
-               return;
+               if (!modest_ui_actions_run_account_setup_wizard(MODEST_WINDOW(edit_window)))
+                       return TRUE;
        }
        
        gchar *from = modest_account_mgr_get_from_string (account_mgr, account_name);
 
-       /* mail content checks and dialogs */
-       if (data->subject == NULL || data->subject[0] == '\0') {
-               GtkResponseType response;
-               response = modest_platform_run_confirmation_dialog (GTK_WINDOW (edit_window),
-                                                                   _("mcen_nc_subject_is_empty_send"));
-               if (response == GTK_RESPONSE_CANCEL) {
-                       g_free (account_name);
-                       return;
-               }
-       }
-
-       if (data->plain_body == NULL || data->plain_body[0] == '\0') {
-               GtkResponseType response;
-               gchar *note_message;
-               gchar *note_subject = data->subject;
-               if (note_subject == NULL || note_subject[0] == '\0')
-                       note_subject = _("mail_va_no_subject");
-               note_message = g_strdup_printf (_("emev_ni_ui_smtp_message_null"), note_subject);
-               response = modest_platform_run_confirmation_dialog (GTK_WINDOW (edit_window),
-                                                                   note_message);
-               g_free (note_message);
-               if (response == GTK_RESPONSE_CANCEL) {
-                       g_free (account_name);
-                       return;
-               }
-       }
-
-       modest_platform_information_banner (NULL, NULL, _("mcen_ib_outbox_waiting_to_be_sent"));
-
        /* Create the mail operation */
-       ModestMailOperation *mail_operation = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_SEND, G_OBJECT(edit_window));
+       ModestMailOperation *mail_operation = modest_mail_operation_new (NULL);
        modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_operation);
 
        modest_mail_operation_send_new_mail (mail_operation,
@@ -2090,7 +2533,21 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
                                             data->plain_body, 
                                             data->html_body,
                                             data->attachments,
+                                            data->images,
                                             data->priority_flags);
+
+       if (modest_mail_operation_get_status (mail_operation) == MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS)
+               modest_platform_information_banner (NULL, NULL, _("mcen_ib_outbox_waiting_to_be_sent"));
+
+
+       if (modest_mail_operation_get_error (mail_operation) != NULL) {
+               const GError *error = modest_mail_operation_get_error (mail_operation);
+               if (error->code == MODEST_MAIL_OPERATION_ERROR_INSTANCE_CREATION_FAILED) {
+                       g_warning ("%s failed: %s\n", __FUNCTION__, (modest_mail_operation_get_error (mail_operation))->message);
+                       modest_platform_information_banner (NULL, NULL, _CS("sfil_ni_not_enough_memory"));
+                       had_error = TRUE;
+               }
+       }
                                             
        /* Free data: */
        g_free (from);
@@ -2099,10 +2556,15 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
        g_object_unref (G_OBJECT (mail_operation));
 
        modest_msg_edit_window_free_msg_data (edit_window, data);
-       modest_msg_edit_window_set_sent (edit_window, TRUE);
 
-       /* Save settings and close the window: */
-       modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (edit_window));
+       if (!had_error) {
+               modest_msg_edit_window_set_sent (edit_window, TRUE);
+
+               /* Save settings and close the window: */
+               modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (edit_window));
+       }
+
+       return !had_error;
 }
 
 void 
@@ -2251,88 +2713,108 @@ modest_ui_actions_on_remove_attachments (GtkAction *action,
 }
 
 static void
-modest_ui_actions_new_folder_error_handler (ModestMailOperation *mail_op,
-                                            gpointer user_data)
+do_create_folder_cb (ModestMailOperation *mail_op,
+                    TnyFolderStore *parent_folder, 
+                    TnyFolder *new_folder,
+                    gpointer user_data)
 {
-       ModestMainWindow *window = MODEST_MAIN_WINDOW (user_data);
-       const GError *error = modest_mail_operation_get_error (mail_op);
+       gchar *suggested_name = (gchar *) user_data;
+       GtkWindow *source_win = (GtkWindow *) modest_mail_operation_get_source (mail_op);
 
-       if(error)
-       {
-               modest_platform_information_banner (GTK_WIDGET (window), NULL,
-                                                   modest_mail_operation_get_error (mail_op)->message);
+       if (modest_mail_operation_get_error (mail_op)) {
+               /* Show an error */
+               modest_platform_information_banner (GTK_WIDGET (source_win), NULL,
+                                                   _("mail_in_ui_folder_create_error"));
+
+               /* Try again */
+               do_create_folder (source_win, parent_folder, (const gchar *) suggested_name);
+       } else {
+               /* the 'source_win' is either the ModestMainWindow, or the 'Move to folder'-dialog
+                * FIXME: any other? */         
+               GtkWidget *folder_view;
+
+               if (MODEST_IS_MAIN_WINDOW(source_win)) 
+                       folder_view = 
+                               modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (source_win),
+                                                                    MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
+               else
+                       folder_view =
+                               get_folder_view_from_move_to_dialog (GTK_WIDGET(source_win));
+               
+               /* Select the newly created folder */
+               modest_folder_view_select_folder (MODEST_FOLDER_VIEW (folder_view),
+                                                 new_folder, FALSE);
+               g_object_unref (new_folder);
        }
+       /* Free. Note that the first time it'll be NULL so noop */
+       g_free (suggested_name);
+       g_object_unref (source_win);
 }
 
 static void
-modest_ui_actions_create_folder(GtkWidget *parent_window,
-                                GtkWidget *folder_view)
+do_create_folder (GtkWindow *parent_window, 
+                 TnyFolderStore *parent_folder, 
+                 const gchar *suggested_name)
 {
-       TnyFolderStore *parent_folder;
+       gint result;
+       gchar *folder_name = NULL;
 
-       parent_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view));
+       result = modest_platform_run_new_folder_dialog (GTK_WINDOW (parent_window),
+                                                       parent_folder,
+                                                       (gchar *) suggested_name,
+                                                       &folder_name);
        
-       if (parent_folder) {
-               gboolean finished = FALSE;
-               gint result;
-               gchar *folder_name = NULL, *suggested_name = NULL;
-               const gchar *proto_str = NULL;
-               TnyAccount *account;
-
-               if (TNY_IS_ACCOUNT (parent_folder))
-                       account = g_object_ref (parent_folder);
-               else
-                       account = tny_folder_get_account (TNY_FOLDER (parent_folder));
-               proto_str = tny_account_get_proto (TNY_ACCOUNT (account));
+       if (result == GTK_RESPONSE_ACCEPT) {
+               ModestMailOperation *mail_op;
+               
+               mail_op  = modest_mail_operation_new (G_OBJECT(parent_window));
+                       
+               modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), 
+                                                mail_op);
+               modest_mail_operation_create_folder (mail_op,
+                                                    parent_folder,
+                                                    (const gchar *) folder_name,
+                                                    do_create_folder_cb,
+                                                    folder_name);
+               g_object_unref (mail_op);
+       }
+}
 
-               if (proto_str && modest_protocol_info_get_transport_store_protocol (proto_str) ==
-                   MODEST_PROTOCOL_STORE_POP) {
-                       finished = TRUE;
-                       hildon_banner_show_information (NULL, NULL, _("mail_in_ui_folder_create_error"));
-               }
-               g_object_unref (account);
+static void
+create_folder_performer (gboolean canceled, 
+                        GError *err,
+                        GtkWindow *parent_window, 
+                        TnyAccount *account, 
+                        gpointer user_data)
+{
+       TnyFolderStore *parent_folder = TNY_FOLDER_STORE (user_data);
 
-               /* Run the new folder dialog */
-               while (!finished) {
-                       result = modest_platform_run_new_folder_dialog (GTK_WINDOW (parent_window),
-                                                                       parent_folder,
-                                                                       suggested_name,
-                                                                       &folder_name);
+       if (canceled || err) {
+               goto frees;
+       }
 
-                       g_free (suggested_name);
-                       suggested_name = NULL;
+       /* Run the new folder dialog */
+       do_create_folder (GTK_WINDOW (parent_window), parent_folder, NULL);
 
-                       if (result == GTK_RESPONSE_REJECT) {
-                               finished = TRUE;
-                       } else {
-                               ModestMailOperation *mail_op;
-                               TnyFolder *new_folder = NULL;
-
-                               mail_op  = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_INFO,
-                                                                                         G_OBJECT(parent_window),
-                                                                                         modest_ui_actions_new_folder_error_handler,
-                                                                                         parent_window);
-
-                               modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), 
-                                                                mail_op);
-                               new_folder = modest_mail_operation_create_folder (mail_op,
-                                                                                 parent_folder,
-                                                                                 (const gchar *) folder_name);
-                               if (new_folder) {
-                                       modest_folder_view_select_folder (MODEST_FOLDER_VIEW(folder_view), 
-                                                                         new_folder, TRUE);
-
-                                       g_object_unref (new_folder);
-                                       finished = TRUE;
-                               }
-                               g_object_unref (mail_op);
-                       }
+ frees:
+       g_object_unref (parent_folder);
+}
 
-                       suggested_name = folder_name;
-                       folder_name = NULL;
-               }
+static void
+modest_ui_actions_create_folder(GtkWidget *parent_window,
+                                GtkWidget *folder_view)
+{
+       TnyFolderStore *parent_folder;
 
-               g_object_unref (parent_folder);
+       parent_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view));
+       
+       if (parent_folder) {
+               /* The parent folder will be freed in the callback */
+               modest_platform_connect_if_remote_and_perform (GTK_WINDOW (parent_window), 
+                                                              TRUE,
+                                                              parent_folder,
+                                                              create_folder_performer, 
+                                                              parent_folder);
        }
 }
 
@@ -2344,7 +2826,7 @@ modest_ui_actions_on_new_folder (GtkAction *action, ModestMainWindow *main_windo
        g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
 
        folder_view = modest_main_window_get_child_widget (main_window,
-                                                          MODEST_WIDGET_TYPE_FOLDER_VIEW);
+                                                          MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
        if (!folder_view)
                return;
 
@@ -2355,21 +2837,84 @@ static void
 modest_ui_actions_rename_folder_error_handler (ModestMailOperation *mail_op,
                                               gpointer user_data)
 {
-       GObject *win = modest_mail_operation_get_source (mail_op);
+       ModestMainWindow *window = MODEST_MAIN_WINDOW (user_data);
        const GError *error = NULL;
        const gchar *message = NULL;
        
        /* Get error message */
        error = modest_mail_operation_get_error (mail_op);
-       if (error != NULL && error->message != NULL) {
-               message = error->message;
-       } else {
-               message = _("!!! FIXME: Unable to rename");
+       if (!error)
+               g_return_if_reached ();
+
+       switch (error->code) {
+       case MODEST_MAIL_OPERATION_ERROR_FOLDER_EXISTS:
+               message = _CS("ckdg_ib_folder_already_exists");
+               break;
+       default:
+               g_warning ("%s: BUG: unexpected error:[%d]: %s", __FUNCTION__,
+                          error->code, error->message);
+               return;
        }
-       
-       /* Show notification dialog */
-       modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL, message);
-       g_object_unref (win);
+
+       modest_platform_information_banner (GTK_WIDGET (window), NULL, message);
+}
+
+typedef struct {
+       TnyFolderStore *folder;
+       gchar *new_name;
+} RenameFolderInfo;
+
+static void
+on_rename_folder_cb (ModestMailOperation *mail_op, 
+                    TnyFolder *new_folder,
+                    gpointer user_data)
+{
+       /* Select now */
+       modest_folder_view_select_folder (MODEST_FOLDER_VIEW (user_data),
+                                         new_folder, FALSE);
+}
+
+static void
+on_rename_folder_performer (gboolean canceled, 
+                           GError *err, 
+                           GtkWindow *parent_window, 
+                           TnyAccount *account, 
+                           gpointer user_data)
+{
+       ModestMailOperation *mail_op = NULL;
+       GtkTreeSelection *sel = NULL;
+       GtkWidget *folder_view = NULL;
+       RenameFolderInfo *data = (RenameFolderInfo*)user_data;
+
+       if (!canceled && (err == NULL) && MODEST_IS_MAIN_WINDOW(parent_window)) {
+
+               folder_view = modest_main_window_get_child_widget (
+                               MODEST_MAIN_WINDOW (parent_window),
+                               MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
+
+               mail_op = 
+                       modest_mail_operation_new_with_error_handling (G_OBJECT(parent_window),
+                                       modest_ui_actions_rename_folder_error_handler,
+                                       parent_window, NULL);
+
+               modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
+                               mail_op);
+
+               /* Clear the headers view */
+               sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (folder_view));
+               gtk_tree_selection_unselect_all (sel);
+
+               /* Actually rename the folder */
+               modest_mail_operation_rename_folder (mail_op,
+                                                    TNY_FOLDER (data->folder),
+                                                    (const gchar *) (data->new_name),
+                                                    on_rename_folder_cb,
+                                                    folder_view);
+       }
+
+       g_object_unref (mail_op);
+       g_free (data->new_name);
+       g_free (data);
 }
 
 void 
@@ -2383,63 +2928,43 @@ modest_ui_actions_on_rename_folder (GtkAction *action,
        g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
 
        folder_view = modest_main_window_get_child_widget (main_window,
-                                                          MODEST_WIDGET_TYPE_FOLDER_VIEW);
+                                                          MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
        if (!folder_view)
                return;
 
        header_view = modest_main_window_get_child_widget (main_window,
-                                                          MODEST_WIDGET_TYPE_HEADER_VIEW);
+                                                          MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
        
        if (!header_view)
                return;
 
        folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view));
-       if (!folder)
-               return;
 
-       /* Offer the connection dialog if necessary: */
-       if (!modest_platform_connect_and_wait_if_network_folderstore (NULL, folder)) {
-               g_object_unref (G_OBJECT (folder));
+       if (!folder)
                return;
-       }
 
-       
        if (TNY_IS_FOLDER (folder)) {
                gchar *folder_name;
                gint response;
                const gchar *current_name;
+               TnyFolderStore *parent;
+               gboolean do_rename = TRUE;
 
                current_name = tny_folder_get_name (TNY_FOLDER (folder));
-               response = modest_platform_run_rename_folder_dialog (GTK_WINDOW (main_window), NULL,
-                                                                    current_name, &folder_name);
-
-               if (response == GTK_RESPONSE_ACCEPT && strlen (folder_name) > 0) {
-                       ModestMailOperation *mail_op;
-
-                       mail_op = 
-                               modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_INFO, 
-                                                                              G_OBJECT(main_window),
-                                                                              modest_ui_actions_rename_folder_error_handler,
-                                                                              NULL);
-
-
-                       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
-                                                        mail_op);
-
-                       modest_header_view_clear (MODEST_HEADER_VIEW (header_view));
-                       
-                       modest_folder_view_select_folder (MODEST_FOLDER_VIEW(folder_view),
-                                                         TNY_FOLDER(folder), TRUE);
-
-
-                       modest_header_view_clear ((ModestHeaderView *) header_view);
-                       modest_mail_operation_rename_folder (mail_op,
-                                                            TNY_FOLDER (folder),
-                                                            (const gchar *) folder_name);
-
-                       g_object_unref (mail_op);
-                       g_free (folder_name);
+               parent = tny_folder_get_folder_store (TNY_FOLDER (folder));
+               response = modest_platform_run_rename_folder_dialog (GTK_WINDOW (main_window), 
+                                                                    parent, current_name, 
+                                                                    &folder_name);
+               g_object_unref (parent);
+
+               if (response != GTK_RESPONSE_ACCEPT || strlen (folder_name) == 0) {
+                       do_rename = FALSE;
+               } else {
+                       RenameFolderInfo *rename_folder_data = g_new0 (RenameFolderInfo, 1);
+                       rename_folder_data->folder = folder;
+                       rename_folder_data->new_name = folder_name;
+                       modest_platform_connect_if_remote_and_perform (GTK_WINDOW(main_window), TRUE,
+                                       folder, on_rename_folder_performer, rename_folder_data);
                }
        }
        g_object_unref (folder);
@@ -2456,18 +2981,66 @@ modest_ui_actions_delete_folder_error_handler (ModestMailOperation *mail_op,
        g_object_unref (win);
 }
 
+typedef struct {
+       TnyFolderStore *folder;
+       gboolean move_to_trash;
+} DeleteFolderInfo;
+
+static void
+on_delete_folder_cb (gboolean canceled, 
+                 GError *err,
+                 GtkWindow *parent_window, 
+                 TnyAccount *account, 
+                 gpointer user_data)
+{
+       DeleteFolderInfo *info = (DeleteFolderInfo*) user_data;
+       GtkWidget *folder_view;
+       ModestMailOperation *mail_op;
+       GtkTreeSelection *sel;
+       
+       if (!MODEST_IS_MAIN_WINDOW(parent_window) || canceled || (err!=NULL)) {
+               g_object_unref (G_OBJECT (info->folder));
+               g_free (info);
+               return;
+       }
+       
+       folder_view = modest_main_window_get_child_widget (
+                       MODEST_MAIN_WINDOW (parent_window),
+                       MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
+
+       /* Unselect the folder before deleting it to free the headers */
+       sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (folder_view));
+       gtk_tree_selection_unselect_all (sel);
+
+       /* Create the mail operation */
+       mail_op =
+               modest_mail_operation_new_with_error_handling (G_OBJECT(parent_window),
+                               modest_ui_actions_delete_folder_error_handler,
+                               NULL, NULL);
+
+       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
+                       mail_op);
+       modest_mail_operation_remove_folder (mail_op, TNY_FOLDER (info->folder), info->move_to_trash);
+       
+       modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (folder_view));
+
+       g_object_unref (G_OBJECT (mail_op));
+       g_object_unref (G_OBJECT (info->folder));
+       g_free (info);
+}
+
 static void
-delete_folder (ModestMainWindow *main_window, gboolean move_to_trash) 
+delete_folder (ModestMainWindow *main_window, gboolean move_to_trash)
 {
        TnyFolderStore *folder;
        GtkWidget *folder_view;
        gint response;
        gchar *message;
        
-       g_return_if_fail (MODEST_IS_MAIN_WINDOW (main_window));
+       g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
 
        folder_view = modest_main_window_get_child_widget (main_window,
-                                                          MODEST_WIDGET_TYPE_FOLDER_VIEW);
+                                                          MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
        if (!folder_view)
                return;
 
@@ -2478,12 +3051,6 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash)
                modest_platform_run_information_dialog (GTK_WINDOW (main_window),
                                                        _("mail_in_ui_folder_delete_error"));
                g_object_unref (G_OBJECT (folder));
-               return ;
-       }
-
-       /* Offer the connection dialog if necessary: */
-       if (!modest_platform_connect_and_wait_if_network_folderstore (NULL, folder)) {
-               g_object_unref (G_OBJECT (folder));
                return;
        }
 
@@ -2495,18 +3062,18 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash)
        g_free (message);
 
        if (response == GTK_RESPONSE_OK) {
-               ModestMailOperation *mail_op = 
-                       modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_DELETE, 
-                                                                      G_OBJECT(main_window),
-                                                                      modest_ui_actions_delete_folder_error_handler,
-                                                                      NULL);
-
-               modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
-                                                mail_op);
-               modest_mail_operation_remove_folder (mail_op, TNY_FOLDER (folder), move_to_trash);
-               g_object_unref (G_OBJECT (mail_op));
+               DeleteFolderInfo *info;
+               info = g_new0(DeleteFolderInfo, 1);
+               info->folder = folder;
+               info->move_to_trash = move_to_trash;
+               g_object_ref (G_OBJECT (info->folder));
+               TnyAccount *account = tny_folder_get_account (TNY_FOLDER (folder));
+               modest_platform_connect_if_remote_and_perform (GTK_WINDOW (main_window), 
+                                                              TRUE,
+                                                              TNY_FOLDER_STORE (account), 
+                                                              on_delete_folder_cb, info);
+               g_object_unref (account);
        }
-
        g_object_unref (G_OBJECT (folder));
 }
 
@@ -2514,15 +3081,9 @@ void
 modest_ui_actions_on_delete_folder (GtkAction *action,
                                     ModestMainWindow *main_window)
 {
-       GtkWidget *folder_view;
        g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
-
+       
        delete_folder (main_window, FALSE);
-       folder_view = modest_main_window_get_child_widget (main_window,
-                                                          MODEST_WIDGET_TYPE_FOLDER_VIEW);
-       if (!folder_view)
-               return;
-       modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (folder_view));
 }
 
 void 
@@ -2534,26 +3095,6 @@ modest_ui_actions_on_move_folder_to_trash_folder (GtkAction *action, ModestMainW
 }
 
 
-static void
-show_error (GtkWidget *parent_widget, const gchar* text)
-{
-       hildon_banner_show_information(parent_widget, NULL, text);
-       
-#if 0
-       GtkDialog *dialog = GTK_DIALOG (hildon_note_new_information (parent_window, text)); */
-       /*
-         GtkDialog *dialog = GTK_DIALOG (gtk_message_dialog_new (parent_window,
-         (GtkDialogFlags)0,
-         GTK_MESSAGE_ERROR,
-         GTK_BUTTONS_OK,
-         text ));
-       */
-                
-       gtk_dialog_run (dialog);
-       gtk_widget_destroy (GTK_WIDGET (dialog));
-#endif
-}
-
 void
 modest_ui_actions_on_password_requested (TnyAccountStore *account_store, 
                                         const gchar* server_account_name,
@@ -2564,7 +3105,7 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
                                         ModestMainWindow *main_window)
 {
        g_return_if_fail(server_account_name);
-       /* printf("DEBUG: %s: server_account_name=%s\n", __FUNCTION__, server_account_name); */
+       gboolean completed = FALSE;
        
        /* Initalize output parameters: */
        if (cancel)
@@ -2580,9 +3121,9 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
        GtkWidget *dialog = gtk_dialog_new_with_buttons (_("mail_ti_password_protected"),
                                              NULL,
                                              GTK_DIALOG_MODAL,
-                                             GTK_STOCK_OK,
+                                             _("mcen_bd_dialog_ok"),
                                              GTK_RESPONSE_ACCEPT,
-                                             GTK_STOCK_CANCEL,
+                                             _("mcen_bd_dialog_cancel"),
                                              GTK_RESPONSE_REJECT,
                                              NULL);
 #else
@@ -2596,13 +3137,14 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
                                              NULL);
 #endif /* MODEST_PLATFORM_MAEMO */
 
-       gtk_window_set_transient_for (GTK_WINDOW(dialog), GTK_WINDOW(main_window));
+       modest_window_mgr_set_modal (modest_runtime_get_window_mgr(), GTK_WINDOW (dialog));
        
-       gchar *server_name = modest_server_account_get_hostname (
+       gchar *server_name = modest_account_mgr_get_server_account_hostname (
                modest_runtime_get_account_mgr(), server_account_name);
        if (!server_name) {/* This happened once, though I don't know why. murrayc. */
                g_warning("%s: Could not get server name for server account '%s'", __FUNCTION__, server_account_name);
-               *cancel = TRUE;
+               if (cancel)
+                       *cancel = TRUE;
                return;
        }
        
@@ -2616,7 +3158,7 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
        server_name = NULL;
 
        /* username: */
-       gchar *initial_username = modest_server_account_get_username (
+       gchar *initial_username = modest_account_mgr_get_server_account_username (
                modest_runtime_get_account_mgr(), server_account_name);
        
        GtkWidget *entry_username = gtk_entry_new ();
@@ -2625,7 +3167,7 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
        /* Dim this if a connection has ever succeeded with this username,
         * as per the UI spec: */
        const gboolean username_known = 
-               modest_server_account_get_username_has_succeeded(
+               modest_account_mgr_get_server_account_username_has_succeeded(
                        modest_runtime_get_account_mgr(), server_account_name);
        gtk_widget_set_sensitive (entry_username, !username_known);
        
@@ -2670,6 +3212,9 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
        gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), entry_password,
                            TRUE, FALSE, 0);
 #endif /* MODEST_PLATFORM_MAEMO */     
+
+       if (initial_username != NULL)
+               gtk_widget_grab_focus (GTK_WIDGET (entry_password));
                                
 /* This is not in the Maemo UI spec:
        remember_pass_check = gtk_check_button_new_with_label (_("Remember password"));
@@ -2678,49 +3223,58 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
 */
 
        gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox));
+
+       while (!completed) {
        
-       if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
-               if (username) {
-                       *username = g_strdup (gtk_entry_get_text (GTK_ENTRY(entry_username)));
-                       
-                       modest_server_account_set_username (
-                                modest_runtime_get_account_mgr(), server_account_name, 
-                                *username);
-                                
-                       const gboolean username_was_changed = 
-                               (strcmp (*username, initial_username) != 0);
-                       if (username_was_changed) {
-                               g_warning ("%s: tinymail does not yet support changing the "
-                                       "username in the get_password() callback.\n", __FUNCTION__);
+               if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
+                       if (username) {
+                               *username = g_strdup (gtk_entry_get_text (GTK_ENTRY(entry_username)));
+                               
+                               /* Note that an empty field becomes the "" string */
+                               if (*username && strlen (*username) > 0) {
+                                       modest_account_mgr_set_server_account_username (modest_runtime_get_account_mgr(), 
+                                                                                       server_account_name, 
+                                                                                       *username);
+                                       completed = TRUE;
+                               
+                                       const gboolean username_was_changed = 
+                                               (strcmp (*username, initial_username) != 0);
+                                       if (username_was_changed) {
+                                               g_warning ("%s: tinymail does not yet support changing the "
+                                                          "username in the get_password() callback.\n", __FUNCTION__);
+                                       }
+                               } else {
+                                       /* Show error */
+                                       modest_platform_information_banner (GTK_WIDGET (dialog), NULL, 
+                                                                           _("mcen_ib_username_pw_incorrect"));
+                                       completed = FALSE;
+                               }
                        }
-               }
                        
-               if (password) {
-                       *password = g_strdup (gtk_entry_get_text (GTK_ENTRY(entry_password)));
+                       if (password) {
+                               *password = g_strdup (gtk_entry_get_text (GTK_ENTRY(entry_password)));
                        
-                       /* We do not save the password in the configuration, 
-                        * because this function is only called for passwords that should 
-                        * not be remembered:
-                       modest_server_account_set_password (
+                               /* We do not save the password in the configuration, 
+                                * because this function is only called for passwords that should 
+                                * not be remembered:
+                                modest_server_account_set_password (
                                 modest_runtime_get_account_mgr(), server_account_name, 
                                 *password);
-                       */
+                                */
+                       }                       
+                       if (cancel)
+                               *cancel   = FALSE;                      
+               } else {
+                       modest_platform_information_banner(GTK_WIDGET (dialog), 
+                                                          NULL, _("mail_ib_login_cancelled"));
+                       completed = TRUE;
+                       if (username)
+                               *username = NULL;                       
+                       if (password)
+                               *password = NULL;                       
+                       if (cancel)
+                               *cancel   = TRUE;
                }
-               
-               if (cancel)
-                       *cancel   = FALSE;
-                       
-       } else {
-               show_error(GTK_WIDGET (main_window), _("mail_ib_login_cancelled"));
-               
-               if (username)
-                       *username = NULL;
-                       
-               if (password)
-                       *password = NULL;
-                       
-               if (cancel)
-                       *cancel   = TRUE;
        }
 
 /* This is not in the Maemo UI spec:
@@ -2752,11 +3306,33 @@ modest_ui_actions_on_cut (GtkAction *action,
                GtkTextBuffer *buffer;
 
                buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focused_widget));
-               gtk_text_buffer_cut_clipboard (buffer, clipboard, TRUE);
-               gtk_clipboard_set_can_store (clipboard, NULL, 0);
-               gtk_clipboard_store (clipboard);
+               if (modest_text_utils_buffer_selection_is_valid (buffer)) {
+                       gtk_text_buffer_cut_clipboard (buffer, clipboard, TRUE);
+                       gtk_clipboard_set_can_store (clipboard, NULL, 0);
+                       gtk_clipboard_store (clipboard);
+               }
        } else if (MODEST_IS_HEADER_VIEW (focused_widget)) {
-               modest_header_view_cut_selection (MODEST_HEADER_VIEW (focused_widget));
+               TnyList *header_list = modest_header_view_get_selected_headers (
+                               MODEST_HEADER_VIEW (focused_widget));
+               gboolean continue_download = FALSE;
+               gint num_of_unc_msgs;
+
+               num_of_unc_msgs = header_list_count_uncached_msgs(header_list);
+
+               if (num_of_unc_msgs) {
+                       TnyAccount *account = get_account_from_header_list (header_list);
+                       continue_download = connect_to_get_msg (window, num_of_unc_msgs, account);
+                       g_object_unref (account);
+               }
+
+               if (num_of_unc_msgs == 0 || continue_download) {
+/*                     modest_platform_information_banner (
+                                       NULL, NULL, _CS("mcen_ib_getting_items"));*/
+                       modest_header_view_cut_selection (
+                                       MODEST_HEADER_VIEW (focused_widget));
+               }
+
+               g_object_unref (header_list);
        } else if (MODEST_IS_FOLDER_VIEW (focused_widget)) {
                modest_folder_view_cut_selection (MODEST_FOLDER_VIEW (focused_widget));
        }
@@ -2768,12 +3344,16 @@ modest_ui_actions_on_copy (GtkAction *action,
 {
        GtkClipboard *clipboard;
        GtkWidget *focused_widget;
+       gboolean copied = TRUE;
 
        clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
        focused_widget = gtk_window_get_focus (GTK_WINDOW (window));
 
        if (GTK_IS_LABEL (focused_widget)) {
-               gtk_clipboard_set_text (clipboard, gtk_label_get_text (GTK_LABEL (focused_widget)), -1);
+               gchar *selection;
+               selection = modest_text_utils_label_get_selection (GTK_LABEL (focused_widget));
+               gtk_clipboard_set_text (clipboard, selection, -1);
+               g_free (selection);
                gtk_clipboard_set_can_store (clipboard, NULL, 0);
                gtk_clipboard_store (clipboard);
        } else if (GTK_IS_EDITABLE (focused_widget)) {
@@ -2787,43 +3367,43 @@ modest_ui_actions_on_copy (GtkAction *action,
        } else if (GTK_IS_TEXT_VIEW (focused_widget)) {
                GtkTextBuffer *buffer;
                buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focused_widget));
-               gtk_text_buffer_copy_clipboard (buffer, clipboard);
-               gtk_clipboard_set_can_store (clipboard, NULL, 0);
-               gtk_clipboard_store (clipboard);
+               if (modest_text_utils_buffer_selection_is_valid (buffer)) {
+                       gtk_text_buffer_copy_clipboard (buffer, clipboard);
+                       gtk_clipboard_set_can_store (clipboard, NULL, 0);
+                       gtk_clipboard_store (clipboard);
+               }
        } else if (MODEST_IS_HEADER_VIEW (focused_widget)) {
-               TnyList *header_list = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW (focused_widget));
-               TnyIterator *iter = tny_list_create_iterator (header_list);
-               TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
-               
-               gboolean ask = FALSE;
-               if (header) {
-                       TnyFolder *folder = tny_header_get_folder (header);
-                       TnyAccount *account = tny_folder_get_account (folder);
-                       const gchar *proto_str = tny_account_get_proto (TNY_ACCOUNT (account));
-                       /* If it's POP then ask */
-                       ask = (modest_protocol_info_get_transport_store_protocol (proto_str) == 
-                               MODEST_PROTOCOL_STORE_POP) ? TRUE : FALSE;
+               TnyList *header_list = modest_header_view_get_selected_headers (
+                               MODEST_HEADER_VIEW (focused_widget));
+               gboolean continue_download = FALSE;
+               gint num_of_unc_msgs;
+
+               num_of_unc_msgs = header_list_count_uncached_msgs(header_list);
+
+               if (num_of_unc_msgs) {
+                       TnyAccount *account = get_account_from_header_list (header_list);
+                       continue_download = connect_to_get_msg (window, num_of_unc_msgs, account);
                        g_object_unref (account);
-                       g_object_unref (folder);
-                       g_object_unref (header);
                }
 
-               g_object_unref (iter);
-               
-               /* Check that the messages have been previously downloaded */
-               gboolean continue_download = TRUE;
-               if (ask)
-                       continue_download = download_uncached_messages (header_list, GTK_WINDOW (window), FALSE);
-               if (continue_download)
-                       modest_header_view_copy_selection (MODEST_HEADER_VIEW (focused_widget));
+               if (num_of_unc_msgs == 0 || continue_download) {
+                       modest_platform_information_banner (
+                                       NULL, NULL, _CS("mcen_ib_getting_items"));
+                       modest_header_view_copy_selection (
+                                       MODEST_HEADER_VIEW (focused_widget));
+               } else
+                       copied = FALSE;
+
                g_object_unref (header_list);
+
        } else if (MODEST_IS_FOLDER_VIEW (focused_widget)) {
                modest_folder_view_copy_selection (MODEST_FOLDER_VIEW (focused_widget));
-       }    
+       }
 
-       /* Show information banner */
-       modest_platform_information_banner (NULL, NULL, _CS("ecoc_ib_edwin_copied"));
-       
+       /* Show information banner if there was a copy to clipboard */
+       if(copied)
+               modest_platform_information_banner (
+                               NULL, NULL, _CS("ecoc_ib_edwin_copied"));
 }
 
 void
@@ -2858,16 +3438,24 @@ modest_ui_actions_on_redo (GtkAction *action,
 
 
 static void
-paste_msgs_cb (const GObject *object, gpointer user_data)
+destroy_information_note (ModestMailOperation *mail_op, 
+                         gpointer user_data)
 {
-       g_return_if_fail (MODEST_IS_MAIN_WINDOW (object));
-       g_return_if_fail (GTK_IS_WIDGET (user_data));
-       
        /* destroy information note */
        gtk_widget_destroy (GTK_WIDGET(user_data));
 }
 
 static void
+destroy_folder_information_note (ModestMailOperation *mail_op, 
+                                TnyFolder *new_folder,
+                                gpointer user_data)
+{
+       /* destroy information note */
+       gtk_widget_destroy (GTK_WIDGET(user_data));
+}
+
+
+static void
 paste_as_attachment_free (gpointer data)
 {
        PasteAsAttachmentHelper *helper = (PasteAsAttachmentHelper *) data;
@@ -2924,8 +3512,7 @@ modest_ui_actions_on_paste (GtkAction *action,
                        helper->banner = modest_platform_animation_banner (GTK_WIDGET (window), NULL,
                                                                           _CS("ckct_nw_pasting"));
                        modest_email_clipboard_get_data (e_clipboard, &src_folder, &data, &delete);
-                       mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, 
-                                                            G_OBJECT (window));
+                       mail_op = modest_mail_operation_new (G_OBJECT (window));
                        if (helper->banner != NULL) {
                                g_object_ref (G_OBJECT (helper->banner));
                                gtk_window_set_modal (GTK_WINDOW (helper->banner), FALSE);
@@ -2956,7 +3543,7 @@ modest_ui_actions_on_paste (GtkAction *action,
                modest_email_clipboard_get_data (clipboard, &src_folder, &data, &delete);
 
                /* Create a new mail operation */
-               mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT(window));
+               mail_op = modest_mail_operation_new (G_OBJECT(window));
                
                /* Get destination folder */
                folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (focused_widget));
@@ -2966,10 +3553,11 @@ modest_ui_actions_on_paste (GtkAction *action,
                        gint response = 0;
 
                        /* Ask for user confirmation */
-                       response = msgs_move_to_confirmation (GTK_WINDOW (window), 
-                                                             TNY_FOLDER (folder_store), 
-                                                             delete,
-                                                             data);
+                       response = 
+                               modest_ui_actions_msgs_move_to_confirmation (window, 
+                                                                            TNY_FOLDER (folder_store), 
+                                                                            delete,
+                                                                            data);
                        
                        if (response == GTK_RESPONSE_OK) {
                                /* Launch notification */
@@ -2985,7 +3573,7 @@ modest_ui_actions_on_paste (GtkAction *action,
                                                                 data,
                                                                 TNY_FOLDER (folder_store),
                                                                 delete,
-                                                                paste_msgs_cb,
+                                                                destroy_information_note,
                                                                 inf_note);                             
                        } else {
                                g_object_unref (mail_op);
@@ -3005,7 +3593,7 @@ modest_ui_actions_on_paste (GtkAction *action,
                                                           src_folder,
                                                           folder_store,
                                                           delete,
-                                                          paste_msgs_cb,
+                                                          destroy_folder_information_note,
                                                           inf_note);
                }
 
@@ -3047,16 +3635,25 @@ modest_ui_actions_on_select_all (GtkAction *action,
                GtkWidget *header_view = focused_widget;
                GtkTreeSelection *selection = NULL;
                
-               if (!(MODEST_IS_HEADER_VIEW (focused_widget)))
+               if (!(MODEST_IS_HEADER_VIEW (focused_widget))) {
                        header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (window),
-                                                                          MODEST_WIDGET_TYPE_HEADER_VIEW);
+                                                                          MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
+               }
                                
+               /* Disable window dimming management */
+               modest_window_disable_dimming (MODEST_WINDOW(window));
+               
                /* Select all messages */
                selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(header_view));
                gtk_tree_selection_select_all (selection);
 
                /* Set focuse on header view */
                gtk_widget_grab_focus (header_view);
+
+
+               /* Enable window dimming management */
+               modest_window_enable_dimming (MODEST_WINDOW(window));
+               modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
        }
 
 }
@@ -3094,9 +3691,10 @@ modest_ui_actions_on_change_zoom (GtkRadioAction *action,
        }
 }
 
-void     modest_ui_actions_msg_edit_on_change_priority (GtkRadioAction *action,
-                                                       GtkRadioAction *selected,
-                                                       ModestWindow *window)
+void
+modest_ui_actions_msg_edit_on_change_priority (GtkRadioAction *action,
+                                              GtkRadioAction *selected,
+                                              ModestWindow *window)
 {
        TnyHeaderFlags flags;
        g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
@@ -3105,9 +3703,10 @@ void     modest_ui_actions_msg_edit_on_change_priority (GtkRadioAction *action,
        modest_msg_edit_window_set_priority_flags (MODEST_MSG_EDIT_WINDOW (window), flags);
 }
 
-void     modest_ui_actions_msg_edit_on_change_file_format (GtkRadioAction *action,
-                                                          GtkRadioAction *selected,
-                                                          ModestWindow *window)
+void
+modest_ui_actions_msg_edit_on_change_file_format (GtkRadioAction *action,
+                                                 GtkRadioAction *selected,
+                                                 ModestWindow *window)
 {
        gint file_format;
 
@@ -3118,7 +3717,7 @@ void     modest_ui_actions_msg_edit_on_change_file_format (GtkRadioAction *actio
 }
 
 
-void     
+void
 modest_ui_actions_on_zoom_plus (GtkAction *action,
                                ModestWindow *window)
 {
@@ -3252,7 +3851,7 @@ modest_ui_actions_on_details (GtkAction *action,
 
                /* Check which widget has the focus */
                folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
-                                                                   MODEST_WIDGET_TYPE_FOLDER_VIEW);
+                                                                   MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
                if (gtk_widget_is_focus (folder_view)) {
                        TnyFolderStore *folder_store
                                = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
@@ -3271,7 +3870,7 @@ modest_ui_actions_on_details (GtkAction *action,
 
                } else {
                        header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
-                                                                          MODEST_WIDGET_TYPE_HEADER_VIEW);
+                                                                          MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
                        /* Show details of each header */
                        do_headers_action (win, headers_action_show_details, header_view);
                }
@@ -3326,7 +3925,7 @@ modest_ui_actions_on_toggle_toolbar (GtkToggleAction *toggle,
 
        /* Toggle toolbar */
        mgr = modest_runtime_get_window_mgr ();
-       modest_window_mgr_show_toolbars (mgr, active, fullscreen);
+       modest_window_mgr_show_toolbars (mgr, G_TYPE_FROM_INSTANCE (window), active, fullscreen);
 }
 
 void     
@@ -3336,21 +3935,27 @@ modest_ui_actions_msg_edit_on_select_font (GtkAction *action,
        modest_msg_edit_window_select_font (window);
 }
 
+
 void
 modest_ui_actions_on_folder_display_name_changed (ModestFolderView *folder_view,
                                                  const gchar *display_name,
                                                  GtkWindow *window)
 {
-       /* Do not change the application name if the widget has not
-          the focus. This callback could be called even if the folder
-          view has not the focus, because the handled signal could be
-          emitted when the folder view is redrawn */
-       if (gtk_widget_is_focus (GTK_WIDGET (folder_view))) {
-               if (display_name)
-                       gtk_window_set_title (window, display_name);
-               else
-                       gtk_window_set_title (window, " ");
-       }
+       /* don't update the display name if it was already set;
+        * updating the display name apparently is expensive */
+       const gchar* old_name = gtk_window_get_title (window);
+
+       if (display_name == NULL)
+               display_name = " ";
+
+       if (old_name && display_name && strcmp (old_name, display_name) == 0)
+               return; /* don't do anything */
+
+       /* This is usually used to change the title of the main window, which
+        * is the one that holds the folder view. Note that this change can
+        * happen even when the widget doesn't have the focus. */
+       gtk_window_set_title (window, display_name);
+
 }
 
 void
@@ -3374,25 +3979,183 @@ create_move_to_dialog_on_new_folder(GtkWidget *button, gpointer user_data)
                                         GTK_WIDGET (user_data));
 }
 
-static GtkWidget*
-create_move_to_dialog (GtkWindow *win,
-                      GtkWidget *folder_view,
-                      GtkWidget **tree_view)
-{
-       GtkWidget *dialog, *scroll;
-       GtkWidget *new_button;
+/*
+ * This function is used to track changes in the selection of the
+ * folder view that is inside the "move to" dialog to enable/disable
+ * the OK button because we do not want the user to select a disallowed
+ * destination for a folder.
+ * The user also not desired to be able to use NEW button on items where
+ * folder creation is not possibel.
+ */
+static void
+on_move_to_dialog_folder_selection_changed (ModestFolderView* self,
+                                           TnyFolderStore *folder_store,
+                                           gboolean selected,
+                                           gpointer user_data)
+{
+       GtkWidget *dialog = NULL;
+       GtkWidget *ok_button = NULL, *new_button = NULL;
+       GList *children = NULL;
+       gboolean ok_sensitive = TRUE, new_sensitive = TRUE;
+       gboolean moving_folder = FALSE;
+       gboolean is_local_account = TRUE;
+       GtkWidget *folder_view = NULL;
+       ModestTnyFolderRules rules;
+
+       g_return_if_fail (MODEST_IS_FOLDER_VIEW(self));
+       
+       if (!selected)
+               return;
+       
+       /* Get the OK button */
+       dialog = gtk_widget_get_ancestor (GTK_WIDGET (self), GTK_TYPE_DIALOG);
+       if (!dialog)
+               return;
 
-       dialog = gtk_dialog_new_with_buttons (_("mcen_ti_moveto_folders_title"),
-                                             GTK_WINDOW (win),
-                                             GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR | GTK_DIALOG_DESTROY_WITH_PARENT,
-                                             NULL);
+       children = gtk_container_get_children (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area));
+       ok_button = GTK_WIDGET (children->next->next->data);
+       new_button = GTK_WIDGET (children->next->data);
+       g_list_free (children);
 
-       gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_OK, GTK_RESPONSE_ACCEPT);
+       /* check if folder_store is an remote account */
+       if (TNY_IS_ACCOUNT (folder_store)) {
+               TnyAccount *local_account = NULL;
+               TnyAccount *mmc_account = NULL;
+               ModestTnyAccountStore *account_store = NULL;
+
+               account_store = modest_runtime_get_account_store ();
+               local_account = modest_tny_account_store_get_local_folders_account (account_store);
+               mmc_account = modest_tny_account_store_get_mmc_folders_account (account_store);
+
+               if ((gpointer) local_account != (gpointer) folder_store &&
+                   (gpointer) mmc_account != (gpointer) folder_store) {
+                       const char *proto_name = tny_account_get_proto (TNY_ACCOUNT (folder_store));
+                       ModestTransportStoreProtocol proto = MODEST_PROTOCOL_STORE_MAILDIR;
+                       if (proto_name != NULL) {
+                               proto = modest_protocol_info_get_transport_store_protocol (proto_name);
+                       }
+                       is_local_account = FALSE;
+                       /* New button should be dimmed on remote
+                          POP account root */
+                       new_sensitive = (proto != MODEST_PROTOCOL_STORE_POP);
+               }
+               g_object_unref (local_account);
+       }
+
+       /* Check the target folder rules */
+       if (TNY_IS_FOLDER (folder_store)) {
+               rules = modest_tny_folder_get_rules (TNY_FOLDER (folder_store));
+               if (rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE) {
+                       ok_sensitive = FALSE;
+                       new_sensitive = FALSE;
+                       goto end;
+               }
+       }
+
+       /* Check if we're moving a folder */
+       if (MODEST_IS_MAIN_WINDOW (user_data)) {
+               /* Get the widgets */
+               folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (user_data),
+                                                                  MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
+               if (gtk_widget_is_focus (folder_view))
+                       moving_folder = TRUE;
+       }
+
+       if (moving_folder) {
+               TnyFolderStore *moved_folder = NULL, *parent = NULL;
+
+               /* Get the folder to move */
+               moved_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
+               
+               /* Check that we're not moving to the same folder */
+               if (TNY_IS_FOLDER (moved_folder)) {
+                       parent = tny_folder_get_folder_store (TNY_FOLDER (moved_folder));
+                       if (parent == folder_store)
+                               ok_sensitive = FALSE;
+                       g_object_unref (parent);
+               } 
+
+               if (ok_sensitive && TNY_IS_ACCOUNT (folder_store)) {
+                       /* Do not allow to move to an account unless it's the
+                          local folders account */
+                       if (!is_local_account)
+                               ok_sensitive = FALSE;
+               } 
+
+               if (ok_sensitive && (moved_folder == folder_store)) {
+                       /* Do not allow to move to itself */
+                       ok_sensitive = FALSE;
+               }
+               g_object_unref (moved_folder);
+       } else {
+               TnyFolder *src_folder = NULL;
+
+               /* Moving a message */
+               if (MODEST_IS_MSG_VIEW_WINDOW (user_data)) {
+
+                       TnyHeader *header = NULL;
+                       header = modest_msg_view_window_get_header
+                               (MODEST_MSG_VIEW_WINDOW (user_data));
+                       if (!TNY_IS_HEADER(header))
+                               g_warning ("%s: could not get source header", __FUNCTION__);
+                       else
+                               src_folder = tny_header_get_folder (header);
+
+                       if (header)
+                               g_object_unref (header);
+               } else {
+                       src_folder = 
+                               TNY_FOLDER (modest_folder_view_get_selected
+                                           (MODEST_FOLDER_VIEW (folder_view)));
+               }
+
+               if (TNY_IS_FOLDER(src_folder)) {
+                       /* Do not allow to move the msg to the same folder */
+                       /* Do not allow to move the msg to an account */
+                       if ((gpointer) src_folder == (gpointer) folder_store ||
+                           TNY_IS_ACCOUNT (folder_store))
+                               ok_sensitive = FALSE;
+                       g_object_unref (src_folder);
+               } else
+                       g_warning ("%s: could not get source folder", __FUNCTION__);
+       }
+
+ end:
+       /* Set sensitivity of the OK button */
+       gtk_widget_set_sensitive (ok_button, ok_sensitive);
+       /* Set sensitivity of the NEW button */
+       gtk_widget_set_sensitive (new_button, new_sensitive);
+}
+
+
+#define MODEST_MOVE_TO_DIALOG_FOLDER_VIEW "move-to-dialog-folder-view"
+
+static GtkWidget*
+get_folder_view_from_move_to_dialog (GtkWidget *move_to_dialog)
+{
+       return GTK_WIDGET(g_object_get_data (G_OBJECT(move_to_dialog),
+                                            MODEST_MOVE_TO_DIALOG_FOLDER_VIEW));
+}
+
+static GtkWidget*
+create_move_to_dialog (GtkWindow *win,
+                      GtkWidget *folder_view,
+                      GtkWidget **tree_view)
+{
+       GtkWidget *dialog, *scroll;
+       GtkWidget *new_button;
+
+       dialog = gtk_dialog_new_with_buttons (_("mcen_ti_moveto_folders_title"),
+                                             GTK_WINDOW (win),
+                                             GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR | GTK_DIALOG_DESTROY_WITH_PARENT,
+                                             NULL);
+
+       gtk_dialog_add_button (GTK_DIALOG (dialog), _("mcen_bd_dialog_ok"), GTK_RESPONSE_ACCEPT);
        /* We do this manually so GTK+ does not associate a response ID for
         * the button. */
-       new_button = gtk_button_new_from_stock (GTK_STOCK_NEW);
+       new_button = gtk_button_new_from_stock (_("mcen_bd_new"));
        gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->action_area), new_button, FALSE, FALSE, 0);
-       gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT);
+       gtk_dialog_add_button (GTK_DIALOG (dialog), _("mcen_bd_dialog_cancel"), GTK_RESPONSE_REJECT);
 
        /* Create scrolled window */
        scroll = gtk_scrolled_window_new (NULL, NULL);
@@ -3403,21 +4166,75 @@ create_move_to_dialog (GtkWindow *win,
        /* Create folder view */
        *tree_view = modest_platform_create_folder_view (NULL);
 
-       g_signal_connect (G_OBJECT (new_button), "clicked", G_CALLBACK(create_move_to_dialog_on_new_folder), *tree_view);
+       /* Track changes in the selection to
+        * disable the OK button whenever "Move to" is not possible
+        * disbale NEW button whenever New is not possible */
+       g_signal_connect (*tree_view,
+                         "folder_selection_changed",
+                         G_CALLBACK (on_move_to_dialog_folder_selection_changed),
+                         win);
+
+       /* Listen to clicks on New button */
+       g_signal_connect (G_OBJECT (new_button), 
+                         "clicked", 
+                         G_CALLBACK(create_move_to_dialog_on_new_folder), 
+                         *tree_view);
 
        /* It could happen that we're trying to move a message from a
           window (msg window for example) after the main window was
           closed, so we can not just get the model of the folder
           view */
-       if (MODEST_IS_FOLDER_VIEW (folder_view))
-               gtk_tree_view_set_model (GTK_TREE_VIEW (*tree_view),
-                                        gtk_tree_view_get_model (GTK_TREE_VIEW (folder_view)));
-       else
+       if (MODEST_IS_FOLDER_VIEW (folder_view)) {
+               const gchar *visible_id = NULL;
+
+               modest_folder_view_set_style (MODEST_FOLDER_VIEW (*tree_view),
+                                             MODEST_FOLDER_VIEW_STYLE_SHOW_ALL);
+               modest_folder_view_copy_model (MODEST_FOLDER_VIEW(folder_view), 
+                                              MODEST_FOLDER_VIEW(*tree_view));
+
+               visible_id = 
+                       modest_folder_view_get_account_id_of_visible_server_account (MODEST_FOLDER_VIEW(folder_view));
+
+               /* Show the same account than the one that is shown in the main window */
+               modest_folder_view_set_account_id_of_visible_server_account (MODEST_FOLDER_VIEW(*tree_view), 
+                                                                            visible_id);
+       } else {
+               const gchar *active_account_name = NULL;
+               ModestAccountMgr *mgr = NULL;
+               ModestAccountSettings *settings = NULL;
+               ModestServerAccountSettings *store_settings = NULL;
+
+               modest_folder_view_set_style (MODEST_FOLDER_VIEW (*tree_view),
+                                             MODEST_FOLDER_VIEW_STYLE_SHOW_ALL);
                modest_folder_view_update_model (MODEST_FOLDER_VIEW (*tree_view), 
                                                 TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()));
 
-       modest_folder_view_show_non_move_folders (MODEST_FOLDER_VIEW (*tree_view), FALSE);
+               active_account_name = modest_window_get_active_account (MODEST_WINDOW (win));
+               mgr = modest_runtime_get_account_mgr ();
+               settings = modest_account_mgr_load_account_settings (mgr, active_account_name);
+
+               if (settings) {
+                       const gchar *store_account_name;
+                       store_settings = modest_account_settings_get_store_settings (settings);
+                       store_account_name = modest_server_account_settings_get_account_name (store_settings);
+
+                       modest_folder_view_set_account_id_of_visible_server_account (MODEST_FOLDER_VIEW (*tree_view),
+                                                                                    store_account_name);
+                       g_object_unref (store_settings);
+                       g_object_unref (settings);
+               }
+       }
+
+       /* we keep a pointer to the embedded folder view, so we can retrieve it with
+        *   get_folder_view_from_move_to_dialog 
+        * (see above) later (needed for focus handling) 
+        */
+       g_object_set_data (G_OBJECT(dialog), MODEST_MOVE_TO_DIALOG_FOLDER_VIEW, *tree_view);
+
        
+       /* Hide special folders */
+       modest_folder_view_show_non_move_folders (MODEST_FOLDER_VIEW (*tree_view), FALSE);
+
        gtk_container_add (GTK_CONTAINER (scroll), *tree_view);
 
        /* Add scroll to dialog */
@@ -3434,6 +4251,7 @@ create_move_to_dialog (GtkWindow *win,
  * Returns TRUE if at least one of the headers of the list belongs to
  * a message that has been fully retrieved.
  */
+#if 0 /* no longer in use. delete in 2007.10 */
 static gboolean
 has_retrieved_msgs (TnyList *list)
 {
@@ -3462,102 +4280,165 @@ has_retrieved_msgs (TnyList *list)
 
        return found;
 }
+#endif /* 0 */
+
 
 /*
  * Shows a confirmation dialog to the user when we're moving messages
  * from a remote server to the local storage. Returns the dialog
- * response. If it's other kind of movement the it always returns
+ * response. If it's other kind of movement then it always returns
  * GTK_RESPONSE_OK
+ *
+ * This one is used by the next functions:
+ *     modest_ui_actions_on_paste                      - commented out
+ *     drag_and_drop_from_header_view (for d&d in modest_folder_view.c)
  */
-static gint
-msgs_move_to_confirmation (GtkWindow *win,
-                          TnyFolder *dest_folder,
-                          gboolean delete,
-                          TnyList *headers)
+gint
+modest_ui_actions_msgs_move_to_confirmation (ModestWindow *win,
+                                            TnyFolder *dest_folder,
+                                            gboolean delete,
+                                            TnyList *headers)
 {
        gint response = GTK_RESPONSE_OK;
+       TnyAccount *account = NULL;
+       TnyFolder *src_folder = NULL;
+       TnyIterator *iter = NULL;
+       TnyHeader *header = NULL;
 
-       /* If the destination is a local folder (or MMC folder )*/
-       if (!modest_tny_folder_is_remote_folder (dest_folder)) {
-/*     if (modest_tny_folder_is_local_folder (dest_folder)) { */
-               TnyFolder *src_folder = NULL;
-               TnyIterator *iter = NULL;
-               TnyHeader *header = NULL;
+       /* return with OK if the destination is a remote folder */
+       if (modest_tny_folder_is_remote_folder (dest_folder))
+               return GTK_RESPONSE_OK;
 
-               /* Get source folder */
-               iter = tny_list_create_iterator (headers);
-               header = TNY_HEADER (tny_iterator_get_current (iter));
-               if (header) {
-                       src_folder = tny_header_get_folder (header);
-                       g_object_unref (header);
-               }
+       /* Get source folder */
+       iter = tny_list_create_iterator (headers);
+       header = TNY_HEADER (tny_iterator_get_current (iter));
+       if (header) {
+               src_folder = tny_header_get_folder (header);
+               g_object_unref (header);
+       }
+       g_object_unref (iter);
 
-               g_object_unref (iter);
+       /* if no src_folder, message may be an attahcment */
+       if (src_folder == NULL) 
+               return GTK_RESPONSE_CANCEL;
 
-               /* if no src_folder, message may be an attahcment */
-               if (src_folder == NULL) 
-                       return GTK_RESPONSE_CANCEL;
-
-               /* If the source is a remote folder */
-/*             if (!modest_tny_folder_is_local_folder (src_folder)) { */
-               if (modest_tny_folder_is_remote_folder (src_folder)) {
-                       const gchar *message = NULL;
-                       gboolean cached = has_retrieved_msgs (headers);
-                       if (cached) 
-                               message = ngettext ("mcen_nc_move_retrieve", "mcen_nc_move_retrieves",
-                                                   tny_list_get_length (headers));
-                       else 
-                               message = ngettext ("mcen_nc_move_header", "mcen_nc_move_headers",
-                                                   tny_list_get_length (headers));
-                       
-                       if (cached && !delete)  
-                               response = GTK_RESPONSE_OK;
-                       else
-                               response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
-                                                                                   (const gchar *) message);
-               }
-               
+       /* If the source is a local or MMC folder */
+       if (!modest_tny_folder_is_remote_folder (src_folder)) {
                g_object_unref (src_folder);
+               return GTK_RESPONSE_OK;
        }
-       
+
+       /* Get the account */
+       account = tny_folder_get_account (src_folder);
+
+       /* now if offline we ask the user */
+       if(connect_to_get_msg (win, tny_list_get_length (headers), account))
+               response = GTK_RESPONSE_OK;
+       else
+               response = GTK_RESPONSE_CANCEL;
+
+       /* Frees */
+       g_object_unref (src_folder);
+       g_object_unref (account);
+
        return response;
 }
 
+static void
+move_to_cb (ModestMailOperation *mail_op, 
+           gpointer user_data)
+{
+       MoveToHelper *helper = (MoveToHelper *) user_data;
+
+       /* Note that the operation could have failed, in that case do
+          nothing */
+       if (modest_mail_operation_get_status (mail_op) == 
+           MODEST_MAIL_OPERATION_STATUS_SUCCESS) {
+
+               GObject *object = modest_mail_operation_get_source (mail_op);
+               if (MODEST_IS_MSG_VIEW_WINDOW (object)) {
+                       ModestMsgViewWindow *self = MODEST_MSG_VIEW_WINDOW (object);
 
+                       if (!modest_msg_view_window_select_next_message (self) &&
+                           !modest_msg_view_window_select_previous_message (self)) {
+                               /* No more messages to view, so close this window */
+                               modest_ui_actions_on_close_window (NULL, MODEST_WINDOW(self));
+                       }
+               } else if (MODEST_IS_MAIN_WINDOW (object) && helper->reference != NULL) {
+                       GtkWidget *header_view;
+                       GtkTreePath *path;
+                       GtkTreeSelection *sel;
+
+                       header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(object),
+                                                                          MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
+                       sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (header_view));
+                       path = gtk_tree_row_reference_get_path (helper->reference);
+                       gtk_tree_selection_select_path (sel, path);
+                       gtk_tree_path_free (path);
+               }
+               g_object_unref (object);
+        }
+
+       /* Close the "Pasting" information banner */
+       gtk_widget_destroy (GTK_WIDGET(helper->banner));
+       if (helper->reference != NULL)
+               gtk_tree_row_reference_free (helper->reference);
+       g_free (helper);
+}
 
 static void
-transfer_msgs_from_viewer_cb (const GObject *object, gpointer user_data)
+folder_move_to_cb (ModestMailOperation *mail_op, 
+                  TnyFolder *new_folder,
+                  gpointer user_data)
 {
-       ModestMsgViewWindow *self = NULL;
+       GtkWidget *folder_view;
+       GObject *object;
 
-       g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (object));
-       self = MODEST_MSG_VIEW_WINDOW (object);
-       
-       if (!modest_msg_view_window_select_next_message (self))
-               if (!modest_msg_view_window_select_previous_message (self))
-                       /* No more messages to view, so close this window */
-                       modest_ui_actions_on_close_window (NULL, MODEST_WINDOW(self));
+       object = modest_mail_operation_get_source (mail_op);
+       folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(object),
+                                                          MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
+       g_object_ref (folder_view);
+       g_object_unref (object);
+       move_to_cb (mail_op, user_data);
+       modest_folder_view_select_folder (MODEST_FOLDER_VIEW (folder_view), new_folder, FALSE);
+       g_object_unref (folder_view);
+}
+
+static void
+msgs_move_to_cb (ModestMailOperation *mail_op, 
+                gpointer user_data)
+{
+       move_to_cb (mail_op, user_data);
 }
 
 void
 modest_ui_actions_move_folder_error_handler (ModestMailOperation *mail_op, 
                                             gpointer user_data)
 {
-       GObject *win = modest_mail_operation_get_source (mail_op);
-       const GError *error = NULL;
-       const gchar *message = NULL;
+       ModestWindow *main_window = NULL;
+       GObject *win = NULL;
        
-       /* Get error message */
-       error = modest_mail_operation_get_error (mail_op);
-       if (error != NULL && error->message != NULL) {
-               message = error->message;
-       } else {
-               message = _("mail_in_ui_folder_move_target_error");
-       }
+       /* Disable next automatic folder selection */
+       main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
+                                                        FALSE); /* don't create */
+       if (main_window) {
+               GtkWidget *folder_view = NULL;
        
+               folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (main_window),
+                                                                  MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); 
+               modest_folder_view_disable_next_folder_selection (MODEST_FOLDER_VIEW(folder_view));
+               
+               if (user_data && TNY_IS_FOLDER (user_data)) {
+                       modest_folder_view_select_folder (MODEST_FOLDER_VIEW (folder_view), 
+                                                         TNY_FOLDER (user_data), FALSE);
+               }
+       }
+
        /* Show notification dialog */
-       modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL, message);
-       g_object_unref (win);
+       win = modest_mail_operation_get_source (mail_op);
+       modest_platform_run_information_dialog ((GtkWindow *) win, _("mail_in_ui_folder_move_target_error"));
+       if (win)
+               g_object_unref (win);
 }
 
 void
@@ -3586,7 +4467,9 @@ modest_ui_actions_send_receive_error_handler (ModestMailOperation *mail_op,
 static void
 open_msg_for_purge_cb (ModestMailOperation *mail_op, 
                       TnyHeader *header, 
+                      gboolean canceled,
                       TnyMsg *msg, 
+                      GError *err,
                       gpointer user_data)
 {
        TnyList *parts;
@@ -3624,6 +4507,8 @@ open_msg_for_purge_cb (ModestMailOperation *mail_op,
 
                tny_iterator_next (iter);
        }
+       g_object_unref (iter);
+       
 
        if (pending_purges>0) {
                gint response;
@@ -3631,7 +4516,7 @@ open_msg_for_purge_cb (ModestMailOperation *mail_op,
 
                if (response == GTK_RESPONSE_OK) {
                        modest_platform_information_banner (NULL, NULL, _("mcen_ib_removing_attachment"));
-                       tny_iterator_first (iter);
+                       iter = tny_list_create_iterator (parts);
                        while (!tny_iterator_is_done (iter)) {
                                TnyMimePart *part;
                                
@@ -3644,32 +4529,17 @@ open_msg_for_purge_cb (ModestMailOperation *mail_op,
 
                                tny_iterator_next (iter);
                        }
+                       g_object_unref (iter);
                        
                        tny_msg_rewrite_cache (msg);
                }
-       } else {
-               modest_platform_information_banner (NULL, NULL, _("mail_ib_attachment_already_purged"));
+     /* } else { */
+               /* This string no longer exists, refer to NB#75415 for more info */
+               /* modest_platform_information_banner (NULL, NULL, _("mail_ib_attachment_already_purged")); */
        }
 
-       /* remove attachments */
-       tny_iterator_first (iter);
-       while (!tny_iterator_is_done (iter)) {
-               TnyMimePart *part;
-                       
-               part = TNY_MIME_PART (tny_iterator_get_current (iter));
-               if (part) {
-                       /* One for the reference given by tny_iterator_get_current(): */
-                       g_object_unref (part);
-
-                       /* TODO: Is this meant to remove the attachment by doing another unref()? 
-                        * Otherwise, this seems useless. */
-               }
-
-               tny_iterator_next (iter);
-       }
        modest_window_mgr_unregister_header (mgr, header);
 
-       g_object_unref (iter);
        g_object_unref (parts);
 }
 
@@ -3679,7 +4549,6 @@ modest_ui_actions_on_main_window_remove_attachments (GtkAction *action,
 {
        GtkWidget *header_view;
        TnyList *header_list;
-       TnyIterator *iter;
        TnyHeader *header;
        TnyHeaderFlags flags;
        ModestWindow *msg_view_window =  NULL;
@@ -3688,18 +4557,26 @@ modest_ui_actions_on_main_window_remove_attachments (GtkAction *action,
        g_return_if_fail (MODEST_IS_MAIN_WINDOW (win));
 
        header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
-                                                          MODEST_WIDGET_TYPE_HEADER_VIEW);
+                                                          MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
 
        header_list = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW (header_view));
-
+       if (!header_list) {
+               g_warning ("%s: no header selected", __FUNCTION__);
+               return;
+       }
+       
        if (tny_list_get_length (header_list) == 1) {
-               iter = tny_list_create_iterator (header_list);
+               TnyIterator *iter = tny_list_create_iterator (header_list);
                header = TNY_HEADER (tny_iterator_get_current (iter));
                g_object_unref (iter);
-       } else {
+       } else
+               return;
+       
+       if (!header || !TNY_IS_HEADER(header)) {
+               g_warning ("%s: header is not valid", __FUNCTION__);
                return;
        }
-
+       
        found = modest_window_mgr_find_registered_header (modest_runtime_get_window_mgr (),
                                                          header, &msg_view_window);
        flags = tny_header_get_flags (header);
@@ -3714,11 +4591,10 @@ modest_ui_actions_on_main_window_remove_attachments (GtkAction *action,
                }
        } else {
                ModestMailOperation *mail_op = NULL;
-               modest_window_mgr_register_header (modest_runtime_get_window_mgr (), header);
-               mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE,
-                                                                        G_OBJECT (win),
+               modest_window_mgr_register_header (modest_runtime_get_window_mgr (), header, NULL);
+               mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT (win),
                                                                         modest_ui_actions_get_msgs_full_error_handler,
-                                                                        NULL);
+                                                                        NULL, NULL);
                modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
                modest_mail_operation_get_msg (mail_op, header, open_msg_for_purge_cb, win);
                
@@ -3730,35 +4606,129 @@ modest_ui_actions_on_main_window_remove_attachments (GtkAction *action,
                g_object_unref (header_list);
 }
 
+/*
+ * Checks if we need a connection to do the transfer and if the user
+ * wants to connect to complete it
+ */
+void
+modest_ui_actions_xfer_messages_check (GtkWindow *parent_window,
+                                      TnyFolderStore *src_folder,
+                                      TnyList *headers,
+                                      TnyFolder *dst_folder,
+                                      gboolean delete_originals,
+                                      gboolean *need_connection,
+                                      gboolean *do_xfer)
+{
+       TnyAccount *src_account;
+       gint uncached_msgs = 0;
+
+       uncached_msgs = header_list_count_uncached_msgs (headers);
+
+       /* We don't need any further check if
+        *
+        * 1- the source folder is local OR
+        * 2- the device is already online
+        */
+       if (!modest_tny_folder_store_is_remote (src_folder) ||
+           tny_device_is_online (modest_runtime_get_device())) {
+               *need_connection = FALSE;
+               *do_xfer = TRUE;
+               return;
+       }
+
+       /* We must ask for a connection when
+        *
+        *   - the message(s) is not already cached   OR 
+        *   - the message(s) is cached but the leave_on_server setting
+        * is FALSE (because we need to sync the source folder to
+        * delete the message from the server (for IMAP we could do it
+        * offline, it'll take place the next time we get a
+        * connection)
+        */
+       src_account = get_account_from_folder_store (src_folder);
+       if (uncached_msgs > 0) {
+               guint num_headers;
+               const gchar *msg;
+
+               *need_connection = TRUE;
+               num_headers = tny_list_get_length (headers);
+               msg = ngettext ("mcen_nc_get_msg", "mcen_nc_get_msgs", num_headers);
+
+               if (modest_platform_run_confirmation_dialog (parent_window, msg) ==
+                   GTK_RESPONSE_CANCEL) {
+                       *do_xfer = FALSE;
+               } else {
+                       *do_xfer = TRUE;
+               }
+       } else {
+               /* The transfer is possible and the user wants to */
+               *do_xfer = TRUE;
+
+               if (remote_folder_is_pop (src_folder) && delete_originals) {
+                       const gchar *account_name;
+                       gboolean leave_on_server;
+                       
+                       account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (src_account);
+                       leave_on_server = modest_account_mgr_get_leave_on_server (modest_runtime_get_account_mgr (),
+                                                                                 account_name);
+                       
+                       if (leave_on_server == TRUE) {
+                               *need_connection = FALSE;
+                       } else {
+                               *need_connection = TRUE;
+                       }
+               } else {
+                       *need_connection = FALSE;
+               }
+       }
+
+       /* Frees */
+       g_object_unref (src_account);
+}
+
+
 /**
  * Utility function that transfer messages from both the main window
  * and the msg view window when using the "Move to" dialog
  */
 static void
-modest_ui_actions_xfer_messages_from_move_to (TnyFolderStore *dst_folder,
-                                             ModestWindow *win)
-{
+xfer_messages_performer  (gboolean canceled, 
+                         GError *err,
+                         GtkWindow *parent_window, 
+                         TnyAccount *account, 
+                         gpointer user_data)
+{
+       TnyFolderStore *dst_folder = TNY_FOLDER_STORE (user_data);
+       ModestWindow *win = MODEST_WINDOW (parent_window);
        TnyList *headers = NULL;
-       gint response = 0;
        TnyAccount *dst_account = NULL;
        const gchar *proto_str = NULL;
        gboolean dst_is_pop = FALSE;
 
-       if (!TNY_IS_FOLDER (dst_folder)) {
-               modest_platform_information_banner (GTK_WIDGET (win),
-                                                   NULL,
-                                                   _CS("ckdg_ib_unable_to_move_to_current_location"));
+       if (canceled || err) {
+               /* Show the proper error message */
+               modest_ui_actions_on_account_connection_error (parent_window, account);
+               g_object_unref (dst_folder);
                return;
        }
 
        dst_account = tny_folder_get_account (TNY_FOLDER (dst_folder));
        proto_str = tny_account_get_proto (dst_account);
-       dst_is_pop = (modest_protocol_info_get_transport_store_protocol (proto_str) == 
-                     MODEST_PROTOCOL_STORE_POP);
+
+       /* tinymail will return NULL for local folders it seems */
+       dst_is_pop = proto_str &&
+               (modest_protocol_info_get_transport_store_protocol (proto_str) == 
+                MODEST_PROTOCOL_STORE_POP);
+
        g_object_unref (dst_account);
 
        /* Get selected headers */
        headers = get_selected_headers (MODEST_WINDOW (win));
+       if (!headers) {
+               g_warning ("%s: no headers selected", __FUNCTION__);
+               return;
+       }
+
 
        if (dst_is_pop) {
                modest_platform_information_banner (GTK_WIDGET (win),
@@ -3770,34 +4740,121 @@ modest_ui_actions_xfer_messages_from_move_to (TnyFolderStore *dst_folder,
                return;
        }
 
-       /* Ask for user confirmation */
-       response = msgs_move_to_confirmation (GTK_WINDOW (win), 
-                                             TNY_FOLDER (dst_folder), 
-                                             TRUE,
-                                             headers);
+       MoveToHelper *helper = g_new0 (MoveToHelper, 1);
+       helper->banner = modest_platform_animation_banner (GTK_WIDGET (win), NULL,
+                                                          _CS("ckct_nw_pasting"));
+       if (helper->banner != NULL)  {
+               gtk_window_set_modal (GTK_WINDOW(helper->banner), FALSE);
+               gtk_widget_show (GTK_WIDGET(helper->banner));
+       }
 
-       /* Transfer messages */
-       if (response == GTK_RESPONSE_OK) {
-               ModestMailOperation *mail_op = 
-                       modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, 
-                                                                      G_OBJECT(win),
-                                                                      modest_ui_actions_move_folder_error_handler,
-                                                                      NULL);
-               modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), 
-                                                mail_op);
+       if (MODEST_IS_MAIN_WINDOW (win)) {
+               GtkWidget *header_view = 
+                       modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win),
+                                                            MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
+               helper->reference = get_next_after_selected_headers (MODEST_HEADER_VIEW (header_view));
+       }
 
-               modest_mail_operation_xfer_msgs (mail_op, 
-                                                headers,
-                                                TNY_FOLDER (dst_folder),
-                                                TRUE,
-                                                (MODEST_IS_MSG_VIEW_WINDOW (win)) ? transfer_msgs_from_viewer_cb : NULL,
-                                                NULL);
+       ModestMailOperation *mail_op = 
+               modest_mail_operation_new_with_error_handling (G_OBJECT(win),
+                                                              modest_ui_actions_move_folder_error_handler,
+                                                              NULL, NULL);
+       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), 
+                                        mail_op);
 
-               g_object_unref (G_OBJECT (mail_op));
-       }
+       modest_mail_operation_xfer_msgs (mail_op, 
+                                        headers,
+                                        TNY_FOLDER (dst_folder),
+                                        TRUE,
+                                        msgs_move_to_cb,
+                                        helper);
+
+       g_object_unref (G_OBJECT (mail_op));
        g_object_unref (headers);
+       g_object_unref (dst_folder);
 }
 
+typedef struct {
+       TnyFolder *src_folder;
+       TnyFolderStore *dst_folder;
+       gboolean delete_original;
+       GtkWidget *folder_view;
+} MoveFolderInfo;
+
+static void
+on_move_folder_cb (gboolean canceled, GError *err, GtkWindow *parent_window, 
+               TnyAccount *account, gpointer user_data)
+{
+       MoveFolderInfo *info = (MoveFolderInfo*)user_data;
+       GtkTreeSelection *sel;
+       ModestMailOperation *mail_op = NULL;
+       
+       if (canceled || err || !MODEST_IS_MAIN_WINDOW (parent_window)) {
+               g_object_unref (G_OBJECT (info->src_folder));
+               g_object_unref (G_OBJECT (info->dst_folder));
+               g_free (info);
+               return;
+       }
+       
+       MoveToHelper *helper = g_new0 (MoveToHelper, 1);
+       helper->banner = modest_platform_animation_banner (GTK_WIDGET (parent_window), NULL,
+                       _CS("ckct_nw_pasting"));
+       if (helper->banner != NULL)  {
+               gtk_window_set_modal (GTK_WINDOW(helper->banner), FALSE);
+               gtk_widget_show (GTK_WIDGET(helper->banner));
+       }
+       /* Clean folder on header view before moving it */
+       sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (info->folder_view));
+       gtk_tree_selection_unselect_all (sel);
+
+       /* Let gtk events run. We need that the folder
+          view frees its reference to the source
+          folder *before* issuing the mail operation
+          so we need the signal handler of selection
+          changed to happen before the mail
+          operation 
+       while (gtk_events_pending ())
+               gtk_main_iteration ();   */
+
+       mail_op =
+               modest_mail_operation_new_with_error_handling (G_OBJECT(parent_window),
+                               modest_ui_actions_move_folder_error_handler,
+                               info->src_folder, NULL);
+       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
+                       mail_op);
+
+       /* Select *after* the changes */
+       /* TODO: this function hangs UI after transfer */ 
+       /*                      modest_folder_view_select_folder (MODEST_FOLDER_VIEW(folder_view), */
+       /*                                                        TNY_FOLDER (src_folder), TRUE); */
+
+       modest_mail_operation_xfer_folder (mail_op,
+                       TNY_FOLDER (info->src_folder),
+                       info->dst_folder,
+                       info->delete_original, 
+                       folder_move_to_cb, 
+                       helper);
+
+       if (modest_mail_operation_get_status (mail_op) == MODEST_MAIL_OPERATION_STATUS_SUCCESS) {       
+               modest_folder_view_select_folder (MODEST_FOLDER_VIEW(info->folder_view),
+                                                 TNY_FOLDER (info->dst_folder), TRUE);
+       }
+       
+       /* Unref mail operation */
+       g_object_unref (G_OBJECT (mail_op));
+       g_object_unref (G_OBJECT (info->src_folder));
+       g_object_unref (G_OBJECT (info->dst_folder));
+       g_free (user_data);
+}
+
+static TnyAccount *
+get_account_from_folder_store (TnyFolderStore *folder_store) 
+{
+       if (TNY_IS_ACCOUNT (folder_store))
+               return g_object_ref (folder_store);
+       else
+               return tny_folder_get_account (TNY_FOLDER (folder_store));
+}
 
 /*
  * UI handler for the "Move to" action when invoked from the
@@ -3809,64 +4866,101 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action,
                                          TnyFolderStore *dst_folder,
                                          ModestMainWindow *win)
 {
-       GtkWidget *header_view = NULL;
-       ModestMailOperation *mail_op = NULL;
-       TnyFolderStore *src_folder;
+       ModestHeaderView *header_view = NULL;
+       TnyFolderStore *src_folder = NULL;
 
        g_return_if_fail (MODEST_IS_MAIN_WINDOW (win));
 
        /* Get the source folder */
        src_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
-       
-       /* Offer the connection dialog if necessary, if the source folder is in a networked account: */
-       if (!modest_platform_connect_and_wait_if_network_folderstore (GTK_WINDOW (win), 
-                                                                     src_folder))
-               goto end;
 
        /* Get header view */
-       header_view = 
-               modest_main_window_get_child_widget (win, MODEST_WIDGET_TYPE_HEADER_VIEW);
+       header_view = MODEST_HEADER_VIEW(modest_main_window_get_child_widget (win, MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW));
 
        /* Get folder or messages to transfer */
        if (gtk_widget_is_focus (folder_view)) {
+               gboolean do_xfer = TRUE;
 
                /* Allow only to transfer folders to the local root folder */
                if (TNY_IS_ACCOUNT (dst_folder) && 
-                   !MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (dst_folder))
-                       goto end;
-               
-               /* Clean folder on header view before moving it */
-               modest_header_view_clear (MODEST_HEADER_VIEW (header_view)); 
-
-               if (TNY_IS_FOLDER (src_folder)) {
-                       mail_op = 
-                               modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, 
-                                                                              G_OBJECT(win),
-                                                                              modest_ui_actions_move_folder_error_handler,
-                                                                              NULL);
-                       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), 
-                                                        mail_op);
+                   !MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (dst_folder) &&
+                   !modest_tny_account_is_memory_card_account (TNY_ACCOUNT (dst_folder))) {
+                       do_xfer = FALSE;
+               } else if (!TNY_IS_FOLDER (src_folder)) {
+                       g_warning ("%s: src_folder is not a TnyFolder.\n", __FUNCTION__);
+                       do_xfer = FALSE;
+               }
 
-                       modest_mail_operation_xfer_folder (mail_op, 
-                                                          TNY_FOLDER (src_folder),
-                                                          dst_folder,
-                                                          TRUE, NULL, NULL);
-                       /* Unref mail operation */
-                       g_object_unref (G_OBJECT (mail_op));
-               } else {
-                       g_warning ("%s: src_folder is not a TnyFolder.\n", __FUNCTION__);       
+               if (do_xfer) {                  
+                       MoveFolderInfo *info = g_new0 (MoveFolderInfo, 1);
+                       DoubleConnectionInfo *connect_info = g_slice_new (DoubleConnectionInfo);
+
+                       info->src_folder = g_object_ref (src_folder);
+                       info->dst_folder = g_object_ref (dst_folder);
+                       info->delete_original = TRUE;
+                       info->folder_view = folder_view;
+
+                       connect_info->callback = on_move_folder_cb;
+                       connect_info->dst_account = get_account_from_folder_store (TNY_FOLDER_STORE (dst_folder));
+                       connect_info->data = info;
+
+                       modest_platform_double_connect_and_perform(GTK_WINDOW (win), TRUE,
+                                                                  TNY_FOLDER_STORE (src_folder), 
+                                                                  connect_info);
                }
-       } else if (gtk_widget_is_focus (header_view)) {
-               /* Transfer messages */
-               modest_ui_actions_xfer_messages_from_move_to (dst_folder, MODEST_WINDOW (win));
+       } else if (gtk_widget_is_focus (GTK_WIDGET(header_view))) {
+               TnyList *headers;
+
+               headers = modest_header_view_get_selected_headers(header_view);
+
+               /* Transfer the messages */
+               transfer_messages_helper (GTK_WINDOW (win), TNY_FOLDER (src_folder), 
+                                         headers, TNY_FOLDER (dst_folder));
+
+               g_object_unref (headers);
        }
-       
- end:
-    if (src_folder)
-       g_object_unref (src_folder);
+
+       /* Frees */
+       g_object_unref (src_folder);
 }
 
 
+static void
+transfer_messages_helper (GtkWindow *win,
+                         TnyFolder *src_folder,
+                         TnyList *headers,
+                         TnyFolder *dst_folder)
+{
+       gboolean need_connection = TRUE;
+       gboolean do_xfer = TRUE;
+       
+       modest_ui_actions_xfer_messages_check (win, TNY_FOLDER_STORE (src_folder), 
+                                              headers, TNY_FOLDER (dst_folder),
+                                              TRUE, &need_connection, 
+                                              &do_xfer);
+
+       /* If we don't want to transfer just return */
+       if (!do_xfer)
+               return;
+
+       if (need_connection) {
+               DoubleConnectionInfo *connect_info = g_slice_new (DoubleConnectionInfo);
+               connect_info->callback = xfer_messages_performer;
+               connect_info->dst_account = tny_folder_get_account (TNY_FOLDER (dst_folder));
+               connect_info->data = g_object_ref (dst_folder);
+               
+               modest_platform_double_connect_and_perform(GTK_WINDOW (win), TRUE,
+                                                          TNY_FOLDER_STORE (src_folder), 
+                                                          connect_info);
+       } else {
+               TnyAccount *src_account = get_account_from_folder_store (TNY_FOLDER_STORE (src_folder));
+               xfer_messages_performer (FALSE, NULL, GTK_WINDOW (win),
+                                        src_account, 
+                                        g_object_ref (dst_folder));
+               g_object_unref (src_account);
+       }
+}
+
 /*
  * UI handler for the "Move to" action when invoked from the
  * ModestMsgViewWindow
@@ -3876,19 +4970,25 @@ modest_ui_actions_on_msg_view_window_move_to (GtkAction *action,
                                              TnyFolderStore *dst_folder,
                                              ModestMsgViewWindow *win)
 {
+       TnyList *headers = NULL;
        TnyHeader *header = NULL;
-       TnyFolder *src_folder;
+       TnyFolder *src_folder = NULL;
+
+       g_return_if_fail (TNY_IS_FOLDER (dst_folder));
 
        /* Create header list */
-       header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win));              
-       src_folder = tny_header_get_folder(header);
-       g_object_unref (header);
+       header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win));
+       src_folder = TNY_FOLDER (tny_header_get_folder(header));
+       headers = tny_simple_list_new ();
+       tny_list_append (headers, G_OBJECT (header));
 
-       /* Transfer the message */
-       if (modest_platform_connect_and_wait_if_network_folderstore (NULL, TNY_FOLDER_STORE (src_folder)))
-               modest_ui_actions_xfer_messages_from_move_to (dst_folder, MODEST_WINDOW (win));
+       /* Transfer the messages */
+       transfer_messages_helper (GTK_WINDOW (win), src_folder, headers, 
+                                 TNY_FOLDER (dst_folder));
 
-       g_object_unref (src_folder);
+       /* Frees */
+       g_object_unref (header);
+       g_object_unref (headers);
 }
 
 void 
@@ -3908,12 +5008,13 @@ modest_ui_actions_on_move_to (GtkAction *action,
                main_window = MODEST_MAIN_WINDOW (win);
        else
                main_window = 
-                       MODEST_MAIN_WINDOW (modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()));
+                       MODEST_MAIN_WINDOW (modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
+                                                                              FALSE)); /* don't create */
 
        /* Get the folder view widget if exists */
        if (main_window)
                folder_view = modest_main_window_get_child_widget (main_window,
-                                                                  MODEST_WIDGET_TYPE_FOLDER_VIEW);
+                                                                  MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
        else
                folder_view = NULL;
 
@@ -3929,21 +5030,18 @@ modest_ui_actions_on_move_to (GtkAction *action,
                return;
 
        dst_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (tree_view));
-       /* Offer the connection dialog if necessary: */
-       if (modest_platform_connect_and_wait_if_network_folderstore (GTK_WINDOW (win), 
-                                                                     dst_folder)) {
-
-               /* Do window specific stuff */
-               if (MODEST_IS_MAIN_WINDOW (win))
-                       modest_ui_actions_on_main_window_move_to (action,
-                                                                 folder_view,
-                                                                 dst_folder,
-                                                                 MODEST_MAIN_WINDOW (win));
-               else
-                       modest_ui_actions_on_msg_view_window_move_to (action,
-                                                                     dst_folder,
-                                                                     MODEST_MSG_VIEW_WINDOW (win));
+       /* Do window specific stuff */
+       if (MODEST_IS_MAIN_WINDOW (win)) {
+               modest_ui_actions_on_main_window_move_to (action,
+                               folder_view,
+                               dst_folder,
+                               MODEST_MAIN_WINDOW (win));
+       } else {
+               modest_ui_actions_on_msg_view_window_move_to (action,
+                               dst_folder,
+                               MODEST_MSG_VIEW_WINDOW (win));
        }
+
        if (dst_folder)
                g_object_unref (dst_folder);
 }
@@ -4049,85 +5147,100 @@ modest_ui_actions_on_settings (GtkAction *action,
 
 void 
 modest_ui_actions_on_help (GtkAction *action, 
-                          ModestWindow *win)
+                          GtkWindow *win)
 {
-       const gchar *help_id = NULL;
+       const gchar *help_id;
 
-       if (MODEST_IS_MAIN_WINDOW (win)) {
-               const gchar *action_name;
-               action_name = gtk_action_get_name (action);
-
-               if (!strcmp (action_name, "FolderViewCSMHelp") ||
-                   !strcmp (action_name, "HeaderViewCSMHelp")) {
-                       GtkWidget *folder_view;
-                       TnyFolderStore *folder_store;
-                       /* Get selected folder */
-                       folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
-                                                                          MODEST_WIDGET_TYPE_FOLDER_VIEW);
-                       folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
-
-                       /* Switch help_id */
-                       if (TNY_IS_FOLDER (folder_store)) {
-                               switch (modest_tny_folder_guess_folder_type (TNY_FOLDER (folder_store))) {
-                               case TNY_FOLDER_TYPE_NORMAL:
-                                       help_id = "applications_email_managefolders";
-                                       break;
-                               case TNY_FOLDER_TYPE_INBOX:
-                                       help_id = "applications_email_inbox";
-                                       break;
-                               case TNY_FOLDER_TYPE_OUTBOX:
-                                       help_id = "applications_email_outbox";
-                                       break;
-                               case TNY_FOLDER_TYPE_SENT:
-                                       help_id = "applications_email_sent";
-                                       break;
-                               case TNY_FOLDER_TYPE_DRAFTS:
-                                       help_id = "applications_email_drafts";
-                                       break;
-                               case TNY_FOLDER_TYPE_ARCHIVE:
-                                       help_id = "applications_email_managefolders";
-                                       break;
-                               default:
-                                       help_id = "applications_email_managefolders";
-                               }
-                       } else {
-                               help_id = "applications_email_mainview";        
-                       }
-                       g_object_unref (folder_store);
-               } else {
-                       help_id = "applications_email_mainview";        
-               }
-       } else if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
-               help_id = "applications_email_viewer";
-       } else if (MODEST_IS_MSG_EDIT_WINDOW (win))
-               help_id = "applications_email_editor";
+       g_return_if_fail (action);
+       g_return_if_fail (win && GTK_IS_WINDOW(win));
+       
+       help_id = modest_window_mgr_get_help_id (modest_runtime_get_window_mgr(), win);
+       
+       if (help_id)
+               modest_platform_show_help (GTK_WINDOW (win), help_id);
+       else
+               g_warning ("%s: no help for window %p", __FUNCTION__, win);
+}
+
+static void
+retrieve_msg_contents_performer (gboolean canceled, 
+                                GError *err,
+                                GtkWindow *parent_window, 
+                                TnyAccount *account, 
+                                gpointer user_data)
+{
+       ModestMailOperation *mail_op;
+       TnyList *headers = TNY_LIST (user_data);
+
+       if (err || canceled) {
+               goto out;
+       }
 
-       modest_platform_show_help (GTK_WINDOW (win), help_id);
+       /* Create mail operation */
+       mail_op = modest_mail_operation_new_with_error_handling ((GObject *) parent_window,
+                                                                modest_ui_actions_get_msgs_full_error_handler, 
+                                                                NULL, NULL);
+       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
+       modest_mail_operation_get_msgs_full (mail_op, headers, NULL, NULL, NULL);
+
+       /* Frees */
+       g_object_unref (mail_op);
+ out:
+       g_object_unref (headers);
+       g_object_unref (account);
 }
 
 void 
 modest_ui_actions_on_retrieve_msg_contents (GtkAction *action,
                                            ModestWindow *window)
 {
-       ModestMailOperation *mail_op;
-       TnyList *headers;
+       TnyList *headers = NULL;
+       TnyAccount *account = NULL;
+       TnyIterator *iter = NULL;
+       TnyHeader *header = NULL;
+       TnyFolder *folder = NULL;
 
        /* Get headers */
        headers = get_selected_headers (window);
        if (!headers)
                return;
 
-       /* Create mail operation */
-       mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, 
-                                                                G_OBJECT (window),
-                                                                modest_ui_actions_get_msgs_full_error_handler, 
-                                                                NULL);
-       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
-       modest_mail_operation_get_msgs_full (mail_op, headers, NULL, NULL, NULL);
+       /* Pick the account */
+       iter = tny_list_create_iterator (headers);
+       header = TNY_HEADER (tny_iterator_get_current (iter));
+       folder = tny_header_get_folder (header);
+       account = tny_folder_get_account (folder);
+       g_object_unref (folder);
+       g_object_unref (header);
+       g_object_unref (iter);
+
+       /* Connect and perform the message retrieval */
+       modest_platform_connect_and_perform ((GtkWindow *) window, TRUE,
+                                            g_object_ref (account), 
+                                            retrieve_msg_contents_performer, 
+                                            g_object_ref (headers));
 
        /* Frees */
+       g_object_unref (account);
        g_object_unref (headers);
-       g_object_unref (mail_op);
+}
+
+void
+modest_ui_actions_check_toolbar_dimming_rules (ModestWindow *window)
+{
+       g_return_if_fail (MODEST_IS_WINDOW (window));
+
+       /* Update dimmed */
+       modest_window_check_dimming_rules_group (window, MODEST_DIMMING_RULES_TOOLBAR);
+}
+
+void
+modest_ui_actions_check_menu_dimming_rules (ModestWindow *window)
+{
+       g_return_if_fail (MODEST_IS_WINDOW (window));
+
+       /* Update dimmed */
+       modest_window_check_dimming_rules_group (window, MODEST_DIMMING_RULES_MENU);
 }
 
 void
@@ -4136,8 +5249,8 @@ modest_ui_actions_on_email_menu_activated (GtkAction *action,
 {
        g_return_if_fail (MODEST_IS_WINDOW (window));
        
-       /* Update dimmed */     
-       modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules");     
+       /* Update dimmed */
+       modest_ui_actions_check_menu_dimming_rules (window);
 }
 
 void
@@ -4146,8 +5259,8 @@ modest_ui_actions_on_edit_menu_activated (GtkAction *action,
 {
        g_return_if_fail (MODEST_IS_WINDOW (window));
 
-       /* Update dimmed */     
-       modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules");     
+       /* Update dimmed */
+       modest_ui_actions_check_menu_dimming_rules (window);
 }
 
 void
@@ -4156,8 +5269,18 @@ modest_ui_actions_on_view_menu_activated (GtkAction *action,
 {
        g_return_if_fail (MODEST_IS_WINDOW (window));
 
-       /* Update dimmed */     
-       modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules");     
+       /* Update dimmed */
+       modest_ui_actions_check_menu_dimming_rules (window);
+}
+
+void
+modest_ui_actions_on_format_menu_activated (GtkAction *action,
+                                           ModestWindow *window)
+{
+       g_return_if_fail (MODEST_IS_WINDOW (window));
+
+       /* Update dimmed */
+       modest_ui_actions_check_menu_dimming_rules (window);
 }
 
 void
@@ -4166,8 +5289,8 @@ modest_ui_actions_on_tools_menu_activated (GtkAction *action,
 {
        g_return_if_fail (MODEST_IS_WINDOW (window));
 
-       /* Update dimmed */     
-       modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules");     
+       /* Update dimmed */
+       modest_ui_actions_check_menu_dimming_rules (window);
 }
 
 void
@@ -4176,8 +5299,8 @@ modest_ui_actions_on_attachment_menu_activated (GtkAction *action,
 {
        g_return_if_fail (MODEST_IS_WINDOW (window));
 
-       /* Update dimmed */     
-       modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules");     
+       /* Update dimmed */
+       modest_ui_actions_check_menu_dimming_rules (window);
 }
 
 void
@@ -4186,8 +5309,8 @@ modest_ui_actions_on_toolbar_csm_menu_activated (GtkAction *action,
 {
        g_return_if_fail (MODEST_IS_WINDOW (window));
 
-       /* Update dimmed */     
-       modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules");     
+       /* Update dimmed */
+       modest_ui_actions_check_menu_dimming_rules (window);
 }
 
 void
@@ -4196,8 +5319,8 @@ modest_ui_actions_on_folder_view_csm_menu_activated (GtkAction *action,
 {
        g_return_if_fail (MODEST_IS_WINDOW (window));
 
-       /* Update dimmed */     
-       modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules");     
+       /* Update dimmed */
+       modest_ui_actions_check_menu_dimming_rules (window);
 }
 
 void
@@ -4206,17 +5329,8 @@ modest_ui_actions_on_header_view_csm_menu_activated (GtkAction *action,
 {
        g_return_if_fail (MODEST_IS_WINDOW (window));
 
-       /* Update dimmed */     
-       modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules");     
-}
-
-void
-modest_ui_actions_check_toolbar_dimming_rules (ModestWindow *window)
-{
-       g_return_if_fail (MODEST_IS_WINDOW (window));
-
-       /* Update dimmed */     
-       modest_window_check_dimming_rules_group (window, "ModestToolbarDimmingRules");  
+       /* Update dimmed */
+       modest_ui_actions_check_menu_dimming_rules (window);
 }
 
 void
@@ -4245,16 +5359,248 @@ modest_ui_actions_on_toggle_find_in_page (GtkToggleAction *action,
 }
 
 static void 
-_on_send_receive_progress_changed (ModestMailOperation  *mail_op, 
-                                  ModestMailOperationState *state,
-                                  gpointer user_data)
+on_send_receive_finished (ModestMailOperation  *mail_op, 
+                          gpointer user_data)
 {
-       g_return_if_fail (MODEST_IS_MAIN_WINDOW(user_data));
+       GtkWidget *header_view, *folder_view;
+       TnyFolderStore *folder_store;
+       ModestMainWindow *main_win = MODEST_MAIN_WINDOW (user_data);
 
        /* Set send/receive operation finished */       
-       if (state->status != MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS)
-               modest_main_window_notify_send_receive_completed (MODEST_MAIN_WINDOW(user_data));
+       modest_main_window_notify_send_receive_completed (main_win);
+
+       /* Don't refresh the current folder if there were any errors */
+       if (modest_mail_operation_get_status (mail_op) !=
+           MODEST_MAIL_OPERATION_STATUS_SUCCESS)
+               return;
        
+       /* Refresh the current folder if we're viewing a window. We do
+          this because the user won't be able to see the new mails in
+          the selected folder after a Send&Receive because it only
+          performs a poke_status, i.e, only the number of read/unread
+          messages is updated, but the new headers are not
+          downloaded */
+       folder_view = modest_main_window_get_child_widget (main_win, 
+                                                          MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
+       if (!folder_view)
+               return;
+
+       folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
+       
+       /* Do not need to refresh INBOX again because the
+          update_account does it always automatically */
+       if (folder_store && TNY_IS_FOLDER (folder_store) && 
+           tny_folder_get_folder_type (TNY_FOLDER (folder_store)) != TNY_FOLDER_TYPE_INBOX) {
+               ModestMailOperation *refresh_op;
+
+               header_view = modest_main_window_get_child_widget (main_win,
+                                                                  MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
+               
+               /* We do not need to set the contents style
+                  because it hasn't changed. We also do not
+                  need to save the widget status. Just force
+                  a refresh */
+               refresh_op = modest_mail_operation_new (G_OBJECT (main_win));
+               modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), refresh_op);
+               modest_mail_operation_refresh_folder (refresh_op, TNY_FOLDER (folder_store),
+                                                     folder_refreshed_cb, main_win);
+               g_object_unref (refresh_op);
+       }
+       
+       if (folder_store)
+               g_object_unref (folder_store);
 }
 
 
+void 
+modest_ui_actions_on_send_queue_error_happened (TnySendQueue *self, 
+                                               TnyHeader *header, 
+                                               TnyMsg *msg, 
+                                               GError *err, 
+                                               gpointer user_data)
+{
+       const gchar* server_name = NULL;
+       TnyTransportAccount *server_account;
+       gchar *message = NULL;
+
+       /* Don't show anything if the user cancelled something */
+       if (err->code == TNY_SYSTEM_ERROR_CANCEL)
+               return;
+
+       /* Get the server name: */
+       server_account = 
+               TNY_TRANSPORT_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;
+       }
+       
+       g_return_if_fail (server_name);
+
+       /* Show the appropriate message text for the GError: */
+       switch (err->code) {
+       case TNY_SERVICE_ERROR_CONNECT:
+               message = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), server_name);
+               break;
+       case TNY_SERVICE_ERROR_AUTHENTICATE:
+               message = g_strdup_printf (_("emev_ni_ui_smtp_authentication_fail_error"), server_name);
+               break;
+       case TNY_SERVICE_ERROR_SEND:
+               message = g_strdup (_("emev_ib_ui_smtp_send_error"));
+               break;
+       case TNY_SERVICE_ERROR_UNAVAILABLE:
+               message = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), server_name);
+               break;
+       default:
+               g_warning ("%s: unexpected ERROR %d",
+                          __FUNCTION__, err->code);
+               message = g_strdup (_("emev_ib_ui_smtp_send_error"));
+               break;  
+       }
+       
+       /* TODO if the username or the password where not defined we
+          should show the Accounts Settings dialog or the Connection
+          specific SMTP server window */
+
+       modest_platform_run_information_dialog (NULL, message);
+       g_free (message);
+}
+
+void
+modest_ui_actions_on_send_queue_status_changed (ModestTnySendQueue *send_queue,
+                                               gchar *msg_id, 
+                                               guint status,
+                                               gpointer user_data)
+{
+       ModestMainWindow *main_window = NULL;
+       ModestWindowMgr *mgr = NULL;
+       GtkWidget *folder_view = NULL, *header_view = NULL;
+       TnyFolderStore *selected_folder = NULL;
+       TnyFolderType folder_type;
+
+       mgr = modest_runtime_get_window_mgr ();
+       main_window = MODEST_MAIN_WINDOW (modest_window_mgr_get_main_window (mgr,
+                                                                            FALSE));/* don't create */
+       if (!main_window)
+               return;
+
+       /* Check if selected folder is OUTBOX */
+       folder_view = modest_main_window_get_child_widget (main_window,
+                                                          MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
+       header_view = modest_main_window_get_child_widget (main_window,
+                                                          MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
+
+       selected_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
+       if (!TNY_IS_FOLDER (selected_folder)) 
+               goto frees;
+
+       /* gtk_tree_view_column_queue_resize is only available in GTK+ 2.8 */
+#if GTK_CHECK_VERSION(2, 8, 0) 
+       folder_type = modest_tny_folder_guess_folder_type (TNY_FOLDER (selected_folder)); 
+       if (folder_type ==  TNY_FOLDER_TYPE_OUTBOX) {           
+               GtkTreeViewColumn *tree_column;
+
+               tree_column = gtk_tree_view_get_column (GTK_TREE_VIEW (header_view), 
+                                                       TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN);
+               gtk_tree_view_column_queue_resize (tree_column);
+       }
+#else
+       gtk_widget_queue_draw (header_view);
+#endif         
+
+       /* Rerun dimming rules, because the message could become deletable for example */
+       modest_window_check_dimming_rules_group (MODEST_WINDOW (main_window), 
+                                                MODEST_DIMMING_RULES_TOOLBAR);
+       
+       /* Free */
+ frees:
+       if (selected_folder != NULL)
+               g_object_unref (selected_folder);
+}
+
+void 
+modest_ui_actions_on_account_connection_error (GtkWindow *parent_window,
+                                              TnyAccount *account)
+{
+       ModestTransportStoreProtocol proto;
+       const gchar *proto_name;
+       gchar *error_note = NULL;
+       
+       proto_name = tny_account_get_proto (account);
+       proto = modest_protocol_info_get_transport_store_protocol (proto_name);
+       
+       switch (proto) {
+       case MODEST_PROTOCOL_STORE_POP:
+               error_note = g_strdup_printf (_("emev_ni_ui_pop3_msg_connect_error"), 
+                                             tny_account_get_hostname (account));
+               break;
+       case MODEST_PROTOCOL_STORE_IMAP:
+               error_note = g_strdup_printf (_("emev_ni_ui_imap_connect_server_error"), 
+                                             tny_account_get_hostname (account));
+               break;
+       case MODEST_PROTOCOL_STORE_MAILDIR:
+       case MODEST_PROTOCOL_STORE_MBOX:
+               error_note = g_strdup (_("emev_nc_mailbox_notavailable"));
+               break;
+       default:
+               g_warning ("%s: This should not be reached", __FUNCTION__);
+       }
+
+       if (error_note) {
+               modest_platform_run_information_dialog (parent_window, error_note);
+               g_free (error_note);
+       }
+}
+
+gchar *
+modest_ui_actions_get_msg_already_deleted_error_msg (ModestWindow *win)
+{
+       gchar *msg = NULL;
+       TnyFolderStore *folder = NULL;
+       TnyAccount *account = NULL;
+       ModestTransportStoreProtocol proto;
+       TnyHeader *header = NULL;
+
+       if (MODEST_IS_MAIN_WINDOW (win)) {
+               GtkWidget *header_view;
+               TnyList* headers = NULL;
+               TnyIterator *iter;
+               header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win),
+                                                                  MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
+               headers = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW (header_view));
+               if (!headers || tny_list_get_length (headers) == 0) {
+                       if (headers)
+                               g_object_unref (headers);
+                       return NULL;
+               }
+               iter = tny_list_create_iterator (headers);
+               header = TNY_HEADER (tny_iterator_get_current (iter));
+               folder = TNY_FOLDER_STORE (tny_header_get_folder (header));
+               g_object_unref (iter);
+               g_object_unref (headers);
+       } else if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
+               header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win));
+               folder = TNY_FOLDER_STORE (tny_header_get_folder (header));
+       }
+
+       /* Get the account type */
+       account = tny_folder_get_account (TNY_FOLDER (folder));
+       proto = modest_protocol_info_get_transport_store_protocol (tny_account_get_proto (account));
+       if (proto == MODEST_PROTOCOL_STORE_POP) {
+               msg = g_strdup (_("emev_ni_ui_pop3_msg_recv_error"));
+       } else if (proto == MODEST_PROTOCOL_STORE_IMAP) {
+               msg = g_strdup_printf (_("emev_ni_ui_imap_message_not_available_in_server"), 
+                                      tny_header_get_subject (header));
+       } else {
+               msg = g_strdup_printf (_("mail_ni_ui_folder_get_msg_folder_error"));
+       }
+
+       /* Frees */
+       g_object_unref (account);
+       g_object_unref (folder);
+       g_object_unref (header);
+
+       return msg;
+}