2007-07-16 Armin Burgmeier <armin@openismus.com>
[modest] / src / modest-ui-actions.c
index dbbbf28..29c1280 100644 (file)
@@ -48,6 +48,7 @@
 
 #ifdef MODEST_PLATFORM_MAEMO
 #include "maemo/modest-osso-state-saving.h"
+#include "maemo/modest-maemo-utils.h"
 #endif /* MODEST_PLATFORM_MAEMO */
 
 #include "widgets/modest-ui-constants.h"
@@ -105,11 +106,9 @@ typedef struct _ReplyForwardHelper {
  */
 typedef void (*HeadersFunc) (TnyHeader *header, ModestWindow *win, gpointer user_data);
 
-static void
-do_headers_action (ModestWindow *win, 
-                  HeadersFunc func,
-                  gpointer user_data);
-
+static void     do_headers_action     (ModestWindow *win, 
+                                      HeadersFunc func,
+                                      gpointer user_data);
 
 static void     open_msg_cb            (ModestMailOperation *mail_op, 
                                        TnyHeader *header, 
@@ -123,6 +122,9 @@ static void     reply_forward_cb       (ModestMailOperation *mail_op,
 
 static void     reply_forward          (ReplyForwardAction action, ModestWindow *win);
 
+static void     folder_refreshed_cb    (ModestMailOperation *mail_op, 
+                                       TnyFolder *folder, 
+                                       gpointer user_data);
 
 static void     _on_send_receive_progress_changed (ModestMailOperation  *mail_op, 
                                                   ModestMailOperationState *state,
@@ -235,29 +237,51 @@ headers_action_mark_as_unread (TnyHeader *header,
        }
 }
 
-
-static void
-headers_action_delete (TnyHeader *header,
-                      ModestWindow *win,
-                      gpointer user_data)
+/** A convenience method, because deleting a message is 
+ * otherwise complicated, and it's best to change it in one place 
+ * when we change it.
+ */
+void modest_do_message_delete (TnyHeader *header, ModestWindow *win)
 {
        ModestMailOperation *mail_op = NULL;
-
-       mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_DELETE, G_OBJECT(win));
+       mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_DELETE, 
+               win ? G_OBJECT(win) : NULL);
        modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
                                         mail_op);
        
        /* Always delete. TODO: Move to trash still not supported */
        modest_mail_operation_remove_msg (mail_op, header, FALSE);
        g_object_unref (G_OBJECT (mail_op));
+}
 
-       /* refilter treemodel to hide marked-as-deleted rows */
-       if (MODEST_IS_HEADER_VIEW (user_data))
-               modest_header_view_refilter (MODEST_HEADER_VIEW (user_data));
+static void
+headers_action_delete (TnyHeader *header,
+                      ModestWindow *win,
+                      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, 
+ * show the next message from the list, or close the window if there are no more messages.
+ **/
+void modest_ui_actions_refresh_message_window_after_delete (ModestMsgViewWindow* win)
+{
+       /* 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 {
+               modest_msg_view_window_select_next_message (win);
+       }
 }
 
 void
-modest_ui_actions_on_delete (GtkAction *action, ModestWindow *win)
+modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win)
 {
        TnyList *header_list = NULL;
        TnyIterator *iter = NULL;
@@ -282,7 +306,7 @@ modest_ui_actions_on_delete (GtkAction *action, ModestWindow *win)
        header_list = get_selected_headers (win);
        if (!header_list) return;
 
-       /* Check if any of the headers is already opened, or in the process of being opened */
+       /* Check if any of the headers are already opened, or in the process of being opened */
        if (MODEST_IS_MAIN_WINDOW (win)) {
                gboolean found;
                iter = tny_list_create_iterator (header_list);
@@ -322,50 +346,98 @@ modest_ui_actions_on_delete (GtkAction *action, ModestWindow *win)
        message = g_strdup_printf(ngettext("emev_nc_delete_message", "emev_nc_delete_messages", 
                                           tny_list_get_length(header_list)), desc);
 
-       /* Confirmation dialog */               
+       /* Confirmation dialog */
+       printf("DEBUG: %s\n", __FUNCTION__);    
        response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
                                                            message);
        
 
        if (response == GTK_RESPONSE_OK) {      
-               ModestMainWindow *main_window;
-               ModestWindowMgr *mgr;
-
+               ModestWindow *main_window = NULL;
+               ModestWindowMgr *mgr = NULL;
+               GtkTreeModel *model = NULL;
+               GtkTreeSelection *sel = NULL;
+               GList *sel_list = NULL, *tmp = NULL;
+               GtkTreeRowReference *row_reference = NULL;
+               GtkTreePath *next_path = NULL;
+
+               /* Find last selected row */                    
+               if (MODEST_IS_MAIN_WINDOW (win)) {
+                       model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view));
+                       sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (header_view));
+                       sel_list = gtk_tree_selection_get_selected_rows (sel, &model);
+                       for (tmp=sel_list; tmp; tmp=tmp->next) {
+                               if (tmp->next == NULL) {
+                                       next_path = gtk_tree_path_copy((GtkTreePath *) tmp->data);
+                                       gtk_tree_path_next (next_path);
+                                       row_reference = gtk_tree_row_reference_new (model, next_path);
+                                       gtk_tree_path_free (next_path);
+                               }
+                       }
+               }
+               
                /* Remove each header. If it's a view window header_view == NULL */
                do_headers_action (win, headers_action_delete, header_view);
 
                if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
-                       /* Close msg view window or select next */
-                       if (modest_msg_view_window_last_message_selected (MODEST_MSG_VIEW_WINDOW (win)) &&
-                           modest_msg_view_window_first_message_selected (MODEST_MSG_VIEW_WINDOW (win))) {
-                               modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (win));
-                       } else {
-                               modest_msg_view_window_select_next_message (MODEST_MSG_VIEW_WINDOW (win));
-                       }
+                       modest_ui_actions_refresh_message_window_after_delete (MODEST_MSG_VIEW_WINDOW (win));
+                       
+                       /* Get main window */
+                       mgr = modest_runtime_get_window_mgr ();
+                       main_window = modest_window_mgr_get_main_window (mgr);
                }
