X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=5a9bb0fc03d87fe71b2ed878a926af5a7fc873ac;hb=84ec108299eafb88faf2b2cafad3f6eee9dae154;hp=f3f7ad8c1126129bfec8ad26817832c423ac5c33;hpb=f4b0b2562bf8450100dfaaed047ff78a5019533c;p=modest

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index f3f7ad8..5a9bb0f 100644
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -46,6 +46,7 @@
 #include "modest-platform.h"
 #include "modest-debug.h"
 #include <tny-mime-part.h>
+#include <tny-error.h>
 #include <tny-camel-folder.h>
 #include <tny-camel-imap-folder.h>
 #include <tny-camel-pop-folder.h>
@@ -65,8 +66,8 @@
 #include "maemo/modest-hildon-includes.h"
 #include "maemo/modest-connection-specific-smtp-window.h"
 #endif /* !MODEST_TOOLKIT_GTK */
-#include <modest-utils.h>
 
+#include <modest-utils.h>
 #include "widgets/modest-ui-constants.h"
 #include <widgets/modest-main-window.h>
 #include <widgets/modest-msg-view-window.h>
@@ -84,10 +85,12 @@
 #include <tny-msg-view.h>
 #include <tny-device.h>
 #include <tny-merge-folder.h>
+#include <tny-camel-bs-msg.h>
+#include <tny-camel-bs-mime-part.h>
 
+#include <gtk/gtk.h>
 #include <gtkhtml/gtkhtml.h>
 
-#define MIN_FREE_SPACE 5 * 1024 * 1024
 #define MODEST_MOVE_TO_DIALOG_FOLDER_VIEW "move-to-dialog-folder-view"
 
 typedef struct _GetMsgAsyncHelper {
@@ -112,6 +115,9 @@ typedef struct _ReplyForwardHelper {
 	gchar *mailbox;
 	GtkWidget *parent_window;
 	TnyHeader *header;
+	TnyHeader *top_header;
+	TnyMsg    *msg_part;
+	TnyList *parts;
 } ReplyForwardHelper;
 
 typedef struct _MoveToHelper {
@@ -392,12 +398,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
@@ -411,7 +421,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);
 	}
 }
 
@@ -521,7 +534,6 @@ modest_ui_actions_on_edit_mode_delete_message (ModestWindow *win)
 
 
 	if (response == GTK_RESPONSE_OK) {
-		ModestWindow *main_window = NULL;
 		ModestWindowMgr *mgr = NULL;
 		GtkTreeModel *model = NULL;
 		GtkTreeSelection *sel = NULL;
@@ -552,7 +564,7 @@ modest_ui_actions_on_edit_mode_delete_message (ModestWindow *win)
 		}
 
 		/* Disable window dimming management */
-		modest_window_disable_dimming (MODEST_WINDOW(win));
+		modest_window_disable_dimming (win);
 
 		/* Remove each header. If it's a view window header_view == NULL */
 		mail_op = modest_mail_operation_new ((GObject *) win);
@@ -565,18 +577,14 @@ modest_ui_actions_on_edit_mode_delete_message (ModestWindow *win)
 		if (sel != NULL) {
 			gtk_tree_selection_unselect_all (sel);
 		}
-		modest_window_enable_dimming (MODEST_WINDOW(win));
+		modest_window_enable_dimming (win);
 
 		if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
 			modest_ui_actions_refresh_message_window_after_delete (MODEST_MSG_VIEW_WINDOW (win));
 
 			/* Get main window */
 			mgr = modest_runtime_get_window_mgr ();
-			main_window = modest_window_mgr_get_main_window (mgr, FALSE); /* don't create */
 		} else if (MODEST_IS_MAIN_WINDOW (win)) {
-			/* Move cursor to next row */
-			main_window = win;
-
 			/* Select next or previous row */
 			if (gtk_tree_row_reference_valid (next_row_reference)) {
 				gtk_tree_selection_select_path (sel, next_path);
@@ -597,10 +605,8 @@ modest_ui_actions_on_edit_mode_delete_message (ModestWindow *win)
 		}
 
 		/* Update toolbar dimming state */
-		if (main_window) {
-			modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (main_window));
-			modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window));
-		}
+		modest_ui_actions_check_menu_dimming_rules (win);
+		modest_ui_actions_check_toolbar_dimming_rules (win);
 
 		/* Free */
 		g_list_foreach (sel_list, (GFunc) gtk_tree_path_free, NULL);
@@ -646,7 +652,7 @@ modest_ui_actions_on_quit (GtkAction *action, ModestWindow *win)
 	ModestWindowMgr *mgr = NULL;
 
 #ifdef MODEST_PLATFORM_MAEMO
-	modest_osso_save_state();
+	modest_window_mgr_save_state_for_all_windows (modest_runtime_get_window_mgr ());
 #endif /* MODEST_PLATFORM_MAEMO */
 
 	g_debug ("closing down, clearing %d item(s) from operation queue",
@@ -693,9 +699,10 @@ modest_ui_actions_on_close_window (GtkAction *action, ModestWindow *win)
 void
 modest_ui_actions_add_to_contacts (GtkAction *action, ModestWindow *win)
 {
-       g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (win));
-
-       modest_msg_view_window_add_to_contacts (MODEST_MSG_VIEW_WINDOW (win));
+	if (MODEST_IS_MSG_VIEW_WINDOW (win))
+		modest_msg_view_window_add_to_contacts (MODEST_MSG_VIEW_WINDOW (win));
+	else if (MODEST_IS_MSG_EDIT_WINDOW (win))
+		modest_msg_edit_window_add_to_contacts (MODEST_MSG_EDIT_WINDOW (win));
 }
 
 void
@@ -707,12 +714,8 @@ 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);
 
-	/* 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);
+	if (selection) {
+		modest_address_book_add_address (selection, (GtkWindow *) win);
 		g_free (selection);
 	}
 }
@@ -768,6 +771,54 @@ modest_ui_actions_on_smtp_servers (GtkAction *action, ModestWindow *win)
 #endif /* !MODEST_TOOLKIT_GTK */
 }
 
+static guint64
+count_part_size (const gchar *part)
+{
+	GnomeVFSURI *vfs_uri;
+	gchar *escaped_filename;
+	gchar *filename;
+	GnomeVFSFileInfo *info;
+	guint64 result;
+
+	/* Estimation of attachment size if we cannot get it from file info */
+	result = 32768;
+
+	vfs_uri = gnome_vfs_uri_new (part);
+
+	escaped_filename = g_path_get_basename (gnome_vfs_uri_get_path (vfs_uri));
+	filename = gnome_vfs_unescape_string_for_display (escaped_filename);
+	g_free (escaped_filename);
+	gnome_vfs_uri_unref (vfs_uri);
+
+	info = gnome_vfs_file_info_new ();
+	
+	if (gnome_vfs_get_file_info (part, 
+				     info, 
+				     GNOME_VFS_FILE_INFO_GET_MIME_TYPE)
+	    == GNOME_VFS_OK) {
+		if (info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE) {
+			result = info->size;
+		}
+	}
+	g_free (filename);
+	gnome_vfs_file_info_unref (info);
+
+	return result;
+}
+
+static guint64 
+count_parts_size (GSList *parts)
+{
+	GSList *node;
+	guint64 result = 0;
+
+	for (node = parts; node != NULL; node = g_slist_next (node)) {
+		result += count_part_size ((const gchar *) node->data);
+	}
+
+	return result;
+}
+
 void
 modest_ui_actions_compose_msg(ModestWindow *win,
 			      const gchar *to_str,
@@ -783,18 +834,44 @@ 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();
 	ModestTnyAccountStore *store = modest_runtime_get_account_store();
 	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))
 		goto cleanup;
 
