Removed an old comment
[modest] / src / modest-ui-actions.c
index 4a9c06f..11be20e 100644 (file)
@@ -154,10 +154,7 @@ 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 msgs_already_deleted_from_server ( TnyList *headers,
-                                                   const TnyFolderStore *src_folder);
+static gboolean remote_folder_is_pop (TnyFolderStore *folder);
 
 static void     do_create_folder (GtkWindow *window, 
                                  TnyFolderStore *parent_folder, 
@@ -165,55 +162,31 @@ static void     do_create_folder (GtkWindow *window,
 
 static GtkWidget* get_folder_view_from_move_to_dialog (GtkWidget *move_to_dialog);
 
+static TnyAccount *get_account_from_folder_store (TnyFolderStore *folder_store);
+
+static void transfer_messages_helper (GtkWindow *win,
+                                     TnyFolder *src_folder,
+                                     TnyList *headers,
+                                     TnyFolder *dst_folder);
 
 /*
  * This function checks whether a TnyFolderStore is a pop account
  */
 static gboolean
-remote_folder_is_pop (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.
@@ -395,11 +368,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) &&
-                  !modest_msg_view_window_select_previous_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);       
        }
@@ -598,8 +568,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)
 {      
@@ -735,7 +703,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;
@@ -790,6 +759,8 @@ modest_ui_actions_compose_msg(ModestWindow *win,
                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);
+
        gtk_widget_show_all (GTK_WIDGET (msg_win));
 
 cleanup:
@@ -811,26 +782,7 @@ 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);
-}
-
-void
-modest_ui_actions_on_new_msg_or_folder (GtkAction *action, ModestWindow *win)
-{
-       g_return_if_fail (MODEST_IS_WINDOW (win));
-
-       /* Check first if the folder view has the focus */
-       if (MODEST_IS_MAIN_WINDOW (win)) {
-               GtkWidget *w;
-               w = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
-                                                        MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
-               if (gtk_widget_is_focus (w)) {
-                       modest_ui_actions_on_new_folder (action, MODEST_MAIN_WINDOW(win));
-                       return;
-               }
-       }
-
-       modest_ui_actions_on_new_msg (action, win);
+       modest_ui_actions_compose_msg(win, NULL, NULL, NULL, NULL, NULL, NULL, FALSE);
 }
 
 
@@ -855,6 +807,28 @@ modest_ui_actions_msg_retrieval_check (ModestMailOperation *mail_op,
        return TRUE;
 }
 
