2007-06-12 Murray Cumming <murrayc@murrayc.com>
[modest] / src / modest-ui-actions.c
index fd09f13..98593ab 100644 (file)
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif /*HAVE_CONFIG_H*/
 
 #include <glib/gi18n.h>
+#include <glib/gprintf.h>
 #include <string.h>
 #include <modest-runtime.h>
 #include <modest-tny-folder.h>
 #include <modest-tny-msg.h>
 #include <modest-tny-account.h>
 #include <modest-address-book.h>
-
+#include "modest-error.h"
 #include "modest-ui-actions.h"
 
 #include "modest-tny-platform-factory.h"
@@ -54,7 +55,9 @@
 #include <widgets/modest-account-view-window.h>
 #include <widgets/modest-details-dialog.h>
 #include <widgets/modest-attachments-view.h>
+#include "widgets/modest-folder-view.h"
 #include "widgets/modest-global-settings-dialog.h"
+#include "modest-connection-specific-smtp-window.h"
 #include "modest-account-mgr-helpers.h"
 #include "modest-mail-operation.h"
 #include "modest-text-utils.h"
@@ -68,6 +71,7 @@
 #include <tny-simple-list.h>
 #include <tny-msg-view.h>
 #include <tny-device.h>
+#include <tny-merge-folder.h>
 
 typedef struct _GetMsgAsyncHelper {    
        ModestWindow *window;
@@ -85,18 +89,12 @@ typedef enum _ReplyForwardAction {
 } ReplyForwardAction;
 
 typedef struct _ReplyForwardHelper {
-guint reply_forward_type;
+       guint reply_forward_type;
        ReplyForwardAction action;
        gchar *account_name;
-       guint pending_ops;
+       GtkWidget *parent_window;
 } ReplyForwardHelper;
 
-typedef struct _HeaderActivatedHelper {
-       GtkTreeModel *model;
-       GtkTreeIter iter;
-       TnyFolder *folder;
-} HeaderActivatedHelper;
-
 /*
  * The do_headers_action uses this kind of functions to perform some
  * action to each member of a list of headers
@@ -109,14 +107,27 @@ do_headers_action (ModestWindow *win,
                   gpointer user_data);
 
 
-static void     open_msg_func          (const GObject *obj, const TnyMsg *msg, gpointer user_data);
+static void     open_msg_cb            (ModestMailOperation *mail_op, 
+                                       TnyHeader *header, 
+                                       TnyMsg *msg,
+                                       gpointer user_data);
 
-static void     reply_forward_func     (const GObject *obj, const TnyMsg *msg, gpointer user_data);
+static void     reply_forward_cb       (ModestMailOperation *mail_op, 
+                                       TnyHeader *header, 
+                                       TnyMsg *msg,
+                                       gpointer user_data);
 
 static void     reply_forward          (ReplyForwardAction action, ModestWindow *win);
 
 static gchar*   ask_for_folder_name    (GtkWindow *parent_window, const gchar *title);
 
+
+static void     _on_send_receive_progress_changed (ModestMailOperation  *mail_op, 
+                                                  ModestMailOperationState *state,
+                                                  gpointer user_data);
+
+
+
 void   
 modest_ui_actions_on_about (GtkAction *action, ModestWindow *win)
 {
@@ -143,7 +154,14 @@ modest_ui_actions_on_about (GtkAction *action, ModestWindow *win)
        gtk_widget_destroy(about);
 }
 
-
+/*
+ * Gets the list of currently selected messages. If the win is the
+ * main window, then it returns a newly allocated list of the headers
+ * selected in the header view. If win is the msg view window, then
+ * the value returned is a list with just a single header.
+ *
+ * The caller of this funcion must free the list.
+ */
 static TnyList *
 get_selected_headers (ModestWindow *win)
 {
@@ -156,17 +174,16 @@ get_selected_headers (ModestWindow *win)
                
        } else if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
                /* for MsgViewWindows, we simply return a list with one element */
-               TnyMsg *msg;
                TnyHeader *header;
                TnyList *list = NULL;
                
-               msg  = modest_msg_view_window_get_message (MODEST_MSG_VIEW_WINDOW(win));
-               if (msg) {
-                       header = tny_msg_get_header (msg);
+               header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win));
+               if (header != NULL) {
                        list = tny_simple_list_new ();
                        tny_list_prepend (list, G_OBJECT(header));
                        g_object_unref (G_OBJECT(header));
                }
+
                return list;
 
        } else
@@ -174,17 +191,46 @@ get_selected_headers (ModestWindow *win)
 }
 
 static void
+headers_action_mark_as_read (TnyHeader *header,
+                            ModestWindow *win,
+                            gpointer user_data)
+{
+       TnyHeaderFlags flags;
+
+       g_return_if_fail (TNY_IS_HEADER(header));
+
+       flags = tny_header_get_flags (header);
+       if (flags & TNY_HEADER_FLAG_SEEN) return;
+       tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN);
+}
+
+static void
+headers_action_mark_as_unread (TnyHeader *header,
+                              ModestWindow *win,
+                              gpointer user_data)
+{
+       TnyHeaderFlags flags;
+
+       g_return_if_fail (TNY_IS_HEADER(header));
+
+       flags = tny_header_get_flags (header);
+       if (flags & TNY_HEADER_FLAG_SEEN)  {
+               tny_header_unset_flags (header, TNY_HEADER_FLAG_SEEN);
+       }
+}
+
+
+static void
 headers_action_delete (TnyHeader *header,
                       ModestWindow *win,
                       gpointer user_data)
 {
-       ModestMailOperation *mail_op;
+       ModestMailOperation *mail_op = NULL;
 
-       /* TODO: add confirmation dialog */
-       mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_DELETE, G_OBJECT(win));
+       mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_DELETE, G_OBJECT(win));
        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));
@@ -193,20 +239,83 @@ headers_action_delete (TnyHeader *header,
 void
 modest_ui_actions_on_delete (GtkAction *action, ModestWindow *win)
 {
+       TnyList *header_list = NULL;
+       TnyIterator *iter = NULL;
+       TnyHeader *header = NULL;
+       gchar *message = NULL;
+       gchar *desc = NULL;
+       gint response;
+       gboolean found;
+       ModestWindowMgr *mgr;
+
        g_return_if_fail (MODEST_IS_WINDOW(win));
 
-       if (MODEST_IS_MSG_EDIT_WINDOW (win)) {
-               gboolean ret_value;
-               g_signal_emit_by_name (G_OBJECT (win), "delete-event", NULL, &ret_value);
+       header_list = get_selected_headers (win);
+       if (!header_list) return;
+
+       /* Check if any of the headers is already opened */
+       iter = tny_list_create_iterator (header_list);
+       found = FALSE;
+       mgr = modest_runtime_get_window_mgr ();
+       while (!tny_iterator_is_done (iter) && !found) {
+               header = TNY_HEADER (tny_iterator_get_current (iter));
+               if (modest_window_mgr_find_window_by_header (mgr, header))
+                       found = TRUE;
+               g_object_unref (header);
+               tny_iterator_next (iter);
+       }
+       g_object_unref (iter);
+
+       if (found) {
+               gchar *num, *msg;
+
+               num = g_strdup_printf ("%d", tny_list_get_length (header_list));
+               msg = g_strdup_printf (_("mcen_nc_unable_to_delete_n_messages"), num);
+
+               modest_platform_run_information_dialog (GTK_WINDOW (win), (const gchar *) msg);
+
+               g_free (msg);
+               g_free (num);
+               g_object_unref (header_list);
                return;
        }
+
+       /* Select message */
+       if (tny_list_get_length(header_list) > 1)
+               message = g_strdup(_("emev_nc_delete_messages"));
+       else {
+               iter = tny_list_create_iterator (header_list);
+               header = TNY_HEADER (tny_iterator_get_current (iter));
+               desc = g_strdup_printf ("%s", tny_header_get_subject (header)); 
+               message = g_strdup_printf(_("emev_nc_delete_message"), desc);
+               g_object_unref (header);
+               g_object_unref (iter);
+       }
+
+       /* Confirmation dialog */               
+       response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
+                                                           message);
+       
+
+       if (response == GTK_RESPONSE_OK) {
+               if (MODEST_IS_MSG_EDIT_WINDOW (win)) {
+                       gboolean ret_value;
+                       g_signal_emit_by_name (G_OBJECT (win), "delete-event", NULL, &ret_value);
+                       return;
+               }
                
-       /* Remove each header */
-       do_headers_action (win, headers_action_delete, NULL);
+               /* Remove each header */
+               do_headers_action (win, headers_action_delete, NULL);
 
-       if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
-               gtk_widget_destroy (GTK_WIDGET(win));
-       } 
+               if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
+                       gtk_widget_destroy (GTK_WIDGET(win));
+               } 
+       }
+
+       /* free */
+       g_free(message);
+       g_free(desc);
+       g_object_unref (header_list);
 }
 
 