+	available_disk = modest_utils_get_available_space (NULL);
+	parts_count = g_slist_length (attachments);
+	parts_size = count_parts_size (attachments);
+	expected_size = modest_tny_msg_estimate_size (body, NULL, parts_count, parts_size);
+
+	/* Double check: disk full condition or message too big */
+	if (available_disk < MODEST_TNY_ACCOUNT_STORE_MIN_FREE_SPACE ||
+	    expected_size > available_disk) {
+		gchar *msg = g_strdup_printf (_KR("cerm_device_memory_full"), "");
+		modest_platform_system_banner (NULL, NULL, msg);
+		g_free (msg);
+
+		return;
+	}
+
+	if (expected_size > MODEST_MAX_ATTACHMENT_SIZE) {
+		modest_platform_run_information_dialog (
+			GTK_WINDOW(win),
+			_("mail_ib_error_attachment_size"),
+			TRUE);
+		return;
+	}
+
+
 #ifdef MODEST_TOOLKIT_HILDON2
 	if (win)
 		account_name = g_strdup (modest_window_get_active_account(win));
@@ -827,16 +904,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--\n", signature, NULL) : g_strdup(body_str);
-	} else {
-		body = use_signature ? g_strconcat("\n--\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;
@@ -856,16 +940,18 @@ modest_ui_actions_compose_msg(ModestWindow *win,
 	gtk_widget_show_all (GTK_WIDGET (msg_win));
 
 	while (attachments) {
-		total_size +=
+		GnomeVFSFileSize att_size;
+		att_size =
 			modest_msg_edit_window_attach_file_one((ModestMsgEditWindow *)msg_win,
 							       attachments->data, allowed_size);
+		total_size += att_size;
 
-		if (total_size > allowed_size) {
-			g_warning ("%s: total size: %u",
-				   __FUNCTION__, (unsigned int)total_size);
+		if (att_size > allowed_size) {
+			g_debug ("%s: total size: %u",
+				 __FUNCTION__, (unsigned int)total_size);
 			break;
 		}
-		allowed_size -= total_size;
+		allowed_size -= att_size;
 
 		attachments = g_slist_next(attachments);
 	}
@@ -922,23 +1008,42 @@ modest_ui_actions_msg_retrieval_check (ModestMailOperation *mail_op,
 			      error->code == TNY_SERVICE_ERROR_MESSAGE_NOT_AVAILABLE)) {
 			gchar *subject, *msg, *format = NULL;
 			TnyAccount *account;
-			subject = tny_header_dup_subject (header);
+
+			subject = (header) ? tny_header_dup_subject (header) : NULL;
 			if (!subject)
 				subject = g_strdup (_("mail_va_no_subject"));
 
 			account = modest_mail_operation_get_account (mail_op);
 			if (account) {
-				ModestProtocol *protocol;
-				ModestProtocolType proto;
-				proto = modest_tny_account_get_protocol_type (account);
-				protocol = modest_protocol_registry_get_protocol_by_type (modest_runtime_get_protocol_registry (), proto);
-				if (protocol)
-				  format = modest_protocol_get_translation (protocol, MODEST_PROTOCOL_TRANSLATION_MSG_NOT_AVAILABLE, subject);
+				ModestProtocolType proto = modest_tny_account_get_protocol_type (account);
+				ModestProtocol *protocol = modest_protocol_registry_get_protocol_by_type (modest_runtime_get_protocol_registry (), proto);
+
+				if (protocol) {
+					if (tny_account_get_connection_status (account) ==
+					    TNY_CONNECTION_STATUS_CONNECTED) {
+						if (header) {
+							format = modest_protocol_get_translation (protocol,
+												  MODEST_PROTOCOL_TRANSLATION_MSG_NOT_AVAILABLE,
+												  subject);
+						} else {
+							format = modest_protocol_get_translation (protocol,
+												  MODEST_PROTOCOL_TRANSLATION_MSG_NOT_AVAILABLE_LOST_HEADER);
+						}
+					} else {
+						format = g_strdup_printf (_("mail_ib_backend_server_invalid"),
+									  tny_account_get_hostname (account));
+					}
+				}
 				g_object_unref (account);
 			}
 
-			if (!format)
-				format = g_strdup (_("emev_ni_ui_imap_message_not_available_in_server"));
+			if (!format) {
+				if (header) {
+					format = g_strdup (_("emev_ni_ui_imap_message_not_available_in_server"));
+				} else {
+					format = g_strdup (_("emev_ni_ui_pop3_msg_recv_error"));
+				}
+			}
 
 			msg = g_strdup_printf (format, subject);
 			modest_platform_run_information_dialog (NULL, msg, FALSE);
@@ -966,6 +1071,7 @@ typedef struct {
 typedef struct {
 	GtkTreeModel *model;
 	TnyHeader *header;
+	ModestWindow *caller_window;
 	OpenMsgBannerInfo *banner_info;
 	GtkTreeRowReference *rowref;
 } OpenMsgHelper;
@@ -1147,7 +1253,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);
 	}
@@ -1173,78 +1279,6 @@ cleanup:
 	g_object_unref (parent_win);
 }
 
-static gboolean
-is_memory_full_error (GError *error, ModestMailOperation *mail_op)
-{
-	gboolean enough_free_space = TRUE;
-	GnomeVFSURI *cache_dir_uri;
-	const gchar *cache_dir = NULL;
-	GnomeVFSFileSize free_space;
-	TnyAccountStore *acc_store;
-
-	acc_store = TNY_ACCOUNT_STORE (modest_runtime_get_account_store ());
-
-	/* Cache dir is different in case we're using an external storage (like MMC account) */
-	if (mail_op) {
-		TnyAccount *account = modest_mail_operation_get_account (mail_op);
-		if (account) {
-			if (modest_tny_account_is_memory_card_account (account)) {
-				cache_dir = g_getenv (MODEST_MMC1_VOLUMEPATH_ENV);
-			}
-			g_object_unref (account);
-		}
-	}
-
-	/* Get the default local cache dir */
-	if (!cache_dir)
-		cache_dir = tny_account_store_get_cache_dir (acc_store);
-
-	cache_dir_uri = gnome_vfs_uri_new (cache_dir);
-	if (cache_dir_uri) {
-		if (gnome_vfs_get_volume_free_space (cache_dir_uri, &free_space) == GNOME_VFS_OK) {
-			if (free_space < MIN_FREE_SPACE)
-				enough_free_space = FALSE;
-		}
-		gnome_vfs_uri_unref (cache_dir_uri);
-	}
-
-	if ((error->code == TNY_SYSTEM_ERROR_MEMORY ||
-	     /* When asking for a mail and no space left on device
-		tinymail returns this error */
-	     error->code == TNY_SERVICE_ERROR_MESSAGE_NOT_AVAILABLE ||
-	     /* When the folder summary could not be read or
-		written */
-	     error->code == TNY_IO_ERROR_WRITE ||
-	     error->code == TNY_IO_ERROR_READ) &&
-	    !enough_free_space) {
-		return TRUE;
-	} else {
-		return FALSE;
-	}
-}
-
-static gboolean
-check_memory_full_error (GtkWidget *parent_window, GError *err)
-{
-	if (err == NULL)
-		return FALSE;
-
-	if (is_memory_full_error (err, NULL)) {
-		gchar *msg = g_strdup_printf (_KR("cerm_device_memory_full"), "");
-		modest_platform_information_banner (parent_window, NULL, msg);
-		g_free (msg);
-	} else if (err->code == TNY_SYSTEM_ERROR_MEMORY)
-		/* If the account was created in memory full
-		   conditions then tinymail won't be able to
-		   connect so it'll return this error code */
-		modest_platform_information_banner (parent_window,
-						    NULL, _("emev_ui_imap_inbox_select_error"));
-	else
-		return FALSE;
-
-	return TRUE;
-}
-
 void
 modest_ui_actions_disk_operations_error_handler (ModestMailOperation *mail_op,
 						 gpointer user_data)
@@ -1260,7 +1294,9 @@ modest_ui_actions_disk_operations_error_handler (ModestMailOperation *mail_op,
 	/* If the mail op has been cancelled then it's not an error:
 	   don't show any message */
 	if (status != MODEST_MAIL_OPERATION_STATUS_CANCELED) {
-		if (is_memory_full_error ((GError *) error, mail_op)) {
+		TnyAccount *account = modest_mail_operation_get_account (mail_op);
+		if (modest_tny_account_store_is_disk_full_error (modest_runtime_get_account_store(),
+								 (GError *) error, account)) {
 			gchar *msg = g_strdup_printf (_KR("cerm_device_memory_full"), "");
 			modest_platform_information_banner ((GtkWidget *) win, NULL, msg);
 			g_free (msg);
@@ -1275,6 +1311,8 @@ modest_ui_actions_disk_operations_error_handler (ModestMailOperation *mail_op,
 			modest_platform_information_banner ((GtkWidget *) win,
 							    NULL, user_data);
 		}
+		if (account)
+			g_object_unref (account);
 	}
 
 	if (win)
@@ -1338,10 +1376,22 @@ get_account_from_header (TnyHeader *header)
 }
 
 static void
+caller_win_destroyed (OpenMsgHelper *helper, GObject *object)
+{
+	if (helper->caller_window)
+		helper->caller_window = NULL;
+}
+
+static void
 open_msg_helper_destroyer (gpointer user_data)
 {
 	OpenMsgHelper *helper = (OpenMsgHelper *) user_data;
 
+	if (helper->caller_window) {
+		g_object_weak_unref ((GObject *) helper->caller_window, (GWeakNotify) caller_win_destroyed, helper);
+		helper->caller_window = NULL;
+	}
+
 	if (helper->banner_info) {
 		g_free (helper->banner_info->message);
 		if (helper->banner_info->idle_handler > 0) {
@@ -1381,13 +1431,15 @@ open_msg_performer(gboolean canceled,
 	helper = (OpenMsgHelper *) user_data;
 
 	status = tny_account_get_connection_status (account);
-	if (err || canceled) {
+	if (err || canceled || helper->caller_window == NULL) {
 		modest_window_mgr_unregister_header (modest_runtime_get_window_mgr (), helper->header);
 		/* Free the helper */
 		open_msg_helper_destroyer (helper);
 
-		/* In memory full conditions we could get this error here */
-		check_memory_full_error ((GtkWidget *) parent_window, err);
+		/* In disk full conditions we could get this error here */
+		modest_tny_account_store_check_disk_full_error (modest_runtime_get_account_store(),
+								(GtkWidget *) parent_window, err,
+								account, NULL);
 
 		goto clean;
 	}
@@ -1430,6 +1482,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);
@@ -1520,7 +1578,7 @@ open_msg_from_header (TnyHeader *header, GtkTreeRowReference *rowref, ModestWind
 	OpenMsgHelper *helper;
 	ModestWindow *window;
 
-	g_return_if_fail (header != NULL && rowref != NULL);
+	g_return_if_fail (header != NULL && rowref != NULL && gtk_tree_row_reference_valid (rowref));
 
 	mgr = modest_runtime_get_window_mgr ();
 
@@ -1578,6 +1636,8 @@ open_msg_from_header (TnyHeader *header, GtkTreeRowReference *rowref, ModestWind
 	   (the user could switch between folders) */
 	helper = g_slice_new (OpenMsgHelper);
 	helper->model = g_object_ref (gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)));
+	helper->caller_window = win;
+	g_object_weak_ref ((GObject *) helper->caller_window, (GWeakNotify) caller_win_destroyed, helper);
 	helper->header = g_object_ref (header);
 	helper->rowref = gtk_tree_row_reference_copy (rowref);
 	helper->banner_info = NULL;
@@ -1653,7 +1713,10 @@ static ReplyForwardHelper*
 create_reply_forward_helper (ReplyForwardAction action,
 			     ModestWindow *win,
 			     guint reply_forward_type,
-			     TnyHeader *header)
+			     TnyHeader *header,
+			     TnyMsg *msg_part,
+			     TnyHeader *top_header,
+			     TnyList *parts)
 {
 	ReplyForwardHelper *rf_helper = NULL;
 	const gchar *active_acc = modest_window_get_active_account (win);
@@ -1664,10 +1727,16 @@ 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());
 	rf_helper->mailbox = g_strdup (active_mailbox);
+	if (parts)
+		rf_helper->parts = g_object_ref (parts);
+	else
+		rf_helper->parts = NULL;
 
 	/* Note that window could be destroyed just AFTER calling
 	   register_window so we must ensure that this pointer does
@@ -1689,6 +1758,12 @@ 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)
 		g_object_weak_unref (G_OBJECT (helper->parent_window),
 				     rf_helper_window_closed, helper);
@@ -1710,9 +1785,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
@@ -1723,32 +1797,41 @@ 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);
 
 	/* Create reply mail */
 	switch (rf_helper->action) {
+		/* Use the msg_header to ensure that we have all the
+		   information. The summary can lack some data */
+		TnyHeader *msg_header;
 	case ACTION_REPLY:
+		msg_header = tny_msg_get_header (rf_helper->msg_part?rf_helper->msg_part:msg);
 		new_msg =
-			modest_tny_msg_create_reply_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 (rf_helper->msg_part?rf_helper->msg_part:msg);
 		new_msg =
-			modest_tny_msg_create_reply_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);
 		edit_type = MODEST_EDIT_TYPE_REPLY;
+		g_object_unref (msg_header);
 		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;
@@ -1880,12 +1963,80 @@ 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 (mail_op, rf_helper->header, 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);
 }
 
+static gboolean
+all_parts_retrieved (TnyMimePart *part)
+{
+	if (!TNY_IS_CAMEL_BS_MIME_PART (part)) {
+		return TRUE;
+	} else {
+		TnyList *pending_parts;
+		TnyIterator *iterator;
+		gboolean all_retrieved = TRUE;
+
+		pending_parts = TNY_LIST (tny_simple_list_new ());
+		tny_mime_part_get_parts (part, pending_parts);
+		iterator = tny_list_create_iterator (pending_parts);
+		while (all_retrieved && !tny_iterator_is_done (iterator)) {
+			TnyMimePart *child;
+
+			child = TNY_MIME_PART (tny_iterator_get_current (iterator));
+
+			if (tny_camel_bs_mime_part_is_fetched (TNY_CAMEL_BS_MIME_PART (child))) {
+				all_retrieved = all_parts_retrieved (TNY_MIME_PART (child));
+			} else {
+				all_retrieved = FALSE;
+			}
+
+			g_object_unref (child);
+			tny_iterator_next (iterator);
+		}
+		g_object_unref (iterator);
+		g_object_unref (pending_parts);
+		return all_retrieved;
+	}
+}
+
+static void
+forward_pending_parts_helper (TnyMimePart *part, TnyList *list)
+{
+	TnyList *parts;
+	TnyIterator *iterator;
+
+	if (!tny_camel_bs_mime_part_is_fetched (TNY_CAMEL_BS_MIME_PART (part))) {
+		tny_list_append (list, G_OBJECT (part));
+	}
+	parts = TNY_LIST (tny_simple_list_new ());
+	tny_mime_part_get_parts (part, parts);
+	for (iterator = tny_list_create_iterator (parts); 
+	     !tny_iterator_is_done (iterator);
+	     tny_iterator_next (iterator)) {
+		TnyMimePart *child;
+
+		child = TNY_MIME_PART (tny_iterator_get_current (iterator));
+		forward_pending_parts_helper (child, list);
+		g_object_unref (child);
+	}
+	g_object_unref (iterator);
+	g_object_unref (parts);
+}
+
+static TnyList *
+forward_pending_parts (TnyMsg *msg)
+{
+	TnyList *result = TNY_LIST (tny_simple_list_new ());
+	if (TNY_IS_CAMEL_BS_MIME_PART (msg)) {
+		forward_pending_parts_helper (TNY_MIME_PART (msg), result);
+	}
+
+	return result;
+}
+
 /*
  * Common code for the reply and forward actions
  */
@@ -1895,7 +2046,7 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
 	ReplyForwardHelper *rf_helper = NULL;
 	guint reply_forward_type;
 
-	g_return_if_fail (MODEST_IS_WINDOW(win));
+	g_return_if_fail (win && MODEST_IS_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 */
@@ -1918,23 +2069,74 @@ 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) {
+		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);
+								 reply_forward_type, header, NULL, NULL, NULL);
 			reply_forward_cb (NULL, header, FALSE, msg, NULL, rf_helper);
 		} else {
-			g_warning("%s: no message or header found in viewer\n", __FUNCTION__);
+			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 ())) {
+					gint response;
+
+					/* If ask for user permission to download the messages */
+					response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
+											    ngettext("mcen_nc_get_msg",
+												     "mcen_nc_get_msgs",
+												     1));
+
+					/* End if the user does not want to continue */
+					if (response == GTK_RESPONSE_CANCEL)
+						do_download = FALSE;
+				}
+
+				if (do_download) {
+					TnyList *pending_parts;
+					TnyFolder *folder;
+					TnyAccount *account;
+					TnyHeader *top_header;
+
+					/* Create helper */
+					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, msg, top_header, pending_parts);
+					g_object_unref (pending_parts);
+
+					folder = tny_header_get_folder (top_header);
+					account = tny_folder_get_account (folder);
+					modest_platform_connect_and_perform (GTK_WINDOW (win),
+									     TRUE, account,
+									     reply_forward_performer,
+									     rf_helper);
+					if (folder) g_object_unref (folder);
+					g_object_unref (account);
+					if (top_header) g_object_unref (top_header);
+				}
+
+			} else {
+				g_warning("%s: no message or header found in viewer\n", __FUNCTION__);
+			}
 		}
 
 		if (msg)
 			g_object_unref (msg);
