Work to fix bug NB#80656.
[modest] / src / modest-ui-actions.c
index f6dfd00..765dc88 100644 (file)
 
 #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>
@@ -70,7 +70,7 @@
 #include "modest-text-utils.h"
 
 #ifdef MODEST_HAVE_EASYSETUP
-#include "easysetup/modest-easysetup-wizard.h"
+#include "easysetup/modest-easysetup-wizard-dialog.h"
 #endif /* MODEST_HAVE_EASYSETUP */
 
 #include <modest-widget-memory.h>
@@ -154,60 +154,34 @@ static gboolean connect_to_get_msg (ModestWindow *win,
                                    gint num_of_uncached_msgs,
                                    TnyAccount *account);
 
-static gboolean remote_folder_is_pop (const TnyFolderStore *folder);
+static gboolean remote_folder_is_pop (TnyFolderStore *folder);
 
-static gboolean msgs_already_deleted_from_server ( TnyList *headers,
-                                                   const TnyFolderStore *src_folder);
+static void     do_create_folder (GtkWindow *window, 
+                                 TnyFolderStore *parent_folder, 
+                                 const gchar *suggested_name);
 
+static GtkWidget* get_folder_view_from_move_to_dialog (GtkWidget *move_to_dialog);
+
+static TnyAccount *get_account_from_folder_store (TnyFolderStore *folder_store);
 
 /*
  * This function checks whether a TnyFolderStore is a pop account
  */
 static gboolean
-remote_folder_is_pop (const TnyFolderStore *folder)
+remote_folder_is_pop (TnyFolderStore *folder)
 {
         const gchar *proto = NULL;
         TnyAccount *account = NULL;
 
-        g_return_val_if_fail (TNY_IS_FOLDER_STORE(folder), FALSE);
-
-        if (TNY_IS_ACCOUNT (folder)) {
-                account = TNY_ACCOUNT(folder);
-                g_object_ref(account);
-        } else if (TNY_IS_FOLDER (folder)) {
-                account = tny_folder_get_account(TNY_FOLDER(folder));
-        }
-
-       if (!account && !TNY_IS_ACCOUNT(account)) {
-               g_warning ("%s: could not get account", __FUNCTION__);
-               return FALSE;
-       }
+        g_return_val_if_fail (TNY_IS_FOLDER_STORE (folder), FALSE);
        
-        proto = tny_account_get_proto(account);
+       account = get_account_from_folder_store (folder);
+        proto = tny_account_get_proto (account);
         g_object_unref (account);
 
-        return proto &&
-          (modest_protocol_info_get_transport_store_protocol (proto) == MODEST_PROTOCOL_STORE_POP);
-}
-
-/*
- * This functions checks whether if a list of messages are already
- * deleted from the server: that is, if the server is a POP account
- * and all messages are already cached.
- */
-static gboolean
-msgs_already_deleted_from_server (TnyList *headers, const TnyFolderStore *src_folder)
-{
-        g_return_val_if_fail (TNY_IS_FOLDER_STORE(src_folder), FALSE);
-        g_return_val_if_fail (TNY_IS_LIST(headers), FALSE);
-
-        gboolean src_is_pop = remote_folder_is_pop (src_folder);
-        gint uncached_msgs = header_list_count_uncached_msgs (headers);
-
-        return (src_is_pop && !uncached_msgs);
+        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.
@@ -216,13 +190,12 @@ gboolean
 modest_ui_actions_run_account_setup_wizard (ModestWindow *win)
 {
        gboolean result = FALSE;        
-#ifdef MODEST_PLATFORM_MAEMO
        GtkWindow *dialog, *wizard;
        gint dialog_response;
 
        /* Show the easy-setup wizard: */       
        dialog = modest_window_mgr_get_modal (modest_runtime_get_window_mgr());
-       if (dialog && MODEST_IS_EASYSETUP_WIZARD_DIALOG(dialog)) {
+       if (dialog) {
                /* old wizard is active already; 
                 */
                gtk_window_present (GTK_WINDOW(dialog));
@@ -231,7 +204,7 @@ modest_ui_actions_run_account_setup_wizard (ModestWindow *win)
        
 
        /* there is no such wizard yet */       
-       wizard = GTK_WINDOW (modest_easysetup_wizard_dialog_new ());
+       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 
@@ -257,7 +230,6 @@ modest_ui_actions_run_account_setup_wizard (ModestWindow *win)
                /* Check whether an account was created: */
                result = modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE);
        }
-#endif 
        return result;
 }
 
@@ -391,10 +363,8 @@ 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)) {
+       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);       
        }
@@ -452,7 +422,7 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win)
                        msg = g_strdup_printf (_("mcen_nc_unable_to_delete_n_messages"), 
                                               opened_headers);
 
-                       modest_platform_run_information_dialog (GTK_WINDOW (win), (const gchar *) msg);
+                       modest_platform_run_information_dialog (GTK_WINDOW (win), (const gchar *) msg, FALSE);
                        
                        g_free (msg);
                        g_object_unref (header_list);
@@ -465,7 +435,10 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win)
                iter = tny_list_create_iterator (header_list);
                header = TNY_HEADER (tny_iterator_get_current (iter));
                if (header) {
-                       desc = g_strdup_printf ("%s", tny_header_get_subject (header)); 
+                       gchar *subject;
+                       subject = tny_header_dup_subject (header);
+                       desc = g_strdup_printf ("%s", subject); 
+                       g_free (subject);
                        g_object_unref (header);
                }
 
@@ -593,8 +566,6 @@ 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)
 {      
@@ -669,7 +640,6 @@ 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)) {
                if (!modest_ui_actions_run_account_setup_wizard (win)) 
                        g_debug ("%s: wizard was already running", __FUNCTION__);
@@ -682,33 +652,8 @@ modest_ui_actions_on_accounts (GtkAction *action,
                
                /* The accounts dialog must be modal */
                modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), account_win);