-
-               /* Refilter header view model, if main window still exists */
-               mgr = modest_runtime_get_window_mgr ();
-               main_window = MODEST_MAIN_WINDOW (modest_window_mgr_get_main_window (mgr));
-               if (main_window) {
-                       GtkWidget *widget;
-
-                       widget = modest_main_window_get_child_widget (main_window,
-                                                                     MODEST_WIDGET_TYPE_HEADER_VIEW);
-                       modest_header_view_refilter (MODEST_HEADER_VIEW (widget));
+               else {                  
+                       /* Move cursor to next row */
+                       main_window = win; 
+
+                       /* Select next row */
+                       if (gtk_tree_row_reference_valid (row_reference)) {
+                               next_path = gtk_tree_row_reference_get_path (row_reference);
+                               gtk_tree_selection_select_path (sel, next_path);
+                               gtk_tree_path_free (next_path);
+                       }
+                       if (row_reference != NULL)
+                               gtk_tree_row_reference_free (row_reference);
                }
 
                /* Update toolbar dimming state */
-               modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (win));
+               modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window));
+
+               /* Free */
+               g_list_foreach (sel_list, (GFunc) gtk_tree_path_free, NULL);
+               g_list_free (sel_list);
        }
 
-       /* free */
+       /* Free*/
        g_free(message);
        g_free(desc);
        g_object_unref (header_list);
 }
 
 
+
+
+/* delete either message or folder, based on where we are */
+void
+modest_ui_actions_on_delete_message_or_folder (GtkAction *action, ModestWindow *win)
+{
+       g_return_if_fail (MODEST_IS_WINDOW(win));
+       
+       /* Check first if the header view has the focus */
+       if (MODEST_IS_MAIN_WINDOW (win)) {
+               GtkWidget *w;
+               w = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
+                                                        MODEST_WIDGET_TYPE_FOLDER_VIEW);
+               if (gtk_widget_is_focus (w)) {
+                       modest_ui_actions_on_delete_folder (action, MODEST_MAIN_WINDOW(win));
+                       return;
+               }
+       }
+       modest_ui_actions_on_delete_message (action, win);
+}
+
+
+
 void
 modest_ui_actions_on_quit (GtkAction *action, ModestWindow *win)
 {
@@ -438,9 +510,7 @@ 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));
-               gtk_dialog_run (account_win);
-               gtk_widget_destroy (GTK_WIDGET(account_win));
+               modest_maemo_show_dialog_and_forget (GTK_WINDOW (win), account_win); 
        }
 #else
        GtkWidget *dialog, *label;
@@ -610,6 +680,27 @@ cleanup:
                g_object_unref (G_OBJECT(folder));
 }
 
+gboolean 
+modest_ui_actions_msg_retrieval_check (ModestMailOperation *mail_op,
+                                      TnyHeader *header,
+                                      TnyMsg *msg)
+{
+       ModestMailOperationStatus status;
+
+       /* If there is no message or the operation was not successful */
+       status = modest_mail_operation_get_status (mail_op);
+       if (!msg || status != MODEST_MAIL_OPERATION_STATUS_SUCCESS) {
+
+               /* Remove the header from the preregistered uids */
+               modest_window_mgr_unregister_header (modest_runtime_get_window_mgr (),  
+                                                    header);
+
+               return FALSE;
+       }
+
+       return TRUE;
+}
+
 static void
 open_msg_cb (ModestMailOperation *mail_op, 
             TnyHeader *header, 
@@ -623,9 +714,12 @@ open_msg_cb (ModestMailOperation *mail_op,
        gchar *account = NULL;
        TnyFolder *folder;
        
-       /* TODO: Show an error? (review the specs) */
-       if (!msg)
+       /* 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;
+       }
 
        parent_win = (ModestWindow *) modest_mail_operation_get_source (mail_op);
        folder = tny_header_get_folder (header);
@@ -706,28 +800,30 @@ cleanup:
        /* Free */
        g_free(account);
        g_object_unref (parent_win);
-/*     g_object_unref (msg); */
        g_object_unref (folder);
 }
 
-/*
- * This function is the error handler of the
- * modest_mail_operation_get_msgs_full operation
- */
-static void
+void
 modest_ui_actions_get_msgs_full_error_handler (ModestMailOperation *mail_op,
                                               gpointer user_data)
 {
        const GError *error;
+       GObject *win = modest_mail_operation_get_source (mail_op);
 
        error = modest_mail_operation_get_error (mail_op);
+       printf ("DEBUG: %s: Error: code=%d, text=%s\n", __FUNCTION__, error->code, error->message);
        if (error->code == MODEST_MAIL_OPERATION_ERROR_MESSAGE_SIZE_LIMIT) {
-               GObject *win = modest_mail_operation_get_source (mail_op);
 
                modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL,
                                                        error->message);
-               g_object_unref (win);
+       } else {
+               modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL,
+                                                       _("mail_ni_ui_folder_get_msg_folder_error"));
        }
+
+       if (win)
+               g_object_unref (win);
 }
 
 /*
@@ -776,9 +872,6 @@ _modest_ui_actions_open (TnyList *headers, ModestWindow *win)
                                g_warning ("debug: header %p already registered, waiting for window",
                                           header);
                } else {
-                       /* register the header before actually creating the window */
-                       modest_window_mgr_register_header (mgr, header);
-                               
                        if (!(flags & TNY_HEADER_FLAG_CACHED))
                                tny_list_append (not_opened_headers, G_OBJECT (header));
                        /* Check if msg has already been retreived */
@@ -788,6 +881,47 @@ _modest_ui_actions_open (TnyList *headers, ModestWindow *win)
                g_object_unref (header);
                tny_iterator_next (iter);
        }