+typedef struct {
+       guint idle_handler;
+       gchar *message;
+       GtkWidget *banner;
+} OpenMsgBannerInfo;
+
+gboolean
+open_msg_banner_idle (gpointer userdata)
+{
+       OpenMsgBannerInfo *banner_info = (OpenMsgBannerInfo *) userdata;
+
+       gdk_threads_enter ();
+       banner_info->idle_handler = 0;
+       banner_info->banner = modest_platform_animation_banner (NULL, NULL, banner_info->message);
+       g_object_ref (banner_info->banner);
+       
+       gdk_threads_leave ();
+
+       return FALSE;
+       
+}
+
 static void
 open_msg_cb (ModestMailOperation *mail_op, 
             TnyHeader *header,  
@@ -870,12 +844,13 @@ open_msg_cb (ModestMailOperation *mail_op,
        gchar *account = NULL;
        TnyFolder *folder;
        gboolean open_in_editor = FALSE;
+       OpenMsgBannerInfo *banner_info = (OpenMsgBannerInfo *) user_data;
        
        /* Do nothing if there was any problem with the mail
           operation. The error will be shown by the error_handler of
           the mail operation */
        if (!modest_ui_actions_msg_retrieval_check (mail_op, header, msg))
-               return;
+               goto banner_cleanup;
 
        parent_win = (ModestWindow *) modest_mail_operation_get_source (mail_op);
        folder = tny_header_get_folder (header);
@@ -956,9 +931,6 @@ open_msg_cb (ModestMailOperation *mail_op,
                win = modest_msg_edit_window_new (msg, account, TRUE);
 
 
-               /* Show banner */
-               modest_platform_information_banner_with_timeout
-                       (NULL, NULL, _("mail_ib_opening_draft_message"), 1200);
 
        } else {
                gchar *uid = modest_tny_folder_get_header_unique_id (header);
@@ -1013,6 +985,20 @@ cleanup:
        g_free(account);
        g_object_unref (parent_win);
        g_object_unref (folder);
+banner_cleanup:
+       if (banner_info) {
+               g_free (banner_info->message);
+               if (banner_info->idle_handler > 0) {
+                       g_source_remove (banner_info->idle_handler);
+                       banner_info->idle_handler = 0;
+               }
+               if (banner_info->banner != NULL) {
+                       gtk_widget_destroy (banner_info->banner);
+                       g_object_unref (banner_info->banner);
+                       banner_info->banner = NULL;
+               }
+               g_slice_free (OpenMsgBannerInfo, banner_info);
+       }
 }
 
 void
@@ -1021,13 +1007,25 @@ modest_ui_actions_get_msgs_full_error_handler (ModestMailOperation *mail_op,
 {
        const GError *error;
        GObject *win = NULL;
-       const gchar *err_msg = (const gchar *) user_data;
 
        win = modest_mail_operation_get_source (mail_op);
        error = modest_mail_operation_get_error (mail_op);
 
        /* Show error */
-       modest_platform_run_information_dialog ((GtkWindow *) win, err_msg);
+       if (error->code == TNY_SYSTEM_ERROR_MEMORY ||
+           error->code == TNY_IO_ERROR_WRITE ||
+           error->code == TNY_IO_ERROR_READ) {
+               ModestMailOperationStatus st = modest_mail_operation_get_status (mail_op);
+               /* If the mail op has been cancelled then it's not an error: don't show any message */
+               if (st != MODEST_MAIL_OPERATION_STATUS_CANCELED) {
+                       modest_platform_information_banner ((GtkWidget *) win,
+                                                           NULL, dgettext("ke-recv",
+                                                                          "cerm_device_memory_full"));
+               }
+       } else if (user_data) {
+               modest_platform_information_banner ((GtkWidget *) win, 
+                                                   NULL, user_data);
+       }
 
        if (win)
                g_object_unref (win);
@@ -1077,6 +1075,8 @@ open_msgs_performer(gboolean canceled,
        ModestTransportStoreProtocol proto;
        TnyList *not_opened_headers;
        TnyConnectionStatus status;
+       gboolean show_open_draft = FALSE;
+       OpenMsgBannerInfo *banner_info = NULL;
 
        not_opened_headers = TNY_LIST (user_data);
 
@@ -1108,6 +1108,19 @@ open_msgs_performer(gboolean canceled,
                        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 {
@@ -1121,11 +1134,18 @@ open_msgs_performer(gboolean canceled,
                                                               error_msg, g_free);
        modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
                                         mail_op);
-               
+
+       if (show_open_draft) {
+               banner_info = g_slice_new (OpenMsgBannerInfo);
+               banner_info->message = g_strdup (_("mail_ib_opening_draft_message"));
+               banner_info->banner = NULL;
+               banner_info->idle_handler = g_timeout_add (500, open_msg_banner_idle, banner_info);
+       }
+
        modest_mail_operation_get_msgs_full (mail_op,
                                             not_opened_headers,
                                             open_msg_cb,
-                                            NULL,
+                                            banner_info,
                                             NULL);
 
        /* Frees */
@@ -1327,19 +1347,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:
@@ -1830,9 +1854,12 @@ modest_ui_actions_do_cancel_send (const gchar *account_name,
                             MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
                             "modest: could not find send queue for account\n");
        } else {
-               /* Keeep messages in outbox folder */
-               tny_send_queue_cancel (send_queue, FALSE, &error);
-       }       
+               /* Cancel the current send */
+               tny_account_cancel (TNY_ACCOUNT (transport_account));
+
+               /* Suspend all pending messages */
+               tny_send_queue_cancel (send_queue, TNY_SEND_QUEUE_CANCEL_ACTION_SUSPEND, &error);
+       }
 
  frees:
        if (transport_account != NULL) 
@@ -1998,6 +2025,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));
 }
 
@@ -2282,7 +2310,7 @@ on_save_to_drafts_cb (ModestMailOperation *mail_op,
        g_object_unref(edit_window);
 }
 
-void
+gboolean
 modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edit_window)
 {
        TnyTransportAccount *transport_account;
@@ -2290,12 +2318,32 @@ 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;
+       }
+
        account_name = g_strdup (data->account_name);
        account_mgr = modest_runtime_get_account_mgr();
        if (!account_name)