-               modest_maemo_show_dialog_and_forget (GTK_WINDOW (win), GTK_DIALOG (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
@@ -756,7 +701,8 @@ modest_ui_actions_compose_msg(ModestWindow *win,
                              const gchar *bcc_str,
                              const gchar *subject_str,
                              const gchar *body_str,
-                             GSList *attachments)
+                             GSList *attachments,
+                             gboolean set_as_modified)
 {
        gchar *account_name = NULL;
        TnyMsg *msg = NULL;
@@ -767,9 +713,15 @@ modest_ui_actions_compose_msg(ModestWindow *win,
        ModestWindow *msg_win = NULL;
        ModestAccountMgr *mgr = modest_runtime_get_account_mgr();
        ModestTnyAccountStore *store = modest_runtime_get_account_store();
+       GnomeVFSFileSize total_size, allowed_size;
+
+       /* we check for low-mem; in that case, show a warning, and don't allow
+        * composing a message with attachments
+        */
+       if (attachments && modest_platform_check_memory_low (win))
+               goto cleanup;
 
-       if (win) account_name = g_strdup (modest_window_get_active_account (win));
-       if (!account_name) account_name = modest_account_mgr_get_default_account(mgr);
+       account_name = modest_account_mgr_get_default_account(mgr);
        if (!account_name) {
                g_printerr ("modest: no account found\n");
                goto cleanup;
@@ -797,7 +749,7 @@ modest_ui_actions_compose_msg(ModestWindow *win,
                body = use_signature ? g_strconcat("\n", signature, NULL) : g_strdup("");
        }
 
-       msg = modest_tny_msg_new (to_str, from_str, cc_str, bcc_str, subject_str, body, NULL);
+       msg = modest_tny_msg_new (to_str, from_str, cc_str, bcc_str, subject_str, body, NULL, NULL);
        if (!msg) {
                g_printerr ("modest: failed to create new msg\n");
                goto cleanup;
@@ -805,18 +757,27 @@ modest_ui_actions_compose_msg(ModestWindow *win,
 
        /* Create and register edit window */
        /* This is destroyed by TODO. */
+       total_size = 0;
+       allowed_size = MODEST_MAX_ATTACHMENT_SIZE;
        msg_win = modest_msg_edit_window_new (msg, account_name, FALSE);
        while (attachments) {
-               modest_msg_edit_window_attach_file_one((ModestMsgEditWindow *)msg_win,
-                                                      attachments->data);
+               total_size +=
+                       modest_msg_edit_window_attach_file_one(
+                               (ModestMsgEditWindow *)msg_win,
+                               attachments->data, allowed_size);
+
+               if (total_size > allowed_size) {
+                       g_warning ("%s: total size: %u",
+                                  __FUNCTION__, (unsigned int)total_size);
+                       break;
+               }
+               allowed_size -= total_size;
+
                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:
@@ -824,10 +785,14 @@ cleanup:
        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));
+       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
@@ -838,9 +803,10 @@ modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win)
                if (!modest_ui_actions_run_account_setup_wizard (win))
                        return;
                
-       modest_ui_actions_compose_msg(win, NULL, NULL, NULL, NULL, NULL, NULL);
+       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,
@@ -862,6 +828,35 @@ modest_ui_actions_msg_retrieval_check (ModestMailOperation *mail_op,
        return TRUE;
 }
 
+typedef struct {
+       guint idle_handler;
+       gchar *message;
+       GtkWidget *banner;
+} OpenMsgBannerInfo;
+
+typedef struct {
+       GtkTreeModel *model;
+       TnyList *headers;
+       OpenMsgBannerInfo *banner_info;
+       GHashTable *row_refs_per_header;
+} OpenMsgHelper;
+
+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,  
@@ -877,6 +872,7 @@ open_msg_cb (ModestMailOperation *mail_op,
        gchar *account = NULL;
        TnyFolder *folder;
        gboolean open_in_editor = FALSE;
+       OpenMsgHelper *helper = (OpenMsgHelper *) user_data;
        
        /* Do nothing if there was any problem with the mail
           operation. The error will be shown by the error_handler of
@@ -932,14 +928,18 @@ open_msg_cb (ModestMailOperation *mail_op,
        
        if (open_in_editor) {
                ModestAccountMgr *mgr = modest_runtime_get_account_mgr ();
-               const gchar *from_header = NULL;
+               gchar *from_header = NULL;
 
-               from_header = tny_header_get_from (header);
+               from_header = tny_header_dup_from (header);
 
                /* we cannot edit without a valid account... */
                if (!modest_account_mgr_has_accounts(mgr, TRUE)) {
-                       if (!modest_ui_actions_run_account_setup_wizard(parent_win))
+                       if (!modest_ui_actions_run_account_setup_wizard(parent_win)) {
+                               modest_window_mgr_unregister_header (modest_runtime_get_window_mgr (), 
+                                                                    header);
+                               g_free (from_header);
                                goto cleanup;
+                       }
                }
                
                if (from_header) {
@@ -956,6 +956,7 @@ open_msg_cb (ModestMailOperation *mail_op,
                                }
                                g_free (from);
                        }
+                       g_free (from_header);
                        g_slist_foreach (accounts, (GFunc) g_free, NULL);
                        g_slist_free (accounts);
                }
@@ -963,38 +964,17 @@ open_msg_cb (ModestMailOperation *mail_op,
                win = modest_msg_edit_window_new (msg, account, TRUE);
 
 
-               /* Show banner */
-               modest_platform_information_banner (NULL, NULL, _("mail_ib_opening_draft_message"));
 
        } else {
                gchar *uid = modest_tny_folder_get_header_unique_id (header);
                
                if (MODEST_IS_MAIN_WINDOW (parent_win)) {
-                       GtkWidget *header_view;
-                       GtkTreeSelection *sel;
-                       GList *sel_list = NULL;
-                       GtkTreeModel *model;
-                       
-                       header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(parent_win),
-                                                                          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);
-
-                       if (sel_list != NULL) {
-                               GtkTreeRowReference *row_reference;
+                       GtkTreeRowReference *row_reference;
 
-                               row_reference = gtk_tree_row_reference_new (model, (GtkTreePath *) sel_list->data);
-                               g_list_foreach (sel_list, (GFunc) gtk_tree_path_free, NULL);
-                               g_list_free (sel_list);
+                       row_reference = (GtkTreeRowReference *) g_hash_table_lookup (helper->row_refs_per_header, header);
                                
-                               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_for_attachment (msg, account, (const gchar*) uid);
-                       }
+                       win = modest_msg_view_window_new_with_header_model (msg, account, (const gchar*) uid,
+                                                                           helper->model, row_reference);
                } else {
                        win = modest_msg_view_window_new_for_attachment (msg, account, (const gchar*) uid);
                }
@@ -1021,25 +1001,45 @@ cleanup:
        g_object_unref (folder);
 }
 
+static gboolean
+is_memory_full_error (GError *error)
+{
+       if (error->code == TNY_SYSTEM_ERROR_MEMORY ||
+           error->code == TNY_IO_ERROR_WRITE ||
+           error->code == TNY_IO_ERROR_READ) {
+               return TRUE;
+       } else {
+               return FALSE;
+       }
+}
+
 void
-modest_ui_actions_get_msgs_full_error_handler (ModestMailOperation *mail_op,
-                                              gpointer user_data)
+modest_ui_actions_disk_operations_error_handler (ModestMailOperation *mail_op,
+                                                gpointer user_data)
 {
        const GError *error;
        GObject *win = NULL;
-       const gchar *err_msg;
+       ModestMailOperationStatus status;
 
        win = modest_mail_operation_get_source (mail_op);
        error = modest_mail_operation_get_error (mail_op);
-       /* Select error message */
-       if (error->code == MODEST_MAIL_OPERATION_ERROR_MESSAGE_SIZE_LIMIT)
-               err_msg = _("emev_ni_ui_imap_msg_size_exceed_error");
-       else
-               err_msg = (const gchar *) user_data;
+       status = modest_mail_operation_get_status (mail_op);
 
-       /* Show error */
-       modest_platform_run_information_dialog ((GtkWindow *) win, err_msg);
+       /* If the mail op has been cancelled then it's not an error:
+          don't show any message */
+       if (status != MODEST_MAIL_OPERATION_STATUS_CANCELED) {
+               if (is_memory_full_error ((GError *) error)) {
+                       modest_platform_information_banner ((GtkWidget *) win,
+                                                           NULL, dgettext("ke-recv",
+                                                                          "cerm_device_memory_full"));
+               } else if (error->code == MODEST_MAIL_OPERATION_ERROR_FILE_IO) {
+                       modest_platform_information_banner ((GtkWidget *) win,
+                                                           NULL, dgettext ("hildon-common-strings", "sfil_ni_unable_to_open_file_not_found"));
+               } else if (user_data) {
+                       modest_platform_information_banner ((GtkWidget *) win, 
+                                                           NULL, user_data);
+               }
+       }
 
        if (win)
                g_object_unref (win);
@@ -1058,14 +1058,69 @@ get_account_from_header_list (TnyList *headers)
                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);
+               
+               if (!folder) {
+                       g_object_unref (header);
+                       
+                       while (!tny_iterator_is_done (iter)) {
+                               header = TNY_HEADER (tny_iterator_get_current (iter));
+                               folder = tny_header_get_folder (header);
+                               if (folder) 
+                                       break;
+                               g_object_unref (header);
+                               header = NULL;
+                               tny_iterator_next (iter);
+                       }
+               }
+
+               if (folder) {
+                       account = tny_folder_get_account (folder);
+                       g_object_unref (folder);
+               }
+               
+               if (header)
+                       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
+open_msgs_helper_destroyer (gpointer user_data)
+{
+       OpenMsgHelper *helper = (OpenMsgHelper *) user_data;
+
+       if (helper->banner_info) {
+               g_free (helper->banner_info->message);
+               if (helper->banner_info->idle_handler > 0) {
+                       g_source_remove (helper->banner_info->idle_handler);
+                       helper->banner_info->idle_handler = 0;
+               }
+               if (helper->banner_info->banner != NULL) {
+                       gtk_widget_destroy (helper->banner_info->banner);
+                       g_object_unref (helper->banner_info->banner);
+                       helper->banner_info->banner = NULL;
+               }
+               g_slice_free (OpenMsgBannerInfo, helper->banner_info);
+               helper->banner_info = NULL;
+       }
+       g_object_unref (helper->model);
+       g_object_unref (helper->headers);
+       g_hash_table_destroy (helper->row_refs_per_header);
+       g_slice_free (OpenMsgHelper, helper);
+}
+
 static void
 open_msgs_performer(gboolean canceled, 
                    GError *err,
@@ -1073,16 +1128,32 @@ open_msgs_performer(gboolean canceled,
                    TnyAccount *account,
                    gpointer user_data)
 {
-       ModestMailOperation *mail_op;
+       ModestMailOperation *mail_op = NULL;
        const gchar *proto_name;
        gchar *error_msg;
        ModestTransportStoreProtocol proto;
        TnyList *not_opened_headers;
+       TnyConnectionStatus status;
+       gboolean show_open_draft = FALSE;
+       OpenMsgHelper *helper = NULL;
 
-       not_opened_headers = TNY_LIST (user_data);
+       helper = (OpenMsgHelper *) user_data;
+       not_opened_headers = helper->headers;
 
-       if (err) {
-               /* TODO: Show an error ? */
+       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 ());
+               /* Free the helper */
+               open_msgs_helper_destroyer (helper);
+
+               /* In memory full conditions we could get this error here */
+               if (err && is_memory_full_error (err)) {
+                       modest_platform_information_banner ((GtkWidget *) parent_window,
+                                                           NULL, dgettext("ke-recv",
+                                                                          "cerm_device_memory_full"));
+               }
                goto clean;
        }
 
@@ -1101,11 +1172,26 @@ open_msgs_performer(gboolean canceled,
                } 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));
+                       gchar *subject = tny_header_dup_subject (header);
                        error_msg = g_strdup_printf (_("emev_ni_ui_imap_message_not_available_in_server"),
-                                                    tny_header_get_subject (header));
+                                                    subject);
+                       g_free (subject);
                        g_object_unref (header);
                        g_object_unref (iter);
                } else {
+                       TnyHeader *header;
+                       TnyFolder *folder;
+                       TnyIterator *iter;
+                       TnyFolderType folder_type;
+
+                       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 {
@@ -1115,22 +1201,29 @@ open_msgs_performer(gboolean canceled,
        /* Create the mail operation */
        mail_op = 
                modest_mail_operation_new_with_error_handling ((GObject *) parent_window,
-                                                              modest_ui_actions_get_msgs_full_error_handler,
+                                                              modest_ui_actions_disk_operations_error_handler,
                                                               error_msg, g_free);
        modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
                                         mail_op);
-               
+
+       if (show_open_draft) {
+               helper->banner_info = g_slice_new (OpenMsgBannerInfo);
+               helper->banner_info->message = g_strdup (_("mail_ib_opening_draft_message"));
+               helper->banner_info->banner = NULL;
+               helper->banner_info->idle_handler = g_timeout_add (500, open_msg_banner_idle, 
+                                                                  helper->banner_info);
+       }
+
        modest_mail_operation_get_msgs_full (mail_op,
                                             not_opened_headers,
                                             open_msg_cb,
-                                            NULL,
-                                            NULL);
+                                            helper,
+                                            open_msgs_helper_destroyer);
 
        /* Frees */
  clean:
        if (mail_op)
                g_object_unref (mail_op);
-       g_object_unref (not_opened_headers);
        g_object_unref (account);
 }
 
@@ -1148,13 +1241,19 @@ open_msgs_from_headers (TnyList *headers, ModestWindow *win)
        TnyHeaderFlags flags = 0;
        TnyAccount *account;
        gint uncached_msgs = 0;
+       GtkWidget *header_view;
+       GtkTreeModel *model;
+       GHashTable *refs_for_headers;
+       OpenMsgHelper *helper;
+       GtkTreeSelection *sel;
+       GList *sel_list = NULL, *sel_list_iter = NULL;
                
        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"));