+       g_object_unref (iter);
+       iter = NULL;
+       
+       /* If some messages would have to be downloaded, ask the user to 
+        * make a connection. It's generally easier to do this here (in the mainloop) 
+        * than later in a thread:
+        */
+       if (tny_list_get_length (not_opened_cached_headers) > 0) {
+               gboolean connected = modest_platform_connect_and_wait (GTK_WINDOW (win), NULL);
+               
+               /* Don't go further if a connection would be necessary but none is available: */
+               if (!connected) {
+                       g_object_unref (not_opened_headers);
+                       g_object_unref (not_opened_cached_headers);
+                       return;
+               }
+       }
+       
+       /* Register the headers before actually creating the windows: */
+       TnyIterator *iter_not_opened = tny_list_create_iterator (not_opened_headers);
+       while (!tny_iterator_is_done (iter_not_opened)) {
+               TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter_not_opened));
+               modest_window_mgr_register_header (mgr, header);
+               g_object_unref (header);
+               
+               tny_iterator_next (iter_not_opened);
+       }
+       g_object_unref (iter_not_opened);
+       iter_not_opened = NULL;
+       
+       TnyIterator *iter_cached = tny_list_create_iterator (not_opened_cached_headers);
+       while (!tny_iterator_is_done (iter_cached)) {
+               TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter_cached));
+               modest_window_mgr_register_header (mgr, header);
+               g_object_unref (header);
+               
+               tny_iterator_next (iter_cached);
+       }
+       g_object_unref (iter_cached);
+       iter_cached = NULL;
+       
        
        /* Open each uncached message */
        if (tny_list_get_length (not_opened_headers) > 0) {
@@ -887,6 +1021,12 @@ reply_forward_cb (ModestMailOperation *mail_op,
        TnyAccount *account = NULL;
        ModestWindowMgr *mgr = NULL;
        gchar *signature = NULL;
+
+       /* If there was any error. The mail operation could be NULL,
+          this means that we already have the message downloaded and
+          that we didn't do a mail operation to retrieve it */
+       if (mail_op && !modest_ui_actions_msg_retrieval_check (mail_op, header, msg))
+               return;
                        
        g_return_if_fail (user_data != NULL);
        rf_helper = (ReplyForwardHelper *) user_data;
@@ -977,7 +1117,8 @@ cleanup:
  * of them are currently downloaded
  */
 static gboolean
-download_uncached_messages (TnyList *header_list, GtkWindow *win)
+download_uncached_messages (TnyList *header_list, GtkWindow *win,
+                           gboolean reply_fwd)
 {
        TnyIterator *iter;
        gboolean retval;
@@ -1004,13 +1145,21 @@ download_uncached_messages (TnyList *header_list, GtkWindow *win)
        retval = TRUE;
        if (uncached_messages > 0) {
                GtkResponseType response;
-               response = 
-                       modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
-                                                                ngettext("mcen_nc_get_msg",
-                                                                         "mcen_nc_get_msgs",
-                                                                        uncached_messages));
+               if (reply_fwd)
+                       response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
+                                                                           _("emev_nc_include_original"));
+               else
+                       response =
+                               modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
+                                                                        ngettext("mcen_nc_get_msg",
+                                                                                 "mcen_nc_get_msgs",
+                                                                                 uncached_messages));
                if (response == GTK_RESPONSE_CANCEL)
                        retval = FALSE;
+               else {
+                       /* If a download will be necessary, make sure that we have a connection: */
+                       retval = modest_platform_connect_and_wait(win, NULL);   
+               }
        }
        return retval;
 }
@@ -1041,7 +1190,7 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
                return;
 
        /* Check that the messages have been previously downloaded */
-       continue_download = download_uncached_messages (header_list, GTK_WINDOW (win));
+       continue_download = download_uncached_messages (header_list, GTK_WINDOW (win), TRUE);
        if (!continue_download) {
                g_object_unref (header_list);
                return;
@@ -1061,6 +1210,7 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
        rf_helper->reply_forward_type = reply_forward_type;
        rf_helper->action = action;
        rf_helper->account_name = g_strdup (modest_window_get_active_account (win));
+       
        if ((win != NULL) && (MODEST_IS_WINDOW (win)))
                rf_helper->parent_window = GTK_WIDGET (win);
        if (!rf_helper->account_name)
@@ -1266,6 +1416,76 @@ modest_ui_actions_do_send_receive (const gchar *account_name, ModestWindow *win)
        g_free (acc_name);
 }
 
+
+static void
+modest_ui_actions_do_cancel_send (const gchar *account_name,  
+                                 ModestWindow *win)
+{
+       TnyTransportAccount *transport_account;
+       TnySendQueue *send_queue = NULL;
+       GError *error = NULL;
+
+       /* Get transport account */
+       transport_account =
+               TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_server_account
+                                     (modest_runtime_get_account_store(),
+                                      account_name,
+                                      TNY_ACCOUNT_TYPE_TRANSPORT));
+       if (!transport_account) {
+               g_printerr ("modest: no transport account found for '%s'\n", account_name);
+               goto frees;
+       }
+
+       /* Get send queue*/
+       send_queue = TNY_SEND_QUEUE (modest_runtime_get_send_queue (transport_account));
+       if (!TNY_IS_SEND_QUEUE(send_queue)) {
+               g_set_error (&error, MODEST_MAIL_OPERATION_ERROR,
+                            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);
+       }       
+
+ frees:
+       if (transport_account != NULL) 
+               g_object_unref (G_OBJECT (transport_account));
+}
+
+static void
+modest_ui_actions_cancel_send_all (ModestWindow *win) 
+{
+       GSList *account_names, *iter;
+
+       account_names = modest_account_mgr_account_names (modest_runtime_get_account_mgr(), 
+                                                         TRUE);
+
+       iter = account_names;
+       while (iter) {                  
+               modest_ui_actions_do_cancel_send ((const char*) iter->data, win);
+               iter = g_slist_next (iter);
+       }
+
+       modest_account_mgr_free_account_names (account_names);
+       account_names = NULL;
+}
+
+void
+modest_ui_actions_cancel_send (GtkAction *action,  ModestWindow *win)
+
+{
+       /* Check if accounts exist */
+       gboolean accounts_exist = 
+               modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE);
+       
+       /* If not, allow the user to create an account before trying to send/receive. */
+       if (!accounts_exist)
+               modest_ui_actions_on_accounts (NULL, win);
+       
+       /* Cancel all sending operaitons */     
+       modest_ui_actions_cancel_send_all (win);
+}
+
 /*
  * Refreshes all accounts. This function will be used by automatic
  * updates
@@ -1301,6 +1521,40 @@ modest_ui_actions_on_send_receive (GtkAction *action,  ModestWindow *win)
        /* If not, allow the user to create an account before trying to send/receive. */
        if (!accounts_exist)
                modest_ui_actions_on_accounts (NULL, win);