@@ -244,22 +353,25 @@ modest_ui_actions_on_add_to_contacts (GtkAction *action, ModestWindow *win)
        clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY);
        selection = gtk_clipboard_wait_for_text (clipboard);
 
-       modest_address_book_add_address (selection);
-       g_free (selection);
+       /* Question: why is the clipboard being used here? 
+        * It doesn't really make a lot of sense. */
+
+       if (selection)
+       {
+               modest_address_book_add_address (selection);
+               g_free (selection);
+       }
 }
 
 void
 modest_ui_actions_on_accounts (GtkAction *action, ModestWindow *win)
 {
-       
        /* This is currently only implemented for Maemo,
         * because it requires a providers preset file which is not publically available.
         */
 #ifdef MODEST_PLATFORM_MAEMO /* Defined in config.h */
-       GSList *account_names = modest_account_mgr_account_names (modest_runtime_get_account_mgr(), 
-                               TRUE /* enabled accounts only */);
-       gboolean accounts_exist = account_names != NULL;
-       g_slist_free (account_names);
+       gboolean accounts_exist = modest_account_mgr_has_accounts(
+                                                                                                                                                                                                                                               modest_runtime_get_account_mgr(), TRUE);
        
        if (!accounts_exist) {
                /* If there are no accounts yet, just show the easy-setup wizard, as per the UI spec: */
@@ -301,6 +413,56 @@ modest_ui_actions_on_accounts (GtkAction *action, ModestWindow *win)
 #endif /* MODEST_PLATFORM_MAEMO */
 }
 
+static void
+on_smtp_servers_window_hide (GtkWindow* window, gpointer user_data)
+{
+       ModestWindow *main_window = MODEST_WINDOW (user_data);
+       
+       /* Save any changes. */
+       modest_connection_specific_smtp_window_save_server_accounts (
+                       MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (window), 
+                       modest_window_get_active_account (main_window));
+       gtk_widget_destroy (GTK_WIDGET (window));
+}
+
+void
+modest_ui_actions_on_smtp_servers (GtkAction *action, ModestWindow *win)
+{
+       /* This is currently only implemented for Maemo,
+        * because it requires an API (libconic) to detect different connection 
+        * possiblities.
+        */
+#ifdef MODEST_PLATFORM_MAEMO /* Defined in config.h */
+       
+       /* Create the window if necessary: */
+       const gchar *active_account_name = modest_window_get_active_account (win);
+       
+       /* TODO: Dim the menu item (not in the UI spec)? or show a warning,
+        * or show the default account?
+        * If we show the default account then the account name should be shown in 
+        * the window when we show it. */
+       if (!active_account_name) {
+               g_warning ("%s: No account is active.", __FUNCTION__);
+               return;
+       }
+               
+       GtkWidget *specific_window = GTK_WIDGET (modest_connection_specific_smtp_window_new ());
+       modest_connection_specific_smtp_window_fill_with_connections (
+               MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (specific_window), 
+               modest_runtime_get_account_mgr(), 
+               active_account_name);
+
+       /* Show the window: */  
+       gtk_window_set_transient_for (GTK_WINDOW (specific_window), GTK_WINDOW (win));
+       gtk_window_set_modal (GTK_WINDOW (specific_window), TRUE);
+    gtk_widget_show (specific_window);
+    
+    /* Save changes when the window is hidden: */
+       g_signal_connect (specific_window, "hide", 
+               G_CALLBACK (on_smtp_servers_window_hide), win);
+#endif /* MODEST_PLATFORM_MAEMO */
+}
+
 void
 modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win)
 {
@@ -312,7 +474,7 @@ modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win)
 /*     GError *err = NULL; */
        TnyAccount *account = NULL;
        ModestWindowMgr *mgr;
-       gchar *signature = NULL;
+       gchar *signature = NULL, *blank_and_signature = NULL;
        
        account_name = g_strdup(modest_window_get_active_account (win));
        if (!account_name)
@@ -322,7 +484,7 @@ modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win)
                goto cleanup;
        }
        
-       account = modest_tny_account_store_get_tny_account_by_account (modest_runtime_get_account_store(),
+       account = modest_tny_account_store_get_server_account (modest_runtime_get_account_store(),
                                                                       account_name,
                                                                       TNY_ACCOUNT_TYPE_STORE);
        if (!account) {
@@ -340,11 +502,13 @@ modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win)
                                         MODEST_ACCOUNT_USE_SIGNATURE, FALSE)) {
                signature = modest_account_mgr_get_string (modest_runtime_get_account_mgr (), account_name,
                                                           MODEST_ACCOUNT_SIGNATURE, FALSE);
+               blank_and_signature = g_strconcat ("\n", signature, NULL);
+               g_free (signature);
        } else {
-               signature = g_strdup ("");
+               blank_and_signature = g_strdup ("");
        }
 
-       msg = modest_tny_msg_new ("", from_str, "", "", "", signature, NULL);
+       msg = modest_tny_msg_new ("", from_str, "", "", "", blank_and_signature, NULL);
        if (!msg) {
                g_printerr ("modest: failed to create new msg\n");
                goto cleanup;
@@ -365,6 +529,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);
        mgr = modest_runtime_get_window_mgr ();
        modest_window_mgr_register_window (mgr, msg_win);
@@ -377,7 +542,7 @@ modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win)
 cleanup:
        g_free (account_name);
        g_free (from_str);
-       g_free (signature);
+       g_free (blank_and_signature);
        if (account)
                g_object_unref (G_OBJECT(account));
        if (msg)
@@ -387,62 +552,76 @@ cleanup:
 }
 
 static void
-headers_action_open (TnyHeader *header, 
-                    ModestWindow *win, 
-                    gpointer user_data)
-{
-       modest_ui_actions_on_header_activated (MODEST_HEADER_VIEW (user_data), 
-                                              header,
-                                              MODEST_MAIN_WINDOW (win));
-}
-
-void
-modest_ui_actions_on_open (GtkAction *action, ModestWindow *win)
-{
-       GtkWidget *header_view;
-
-       /* Get header view */
-       header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
-                                                          MODEST_WIDGET_TYPE_HEADER_VIEW);
-
-       /* Open each message */
-       do_headers_action (win, headers_action_open, header_view);
-}
-
-
-static void
-open_msg_func (const GObject *obj, const TnyMsg *msg, gpointer user_data)
+open_msg_cb (ModestMailOperation *mail_op, 
+            TnyHeader *header, 
+            TnyMsg *msg, 
+            gpointer user_data)
 {
        ModestWindowMgr *mgr = NULL;
        ModestWindow *parent_win = NULL;
        ModestWindow *win = NULL;
-       HeaderActivatedHelper *helper = NULL;
        TnyFolderType folder_type = TNY_FOLDER_TYPE_UNKNOWN;
        gchar *account = NULL;
+       TnyFolder *folder;
        
-       g_return_if_fail (MODEST_IS_WINDOW(obj));
-       g_return_if_fail (user_data != NULL);
-       parent_win = MODEST_WINDOW(obj);
-       helper = (HeaderActivatedHelper *) user_data;
+       /* TODO: Show an error? (review the specs) */
+       if (!msg)
+               return;
+
+       parent_win = (ModestWindow *) modest_mail_operation_get_source (mail_op);
+       folder = tny_header_get_folder (header);
+
+       /* Mark header as read */
+       headers_action_mark_as_read (header, MODEST_WINDOW(parent_win), NULL);
 
        /* Get account */
-       account =  g_strdup(modest_window_get_active_account(MODEST_WINDOW(parent_win)));
+       account =  g_strdup (modest_window_get_active_account (MODEST_WINDOW (parent_win)));
        if (!account)
                account = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr());
        
-       /* Gets foldert type (OUTBOX headers will be opened in edit window */
-       if (modest_tny_folder_is_local_folder (helper->folder))
-               folder_type = modest_tny_folder_get_local_folder_type (helper->folder);
+       /* Gets folder type (OUTBOX headers will be opened in edit window */
+       if (modest_tny_folder_is_local_folder (folder))
+               folder_type = modest_tny_folder_get_local_folder_type (folder);
 
