* Review fucntion 'has_retrieved_msgs' implementation
[modest] / src / modest-ui-actions.c
index 8fce36c..41aa482 100644 (file)
@@ -45,6 +45,9 @@
 #include "modest-tny-platform-factory.h"
 #include "modest-platform.h"
 #include <tny-mime-part.h>
+#include <tny-camel-folder.h>
+#include <tny-camel-imap-folder.h>
+#include <tny-camel-pop-folder.h>
 
 #ifdef MODEST_PLATFORM_MAEMO
 #include "maemo/modest-osso-state-saving.h"
@@ -141,15 +144,27 @@ download_uncached_messages (TnyList *header_list, GtkWindow *win,
                            gboolean reply_fwd);
 
 
+static gint
+msgs_move_to_confirmation (GtkWindow *win,
+                          TnyFolder *dest_folder,
+                          gboolean delete,
+                          TnyList *headers);
+
+
 static void
 run_account_setup_wizard (ModestWindow *win)
 {
        ModestEasysetupWizardDialog *wizard;
-
+       
        g_return_if_fail (MODEST_IS_WINDOW(win));
        
        wizard = modest_easysetup_wizard_dialog_new ();
        gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (win));
+       
+       /* Don't make this a modal window, because secondary windows will then 
+        * be unusable, freezing the UI: */
+       /* gtk_window_set_modal (GTK_WINDOW (wizard), TRUE); */
+       
        gtk_dialog_run (GTK_DIALOG (wizard));
        gtk_widget_destroy (GTK_WIDGET (wizard));
 }
@@ -176,6 +191,8 @@ modest_ui_actions_on_about (GtkAction *action, ModestWindow *win)
                                         "uses the tinymail email framework written by Philip van Hoof"));
        gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG(about), authors);
        gtk_about_dialog_set_website (GTK_ABOUT_DIALOG(about), "http://modest.garage.maemo.org");
+       gtk_window_set_transient_for (GTK_WINDOW (about), GTK_WINDOW (win));
+       gtk_window_set_modal (GTK_WINDOW (about), TRUE);
        
        gtk_dialog_run (GTK_DIALOG (about));
        gtk_widget_destroy(about);
@@ -269,10 +286,6 @@ headers_action_delete (TnyHeader *header,
                       gpointer user_data)
 {
        modest_do_message_delete (header, win);
-
-/* refilter treemodel to hide marked-as-deleted rows */
-/*     if (MODEST_IS_HEADER_VIEW (user_data)) */
-/*             modest_header_view_refilter (MODEST_HEADER_VIEW (user_data)); */
 }
 
 /** After deleing a message that is currently visible in a window, 
@@ -285,7 +298,10 @@ void modest_ui_actions_refresh_message_window_after_delete (ModestMsgViewWindow*
                modest_msg_view_window_first_message_selected (win)) {
                modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (win));
        } else {
-               modest_msg_view_window_select_next_message (win);
+               if (!modest_msg_view_window_select_next_message (win)) {
+                       gboolean ret_value;
+                       g_signal_emit_by_name (G_OBJECT (win), "delete-event", NULL, &ret_value);
+               }
        }
 }
 
@@ -312,9 +328,11 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win)
                        return;
        }
        
+       /* Get the headers, either from the header view (if win is the main window),
+        * or from the message view window: */
        header_list = get_selected_headers (win);
        if (!header_list) return;
-
+                       
        /* Check if any of the headers are already opened, or in the process of being opened */
        if (MODEST_IS_MAIN_WINDOW (win)) {
                gboolean found;
@@ -375,6 +393,8 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win)
                GList *sel_list = NULL, *tmp = NULL;
                GtkTreeRowReference *row_reference = NULL;
                GtkTreePath *next_path = NULL;
+               TnyFolder *folder = NULL;
+               GError *err = NULL;
 
                /* Find last selected row */                    
                if (MODEST_IS_MAIN_WINDOW (win)) {
@@ -394,6 +414,9 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win)
                /* Remove each header. If it's a view window header_view == NULL */
                do_headers_action (win, headers_action_delete, header_view);
 
+               /* refresh the header view (removing marked-as-deleted)*/
+               modest_header_view_refilter (MODEST_HEADER_VIEW(header_view)); 
+               
                if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
                        modest_ui_actions_refresh_message_window_after_delete (MODEST_MSG_VIEW_WINDOW (win));
                        