+
+       /* Refresh currently selected folder. Note that if we only
+          want to retrive the headers, then the refresh only will
+          invoke a poke_status over all folders, i.e., only the
+          total/unread count will be updated */
+       if (MODEST_IS_MAIN_WINDOW (win)) {
+               GtkWidget *header_view, *folder_view;
+               TnyFolderStore *folder_store;
+
+               /* Get folder and header view */
+               folder_view = 
+                       modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), 
+                                                            MODEST_WIDGET_TYPE_FOLDER_VIEW);
+
+               folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
+
+               if (folder_store && TNY_IS_FOLDER (folder_store)) {
+                       header_view = 
+                               modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
+                                                                    MODEST_WIDGET_TYPE_HEADER_VIEW);
+               
+                       /* We do not need to set the contents style
+                          because it hasn't changed. We also do not
+                          need to save the widget status. Just force
+                          a refresh */
+                       modest_header_view_set_folder (MODEST_HEADER_VIEW(header_view),
+                                                      TNY_FOLDER (folder_store),
+                                                      folder_refreshed_cb,
+                                                      MODEST_MAIN_WINDOW (win));
+               }
+               
+               if (folder_store)
+                       g_object_unref (folder_store);
+       }
        
        /* Refresh the active account */
        modest_ui_actions_do_send_receive (NULL, win);
@@ -1411,7 +1665,7 @@ set_active_account_from_tny_account (TnyAccount *account,
 
 
 static void
-folder_refreshed_cb (const GObject *obj, 
+folder_refreshed_cb (ModestMailOperation *mail_op, 
                     TnyFolder *folder, 
                     gpointer user_data)
 {
@@ -1639,6 +1893,7 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi
        modest_mail_operation_save_to_drafts (mail_operation,
                                              transport_account,
                                              data->draft_msg,
+                                             edit_window,
                                              from,
                                              data->to, 
                                              data->cc, 
@@ -1670,6 +1925,10 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
        if (!modest_msg_edit_window_check_names (edit_window))
                return;
        
+       /* Offer the connection dialog, if necessary: */        
+       if (!modest_platform_connect_and_wait (GTK_WINDOW (edit_window), NULL))
+               return;
+       
        /* FIXME: Code added just for testing. The final version will
           use the send queue provided by tinymail and some
           classifier */
@@ -1907,18 +2166,25 @@ modest_ui_actions_on_remove_attachments (GtkAction *action,
        modest_msg_edit_window_remove_attachments (window, NULL);
 }
 
-void 
-modest_ui_actions_on_new_folder (GtkAction *action, ModestMainWindow *main_window)
+static void
+modest_ui_actions_new_folder_error_handler (ModestMailOperation *mail_op,
+                                            gpointer user_data)
 {
-       TnyFolderStore *parent_folder;
-       GtkWidget *folder_view;
-       
-       g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
+       ModestMainWindow *window = MODEST_MAIN_WINDOW (user_data);
+       const GError *error = modest_mail_operation_get_error (mail_op);
 
-       folder_view = modest_main_window_get_child_widget (main_window,
-                                                          MODEST_WIDGET_TYPE_FOLDER_VIEW);
-       if (!folder_view)
-               return;
+       if(error)
+       {
+               modest_platform_information_banner (GTK_WIDGET (window), NULL,
+                                                   modest_mail_operation_get_error (mail_op)->message);
+       }
+}
+
+static void
+modest_ui_actions_create_folder(GtkWidget *parent_window,
+                                GtkWidget *folder_view)
+{
+       TnyFolderStore *parent_folder;
 
        parent_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view));
        
@@ -1929,31 +2195,41 @@ modest_ui_actions_on_new_folder (GtkAction *action, ModestMainWindow *main_windo
 
                /* Run the new folder dialog */
                while (!finished) {
-                       result = modest_platform_run_new_folder_dialog (GTK_WINDOW (main_window),
+                       result = modest_platform_run_new_folder_dialog (GTK_WINDOW (parent_window),
                                                                        parent_folder,
                                                                        suggested_name,
                                                                        &folder_name);
 
+                       g_free (suggested_name);
+                       suggested_name = NULL;
+
                        if (result == GTK_RESPONSE_REJECT) {
                                finished = TRUE;
                        } else {
                                ModestMailOperation *mail_op;
                                TnyFolder *new_folder = NULL;
 
-                               mail_op  = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_INFO, 
-                                                                     G_OBJECT(main_window));
+                               mail_op  = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_INFO,
+                                                                                         G_OBJECT(parent_window),
+                                                                                         modest_ui_actions_new_folder_error_handler,
+                                                                                         parent_window);
+
                                modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), 
                                                                 mail_op);
                                new_folder = modest_mail_operation_create_folder (mail_op,
                                                                                  parent_folder,
                                                                                  (const gchar *) folder_name);
                                if (new_folder) {
+                                       modest_folder_view_select_folder (MODEST_FOLDER_VIEW(folder_view), 
+                                                                         new_folder, TRUE);
+
                                        g_object_unref (new_folder);
                                        finished = TRUE;
                                }
                                g_object_unref (mail_op);
                        }
-                       g_free (folder_name);
+
+                       suggested_name = folder_name;
                        folder_name = NULL;
                }
 
@@ -1961,6 +2237,21 @@ modest_ui_actions_on_new_folder (GtkAction *action, ModestMainWindow *main_windo
        }
 }
 