-       switch (folder_type) {
-       case TNY_FOLDER_TYPE_DRAFTS:
-               win = modest_msg_edit_window_new ((TnyMsg *) msg, account);
-               break;
-       default:
-               if (helper->model != NULL)
-                       win = modest_msg_view_window_new_with_header_model ((TnyMsg *) msg, account, helper->model, helper->iter);
-               else
-                       win = modest_msg_view_window_new ((TnyMsg *) msg, account);
+       /* If the header is in the drafts folder then open the editor,
+          else the message view window */
+       if (folder_type == TNY_FOLDER_TYPE_DRAFTS) {
+               win = modest_msg_edit_window_new (msg, account);
+       } else {
+               gchar *uid = modest_tny_folder_get_header_unique_id (header);
+
+               if (MODEST_IS_MAIN_WINDOW (parent_win)) {
+                       GtkWidget *header_view;
+                       GtkTreeSelection *sel;
+                       GList *sel_list = NULL;
+                       GtkTreeModel *model;
+               
+                       header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(parent_win),
+                                                                          MODEST_WIDGET_TYPE_HEADER_VIEW);
+
+                       sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (header_view));
+                       sel_list = gtk_tree_selection_get_selected_rows (sel, &model);
+
+                       if (sel_list != NULL) {
+                               GtkTreeRowReference *row_reference;
+
+                               row_reference = gtk_tree_row_reference_new (model, (GtkTreePath *) sel_list->data);
+                               g_list_foreach (sel_list, (GFunc) gtk_tree_path_free, NULL);
+                               g_list_free (sel_list);
+                               
+                               win = modest_msg_view_window_new_with_header_model (msg, 
+                                                                                   account,
+                                                                                   (const gchar*) uid,
+                                                                                   model, 
+                                                                                   row_reference);
+                               gtk_tree_row_reference_free (row_reference);
+                       } else {
+                               win = modest_msg_view_window_new (msg, account, (const gchar*) uid);
+                       }
+               } else {
+                       win = modest_msg_view_window_new (msg, account, (const gchar*) uid);
+               }
+               g_free (uid);
        }
        
        /* Register and show new window */
@@ -455,21 +634,119 @@ open_msg_func (const GObject *obj, const TnyMsg *msg, gpointer user_data)
 
        /* Free */
        g_free(account);
-/*     g_object_unref (G_OBJECT(msg)); */
-       g_object_unref (G_OBJECT(helper->folder));
-       g_slice_free (HeaderActivatedHelper, helper);
+       g_object_unref (msg);
+       g_object_unref (folder);
+       g_object_unref (header);
 }
 
+/*
+ * This function is the error handler of the
+ * modest_mail_operation_get_msgs_full operation
+ */
 static void