@@ -415,6 +438,30 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win)
                                gtk_tree_row_reference_free (row_reference);
                }
 
+               /* Get folder from first header and sync it */
+               iter = tny_list_create_iterator (header_list);
+               header = TNY_HEADER (tny_iterator_get_current (iter));
+               folder = tny_header_get_folder (header);
+               if (TNY_IS_CAMEL_IMAP_FOLDER (folder))
+/*                     tny_folder_sync_async(folder, FALSE, NULL, NULL, NULL); /\* FALSE --> don't expunge *\/ */
+                       tny_folder_sync (folder, FALSE, &err); /* FALSE --> don't expunge */
+/*             else if (TNY_IS_CAMEL_POP_FOLDER (folder)) */
+/*                     tny_folder_sync_async(folder, FALSE, NULL, NULL, NULL); /\* TRUE --> dont expunge *\/ */
+/*                     tny_folder_sync (folder, TRUE, &err); /\* TRUE --> expunge *\/ */
+               else
+                       /* local folders */
+/*                     tny_folder_sync_async(folder, TRUE, NULL, NULL, NULL); /\* TRUE --> expunge *\/ */
+                       tny_folder_sync (folder, TRUE, &err); /* TRUE --> expunge */
+
+               if (err != NULL) {
+                       printf ("DEBUG: %s: Error: code=%d, text=%s\n", __FUNCTION__, err->code, err->message);
+                       g_error_free(err);
+               }
+
+               g_object_unref (header);
+               g_object_unref (iter);
+               g_object_unref (folder);
+               
                /* Update toolbar dimming state */
                modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window));
 
@@ -526,6 +573,11 @@ modest_ui_actions_on_accounts (GtkAction *action, ModestWindow *win)
        } else  {
                /* Show the list of accounts: */
                GtkDialog *account_win = GTK_DIALOG(modest_account_view_window_new ());
+               gtk_window_set_transient_for (GTK_WINDOW (account_win), GTK_WINDOW (win));
+               
+               /* Don't make this a modal window, because secondary windows will then 
+                * be unusable, freezing the UI: */
+               /* gtk_window_set_modal (GTK_WINDOW (account_win), TRUE); */
                modest_maemo_show_dialog_and_forget (GTK_WINDOW (win), account_win); 
        }
 #else
@@ -673,7 +725,7 @@ modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win)
 
        /* Create and register edit window */
        /* This is destroyed by TOOD. */
-       msg_win = modest_msg_edit_window_new (msg, account_name);
+       msg_win = modest_msg_edit_window_new (msg, account_name, FALSE);
        mgr = modest_runtime_get_window_mgr ();
        modest_window_mgr_register_window (mgr, msg_win);
 
@@ -761,7 +813,8 @@ open_msg_cb (ModestMailOperation *mail_op,
                        run_account_setup_wizard(parent_win);
                        goto cleanup;
                }