+void 
+modest_ui_actions_on_new_folder (GtkAction *action, ModestMainWindow *main_window)
+{
+       GtkWidget *folder_view;
+       
+       g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
+
+       folder_view = modest_main_window_get_child_widget (main_window,
+                                                          MODEST_WIDGET_TYPE_FOLDER_VIEW);
+       if (!folder_view)
+               return;
+
+       modest_ui_actions_create_folder (GTK_WIDGET (main_window), folder_view);
+}
+
 static void
 modest_ui_actions_rename_folder_error_handler (ModestMailOperation *mail_op,
                                               gpointer user_data)
@@ -2004,8 +2295,17 @@ modest_ui_actions_on_rename_folder (GtkAction *action,
                return;
 
        folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view));
+       if (!folder)
+               return;
+
+       /* Offer the connection dialog if necessary: */
+       if (!modest_platform_connect_and_wait_if_network_folderstore (NULL, folder)) {
+               g_object_unref (G_OBJECT (folder));
+               return;
+       }
+
        
-       if (folder && TNY_IS_FOLDER (folder)) {
+       if (TNY_IS_FOLDER (folder)) {
                gchar *folder_name;
                gint response;
                const gchar *current_name;
@@ -2028,7 +2328,13 @@ modest_ui_actions_on_rename_folder (GtkAction *action,
                                                         mail_op);
 
                        modest_header_view_clear (MODEST_HEADER_VIEW (header_view));
+                       
+                       modest_folder_view_select_folder (MODEST_FOLDER_VIEW(folder_view),
+                                                         TNY_FOLDER(folder), TRUE);
+
 
+                       modest_header_view_clear ((ModestHeaderView *) header_view);
                        modest_mail_operation_rename_folder (mail_op,
                                                             TNY_FOLDER (folder),
                                                             (const gchar *) folder_name);
@@ -2036,8 +2342,8 @@ modest_ui_actions_on_rename_folder (GtkAction *action,
                        g_object_unref (mail_op);
                        g_free (folder_name);
                }
-               g_object_unref (folder);
        }
+       g_object_unref (folder);
 }
 
 static void
@@ -2059,7 +2365,7 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash)
        gint response;
        gchar *message;
        
-       g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
+       g_return_if_fail (MODEST_IS_MAIN_WINDOW (main_window));
 
        folder_view = modest_main_window_get_child_widget (main_window,
                                                           MODEST_WIDGET_TYPE_FOLDER_VIEW);
@@ -2072,9 +2378,16 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash)
        if (!TNY_IS_FOLDER (folder)) {
                modest_platform_run_information_dialog (GTK_WINDOW (main_window),
                                                        _("mail_in_ui_folder_delete_error"));
+               g_object_unref (G_OBJECT (folder));
                return ;
        }
 
+       /* Offer the connection dialog if necessary: */
+       if (!modest_platform_connect_and_wait_if_network_folderstore (NULL, folder)) {
+               g_object_unref (G_OBJECT (folder));
+               return;
+       }
+
        /* Ask the user */      
        message =  g_strdup_printf (_("mcen_nc_delete_folder_text"), 
                                    tny_folder_get_name (TNY_FOLDER (folder)));
@@ -2310,6 +2623,7 @@ modest_ui_actions_on_cut (GtkAction *action,
                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);
        } 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)) {
@@ -2331,11 +2645,13 @@ modest_ui_actions_on_copy (GtkAction *action,
                gtk_clipboard_set_text (clipboard, gtk_label_get_text (GTK_LABEL (focused_widget)), -1);
        } else if (GTK_IS_EDITABLE (focused_widget)) {
                gtk_editable_copy_clipboard (GTK_EDITABLE(focused_widget));
+       } else if (GTK_IS_HTML (focused_widget)) {
+               gtk_html_copy (GTK_HTML (focused_widget));
        } 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);
-               modest_header_view_copy_selection (MODEST_HEADER_VIEW (focused_widget));
+               gtk_clipboard_set_can_store (clipboard, NULL, 0);
        } 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);
@@ -2354,7 +2670,7 @@ modest_ui_actions_on_copy (GtkAction *action,
                /* Check that the messages have been previously downloaded */
                gboolean continue_download = TRUE;
                if (ask)
-                       continue_download = download_uncached_messages (header_list, GTK_WINDOW (window));
+                       continue_download = download_uncached_messages (header_list, GTK_WINDOW (window), FALSE);
                if (continue_download)
                        modest_header_view_copy_selection (MODEST_HEADER_VIEW (focused_widget));
                g_object_unref (header_list);
@@ -2385,6 +2701,18 @@ modest_ui_actions_on_undo (GtkAction *action,
        }
 }
 
+void
+modest_ui_actions_on_redo (GtkAction *action,
+                          ModestWindow *window)
+{
+       if (MODEST_IS_MSG_EDIT_WINDOW (window)) {
+               modest_msg_edit_window_redo (MODEST_MSG_EDIT_WINDOW (window));
+       }
+       else {
+               g_return_if_reached ();
+       }
+}
+
 
 static void
 paste_msgs_cb (const GObject *object, gpointer user_data)
@@ -2750,16 +3078,12 @@ void
 modest_ui_actions_toggle_folders_view (GtkAction *action, 
                                       ModestMainWindow *main_window)
 {
-       ModestConf *conf;
-       
        g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
 
-       conf = modest_runtime_get_conf ();
-       
-       if (modest_main_window_get_style (main_window) == MODEST_MAIN_WINDOW_STYLE_SPLIT)
-               modest_main_window_set_style (main_window, MODEST_MAIN_WINDOW_STYLE_SIMPLE);
-       else
+       if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
                modest_main_window_set_style (main_window, MODEST_MAIN_WINDOW_STYLE_SPLIT);
+       else
+               modest_main_window_set_style (main_window, MODEST_MAIN_WINDOW_STYLE_SIMPLE);
 }
 
 void 