+               modest_platform_information_banner ((win) ? GTK_WIDGET (win) : NULL,
+                                                   NULL, _("mcen_ib_select_one_message"));
                return;
        }
 
@@ -1163,12 +1262,27 @@ open_msgs_from_headers (TnyList *headers, ModestWindow *win)
 
        /* Get the account */
        account = get_account_from_header_list (headers);
-       
+
+       if (!account)
+               return;
+
+       /* Get the selections, we need to get the references to the
+          rows here because the treeview/model could dissapear (the
+          user might want to select another folder)*/
+       header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
+                                                          MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
+       sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (header_view));
+       model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view));
+       sel_list = gtk_tree_selection_get_selected_rows (sel, &model);
+       refs_for_headers = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, 
+                                                 (GDestroyNotify) gtk_tree_row_reference_free);
+
        /* Look if we already have a message view for each header. If
           true, then remove the header from the list of headers to
           open */
+       sel_list_iter = sel_list;
        not_opened_headers = tny_simple_list_new ();
-       while (!tny_iterator_is_done (iter)) {
+       while (!tny_iterator_is_done (iter) && sel_list_iter) {
 
                ModestWindow *window = NULL;
                TnyHeader *header = NULL;
@@ -1184,27 +1298,39 @@ open_msgs_from_headers (TnyList *headers, ModestWindow *win)
                /* Do not open again the message and present the
                   window to the user */
                if (found) {
-                       if (window)
+                       if (window) {
                                gtk_window_present (GTK_WINDOW (window));
-                       else
+                       } else {
                                /* the header has been registered already, we don't do
                                 * anything but wait for the window to come up*/
                                g_debug ("header %p already registered, waiting for window", header);
+                       }
                } else {
+                       GtkTreeRowReference *row_reference;
+
                        tny_list_append (not_opened_headers, G_OBJECT (header));
+                       /* Create a new row reference and add it to the hash table */
+                       row_reference = gtk_tree_row_reference_new (model, (GtkTreePath *) sel_list_iter->data);
+                       g_hash_table_insert (refs_for_headers, header, row_reference);
                }
 
                if (header)
                        g_object_unref (header);
 
+               /* Go to next */
                tny_iterator_next (iter);
+               sel_list_iter = g_list_next (sel_list_iter);
        }
        g_object_unref (iter);
        iter = NULL;
+       g_list_foreach (sel_list, (GFunc) gtk_tree_path_free, NULL);
+       g_list_free (sel_list);
 
        /* Open each message */
-       if (tny_list_get_length (not_opened_headers) == 0)
+       if (tny_list_get_length (not_opened_headers) == 0) {
+               g_hash_table_destroy (refs_for_headers);
                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) 
@@ -1225,8 +1351,10 @@ open_msgs_from_headers (TnyList *headers, ModestWindow *win)
                                                                                             uncached_msgs));
 
                                /* End if the user does not want to continue */
-                               if (response == GTK_RESPONSE_CANCEL)
+                               if (response == GTK_RESPONSE_CANCEL) {
+                                       g_hash_table_destroy (refs_for_headers);
                                        goto cleanup;
+                               }
                        }
                }
        }
@@ -1244,14 +1372,23 @@ open_msgs_from_headers (TnyList *headers, ModestWindow *win)
        g_object_unref (iter_not_opened);
        iter_not_opened = NULL;
 
+       /* Create the helper. We need to get a reference to the model
+          here because it could change while the message is readed
+          (the user could switch between folders) */
+       helper = g_slice_new (OpenMsgHelper);
+       helper->model = g_object_ref (model);
+       helper->headers = g_object_ref (not_opened_headers);
+       helper->row_refs_per_header = refs_for_headers;
+       helper->banner_info = NULL;
+
        /* Connect to the account and perform */
        if (uncached_msgs > 0) {
-               modest_platform_connect_and_perform ((GtkWindow *) win, g_object_ref (account), 
-                                                    open_msgs_performer, g_object_ref (not_opened_headers));
+               modest_platform_connect_and_perform ((GtkWindow *) win, TRUE, g_object_ref (account), 
+                                                    open_msgs_performer, helper);
        } 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));
+               open_msgs_performer (FALSE, NULL, (GtkWindow *) win, 
+                                    g_object_ref (account), helper);
        }
 cleanup:
        /* Clean */
@@ -1265,6 +1402,12 @@ void
 modest_ui_actions_on_open (GtkAction *action, ModestWindow *win)
 {
        TnyList *headers;
+       
+       /* we check for low-mem; in that case, show a warning, and don't allow
+        * opening
+        */
+       if (modest_platform_check_memory_low (MODEST_WINDOW(win)))
+               return;
 
        /* Get headers */
        headers = get_selected_headers (win);
@@ -1325,19 +1468,23 @@ reply_forward_cb (ModestMailOperation *mail_op,
        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:
@@ -1454,6 +1601,13 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
        
        g_return_if_fail (MODEST_IS_WINDOW(win));
 
+                       
+       /* we check for low-mem; in that case, show a warning, and don't allow
+        * reply/forward (because it could potentially require a lot of memory */
+       if (modest_platform_check_memory_low (MODEST_WINDOW(win)))
+               return;
+
+
        /* we need an account when editing */
        if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE)) {
                if (!modest_ui_actions_run_account_setup_wizard (win))
@@ -1482,8 +1636,10 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
                 * 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 (account) {
+                               continue_download = connect_to_get_msg (win, num_of_unc_msgs, account);
+                               g_object_unref (account);
+                       }
                }
        }
 
@@ -1540,7 +1696,7 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
                        if (do_retrieve) {
                                mail_op = 
                                        modest_mail_operation_new_with_error_handling (G_OBJECT(win),
-                                                                                      modest_ui_actions_get_msgs_full_error_handler, 
+                                                                                      modest_ui_actions_disk_operations_error_handler, 
                                                                                       NULL, NULL);
                                modest_mail_operation_queue_add (
                                        modest_runtime_get_mail_operation_queue (), mail_op);
@@ -1662,23 +1818,53 @@ new_messages_arrived (ModestMailOperation *self,
                      gpointer user_data)
 {
        GObject *source;
+       gboolean show_visual_notifications;
 
        source = modest_mail_operation_get_source (self);
-
-       /* Notify new messages have been downloaded. Do not notify if
-          the send&receive was invoked by the user, i.e, if the mail
-          operation has a source (the main window) */
-       if ((new_headers != NULL) && (tny_list_get_length (new_headers) > 0) && !source)
-               modest_platform_on_new_headers_received (new_headers);
-
+       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;
+       gboolean poke_status;
+       gboolean interactive;
+       ModestMailOperation *mail_op;
 } SendReceiveInfo;
 
 static void
@@ -1688,13 +1874,21 @@ do_send_receive_performer (gboolean canceled,
                           TnyAccount *account, 
                           gpointer user_data)
 {
-       ModestMailOperation *mail_op;
        SendReceiveInfo *info;
 
        info = (SendReceiveInfo *) user_data;
 
        if (err || canceled) {
-
+               /* In memory full conditions we could get this error here */
+               if (err && is_memory_full_error (err)) {
+                       modest_platform_information_banner ((GtkWidget *) parent_window,
+                                                           NULL, dgettext("ke-recv",
+                                                                          "cerm_device_memory_full"));
+               }
+               if (info->mail_op) {
+                       modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (),
+                                                           info->mail_op);
+               }
                goto clean;
        }
 
@@ -1702,24 +1896,21 @@ do_send_receive_performer (gboolean canceled,
        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 (G_OBJECT (info->win),
-                                                                modest_ui_actions_send_receive_error_handler,
-                                                                NULL, NULL);
 
        if (info->win && MODEST_IS_MAIN_WINDOW (info->win))
-               g_signal_connect (G_OBJECT(mail_op), "operation-finished", 
+               g_signal_connect (G_OBJECT (info->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,
+       modest_mail_operation_update_account (info->mail_op, info->account_name, info->poke_status, info->interactive,
+                                             (info->win) ? retrieve_all_messages_cb : NULL, 
                                              new_messages_arrived, info->win);
-       g_object_unref (G_OBJECT (mail_op));
        
  clean:
        /* Frees */
+       if (info->mail_op)
+               g_object_unref (G_OBJECT (info->mail_op));
        if (info->account_name)
                g_free (info->account_name);
        if (info->win)
@@ -1737,6 +1928,9 @@ do_send_receive_performer (gboolean canceled,
  */
 void
 modest_ui_actions_do_send_receive (const gchar *account_name, 
+                                  gboolean force_connection,
+                                  gboolean poke_status,
+                                  gboolean interactive,
                                   ModestWindow *win)
 {
        gchar *acc_name = NULL;
@@ -1764,11 +1958,21 @@ modest_ui_actions_do_send_receive (const gchar *account_name,
        info = g_slice_new (SendReceiveInfo);
        info->account_name = acc_name;
        info->win = (win) ? g_object_ref (win) : NULL;
+       info->poke_status = poke_status;
+       info->interactive = interactive;
        info->account = modest_tny_account_store_get_server_account (acc_store, acc_name,
                                                                     TNY_ACCOUNT_TYPE_STORE);
+       /* We need to create the operation here, because otherwise it
+          could happen that the queue emits the queue-empty signal
+          while we're trying to connect the account */
+       info->mail_op = modest_mail_operation_new_with_error_handling ((info->win) ? G_OBJECT (info->win) : NULL,
+                                                                      modest_ui_actions_disk_operations_error_handler,
+                                                                      NULL, NULL);
+       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), info->mail_op);
 
        /* Invoke the connect and perform */
-       modest_platform_connect_and_perform ((win) ? GTK_WINDOW (win) : NULL, info->account, 
+       modest_platform_connect_and_perform ((win) ? GTK_WINDOW (win) : NULL, 
+                                            force_connection, info->account, 
                                             do_send_receive_performer, info);
 }
 
@@ -1799,9 +2003,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) 
@@ -1847,7 +2054,10 @@ 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,
+                                      gboolean poke_status,
+                                      gboolean interactive)
 {
        GSList *account_names, *iter;
 
@@ -1856,7 +2066,9 @@ 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, 
+                                                  poke_status, interactive, win);
                iter = g_slist_next (iter);
        }
 
@@ -1882,7 +2094,7 @@ modest_ui_actions_on_send_receive (GtkAction *action, ModestWindow *win)
        
        /* Refresh the current folder. The if is always TRUE it's just an extra check */
        if (MODEST_IS_MAIN_WINDOW (win)) {
-               GtkWidget *header_view, *folder_view;
+               GtkWidget *folder_view;
                TnyFolderStore *folder_store;
 
                folder_view = 
@@ -1893,29 +2105,13 @@ modest_ui_actions_on_send_receive (GtkAction *action, ModestWindow *win)
                
                folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
        
-               /* No need to refresh the INBOX the send_receive will do it for us */
-               if (folder_store && TNY_IS_FOLDER (folder_store) && 
-                   tny_folder_get_folder_type (TNY_FOLDER (folder_store)) != TNY_FOLDER_TYPE_INBOX) {
-                       header_view = 
-                               modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (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 */
-                       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);
        }       
        
-       /* Refresh the active account */
-       modest_ui_actions_do_send_receive (NULL, win);
+       /* Refresh the active account. Force the connection if needed
+          and poke the status of all folders */
+       modest_ui_actions_do_send_receive (NULL, TRUE, TRUE, TRUE, win);
 }
 
 
@@ -1983,6 +2179,7 @@ modest_ui_actions_on_header_selected (ModestHeaderView *header_view,
            gtk_widget_grab_focus (GTK_WIDGET(header_view));
 
        /* Update toolbar dimming state */
+       modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (main_window));
        modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window));
 }
 