-               win = modest_msg_edit_window_new (msg, account);
+               win = modest_msg_edit_window_new (msg, account, TRUE);
+               
        } else {
                gchar *uid = modest_tny_folder_get_header_unique_id (header);
                
@@ -1031,13 +1084,13 @@ reply_forward_cb (ModestMailOperation *mail_op,
        switch (rf_helper->action) {
        case ACTION_REPLY:
                new_msg = 
-                       modest_tny_msg_create_reply_msg (msg,  from, signature,
+                       modest_tny_msg_create_reply_msg (msg, header, from, signature,
                                                         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, from, signature, rf_helper->reply_forward_type,
+                       modest_tny_msg_create_reply_msg (msg, header, from, signature, rf_helper->reply_forward_type,
                                                         MODEST_TNY_MSG_REPLY_MODE_ALL);
                edit_type = MODEST_EDIT_TYPE_REPLY;
                break;
@@ -1067,7 +1120,7 @@ reply_forward_cb (ModestMailOperation *mail_op,
        }
 
        /* Create and register the windows */
-       msg_win = modest_msg_edit_window_new (new_msg, rf_helper->account_name);
+       msg_win = modest_msg_edit_window_new (new_msg, rf_helper->account_name, FALSE);
        mgr = modest_runtime_get_window_mgr ();
        modest_window_mgr_register_window (mgr, msg_win);
 
@@ -1089,7 +1142,6 @@ cleanup:
        if (account)
                g_object_unref (G_OBJECT (account));
 /*     g_object_unref (msg); */
-       g_object_unref (header);
        free_reply_forward_helper (rf_helper);
 }
 
@@ -1160,7 +1212,8 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
        TnyList *header_list = NULL;
        ReplyForwardHelper *rf_helper = NULL;
        guint reply_forward_type;
-       gboolean continue_download;
+       gboolean continue_download = TRUE;
+       gboolean do_retrieve = TRUE;
        
        g_return_if_fail (MODEST_IS_WINDOW(win));
 
@@ -1174,17 +1227,20 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
        if (!header_list)
                return;
 
+       reply_forward_type = 
+               modest_conf_get_int (modest_runtime_get_conf (),
+                                    (action == ACTION_FORWARD) ? MODEST_CONF_FORWARD_TYPE : MODEST_CONF_REPLY_TYPE,
+                                    NULL);
+
        /* Check that the messages have been previously downloaded */
-       continue_download = download_uncached_messages (header_list, GTK_WINDOW (win), TRUE);
+       do_retrieve = (action == ACTION_FORWARD) || (reply_forward_type != MODEST_TNY_MSG_REPLY_TYPE_CITE);
+       if (do_retrieve)
+               continue_download = download_uncached_messages (header_list, GTK_WINDOW (win), TRUE);
        if (!continue_download) {
                g_object_unref (header_list);
                return;
        }
        
-       reply_forward_type = 
-               modest_conf_get_int (modest_runtime_get_conf (),
-                                    (action == ACTION_FORWARD) ? MODEST_CONF_FORWARD_TYPE : MODEST_CONF_REPLY_TYPE,
-                                    NULL);
        /* We assume that we can only select messages of the
           same folder and that we reply all of them from the
           same account. In fact the interface currently only
@@ -1212,46 +1268,49 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
                if (!msg || !header) {
                        if (msg)
                                g_object_unref (msg);
-                       if (header)
-                               g_object_unref (header);
                        g_printerr ("modest: no message found\n");
                        return;
                } else {
                        reply_forward_cb (NULL, header, msg, rf_helper);
                }
+               if (header)
+                       g_object_unref (header);
        } else {
                TnyHeader *header;
                TnyIterator *iter;
 
-               /* Retrieve messages */
-               mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, 
-                                                                        G_OBJECT(win),
-                                                                        modest_ui_actions_get_msgs_full_error_handler, 
-                                                                        NULL);
-               modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
-
                /* Only reply/forward to one message */
                iter = tny_list_create_iterator (header_list);
                header = TNY_HEADER (tny_iterator_get_current (iter));
                g_object_unref (iter);
 
                if (header) {
-                       modest_mail_operation_get_msg (mail_op,
-                                              header,
-                                              reply_forward_cb,
-                                              rf_helper);
+                       /* Retrieve messages */
+                       if (do_retrieve) {
+                               mail_op = modest_mail_operation_new_with_error_handling (
+                                       MODEST_MAIL_OPERATION_TYPE_RECEIVE, 
+                                       G_OBJECT(win),
+                                       modest_ui_actions_get_msgs_full_error_handler, 
+                                       NULL);
+                               modest_mail_operation_queue_add (
+                                       modest_runtime_get_mail_operation_queue (), mail_op);
+                               
+                               modest_mail_operation_get_msg (mail_op,
+                                                              header,
+                                                              reply_forward_cb,
+                                                              rf_helper);
+                               /* Clean */
+                               g_object_unref(mail_op);
+                       } else {
+                               /* we put a ref here to prevent double unref as the reply
+                                * forward callback unrefs the header at its end */
+                               reply_forward_cb (NULL, header, NULL, rf_helper);
+                       }
 
-/*                     modest_mail_operation_get_msgs_full (mail_op,  */
-/*                                                  header_list,  */
-/*                                                  reply_forward_cb,  */
-/*                                                  rf_helper,  */
-/*                                                  free_reply_forward_helper); */
 
                        g_object_unref (header);
                }
 
-               /* Clean */
-               g_object_unref(mail_op);
        }
 
        /* Free */
@@ -1601,6 +1660,20 @@ modest_ui_actions_on_header_selected (ModestHeaderView *header_view,
        g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
        g_return_if_fail (MODEST_IS_HEADER_VIEW (header_view));
        
+       /* in the case the folder is empty, show the empty folder message and focus
+        * folder view */
+       if (!header && gtk_widget_is_focus (GTK_WIDGET (header_view))) {
+               if (modest_header_view_is_empty (header_view)) {
+                       TnyFolder *folder = modest_header_view_get_folder (header_view);
+                       GtkWidget *folder_view = 
+                               modest_main_window_get_child_widget (main_window,
+                                                                    MODEST_WIDGET_TYPE_FOLDER_VIEW);
+                       if (folder != NULL) 
+                               modest_folder_view_select_folder (MODEST_FOLDER_VIEW (folder_view), folder, FALSE);
+                       gtk_widget_grab_focus (GTK_WIDGET (folder_view));
+                       return;
+               }
+       }
        /* If no header has been selected then exit */
        if (!header)
                return;
@@ -1946,7 +2019,8 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
                account_name = modest_account_mgr_get_default_account (account_mgr);
                
        if (!account_name) {
-               g_printerr ("modest: no account found\n");
+               /* Run account setup wizard */
+               run_account_setup_wizard(MODEST_WINDOW(edit_window));
                return;
        }
        
@@ -1962,9 +2036,8 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
                                      (modest_runtime_get_account_store(),
                                       account_name));
        if (!transport_account) {
-               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);
+               /* Run account setup wizard */
+               run_account_setup_wizard(MODEST_WINDOW(edit_window));
                return;
        }
        
@@ -2200,6 +2273,21 @@ modest_ui_actions_create_folder(GtkWidget *parent_window,
                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 (proto_str && modest_protocol_info_get_transport_store_protocol (proto_str) ==
+                   MODEST_PROTOCOL_STORE_POP) {
+                       finished = TRUE;
+                       hildon_banner_show_information (NULL, NULL, _("mail_in_ui_folder_create_error"));
+               }
+               g_object_unref (account);
 
                /* Run the new folder dialog */
                while (!finished) {
@@ -2423,9 +2511,15 @@ void
 modest_ui_actions_on_delete_folder (GtkAction *action,
                                     ModestMainWindow *main_window)
 {
+       GtkWidget *folder_view;
        g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
 
        delete_folder (main_window, FALSE);
+       folder_view = modest_main_window_get_child_widget (main_window,
+                                                          MODEST_WIDGET_TYPE_FOLDER_VIEW);
+       if (!folder_view)
+               return;
+       modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (folder_view));
 }
 
 void 
@@ -2643,18 +2737,21 @@ modest_ui_actions_on_cut (GtkAction *action,
                          ModestWindow *window)
 {
        GtkWidget *focused_widget;
+       GtkClipboard *clipboard;
 
+       clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
        focused_widget = gtk_window_get_focus (GTK_WINDOW (window));
        if (GTK_IS_EDITABLE (focused_widget)) {
                gtk_editable_cut_clipboard (GTK_EDITABLE(focused_widget));
+               gtk_clipboard_set_can_store (clipboard, NULL, 0);
+               gtk_clipboard_store (clipboard);
        } else if (GTK_IS_TEXT_VIEW (focused_widget)) {
                GtkTextBuffer *buffer;
-               GtkClipboard *clipboard;
 
-               clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
                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);
        } else if (MODEST_IS_HEADER_VIEW (focused_widget)) {
                modest_header_view_cut_selection (MODEST_HEADER_VIEW (focused_widget));
        } else if (MODEST_IS_FOLDER_VIEW (focused_widget)) {
@@ -2674,15 +2771,22 @@ modest_ui_actions_on_copy (GtkAction *action,
 
        if (GTK_IS_LABEL (focused_widget)) {
                gtk_clipboard_set_text (clipboard, gtk_label_get_text (GTK_LABEL (focused_widget)), -1);
+               gtk_clipboard_set_can_store (clipboard, NULL, 0);
+               gtk_clipboard_store (clipboard);
        } else if (GTK_IS_EDITABLE (focused_widget)) {
                gtk_editable_copy_clipboard (GTK_EDITABLE(focused_widget));
+               gtk_clipboard_set_can_store (clipboard, NULL, 0);
+               gtk_clipboard_store (clipboard);
        } else if (GTK_IS_HTML (focused_widget)) {
                gtk_html_copy (GTK_HTML (focused_widget));
+               gtk_clipboard_set_can_store (clipboard, NULL, 0);
+               gtk_clipboard_store (clipboard);
        } 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);
        } else if (MODEST_IS_HEADER_VIEW (focused_widget)) {
                TnyList *header_list = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW (focused_widget));
                TnyIterator *iter = tny_list_create_iterator (header_list);
@@ -2850,30 +2954,50 @@ modest_ui_actions_on_paste (GtkAction *action,
 
                /* Create a new mail operation */
                mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT(window));
-               modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), 
-                                                mail_op);
                
                /* Get destination folder */
                folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (focused_widget));
 