@@ -2821,22 +3145,32 @@ modest_ui_actions_on_check_names (GtkAction *action, ModestMsgEditWindow *window
        modest_msg_edit_window_check_names (window);
 }
 
+static void
+create_move_to_dialog_on_new_folder(GtkWidget *button, gpointer user_data)
+{
+       modest_ui_actions_create_folder (gtk_widget_get_toplevel (button),
+                                        GTK_WIDGET (user_data));
+}
 
 static GtkWidget*
-create_move_to_dialog (ModestWindow *win,
+create_move_to_dialog (GtkWindow *win,
                       GtkWidget *folder_view,
                       GtkWidget **tree_view)
 {
        GtkWidget *dialog, *scroll;
+       GtkWidget *new_button;
 
        dialog = gtk_dialog_new_with_buttons (_("mcen_ti_moveto_folders_title"),
                                              GTK_WINDOW (win),
                                              GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR | GTK_DIALOG_DESTROY_WITH_PARENT,
-                                             GTK_STOCK_OK,
-                                             GTK_RESPONSE_ACCEPT,
-                                             GTK_STOCK_CANCEL,
-                                             GTK_RESPONSE_REJECT,
-                                             NULL);
+                                             NULL);
+
+       gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_OK, GTK_RESPONSE_ACCEPT);
+       /* We do this manually so GTK+ does not associate a response ID for
+        * the button. */
+       new_button = gtk_button_new_from_stock (GTK_STOCK_NEW);
+       gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->action_area), new_button, FALSE, FALSE, 0);
+       gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT);
 
        /* Create scrolled window */
        scroll = gtk_scrolled_window_new (NULL, NULL);
@@ -2847,6 +3181,8 @@ create_move_to_dialog (ModestWindow *win,
        /* Create folder view */
        *tree_view = modest_platform_create_folder_view (NULL);
 
+       g_signal_connect (G_OBJECT (new_button), "clicked", G_CALLBACK(create_move_to_dialog_on_new_folder), *tree_view);
+
        /* It could happen that we're trying to move a message from a
           window (msg window for example) after the main window was
           closed, so we can not just get the model of the folder
@@ -2858,16 +3194,16 @@ create_move_to_dialog (ModestWindow *win,
                modest_folder_view_update_model (MODEST_FOLDER_VIEW (*tree_view), 
                                                 TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()));
 
+       modest_folder_view_show_non_move_folders (MODEST_FOLDER_VIEW (*tree_view), FALSE);
+       
        gtk_container_add (GTK_CONTAINER (scroll), *tree_view);
 
        /* Add scroll to dialog */
        gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), 
-                           scroll, FALSE, FALSE, 0);
+                           scroll, TRUE, TRUE, 0);
 
        gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox));
-
-       /* Select INBOX or local account */
-       modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (*tree_view));
+       gtk_window_set_default_size (GTK_WINDOW (dialog), 300, 300);
 
        return dialog;
 }
@@ -2955,22 +3291,14 @@ static void
 transfer_msgs_from_viewer_cb (const GObject *object, gpointer user_data)
 {
        ModestMsgViewWindow *self = NULL;
-       gboolean last, first;
 
        g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (object));
        self = MODEST_MSG_VIEW_WINDOW (object);
        
-       last = modest_msg_view_window_last_message_selected (self);
-       first = modest_msg_view_window_first_message_selected (self);   
-       if (last & first) {
-               /* No more messages to view, so close this window */
-/*             gboolean ret_value; */
-/*             g_signal_emit_by_name (G_OBJECT (self), "delete-event", NULL, &ret_value); */
-               modest_ui_actions_on_close_window (NULL, MODEST_WINDOW(self));
-       } else if (last)
-               modest_msg_view_window_select_previous_message (self);
-       else 
-               modest_msg_view_window_select_next_message (self);
+       if (!modest_msg_view_window_select_next_message (self))
+               if (!modest_msg_view_window_select_previous_message (self))
+                       /* No more messages to view, so close this window */
+                       modest_ui_actions_on_close_window (NULL, MODEST_WINDOW(self));
 }
 
 void