@@ -1994,7 +2191,7 @@ modest_ui_actions_on_header_activated (ModestHeaderView *header_view,
        TnyList *headers;
 
        g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
-       
+
        if (!header)
                return;
 
@@ -2003,6 +2200,12 @@ modest_ui_actions_on_header_activated (ModestHeaderView *header_view,
                return;
        }
 
+       /* we check for low-mem; in that case, show a warning, and don't allow
+        * activating headers
+        */
+       if (modest_platform_check_memory_low (MODEST_WINDOW(main_window)))
+               return;
+
 
 /*     headers = tny_simple_list_new (); */
 /*     tny_list_prepend (headers, G_OBJECT (header)); */
@@ -2051,8 +2254,6 @@ folder_refreshed_cb (ModestMailOperation *mail_op,
 {
        ModestMainWindow *win = NULL;
        GtkWidget *header_view;
-       gboolean folder_empty = FALSE;
-       gboolean all_marked_as_deleted = FALSE;
 
        g_return_if_fail (TNY_IS_FOLDER (folder));
 
@@ -2067,16 +2268,15 @@ folder_refreshed_cb (ModestMailOperation *mail_op,
                if (current_folder != NULL && folder != current_folder) {
                        g_object_unref (current_folder);
                        return;
-               }
-               g_object_unref (current_folder);
+               } else if (current_folder)
+                       g_object_unref (current_folder);
        }
 
        /* Check if folder is empty and set headers view contents style */
-       folder_empty = (tny_folder_get_all_count (folder) == 0);
-       all_marked_as_deleted = modest_header_view_is_empty (MODEST_HEADER_VIEW(header_view));
-       if (folder_empty || all_marked_as_deleted)
+       if (tny_folder_get_all_count (folder) == 0)
                modest_main_window_set_contents_style (win,
                                                       MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY);
+
 }
 
 void 
@@ -2139,18 +2339,24 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view,
                                                      G_OBJECT(header_view),
                                                      MODEST_CONF_HEADER_VIEW_KEY);
                } else {
-                       /* Update the active account */
-                       //modest_window_set_active_account (MODEST_WINDOW (main_window), NULL);
-                       /* Save only if we're seeing headers */
+                       /* No need to save the header view
+                          configuration for Maemo because it only
+                          saves the sorting stuff and that it's
+                          already being done by the sort
+                          dialog. Remove it when the GNOME version
+                          has the same behaviour */
+#ifdef MODEST_PLATFORM_GNOME
                        if (modest_main_window_get_contents_style (main_window) ==
                            MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS)
                                modest_widget_memory_save (conf, G_OBJECT (header_view), 
                                                           MODEST_CONF_HEADER_VIEW_KEY);
+#endif
                        modest_header_view_clear (MODEST_HEADER_VIEW(header_view));
                }
        }
 
-       /* Update toolbar dimming state */
+       /* Update dimming state */
+       modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (main_window));
        modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window));
 }
 
@@ -2226,7 +2432,13 @@ modest_ui_actions_on_msg_link_contextual (ModestMsgView *msgview, const gchar* l
 void
 modest_ui_actions_on_msg_attachment_clicked (ModestMsgView *msgview, TnyMimePart *mime_part,
                                             ModestWindow *win)
-{
+{              
+       /* we check for low-mem; in that case, show a warning, and don't allow
+        * viewing attachments
+        */
+       if (modest_platform_check_memory_low (MODEST_WINDOW(win)))
+               return;
+
        modest_msg_view_window_view_attachment (MODEST_MSG_VIEW_WINDOW (win), mime_part);
 }
 
@@ -2259,14 +2471,14 @@ on_save_to_drafts_cb (ModestMailOperation *mail_op,
 
        edit_window = MODEST_MSG_EDIT_WINDOW (user_data);
 
-       /* If there was any error do nothing */
-       if (modest_mail_operation_get_error (mail_op) != NULL)
-               return;
+       /* Set draft is there was no error */
+       if (!modest_mail_operation_get_error (mail_op))
+               modest_msg_edit_window_set_draft (edit_window, saved_draft);
 
-       modest_msg_edit_window_set_draft (edit_window, saved_draft);
+       g_object_unref(edit_window);
 }
 
-void
+gboolean
 modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edit_window)
 {
        TnyTransportAccount *transport_account;
@@ -2274,12 +2486,61 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi
        MsgData *data;
        gchar *account_name, *from;
        ModestAccountMgr *account_mgr;
-       char *info_text;
+/*     char *info_text; */
+       gboolean had_error = FALSE;
+       guint64 available_disk, expected_size;
+       gint parts_count;
+       guint64 parts_size;
+       ModestMainWindow *win;
 
-       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window));
+       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;
+       }
+
+       /*
+        * djcb: if we're in low-memory state, we only allow for
+        * saving messages smaller than
+        * MODEST_MAX_LOW_MEMORY_MESSAGE_SIZE (see modest-defs.h) this
+        * should still allow for sending anything critical...
+        */
+       if (expected_size > MODEST_MAX_LOW_MEMORY_MESSAGE_SIZE) {
+
+               if (modest_platform_check_memory_low (MODEST_WINDOW(edit_window))) {
+                       modest_msg_edit_window_free_msg_data (edit_window, data);
+                       return FALSE;
+               }
+       }
+
+       /*
+        * djcb: we also make sure that the attachments are smaller than the max size
+        * this is for the case where we'd try to forward a message with attachments 
+        * bigger than our max allowed size, or sending an message from drafts which
+        * somehow got past our checks when attaching.
+        */
+       if (expected_size > MODEST_MAX_ATTACHMENT_SIZE) {
+               modest_platform_run_information_dialog (
+                       GTK_WINDOW(edit_window),
+                       dgettext("ke-recv","memr_ib_operation_disabled"),
+                       TRUE);
+               modest_msg_edit_window_free_msg_data (edit_window, data);
+               return FALSE;
+       }
+
        account_name = g_strdup (data->account_name);
        account_mgr = modest_runtime_get_account_mgr();
        if (!account_name)
@@ -2289,7 +2550,7 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi
        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)) {
@@ -2305,12 +2566,13 @@ 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 (G_OBJECT(edit_window));
+       mail_operation = modest_mail_operation_new_with_error_handling (NULL, modest_ui_actions_disk_operations_error_handler,
+                                                                       NULL, NULL);
        modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_operation);
 
        modest_mail_operation_save_to_drafts (mail_operation,
@@ -2327,19 +2589,29 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi
                                              data->images,
                                              data->priority_flags,
                                              on_save_to_drafts_cb,
-                                             edit_window);
-       info_text = g_strdup_printf (_("mail_va_saved_to_drafts"), _("mcen_me_folder_drafts"));
-       modest_platform_information_banner (NULL, NULL, info_text);
+                                             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) {
+               gchar *text = g_strdup_printf (_("mail_va_saved_to_drafts"), _("mcen_me_folder_drafts"));
+               modest_platform_information_banner (GTK_WIDGET (win), NULL, text);
+               g_free (text);
+       }
+       modest_msg_edit_window_set_modified (edit_window, FALSE);
 
        /* Frees */
-       g_free (info_text);
        g_free (from);
        g_free (account_name);
        g_object_unref (G_OBJECT (transport_account));
        g_object_unref (G_OBJECT (mail_operation));
 
        modest_msg_edit_window_free_msg_data (edit_window, data);
-       modest_msg_edit_window_reset_modified (edit_window);
 
        /* ** FIXME **
         * If the drafts folder is selected then make the header view
@@ -2356,9 +2628,7 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi
         * we find a better solution it should be removed
         * See NB#65125 (commend #18) for details.
         */
-       ModestMainWindow *win = MODEST_MAIN_WINDOW(modest_window_mgr_get_main_window(
-               modest_runtime_get_window_mgr(), FALSE));
-       if (win != NULL) {
+       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) {
@@ -2377,28 +2647,74 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi
                        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)
 {
        TnyTransportAccount *transport_account = NULL;
+       gboolean had_error = FALSE;
+       guint64 available_disk, expected_size;
+       gint parts_count;
+       guint64 parts_size;
 
-       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window));
+       g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window), TRUE);
 
        if (!modest_msg_edit_window_check_names (edit_window, TRUE))