-reply_forward_func (const GObject *obj, const TnyMsg *msg, gpointer user_data)
+modest_ui_actions_get_msgs_full_error_handler (ModestMailOperation *mail_op,
+                                              gpointer user_data)
+{
+       const GError *error;
+
+       error = modest_mail_operation_get_error (mail_op);
+       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);
+       }
+}
+
+/*
+ * This function is used by both modest_ui_actions_on_open and
+ * modest_ui_actions_on_header_activated. This way we always do the
+ * same when trying to open messages.
+ */
+static void
+_modest_ui_actions_open (TnyList *headers, ModestWindow *win)
+{
+       ModestWindowMgr *mgr;
+       TnyIterator *iter;
+       ModestMailOperation *mail_op;
+
+       /* Look if we already have a message view for each header. If
+          true, then remove the header from the list of headers to
+          open */
+       mgr = modest_runtime_get_window_mgr ();
+       iter = tny_list_create_iterator (headers);
+       while (!tny_iterator_is_done (iter)) {
+               ModestWindow *window;
+               TnyHeader *header;
+               
+               header = TNY_HEADER (tny_iterator_get_current (iter));
+               window = modest_window_mgr_find_window_by_header (mgr, header);
+               if (window) {
+                       /* Do not open again the message and present
+                          the window to the user */
+                       tny_list_remove (headers, G_OBJECT (header));
+                       gtk_window_present (GTK_WINDOW (window));
+               }
+
+               g_object_unref (header);
+               tny_iterator_next (iter);
+       }
+
+       
+       /* Open each message */
+       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_msgs_full (mail_op, 
+                                            headers, 
+                                            open_msg_cb, 
+                                            NULL, 
+                                            NULL);
+       /* Clean */
+       g_object_unref (iter);
+       g_object_unref(mail_op);
+}
+
+void
+modest_ui_actions_on_open (GtkAction *action, ModestWindow *win)
+{
+       TnyList *headers;
+
+       /* Get headers */
+       headers = get_selected_headers (win);
+       if (!headers)
+               return;
+
+       /* Open them */
+       _modest_ui_actions_open (headers, win);
+
+       g_object_unref(headers);
+}
+
+
+static void
+free_reply_forward_helper (gpointer data)
+{
+       ReplyForwardHelper *helper;
+
+       helper = (ReplyForwardHelper *) data;
+       g_free (helper->account_name);
+       g_slice_free (ReplyForwardHelper, helper);
+}
+
+static void
+reply_forward_cb (ModestMailOperation *mail_op, 
+                 TnyHeader *header, 
+                 TnyMsg *msg,
+                 gpointer user_data)
 {
        TnyMsg *new_msg;
        ReplyForwardHelper *rf_helper;
        ModestWindow *msg_win;
        ModestEditType edit_type;
        gchar *from;
-       GError *err = NULL;
-       TnyFolder *folder = NULL;
        TnyAccount *account = NULL;
        ModestWindowMgr *mgr;
        gchar *signature = NULL;
@@ -477,8 +754,6 @@ reply_forward_func (const GObject *obj, const TnyMsg *msg, gpointer user_data)
        g_return_if_fail (user_data != NULL);
        rf_helper = (ReplyForwardHelper *) user_data;
 
-       rf_helper->pending_ops--;
-
        from = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(),
                                                   rf_helper->account_name);
        if (modest_account_mgr_get_bool (modest_runtime_get_account_mgr(),
@@ -493,19 +768,19 @@ reply_forward_func (const GObject *obj, const TnyMsg *msg, gpointer user_data)
        switch (rf_helper->action) {
        case ACTION_REPLY:
                new_msg = 
-                       modest_tny_msg_create_reply_msg ((TnyMsg *) msg,  from, signature,
+                       modest_tny_msg_create_reply_msg (msg,  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 ((TnyMsg *) msg, from, signature, rf_helper->reply_forward_type,
+                       modest_tny_msg_create_reply_msg (msg, from, signature, rf_helper->reply_forward_type,
                                                         MODEST_TNY_MSG_REPLY_MODE_ALL);
                edit_type = MODEST_EDIT_TYPE_REPLY;
                break;
        case ACTION_FORWARD:
                new_msg = 
-                       modest_tny_msg_create_forward_msg ((TnyMsg *) msg, from, signature, rf_helper->reply_forward_type);
+                       modest_tny_msg_create_forward_msg (msg, from, signature, rf_helper->reply_forward_type);
                edit_type = MODEST_EDIT_TYPE_FORWARD;
                break;
        default:
@@ -520,7 +795,7 @@ reply_forward_func (const GObject *obj, const TnyMsg *msg, gpointer user_data)
                goto cleanup;
        }
 
-       account = modest_tny_account_store_get_tny_account_by_account (modest_runtime_get_account_store(),
+       account = modest_tny_account_store_get_server_account (modest_runtime_get_account_store(),
                                                                       rf_helper->account_name,
                                                                       TNY_ACCOUNT_TYPE_STORE);
        if (!account) {
@@ -528,41 +803,76 @@ reply_forward_func (const GObject *obj, const TnyMsg *msg, gpointer user_data)
                goto cleanup;
        }
 
-       folder = modest_tny_account_get_special_folder (account, TNY_FOLDER_TYPE_DRAFTS);
-       if (!folder) {
-               g_printerr ("modest: failed to find Drafts folder\n");
-               goto cleanup;
-       }
-       
-       tny_folder_add_msg (folder, (TnyMsg *) msg, &err);
-       if (err) {
-               g_printerr ("modest: error adding msg to Drafts folder: %s",
-                           err->message);
-               g_error_free (err);
-               goto cleanup;
-       }       
-
-       /* Create and register the windows */                   
+       /* Create and register the windows */
        msg_win = modest_msg_edit_window_new (new_msg, rf_helper->account_name);
        mgr = modest_runtime_get_window_mgr ();
        modest_window_mgr_register_window (mgr, msg_win);
 
+       if (rf_helper->parent_window != NULL) {
+               gdouble parent_zoom;
+
+               parent_zoom = modest_window_get_zoom (MODEST_WINDOW (rf_helper->parent_window));
+               modest_window_set_zoom (msg_win, parent_zoom);
+       }
+
        /* Show edit window */
        gtk_widget_show_all (GTK_WIDGET (msg_win));
 
 cleanup:
        if (new_msg)
                g_object_unref (G_OBJECT (new_msg));
-       if (folder)
-               g_object_unref (G_OBJECT (folder));
        if (account)
                g_object_unref (G_OBJECT (account));
-       
-       if (rf_helper->pending_ops == 0) {
-               g_free (rf_helper->account_name);
-               g_slice_free (ReplyForwardHelper, rf_helper);
+       g_object_unref (msg);
+       g_object_unref (header);
+}
+
+/*
+ * Checks a list of headers. If any of them are not currently
+ * downloaded (CACHED) then it asks the user for permission to
+ * download them.
+ *
+ * Returns FALSE if the user does not want to download the
+ * messages. Returns TRUE if the user allowed the download or if all
+ * of them are currently downloaded
+ */
+static gboolean
+download_uncached_messages (TnyList *header_list, GtkWindow *win)
+{
+       TnyIterator *iter;
+       gboolean found, retval;
+
+       iter = tny_list_create_iterator (header_list);
+       found = FALSE;
+       while (!tny_iterator_is_done (iter) && !found) {
+               TnyHeader *header;
+               TnyHeaderFlags flags;
+
+               header = TNY_HEADER (tny_iterator_get_current (iter));
+               flags = tny_header_get_flags (header);
+               /* TODO: is this the right flag?, it seems that some
+                  headers that have been previously downloaded do not
+                  come with it */
+               found = !(flags & TNY_HEADER_FLAG_CACHED);
+               g_object_unref (header);
+               tny_iterator_next (iter);
        }
+       g_object_unref (iter);
+
+       /* Ask for user permission to download the messages */
+       retval = TRUE;
+       if (found) {
+               GtkResponseType response;
+               response = 
+                       modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
+                                                                _("mcen_nc_get_multi_msg_txt"));
+               if (response == GTK_RESPONSE_CANCEL)
+                       retval = FALSE;
+       }
+       return retval;
 }
+
+
 /*
  * Common code for the reply and forward actions
  */
@@ -573,16 +883,25 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
        TnyList *header_list = NULL;
        ReplyForwardHelper *rf_helper = NULL;
        guint reply_forward_type;
+       gboolean continue_download;
        
        g_return_if_fail (MODEST_IS_WINDOW(win));
 
        header_list = get_selected_headers (win);
        if (!header_list)
                return;
+
+       /* Check that the messages have been previously downloaded */
+       continue_download = download_uncached_messages (header_list, GTK_WINDOW (win));
+       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);
+       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
@@ -592,29 +911,48 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
        rf_helper = g_slice_new0 (ReplyForwardHelper);
        rf_helper->reply_forward_type = reply_forward_type;
        rf_helper->action = action;
-       rf_helper->pending_ops = tny_list_get_length (header_list);
        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)
                rf_helper->account_name =
                        modest_account_mgr_get_default_account (modest_runtime_get_account_mgr());
 
        if (MODEST_IS_MSG_VIEW_WINDOW(win)) {
                TnyMsg *msg;
-               msg = modest_msg_view_window_get_message(MODEST_MSG_VIEW_WINDOW(win));
-               if (!msg) {
+               TnyHeader *header;
+               /* Get header and message. Do not free them here, the
+                  reply_forward_cb must do it */
+               msg = modest_msg_view_window_get_message (MODEST_MSG_VIEW_WINDOW(win));
+               header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW(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_func (G_OBJECT(win), msg, rf_helper);
+                       reply_forward_cb (NULL, header, msg, rf_helper);
        } else {
-                               
-               mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_RECEIVE, G_OBJECT(win));
+               /* 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);
-               modest_mail_operation_process_msg (mail_op, header_list, reply_forward_func, rf_helper);
+               modest_mail_operation_get_msgs_full (mail_op, 
+                                                    header_list, 
+                                                    reply_forward_cb, 
+                                                    rf_helper, 
+                                                    free_reply_forward_helper);
 
                /* Clean */
                g_object_unref(mail_op);
        }
+
+       /* Free */
+       g_object_unref (header_list);
 }
 
 void
@@ -690,117 +1028,30 @@ modest_ui_actions_on_sort (GtkAction *action,
 
        if (MODEST_IS_MAIN_WINDOW (window)) {
                GtkWidget *header_view;
-               header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(window),
-                                                                  MODEST_WIDGET_TYPE_HEADER_VIEW);
-               if (!header_view)
-                       return;
-
-               /* Show sorting dialog */
-               modest_platform_run_sort_dialog (GTK_WINDOW (window), MODEST_SORT_HEADERS);     
-       }
-}
-
-
-static gboolean
-action_send (const gchar* account_name)
-{
-       TnyAccount *tny_account;
-       ModestTnySendQueue *send_queue;
-
-       g_return_val_if_fail (account_name, FALSE);
-
-       /* Get the transport account according to the open connection, 
-        * because the account might specify connection-specific SMTP servers.
-        */
-       tny_account = 
-               modest_tny_account_store_get_transport_account_for_open_connection (modest_runtime_get_account_store(),
-                                                                    account_name);
-       if (!tny_account) {
-               g_printerr ("modest: cannot get tny transport account for %s\n", account_name);
-               return FALSE;
-       }
-       
-       send_queue = modest_tny_send_queue_new (TNY_CAMEL_TRANSPORT_ACCOUNT(tny_account));
-       if (!send_queue) {
-               g_object_unref (G_OBJECT(tny_account));
-               g_printerr ("modest: cannot get send queue for %s\n", account_name);
-               return FALSE;
-       }
-       
-       modest_tny_send_queue_flush (send_queue);
-
-       g_object_unref (G_OBJECT(send_queue));
-       g_object_unref (G_OBJECT(tny_account));
-
-       return TRUE;
-}
-
-
-static gboolean
-action_receive (const gchar* account_name, 
-               ModestWindow *win)
-{
-       TnyAccount *tny_account;
-       ModestMailOperation *mail_op;
-
-       g_return_val_if_fail (account_name, FALSE);
-
-       tny_account = 
-               modest_tny_account_store_get_tny_account_by_account (modest_runtime_get_account_store(),
-                                                                    account_name,
-                                                                    TNY_ACCOUNT_TYPE_STORE);
-       if (!tny_account) {
-               g_printerr ("modest: cannot get tny store account for %s\n", account_name);
-               return FALSE;
-       }
-
-       /* Create the mail operation */
-       /* TODO: The spec wants us to first do any pending deletions, before receiving. */
-       mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_RECEIVE, G_OBJECT(win));
-       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
-       modest_mail_operation_update_account (mail_op, TNY_STORE_ACCOUNT(tny_account));
-
-       g_object_unref (G_OBJECT(tny_account));
-       g_object_unref (G_OBJECT (mail_op));
-               
-       return TRUE;
-}
-
-/** Check that an appropriate connection is open.
- */
-gboolean check_for_connection (const gchar *account_name)
-{
-       TnyDevice *device = modest_runtime_get_device ();
-
-/*
-       g_assert (TNY_IS_MAEMO_CONIC_DEVICE (device));
-       
-       TnyMaemoConicDevice *maemo_device = TNY_MAEMO_CONIC_DEVICE (device);
-*/
-       
-       if (tny_device_is_online (device))
-               return TRUE;
-       else {
-               modest_platform_connect_and_wait (NULL);
-               
-               /* TODO: Wait until a result. */
-               return TRUE;
+               header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(window),
+                                                                  MODEST_WIDGET_TYPE_HEADER_VIEW);
+               if (!header_view)
+                       return;
+
+               /* Show sorting dialog */
+               modest_platform_run_sort_dialog (GTK_WINDOW (window), MODEST_SORT_HEADERS);     
        }
 }
 
 /*
  * This function performs the send & receive required actions. The
- * window it's used to create the mail operation. Tipically it should
- * be allways the main window, but we pass it as argument in order to
+ * window is used to create the mail operation. Typically it should
+ * always be the main window, but we pass it as argument in order to
  * be more flexible.
  */
 void
 modest_ui_actions_do_send_receive (const gchar *account_name, ModestWindow *win)
 {
        gchar *acc_name = NULL;
+       ModestMailOperation *mail_op;
 
-       /* If no account name was provided get the current account, if
-          there is none either then pick the default one */
+       /* If no account name was provided then get the current account, and if
+          there is no current account then pick the default one: */
        if (!account_name) {
                acc_name = g_strdup (modest_window_get_active_account(win));
                if (!acc_name)
@@ -813,20 +1064,25 @@ modest_ui_actions_do_send_receive (const gchar *account_name, ModestWindow *win)
                acc_name = g_strdup (account_name);
        }
 
-       /* Send & receive. Do not continue if no suitable connection
-          is open */
-       if (check_for_connection (acc_name)) {
-               /* As per the UI spec,
-                * for POP accounts, we should receive,
-                * for IMAP we should synchronize everything, including receiving,
-                * for SMTP we should send,
-                * first receiving, then sending:
-                */
-               if (!action_receive(acc_name, win))
-                       g_printerr ("modest: failed to receive\n");
-               if (!action_send(acc_name))
-                       g_printerr ("modest: failed to send\n");
-       }
+       /* Set send/receive operation in progress */    
+       modest_main_window_notify_send_receive_initied (MODEST_MAIN_WINDOW(win));
+
+       mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT(win));
+       g_signal_connect (G_OBJECT(mail_op), "progress-changed", 
+                         G_CALLBACK (_on_send_receive_progress_changed), 
+                         win);
+
+       /* Send & receive. */
+       /* TODO: The spec wants us to first do any pending deletions, before receiving. */
+       /* Receive and then send. The operation is tagged initially as
+          a receive operation because the account update performs a
+          receive and then a send. The operation changes its type
+          internally, so the progress objects will receive the proper
+          progress information */
+       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
+       modest_mail_operation_update_account (mail_op, acc_name);
+       g_object_unref (G_OBJECT (mail_op));
+       
        /* Free */
        g_free (acc_name);
 }