+		if (top_msg)
+			g_object_unref (top_msg);
  		if (header)
 			g_object_unref (header);
 	} else {
@@ -1998,7 +2200,7 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
 			if (download) {
 				/* Create helper */
 				rf_helper = create_reply_forward_helper (action, win,
-									 reply_forward_type, header);
+									 reply_forward_type, header, NULL, NULL, NULL);
 				if (uncached_msgs > 0) {
 					modest_platform_connect_and_perform (GTK_WINDOW (win),
 									     TRUE, account,
@@ -2015,7 +2217,7 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
 			if (folder)
 				g_object_unref (folder);
 		} else {
-			reply_forward_cb (NULL, header, FALSE, NULL, NULL, rf_helper);
+			reply_forward_cb (NULL, header, FALSE, NULL, NULL, NULL);
 		}
 		/* Frees */
 		g_object_unref (header_list);
@@ -2024,6 +2226,68 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
 }
 
 void
+modest_ui_actions_reply_calendar (ModestWindow *win, 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;
+	}
+
+	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));
@@ -2119,49 +2383,126 @@ modest_ui_actions_on_sort (GtkAction *action,
 }
 
 static void
-new_messages_arrived (ModestMailOperation *self,
-		      TnyList *new_headers,
-		      gpointer user_data)
+sync_folder_cb (ModestMailOperation *mail_op,
+		TnyFolder *folder,
+		gpointer user_data)
+{
+	ModestHeaderView *header_view = (ModestHeaderView *) user_data;
+
+	if (modest_mail_operation_get_status (mail_op) == MODEST_MAIL_OPERATION_STATUS_SUCCESS) {
+		ModestWindow *parent = (ModestWindow *) modest_mail_operation_get_source (mail_op);
+
+		/* We must clear first, because otherwise set_folder will ignore */
+		/*    the change as the folders are the same */
+		modest_header_view_clear (header_view);
+		modest_header_view_set_folder (header_view, folder, TRUE, parent, NULL, NULL);
+
+		g_object_unref (parent);
+	}
+
+	g_object_unref (header_view);
+}
+
+static gboolean
+idle_refresh_folder (gpointer source)
+{
+	ModestHeaderView *header_view = NULL;
+
+	/* If the window still exists */
+	if (!GTK_IS_WIDGET (source) ||
+	    !GTK_WIDGET_VISIBLE (source))
+		return FALSE;
+
+	/* Refresh the current view */
+#ifdef MODEST_TOOLKIT_HILDON2
+	if (MODEST_IS_HEADER_WINDOW (source))
+		header_view = modest_header_window_get_header_view ((ModestHeaderWindow *) source);
+#else
+	if (MODEST_IS_MAIN_WINDOW (source))
+		header_view = MODEST_HEADER_VIEW (modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (source),
+										       MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW));
+#endif
+	if (header_view) {
+		TnyFolder *folder = modest_header_view_get_folder (header_view);
+		if (folder) {
+			/* Sync the folder status */
+			ModestMailOperation *mail_op = modest_mail_operation_new (source);
+			modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
+			modest_mail_operation_sync_folder (mail_op, folder, FALSE, sync_folder_cb, g_object_ref (header_view));
+			g_object_unref (folder);
+			g_object_unref (mail_op);
+		}
+	}
+
+	return FALSE;
+}
+
+static void
+update_account_cb (ModestMailOperation *self,
+		   TnyList *new_headers,
+		   gpointer user_data)
 {
-	GObject *source;
+	ModestWindow *top;
 	gboolean show_visual_notifications;
 
-	source = modest_mail_operation_get_source (self);
-	show_visual_notifications = (source) ? FALSE : TRUE;
-	if (source)
-		g_object_unref (source);
+	top = modest_window_mgr_get_current_top (modest_runtime_get_window_mgr ());
+	show_visual_notifications = (top) ? FALSE : TRUE;
 
 	/* Notify new messages have been downloaded. If the
 	   send&receive was invoked by the user then do not show any
 	   visual notification, only play a sound and activate the LED
 	   (for the Maemo version) */
-	if (TNY_IS_LIST(new_headers) && (tny_list_get_length (new_headers)) > 0)
-		modest_platform_on_new_headers_received (new_headers,
-							 show_visual_notifications);
+	if (TNY_IS_LIST(new_headers) && (tny_list_get_length (new_headers)) > 0) {
+
+		/* We only notify about really new messages (not seen) we get */
+		TnyList *actually_new_list;
+		TnyIterator *iterator;
+		actually_new_list = TNY_LIST (tny_simple_list_new ());
+		for (iterator = tny_list_create_iterator (new_headers);
+		     !tny_iterator_is_done (iterator);
+		     tny_iterator_next (iterator)) {
+			TnyHeader *header;
+			TnyHeaderFlags flags;
+			header = TNY_HEADER (tny_iterator_get_current (iterator));
+			flags = tny_header_get_flags (header);
+
+			if (!(flags & TNY_HEADER_FLAG_SEEN)) {
+				/* Messages are ordered from most
+				   recent to oldest. But we want to
+				   show notifications starting from
+				   the oldest message. That's why we
+				   reverse the list */
+				tny_list_prepend (actually_new_list, G_OBJECT (header));
+			}
+			g_object_unref (header);
+		}
+		g_object_unref (iterator);
 
-}
+		if (tny_list_get_length (actually_new_list) > 0) {
+			GList *new_headers_list = NULL;
 
-gboolean
-retrieve_all_messages_cb (GObject *source,
-			  guint num_msgs,
-			  guint retrieve_limit)
-{
-	GtkWindow *window;
-	gchar *msg;
-	gint response;
+			new_headers_list = modest_utils_create_notification_list_from_header_list (actually_new_list);
 
-	window = GTK_WINDOW (source);
-	msg = g_strdup_printf (_("mail_nc_msg_count_limit_exceeded"),
-			       num_msgs, retrieve_limit);
+			/* Send notifications */
+			if (new_headers_list) {
+				modest_platform_on_new_headers_received (new_headers_list,
+									 show_visual_notifications);
+				/* Free the list */
+				modest_utils_free_notification_list (new_headers_list);
+			}
+		}
+		g_object_unref (actually_new_list);
+	}
 
-	/* Ask the user if they want to retrieve all the messages */
-	response =
-		modest_platform_run_confirmation_dialog_with_buttons (window, msg,
-								      _("mcen_bd_get_all"),
-								      _("mcen_bd_newest_only"));
-	/* Free and return */
-	g_free (msg);
-	return (response == GTK_RESPONSE_ACCEPT) ? TRUE : FALSE;
+	if (top) {
+		/* Refresh the current folder in an idle. We do this
+		   in order to avoid refresh cancelations if the
+		   currently viewed folder is the inbox */
+		g_idle_add_full (G_PRIORITY_DEFAULT_IDLE,
+				 idle_refresh_folder,
+				 g_object_ref (top),
+				 g_object_unref);
+	}
 }
 
 typedef struct {
@@ -2185,8 +2526,10 @@ do_send_receive_performer (gboolean canceled,
 	info = (SendReceiveInfo *) user_data;
 
 	if (err || canceled) {
-		/* In memory full conditions we could get this error here */
-		check_memory_full_error ((GtkWidget *) parent_window, err);
+		/* In disk full conditions we could get this error here */
+		modest_tny_account_store_check_disk_full_error (modest_runtime_get_account_store(),
+								(GtkWidget *) parent_window, err,
+								account, NULL);
 
 		if (info->mail_op) {
 			modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (),
@@ -2207,8 +2550,7 @@ do_send_receive_performer (gboolean canceled,
 
 	/* Send & receive. */
 	modest_mail_operation_update_account (info->mail_op, info->account_name, info->poke_status, info->interactive,
-					      (info->win) ? retrieve_all_messages_cb : NULL,
-					      new_messages_arrived, info->win);
+					      update_account_cb, info->win);
 
  clean:
 	/* Frees */
@@ -2239,6 +2581,7 @@ modest_ui_actions_do_send_receive (const gchar *account_name,
 	gchar *acc_name = NULL;
 	SendReceiveInfo *info;
 	ModestTnyAccountStore *acc_store;
+	TnyAccount *account;
 
 	/* If no account name was provided then get the current account, and if
 	   there is no current account then pick the default one: */
@@ -2248,7 +2591,7 @@ modest_ui_actions_do_send_receive (const gchar *account_name,
 		if (!acc_name)
 			acc_name  = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr());
 		if (!acc_name) {
-			g_printerr ("modest: cannot get default account\n");
+			modest_platform_information_banner (NULL, NULL, _("emev_ni_internal_error"));
 			return;
 		}
 	} else {
@@ -2256,6 +2599,31 @@ modest_ui_actions_do_send_receive (const gchar *account_name,
 	}
 
 	acc_store = modest_runtime_get_account_store ();
+	account = modest_tny_account_store_get_server_account (acc_store, acc_name, TNY_ACCOUNT_TYPE_STORE);
+
+	if (!account) {
+		g_free (acc_name);
+		modest_platform_information_banner (NULL, NULL, _("emev_ni_internal_error"));
+		return;
+	}
+
+	/* Do not automatically refresh accounts that are flagged as
+	   NO_AUTO_UPDATE. This could be useful for accounts that
+	   handle their own update times */
+	if (!interactive) {
+		ModestProtocolType proto = modest_tny_account_get_protocol_type (account);
+		if (proto != MODEST_PROTOCOL_REGISTRY_TYPE_INVALID) {
+			const gchar *tag = MODEST_PROTOCOL_REGISTRY_NO_AUTO_UPDATE_PROTOCOLS;
+			ModestProtocolRegistry *registry = modest_runtime_get_protocol_registry ();
+
+			if (modest_protocol_registry_protocol_type_has_tag (registry, proto, tag)) {
+				g_debug ("%s no auto update allowed for account %s", __FUNCTION__, account_name);
+				g_object_unref (account);
+				g_free (acc_name);
+				return;
+			}
+		}
+	}
 
 	/* Create the info for the connect and perform */
 	info = g_slice_new (SendReceiveInfo);
@@ -2263,8 +2631,7 @@ modest_ui_actions_do_send_receive (const gchar *account_name,
 	info->win = (win) ? g_object_ref (win) : NULL;
 	info->poke_status = poke_status;
 	info->interactive = interactive;
-	info->account = modest_tny_account_store_get_server_account (acc_store, acc_name,
-								     TNY_ACCOUNT_TYPE_STORE);
+	info->account = account;
 	/* We need to create the operation here, because otherwise it
 	   could happen that the queue emits the queue-empty signal
 	   while we're trying to connect the account */
@@ -2618,7 +2985,6 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view,
 					       gboolean selected,
 					       ModestMainWindow *main_window)
 {
-	ModestConf *conf;
 	GtkWidget *header_view;
 
 	g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
@@ -2628,7 +2994,6 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view,
 	if (!header_view)
 		return;
 
-	conf = modest_runtime_get_conf ();
 
 	if (TNY_IS_ACCOUNT (folder_store)) {
 		if (selected) {
@@ -2640,14 +3005,11 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view,
 	} else {
 		if (TNY_IS_FOLDER (folder_store) && selected) {
 			TnyAccount *account;
-			const gchar *account_name = NULL;
 
 			/* Update the active account */
 			account = modest_tny_folder_get_account (TNY_FOLDER (folder_store));
 			if (account) {
 				set_active_account_from_tny_account (account, MODEST_WINDOW (main_window));
-				account_name =
-					modest_tny_account_get_parent_modest_account_name_for_server_account (account);
 				g_object_unref (account);
 				account = NULL;
 			}
@@ -2687,7 +3049,8 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view,
 #ifdef MODEST_TOOLKIT_GTK
 			if (modest_main_window_get_contents_style (main_window) ==
 			    MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS)
-				modest_widget_memory_save (conf, G_OBJECT (header_view),
+				modest_widget_memory_save (modest_runtime_get_conf (), 
+							   G_OBJECT (header_view),
 							   MODEST_CONF_HEADER_VIEW_KEY);
 #endif
 			modest_header_view_clear (MODEST_HEADER_VIEW(header_view));
@@ -2750,7 +3113,7 @@ void
 modest_ui_actions_on_msg_link_hover (ModestMsgView *msgview, const gchar* link,
 				     ModestWindow *win)
 {
-	/* g_message ("%s %s", __FUNCTION__, link); */
+	/* g_debug ("%s %s", __FUNCTION__, link); */
 }
 
 
@@ -2786,7 +3149,7 @@ modest_ui_actions_on_msg_recpt_activated (ModestMsgView *msgview,
 					  const gchar *address,
 					  ModestWindow *win)
 {
-	/* g_message ("%s %s", __FUNCTION__, address); */
+	/* g_debug ("%s %s", __FUNCTION__, address); */
 }
 
 static void
@@ -2825,13 +3188,11 @@ static gboolean
 enough_space_for_message (ModestMsgEditWindow *edit_window,
 			  MsgData *data)
 {
-	TnyAccountStore *acc_store;
 	guint64 available_disk, expected_size;
 	gint parts_count;
 	guint64 parts_size;
 
 	/* Check size */
-	acc_store = TNY_ACCOUNT_STORE (modest_runtime_get_account_store());
 	available_disk = modest_utils_get_available_space (NULL);
 	modest_msg_edit_window_get_parts_size (edit_window, &parts_count, &parts_size);
 	expected_size = modest_tny_msg_estimate_size (data->plain_body,
@@ -2839,8 +3200,8 @@ enough_space_for_message (ModestMsgEditWindow *edit_window,
 						      parts_count,
 						      parts_size);
 
-	/* Double check: memory full condition or message too big */
-	if (available_disk < MIN_FREE_SPACE ||
+	/* Double check: disk full condition or message too big */
+	if (available_disk < MODEST_TNY_ACCOUNT_STORE_MIN_FREE_SPACE ||
 	    expected_size > available_disk) {
 		gchar *msg = g_strdup_printf (_KR("cerm_device_memory_full"), "");
 		modest_platform_information_banner (NULL, NULL, msg);
@@ -2868,7 +3229,7 @@ enough_space_for_message (ModestMsgEditWindow *edit_window,
 	if (expected_size > MODEST_MAX_ATTACHMENT_SIZE) {
 		modest_platform_run_information_dialog (
 			GTK_WINDOW(edit_window),
-			_KR("memr_ib_operation_disabled"),
+			_("mail_ib_error_attachment_size"),
 			TRUE);
 		return FALSE;
 	}
@@ -2945,6 +3306,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));
 
@@ -3021,19 +3383,35 @@ gboolean
 modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
 {
 	TnyTransportAccount *transport_account = NULL;
-	gboolean had_error = FALSE;
+	gboolean had_error = FALSE, 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);
 
-	if (!modest_msg_edit_window_check_names (edit_window, TRUE))
+	/* Check whether to automatically add new contacts to addressbook or not */
+	add_to_contacts = modest_conf_get_bool (modest_runtime_get_conf (),
+						MODEST_CONF_AUTO_ADD_TO_CONTACTS, NULL);
+	if (!modest_msg_edit_window_check_names (edit_window, add_to_contacts))
 		return TRUE;
 
 	data = modest_msg_edit_window_get_msg_data (edit_window);
 
+	recipients = g_strconcat (data->to?data->to:"", 
+				  data->cc?data->cc:"",
+				  data->bcc?data->bcc:"",
+				  NULL);
+	if (recipients == NULL || recipients[0] == '\0') {
+		/* Empty subject -> no send */
+		g_free (recipients);
+		modest_msg_edit_window_free_msg_data (edit_window, data);
+		return FALSE;
+	}
+	g_free (recipients);
+
 	/* Check size */
 	if (!enough_space_for_message (edit_window, data)) {
 		modest_msg_edit_window_free_msg_data (edit_window, data);
@@ -3057,7 +3435,7 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
 	}
 
 	/* Get the currently-active transport account for this modest account: */
-	if (strcmp (account_name, MODEST_LOCAL_FOLDERS_ACCOUNT_ID) != 0) {
+	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 (),
@@ -3090,7 +3468,8 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
 					     data->images,
 					     data->references,
 					     data->in_reply_to,
-					     data->priority_flags);
+					     data->priority_flags,
+					     data->custom_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"));
@@ -3122,6 +3501,59 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
 	return !had_error;
 }
 
+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;
+
+	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;
+}
+
 void
 modest_ui_actions_on_toggle_bold (GtkToggleAction *action,
 				  ModestMsgEditWindow *window)
@@ -3284,7 +3716,8 @@ do_create_folder_cb (ModestMailOperation *mail_op,
 
 	error = modest_mail_operation_get_error (mail_op);
 	if (error) {
-
+		gboolean disk_full = FALSE;
+		TnyAccount *account;
 		/* Show an error. If there was some problem writing to
 		   disk, show it, otherwise show the generic folder
 		   create error. We do it here and not in an error
@@ -3292,13 +3725,24 @@ do_create_folder_cb (ModestMailOperation *mail_op,
 		   stop the main loop in a gtk_dialog_run and then,
 		   the message won't be shown until that dialog is
 		   closed */
-		modest_ui_actions_disk_operations_error_handler (mail_op,
-								 _("mail_in_ui_folder_create_error"));
-
-		if (!is_memory_full_error ((GError *) error, mail_op)) {
-			/* Try again if there is no full memory condition */
+		account = modest_mail_operation_get_account (mail_op);
+		if (account) {
+			disk_full =
+				modest_tny_account_store_check_disk_full_error (modest_runtime_get_account_store(),
+										(GtkWidget *) source_win,
+										(GError *) error,
+										account,
+										_("mail_in_ui_folder_create_error_memory"));
+			g_object_unref (account);
+		}
+		if (!disk_full) {
+			/* Show an error and try again if there is no
+			   full memory condition */
+			modest_platform_information_banner ((GtkWidget *) source_win, NULL,
+							    _("mail_in_ui_folder_create_error"));
 			do_create_folder (source_win, parent_folder, (const gchar *) suggested_name);
 		}
+
 	} else {
 		/* the 'source_win' is either the ModestMainWindow, or the 'Move to folder'-dialog
 		 * FIXME: any other? */
@@ -3341,8 +3785,23 @@ do_create_folder_performer (gboolean canceled,
 	ModestMailOperation *mail_op;
 
 	if (canceled || err) {
-		/* In memory full conditions we could get this error here */
-		check_memory_full_error ((GtkWidget *) parent_window, err);
+		/* In disk full conditions we could get this error here */
+		modest_tny_account_store_check_disk_full_error (modest_runtime_get_account_store(),
+								(GtkWidget *) parent_window, err,
+								NULL, _("mail_in_ui_folder_create_error_memory"));
+
+		/* This happens if we have selected the outbox folder
+		   as the parent */
+		if (err && err->code == TNY_SERVICE_ERROR_UNKNOWN &&
+		    TNY_IS_MERGE_FOLDER (helper->parent)) {
+			/* Show an error and retry */
+			modest_platform_information_banner ((GtkWidget *) parent_window,
+							    NULL,
+							    _("mail_in_ui_folder_create_error"));
+
+			do_create_folder (parent_window, helper->parent, helper->folder_name);
+		}
+
 		goto frees;
 	}
 
@@ -3456,13 +3915,15 @@ modest_ui_actions_rename_folder_error_handler (ModestMailOperation *mail_op,
 	const GError *error = NULL;
 	gchar *message = NULL;
 	gboolean mem_full;
+	TnyAccount *account = modest_mail_operation_get_account (mail_op);
 
 	/* Get error message */
 	error = modest_mail_operation_get_error (mail_op);
 	if (!error)
 		g_return_if_reached ();
 
-	mem_full = is_memory_full_error ((GError *) error, mail_op);
+	mem_full = modest_tny_account_store_is_disk_full_error (modest_runtime_get_account_store(),
+								(GError *) error, account);
 	if (mem_full) {
 		message = g_strdup_printf (_KR("cerm_device_memory_full"), "");
 	} else if (error->domain == MODEST_MAIL_OPERATION_ERROR &&
@@ -3481,6 +3942,8 @@ modest_ui_actions_rename_folder_error_handler (ModestMailOperation *mail_op,
 	   will be destroyed so the banner won't appear */
 	modest_platform_information_banner (NULL, NULL, message);
 
+	if (account)
+		g_object_unref (account);
 	if (mem_full)
 		g_free (message);
 }
@@ -3525,8 +3988,10 @@ on_rename_folder_performer (gboolean canceled,
 	RenameFolderInfo *data = (RenameFolderInfo*)user_data;
 
 	if (canceled || err) {
-		/* In memory full conditions we could get this error here */
-		check_memory_full_error ((GtkWidget *) parent_window, err);
+		/* In disk full conditions we could get this error here */
+		modest_tny_account_store_check_disk_full_error (modest_runtime_get_account_store(),
+								(GtkWidget *) parent_window, err,
+								account, NULL);
 	} else {
 
 		mail_op =
@@ -3660,6 +4125,13 @@ on_delete_folder_cb (gboolean canceled,
 	GtkTreeSelection *sel;
 
 	if (!MODEST_IS_WINDOW(parent_window) || canceled || (err!=NULL)) {
+		/* Note that the connection process can fail due to
+		   memory low conditions as it can not successfully
+		   store the summary */
+		if (!modest_tny_account_store_check_disk_full_error (modest_runtime_get_account_store(),
+								     (GtkWidget*) parent_window, err,
+								     account, NULL))
+			g_debug ("Error connecting when trying to delete a folder");
 		g_object_unref (G_OBJECT (info->folder));
 		g_free (info);
 		return;
@@ -3695,8 +4167,8 @@ on_delete_folder_cb (gboolean canceled,
 
 	modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (folder_view));
 
-	g_object_unref (G_OBJECT (mail_op));
-	g_object_unref (G_OBJECT (info->folder));
+	g_object_unref (mail_op);
+	g_object_unref (info->folder);
 	g_free (info);
 }
 
@@ -3746,22 +4218,23 @@ delete_folder (ModestWindow *window, gboolean move_to_trash)
 	g_free (message);
 
 	if (response == GTK_RESPONSE_OK) {
-		DeleteFolderInfo *info;
+		TnyAccount *account = NULL;
+		DeleteFolderInfo *info = NULL;
 		info = g_new0(DeleteFolderInfo, 1);
-		info->folder = folder;
+		info->folder = g_object_ref (folder);
 		info->move_to_trash = move_to_trash;
-		g_object_ref (G_OBJECT (info->folder));
-		TnyAccount *account = tny_folder_get_account (TNY_FOLDER (folder));
+
+		account = tny_folder_get_account (TNY_FOLDER (folder));
 		modest_platform_connect_if_remote_and_perform (GTK_WINDOW (window),
 							       TRUE,
 							       TNY_FOLDER_STORE (account),
 							       on_delete_folder_cb, info);
 		g_object_unref (account);
+		g_object_unref (folder);
 		return TRUE;
 	} else {
 		return FALSE;
 	}
-	g_object_unref (G_OBJECT (folder));
 }
 
 void
@@ -4598,6 +5071,7 @@ headers_action_show_details (TnyHeader *header,
 	if (MODEST_IS_MSG_VIEW_WINDOW (window)) {
 		async_retrieval = TRUE;
 		msg = modest_msg_view_window_get_message (MODEST_MSG_VIEW_WINDOW (window));
+		async_retrieval = !TNY_IS_CAMEL_BS_MSG (msg);
 	} else {
 		async_retrieval = FALSE;
 	}
@@ -4674,6 +5148,16 @@ modest_ui_actions_on_details (GtkAction *action,
 }
 
 void
+modest_ui_actions_on_limit_error (GtkAction *action,
+				  ModestWindow *win)
+{
+	g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (win));
+
+	modest_platform_information_banner ((GtkWidget *) win, NULL, _CS("ckdg_ib_maximum_characters_reached"));
+
+}
+
+void
 modest_ui_actions_on_toggle_show_cc (GtkToggleAction *toggle,
 				     ModestMsgEditWindow *window)
 {
@@ -4923,13 +5407,13 @@ on_move_to_dialog_response (GtkDialog *dialog,
 	GtkWidget *parent_win;
 	MoveToInfo *helper = NULL;
 	ModestFolderView *folder_view;
+	gboolean unset_edit_mode = FALSE;
 
 	helper = (MoveToInfo *) user_data;
 
 	parent_win = (GtkWidget *) helper->win;
 	folder_view = MODEST_FOLDER_VIEW (g_object_get_data (G_OBJECT (dialog),
 							     MODEST_MOVE_TO_DIALOG_FOLDER_VIEW));
-
 	switch (response) {
 		TnyFolderStore *dst_folder;
 		TnyFolderStore *selected;
@@ -4984,6 +5468,7 @@ on_move_to_dialog_response (GtkDialog *dialog,
 		if (dst_folder)
 			g_object_unref (dst_folder);
 
+		unset_edit_mode = TRUE;
 		break;
 	default:
 		g_warning ("%s unexpected response id %d", __FUNCTION__, response);
@@ -4992,6 +5477,11 @@ on_move_to_dialog_response (GtkDialog *dialog,
 	/* Free the helper and exit */
 	if (helper->list)
 		g_object_unref (helper->list);
+	if (unset_edit_mode) {
+#ifdef MODEST_TOOLKIT_HILDON2
+		modest_hildon2_window_unset_edit_mode (MODEST_HILDON2_WINDOW (helper->win));
+#endif
+	}
 	g_slice_free (MoveToInfo, helper);
 	gtk_widget_destroy (GTK_WIDGET (dialog));
 }
@@ -5041,8 +5531,6 @@ create_move_to_dialog (GtkWindow *win,
 
 		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));
 		mgr = modest_runtime_get_account_mgr ();
@@ -5238,6 +5726,8 @@ modest_ui_actions_move_folder_error_handler (ModestMailOperation *mail_op,
 					     gpointer user_data)
 {
 	GObject *win = NULL;
+	const GError *error;
+	TnyAccount *account = NULL;
 
 #ifndef MODEST_TOOLKIT_HILDON2
 	ModestWindow *main_window = NULL;
@@ -5245,6 +5735,8 @@ modest_ui_actions_move_folder_error_handler (ModestMailOperation *mail_op,
 	/* Disable next automatic folder selection */
 	main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
 							 FALSE); /* don't create */
+
+	/* Show notification dialog only if the main window exists */
 	if (main_window) {
 		GtkWidget *folder_view = NULL;
 
@@ -5258,11 +5750,23 @@ modest_ui_actions_move_folder_error_handler (ModestMailOperation *mail_op,
 		}
 	}
 #endif
-	/* Show notification dialog only if the main window exists */
 	win = modest_mail_operation_get_source (mail_op);
-	modest_platform_run_information_dialog ((GtkWindow *) win,
-						_("mail_in_ui_folder_move_target_error"),
-						FALSE);
+	error = modest_mail_operation_get_error (mail_op);
+
+	if (TNY_IS_FOLDER (user_data))
+		account = modest_tny_folder_get_account (TNY_FOLDER (user_data));
+	else if (TNY_IS_ACCOUNT (user_data))
+		account = g_object_ref (user_data);
+
+	/* If it's not a disk full error then show a generic error */
+	if (!modest_tny_account_store_check_disk_full_error (modest_runtime_get_account_store(),
+							     (GtkWidget *) win, (GError *) error,
+							     account, NULL))
+		modest_platform_run_information_dialog ((GtkWindow *) win,
+							_("mail_in_ui_folder_move_target_error"),
+							FALSE);
+	if (account)
+		g_object_unref (account);
 	if (win)
 		g_object_unref (win);
 }
@@ -5391,7 +5895,7 @@ modest_ui_actions_on_main_window_remove_attachments (GtkAction *action,
 			modest_msg_view_window_remove_attachments (MODEST_MSG_VIEW_WINDOW (msg_view_window), TRUE);
 		else {
 			/* do nothing; uid was registered before, so window is probably on it's way */
-			g_warning ("debug: header %p has already been registered", header);
+			g_debug ("header %p has already been registered", header);
 		}
 	} else {
 		ModestMailOperation *mail_op = NULL;
@@ -5495,15 +5999,20 @@ xfer_messages_error_handler (ModestMailOperation *mail_op,
 {
 	GObject *win;
 	const GError *error;
+	TnyAccount *account;
 
 	win = modest_mail_operation_get_source (mail_op);
 	error = modest_mail_operation_get_error (mail_op);
 
-	if (error && is_memory_full_error ((GError *) error, mail_op)) {
-		gchar *msg = g_strdup_printf (_KR("cerm_device_memory_full"), "");
-		modest_platform_information_banner ((GtkWidget *) win, NULL, msg);
-		g_free (msg);
-	} else {
+	/* We cannot get the account from the mail op as that is the
+	   source account and for checking memory full conditions we
+	   need the destination one */
+	account = TNY_ACCOUNT (user_data);
+
+	if (error &&
+	    !modest_tny_account_store_check_disk_full_error (modest_runtime_get_account_store(),
+							     (GtkWidget *) win, (GError*) error,
+							     account, _KR("cerm_memory_card_full"))) {
 		modest_platform_run_information_dialog ((GtkWindow *) win,
 							_("mail_in_ui_folder_move_target_error"),
 							FALSE);
@@ -5538,7 +6047,9 @@ xfer_messages_performer  (gboolean canceled,
 	helper = (XferMsgsHelper *) user_data;
 
 	if (canceled || err) {
-		if (!check_memory_full_error ((GtkWidget *) parent_window, err)) {
+		if (!modest_tny_account_store_check_disk_full_error (modest_runtime_get_account_store(),
+								     (GtkWidget *) parent_window, err,
+								     account, NULL)) {
 			/* Show the proper error message */
 			modest_ui_actions_on_account_connection_error (parent_window, account);
 		}
@@ -5550,8 +6061,7 @@ xfer_messages_performer  (gboolean canceled,
 	/* tinymail will return NULL for local folders it seems */
 	dst_forbids_message_add = modest_protocol_registry_protocol_type_has_tag (modest_runtime_get_protocol_registry (),
 										  modest_tny_account_get_protocol_type (dst_account),
-										  MODEST_PROTOCOL_REGISTRY_STORE_FORBID_MESSAGE_ADD);
-	g_object_unref (dst_account);
+										  MODEST_PROTOCOL_REGISTRY_STORE_FORBID_INCOMING_XFERS);
 
 	if (dst_forbids_message_add) {
 		modest_platform_information_banner (GTK_WIDGET (win),
@@ -5583,7 +6093,8 @@ xfer_messages_performer  (gboolean canceled,
 	/* Perform the mail operation */
 	mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT(win),
 								 xfer_messages_error_handler,
-								 movehelper, NULL);
+								 g_object_ref (dst_account),
+								 g_object_unref);
 	modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
 					 mail_op);
 
@@ -5596,6 +6107,8 @@ xfer_messages_performer  (gboolean canceled,
 
 	g_object_unref (G_OBJECT (mail_op));
  end:
+	if (dst_account)
+		g_object_unref (dst_account);
 	g_object_unref (helper->dst_folder);
 	g_object_unref (helper->headers);
 	g_slice_free (XferMsgsHelper, helper);
@@ -5609,14 +6122,25 @@ typedef struct {
 } MoveFolderInfo;
 
 static void
-on_move_folder_cb (gboolean canceled, GError *err, GtkWindow *parent_window,
-		TnyAccount *account, gpointer user_data)
+on_move_folder_cb (gboolean canceled,
+		   GError *err,
+		   GtkWindow *parent_window,
+		   TnyAccount *account,
+		   gpointer user_data)
 {
 	MoveFolderInfo *info = (MoveFolderInfo*)user_data;
 	GtkTreeSelection *sel;
 	ModestMailOperation *mail_op = NULL;
 
 	if (canceled || err || !MODEST_IS_WINDOW (parent_window)) {
+		/* Note that the connection process can fail due to
+		   memory low conditions as it can not successfully
+		   store the summary */
+		if (!modest_tny_account_store_check_disk_full_error (modest_runtime_get_account_store(),
+								     (GtkWidget*) parent_window, err,
+								     account, NULL))
+			g_debug ("Error connecting when trying to move a folder");
+
 		g_object_unref (G_OBJECT (info->src_folder));
 		g_object_unref (G_OBJECT (info->dst_folder));
 		g_free (info);
@@ -5647,15 +6171,10 @@ on_move_folder_cb (gboolean canceled, GError *err, GtkWindow *parent_window,
 
 	mail_op =
 		modest_mail_operation_new_with_error_handling (G_OBJECT(parent_window),
-				modest_ui_actions_move_folder_error_handler,
-				info->src_folder, NULL);
+							       modest_ui_actions_move_folder_error_handler,
+							       g_object_ref (info->dst_folder), g_object_unref);
 	modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
-			mail_op);
-
-	/* Select *after* the changes */
-	/* TODO: this function hangs UI after transfer */
-	/* 			modest_folder_view_select_folder (MODEST_FOLDER_VIEW(folder_view), */
-	/* 							  TNY_FOLDER (src_folder), TRUE); */
+					 mail_op);
 
 	if (MODEST_IS_MAIN_WINDOW (parent_window)) {
 		modest_folder_view_select_folder (MODEST_FOLDER_VIEW(info->folder_view),
@@ -5951,7 +6470,7 @@ modest_ui_actions_on_edit_mode_move_to (ModestWindow *win)
 	/* Show the dialog */
 	gtk_widget_show (dialog);
 
-	return TRUE;
+	return FALSE;
 }
 
 /*
@@ -6134,7 +6653,9 @@ retrieve_msg_contents_performer (gboolean canceled,
 	TnyList *headers = TNY_LIST (user_data);
 
 	if (err || canceled) {
-		check_memory_full_error ((GtkWidget *) parent_window, err);
+		modest_tny_account_store_check_disk_full_error (modest_runtime_get_account_store(),
+								(GtkWidget *) parent_window, err,
+								account, NULL);
 		goto out;
 	}
 
@@ -6611,7 +7132,8 @@ modest_ui_actions_get_msg_already_deleted_error_msg (ModestWindow *win)
 #endif
 	} else if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
 		header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win));
-		folder = TNY_FOLDER_STORE (tny_header_get_folder (header));
+		if (header)
+			folder = TNY_FOLDER_STORE (tny_header_get_folder (header));
 	}
 
 	if (!header || !folder)
@@ -6683,20 +7205,50 @@ modest_ui_actions_on_delete_account (GtkWindow *parent_window,
 		g_free (default_account_name);
 
 		removed = modest_account_mgr_remove_account (account_mgr, account_name);
-		if (!removed)
+		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, account_name);
+		} else {
 			g_warning ("%s: modest_account_mgr_remove_account() failed.\n", __FUNCTION__);
+		}
 	}
 	return removed;
 }
 
-void 
+static void
+on_fetch_images_performer (gboolean canceled,
+			   GError *err,
+			   GtkWindow *parent_window,
+			   TnyAccount *account,
+			   gpointer user_data)
+{
+	if (err || canceled) {
+		/* Show an unable to retrieve images ??? */
+		return;
+	}
+
+	/* Note that the user could have closed the window while connecting */
+	if (GTK_WIDGET_VISIBLE (parent_window))
+		modest_msg_view_window_fetch_images ((ModestMsgViewWindow *) parent_window);
+	g_object_unref ((GObject *) user_data);
+}
+
+void
 modest_ui_actions_on_fetch_images (GtkAction *action,
 				   ModestWindow *window)
 {
 	g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window));
 
-	modest_msg_view_window_fetch_images (MODEST_MSG_VIEW_WINDOW (window));
-
+	modest_platform_connect_and_perform ((GtkWindow *) window, TRUE, 
+					     NULL,
+					     on_fetch_images_performer, 
+					     g_object_ref (window));
 }
 
 void
@@ -6716,3 +7268,89 @@ modest_ui_actions_on_reload_message (const gchar *msg_id)
 
 	modest_msg_view_window_reload (MODEST_MSG_VIEW_WINDOW (window));
 }
+
+/** Check whether any connections are active, and cancel them if 
+ * the user wishes.
+ * Returns TRUE is there was no problem, 
+ * or if an operation was cancelled so we can continue.
+ * Returns FALSE if the user chose to cancel his request instead.
+ */
+
+gboolean
+modest_ui_actions_check_for_active_account (ModestWindow *self,
+					    const gchar* account_name)
+{
+	ModestTnySendQueue *send_queue;
+	ModestTnyAccountStore *acc_store;
+	ModestMailOperationQueue* queue;
+	TnyConnectionStatus store_conn_status;
+	TnyAccount *store_account = NULL, *transport_account = NULL;
+	gboolean retval = TRUE, sending = FALSE;
+
+	acc_store = modest_runtime_get_account_store ();
+	queue = modest_runtime_get_mail_operation_queue ();
+
+	store_account = 
+		modest_tny_account_store_get_server_account (acc_store,
+							     account_name,
+							     TNY_ACCOUNT_TYPE_STORE);
+
+	/* This could happen if the account was deleted before the
+	   call to this function */
+	if (!store_account)
+		return FALSE;
+
+	transport_account = 
+		modest_tny_account_store_get_server_account (acc_store,
+							     account_name,
+							     TNY_ACCOUNT_TYPE_TRANSPORT);
+
+	/* This could happen if the account was deleted before the
+	   call to this function */
+	if (!transport_account) {
+		g_object_unref (store_account);
+		return FALSE;
+	}
+
+	/* If the transport account was not used yet, then the send
+	   queue could not exist (it's created on demand) */
+	send_queue = modest_runtime_get_send_queue (TNY_TRANSPORT_ACCOUNT (transport_account), FALSE);
+	if (TNY_IS_SEND_QUEUE (send_queue))
+		sending = modest_tny_send_queue_sending_in_progress (send_queue);
+
+	store_conn_status = tny_account_get_connection_status (store_account);
+	if (store_conn_status == TNY_CONNECTION_STATUS_CONNECTED || sending) {
+		gint response;
+
+		response = modest_platform_run_confirmation_dialog (GTK_WINDOW (self), 
+								_("emev_nc_disconnect_account"));
+		if (response == GTK_RESPONSE_OK) {
+			retval = TRUE;
+		} else {
+			retval = FALSE;
+		}
+	}
+
+	if (retval) {
+
+		/* FIXME: We should only cancel those of this account */
+		modest_mail_operation_queue_cancel_all (queue);
+
+		/* Also disconnect the account */
+		if ((tny_account_get_connection_status (store_account) != TNY_CONNECTION_STATUS_DISCONNECTED) &&
+		    (tny_account_get_connection_status (store_account) != TNY_CONNECTION_STATUS_DISCONNECTED_BROKEN)) {
+			tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (store_account),
+						      FALSE, NULL, NULL);
+		}
+		if (sending) {
+			tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (transport_account),
+						      FALSE, NULL, NULL);
+		}
+	}
+		
+	/* Frees */
+	g_object_unref (store_account);
+	g_object_unref (transport_account);
+	
+	return retval;
+}