@@ -2305,7 +2353,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)) {
@@ -2321,7 +2369,7 @@ 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);
 
@@ -2344,18 +2392,28 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi
                                              data->priority_flags,
                                              on_save_to_drafts_cb,
                                              g_object_ref(edit_window));
-       info_text = g_strdup_printf (_("mail_va_saved_to_drafts"), _("mcen_me_folder_drafts"));
-       modest_platform_information_banner (NULL, NULL, info_text);
+
+       /* 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
@@ -2372,9 +2430,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) {
@@ -2393,24 +2449,42 @@ 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;
+       }
+
        ModestAccountMgr *account_mgr = modest_runtime_get_account_mgr();
        gchar *account_name = g_strdup (data->account_name);
        if (!account_name)
@@ -2423,7 +2497,7 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
                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;
                }
        }
        
@@ -2438,7 +2512,7 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
                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);
@@ -2464,6 +2538,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);
@@ -2472,10 +2555,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 
@@ -2912,6 +3000,7 @@ on_delete_folder_cb (gboolean canceled,
        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 (
@@ -3005,26 +3094,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,
@@ -3035,6 +3104,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)
@@ -3152,49 +3222,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 {
+                       modest_platform_information_banner(GTK_WIDGET (dialog), 
+                                                          NULL, _("mail_ib_login_cancelled"));
+                       completed = TRUE;
+                       if (username)
+                               *username = NULL;                       
+                       if (password)
+                               *password = NULL;                       
+                       if (cancel)
+                               *cancel   = TRUE;
                }
-               
-               if (cancel)
-                       *cancel   = FALSE;
-                       
-       } else {
-               show_error(GTK_WIDGET (main_window), _("mail_ib_login_cancelled"));
-               
-               if (username)
-                       *username = NULL;
-                       
-               if (password)
-                       *password = NULL;
-                       
-               if (cancel)
-                       *cancel   = TRUE;
        }
 
 /* This is not in the Maemo UI spec:
@@ -3226,9 +3305,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));
@@ -3268,7 +3349,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)) {
@@ -3282,9 +3366,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));
@@ -3915,9 +4001,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)
@@ -3951,6 +4039,7 @@ on_move_to_dialog_folder_selection_changed (ModestFolderView* self,
                        new_sensitive = (proto != MODEST_PROTOCOL_STORE_POP);
                }
                g_object_unref (local_account);
+               g_object_unref (mmc_account);
        }
 
        /* Check the target folder rules */
@@ -3999,25 +4088,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:
@@ -4259,11 +4359,8 @@ move_to_cb (ModestMailOperation *mail_op,
                if (MODEST_IS_MSG_VIEW_WINDOW (object)) {
                        ModestMsgViewWindow *self = MODEST_MSG_VIEW_WINDOW (object);
 
-                       if (modest_msg_view_window_last_message_selected (self) &&
-                           modest_msg_view_window_first_message_selected (self)) {
-                               modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (self));
-                       } else if (!modest_msg_view_window_select_next_message (self) &&
-                                  !modest_msg_view_window_select_previous_message (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));
                        }
@@ -4294,7 +4391,17 @@ 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
@@ -4422,6 +4529,7 @@ open_msg_for_purge_cb (ModestMailOperation *mail_op,
 
                                tny_iterator_next (iter);
                        }
+                       g_object_unref (iter);
                        
                        tny_msg_rewrite_cache (msg);
                }
@@ -4429,7 +4537,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);
 