@@ -859,11 +1115,9 @@ modest_ui_actions_do_send_receive_all (ModestWindow *win)
 void
 modest_ui_actions_on_send_receive (GtkAction *action,  ModestWindow *win)
 {
-       /* Check that at least one account exists: */
-       GSList *account_names = modest_account_mgr_account_names (modest_runtime_get_account_mgr(),
-                               TRUE /* enabled accounts only */);
-       gboolean accounts_exist = account_names != NULL;
-       g_slist_free (account_names);
+       /* 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)
@@ -913,19 +1167,23 @@ modest_ui_actions_on_header_selected (ModestHeaderView *header_view,
                                      ModestMainWindow *main_window)
 {
        g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
-
+       g_return_if_fail (MODEST_IS_HEADER_VIEW (header_view));
+       
        /* If no header has been selected then exit */
        if (!header)
                return;
-
+       
        /* Update Main window title */
        if (GTK_WIDGET_HAS_FOCUS (header_view)) {
                const gchar *subject = tny_header_get_subject (header);
-               if (subject && strcmp (subject, ""))
+               if (subject && strlen(subject) > 0)
                        gtk_window_set_title (GTK_WINDOW (main_window), subject);
                else
                        gtk_window_set_title (GTK_WINDOW (main_window), _("mail_va_no_subject"));
        }
+
+       /* Update toolbar dimming state */
+       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window));
 }
 
 void
@@ -933,51 +1191,38 @@ modest_ui_actions_on_header_activated (ModestHeaderView *header_view,
                                       TnyHeader *header,
                                       ModestMainWindow *main_window)
 {
-       ModestMailOperation *mail_op = NULL;
-       HeaderActivatedHelper *helper = NULL;
-       ModestWindowMgr *mgr = NULL;
-       ModestWindow *win = NULL;
-       GtkTreeModel *model = NULL;
-       GtkTreeIter iter;
-       GtkTreeSelection *sel = NULL;
-       GList *sel_list = NULL;
-       
+       TnyList *headers;
+
        g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
        
        if (!header)
                return;
 
-       /* Look if we already have a message view for that header */
-       mgr = modest_runtime_get_window_mgr ();
-       win = modest_window_mgr_find_window_by_msguid (mgr, tny_header_get_uid (header));
-       if (win) return;
-
-       /* Build helper */
-       helper = g_slice_new0 (HeaderActivatedHelper);
-       helper->folder = tny_header_get_folder (header);
-       helper->model = NULL;
-
-       /* Get headers tree model and selected iter to build message view */
-       sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (header_view));
-       sel_list = gtk_tree_selection_get_selected_rows (sel, &model);
-       if (sel_list != NULL) {
-               gtk_tree_model_get_iter (model, &iter, (GtkTreePath *) sel_list->data);
-               
-               /* Fill helpers */
-               helper->model = model;
-               helper->iter = iter;
+       headers = tny_simple_list_new ();
+       tny_list_prepend (headers, G_OBJECT (header));
 
-               g_list_foreach (sel_list, (GFunc) gtk_tree_path_free, NULL);
-               g_list_free (sel_list);
-       }
+       _modest_ui_actions_open (headers, MODEST_WINDOW (main_window));
 
-       /* New mail operation */
-       mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_RECEIVE, G_OBJECT(main_window));
-       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
-       modest_mail_operation_get_msg (mail_op, header, open_msg_func, helper);
+       g_object_unref (headers);
+}
 
-       /* Free */
-       g_object_unref (mail_op);
+static void
+set_active_account_from_tny_account (TnyAccount *account,
+                                    ModestWindow *window)
+{
+       const gchar *server_acc_name = tny_account_get_id (account);
+       
+       /* We need the TnyAccount provided by the
+          account store because that is the one that
+          knows the name of the Modest account */
+       TnyAccount *modest_server_account = modest_server_account = 
+               modest_tny_account_store_get_tny_account_by_id  (modest_runtime_get_account_store (), 
+                                                                server_acc_name);
+       
+       const gchar *modest_acc_name = 
+               modest_tny_account_get_parent_modest_account_name_for_server_account (modest_server_account);
+       modest_window_set_active_account (window, modest_acc_name);
+       g_object_unref (modest_server_account);
 }
 
 void 
@@ -988,7 +1233,8 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view,
 {
        ModestConf *conf;
        GtkWidget *header_view;
-       
+       gboolean folder_empty = FALSE;
+
        g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
 
        header_view = modest_main_window_get_child_widget(main_window,
@@ -998,23 +1244,49 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view,
        
        conf = modest_runtime_get_conf ();
 
-       if (TNY_IS_FOLDER (folder_store)) {
+       if (TNY_IS_ACCOUNT (folder_store)) {
+               /* Update active account */
+               set_active_account_from_tny_account (TNY_ACCOUNT (folder_store), MODEST_WINDOW (main_window));
+               /* Show account details */
+               modest_main_window_set_contents_style (main_window, MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS);
+       } else {
+               if (TNY_IS_FOLDER (folder_store) && selected) {
+                       
+                       if (!TNY_IS_MERGE_FOLDER (folder_store)) { /* TnyMergeFolder can have no get_account() implementation. */
+                               /* Update the active account */
+                               TnyAccount *account = modest_tny_folder_get_account (TNY_FOLDER (folder_store));
+                               set_active_account_from_tny_account (account, MODEST_WINDOW (main_window));
+                               g_object_unref (account);
+                       }
+                       
 
-               if (selected) {
-                       modest_main_window_set_contents_style (main_window, 
-                                                              MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS);
+                       /* Set folder on header view */
                        modest_header_view_set_folder (MODEST_HEADER_VIEW(header_view),
-                                                      TNY_FOLDER (folder_store));
-                       modest_widget_memory_restore (conf, G_OBJECT(header_view),
-                                                     MODEST_CONF_HEADER_VIEW_KEY);
+                                                      TNY_FOLDER (folder_store));                              
+                       
+                       /* Set main view style */
+                       folder_empty = tny_folder_get_all_count (TNY_FOLDER (folder_store)) == 0;
+                       if (folder_empty)  {
+                               modest_main_window_set_contents_style (main_window, 
+                                                                      MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY);
+                       }
+                       else {
+                               modest_main_window_set_contents_style (main_window, 
+                                                                      MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS);
+                               modest_widget_memory_restore (conf, G_OBJECT(header_view),
+                                                             MODEST_CONF_HEADER_VIEW_KEY);
+                       }
                } else {
+                       /* Update the active account */
+                       modest_window_set_active_account (MODEST_WINDOW (main_window), NULL);
+                       /* Do not show folder */
                        modest_widget_memory_save (conf, G_OBJECT (header_view), MODEST_CONF_HEADER_VIEW_KEY);
                        modest_header_view_set_folder (MODEST_HEADER_VIEW(header_view), NULL);
                }
-       } else if (TNY_IS_ACCOUNT (folder_store)) {
-
-               modest_main_window_set_contents_style (main_window, MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS);
        }
+
+       /* Update toolbar dimming state */
+       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window));
 }
 
 void 
@@ -1058,7 +1330,7 @@ modest_ui_actions_on_item_not_found (ModestHeaderView *header_view,ModestItemTyp
 
                gtk_window_set_default_size (GTK_WINDOW(dialog), 300, 300);
                if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
-//                     modest_platform_connect_and_wait ();;
+//                     modest_platform_connect_and_wait ();
                }
        }
        gtk_widget_destroy (dialog);
@@ -1125,8 +1397,13 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi
                modest_msg_edit_window_free_msg_data (edit_window, data);
                return;
        }
+
+       if (!strcmp (account_name, MODEST_LOCAL_FOLDERS_ACCOUNT_ID)) {
+               account_name = g_strdup (data->account_name);
+       }
+
        transport_account =
-               TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_tny_account_by_account
+               TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_server_account
                                      (modest_runtime_get_account_store(),
                                       account_name,
                                       TNY_ACCOUNT_TYPE_TRANSPORT));
@@ -1139,11 +1416,12 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi
        from = modest_account_mgr_get_from_string (account_mgr, account_name);
 
        /* Create the mail operation */         
-       mail_operation = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_INFO, G_OBJECT(edit_window));
+       mail_operation = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_INFO, G_OBJECT(edit_window));
        modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_operation);
 
        modest_mail_operation_save_to_drafts (mail_operation,
                                              transport_account,
+                                             data->draft_msg,
                                              from,
                                              data->to, 
                                              data->cc, 
@@ -1164,35 +1442,37 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi
        /* Save settings and close the window */
        gtk_widget_destroy (GTK_WIDGET (edit_window));
 }
+
+/* For instance, when clicking the Send toolbar button when editing a message: */
 void
 modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
 {
-       TnyTransportAccount *transport_account;
-       ModestMailOperation *mail_operation;
-       MsgData *data;
-       gchar *account_name, *from;
-       ModestAccountMgr *account_mgr;
-
        g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window));
 
        if (!modest_msg_edit_window_check_names (edit_window))
                return;
        
-       data = modest_msg_edit_window_get_msg_data (edit_window);
-
        /* FIXME: Code added just for testing. The final version will
           use the send queue provided by tinymail and some
           classifier */