-               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;
+       }
+
+       
+       /*
+        * djcb: if we're in low-memory state, we only allow for sending messages
+        * smaller than MODEST_MAX_LOW_MEMORY_MESSAGE_SIZE (see modest-defs.h)
+        * this should still allow for sending anything critical... 
+        */
+       if (expected_size > MODEST_MAX_LOW_MEMORY_MESSAGE_SIZE) {
+               if (modest_platform_check_memory_low (MODEST_WINDOW(edit_window))) {
+                       modest_msg_edit_window_free_msg_data (edit_window, data);
+                       return FALSE;
+               }
+       }
+
+       /*
+        * djcb: we also make sure that the attachments are smaller than the max size
+        * this is for the case where we'd try to forward a message with attachments 
+        * bigger than our max allowed size, or sending an message from drafts which
+        * somehow got past our checks when attaching.
+        */
+       if (expected_size > MODEST_MAX_ATTACHMENT_SIZE) {
+               modest_platform_run_information_dialog (
+                       GTK_WINDOW(edit_window),
+                       dgettext("ke-recv","memr_ib_operation_disabled"),
+                       TRUE);
+               modest_msg_edit_window_free_msg_data (edit_window, data);
+               return FALSE;
+       }
+
        ModestAccountMgr *account_mgr = modest_runtime_get_account_mgr();
        gchar *account_name = g_strdup (data->account_name);
        if (!account_name)
-               g_strdup(modest_window_get_active_account (MODEST_WINDOW(edit_window)));
+               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);
@@ -2406,8 +2722,9 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
        if (!account_name) {
                modest_msg_edit_window_free_msg_data (edit_window, data);
                /* Run account setup wizard */
-               if (!modest_ui_actions_run_account_setup_wizard (MODEST_WINDOW(edit_window)))
-                       return;
+               if (!modest_ui_actions_run_account_setup_wizard (MODEST_WINDOW(edit_window))) {
+                       return TRUE;
+               }
        }
        
        /* Get the currently-active transport account for this modest account: */
@@ -2418,15 +2735,16 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
        }
        
        if (!transport_account) {
+               modest_msg_edit_window_free_msg_data (edit_window, data);
                /* Run account setup wizard */
                if (!modest_ui_actions_run_account_setup_wizard(MODEST_WINDOW(edit_window)))
-                       return;
+                       return TRUE;
        }
        
        gchar *from = modest_account_mgr_get_from_string (account_mgr, account_name);
 
        /* Create the mail operation */
-       ModestMailOperation *mail_operation = modest_mail_operation_new (G_OBJECT(edit_window));
+       ModestMailOperation *mail_operation = modest_mail_operation_new_with_error_handling (NULL, modest_ui_actions_disk_operations_error_handler, NULL, NULL);
        modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_operation);
 
        modest_mail_operation_send_new_mail (mail_operation,
@@ -2446,6 +2764,15 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
        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);
@@ -2454,10 +2781,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 
@@ -2579,6 +2911,10 @@ modest_ui_actions_on_insert_image (GtkAction *action,
        g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
        g_return_if_fail (GTK_IS_ACTION (action));
 
+
+       if (modest_platform_check_memory_low (MODEST_WINDOW(window)))
+               return;
+
        if (modest_msg_edit_window_get_format (MODEST_MSG_EDIT_WINDOW(window)) == MODEST_MSG_EDIT_FORMAT_TEXT)
                return;
 
@@ -2592,6 +2928,9 @@ modest_ui_actions_on_attach_file (GtkAction *action,
        g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
        g_return_if_fail (GTK_IS_ACTION (action));
 
+       if (modest_platform_check_memory_low (MODEST_WINDOW(window)))
+               return;
+       
        modest_msg_edit_window_offer_attach_file (window);
 }
 
@@ -2606,86 +2945,125 @@ 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 (modest_mail_operation_get_error (mail_op)) {
+
+               /* Show an error. If there was some problem writing to
+                  disk, show it, otherwise show the generic folder
+                  create error. We do it here and not in an error
+                  handler because the call to do_create_folder will
+                  stop the main loop in a gtk_dialog_run and then,
+                  the message won't be shown until that dialog is
+                  closed */
+               modest_ui_actions_disk_operations_error_handler (mail_op,
+                                                                _("mail_in_ui_folder_create_error"));
+
+               /* Try again. Do *NOT* show any error because the mail
+                  operations system will do it for us because we
+                  created the mail_op with new_with_error_handler */
+               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(error) {
-               modest_platform_information_banner (GTK_WIDGET (window), NULL,
-                                                   _("mail_in_ui_folder_create_error"));
+               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. It could happen
+                  that the widget is no longer there (i.e. the window
+                  has been destroyed, so we need to check this */
+               if (folder_view)
+                       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 ((GObject *) 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;
-                       modest_platform_information_banner (NULL, NULL, _("mail_in_ui_folder_create_error"));
+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);
+
+       if (canceled || err) {
+               /* In memory full conditions we could get this error here */
+               if (err && is_memory_full_error (err)) {
+                       modest_platform_information_banner ((GtkWidget *) parent_window,
+                                                           NULL, dgettext("ke-recv",
+                                                                          "cerm_device_memory_full"));
                }
-               g_object_unref (account);
+               goto frees;
+       }
 
-               /* Run the new folder dialog */
-               while (!finished) {
-                       result = modest_platform_run_new_folder_dialog (GTK_WINDOW (parent_window),
-                                                                       parent_folder,
-                                                                       suggested_name,
-                                                                       &folder_name);
-
-                       g_free (suggested_name);
-                       suggested_name = NULL;
-
-                       if (result == GTK_RESPONSE_ACCEPT) {
-                               ModestMailOperation *mail_op;
-                               TnyFolder *new_folder = NULL;
-
-                               mail_op  = modest_mail_operation_new_with_error_handling (G_OBJECT(parent_window),
-                                                                                         modest_ui_actions_new_folder_error_handler,
-                                                                                         parent_window, NULL);
-
-                               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);
-                       } else {
-                               finished = TRUE;
-                       }
+       /* Run the new folder dialog */
+       do_create_folder (GTK_WINDOW (parent_window), parent_folder, NULL);
 
-                       suggested_name = folder_name;
-                       folder_name = NULL;
-               }
+ frees:
+       g_object_unref (parent_folder);
+}
 
-               g_object_unref (parent_folder);
+static void
+modest_ui_actions_create_folder(GtkWidget *parent_window,
+                                GtkWidget *folder_view)
+{
+       TnyFolderStore *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);
        }
 }
 
@@ -2708,7 +3086,6 @@ static void
 modest_ui_actions_rename_folder_error_handler (ModestMailOperation *mail_op,
                                               gpointer user_data)
 {
-       ModestMainWindow *window = MODEST_MAIN_WINDOW (user_data);
        const GError *error = NULL;
        const gchar *message = NULL;
        
@@ -2722,12 +3099,12 @@ modest_ui_actions_rename_folder_error_handler (ModestMailOperation *mail_op,
                message = _CS("ckdg_ib_folder_already_exists");
                break;
        default:
-               g_warning ("%s: BUG: unexpected error:[%d]: %s", __FUNCTION__,
-                          error->code, error->message);
-               return;
+               message = _("emev_ib_ui_imap_unable_to_rename");
        }
 
-       modest_platform_information_banner (GTK_WIDGET (window), NULL, message);
+       /* We don't set a parent for the dialog because the dialog
+          will be destroyed so the banner won't appear */
+       modest_platform_information_banner (NULL, NULL, message);
 }
 
 typedef struct {
@@ -2736,15 +3113,46 @@ typedef struct {
 } RenameFolderInfo;
 
 static void
-on_rename_folder_cb (gboolean canceled, GError *err, GtkWindow *parent_window, 
-               TnyAccount *account, gpointer user_data)
+on_rename_folder_cb (ModestMailOperation *mail_op, 
+                    TnyFolder *new_folder,
+                    gpointer user_data)
+{
+       ModestFolderView *folder_view;
+
+       /* If the window was closed when renaming a folder this could
+          happen */
+       if (MODEST_IS_FOLDER_VIEW (user_data))
+               return;
+
+       folder_view = MODEST_FOLDER_VIEW (user_data);
+       /* Note that if the rename fails new_folder will be NULL */
+       if (new_folder) {
+               modest_folder_view_select_folder (folder_view, new_folder, FALSE);
+       } else {
+               modest_folder_view_select_first_inbox_or_local (folder_view);
+       }
+}
+
+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 (MODEST_IS_MAIN_WINDOW(parent_window)) {
+       if (canceled || err) {
+               /* In memory full conditions we could get this error here */
+               if (err && is_memory_full_error (err)) {
+                       modest_platform_information_banner ((GtkWidget *) parent_window,
+                                                           NULL, dgettext("ke-recv",
+                                                                          "cerm_device_memory_full"));
+               }
+       } else if (MODEST_IS_MAIN_WINDOW(parent_window)) {
 
                folder_view = modest_main_window_get_child_widget (
                                MODEST_MAIN_WINDOW (parent_window),
@@ -2762,23 +3170,15 @@ on_rename_folder_cb (gboolean canceled, GError *err, GtkWindow *parent_window,
                sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (folder_view));
                gtk_tree_selection_unselect_all (sel);
 
-               /* Select *after* the changes */
-               modest_folder_view_select_folder (MODEST_FOLDER_VIEW(folder_view),
-                               TNY_FOLDER(data->folder), TRUE);
-
                /* Actually rename the folder */
                modest_mail_operation_rename_folder (mail_op,
-                               TNY_FOLDER (data->folder),
-                               (const gchar *) (data->new_name));
-               
-               /* TODO folder view filter refilter */
-               /* 
-               GtkTreeModel *tree_model = gtk_tree_view_get_model (GTK_TREE_VIEW (folder_view));
-               if (GTK_IS_TREE_MODEL_FILTER (tree_model))
-                       gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (tree_model)); */
+                                                    TNY_FOLDER (data->folder),
+                                                    (const gchar *) (data->new_name),
+                                                    on_rename_folder_cb,
+                                                    folder_view);
+               g_object_unref (mail_op);
        }
 
-       g_object_unref (mail_op);
        g_free (data->new_name);
        g_free (data);
 }
@@ -2829,8 +3229,8 @@ modest_ui_actions_on_rename_folder (GtkAction *action,
                        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), 
-                                       folder, on_rename_folder_cb, rename_folder_data);
+                       modest_platform_connect_if_remote_and_perform (GTK_WINDOW(main_window), TRUE,
+                                       folder, on_rename_folder_performer, rename_folder_data);
                }
        }
        g_object_unref (folder);