@@ -4442,7 +4549,6 @@ modest_ui_actions_on_main_window_remove_attachments (GtkAction *action,
 {
        GtkWidget *header_view;
        TnyList *header_list;
-       TnyIterator *iter;
        TnyHeader *header;
        TnyHeaderFlags flags;
        ModestWindow *msg_view_window =  NULL;
@@ -4460,7 +4566,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
@@ -4500,14 +4606,97 @@ modest_ui_actions_on_main_window_remove_attachments (GtkAction *action,
                g_object_unref (header_list);
 }
 
+/*
+ * Checks if we need a connection to do the transfer and if the user
+ * wants to connect to complete it
+ */
+void
+modest_ui_actions_xfer_messages_check (GtkWindow *parent_window,
+                                      TnyFolderStore *src_folder,
+                                      TnyList *headers,
+                                      TnyFolder *dst_folder,
+                                      gboolean delete_originals,
+                                      gboolean *need_connection,
+                                      gboolean *do_xfer)
+{
+       TnyAccount *src_account;
+       gint uncached_msgs = 0;
+
+       uncached_msgs = header_list_count_uncached_msgs (headers);
+
+       /* We don't need any further check if
+        *
+        * 1- the source folder is local OR
+        * 2- the device is already online
+        */
+       if (!modest_tny_folder_store_is_remote (src_folder) ||
+           tny_device_is_online (modest_runtime_get_device())) {
+               *need_connection = FALSE;
+               *do_xfer = TRUE;
+               return;
+       }
+
+       /* We must ask for a connection when
+        *
+        *   - the message(s) is not already cached   OR 
+        *   - the message(s) is cached but the leave_on_server setting
+        * is FALSE (because we need to sync the source folder to
+        * delete the message from the server (for IMAP we could do it
+        * offline, it'll take place the next time we get a
+        * connection)
+        */
+       src_account = get_account_from_folder_store (src_folder);
+       if (uncached_msgs > 0) {
+               guint num_headers;
+               const gchar *msg;
+
+               *need_connection = TRUE;
+               num_headers = tny_list_get_length (headers);
+               msg = ngettext ("mcen_nc_get_msg", "mcen_nc_get_msgs", num_headers);
+
+               if (modest_platform_run_confirmation_dialog (parent_window, msg) ==
+                   GTK_RESPONSE_CANCEL) {
+                       *do_xfer = FALSE;
+               } else {
+                       *do_xfer = TRUE;
+               }
+       } else {
+               /* The transfer is possible and the user wants to */
+               *do_xfer = TRUE;
+
+               if (remote_folder_is_pop (src_folder) && delete_originals) {
+                       const gchar *account_name;
+                       gboolean leave_on_server;
+                       
+                       account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (src_account);
+                       leave_on_server = modest_account_mgr_get_leave_on_server (modest_runtime_get_account_mgr (),
+                                                                                 account_name);
+                       
+                       if (leave_on_server == TRUE) {
+                               *need_connection = FALSE;
+                       } else {
+                               *need_connection = TRUE;
+                       }
+               } else {
+                       *need_connection = FALSE;
+               }
+       }
+
+       /* Frees */
+       g_object_unref (src_account);
+}
+
+
 /**
  * Utility function that transfer messages from both the main window
  * and the msg view window when using the "Move to" dialog
  */
 static void
-xfer_messages_from_move_to_cb  (gboolean canceled, GError *err,
-                               GtkWindow *parent_window, 
-                               TnyAccount *account, gpointer user_data)
+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);
@@ -4517,6 +4706,8 @@ xfer_messages_from_move_to_cb  (gboolean canceled, GError *err,
        gboolean dst_is_pop = FALSE;
 
        if (canceled || err) {
+               /* Show the proper error message */
+               modest_ui_actions_on_account_connection_error (parent_window, account);
                g_object_unref (dst_folder);
                return;
        }
@@ -4584,36 +4775,6 @@ xfer_messages_from_move_to_cb  (gboolean canceled, GError *err,
 }
 
 typedef struct {
-       TnyAccount *dst_account;
-       ModestConnectedPerformer callback;
-       gpointer data;
-} DoubleConnectionInfo;
-
-static void
-src_account_connect_performer (gboolean canceled, 
-                              GError *err,
-                              GtkWindow *parent_window, 
-                              TnyAccount *src_account, 
-                              gpointer user_data)
-{
-       DoubleConnectionInfo *info = (DoubleConnectionInfo *) user_data;
-
-       if (canceled || err) {
-               /* If there was any error call the user callback */
-               info->callback (canceled, err, parent_window, src_account, info->data);
-       } else {
-               /* Connect the destination account */
-               modest_platform_connect_if_remote_and_perform (parent_window, TRUE, 
-                                                              TNY_FOLDER_STORE (info->dst_account),
-                                                              info->callback, info->data);
-       }
-
-       /* Free the info object */
-       g_object_unref (info->dst_account);
-       g_slice_free (DoubleConnectionInfo, info);
-}
-
-typedef struct {
        TnyFolder *src_folder;
        TnyFolderStore *dst_folder;
        gboolean delete_original;
@@ -4686,6 +4847,15 @@ on_move_folder_cb (gboolean canceled, GError *err, GtkWindow *parent_window,
        g_free (user_data);
 }
 
+static TnyAccount *
+get_account_from_folder_store (TnyFolderStore *folder_store) 
+{
+       if (TNY_IS_ACCOUNT (folder_store))
+               return g_object_ref (folder_store);
+       else
+               return tny_folder_get_account (TNY_FOLDER (folder_store));
+}
+
 /*
  * UI handler for the "Move to" action when invoked from the
  * ModestMainWindow
@@ -4697,8 +4867,7 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action,
                                          ModestMainWindow *win)
 {
        ModestHeaderView *header_view = 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));
 
@@ -4714,79 +4883,84 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action,
 
                /* 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)) {
                        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) {
+               if (do_xfer) {                  
                        MoveFolderInfo *info = g_new0 (MoveFolderInfo, 1);
-                       info->src_folder = TNY_FOLDER (src_folder);
-                       info->dst_folder = dst_folder;
+                       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;
-                       g_object_ref (G_OBJECT (info->src_folder));
-                       g_object_ref (G_OBJECT (info->dst_folder));
-                       modest_platform_connect_if_remote_and_perform(GTK_WINDOW (win), TRUE,
-                                   TNY_FOLDER_STORE (dst_folder), on_move_folder_cb, info);
+
+                       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;
+               TnyList *headers;
 
-               /* Show an error when trying to move msgs to an account */      
-               if (!TNY_IS_FOLDER (dst_folder)) {
-                       modest_platform_information_banner (GTK_WIDGET (win),
-                                                           NULL,
-                                                           _CS("ckdg_ib_unable_to_move_to_current_location"));
-                       goto free;
-               }
+               headers = modest_header_view_get_selected_headers(header_view);
 
-               /* 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);
-                               GtkResponseType response;
+               /* Transfer the messages */
+               transfer_messages_helper (GTK_WINDOW (win), TNY_FOLDER (src_folder), 
+                                         headers, TNY_FOLDER (dst_folder));
 
-                               response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
-                                                                                   ngettext("mcen_nc_get_msg",
-                                                                                            "mcen_nc_get_msgs",
-                                                                                            num_headers));
-                               if (response == GTK_RESPONSE_CANCEL)
-                                       do_xfer = FALSE;
-                               
-                               g_object_unref (account);
-                       }
-                       g_object_unref(headers);
-               }
-               if (do_xfer) /* Transfer messages */ {
-                       DoubleConnectionInfo *info = g_slice_new (DoubleConnectionInfo);
-                       info->callback = xfer_messages_from_move_to_cb;
-                       info->dst_account = tny_folder_get_account (TNY_FOLDER (dst_folder));
-                       info->data = g_object_ref (dst_folder);
-
-                       modest_platform_connect_if_remote_and_perform(GTK_WINDOW (win), TRUE,
-                                                                     TNY_FOLDER_STORE (src_folder), 
-                                                                     src_account_connect_performer, 
-                                                                     info);
-               }
+               g_object_unref (headers);
        }
 