-       account_mgr = modest_runtime_get_account_mgr();
-       account_name = g_strdup(modest_window_get_active_account (MODEST_WINDOW(edit_window)));
+       ModestAccountMgr *account_mgr = modest_runtime_get_account_mgr();
+       gchar *account_name = g_strdup(modest_window_get_active_account (MODEST_WINDOW(edit_window)));
        if (!account_name) 
                account_name = modest_account_mgr_get_default_account (account_mgr);
+               
        if (!account_name) {
                g_printerr ("modest: no account found\n");
-               modest_msg_edit_window_free_msg_data (edit_window, data);
                return;
        }
-       transport_account =
+       
+       MsgData *data = modest_msg_edit_window_get_msg_data (edit_window);
+
+       if (!strcmp (account_name, MODEST_LOCAL_FOLDERS_ACCOUNT_ID)) {
+               account_name = g_strdup (data->account_name);
+       }
+       
+       /* Get the currently-active transport account for this modest account: */
+       TnyTransportAccount *transport_account =
                TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_transport_account_for_open_connection
                                      (modest_runtime_get_account_store(),
                                       account_name));
@@ -1202,14 +1482,43 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
                modest_msg_edit_window_free_msg_data (edit_window, data);
                return;
        }
-       from = modest_account_mgr_get_from_string (account_mgr, account_name);
+       
+       gchar *from = modest_account_mgr_get_from_string (account_mgr, account_name);
 
-       /* Create the mail operation */         
-       mail_operation = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_SEND, G_OBJECT(edit_window));
+       /* mail content checks and dialogs */
+       if (data->subject == NULL || data->subject[0] == '\0') {
+               GtkResponseType response;
+               response = modest_platform_run_confirmation_dialog (GTK_WINDOW (edit_window),
+                                                                   _("mcen_nc_subject_is_empty_send"));
+               if (response == GTK_RESPONSE_CANCEL) {
+                       g_free (account_name);
+                       return;
+               }
+       }
+
+       if (data->plain_body == NULL || data->plain_body[0] == '\0') {
+               GtkResponseType response;
+               gchar *note_message;
+               gchar *note_subject = data->subject;
+               if (note_subject == NULL || note_subject[0] == '\0')
+                       note_subject = _("mail_va_no_subject");
+               note_message = g_strdup_printf (_("emev_ni_ui_smtp_message_null"), note_subject);
+               response = modest_platform_run_confirmation_dialog (GTK_WINDOW (edit_window),
+                                                                   note_message);
+               g_free (note_message);
+               if (response == GTK_RESPONSE_CANCEL) {
+                       g_free (account_name);
+                       return;
+               }
+       }
+
+       /* Create the mail operation */
+       ModestMailOperation *mail_operation = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_SEND, G_OBJECT(edit_window));
        modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_operation);
 
        modest_mail_operation_send_new_mail (mail_operation,
                                             transport_account,
+                                            data->draft_msg,
                                             from,
                                             data->to, 
                                             data->cc, 
@@ -1219,7 +1528,8 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
                                             data->html_body,
                                             data->attachments,
                                             data->priority_flags);
-       /* Frees */
+                                            
+       /* Free data: */
        g_free (from);
        g_free (account_name);
        g_object_unref (G_OBJECT (transport_account));
@@ -1227,7 +1537,7 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
 
        modest_msg_edit_window_free_msg_data (edit_window, data);
 
-       /* Save settings and close the window */
+       /* Save settings and close the window: */
        gtk_widget_destroy (GTK_WIDGET (edit_window));
 }
 
@@ -1446,26 +1756,20 @@ modest_ui_actions_on_new_folder (GtkAction *action, ModestMainWindow *main_windo
                        if (result == GTK_RESPONSE_REJECT) {
                                finished = TRUE;
                        } else {
-                               ModestMailOperation *mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_INFO, G_OBJECT(main_window));
+                               ModestMailOperation *mail_op;
                                TnyFolder *new_folder = NULL;
 
+                               mail_op  = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_INFO, 
+                                                                     G_OBJECT(main_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) {
                                        g_object_unref (new_folder);
                                        finished = TRUE;
-                               } 
-/*                             else { */
-/*                                     /\* TODO: check error and follow proper actions *\/ */
-/* /\*                                         suggested_name = X; *\/ */
-/*                                     /\* Show error to the user *\/ */
-/*                                     modest_platform_run_information_dialog (GTK_WINDOW (main_window), */
-/*                                                                             MODEST_INFORMATION_CREATE_FOLDER); */
-/*                             } */
+                               }
                                g_object_unref (mail_op);
                        }
                        g_free (folder_name);
@@ -1482,14 +1786,21 @@ modest_ui_actions_on_rename_folder (GtkAction *action,
 {
        TnyFolderStore *folder;
        GtkWidget *folder_view;
-       
+       GtkWidget *header_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;
+
+       header_view = modest_main_window_get_child_widget (main_window,
+                                                          MODEST_WIDGET_TYPE_HEADER_VIEW);
        
+       if (!header_view)
+               return;
+
        folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view));
        
        if (folder && TNY_IS_FOLDER (folder)) {
@@ -1500,10 +1811,12 @@ modest_ui_actions_on_rename_folder (GtkAction *action,
                if (folder_name != NULL && strlen (folder_name) > 0) {
                        ModestMailOperation *mail_op;
 
-                       mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_INFO, G_OBJECT(main_window));
+                       mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_INFO, G_OBJECT(main_window));
                        modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
                                                         mail_op);
 
+                       modest_header_view_set_folder (MODEST_HEADER_VIEW (header_view), NULL);
+
                        modest_mail_operation_rename_folder (mail_op,
                                                             TNY_FOLDER (folder),
                                                             (const gchar *) folder_name);
@@ -1516,6 +1829,16 @@ modest_ui_actions_on_rename_folder (GtkAction *action,
 }
 
 static void
+modest_ui_actions_delete_folder_error_handler (ModestMailOperation *mail_op,
+                                              gpointer user_data)
+{
+       GObject *win = modest_mail_operation_get_source (mail_op);
+
+       modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL,
+                                               _("mail_in_ui_folder_delete_error"));
+}
+
+static void
 delete_folder (ModestMainWindow *main_window, gboolean move_to_trash) 
 {
        TnyFolderStore *folder;
@@ -1532,6 +1855,13 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash)
 
        folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
 
+       /* Show an error if it's an account */
+       if (!TNY_IS_FOLDER (folder)) {
+               modest_platform_run_information_dialog (GTK_WINDOW (main_window),
+                                                       _("mail_in_ui_folder_delete_error"));
+               return ;
+       }
+
        /* Ask the user */      
        message =  g_strdup_printf (_("mcen_nc_delete_folder_text"), 
                                    tny_folder_get_name (TNY_FOLDER (folder)));
@@ -1540,17 +1870,15 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash)
        g_free (message);
 
        if (response == GTK_RESPONSE_OK) {
-               ModestMailOperation *mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_DELETE, G_OBJECT(main_window));
+               ModestMailOperation *mail_op = 
+                       modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_DELETE, 
+                                                                      G_OBJECT(main_window),
+                                                                      modest_ui_actions_delete_folder_error_handler,
+                                                                      NULL);
 
                modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
                                                 mail_op);
                modest_mail_operation_remove_folder (mail_op, TNY_FOLDER (folder), move_to_trash);
-
-               /* Show error if happened */
-               if (modest_mail_operation_get_error (mail_op))
-                       modest_platform_run_information_dialog (GTK_WINDOW (main_window),
-                                                               MODEST_INFORMATION_DELETE_FOLDER);
-
                g_object_unref (G_OBJECT (mail_op));
        }
 
@@ -1586,6 +1914,13 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
        g_return_if_fail(server_account_name);
        /* printf("DEBUG: %s: server_account_name=%s\n", __FUNCTION__, server_account_name); */
        
+       /* Initalize output parameters: */
+       if (cancel)
+               *cancel = FALSE;
+               
+       if (remember)
+               *remember = TRUE;
+               
 #ifdef MODEST_PLATFORM_MAEMO
        /* Maemo uses a different (awkward) button order,
         * It should probably just use gtk_alternative_dialog_button_order ().
@@ -1613,6 +1948,11 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
        
        gchar *server_name = modest_server_account_get_hostname (
                modest_runtime_get_account_mgr(), server_account_name);
+       if (!server_name) {/* This happened once, though I don't know why. murrayc. */
+               g_warning("%s: Could not get server name for server account '%s'", __FUNCTION__, server_account_name);
+               *cancel = TRUE;
+               return;
+       }
        
        /* This causes a warning because the logical ID has no %s in it, 
         * though the translation does, but there is not much we can do about that: */
@@ -1660,11 +2000,12 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
        /* password: */
        GtkWidget *entry_password = gtk_entry_new ();
        gtk_entry_set_visibility (GTK_ENTRY(entry_password), FALSE);