@@ -3028,8 +3356,13 @@ open_msg_for_purge_cb (ModestMailOperation *mail_op,
        gint pending_purges = 0;
        gboolean some_purged = FALSE;
        ModestWindow *win = MODEST_WINDOW (user_data);
-       if (!msg)
+       ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
+
+       /* If there was any error */
+       if (!modest_ui_actions_msg_retrieval_check (mail_op, header, msg)) {
+               modest_window_mgr_unregister_header (mgr, header);
                return;
+       }
 
        /* Once the message has been retrieved for purging, we check if
         * it's all ok for purging */
@@ -3081,6 +3414,7 @@ open_msg_for_purge_cb (ModestMailOperation *mail_op,
                g_object_unref (part);
                tny_iterator_next (iter);
        }
+       modest_window_mgr_unregister_header (mgr, header);
 
        g_object_unref (iter);
        g_object_unref (parts);
@@ -3143,51 +3477,91 @@ modest_ui_actions_on_main_window_remove_attachments (GtkAction *action,
                g_object_unref (header_list);
 }
 
+/**
+ * Utility function that transfer messages from both the main window
+ * and the msg view window when using the "Move to" dialog
+ */
+static void
+modest_ui_actions_xfer_messages_from_move_to (TnyFolderStore *dst_folder,
+                                             ModestWindow *win)
+{
+       TnyList *headers = NULL;
+       gint response = 0;
+
+       if (!TNY_IS_FOLDER (dst_folder)) {
+               modest_platform_information_banner (GTK_WIDGET (win),
+                                                   NULL,
+                                                   _CS("ckdg_ib_unable_to_move_to_current_location"));
+               return;
+       }
+
+       /* Get selected headers */
+       headers = get_selected_headers (MODEST_WINDOW (win));
+
+       /* Ask for user confirmation */
+       response = msgs_move_to_confirmation (GTK_WINDOW (win), 
+                                             TNY_FOLDER (dst_folder), 
+                                             headers);
+
+       /* Transfer messages */
+       if (response == GTK_RESPONSE_OK) {
+               ModestMailOperation *mail_op = 
+                       modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, 
+                                                                      G_OBJECT(win),
+                                                                      modest_ui_actions_move_folder_error_handler,
+                                                                      NULL);
+               modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), 
+                                                mail_op);
+
+               modest_mail_operation_xfer_msgs (mail_op, 
+                                                headers,
+                                                TNY_FOLDER (dst_folder),
+                                                TRUE,
+                                                (MODEST_IS_MSG_VIEW_WINDOW (win)) ? transfer_msgs_from_viewer_cb : NULL,
+                                                NULL);
+
+               g_object_unref (G_OBJECT (mail_op));
+       }
+       g_object_unref (headers);
+}
+
+
 /*
  * UI handler for the "Move to" action when invoked from the
  * ModestMainWindow
  */
 static void 
 modest_ui_actions_on_main_window_move_to (GtkAction *action, 
+                                         GtkWidget *folder_view,
+                                         TnyFolderStore *dst_folder,
                                          ModestMainWindow *win)
 {
-       GtkWidget *dialog = NULL, *folder_view = NULL, *tree_view = NULL;
        GtkWidget *header_view = NULL;
-       gint result;
-       TnyFolderStore *folder_store = NULL;
        ModestMailOperation *mail_op = NULL;
+       TnyFolderStore *src_folder;
 
        g_return_if_fail (MODEST_IS_MAIN_WINDOW (win));
 
-       /* Get the folder view */
-       folder_view = modest_main_window_get_child_widget (win,
-                                                          MODEST_WIDGET_TYPE_FOLDER_VIEW);
-
-       /* Get header view */
-       header_view = modest_main_window_get_child_widget (win,
-                                                          MODEST_WIDGET_TYPE_HEADER_VIEW);
-
-       /* Create and run the dialog */
-       dialog = create_move_to_dialog (MODEST_WINDOW (win), folder_view, &tree_view);
-       modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (tree_view));
-       result = gtk_dialog_run (GTK_DIALOG(dialog));
-       g_object_ref (tree_view);
-
-       /* We do this to save an indentation level ;-) */
-       if (result != GTK_RESPONSE_ACCEPT)
+       /* Get the source folder */
+       src_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
+       
+       /* Offer the connection dialog if necessary, if the source folder is in a networked account: */
+       if (!modest_platform_connect_and_wait_if_network_folderstore (GTK_WINDOW (win), 
+                                                                     src_folder))
                goto end;
 
-       folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (tree_view));
-
-       if (TNY_IS_ACCOUNT (folder_store) && 
-           !MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (folder_store))
-               goto end;
+       /* Get header view */
+       header_view = 
+               modest_main_window_get_child_widget (win, MODEST_WIDGET_TYPE_HEADER_VIEW);
 
        /* Get folder or messages to transfer */
        if (gtk_widget_is_focus (folder_view)) {
-               TnyFolderStore *src_folder;
-               src_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
 
+               /* Allow only to transfer folders to the local root folder */
+               if (TNY_IS_ACCOUNT (dst_folder) && 
+                   !MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (dst_folder))
+                       goto end;
+               
                /* Clean folder on header view before moving it */
                modest_header_view_clear (MODEST_HEADER_VIEW (header_view)); 
 
@@ -3197,58 +3571,26 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action,
                                                                               G_OBJECT(win),
                                                                               modest_ui_actions_move_folder_error_handler,
                                                                               NULL);
-                       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
+                       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), 
+                                                        mail_op);
 
                        modest_mail_operation_xfer_folder (mail_op, 
                                                           TNY_FOLDER (src_folder),
-                                                          folder_store,
-                                                          TRUE,
-                                                          NULL,
-                                                          NULL);
+                                                          dst_folder,
+                                                          TRUE, NULL, NULL);
                        /* Unref mail operation */
                        g_object_unref (G_OBJECT (mail_op));
+               } else {
+                       g_warning ("%s: src_folder is not a TnyFolder.\n", __FUNCTION__);       
                }
-
-               /* Frees */
-               g_object_unref (G_OBJECT (src_folder));
-       } else {
-               if (gtk_widget_is_focus (header_view)) {
-                       TnyList *headers;
-                       gint response;
-
-                       headers = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW (header_view));
-
-                       /* Ask for user confirmation */
-                       response = msgs_move_to_confirmation (GTK_WINDOW (win), 
-                                                             TNY_FOLDER (folder_store), 
-                                                             headers);
-
-                       /* Transfer messages */
-                       if (response == GTK_RESPONSE_OK) {
-                               mail_op = 
-                                       modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, 
-                                                                                      G_OBJECT(win),
-                                                                                      modest_ui_actions_move_folder_error_handler,
-                                                                                      NULL);
-                               modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), 
-                                                                mail_op);
-
-                               modest_mail_operation_xfer_msgs (mail_op, 
-                                                                headers,
-                                                                TNY_FOLDER (folder_store),
-                                                                TRUE,
-                                                                NULL,
-                                                                NULL);
-
-                               g_object_unref (G_OBJECT (mail_op));
-                       }
-                       g_object_unref (headers);
-               }
+       } else if (gtk_widget_is_focus (header_view)) {
+               /* Transfer messages */
+               modest_ui_actions_xfer_messages_from_move_to (dst_folder, MODEST_WINDOW (win));
        }
+       
  end:
-       if (folder_store != NULL)
-               g_object_unref (folder_store);
-       gtk_widget_destroy (dialog);
+    if (src_folder)
+       g_object_unref (src_folder);
 }
 
 