-               /* Launch notification */
-               inf_note = modest_platform_animation_banner (GTK_WIDGET (window), NULL, 
-                                                            _CS("ckct_nw_pasting"));
-               if (inf_note != NULL)  {
-                       gtk_window_set_modal (GTK_WINDOW(inf_note), FALSE);
-                       gtk_widget_show (GTK_WIDGET(inf_note));
-               }
-
                /* transfer messages  */
                if (data != NULL) {
-                       modest_mail_operation_xfer_msgs (mail_op, 
-                                                        data,
-                                                        TNY_FOLDER (folder_store),
-                                                        delete,
-                                                        paste_msgs_cb,
-                                                        inf_note);
+                       gint response = 0;
+
+                       /* Ask for user confirmation */
+                       response = msgs_move_to_confirmation (GTK_WINDOW (window), 
+                                                             TNY_FOLDER (folder_store), 
+                                                             delete,
+                                                             data);
+                       
+                       if (response == GTK_RESPONSE_OK) {
+                               /* Launch notification */
+                               inf_note = modest_platform_animation_banner (GTK_WIDGET (window), NULL, 
+                                                                            _CS("ckct_nw_pasting"));
+                               if (inf_note != NULL)  {
+                                       gtk_window_set_modal (GTK_WINDOW(inf_note), FALSE);
+                                       gtk_widget_show (GTK_WIDGET(inf_note));
+                               }
+
+                               modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
+                               modest_mail_operation_xfer_msgs (mail_op, 
+                                                                data,
+                                                                TNY_FOLDER (folder_store),
+                                                                delete,
+                                                                paste_msgs_cb,
+                                                                inf_note);                             
+                       } else {
+                               g_object_unref (mail_op);
+                       }
                        
                } else if (src_folder != NULL) {                        
+                       /* Launch notification */
+                       inf_note = modest_platform_animation_banner (GTK_WIDGET (window), NULL, 
+                                                                    _CS("ckct_nw_pasting"));
+                       if (inf_note != NULL)  {
+                               gtk_window_set_modal (GTK_WINDOW(inf_note), FALSE);
+                               gtk_widget_show (GTK_WIDGET(inf_note));
+                       }
+                       
+                       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
                        modest_mail_operation_xfer_folder (mail_op, 
                                                           src_folder,
                                                           folder_store,
@@ -3059,6 +3183,7 @@ headers_action_show_details (TnyHeader *header,
        dialog = modest_details_dialog_new_with_header (GTK_WINDOW (window), header);
 
        /* Run dialog */
+       gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
        gtk_widget_show_all (dialog);
        gtk_dialog_run (GTK_DIALOG (dialog));
 
@@ -3078,6 +3203,7 @@ show_folder_details (TnyFolder *folder,
        dialog = modest_details_dialog_new_with_folder (window, folder);
 
        /* Run dialog */
+       gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
        gtk_widget_show_all (dialog);
        gtk_dialog_run (GTK_DIALOG (dialog));
 
@@ -3312,14 +3438,15 @@ has_retrieved_msgs (TnyList *list)
        gboolean found = FALSE;
 
        iter = tny_list_create_iterator (list);
-       while (tny_iterator_is_done (iter) && !found) {
+       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_PARTIAL))
+                       if (flags & TNY_HEADER_FLAG_CACHED)
+/*                     if (!(flags & TNY_HEADER_FLAG_PARTIAL)) */
                                found = TRUE;
 
                        g_object_unref (header);
@@ -3342,12 +3469,14 @@ has_retrieved_msgs (TnyList *list)
 static gint
 msgs_move_to_confirmation (GtkWindow *win,
                           TnyFolder *dest_folder,
+                          gboolean delete,
                           TnyList *headers)
 {
        gint response = GTK_RESPONSE_OK;
 
-       /* If the destination is a local folder */
-       if (modest_tny_folder_is_local_folder (dest_folder)) {
+       /* If the destination is a local folder (or MMC folder )*/
+       if (!modest_tny_folder_is_remote_folder (dest_folder)) {
+/*     if (modest_tny_folder_is_local_folder (dest_folder)) { */
                TnyFolder *src_folder = NULL;
                TnyIterator *iter = NULL;
                TnyHeader *header = NULL;
@@ -3367,18 +3496,22 @@ msgs_move_to_confirmation (GtkWindow *win,
                        return GTK_RESPONSE_CANCEL;
 
                /* If the source is a remote folder */
-               if (!modest_tny_folder_is_local_folder (src_folder)) {
-                       const gchar *message;
-                       
-                       if (has_retrieved_msgs (headers))
+/*             if (!modest_tny_folder_is_local_folder (src_folder)) { */
+               if (modest_tny_folder_is_remote_folder (src_folder)) {
+                       const gchar *message = NULL;
+                       gboolean cached = has_retrieved_msgs (headers);
+                       if (cached) 
                                message = ngettext ("mcen_nc_move_retrieve", "mcen_nc_move_retrieves",
                                                    tny_list_get_length (headers));
                        else 
                                message = ngettext ("mcen_nc_move_header", "mcen_nc_move_headers",
                                                    tny_list_get_length (headers));
-
-                       response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
-                                                                           (const gchar *) message);
+                       
+                       if (cached && !delete)  
+                               response = GTK_RESPONSE_OK;
+                       else
+                               response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
+                                                                                   (const gchar *) message);
                }
                
                g_object_unref (src_folder);
@@ -3604,6 +3737,9 @@ modest_ui_actions_xfer_messages_from_move_to (TnyFolderStore *dst_folder,
 {
        TnyList *headers = NULL;
        gint response = 0;
+       TnyAccount *dst_account = NULL;
+       const gchar *proto_str = NULL;
+       gboolean dst_is_pop = FALSE;
 
        if (!TNY_IS_FOLDER (dst_folder)) {
                modest_platform_information_banner (GTK_WIDGET (win),
@@ -3612,12 +3748,29 @@ modest_ui_actions_xfer_messages_from_move_to (TnyFolderStore *dst_folder,
                return;
        }
 
+       dst_account = tny_folder_get_account (TNY_FOLDER (dst_folder));
+       proto_str = tny_account_get_proto (dst_account);
+       dst_is_pop = (modest_protocol_info_get_transport_store_protocol (proto_str) == 
+                     MODEST_PROTOCOL_STORE_POP);
+       g_object_unref (dst_account);
+
        /* Get selected headers */
        headers = get_selected_headers (MODEST_WINDOW (win));
 
+       if (dst_is_pop) {
+               modest_platform_information_banner (GTK_WIDGET (win),
+                                                   NULL,
+                                                   ngettext("mail_in_ui_folder_move_target_error",
+                                                            "mail_in_ui_folder_move_targets_error",
+                                                            tny_list_get_length (headers)));
+               g_object_unref (headers);
+               return;
+       }
+
        /* Ask for user confirmation */
        response = msgs_move_to_confirmation (GTK_WINDOW (win), 
                                              TNY_FOLDER (dst_folder), 
+                                             TRUE,
                                              headers);
 
        /* Transfer messages */
@@ -3764,6 +3917,7 @@ modest_ui_actions_on_move_to (GtkAction *action,
        /* Create and run the dialog */
        dialog = create_move_to_dialog (GTK_WINDOW (win), folder_view, &tree_view);
        modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (tree_view));
+       gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
        result = gtk_dialog_run (GTK_DIALOG(dialog));
        g_object_ref (tree_view);
        gtk_widget_destroy (dialog);
@@ -3882,6 +4036,7 @@ modest_ui_actions_on_settings (GtkAction *action,
 
        dialog = modest_platform_get_global_settings_dialog ();
        gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (win));
+       gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
        gtk_widget_show_all (dialog);
 
        gtk_dialog_run (GTK_DIALOG (dialog));
@@ -3977,7 +4132,7 @@ 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");     
 }