-       gtk_entry_set_invisible_char (GTK_ENTRY(entry_password), 0x2022); /* bullet unichar */
+       /* gtk_entry_set_invisible_char (GTK_ENTRY(entry_password), "*"); */
        
 #ifdef MODEST_PLATFORM_MAEMO
        /* Auto-capitalization is the default, so let's turn it off: */
-       hildon_gtk_entry_set_input_mode (GTK_ENTRY (entry_password), HILDON_GTK_INPUT_MODE_FULL);
+       hildon_gtk_entry_set_input_mode (GTK_ENTRY (entry_password), 
+               HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE);
        
        caption = hildon_caption_new (sizegroup, 
                _("mail_fi_password"), entry_password, NULL, HILDON_CAPTION_MANDATORY);
@@ -1672,6 +2013,7 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
        gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), caption, 
                FALSE, FALSE, MODEST_MARGIN_HALF);
        gtk_widget_show (caption);
+       g_object_unref (sizegroup);
 #else 
        gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), entry_password,
                            TRUE, FALSE, 0);
@@ -1739,6 +2081,8 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
 */
 
        gtk_widget_destroy (dialog);
+       
+       /* printf ("DEBUG: %s: cancel=%d\n", __FUNCTION__, *cancel); */
 }
 
 void
@@ -1754,7 +2098,7 @@ modest_ui_actions_on_cut (GtkAction *action,
                GtkTextBuffer *buffer;
                GtkClipboard *clipboard;
 
-               clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY);
+               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);
        }
@@ -1767,7 +2111,7 @@ modest_ui_actions_on_copy (GtkAction *action,
        GtkClipboard *clipboard;
        GtkWidget *focused_widget;
 
-       clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY);
+       clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
        focused_widget = gtk_window_get_focus (GTK_WINDOW (window));
        if (GTK_IS_LABEL (focused_widget)) {
                gtk_clipboard_set_text (clipboard, gtk_label_get_text (GTK_LABEL (focused_widget)), -1);
@@ -1805,7 +2149,7 @@ modest_ui_actions_on_paste (GtkAction *action,
                GtkTextBuffer *buffer;
                GtkClipboard *clipboard;
 
-               clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY);
+               clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
                buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focused_widget));
                gtk_text_buffer_paste_clipboard (buffer, clipboard, NULL, TRUE);
        }
@@ -1833,6 +2177,41 @@ modest_ui_actions_on_select_all (GtkAction *action,
                gtk_text_buffer_get_end_iter (buffer, &end);
                gtk_text_buffer_select_range (buffer, &start, &end);
        }
+       else if ((MODEST_IS_FOLDER_VIEW (focused_widget)) ||
+                (MODEST_IS_HEADER_VIEW (focused_widget))) {
+               
+               GtkTreeSelection *selection = NULL;
+
+               /* Get header view */           
+               GtkWidget *header_view = focused_widget;
+               if (MODEST_IS_FOLDER_VIEW (focused_widget))
+                       header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (window),
+                                                                          MODEST_WIDGET_TYPE_HEADER_VIEW);
+
+               /* Select all messages */
+               selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(header_view));
+               gtk_tree_selection_select_all (selection);
+       }
+}
+
+void
+modest_ui_actions_on_mark_as_read (GtkAction *action,
+                                  ModestWindow *window)
+{      
+       g_return_if_fail (MODEST_IS_WINDOW(window));
+               
+       /* Mark each header as read */
+       do_headers_action (window, headers_action_mark_as_read, NULL);
+}
+
+void
+modest_ui_actions_on_mark_as_unread (GtkAction *action,
+                                    ModestWindow *window)
+{      
+       g_return_if_fail (MODEST_IS_WINDOW(window));
+               
+       /* Mark each header as read */
+       do_headers_action (window, headers_action_mark_as_unread, NULL);
 }
 
 void
@@ -1980,21 +2359,23 @@ modest_ui_actions_on_details (GtkAction *action,
                TnyMsg *msg;
 
                msg = modest_msg_view_window_get_message (MODEST_MSG_VIEW_WINDOW (win));
-               if (!msg) {
+               if (!msg)
                        return;
-               } else {
-                       headers_list = get_selected_headers (win);
-                       if (!headers_list)
-                               return;
+               g_object_unref (msg);           
 
-                       iter = tny_list_create_iterator (headers_list);
+               headers_list = get_selected_headers (win);
+               if (!headers_list)
+                       return;
 
-                       header = TNY_HEADER (tny_iterator_get_current (iter));
-                       headers_action_show_details (header, win, NULL);
-                       g_object_unref (header);
+               iter = tny_list_create_iterator (headers_list);
+
+               header = TNY_HEADER (tny_iterator_get_current (iter));
+               headers_action_show_details (header, win, NULL);
+               g_object_unref (header);
+
+               g_object_unref (iter);
+               g_object_unref (headers_list);
 
-                       g_object_unref (iter);
-               }
        } else if (MODEST_IS_MAIN_WINDOW (win)) {
                GtkWidget *folder_view, *header_view;
 
@@ -2139,8 +2520,18 @@ create_move_to_dialog (ModestWindow *win,
 
        /* Create folder view */
        *tree_view = modest_folder_view_new (NULL);
-       gtk_tree_view_set_model (GTK_TREE_VIEW (*tree_view),
-                                gtk_tree_view_get_model (GTK_TREE_VIEW (folder_view)));
+
+       /* It could happen that we're trying to move a message from a
+          window (msg window for example) after the main window was
+          closed, so we can not just get the model of the folder
+          view */
+       if (MODEST_IS_FOLDER_VIEW (folder_view))
+               gtk_tree_view_set_model (GTK_TREE_VIEW (*tree_view),
+                                        gtk_tree_view_get_model (GTK_TREE_VIEW (folder_view)));
+       else
+               modest_folder_view_update_model (MODEST_FOLDER_VIEW (*tree_view), 
+                                                TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()));
+
        gtk_container_add (GTK_CONTAINER (scroll), *tree_view);
 
        /* Add scroll to dialog */
@@ -2224,10 +2615,36 @@ msgs_move_to_confirmation (GtkWindow *win,
                        response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
                                                                            (const gchar *) message);
                }
+               g_object_unref (src_folder);
        }
        return response;
 }
 
+
+static void
+tranasfer_msgs_from_viewer_cb (const GObject *object, gpointer user_data)
+{
+       ModestMsgViewWindow *self = NULL;
+       gboolean found = FALSE;
+
+       g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (object));
+       self = MODEST_MSG_VIEW_WINDOW (object);
+
+       found = modest_msg_view_window_select_first_message (self);
+       g_return_if_fail (found);
+}
+
+void
+modest_ui_actions_move_folder_error_handler (ModestMailOperation *mail_op, 
+                                            gpointer user_data)
+{
+       GObject *win = modest_mail_operation_get_source (mail_op);
+
+       /* TODO: show error message */
+       modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL,
+                                               _("mail_in_ui_folder_move_target_error"));
+}
+
 /*
  * UI handler for the "Move to" action when invoked from the
  * ModestMainWindow
@@ -2236,9 +2653,10 @@ static void
 modest_ui_actions_on_main_window_move_to (GtkAction *action, 
                                          ModestMainWindow *win)
 {
-       GtkWidget *dialog, *folder_view, *tree_view = NULL;
+       GtkWidget *dialog = NULL, *folder_view = NULL, *tree_view = NULL;
+       GtkWidget *header_view = NULL;
        gint result;
-       TnyFolderStore *folder_store;
+       TnyFolderStore *folder_store = NULL;
        ModestMailOperation *mail_op = NULL;
 
        g_return_if_fail (MODEST_IS_MAIN_WINDOW (win));
@@ -2247,9 +2665,15 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action,
        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)
@@ -2265,24 +2689,28 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action,
                TnyFolderStore *src_folder;
                src_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
 
+               /* Clean folder on header view before moving it */
+               modest_header_view_set_folder (MODEST_HEADER_VIEW (header_view), NULL); 
+
                if (TNY_IS_FOLDER (src_folder)) {
-                       mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_RECEIVE, G_OBJECT(win));
-                       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), 
-                                                        mail_op);
+                       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_folder (mail_op, 
                                                           TNY_FOLDER (src_folder),
                                                           folder_store,
                                                           TRUE);
+                       /* Unref mail operation */
                        g_object_unref (G_OBJECT (mail_op));
                }
 
                /* Frees */
                g_object_unref (G_OBJECT (src_folder));
        } else {
-               GtkWidget *header_view;
-               header_view = modest_main_window_get_child_widget (win,
-                                                                  MODEST_WIDGET_TYPE_HEADER_VIEW);
                if (gtk_widget_is_focus (header_view)) {
                        TnyList *headers;
                        gint response;
@@ -2296,20 +2724,23 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action,
 
                        /* Transfer messages */
                        if (response == GTK_RESPONSE_OK) {
-                               mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_RECEIVE, G_OBJECT(win));
+                               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);
 
                                modest_mail_operation_xfer_msgs (mail_op, 
                                                                 headers,
                                                                 TNY_FOLDER (folder_store),
-                                                                TRUE);
+                                                                TRUE,
+                                                                NULL,
+                                                                NULL);
+
                                g_object_unref (G_OBJECT (mail_op));
                        }