@@ -3258,81 +3600,78 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action,
  */
 static void 
 modest_ui_actions_on_msg_view_window_move_to (GtkAction *action, 
+                                             TnyFolderStore *dst_folder,
                                              ModestMsgViewWindow *win)
 {
-       GtkWidget *dialog, *folder_view, *tree_view = NULL;
-       gint result;
-       ModestMainWindow *main_window;
-       TnyHeader *header;
-       TnyList *headers;
-
-       /* Get the folder view */
-       main_window = MODEST_MAIN_WINDOW (modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()));
-       if (main_window)
-               folder_view = modest_main_window_get_child_widget (main_window,
-                                                                  MODEST_WIDGET_TYPE_FOLDER_VIEW);
-       else
-               folder_view = NULL;
-
-       /* Create and run the dialog */
-       dialog = create_move_to_dialog (MODEST_WINDOW (win), folder_view, &tree_view);  
-       result = gtk_dialog_run (GTK_DIALOG(dialog));
-
-       if (result == GTK_RESPONSE_ACCEPT) {
-               TnyFolderStore *folder_store;
-               gint response;
-
-               /* Create header list */
-               header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win));              
-               g_return_if_fail (header != NULL);
+       TnyHeader *header = NULL;
+       TnyFolder *src_folder;
 
-               headers = tny_simple_list_new ();
-               tny_list_prepend (headers, G_OBJECT (header));
-               g_object_unref (header);
+       /* Create header list */
+       header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win));              
+       src_folder = tny_header_get_folder(header);
+       g_object_unref (header);
 
-               /* Ask user for confirmation. MSG-NOT404 */
-               folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (g_object_ref (tree_view)));
-               response = msgs_move_to_confirmation (GTK_WINDOW (win), 
-                                                     TNY_FOLDER (folder_store), 
-                                                     headers);
+       /* Transfer the message */
+       if (modest_platform_connect_and_wait_if_network_folderstore (NULL, TNY_FOLDER_STORE (src_folder)))
+               modest_ui_actions_xfer_messages_from_move_to (dst_folder, MODEST_WINDOW (win));
 
-               /* Transfer current msg */
-               if (response == GTK_RESPONSE_OK) {
-                       ModestMailOperation *mail_op;
-
-                       /* Create mail op */
-                       mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT(win));
-                       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), 
-                                                        mail_op);
-                       
-                       /* Transfer messages */
-                       modest_mail_operation_xfer_msgs (mail_op, 
-                                                        headers,
-                                                        TNY_FOLDER (folder_store),
-                                                        TRUE,
-                                                        transfer_msgs_from_viewer_cb,
-                                                        NULL);
-                       g_object_unref (G_OBJECT (mail_op));
-               }
-               g_object_unref (headers);
-               g_object_unref (folder_store);
-       }
-       gtk_widget_destroy (dialog);
+       g_object_unref (src_folder);
 }
 
 void 
 modest_ui_actions_on_move_to (GtkAction *action, 
                              ModestWindow *win)
 {
+       GtkWidget *dialog = NULL, *folder_view = NULL, *tree_view = NULL;
+       gint result = 0;
+       TnyFolderStore *dst_folder = NULL;
+       ModestMainWindow *main_window;
+
        g_return_if_fail (MODEST_IS_MAIN_WINDOW (win) ||
                          MODEST_IS_MSG_VIEW_WINDOW (win));
 
-       if (MODEST_IS_MAIN_WINDOW (win)) 
-               modest_ui_actions_on_main_window_move_to (action, 
-                                                         MODEST_MAIN_WINDOW (win));
+       /* Get the main window if exists */
+       if (MODEST_IS_MAIN_WINDOW (win))
+               main_window = MODEST_MAIN_WINDOW (win);
        else
-               modest_ui_actions_on_msg_view_window_move_to (action, 
-                                                             MODEST_MSG_VIEW_WINDOW (win));
+               main_window = 
+                       MODEST_MAIN_WINDOW (modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()));
+
+       /* Get the folder view widget if exists */
+       if (main_window)
+               folder_view = modest_main_window_get_child_widget (main_window,
+                                                                  MODEST_WIDGET_TYPE_FOLDER_VIEW);
+       else
+               folder_view = NULL;
+
+       /* 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));
+       result = gtk_dialog_run (GTK_DIALOG(dialog));
+       g_object_ref (tree_view);
+       gtk_widget_destroy (dialog);
+
+       if (result != GTK_RESPONSE_ACCEPT)
+               return;
+
+       dst_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (tree_view));
+       /* Offer the connection dialog if necessary: */
+       if (modest_platform_connect_and_wait_if_network_folderstore (GTK_WINDOW (win), 
+                                                                     dst_folder)) {
+
+               /* Do window specific stuff */
+               if (MODEST_IS_MAIN_WINDOW (win))
+                       modest_ui_actions_on_main_window_move_to (action,
+                                                                 folder_view,
+                                                                 dst_folder,
+                                                                 MODEST_MAIN_WINDOW (win));
+               else
+                       modest_ui_actions_on_msg_view_window_move_to (action,
+                                                                     dst_folder,
+                                                                     MODEST_MSG_VIEW_WINDOW (win));
+       }
+       if (dst_folder)
+               g_object_unref (dst_folder);
 }
 
 /*
@@ -3452,9 +3791,9 @@ modest_ui_actions_on_help (GtkAction *action,
 
                        /* Switch help_id */
                        if (TNY_IS_FOLDER (folder_store)) {
-                               switch (tny_folder_get_folder_type (TNY_FOLDER (folder_store))) {
+                               switch (modest_tny_folder_guess_folder_type (TNY_FOLDER (folder_store))) {
                                case TNY_FOLDER_TYPE_NORMAL:
-                                       help_id = "applications_email_userfolder";
+                                       help_id = "applications_email_managefolders";
                                        break;
                                case TNY_FOLDER_TYPE_INBOX:
                                        help_id = "applications_email_inbox";
@@ -3469,11 +3808,13 @@ modest_ui_actions_on_help (GtkAction *action,
                                        help_id = "applications_email_drafts";
                                        break;
                                case TNY_FOLDER_TYPE_ARCHIVE:
-                                       help_id = "applications_email_archive";
+                                       help_id = "applications_email_managefolders";
                                        break;
                                default:
-                                       help_id = NULL;
+                                       help_id = "applications_email_managefolders";
                                }
+                       } else {
+                               help_id = "applications_email_mainview";        
                        }
                        g_object_unref (folder_store);
                } else {