Build fix
[modest] / src / modest-ui-actions.c
index cca3c78..598b5d5 100644 (file)
 #include <widgets/modest-header-window.h>
 #include <widgets/modest-folder-window.h>
 #include <widgets/modest-accounts-window.h>
+
 #ifdef MODEST_TOOLKIT_HILDON2
 #include <hildon/hildon-gtk.h>
 #include <modest-maemo-utils.h>
+#else
+#include <gtk/modest-shell-window.h>
 #endif
 #include "modest-utils.h"
 #include "widgets/modest-connection-specific-smtp-window.h"
 #include "widgets/modest-ui-constants.h"
-#include <widgets/modest-main-window.h>
 #include <widgets/modest-msg-view-window.h>
 #include <widgets/modest-account-view-window.h>
 #include <widgets/modest-details-dialog.h>
@@ -80,6 +82,7 @@
 #include <tny-camel-bs-msg.h>
 #include <tny-camel-bs-mime-part.h>
 
+#include <gtk/gtk.h>
 #include <gtkhtml/gtkhtml.h>
 
 #define MODEST_MOVE_TO_DIALOG_FOLDER_VIEW "move-to-dialog-folder-view"
@@ -106,6 +109,8 @@ typedef struct _ReplyForwardHelper {
        gchar *mailbox;
        GtkWidget *parent_window;
        TnyHeader *header;
+       TnyHeader *top_header;
+       TnyMsg    *msg_part;
        TnyList *parts;
 } ReplyForwardHelper;
 
@@ -158,7 +163,7 @@ static gboolean connect_to_get_msg (ModestWindow *win,
 
 static gboolean remote_folder_has_leave_on_server (TnyFolderStore *folder);
 
-static void     do_create_folder (GtkWindow *window,
+static void     do_create_folder (ModestWindow *window,
                                  TnyFolderStore *parent_folder,
                                  const gchar *suggested_name);
 
@@ -167,7 +172,7 @@ static TnyAccount *get_account_from_folder_store (TnyFolderStore *folder_store);
 static void modest_ui_actions_on_folder_window_move_to (GtkWidget *folder_view,
                                                        TnyFolderStore *dst_folder,
                                                        TnyList *selection,
-                                                       GtkWindow *win);
+                                                       ModestWindow *win);
 
 static void modest_ui_actions_on_window_move_to (GtkAction *action,
                                                 TnyList *list_to_move,
@@ -265,7 +270,7 @@ modest_ui_actions_on_about (GtkAction *action, ModestWindow *win)
                NULL
        };
        about = gtk_about_dialog_new ();
-       gtk_about_dialog_set_name (GTK_ABOUT_DIALOG(about), PACKAGE_NAME);
+       gtk_about_dialog_set_program_name (GTK_ABOUT_DIALOG(about), PACKAGE_NAME);
        gtk_about_dialog_set_version (GTK_ABOUT_DIALOG(about),PACKAGE_VERSION);
        gtk_about_dialog_set_copyright (GTK_ABOUT_DIALOG(about),
                                        _("Copyright (c) 2006, Nokia Corporation\n"
@@ -326,12 +331,16 @@ headers_action_mark_as_read (TnyHeader *header,
                             gpointer user_data)
 {
        TnyHeaderFlags flags;
+       gchar *uid;
 
        g_return_if_fail (TNY_IS_HEADER(header));
 
        flags = tny_header_get_flags (header);
        if (flags & TNY_HEADER_FLAG_SEEN) return;
        tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN);
+       uid = modest_tny_folder_get_header_unique_id (header);
+       modest_platform_emit_msg_read_changed_signal (uid, TRUE);
+       g_free (uid);
 }
 
 static void
@@ -345,7 +354,10 @@ headers_action_mark_as_unread (TnyHeader *header,
 
        flags = tny_header_get_flags (header);
        if (flags & TNY_HEADER_FLAG_SEEN)  {
+               gchar *uid;
+               uid = modest_tny_folder_get_header_unique_id (header);
                tny_header_unset_flag (header, TNY_HEADER_FLAG_SEEN);
+               modest_platform_emit_msg_read_changed_signal (uid, FALSE);
        }
 }
 
@@ -381,7 +393,6 @@ modest_ui_actions_on_edit_mode_delete_message (ModestWindow *win)
        gint response;
        ModestWindowMgr *mgr;
        gboolean retval = TRUE;
-       GtkWindow *toplevel;
 
        g_return_val_if_fail (MODEST_IS_WINDOW(win), FALSE);
 
@@ -412,8 +423,8 @@ modest_ui_actions_on_edit_mode_delete_message (ModestWindow *win)
                                           tny_list_get_length(header_list)), desc);
 
        /* Confirmation dialog */