- free:
-       if (src_folder)
-               g_object_unref (src_folder);
+       /* Frees */
+       g_object_unref (src_folder);
 }
 
 
+static void
+transfer_messages_helper (GtkWindow *win,
+                         TnyFolder *src_folder,
+                         TnyList *headers,
+                         TnyFolder *dst_folder)
+{
+       gboolean need_connection = TRUE;
+       gboolean do_xfer = TRUE;
+       
+       modest_ui_actions_xfer_messages_check (win, TNY_FOLDER_STORE (src_folder), 
+                                              headers, TNY_FOLDER (dst_folder),
+                                              TRUE, &need_connection, 
+                                              &do_xfer);
+
+       /* If we don't want to transfer just return */
+       if (!do_xfer)
+               return;
+
+       if (need_connection) {
+               DoubleConnectionInfo *connect_info = g_slice_new (DoubleConnectionInfo);
+               connect_info->callback = xfer_messages_performer;
+               connect_info->dst_account = tny_folder_get_account (TNY_FOLDER (dst_folder));
+               connect_info->data = g_object_ref (dst_folder);
+               
+               modest_platform_double_connect_and_perform(GTK_WINDOW (win), TRUE,
+                                                          TNY_FOLDER_STORE (src_folder), 
+                                                          connect_info);
+       } else {
+               TnyAccount *src_account = get_account_from_folder_store (TNY_FOLDER_STORE (src_folder));
+               xfer_messages_performer (FALSE, NULL, GTK_WINDOW (win),
+                                        src_account, 
+                                        g_object_ref (dst_folder));
+               g_object_unref (src_account);
+       }
+}
+
 /*
  * UI handler for the "Move to" action when invoked from the
  * ModestMsgViewWindow
@@ -4796,36 +4970,25 @@ modest_ui_actions_on_msg_view_window_move_to (GtkAction *action,
                                              TnyFolderStore *dst_folder,
                                              ModestMsgViewWindow *win)
 {
+       TnyList *headers = NULL;
        TnyHeader *header = NULL;
        TnyFolder *src_folder = 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) {
-               g_object_ref (dst_folder);
-               modest_platform_connect_if_remote_and_perform(GTK_WINDOW (win), TRUE,
-                               TNY_FOLDER_STORE (dst_folder), xfer_messages_from_move_to_cb, dst_folder);
-        }
-       g_object_unref (account);
-       g_object_unref (src_folder);
+       /* Transfer the messages */
+       transfer_messages_helper (GTK_WINDOW (win), src_folder, headers, 
+                                 TNY_FOLDER (dst_folder));
+
+       /* Frees */
+       g_object_unref (header);
+       g_object_unref (headers);
 }
 
 void 