@@ -2843,34 +3243,83 @@ modest_ui_actions_delete_folder_error_handler (ModestMailOperation *mail_op,
        GObject *win = modest_mail_operation_get_source (mail_op);
 
        modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL,
-                                               _("mail_in_ui_folder_delete_error"));
+                                               _("mail_in_ui_folder_delete_error"),
+                                               FALSE);
        g_object_unref (win);
 }
 
-static gboolean
-delete_folder (ModestMainWindow *main_window, gboolean move_to_trash) 
+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)
 {
        TnyFolderStore *folder;
        GtkWidget *folder_view;
        gint response;
        gchar *message;
-        gboolean do_delete = TRUE;
-
-       g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (main_window), FALSE);
+       
+       g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
 
        folder_view = modest_main_window_get_child_widget (main_window,
                                                           MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
        if (!folder_view)
-               return FALSE;
+               return;
 
        folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
 
        /* Show an error if it's an account */
        if (!TNY_IS_FOLDER (folder)) {
                modest_platform_run_information_dialog (GTK_WINDOW (main_window),
-                                                       _("mail_in_ui_folder_delete_error"));
+                                                       _("mail_in_ui_folder_delete_error"),
+                                                       FALSE);
                g_object_unref (G_OBJECT (folder));
-               return FALSE;
+               return;
        }
 
        /* Ask the user */      
@@ -2880,38 +3329,20 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash)
                                                            (const gchar *) message);
        g_free (message);
 
-        if (response != GTK_RESPONSE_OK) {
-                do_delete = FALSE;
-        } else if (modest_tny_folder_store_is_remote(folder) &&
-                   !tny_device_is_online (modest_runtime_get_device())) {
-                TnyAccount *account = tny_folder_get_account(TNY_FOLDER(folder));
-                do_delete = modest_platform_connect_and_wait(GTK_WINDOW(main_window), account);
-                g_object_unref(account);
-        }
-
-       if (do_delete) {
-               ModestMailOperation *mail_op;
-               GtkTreeSelection *sel;
-
-               /* 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(main_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 (folder), move_to_trash);
-               g_object_unref (G_OBJECT (mail_op));
+       if (response == GTK_RESPONSE_OK) {
+               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));
-
-       return do_delete;
 }
 
 void 
@@ -2919,14 +3350,8 @@ modest_ui_actions_on_delete_folder (GtkAction *action,
                                     ModestMainWindow *main_window)
 {
        g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
-
-       if (delete_folder (main_window, FALSE)) {
-               GtkWidget *folder_view;
-
-               folder_view = modest_main_window_get_child_widget (main_window,
-                                                                  MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
-               modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (folder_view));
-       }
+       
+       delete_folder (main_window, FALSE);
 }
 
 void 
@@ -2938,26 +3363,6 @@ modest_ui_actions_on_move_folder_to_trash_folder (GtkAction *action, ModestMainW
 }
 
 
-static void
-show_error (GtkWidget *parent_widget, const gchar* text)
-{
-       modest_platform_information_banner(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,
@@ -2968,6 +3373,7 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
                                         ModestMainWindow *main_window)
 {
        g_return_if_fail(server_account_name);
+       gboolean completed = FALSE;
        
        /* Initalize output parameters: */
        if (cancel)
@@ -3085,49 +3491,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_account_mgr_set_server_account_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 {
+                       /* Set parent to NULL or the banner will disappear with its parent dialog */
+                       modest_platform_information_banner(NULL, 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:
@@ -3159,9 +3574,11 @@ 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)) {
                TnyList *header_list = modest_header_view_get_selected_headers (
                                MODEST_HEADER_VIEW (focused_widget));
@@ -3172,8 +3589,10 @@ modest_ui_actions_on_cut (GtkAction *action,
 
                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 (account) {
+                               continue_download = connect_to_get_msg (window, num_of_unc_msgs, account);
+                               g_object_unref (account);
+                       }
                }
 
                if (num_of_unc_msgs == 0 || continue_download) {
@@ -3201,7 +3620,10 @@ modest_ui_actions_on_copy (GtkAction *action,
        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)) {
@@ -3215,9 +3637,11 @@ 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));
@@ -3228,8 +3652,10 @@ modest_ui_actions_on_copy (GtkAction *action,
 
                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 (account) {
+                               continue_download = connect_to_get_msg (window, num_of_unc_msgs, account);
+                               g_object_unref (account);
+                       }
                }
 
                if (num_of_unc_msgs == 0 || continue_download) {
@@ -3284,7 +3710,17 @@ modest_ui_actions_on_redo (GtkAction *action,
 
 
 static void
-destroy_information_note (ModestMailOperation *mail_op, gpointer user_data)
+destroy_information_note (ModestMailOperation *mail_op, 
+                         gpointer 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));
@@ -3429,7 +3865,7 @@ modest_ui_actions_on_paste (GtkAction *action,
                                                           src_folder,
                                                           folder_store,
                                                           delete,
-                                                          destroy_information_note,
+                                                          destroy_folder_information_note,
                                                           inf_note);
                }
 
@@ -3771,18 +4207,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)
 {
+       /* 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. */
-       if (display_name)
-               gtk_window_set_title (window, display_name);
-       else
-               gtk_window_set_title (window, " ");
+       gtk_window_set_title (window, display_name);
+
 }
 
 void
@@ -3829,9 +4274,11 @@ on_move_to_dialog_folder_selection_changed (ModestFolderView* self,
        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)
@@ -3854,12 +4301,18 @@ on_move_to_dialog_folder_selection_changed (ModestFolderView* self,
 
                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
-                          account root */
-                       new_sensitive = FALSE;
+                          POP account root */
+                       new_sensitive = (proto != MODEST_PROTOCOL_STORE_POP);
                }
                g_object_unref (local_account);
+               g_object_unref (mmc_account);
        }
 
        /* Check the target folder rules */
@@ -3908,25 +4361,36 @@ on_move_to_dialog_folder_selection_changed (ModestFolderView* self,
                }
                g_object_unref (moved_folder);
        } else {
-               TnyHeader *header = NULL;
                TnyFolder *src_folder = NULL;
 
                /* Moving a message */
                if (MODEST_IS_MSG_VIEW_WINDOW (user_data)) {
-                       header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (user_data));
-                       src_folder = tny_header_get_folder (header);
-                       g_object_unref (header);
+
+                       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)));
+                               TNY_FOLDER (modest_folder_view_get_selected
+                                           (MODEST_FOLDER_VIEW (folder_view)));
                }
 
-               /* 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);
+               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:
@@ -3936,6 +4400,16 @@ on_move_to_dialog_folder_selection_changed (ModestFolderView* self,
        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,
@@ -4000,7 +4474,8 @@ create_move_to_dialog (GtkWindow *win,
        } else {
                const gchar *active_account_name = NULL;
                ModestAccountMgr *mgr = NULL;
-               ModestAccountData *acc_data = NULL;
+               ModestAccountSettings *settings = NULL;
+               ModestServerAccountSettings *store_settings = NULL;
 
                modest_folder_view_set_style (MODEST_FOLDER_VIEW (*tree_view),
                                              MODEST_FOLDER_VIEW_STYLE_SHOW_ALL);
@@ -4009,19 +4484,30 @@ create_move_to_dialog (GtkWindow *win,
 
                active_account_name = modest_window_get_active_account (MODEST_WINDOW (win));
                mgr = modest_runtime_get_account_mgr ();
-               acc_data = modest_account_mgr_get_account_data (mgr, active_account_name);
+               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);
 
-               /* Set the new visible & active account */
-               if (acc_data && acc_data->store_account) { 
                        modest_folder_view_set_account_id_of_visible_server_account (MODEST_FOLDER_VIEW (*tree_view),
-                                                                                    acc_data->store_account->account_name);
-                       modest_account_mgr_free_account_data (mgr, acc_data);
+                                                                                    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 */
@@ -4034,40 +4520,6 @@ create_move_to_dialog (GtkWindow *win,
        return dialog;
 }
 
-/*
- * 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)
-{
-       TnyIterator *iter;
-       gboolean found = FALSE;
-
-       iter = tny_list_create_iterator (list);
-       while (!tny_iterator_is_done (iter) && !found) {
-               TnyHeader *header;
-               TnyHeaderFlags flags = 0;
-
-               header = TNY_HEADER (tny_iterator_get_current (iter));
-               if (header) {
-                       flags = tny_header_get_flags (header);
-                       if (flags & TNY_HEADER_FLAG_CACHED)
-/*                     if (!(flags & TNY_HEADER_FLAG_PARTIAL)) */
-                               found = TRUE;
-
-                       g_object_unref (header);
-               }
-
-               if (!found)
-                       tny_iterator_next (iter);
-       }
-       g_object_unref (iter);
-
-       return found;
-}
-#endif /* 0 */
 
 
 /*
@@ -4131,10 +4583,9 @@ modest_ui_actions_msgs_move_to_confirmation (ModestWindow *win,
        return response;
 }
 
-
-
 static void
-move_to_cb (ModestMailOperation *mail_op, gpointer user_data)
+move_to_cb (ModestMailOperation *mail_op, 
+           gpointer user_data)
 {
        MoveToHelper *helper = (MoveToHelper *) user_data;
 
@@ -4147,10 +4598,11 @@ move_to_cb (ModestMailOperation *mail_op, gpointer user_data)
                if (MODEST_IS_MSG_VIEW_WINDOW (object)) {
                        ModestMsgViewWindow *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));
+                       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;
@@ -4160,6 +4612,10 @@ move_to_cb (ModestMailOperation *mail_op, gpointer user_data)
                                                                           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);
+                       /* We need to unselect the previous one
+                          because we could be copying instead of
+                          moving */
+                       gtk_tree_selection_unselect_all (sel);
                        gtk_tree_selection_select_path (sel, path);
                        gtk_tree_path_free (path);
                }