+                       g_object_unref (headers);
                }
        }
        g_object_unref (folder_store);
-
  end:
        gtk_widget_destroy (dialog);
 }
@@ -2326,18 +2757,21 @@ modest_ui_actions_on_msg_view_window_move_to (GtkAction *action,
        GtkWidget *dialog, *folder_view, *tree_view = NULL;
        gint result;
        ModestMainWindow *main_window;
-       TnyMsg *msg;
        TnyHeader *header;
        TnyList *headers;
 
        /* Get the folder view */
        main_window = MODEST_MAIN_WINDOW (modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()));
-       folder_view = modest_main_window_get_child_widget (main_window,
-                                                          MODEST_WIDGET_TYPE_FOLDER_VIEW);
+       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));
+       g_object_ref (tree_view);
 
        if (result == GTK_RESPONSE_ACCEPT) {
                TnyFolderStore *folder_store;
@@ -2346,12 +2780,10 @@ modest_ui_actions_on_msg_view_window_move_to (GtkAction *action,
                folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (tree_view));
 
                /* Create header list */
-               msg = modest_msg_view_window_get_message (MODEST_MSG_VIEW_WINDOW (win));
-               header = tny_msg_get_header (msg);
+               header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win));              
                headers = tny_simple_list_new ();
                tny_list_prepend (headers, G_OBJECT (header));
                g_object_unref (header);
-               g_object_unref (msg);
 
                /* Ask user for confirmation. MSG-NOT404 */
                response = msgs_move_to_confirmation (GTK_WINDOW (win), 
@@ -2363,7 +2795,7 @@ modest_ui_actions_on_msg_view_window_move_to (GtkAction *action,
                        ModestMailOperation *mail_op;
 
                        /* Create mail op */
-                       mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_RECEIVE, G_OBJECT(win));
+                       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);
                        
@@ -2371,11 +2803,12 @@ modest_ui_actions_on_msg_view_window_move_to (GtkAction *action,
                        modest_mail_operation_xfer_msgs (mail_op, 
                                                         headers,
                                                         TNY_FOLDER (folder_store),
-                                                        TRUE);
+                                                        TRUE,
+                                                        tranasfer_msgs_from_viewer_cb,
+                                                        NULL);
                        g_object_unref (G_OBJECT (mail_op));
-               } else {
-                       g_object_unref (headers);
                }
+               g_object_unref (headers);
                g_object_unref (folder_store);
        }
        gtk_widget_destroy (dialog);
@@ -2424,6 +2857,7 @@ do_headers_action (ModestWindow *win,
                tny_iterator_next (iter);
        }
        g_object_unref (iter);
+       g_object_unref (headers_list);
 }
 
 void 
@@ -2468,8 +2902,188 @@ modest_ui_actions_on_settings (GtkAction *action,
 {
        GtkWidget *dialog;
 
-       dialog = modest_global_settings_dialog_new ();
+       dialog = modest_platform_get_global_settings_dialog ();
+       gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (win));
        gtk_widget_show (dialog);
+
        gtk_dialog_run (GTK_DIALOG (dialog));
+
        gtk_widget_destroy (dialog);
 }
+
+void 
+modest_ui_actions_on_help (GtkAction *action, 
+                          ModestWindow *win)
+{
+       const gchar *help_id = NULL;
+
+       if (MODEST_IS_MAIN_WINDOW (win)) {
+               const gchar *action_name;
+               action_name = gtk_action_get_name (action);
+
+               if (!strcmp (action_name, "FolderViewCSMHelp") ||
+                   !strcmp (action_name, "HeaderViewCSMHelp")) {
+                       GtkWidget *folder_view;
+                       TnyFolderStore *folder_store;
+                       /* Get selected folder */
+                       folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
+                                                                          MODEST_WIDGET_TYPE_FOLDER_VIEW);
+                       folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
+
+                       /* Switch help_id */
+                       if (TNY_IS_FOLDER (folder_store)) {
+                               switch (tny_folder_get_folder_type (TNY_FOLDER (folder_store))) {
+                               case TNY_FOLDER_TYPE_NORMAL:
+                                       help_id = "applications_email_userfolder";
+                                       break;
+                               case TNY_FOLDER_TYPE_INBOX:
+                                       help_id = "applications_email_inbox";
+                                       break;
+                               case TNY_FOLDER_TYPE_OUTBOX:
+                                       help_id = "applications_email_outbox";
+                                       break;
+                               case TNY_FOLDER_TYPE_SENT:
+                                       help_id = "applications_email_sent";
+                                       break;
+                               case TNY_FOLDER_TYPE_DRAFTS:
+                                       help_id = "applications_email_drafts";
+                                       break;
+                               case TNY_FOLDER_TYPE_ARCHIVE:
+                                       help_id = "applications_email_archive";
+                                       break;
+                               default:
+                                       help_id = NULL;
+                               }
+                       }
+               } else {
+                       help_id = "applications_email_mainview";        
+               }
+       } else if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
+               help_id = "applications_email_viewer";
+       } else if (MODEST_IS_MSG_EDIT_WINDOW (win))
+               help_id = "applications_email_editor";
+
+       modest_platform_show_help (GTK_WINDOW (win), help_id);
+}
+
+void 
+modest_ui_actions_on_retrieve_msg_contents (GtkAction *action,
+                                           ModestWindow *window)
+{
+       ModestMailOperation *mail_op;
+       TnyList *headers;
+
+       /* Get headers */
+       headers = get_selected_headers (window);
+       if (!headers)
+               return;
+
+       /* Create mail operation */
+       mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, 
+                                                                G_OBJECT (window),
+                                                                modest_ui_actions_get_msgs_full_error_handler, 
+                                                                NULL);
+       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
+       modest_mail_operation_get_msgs_full (mail_op, headers, NULL, NULL, NULL);
+
+       /* Frees */
+       g_object_unref (headers);
+       g_object_unref (mail_op);
+}
+
+void
+modest_ui_actions_on_email_menu_activated (GtkAction *action,
+                                         ModestWindow *window)
+{
+       g_return_if_fail (MODEST_IS_WINDOW (window));
+
+       /* Update dimmed */     
+       modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules");     
+}
+
+void
+modest_ui_actions_on_edit_menu_activated (GtkAction *action,
+                                         ModestWindow *window)
+{
+       g_return_if_fail (MODEST_IS_WINDOW (window));
+
+       /* Update dimmed */     
+       modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules");     
+}
+
+void
+modest_ui_actions_on_toolbar_csm_menu_activated (GtkAction *action,
+                                                ModestWindow *window)
+{
+       g_return_if_fail (MODEST_IS_WINDOW (window));
+
+       /* Update dimmed */     
+       modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules");     
+}
+
+void
+modest_ui_actions_on_folder_view_csm_menu_activated (GtkAction *action,
+                                                    ModestWindow *window)
+{
+       g_return_if_fail (MODEST_IS_WINDOW (window));
+
+       /* Update dimmed */     
+       modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules");     
+}
+
+void
+modest_ui_actions_on_header_view_csm_menu_activated (GtkAction *action,
+                                                    ModestWindow *window)
+{
+       g_return_if_fail (MODEST_IS_WINDOW (window));
+
+       /* Update dimmed */     
+       modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules");     
+}
+
+void
+modest_ui_actions_check_toolbar_dimming_rules (ModestWindow *window)
+{
+       g_return_if_fail (MODEST_IS_WINDOW (window));
+
+       /* Update dimmed */     
+       modest_window_check_dimming_rules_group (window, "ModestToolbarDimmingRules");  
+}
+
+void
+modest_ui_actions_on_search_messages (GtkAction *action, ModestWindow *window)
+{
+       g_return_if_fail (MODEST_IS_WINDOW (window));
+
+       modest_platform_show_search_messages (GTK_WINDOW (window));
+}
+
+void     
+modest_ui_actions_on_open_addressbook (GtkAction *action, ModestWindow *win)
+{
+       g_return_if_fail (MODEST_IS_WINDOW (win));
+       modest_platform_show_addressbook (GTK_WINDOW (win));
+}
+
+
+void
+modest_ui_actions_on_toggle_find_in_page (GtkToggleAction *action,
+                                         ModestWindow *window)
+{
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+
+       modest_msg_edit_window_toggle_find_toolbar (MODEST_MSG_EDIT_WINDOW (window), gtk_toggle_action_get_active (action));
+}
+
+static void 
+_on_send_receive_progress_changed (ModestMailOperation  *mail_op, 
+                                  ModestMailOperationState *state,
+                                  gpointer user_data)
+{
+       g_return_if_fail (MODEST_IS_MAIN_WINDOW(user_data));
+
+       /* Set send/receive operation finished */       
+       if (state->status != MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS)
+               modest_main_window_notify_send_receive_completed (MODEST_MAIN_WINDOW(user_data));
+       
+}