-       toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win);
-       response = modest_platform_run_confirmation_dialog (toplevel, message);
+       response = modest_platform_run_confirmation_dialog (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (win))),
+                                                           message);
 
        if (response == GTK_RESPONSE_OK) {
                GtkTreeSelection *sel = NULL;
@@ -589,12 +600,6 @@ modest_ui_actions_on_accounts (GtkAction *action,
 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.
-        */
-#ifndef MODEST_TOOLKIT_GTK /* Defined in config.h */
-
        /* Create the window if necessary: */
        GtkWidget *specific_window = GTK_WIDGET (modest_connection_specific_smtp_window_new ());
        modest_connection_specific_smtp_window_fill_with_connections (
@@ -605,7 +610,6 @@ modest_ui_actions_on_smtp_servers (GtkAction *action, ModestWindow *win)
        modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
                                     GTK_WINDOW (specific_window), (GtkWindow *) win);
        gtk_widget_show (specific_window);
-#endif /* !MODEST_TOOLKIT_GTK */
 }
 
 static guint64
@@ -671,8 +675,7 @@ modest_ui_actions_compose_msg(ModestWindow *win,
        TnyMsg *msg = NULL;
        TnyAccount *account = NULL;
        TnyFolder *folder = NULL;
-       gchar *from_str = NULL, *signature = NULL, *body = NULL;
-       gchar *recipient = NULL;
+       gchar *from_str = NULL, *signature = NULL, *body = NULL, *recipient = NULL, *tmp = NULL;
        gboolean use_signature = FALSE;
        ModestWindow *msg_win = NULL;
        ModestAccountMgr *mgr = modest_runtime_get_account_mgr();
@@ -680,6 +683,7 @@ modest_ui_actions_compose_msg(ModestWindow *win,
        GnomeVFSFileSize total_size, allowed_size;
        guint64 available_disk, expected_size, parts_size;
        guint parts_count;
+       TnyList *header_pairs;
 
        /* we check for low-mem */
        if (modest_platform_check_memory_low (win, TRUE))
@@ -739,19 +743,23 @@ modest_ui_actions_compose_msg(ModestWindow *win,
                goto cleanup;
        }
 
+
        recipient = modest_text_utils_get_email_address (from_str);
-       signature = modest_account_mgr_get_signature_from_recipient (mgr, recipient, &use_signature);
+       tmp = modest_account_mgr_get_signature_from_recipient (modest_runtime_get_account_mgr (),
+                                                              recipient,
+                                                              &use_signature);
+       signature = modest_text_utils_create_colored_signature (tmp);
+       g_free (tmp);
        g_free (recipient);
-       if (body_str != NULL) {
-               body = use_signature ? g_strconcat(body_str, "\n",
-                                                  MODEST_TEXT_UTILS_SIGNATURE_MARKER,
-                                                  "\n", signature, NULL) : g_strdup(body_str);
-       } else {
-               body = use_signature ? g_strconcat("\n", MODEST_TEXT_UTILS_SIGNATURE_MARKER,
-                                                  "\n", signature, NULL) : g_strdup("");
-       }
 
-       msg = modest_tny_msg_new (to_str, from_str, cc_str, bcc_str, subject_str, NULL, NULL, body, NULL, NULL, NULL);
+       body = use_signature ? g_strconcat ((body_str) ? body_str : "", signature, NULL) :
+               g_strdup(body_str);
+
+       header_pairs = TNY_LIST (tny_simple_list_new ());
+       msg = modest_tny_msg_new_html_plain (to_str, from_str, cc_str, bcc_str, subject_str,
+                                            NULL, NULL, body, NULL, NULL, NULL, NULL, header_pairs, NULL);
+       g_object_unref (header_pairs);
+
        if (!msg) {
                g_printerr ("modest: failed to create new msg\n");
                goto cleanup;
@@ -1080,7 +1088,7 @@ open_msg_cb (ModestMailOperation *mail_op,
                        win = modest_msg_view_window_new_with_header_model (msg, account, mailbox, (const gchar*) uid,
                                                                            helper->model, helper->rowref);
                } else {
-                       win = modest_msg_view_window_new_for_attachment (msg, account, mailbox, (const gchar*) uid);
+                       win = modest_msg_view_window_new_for_attachment (msg, NULL, account, mailbox, (const gchar*) uid);
                }
                g_free (uid);
        }
@@ -1238,7 +1246,7 @@ open_msg_helper_destroyer (gpointer user_data)
 static void
 open_msg_performer(gboolean canceled,
                    GError *err,
-                   GtkWindow *parent_window,
+                   ModestWindow *parent_window,
                    TnyAccount *account,
                    gpointer user_data)
 {
@@ -1289,6 +1297,12 @@ open_msg_performer(gboolean canceled,
        gboolean can_open;
        gchar *account_name = get_info_from_header (helper->header, &is_draft, &can_open);
 
+       if (!g_strcmp0 (account_name, MODEST_LOCAL_FOLDERS_ACCOUNT_ID) ||
+           !g_strcmp0 (account_name, MODEST_MMC_ACCOUNT_ID)) {
+               g_free (account_name);
+               account_name = g_strdup (modest_window_get_active_account (MODEST_WINDOW (parent_window)));
+       }
+
        if (!can_open) {
                modest_window_mgr_unregister_header (modest_runtime_get_window_mgr (), helper->header);
                g_free (account_name);
@@ -1301,11 +1315,11 @@ open_msg_performer(gboolean canceled,
                GtkWidget *header_view;
                gchar *uid;
 
-               header_view = get_header_view_from_window (MODEST_WINDOW (parent_window));
+               header_view = get_header_view_from_window (parent_window);
                uid = modest_tny_folder_get_header_unique_id (helper->header);
                if (header_view) {
                        const gchar *mailbox = NULL;
-                       mailbox = modest_window_get_active_mailbox (MODEST_WINDOW (parent_window));
+                       mailbox = modest_window_get_active_mailbox (parent_window);
                        window = modest_msg_view_window_new_from_header_view 
                                (MODEST_HEADER_VIEW (header_view), account_name, mailbox, uid, helper->rowref);
                        if (window != NULL) {
@@ -1436,11 +1450,11 @@ open_msg_from_header (TnyHeader *header, GtkTreeRowReference *rowref, ModestWind
 
        /* Connect to the account and perform */
        if (!cached) {
-               modest_platform_connect_and_perform ((GtkWindow *) win, TRUE, g_object_ref (account),
+               modest_platform_connect_and_perform (win, TRUE, g_object_ref (account),
                                                     open_msg_performer, helper);
        } else {
                /* Call directly the performer, do not need to connect */
-               open_msg_performer (FALSE, NULL, (GtkWindow *) win,
+               open_msg_performer (FALSE, NULL, win,
                                    g_object_ref (account), helper);
        }
 cleanup:
@@ -1506,6 +1520,8 @@ create_reply_forward_helper (ReplyForwardAction action,
                             ModestWindow *win,
                             guint reply_forward_type,
                             TnyHeader *header,
+                            TnyMsg *msg_part,
+                            TnyHeader *top_header,
                             TnyList *parts)
 {
        ReplyForwardHelper *rf_helper = NULL;
@@ -1517,6 +1533,8 @@ create_reply_forward_helper (ReplyForwardAction action,
        rf_helper->action = action;
        rf_helper->parent_window = (MODEST_IS_WINDOW (win)) ? GTK_WIDGET (win) : NULL;
        rf_helper->header = (header) ? g_object_ref (header) : NULL;
+       rf_helper->top_header = (top_header) ? g_object_ref (top_header) : NULL;
+       rf_helper->msg_part = (msg_part) ? g_object_ref (msg_part) : NULL;
        rf_helper->account_name = (active_acc) ?
                g_strdup (active_acc) :
                modest_account_mgr_get_default_account (modest_runtime_get_account_mgr());
@@ -1546,6 +1564,10 @@ free_reply_forward_helper (gpointer data)
        g_free (helper->mailbox);
        if (helper->header)
                g_object_unref (helper->header);
+       if (helper->top_header)
+               g_object_unref (helper->top_header);
+       if (helper->msg_part)
+               g_object_unref (helper->msg_part);
        if (helper->parts)
                g_object_unref (helper->parts);
        if (helper->parent_window)
@@ -1569,9 +1591,8 @@ reply_forward_cb (ModestMailOperation *mail_op,
        gchar *from = NULL;
        TnyAccount *account = NULL;
        ModestWindowMgr *mgr = NULL;
-       gchar *signature = NULL;
+       gchar *signature = NULL, *recipient = NULL;
        gboolean use_signature;
-       gchar *recipient;
 
        /* If there was any error. The mail operation could be NULL,
           this means that we already have the message downloaded and
@@ -1582,9 +1603,10 @@ reply_forward_cb (ModestMailOperation *mail_op,
 
        from = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(),
                                                   rf_helper->account_name, rf_helper->mailbox);
+
        recipient = modest_text_utils_get_email_address (from);
-       signature = modest_account_mgr_get_signature_from_recipient (modest_runtime_get_account_mgr(), 
-                                                                    recipient, 
+       signature = modest_account_mgr_get_signature_from_recipient (modest_runtime_get_account_mgr (),
+                                                                    recipient,
                                                                     &use_signature);
        g_free (recipient);
 
@@ -1594,18 +1616,18 @@ reply_forward_cb (ModestMailOperation *mail_op,
                   information. The summary can lack some data */
                TnyHeader *msg_header;
        case ACTION_REPLY:
-               msg_header = tny_msg_get_header (msg);
+               msg_header = tny_msg_get_header (rf_helper->msg_part?rf_helper->msg_part:msg);
                new_msg =
-                       modest_tny_msg_create_reply_msg (msg, msg_header, from,
+                       modest_tny_msg_create_reply_msg (rf_helper->msg_part?rf_helper->msg_part:msg, msg_header, from,
                                                         (use_signature) ? signature : NULL,
                                                         rf_helper->reply_forward_type,
                                                         MODEST_TNY_MSG_REPLY_MODE_SENDER);
                g_object_unref (msg_header);
                break;
        case ACTION_REPLY_TO_ALL:
-               msg_header = tny_msg_get_header (msg);
+               msg_header = tny_msg_get_header (rf_helper->msg_part?rf_helper->msg_part:msg);
                new_msg =
-                       modest_tny_msg_create_reply_msg (msg, msg_header, from,
+                       modest_tny_msg_create_reply_msg (rf_helper->msg_part?rf_helper->msg_part:msg, msg_header, from,
                                                         (use_signature) ? signature : NULL,
                                                         rf_helper->reply_forward_type,
                                                         MODEST_TNY_MSG_REPLY_MODE_ALL);
@@ -1614,7 +1636,8 @@ reply_forward_cb (ModestMailOperation *mail_op,
                break;
        case ACTION_FORWARD:
                new_msg =
-                       modest_tny_msg_create_forward_msg (msg, from, (use_signature) ? signature : NULL,
+                       modest_tny_msg_create_forward_msg (rf_helper->msg_part?rf_helper->msg_part:msg, from, 
+                                                          (use_signature) ? signature : NULL,
                                                           rf_helper->reply_forward_type);
                edit_type = MODEST_EDIT_TYPE_FORWARD;
                break;
@@ -1728,7 +1751,7 @@ connect_to_get_msg (ModestWindow *win,
 static void
 reply_forward_performer (gboolean canceled,
                         GError *err,
-                        GtkWindow *parent_window,
+                        ModestWindow *parent_window,
                         TnyAccount *account,
                         gpointer user_data)
 {
@@ -1748,7 +1771,7 @@ reply_forward_performer (gboolean canceled,
                                                                 modest_ui_actions_disk_operations_error_handler,
                                                                 NULL, NULL);
        modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
-       modest_mail_operation_get_msg_and_parts (mail_op, rf_helper->header, rf_helper->parts, TRUE, reply_forward_cb, rf_helper);
+       modest_mail_operation_get_msg_and_parts (mail_op, rf_helper->top_header, rf_helper->parts, TRUE, reply_forward_cb, rf_helper);
 
        /* Frees */
        g_object_unref(mail_op);
@@ -1854,21 +1877,25 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
 
        if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
                TnyMsg *msg = NULL;
+               TnyMsg *top_msg = NULL;
                TnyHeader *header = NULL;
                /* 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));
+               top_msg = modest_msg_view_window_get_top_message (MODEST_MSG_VIEW_WINDOW(win));
                header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win));
 
                if (msg && header && (action != ACTION_FORWARD || all_parts_retrieved (TNY_MIME_PART (msg)))) {
                        /* Create helper */
                        rf_helper = create_reply_forward_helper (action, win,
-                                                                reply_forward_type, header, NULL);
+                                                                reply_forward_type, header, NULL, NULL, NULL);
                        reply_forward_cb (NULL, header, FALSE, msg, NULL, rf_helper);
                } else {
                        gboolean do_download = TRUE;
 
                        if (msg && header && action == ACTION_FORWARD) {
+                               if (top_msg == NULL)
+                                       top_msg = g_object_ref (msg);
                                /* Not all parts retrieved. Then we have to retrieve them all before
                                 * creating the forward message */
                                if (!tny_device_is_online (modest_runtime_get_device ())) {
@@ -1891,23 +1918,24 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
                                        TnyList *pending_parts;
                                        TnyFolder *folder;
                                        TnyAccount *account;
-                                       GtkWindow *toplevel;
+                                       TnyHeader *top_header;
 
                                        /* Create helper */
-                                       pending_parts = forward_pending_parts (msg);
+                                       top_header = tny_msg_get_header (top_msg);
+                                       pending_parts = forward_pending_parts (top_msg);
                                        rf_helper = create_reply_forward_helper (action, win,
-                                                                                reply_forward_type, header, pending_parts);
+                                                                                reply_forward_type, header, msg, top_header, pending_parts);
                                        g_object_unref (pending_parts);
 
-                                       folder = tny_header_get_folder (header);
+                                       folder = tny_header_get_folder (top_header);
                                        account = tny_folder_get_account (folder);
-                                       toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win);
-                                       modest_platform_connect_and_perform (toplevel,
+                                       modest_platform_connect_and_perform (win,
                                                                             TRUE, account,
                                                                             reply_forward_performer,
                                                                             rf_helper);
-                                       g_object_unref (folder);
+                                       if (folder) g_object_unref (folder);
                                        g_object_unref (account);
+                                       if (top_header) g_object_unref (top_header);
                                }
 
                        } else {
@@ -1917,6 +1945,8 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
 
                if (msg)
                        g_object_unref (msg);
+               if (top_msg)
+                       g_object_unref (top_msg);
                if (header)
                        g_object_unref (header);
        } else {
@@ -1981,17 +2011,14 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
                        if (download) {
                                /* Create helper */
                                rf_helper = create_reply_forward_helper (action, win,
-                                                                        reply_forward_type, header, NULL);
+                                                                        reply_forward_type, header, NULL, NULL, NULL);
                                if (uncached_msgs > 0) {
-                                       GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win);
-
-                                       modest_platform_connect_and_perform (toplevel,
+                                       modest_platform_connect_and_perform (win,
                                                                             TRUE, account,
                                                                             reply_forward_performer,
                                                                             rf_helper);
                                } else {
-                                       GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win);
-                                       reply_forward_performer (FALSE, NULL, toplevel,
+                                       reply_forward_performer (FALSE, NULL, win,
                                                                 account, rf_helper);
                                }
                        }
@@ -2010,6 +2037,82 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
 }
 
 void
+modest_ui_actions_reply_calendar (ModestWindow *win, TnyList *header_pairs)
+{
+       modest_ui_actions_reply_calendar_with_subject (win, NULL, header_pairs);
+}
+
+void
+modest_ui_actions_reply_calendar_with_subject (ModestWindow *win, const gchar *custom_subject, TnyList *header_pairs)
+{
+       gchar *from;
+       gchar *recipient;
+       gchar *signature;
+       gboolean use_signature;
+       TnyMsg *new_msg;
+       GtkWidget *msg_win;
+       const gchar *account_name;
+       const gchar *mailbox;
+       TnyHeader *msg_header;
+       ModestWindowMgr *mgr;
+       TnyMsg *msg;
+
+       g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW(win));
+
+       /* we check for low-mem; in that case, show a warning, and don't allow
+        * reply/forward (because it could potentially require a lot of memory */
+       if (modest_platform_check_memory_low (MODEST_WINDOW(win), TRUE))
+               return;
+
+       account_name = modest_window_get_active_account (MODEST_WINDOW (win));
+       mailbox = modest_window_get_active_mailbox (MODEST_WINDOW (win));
+       from = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(),
+                                                  account_name, mailbox);
+       recipient = modest_text_utils_get_email_address (from);
+       signature = modest_account_mgr_get_signature_from_recipient (modest_runtime_get_account_mgr(), 
+                                                                    recipient, 
+                                                                    &use_signature);
+       g_free (recipient);
+
+       msg = modest_msg_view_window_get_message(MODEST_MSG_VIEW_WINDOW(win));
+       g_return_if_fail(msg);
+
+       msg_header = tny_msg_get_header (msg);
+       new_msg =
+               modest_tny_msg_create_reply_calendar_msg (msg, msg_header, from,
+                                                         (use_signature) ? signature : NULL,
+                                                         header_pairs);
+       g_object_unref (msg_header);
+
+       g_free (from);
+       g_free (signature);
+
+       if (!new_msg) {
+               g_warning ("%s: failed to create message\n", __FUNCTION__);
+               goto cleanup;
+       }
+
+       if (custom_subject) {
+               TnyHeader *new_msg_header;
+
+               new_msg_header = tny_msg_get_header (new_msg);
+               tny_header_set_subject (new_msg_header, custom_subject);
+               g_object_unref (new_msg_header);
+       }
+
+       msg_win = (GtkWidget *) modest_msg_edit_window_new (new_msg, account_name, mailbox, FALSE);
+       mgr = modest_runtime_get_window_mgr ();
+       modest_window_mgr_register_window (mgr, MODEST_WINDOW (msg_win), (ModestWindow *) win);
+
+       /* Show edit window */
+       gtk_widget_show_all (GTK_WIDGET (msg_win));
+
+cleanup:
+       if (new_msg)
+               g_object_unref (G_OBJECT (new_msg));
+}
+
+void
 modest_ui_actions_on_reply (GtkAction *action, ModestWindow *win)
 {
        g_return_if_fail (MODEST_IS_WINDOW(win));
@@ -2209,7 +2312,7 @@ typedef struct {
 static void
 do_send_receive_performer (gboolean canceled,
                           GError *err,
-                          GtkWindow *parent_window,
+                          ModestWindow *parent_window,
                           TnyAccount *account,
                           gpointer user_data)
 {
@@ -2325,9 +2428,7 @@ modest_ui_actions_do_send_receive (const gchar *account_name,
        modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), info->mail_op);
 
        /* Invoke the connect and perform */
-       GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win);
-       modest_platform_connect_and_perform (toplevel,
-                                            force_connection, info->account,
+       modest_platform_connect_and_perform (win, force_connection, info->account,
                                             do_send_receive_performer, info);
 }
 
@@ -2721,6 +2822,7 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi
                                              data->priority_flags,
                                              data->references,
                                              data->in_reply_to,
+                                             data->custom_header_pairs,
                                              on_save_to_drafts_cb,
                                              g_object_ref(edit_window));
 
@@ -2748,11 +2850,10 @@ gboolean
 modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
 {
        TnyTransportAccount *transport_account = NULL;
-       gboolean had_error = FALSE, add_to_contacts;
+       gboolean result = TRUE, add_to_contacts;
        MsgData *data;
        ModestAccountMgr *account_mgr;
        gchar *account_name;
-       ModestMailOperation *mail_operation;
        gchar *recipients;
 
        g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window), TRUE);
@@ -2814,6 +2915,90 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
                        return TRUE;
        }
 
+       result = modest_ui_actions_send_msg_with_transport (transport_account,
+                                                           data->draft_msg,
+                                                           data->from,
+                                                           data->to,
+                                                           data->cc,
+                                                           data->bcc,
+                                                           data->subject,
+                                                           data->plain_body,
+                                                           data->html_body,
+                                                           data->attachments,
+                                                           data->images,
+                                                           data->references,
+                                                           data->in_reply_to,
+                                                           data->priority_flags,
+                                                           data->custom_header_pairs);
+
+
+       /* Free data: */
+       g_free (account_name);
+       g_object_unref (G_OBJECT (transport_account));
+
+       modest_msg_edit_window_free_msg_data (edit_window, data);
+
+       if (result) {
+               modest_msg_edit_window_set_sent (edit_window, TRUE);
+
+               /* Save settings and close the window: */
+               modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (edit_window));
+       }
+
+       return result;
+}
+
+/* For instance, when clicking the Send toolbar button when editing a message: */
+gboolean
+modest_ui_actions_on_send_custom_msg (const gchar *account_name, 
+                                     const gchar *from, const gchar *to, const gchar *cc, const gchar *bcc,
+                                     const gchar *subject,
+                                     const gchar *plain_body, const gchar *html_body,
+                                     const GList *attachments_list, const GList *images_list,
+                                     const gchar *references, const gchar *in_reply_to,
+                                     TnyHeaderFlags priority_flags, TnyList *header_pairs)
+{
+       TnyTransportAccount *transport_account = NULL;
+       gboolean result = FALSE;
+
+       g_return_val_if_fail (account_name, FALSE);
+
+       transport_account =
+         TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_server_account
+                               (modest_runtime_get_account_store (),
+                                account_name, TNY_ACCOUNT_TYPE_TRANSPORT));
+
+       g_return_val_if_fail (transport_account, FALSE);
+
+       result = modest_ui_actions_send_msg_with_transport (transport_account,
+                                                           NULL /*draft msg*/,
+                                                           from, to, cc, bcc,
+                                                           subject,
+                                                           plain_body, html_body,
+                                                           attachments_list, images_list,
+                                                           references, in_reply_to,
+                                                           priority_flags, header_pairs);
+
+       /* Free data: */
+       g_object_unref (G_OBJECT (transport_account));
+
+       return result;
+}
+
+gboolean
+modest_ui_actions_send_msg_with_transport (TnyTransportAccount *transport_account, 
+                                          TnyMsg *draft_msg,
+                                          const gchar *from, const gchar *to, const gchar *cc, const gchar *bcc,
+                                          const gchar *subject,
+                                          const gchar *plain_body, const gchar *html_body,
+                                          const GList *attachments_list, const GList *images_list,
+                                          const gchar *references, const gchar *in_reply_to,
+                                          TnyHeaderFlags priority_flags, TnyList *header_pairs)
+{
+       gboolean had_error = FALSE;
+       ModestMailOperation *mail_operation;
+
+       g_return_val_if_fail (transport_account, FALSE);
 
        /* Create the mail operation */
        mail_operation = modest_mail_operation_new_with_error_handling (NULL, modest_ui_actions_disk_operations_error_handler, NULL, NULL);
@@ -2821,19 +3006,20 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
 
        modest_mail_operation_send_new_mail (mail_operation,
                                             transport_account,
-                                            data->draft_msg,
-                                            data->from,
-                                            data->to,
-                                            data->cc,
-                                            data->bcc,
-                                            data->subject,
-                                            data->plain_body,
-                                            data->html_body,
-                                            data->attachments,
-                                            data->images,
-                                            data->references,
-                                            data->in_reply_to,
-                                            data->priority_flags);
+                                            draft_msg,
+                                            from,
+                                            to,
+                                            cc,
+                                            bcc,
+                                            subject,
+                                            plain_body,
+                                            html_body,
+                                            attachments_list,
+                                            images_list,
+                                            references,
+                                            in_reply_to,
+                                            priority_flags,
+                                            header_pairs);
 
        if (modest_mail_operation_get_status (mail_operation) == MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS)
                modest_platform_information_banner (NULL, NULL, _("mcen_ib_outbox_waiting_to_be_sent"));
@@ -2849,19 +3035,61 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
        }
 
        /* Free data: */
-       g_free (account_name);
-       g_object_unref (G_OBJECT (transport_account));
        g_object_unref (G_OBJECT (mail_operation));
 
-       modest_msg_edit_window_free_msg_data (edit_window, data);
+       return !had_error;
+}
 
-       if (!had_error) {
-               modest_msg_edit_window_set_sent (edit_window, TRUE);
+gboolean
+modest_ui_actions_on_send_msg (ModestWindow *window,
+                              TnyMsg *msg)
+{
+       TnyTransportAccount *transport_account = NULL;
+       gboolean had_error = FALSE;
+       ModestAccountMgr *account_mgr;
+       gchar *account_name;
+       ModestMailOperation *mail_operation;
 
-               /* Save settings and close the window: */
-               modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (edit_window));
+       account_mgr = modest_runtime_get_account_mgr();
+       account_name = g_strdup(modest_window_get_active_account (MODEST_WINDOW(window)));
+
+       if (!account_name)
+               account_name = modest_account_mgr_get_default_account (account_mgr);
+
+       /* Get the currently-active transport account for this modest account: */
+       if (account_name && strcmp (account_name, MODEST_LOCAL_FOLDERS_ACCOUNT_ID) != 0) {
+               transport_account =
+                       TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_server_account
+                                             (modest_runtime_get_account_store (),
+                                              account_name, TNY_ACCOUNT_TYPE_TRANSPORT));
        }
 
+       /* Create the mail operation */
+       mail_operation = modest_mail_operation_new_with_error_handling (NULL, modest_ui_actions_disk_operations_error_handler, NULL, NULL);
+       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_operation);
+
+       modest_mail_operation_send_mail (mail_operation,
+                                        transport_account,
+                                        msg);
+
+       if (modest_mail_operation_get_status (mail_operation) == MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS)
+               modest_platform_information_banner (NULL, NULL, _("mcen_ib_outbox_waiting_to_be_sent"));
+
+       if (modest_mail_operation_get_error (mail_operation) != NULL) {
+               const GError *error = modest_mail_operation_get_error (mail_operation);
+               if (error->domain == MODEST_MAIL_OPERATION_ERROR &&
+                   error->code == MODEST_MAIL_OPERATION_ERROR_INSTANCE_CREATION_FAILED) {
+                       g_warning ("%s failed: %s\n", __FUNCTION__, (modest_mail_operation_get_error (mail_operation))->message);
+                       modest_platform_information_banner (NULL, NULL, _CS("sfil_ni_not_enough_memory"));
+                       had_error = TRUE;
+               }
+       }
+
+       /* Free data: */
+       g_free (account_name);
+       g_object_unref (G_OBJECT (transport_account));
+       g_object_unref (G_OBJECT (mail_operation));
+
        return !had_error;
 }
 
@@ -3050,12 +3278,12 @@ do_create_folder_cb (ModestMailOperation *mail_op,
                           full memory condition */
                        modest_platform_information_banner ((GtkWidget *) source_win, NULL,
                                                            _("mail_in_ui_folder_create_error"));
-                       do_create_folder ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (source_win)),
+                       do_create_folder ((ModestWindow *) source_win,
                                          parent_folder, (const gchar *) suggested_name);
                }
 
        } else {
-               /* the 'source_win' is either the ModestMainWindow, or the 'Move to folder'-dialog
+               /* the 'source_win' is either the ModestWindow, or the 'Move to folder'-dialog
                 * FIXME: any other? */
                GtkWidget *folder_view;
 
@@ -3082,10 +3310,10 @@ typedef struct {
 
 static void
 do_create_folder_performer (gboolean canceled,
-                        GError *err,
-                        GtkWindow *parent_window,
-                        TnyAccount *account,
-                        gpointer user_data)
+                           GError *err,
+                           ModestWindow *parent_window,
+                           TnyAccount *account,
+                           gpointer user_data)
 {
        CreateFolderConnect *helper = (CreateFolderConnect *) user_data;
        ModestMailOperation *mail_op;
@@ -3131,15 +3359,17 @@ do_create_folder_performer (gboolean canceled,
 
 
 static void
-do_create_folder (GtkWindow *parent_window,
+do_create_folder (ModestWindow *parent_window,
                  TnyFolderStore *suggested_parent,
                  const gchar *suggested_name)
 {
        gint result;
        gchar *folder_name = NULL;
        TnyFolderStore *parent_folder = NULL;
+       GtkWindow *toplevel;
 
-       result = modest_platform_run_new_folder_dialog (parent_window,
+       toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) parent_window);
+       result = modest_platform_run_new_folder_dialog (toplevel,
                                                        suggested_parent,
                                                        (gchar *) suggested_name,
                                                        &folder_name,
@@ -3178,7 +3408,7 @@ modest_ui_actions_create_folder(GtkWindow *parent_window,
        }
 
        if (parent_folder) {
-               do_create_folder (parent_window, parent_folder, NULL);
+               do_create_folder (MODEST_WINDOW (parent_window), parent_folder, NULL);
                g_object_unref (parent_folder);
        }
 }
@@ -3269,7 +3499,7 @@ on_rename_folder_cb (ModestMailOperation *mail_op,
 static void
 on_rename_folder_performer (gboolean canceled,
                            GError *err,
-                           GtkWindow *parent_window,
+                           ModestWindow *parent_window,
                            TnyAccount *account,
                            gpointer user_data)
 {
@@ -3358,11 +3588,10 @@ modest_ui_actions_on_edit_mode_rename_folder (ModestWindow *window)
                if (response != GTK_RESPONSE_ACCEPT || strlen (folder_name) == 0) {
                        do_rename = FALSE;
                } else {
-                       GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) window);
                        RenameFolderInfo *rename_folder_data = g_new0 (RenameFolderInfo, 1);
                        rename_folder_data->folder = g_object_ref (folder);
                        rename_folder_data->new_name = folder_name;
-                       modest_platform_connect_if_remote_and_perform (toplevel, TRUE,
+                       modest_platform_connect_if_remote_and_perform (window, TRUE,
                                        folder, on_rename_folder_performer, rename_folder_data);
                }
        }
@@ -3390,17 +3619,28 @@ typedef struct {
 
 static void
 on_delete_folder_cb (gboolean canceled,
-                 GError *err,
-                 GtkWindow *parent_window,
-                 TnyAccount *account,
-                 gpointer user_data)
+                    GError *err,
+                    ModestWindow *parent_window,
+                    TnyAccount *account,
+                    gpointer user_data)
 {
        DeleteFolderInfo *info = (DeleteFolderInfo*) user_data;
        GtkWidget *folder_view;
        ModestMailOperation *mail_op;
        GtkTreeSelection *sel;
+       ModestWindow *modest_window;
+
+#ifdef MODEST_TOOLKIT_HILDON2
+       modest_window = (ModestWindow*) parent_window;
+#else
+       if (MODEST_IS_SHELL (parent_window)) {
+               modest_window = modest_shell_peek_window (MODEST_SHELL (parent_window));
+       } else {
+               modest_window = NULL;
+       }
+#endif
 
-       if (!MODEST_IS_WINDOW(parent_window) || canceled || (err!=NULL)) {
+       if (!MODEST_IS_WINDOW(modest_window) || canceled || (err!=NULL)) {
                /* Note that the connection process can fail due to
                   memory low conditions as it can not successfully
                   store the summary */
@@ -3413,8 +3653,8 @@ on_delete_folder_cb (gboolean canceled,
                return;
        }
 
-       if (MODEST_IS_FOLDER_WINDOW (parent_window)) {
-               folder_view = GTK_WIDGET (modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (parent_window)));
+       if (MODEST_IS_FOLDER_WINDOW (modest_window)) {
+               folder_view = GTK_WIDGET (modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (modest_window)));
        } else {
                g_object_unref (G_OBJECT (info->folder));
                g_free (info);
@@ -3447,12 +3687,9 @@ delete_folder (ModestWindow *window, gboolean move_to_trash)
        GtkWidget *folder_view;
        gint response;
        gchar *message;
-       GtkWindow *toplevel;
 
        g_return_val_if_fail (MODEST_IS_WINDOW(window), FALSE);
 
-       toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) window);
-
        if (MODEST_IS_FOLDER_WINDOW (window)) {
                folder_view = GTK_WIDGET (modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (window)));
        } else {
@@ -3468,7 +3705,7 @@ delete_folder (ModestWindow *window, gboolean move_to_trash)
 
        /* Show an error if it's an account */
        if (!TNY_IS_FOLDER (folder)) {
-               modest_platform_run_information_dialog (toplevel,
+               modest_platform_run_information_dialog (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (window))),
                                                        _("mail_in_ui_folder_delete_error"),
                                                        FALSE);
                g_object_unref (G_OBJECT (folder));
@@ -3478,7 +3715,7 @@ delete_folder (ModestWindow *window, gboolean move_to_trash)
        /* Ask the user */
        message =  g_strdup_printf (_("mcen_nc_delete_folder_text"),
                                    tny_folder_get_name (TNY_FOLDER (folder)));
-       response = modest_platform_run_confirmation_dialog (toplevel,
+       response = modest_platform_run_confirmation_dialog (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (window))),
                                                            (const gchar *) message);
        g_free (message);
 
@@ -3490,7 +3727,7 @@ delete_folder (ModestWindow *window, gboolean move_to_trash)
                info->move_to_trash = move_to_trash;
 
                account = tny_folder_get_account (TNY_FOLDER (folder));
-               modest_platform_connect_if_remote_and_perform (toplevel,
+               modest_platform_connect_if_remote_and_perform (window,
                                                               TRUE,
                                                               TNY_FOLDER_STORE (account),
                                                               on_delete_folder_cb, info);
@@ -3549,7 +3786,7 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
                                         gchar **password,
                                         gboolean *cancel,
                                         gboolean *remember,
-                                        ModestMainWindow *main_window)
+                                        ModestWindow *window)
 {
        g_return_if_fail(server_account_name);
        gboolean completed = FALSE;
@@ -4402,12 +4639,10 @@ on_move_to_dialog_response (GtkDialog *dialog,
        MoveToInfo *helper = NULL;
        ModestFolderView *folder_view;
        gboolean unset_edit_mode = FALSE;
-       GtkWindow *toplevel;
 
        helper = (MoveToInfo *) user_data;
 
        parent_win = (GtkWidget *) helper->win;
-       toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) parent_win);
        folder_view = MODEST_FOLDER_VIEW (g_object_get_data (G_OBJECT (dialog),
                                                             MODEST_MOVE_TO_DIALOG_FOLDER_VIEW));
        switch (response) {
@@ -4433,7 +4668,7 @@ on_move_to_dialog_response (GtkDialog *dialog,
                        modest_ui_actions_on_folder_window_move_to (GTK_WIDGET (folder_view),
                                                                    dst_folder,
                                                                    helper->list,
-                                                                   toplevel);
+                                                                   MODEST_WINDOW (parent_win));
                } else {
                        /* if the user selected a root folder
                           (account) then do not perform any action */
@@ -4505,13 +4740,17 @@ create_move_to_dialog (GtkWindow *win,
                ModestAccountMgr *mgr = NULL;
                ModestAccountSettings *settings = NULL;
                ModestServerAccountSettings *store_settings = NULL;
+               ModestWindow *modest_window;
 
                modest_folder_view_set_style (MODEST_FOLDER_VIEW (tree_view),
                                              MODEST_FOLDER_VIEW_STYLE_SHOW_ALL);
-               /* modest_folder_view_update_model (MODEST_FOLDER_VIEW (tree_view), */
-               /*                               TNY_ACCOUNT_STORE (modest_runtime_get_account_store ())); */
 
-               active_account_name = modest_window_get_active_account (MODEST_WINDOW (win));
+#ifdef MODEST_TOOLKIT_HILDON2
+               modest_window = (ModestWindow *) win;
+#else
+               modest_window = modest_shell_peek_window (MODEST_SHELL (win));
+#endif
+               active_account_name = modest_window_get_active_account (modest_window);
                mgr = modest_runtime_get_account_mgr ();
                settings = modest_account_mgr_load_account_settings (mgr, active_account_name);
 
@@ -4704,7 +4943,7 @@ modest_ui_actions_move_folder_error_handler (ModestMailOperation *mail_op,
  * wants to connect to complete it
  */
 static void
-modest_ui_actions_xfer_messages_check (GtkWindow *parent_window,
+modest_ui_actions_xfer_messages_check (ModestWindow *parent_window,
                                       TnyFolderStore *src_folder,
                                       TnyList *headers,
                                       TnyFolder *dst_folder,
@@ -4741,12 +4980,14 @@ modest_ui_actions_xfer_messages_check (GtkWindow *parent_window,
        if (uncached_msgs > 0) {
                guint num_headers;
                const gchar *msg;
+               GtkWindow *toplevel;
 
                *need_connection = TRUE;
                num_headers = tny_list_get_length (headers);
                msg = ngettext ("mcen_nc_get_msg", "mcen_nc_get_msgs", num_headers);
+               toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) parent_window);
 
-               if (modest_platform_run_confirmation_dialog (parent_window, msg) ==
+               if (modest_platform_run_confirmation_dialog (toplevel, msg) ==
                    GTK_RESPONSE_CANCEL) {
                        *do_xfer = FALSE;
                } else {
@@ -4818,11 +5059,10 @@ typedef struct {
 static void
 xfer_messages_performer  (gboolean canceled,
                          GError *err,
-                         GtkWindow *parent_window,
+                         ModestWindow *parent_window,
                          TnyAccount *account,
                          gpointer user_data)
 {
-       ModestWindow *win = MODEST_WINDOW (parent_window);
        TnyAccount *dst_account = NULL;
        gboolean dst_forbids_message_add = FALSE;
        XferMsgsHelper *helper;
@@ -4849,7 +5089,7 @@ xfer_messages_performer  (gboolean canceled,
                                                                                  MODEST_PROTOCOL_REGISTRY_STORE_FORBID_INCOMING_XFERS);
 
        if (dst_forbids_message_add) {
-               modest_platform_information_banner (GTK_WIDGET (win),
+               modest_platform_information_banner (GTK_WIDGET (parent_window),
                                                    NULL,
                                                    ngettext("mail_in_ui_folder_move_target_error",
                                                             "mail_in_ui_folder_move_targets_error",
@@ -4861,7 +5101,7 @@ xfer_messages_performer  (gboolean canceled,
 
 
        /* Perform the mail operation */
-       mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT(win),
+       mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT(parent_window),
                                                                 xfer_messages_error_handler,
                                                                 g_object_ref (dst_account),
                                                                 g_object_unref);
@@ -4894,7 +5134,7 @@ typedef struct {
 static void
 on_move_folder_cb (gboolean canceled,
                   GError *err,
-                  GtkWindow *parent_window,
+                  ModestWindow *parent_window,
                   TnyAccount *account,
                   gpointer user_data)
 {
@@ -4980,7 +5220,7 @@ static void
 modest_ui_actions_on_folder_window_move_to (GtkWidget *folder_view,
                                            TnyFolderStore *dst_folder,
                                            TnyList *selection,
-                                           GtkWindow *win)
+                                           ModestWindow *win)
 {
        TnyFolderStore *src_folder = NULL;
        TnyIterator *iterator;
@@ -4999,9 +5239,11 @@ modest_ui_actions_on_folder_window_move_to (GtkWidget *folder_view,
        if (TNY_IS_ACCOUNT (dst_folder) &&
            !MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (dst_folder) &&
            !modest_tny_account_is_memory_card_account (TNY_ACCOUNT (dst_folder))) {
+               GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win);
+
                do_xfer = FALSE;
                /* Show an error */
-               modest_platform_run_information_dialog (win,
+               modest_platform_run_information_dialog (toplevel,
                                                        _("mail_in_ui_folder_move_target_error"),
                                                        FALSE);
        } else if (!TNY_IS_FOLDER (src_folder)) {
@@ -5033,7 +5275,7 @@ modest_ui_actions_on_folder_window_move_to (GtkWidget *folder_view,
 
 
 void
-modest_ui_actions_transfer_messages_helper (GtkWindow *win,
+modest_ui_actions_transfer_messages_helper (ModestWindow *win,
                                            TnyFolder *src_folder,
                                            TnyList *headers,
                                            TnyFolder *dst_folder)
@@ -5094,15 +5336,13 @@ modest_ui_actions_on_window_move_to (GtkAction *action,
        if (headers) {
                TnyHeader *header = NULL;
                TnyIterator *iter;
-               GtkWindow *toplevel;
 
                iter = tny_list_create_iterator (headers);
                header = (TnyHeader *) tny_iterator_get_current (iter);
                src_folder = tny_header_get_folder (header);
 
                /* Transfer the messages */
-               toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win);
-               modest_ui_actions_transfer_messages_helper (toplevel, src_folder,
+               modest_ui_actions_transfer_messages_helper (win, src_folder,
                                                            headers,
                                                            TNY_FOLDER (dst_folder));
 
@@ -5309,7 +5549,7 @@ retrieve_contents_cb (ModestMailOperation *mail_op,
 static void
 retrieve_msg_contents_performer (gboolean canceled,
                                 GError *err,
-                                GtkWindow *parent_window,
+                                ModestWindow *parent_window,
                                 TnyAccount *account,
                                 gpointer user_data)
 {
@@ -5362,7 +5602,7 @@ modest_ui_actions_on_retrieve_msg_contents (GtkAction *action,
        g_object_unref (iter);
 
        /* Connect and perform the message retrieval */
-       modest_platform_connect_and_perform ((GtkWindow *) window, TRUE,
+       modest_platform_connect_and_perform (window, TRUE,
                                             g_object_ref (account),
                                             retrieve_msg_contents_performer,
                                             g_object_ref (headers));
@@ -5666,7 +5906,7 @@ modest_ui_actions_on_send_queue_status_changed (ModestTnySendQueue *send_queue,
 }
 
 void
-modest_ui_actions_on_account_connection_error (GtkWindow *parent_window,
+modest_ui_actions_on_account_connection_error (ModestWindow *parent_window,
                                               TnyAccount *account)
 {
        ModestProtocolType protocol_type;
@@ -5681,7 +5921,8 @@ modest_ui_actions_on_account_connection_error (GtkWindow *parent_window,
        if (error_note == NULL) {
                g_warning ("%s: This should not be reached", __FUNCTION__);
        } else {
-               modest_platform_run_information_dialog (parent_window, error_note, FALSE);
+               GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) parent_window);
+               modest_platform_run_information_dialog (toplevel, error_note, FALSE);
                g_free (error_note);
        }
 }
@@ -5793,11 +6034,14 @@ modest_ui_actions_on_delete_account (GtkWindow *parent_window,
 
                removed = modest_account_mgr_remove_account (account_mgr, account_name);
                if (removed) {
+#ifdef MODEST_TOOLKIT_HILDON2
+                       hildon_gtk_window_take_screenshot (parent_window, FALSE);
+#endif
                        /* Close all email notifications, we cannot
                           distinguish if the notification belongs to
                           this account or not, so for safety reasons
                           we remove them all */
-                       modest_platform_remove_new_mail_notifications (FALSE);
+                       modest_platform_remove_new_mail_notifications (FALSE, account_name);
                } else {
                        g_warning ("%s: modest_account_mgr_remove_account() failed.\n", __FUNCTION__);
                }
@@ -5808,7 +6052,7 @@ modest_ui_actions_on_delete_account (GtkWindow *parent_window,
 static void
 on_fetch_images_performer (gboolean canceled,
                           GError *err,
-                          GtkWindow *parent_window,
+                          ModestWindow *parent_window,
                           TnyAccount *account,
                           gpointer user_data)
 {
@@ -5829,9 +6073,9 @@ modest_ui_actions_on_fetch_images (GtkAction *action,
 {
        g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window));
 
-       modest_platform_connect_and_perform ((GtkWindow *) window, TRUE, 
+       modest_platform_connect_and_perform (window, TRUE,
                                             NULL,
-                                            on_fetch_images_performer, 
+                                            on_fetch_images_performer,
                                             g_object_ref (window));
 }
 
@@ -5905,9 +6149,8 @@ modest_ui_actions_check_for_active_account (ModestWindow *self,
        store_conn_status = tny_account_get_connection_status (store_account);
        if (store_conn_status == TNY_CONNECTION_STATUS_CONNECTED || sending) {
                gint response;
-               GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) self);
 
-               response = modest_platform_run_confirmation_dialog (toplevel,
+               response = modest_platform_run_confirmation_dialog (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (self))), 
                                                                    _("emev_nc_disconnect_account"));
                if (response == GTK_RESPONSE_OK) {
                        retval = TRUE;