@@ -4168,32 +4624,48 @@ move_to_cb (ModestMailOperation *mail_op, gpointer user_data)
 
        /* Close the "Pasting" information banner */
        gtk_widget_destroy (GTK_WIDGET(helper->banner));
+       g_object_unref (helper->banner);
        if (helper->reference != NULL)
                gtk_tree_row_reference_free (helper->reference);
        g_free (helper);
 }
 
+static void
+folder_move_to_cb (ModestMailOperation *mail_op, 
+                  TnyFolder *new_folder,
+                  gpointer user_data)
+{
+       GtkWidget *folder_view;
+       GObject *object;
+
+       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)
 {
        ModestWindow *main_window = NULL;
-       GObject *win = NULL;
-       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 = _("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) {
+               GObject *win = NULL;
                GtkWidget *folder_view = NULL;
        
                folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (main_window),
@@ -4204,36 +4676,15 @@ modest_ui_actions_move_folder_error_handler (ModestMailOperation *mail_op,
                        modest_folder_view_select_folder (MODEST_FOLDER_VIEW (folder_view), 
                                                          TNY_FOLDER (user_data), FALSE);
                }
-       }
-
-       /* Show notification dialog */
-       win = modest_mail_operation_get_source (mail_op);
-       modest_platform_run_information_dialog ((GtkWindow *) win, message);
-       if (win)
-               g_object_unref (win);
-}
-
-void
-modest_ui_actions_send_receive_error_handler (ModestMailOperation *mail_op, 
-                                             gpointer user_data)
-{
-       GObject *win = modest_mail_operation_get_source (mail_op);
-       const GError *error = modest_mail_operation_get_error (mail_op);
 
-       g_return_if_fail (error != NULL);
-       if (error->message != NULL)             
-               g_printerr ("modest: %s\n", error->message);
-       else
-               g_printerr ("modest: unkonw error on send&receive operation");
-
-       /* Show error message */
-/*     if (modest_mail_operation_get_id (mail_op) == MODEST_MAIL_OPERATION_TYPE_RECEIVE) */
-/*             modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL, */
-/*                                                     _CS("sfil_ib_unable_to_receive")); */
-/*     else  */
-/*             modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL, */
-/*                                                     _CS("sfil_ib_unable_to_send")); */
-       g_object_unref (win);
+               /* Show notification dialog only if the main window exists */
+               win = modest_mail_operation_get_source (mail_op);
+               modest_platform_run_information_dialog ((GtkWindow *) win, 
+                                                       _("mail_in_ui_folder_move_target_error"), 
+                                                       FALSE);
+               if (win)
+                       g_object_unref (win);
+       }
 }
 
 static void
@@ -4301,6 +4752,7 @@ open_msg_for_purge_cb (ModestMailOperation *mail_op,
 
                                tny_iterator_next (iter);
                        }
+                       g_object_unref (iter);
                        
                        tny_msg_rewrite_cache (msg);
                }
@@ -4308,7 +4760,6 @@ open_msg_for_purge_cb (ModestMailOperation *mail_op,
                /* This string no longer exists, refer to NB#75415 for more info */
                /* modest_platform_information_banner (NULL, NULL, _("mail_ib_attachment_already_purged")); */
        }
-       g_object_unref (iter);
 
        modest_window_mgr_unregister_header (mgr, header);
 
@@ -4321,7 +4772,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;
@@ -4339,7 +4789,7 @@ modest_ui_actions_on_main_window_remove_attachments (GtkAction *action,
        }
        
        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
@@ -4366,7 +4816,7 @@ modest_ui_actions_on_main_window_remove_attachments (GtkAction *action,
                ModestMailOperation *mail_op = NULL;
                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,
+                                                                        modest_ui_actions_disk_operations_error_handler,
                                                                         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);
@@ -4379,24 +4829,136 @@ 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);
+}
+
+static void
+xfer_messages_error_handler (ModestMailOperation *mail_op, 
+                            gpointer user_data)
+{
+       ModestWindow *main_window = NULL;
+       
+       /* 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) {
+               GObject *win = modest_mail_operation_get_source (mail_op);
+               modest_platform_run_information_dialog ((GtkWindow *) win, 
+                                                       _("mail_in_ui_folder_move_target_error"), 
+                                                       FALSE);
+               if (win)
+                       g_object_unref (win);
+       }
+}
+
 /**
  * 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;
        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"));
-               return;
+       if (canceled)
+               goto end;
+
+       if (err) {
+               if (is_memory_full_error (err)) {
+                       modest_platform_information_banner ((GtkWidget *) parent_window,
+                                                           NULL, dgettext("ke-recv",
+                                                                          "cerm_device_memory_full"));
+               } else {
+                       /* Show the proper error message */
+                       modest_ui_actions_on_account_connection_error (parent_window, account);
+               }
+               goto end;
        }
 
        dst_account = tny_folder_get_account (TNY_FOLDER (dst_folder));
@@ -4413,10 +4975,9 @@ modest_ui_actions_xfer_messages_from_move_to (TnyFolderStore *dst_folder,
        headers = get_selected_headers (MODEST_WINDOW (win));
        if (!headers) {
                g_warning ("%s: no headers selected", __FUNCTION__);
-               return;
+               goto end;
        }
 
-
        if (dst_is_pop) {
                modest_platform_information_banner (GTK_WIDGET (win),
                                                    NULL,
@@ -4424,13 +4985,14 @@ modest_ui_actions_xfer_messages_from_move_to (TnyFolderStore *dst_folder,
                                                             "mail_in_ui_folder_move_targets_error",
                                                             tny_list_get_length (headers)));
                g_object_unref (headers);
-               return;
+               goto end;
        }
 
        MoveToHelper *helper = g_new0 (MoveToHelper, 1);
        helper->banner = modest_platform_animation_banner (GTK_WIDGET (win), NULL,
                                                           _CS("ckct_nw_pasting"));
        if (helper->banner != NULL)  {
+               g_object_ref (helper->banner);
                gtk_window_set_modal (GTK_WINDOW(helper->banner), FALSE);
                gtk_widget_show (GTK_WIDGET(helper->banner));
        }
@@ -4444,7 +5006,7 @@ modest_ui_actions_xfer_messages_from_move_to (TnyFolderStore *dst_folder,
 
        ModestMailOperation *mail_op = 
                modest_mail_operation_new_with_error_handling (G_OBJECT(win),
-                                                              modest_ui_actions_move_folder_error_handler,
+                                                              xfer_messages_error_handler,
                                                               NULL, NULL);
        modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), 
                                         mail_op);
@@ -4453,11 +5015,96 @@ modest_ui_actions_xfer_messages_from_move_to (TnyFolderStore *dst_folder,
                                         headers,
                                         TNY_FOLDER (dst_folder),
                                         TRUE,
-                                        move_to_cb,
+                                        msgs_move_to_cb,
                                         helper);
 
        g_object_unref (G_OBJECT (mail_op));
        g_object_unref (headers);
+ end:
+       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)  {
+               g_object_ref (helper->banner);
+               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_folder_view_select_folder (MODEST_FOLDER_VIEW(info->folder_view),
+                                         TNY_FOLDER (info->dst_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);
+       g_object_unref (G_OBJECT (info->src_folder));
+
+       /* if (modest_mail_operation_get_status (mail_op) == MODEST_MAIL_OPERATION_STATUS_SUCCESS) {        */
+       /* } */
+       
+       /* Unref mail operation */
+       g_object_unref (G_OBJECT (mail_op));
+       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));
 }
 
 /*
@@ -4471,9 +5118,7 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action,
                                          ModestMainWindow *win)
 {
        ModestHeaderView *header_view = NULL;
-       ModestMailOperation *mail_op = NULL;
-       TnyFolderStore *src_folder;
-        gboolean online = (tny_device_is_online (modest_runtime_get_device()));
+       TnyFolderStore *src_folder = NULL;
 
        g_return_if_fail (MODEST_IS_MAIN_WINDOW (win));
 
@@ -4485,89 +5130,87 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action,
 
        /* Get folder or messages to transfer */
        if (gtk_widget_is_focus (folder_view)) {
-               GtkTreeSelection *sel;
-                gboolean do_xfer = TRUE;
+               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)) {
+                   !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)) {
+               } else if (!TNY_IS_FOLDER (src_folder)) {
                        g_warning ("%s: src_folder is not a TnyFolder.\n", __FUNCTION__);
-                        do_xfer = FALSE;
-                } else if (!online && modest_tny_folder_store_is_remote(src_folder)) {
-                        guint num_headers = tny_folder_get_all_count(TNY_FOLDER (src_folder));
-                       TnyAccount *account = tny_folder_get_account (TNY_FOLDER (src_folder));
-                        if (!connect_to_get_msg(MODEST_WINDOW (win), num_headers, account))
-                                do_xfer = FALSE;
-                       g_object_unref (account);
-                }
-
-                if (do_xfer) {
-                        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));
-                        }
-                        /* Clean folder on header view before moving it */
-                        sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (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(win),
-                                                                         modest_ui_actions_move_folder_error_handler,
-                                                                         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 (src_folder),
-                                                           dst_folder,
-                                                           TRUE, 
-                                                          move_to_cb, 
-                                                          helper);
-                        /* Unref mail operation */
-                        g_object_unref (G_OBJECT (mail_op));
-                }
+                       do_xfer = FALSE;
+               }
+
+               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 (GTK_WIDGET(header_view))) {
-                gboolean do_xfer = TRUE;
-                /* Ask for confirmation if the source folder is remote and we're not connected */
-                if (!online && modest_tny_folder_store_is_remote(src_folder)) {
-                        TnyList *headers = modest_header_view_get_selected_headers(header_view);
-                        if (!msgs_already_deleted_from_server(headers, src_folder)) {
-                                guint num_headers = tny_list_get_length(headers);
-                               TnyAccount *account = get_account_from_header_list (headers);
-                                if (!connect_to_get_msg(MODEST_WINDOW (win), num_headers, account))
-                                        do_xfer = FALSE;
-                               g_object_unref (account);
-                        }
-                        g_object_unref(headers);
-                }
-                if (do_xfer) /* Transfer messages */
-                        modest_ui_actions_xfer_messages_from_move_to (dst_folder, MODEST_WINDOW (win));
+               TnyList *headers;
+
+               headers = modest_header_view_get_selected_headers(header_view);
+
+               /* Transfer the messages */
+               modest_ui_actions_transfer_messages_helper (GTK_WINDOW (win), TNY_FOLDER (src_folder), 
+                                                           headers, TNY_FOLDER (dst_folder));
+
+               g_object_unref (headers);
        }
 