@@ -5287,6 +5450,9 @@ modest_ui_actions_on_send_queue_error_happened (TnySendQueue *self,
        case TNY_SERVICE_ERROR_SEND:
                message = g_strdup (_("emev_ib_ui_smtp_send_error"));
                break;
+       case TNY_SERVICE_ERROR_UNAVAILABLE:
+               message = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), server_name);
+               break;
        default:
                g_warning ("%s: unexpected ERROR %d",
                           __FUNCTION__, err->code);
@@ -5343,6 +5509,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:
@@ -5383,3 +5553,54 @@ modest_ui_actions_on_account_connection_error (GtkWindow *parent_window,
                g_free (error_note);
        }
 }
+
+gchar *
+modest_ui_actions_get_msg_already_deleted_error_msg (ModestWindow *win)
+{
+       gchar *msg = NULL;
+       TnyFolderStore *folder = NULL;
+       TnyAccount *account = NULL;
+       ModestTransportStoreProtocol proto;
+       TnyHeader *header = NULL;
+
+       if (MODEST_IS_MAIN_WINDOW (win)) {
+               GtkWidget *header_view;
+               TnyList* headers = NULL;
+               TnyIterator *iter;
+               header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win),
+                                                                  MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
+               headers = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW (header_view));
+               if (!headers || tny_list_get_length (headers) == 0) {
+                       if (headers)
+                               g_object_unref (headers);
+                       return NULL;
+               }
+               iter = tny_list_create_iterator (headers);
+               header = TNY_HEADER (tny_iterator_get_current (iter));
+               folder = TNY_FOLDER_STORE (tny_header_get_folder (header));
+               g_object_unref (iter);
+               g_object_unref (headers);
+       } else if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
+               header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win));
+               folder = TNY_FOLDER_STORE (tny_header_get_folder (header));
+       }
+
+       /* Get the account type */
+       account = tny_folder_get_account (TNY_FOLDER (folder));
+       proto = modest_protocol_info_get_transport_store_protocol (tny_account_get_proto (account));
+       if (proto == MODEST_PROTOCOL_STORE_POP) {
+               msg = g_strdup (_("emev_ni_ui_pop3_msg_recv_error"));
+       } else if (proto == MODEST_PROTOCOL_STORE_IMAP) {
+               msg = g_strdup_printf (_("emev_ni_ui_imap_message_not_available_in_server"), 
+                                      tny_header_get_subject (header));
+       } else {
+               msg = g_strdup_printf (_("mail_ni_ui_folder_get_msg_folder_error"));
+       }
+
+       /* Frees */
+       g_object_unref (account);
+       g_object_unref (folder);
+       g_object_unref (header);
+
+       return msg;
+}