-    if (src_folder)
-       g_object_unref (src_folder);
+       /* Frees */
+       g_object_unref (src_folder);
 }
 
 
+void
+modest_ui_actions_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
@@ -4577,34 +5220,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 = NULL;
-       TnyAccount *account = NULL;
-       gboolean do_xfer = FALSE;
+
+       g_return_if_fail (TNY_IS_FOLDER (dst_folder));
 
        /* Create header list */
-       header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win));              
+       header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win));
        src_folder = TNY_FOLDER (tny_header_get_folder(header));
-       g_object_unref (header);
+       headers = tny_simple_list_new ();
+       tny_list_append (headers, G_OBJECT (header));
 
-       account = tny_folder_get_account (src_folder);
-       if (!modest_tny_folder_store_is_remote(TNY_FOLDER_STORE(src_folder))) {
-               /* Transfer if the source folder is local */
-               do_xfer = TRUE;
-       } else if (remote_folder_is_pop(TNY_FOLDER_STORE(src_folder))) {
-               /* Transfer if the source folder is POP (as it means
-                * that the message is already downloaded) */
-               do_xfer = TRUE;
-       } else if (connect_to_get_msg(MODEST_WINDOW(win), 1, account)) {
-               /* Transfer after asking confirmation */
-               do_xfer = TRUE;
-       }
-
-       if (do_xfer) {
-               modest_ui_actions_xfer_messages_from_move_to (dst_folder, MODEST_WINDOW (win));
-        }
-       g_object_unref (account);
-       g_object_unref (src_folder);
+       /* Transfer the messages */
+       modest_ui_actions_transfer_messages_helper (GTK_WINDOW (win), src_folder, headers, 
+                                                   TNY_FOLDER (dst_folder));
+
+       /* Frees */
+       g_object_unref (header);
+       g_object_unref (headers);
 }
 
 void 
@@ -4646,17 +5280,17 @@ modest_ui_actions_on_move_to (GtkAction *action,
                return;
 
        dst_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (tree_view));
-        /* 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);
@@ -4724,6 +5358,10 @@ modest_ui_actions_save_attachments (GtkAction *action,
                                    ModestWindow *window)
 {
        if (MODEST_IS_MSG_VIEW_WINDOW (window)) {
+
+               if (modest_platform_check_memory_low (MODEST_WINDOW(window)))
+                       return;
+
                modest_msg_view_window_save_attachments (MODEST_MSG_VIEW_WINDOW (window), NULL);
        } else {
                /* not supported window for this action */
@@ -4789,13 +5427,17 @@ retrieve_msg_contents_performer (gboolean canceled,
        TnyList *headers = TNY_LIST (user_data);
 
        if (err || canceled) {
-               /* Show an error ? */
+               if (err && is_memory_full_error (err)) {
+                       modest_platform_information_banner ((GtkWidget *) parent_window,
+                                                           NULL, dgettext("ke-recv",
+                                                                          "cerm_device_memory_full"));
+               }
                goto out;
        }
 
        /* Create mail operation */
        mail_op = modest_mail_operation_new_with_error_handling ((GObject *) parent_window,
-                                                                modest_ui_actions_get_msgs_full_error_handler, 
+                                                                modest_ui_actions_disk_operations_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);
@@ -4832,7 +5474,7 @@ modest_ui_actions_on_retrieve_msg_contents (GtkAction *action,
        g_object_unref (iter);
 
        /* Connect and perform the message retrieval */
-       modest_platform_connect_and_perform ((GtkWindow *) window, 
+       modest_platform_connect_and_perform ((GtkWindow *) window, TRUE,
                                             g_object_ref (account), 
                                             retrieve_msg_contents_performer, 
                                             g_object_ref (headers));
@@ -4843,13 +5485,31 @@ modest_ui_actions_on_retrieve_msg_contents (GtkAction *action,
 }
 
 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
 modest_ui_actions_on_email_menu_activated (GtkAction *action,
                                          ModestWindow *window)
 {
        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
@@ -4858,8 +5518,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
@@ -4868,8 +5528,8 @@ 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
@@ -4878,8 +5538,8 @@ modest_ui_actions_on_format_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
@@ -4888,8 +5548,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
@@ -4898,8 +5558,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
@@ -4908,8 +5568,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
@@ -4918,8 +5578,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
@@ -4928,17 +5588,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
@@ -4946,6 +5597,12 @@ modest_ui_actions_on_search_messages (GtkAction *action, ModestWindow *window)
 {
        g_return_if_fail (MODEST_IS_WINDOW (window));
 
+       /* we check for low-mem; in that case, show a warning, and don't allow
+        * searching
+        */
+       if (modest_platform_check_memory_low (window))
+               return;
+       
        modest_platform_show_search_messages (GTK_WINDOW (window));
 }
 
@@ -4953,6 +5610,15 @@ void
 modest_ui_actions_on_open_addressbook (GtkAction *action, ModestWindow *win)
 {
        g_return_if_fail (MODEST_IS_WINDOW (win));
+
+
+       /* we check for low-mem; in that case, show a warning, and don't allow
+        * for the addressbook
+        */
+       if (modest_platform_check_memory_low (win))
+               return;
+
+
        modest_platform_show_addressbook (GTK_WINDOW (win));
 }
 
@@ -4999,6 +5665,7 @@ on_send_receive_finished (ModestMailOperation  *mail_op,
           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);
@@ -5007,10 +5674,11 @@ on_send_receive_finished (ModestMailOperation  *mail_op,
                   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,
-                                              main_win);
+               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)
@@ -5029,46 +5697,49 @@ modest_ui_actions_on_send_queue_error_happened (TnySendQueue *self,
        TnyTransportAccount *server_account;
        gchar *message = NULL;
 
-       /* Don't show anything if the user cancelled something */
-       if (err->code == TNY_TRANSPORT_ACCOUNT_ERROR_SEND_USER_CANCEL)
+       /* Don't show anything if the user cancelled something or the send receive request is not
+        * interactive */
+       if (err->code == TNY_SYSTEM_ERROR_CANCEL ||
+           !modest_tny_send_queue_get_requested_send_receive (MODEST_TNY_SEND_QUEUE (self)))
                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);
+       if (server_account)
+               server_name = tny_account_get_hostname (TNY_ACCOUNT (server_account));          
+       else
+               g_return_if_reached ();
 
        /* Show the appropriate message text for the GError: */
        switch (err->code) {
-       case TNY_TRANSPORT_ACCOUNT_ERROR_SEND_HOST_LOOKUP_FAILED:
-               message = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), server_name);
-               break;
-       case TNY_TRANSPORT_ACCOUNT_ERROR_SEND_SERVICE_UNAVAILABLE:
+       case TNY_SERVICE_ERROR_CONNECT:
                message = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), server_name);
                break;
-       case TNY_TRANSPORT_ACCOUNT_ERROR_SEND_AUTHENTICATION_NOT_SUPPORTED:
+       case TNY_SERVICE_ERROR_AUTHENTICATE:
                message = g_strdup_printf (_("emev_ni_ui_smtp_authentication_fail_error"), server_name);
                break;
-       case TNY_TRANSPORT_ACCOUNT_ERROR_SEND:
-               message = g_strdup (_("emev_ib_ui_smtp_send_error"));
+       case TNY_SERVICE_ERROR_SEND:
+               message = g_strdup (dgettext("hildon-common-strings", "sfil_ib_unable_to_send"));
+               break;
+       case TNY_SERVICE_ERROR_UNAVAILABLE:
+               message = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), server_name);
                break;
        default:
-               g_return_if_reached ();
+               g_warning ("%s: unexpected ERROR %d",
+                          __FUNCTION__, err->code);
+               message = g_strdup (dgettext("hildon-common-strings", "sfil_ib_unable_to_send"));
+               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);
+       modest_platform_run_information_dialog (NULL, message, FALSE);
        g_free (message);
+       g_object_unref (server_account);
 }
 
 void
@@ -5112,6 +5783,10 @@ modest_ui_actions_on_send_queue_status_changed (ModestTnySendQueue *send_queue,
 #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:
@@ -5148,7 +5823,61 @@ modest_ui_actions_on_account_connection_error (GtkWindow *parent_window,
        }
 
        if (error_note) {
-               modest_platform_run_information_dialog (parent_window, error_note);
+               modest_platform_run_information_dialog (parent_window, error_note, FALSE);
                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) {
+               gchar *subject;
+               subject = tny_header_dup_subject (header);
+               msg = g_strdup_printf (_("emev_ni_ui_imap_message_not_available_in_server"), 
+                                      subject);
+               g_free (subject);
+       } 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;
+}