X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=25853f6b7dab3f44f34b4273ce86b660ad2224e1;hp=37ee649e6ede6a29ccdce2725798eaa59b932663;hb=8ca4cfa4cf41f383bdcbe2a7715ae8281bdbb626;hpb=c2277fc818b1ba47308bce8b77c6af31c5764f90

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 37ee649..25853f6 100644
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -44,6 +44,7 @@
 
 #include "modest-tny-platform-factory.h"
 #include "modest-platform.h"
+#include <tny-mime-part.h>
 
 #ifdef MODEST_PLATFORM_MAEMO
 #include "maemo/modest-osso-state-saving.h"
@@ -73,6 +74,8 @@
 #include <tny-device.h>
 #include <tny-merge-folder.h>
 
+#include <gtkhtml/gtkhtml.h>
+
 typedef struct _GetMsgAsyncHelper {	
 	ModestWindow *window;
 	ModestMailOperation *mail_op;
@@ -95,6 +98,7 @@ typedef struct _ReplyForwardHelper {
 	GtkWidget *parent_window;
 } ReplyForwardHelper;
 
+
 /*
  * The do_headers_action uses this kind of functions to perform some
  * action to each member of a list of headers
@@ -119,8 +123,6 @@ static void     reply_forward_cb       (ModestMailOperation *mail_op,
 
 static void     reply_forward          (ReplyForwardAction action, ModestWindow *win);
 
-static gchar*   ask_for_folder_name    (GtkWindow *parent_window, const gchar *title);
-
 
 static void     _on_send_receive_progress_changed (ModestMailOperation  *mail_op, 
 						   ModestMailOperationState *state,
@@ -128,6 +130,20 @@ static void     _on_send_receive_progress_changed (ModestMailOperation  *mail_op
 
 
 
+static void
+run_account_setup_wizard (ModestWindow *win)
+{
+	ModestEasysetupWizardDialog *wizard;
+
+	g_return_if_fail (MODEST_IS_WINDOW(win));
+	
+	wizard = modest_easysetup_wizard_dialog_new ();
+	gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (win));
+	gtk_dialog_run (GTK_DIALOG (wizard));
+	gtk_widget_destroy (GTK_WIDGET (wizard));
+}
+
+
 void   
 modest_ui_actions_on_about (GtkAction *action, ModestWindow *win)
 {
@@ -226,6 +242,7 @@ headers_action_delete (TnyHeader *header,
 		       gpointer user_data)
 {
 	ModestMailOperation *mail_op = NULL;
+	GtkTreeModel *model = NULL;
 
 	mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_DELETE, G_OBJECT(win));
 	modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
@@ -234,6 +251,12 @@ headers_action_delete (TnyHeader *header,
 	/* Always delete. TODO: Move to trash still not supported */
 	modest_mail_operation_remove_msg (mail_op, header, FALSE);
 	g_object_unref (G_OBJECT (mail_op));
+
+	/* refilter treemodel to hide marked-as-deleted rows */
+	if (MODEST_IS_HEADER_VIEW (user_data)) {		
+		model = gtk_tree_view_get_model (GTK_TREE_VIEW (user_data));
+		gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model));
+	}
 }
 
 void
@@ -247,20 +270,28 @@ modest_ui_actions_on_delete (GtkAction *action, ModestWindow *win)
 	gint response;
 	gboolean found;
 	ModestWindowMgr *mgr;
+	GtkWidget *header_view;
 
 	g_return_if_fail (MODEST_IS_WINDOW(win));
-
+	header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
+							   MODEST_WIDGET_TYPE_HEADER_VIEW);
+	
+	/* Check first if the header view has the focus */
+	if (MODEST_IS_MAIN_WINDOW (win)) {
+		if (!gtk_widget_is_focus (header_view))
+			return;
+	}
+	
 	header_list = get_selected_headers (win);
 	if (!header_list) return;
 
-	/* Check if any of the headers is already opened */
+	/* Check if any of the headers is already opened, or in the process of being opened */
 	iter = tny_list_create_iterator (header_list);
 	found = FALSE;
 	mgr = modest_runtime_get_window_mgr ();
 	while (!tny_iterator_is_done (iter) && !found) {
 		header = TNY_HEADER (tny_iterator_get_current (iter));
-		if (modest_window_mgr_find_window_by_header (mgr, header))
-			found = TRUE;
+		found =  modest_window_mgr_find_registered_header (mgr, header, NULL);
 		g_object_unref (header);
 		tny_iterator_next (iter);
 	}
@@ -281,16 +312,15 @@ modest_ui_actions_on_delete (GtkAction *action, ModestWindow *win)
 	}
 
 	/* Select message */
-	if (tny_list_get_length(header_list) > 1)
-		message = g_strdup(_("emev_nc_delete_messages"));
-	else {
+	if (tny_list_get_length(header_list) == 1) {
 		iter = tny_list_create_iterator (header_list);
 		header = TNY_HEADER (tny_iterator_get_current (iter));
 		desc = g_strdup_printf ("%s", tny_header_get_subject (header)); 
-		message = g_strdup_printf(_("emev_nc_delete_message"), desc);
 		g_object_unref (header);
 		g_object_unref (iter);
 	}
+	message = g_strdup_printf(ngettext("emev_nc_delete_message", "emev_nc_delete_messages", 
+					   tny_list_get_length(header_list)), desc);
 
 	/* Confirmation dialog */		
 	response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
@@ -305,13 +335,16 @@ modest_ui_actions_on_delete (GtkAction *action, ModestWindow *win)
 		}
 		
 		/* Remove each header */
-		do_headers_action (win, headers_action_delete, NULL);
+		do_headers_action (win, headers_action_delete, header_view);
 
 		if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
 			gtk_widget_destroy (GTK_WIDGET(win));
 		} 
 	}
 
+	/* Update toolbar dimming state */
+	modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (win));
+
 	/* free */
 	g_free(message);
 	g_free(desc);
@@ -322,26 +355,43 @@ modest_ui_actions_on_delete (GtkAction *action, ModestWindow *win)
 void
 modest_ui_actions_on_quit (GtkAction *action, ModestWindow *win)
 {
-	#ifdef MODEST_PLATFORM_MAEMO
+#ifdef MODEST_PLATFORM_MAEMO
 	modest_osso_save_state();
-	#endif /* MODEST_PLATFORM_MAEMO */
+#endif /* MODEST_PLATFORM_MAEMO */
+
+	g_debug ("closing down, clearing %d item(s) from operation queue",
+		 modest_mail_operation_queue_num_elements
+		 (modest_runtime_get_mail_operation_queue()));
+
+	/* cancel all outstanding operations */
+	modest_mail_operation_queue_cancel_all 
+		(modest_runtime_get_mail_operation_queue());
 	
+	g_debug ("queue has been cleared");
+
+	/* note: when modest-tny-account-store is finalized,
+	   it will automatically set all network connections
+	   to offline */
+
 	gtk_main_quit ();
 }
 
 void
 modest_ui_actions_on_close_window (GtkAction *action, ModestWindow *win)
 {
-	if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
-		gtk_widget_destroy (GTK_WIDGET (win));
-	} else if (MODEST_IS_MSG_EDIT_WINDOW (win)) {
-		gboolean ret_value;
-		g_signal_emit_by_name (G_OBJECT (win), "delete-event", NULL, &ret_value);
-	} else if (MODEST_IS_WINDOW (win)) {
-		gtk_widget_destroy (GTK_WIDGET (win));
-	} else {
-		g_return_if_reached ();
-	}
+	gboolean ret_value;
+	g_signal_emit_by_name (G_OBJECT (win), "delete-event", NULL, &ret_value);
+
+/* 	if (MODEST_IS_MSG_VIEW_WINDOW (win)) { */
+/* 		gtk_widget_destroy (GTK_WIDGET (win)); */
+/* 	} else if (MODEST_IS_MSG_EDIT_WINDOW (win)) { */
+/* 		gboolean ret_value; */
+/* 		g_signal_emit_by_name (G_OBJECT (win), "delete-event", NULL, &ret_value); */
+/* 	} else if (MODEST_IS_WINDOW (win)) { */
+/* 		gtk_widget_destroy (GTK_WIDGET (win)); */
+/* 	} else { */
+/* 		g_return_if_reached (); */
+/* 	} */
 }
 
 void
@@ -366,19 +416,11 @@ modest_ui_actions_on_add_to_contacts (GtkAction *action, ModestWindow *win)
 void
 modest_ui_actions_on_accounts (GtkAction *action, ModestWindow *win)
 {
-	/* This is currently only implemented for Maemo,
-	 * because it requires a providers preset file which is not publically available.
-	 */
+	/* This is currently only implemented for Maemo */
 #ifdef MODEST_PLATFORM_MAEMO /* Defined in config.h */
-	gboolean accounts_exist = modest_account_mgr_has_accounts(
-																														modest_runtime_get_account_mgr(), TRUE);
-	
-	if (!accounts_exist) {
-		/* If there are no accounts yet, just show the easy-setup wizard, as per the UI spec: */
-		ModestEasysetupWizardDialog *wizard = modest_easysetup_wizard_dialog_new ();
-		gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (win));
-		gtk_dialog_run (GTK_DIALOG (wizard));
-		gtk_widget_destroy (GTK_WIDGET (wizard));
+	if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE)) {
+		run_account_setup_wizard (win);
+		return;
 	} else 	{
 		/* Show the list of accounts: */
 		GtkDialog *account_win = GTK_DIALOG(modest_account_view_window_new ());
@@ -425,6 +467,8 @@ on_smtp_servers_window_hide (GtkWindow* window, gpointer user_data)
 	gtk_widget_destroy (GTK_WIDGET (window));
 }
 
+
+
 void
 modest_ui_actions_on_smtp_servers (GtkAction *action, ModestWindow *win)
 {
@@ -455,9 +499,9 @@ modest_ui_actions_on_smtp_servers (GtkAction *action, ModestWindow *win)
 	/* Show the window: */	
 	gtk_window_set_transient_for (GTK_WINDOW (specific_window), GTK_WINDOW (win));
 	gtk_window_set_modal (GTK_WINDOW (specific_window), TRUE);
-    gtk_widget_show (specific_window);
+    	gtk_widget_show (specific_window);
     
-    /* Save changes when the window is hidden: */
+    	/* Save changes when the window is hidden: */
 	g_signal_connect (specific_window, "hide", 
 		G_CALLBACK (on_smtp_servers_window_hide), win);
 #endif /* MODEST_PLATFORM_MAEMO */
@@ -466,7 +510,7 @@ modest_ui_actions_on_smtp_servers (GtkAction *action, ModestWindow *win)
 void
 modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win)
 {
-	ModestWindow *msg_win;
+	ModestWindow *msg_win = NULL;
 	TnyMsg *msg = NULL;
 	TnyFolder *folder = NULL;
 	gchar *account_name = NULL;
@@ -475,10 +519,16 @@ modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win)
 	TnyAccount *account = NULL;
 	ModestWindowMgr *mgr;
 	gchar *signature = NULL, *blank_and_signature = NULL;
+
+	/* if there are no accounts yet, just show the wizard */
+	if (!modest_account_mgr_has_accounts (modest_runtime_get_account_mgr(), TRUE)) {
+			run_account_setup_wizard (win);
+			return;
+	}
 	
-	account_name = g_strdup(modest_window_get_active_account (win));
+	account_name = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr ());
 	if (!account_name)
-		account_name = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr());
+		account_name = g_strdup (modest_window_get_active_account (win));
 	if (!account_name) {
 		g_printerr ("modest: no account found\n");
 		goto cleanup;
@@ -520,13 +570,6 @@ modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win)
 		goto cleanup;
 	}
 	
-/* 	tny_folder_add_msg (folder, msg, &err); */
-/* 	if (err) { */
-/* 		g_printerr ("modest: error adding msg to Drafts folder: %s", */
-/* 			    err->message); */
-/* 		g_error_free (err); */
-/* 		goto cleanup; */
-/* 	} */
 
 	/* Create and register edit window */
 	/* This is destroyed by TOOD. */
@@ -543,6 +586,8 @@ cleanup:
 	g_free (account_name);
 	g_free (from_str);
 	g_free (blank_and_signature);
+	if (msg_win)
+		g_object_unref (msg_win);
 	if (account)
 		g_object_unref (G_OBJECT(account));
 	if (msg)
@@ -575,9 +620,9 @@ open_msg_cb (ModestMailOperation *mail_op,
 	headers_action_mark_as_read (header, MODEST_WINDOW(parent_win), NULL);
 
 	/* Get account */
-	account =  g_strdup (modest_window_get_active_account (MODEST_WINDOW (parent_win)));
+	account = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr());
 	if (!account)
-		account = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr());
+		account =  g_strdup (modest_window_get_active_account (MODEST_WINDOW (parent_win)));
 	
 	/* Gets folder type (OUTBOX headers will be opened in edit window */
 	if (modest_tny_folder_is_local_folder (folder))
@@ -586,16 +631,21 @@ open_msg_cb (ModestMailOperation *mail_op,
 	/* If the header is in the drafts folder then open the editor,
 	   else the message view window */
 	if (folder_type == TNY_FOLDER_TYPE_DRAFTS) {
+		/* we cannot edit without a valid account... */
+		if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE)) {
+			run_account_setup_wizard(parent_win);
+			goto cleanup;
+		}
 		win = modest_msg_edit_window_new (msg, account);
 	} else {
 		gchar *uid = modest_tny_folder_get_header_unique_id (header);
-
+		
 		if (MODEST_IS_MAIN_WINDOW (parent_win)) {
 			GtkWidget *header_view;
 			GtkTreeSelection *sel;
 			GList *sel_list = NULL;
 			GtkTreeModel *model;
-		
+			
 			header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(parent_win),
 									   MODEST_WIDGET_TYPE_HEADER_VIEW);
 
@@ -628,15 +678,22 @@ open_msg_cb (ModestMailOperation *mail_op,
 	if (win != NULL) {
 		mgr = modest_runtime_get_window_mgr ();
 		modest_window_mgr_register_window (mgr, win);
+		g_object_unref (win);
 		gtk_window_set_transient_for (GTK_WINDOW (win), GTK_WINDOW (parent_win));
 		gtk_widget_show_all (GTK_WIDGET(win));
 	}
 
+	/* Update toolbar dimming state */
+	if (MODEST_IS_MAIN_WINDOW (parent_win)) {
+		modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (parent_win));
+	}
+
+cleanup:
 	/* Free */
 	g_free(account);
-	g_object_unref (msg);
+	g_object_unref (parent_win);
+/* 	g_object_unref (msg); */
 	g_object_unref (folder);
-	g_object_unref (header);
 }
 
 /*
@@ -655,6 +712,7 @@ modest_ui_actions_get_msgs_full_error_handler (ModestMailOperation *mail_op,
 
 		modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL,
 							error->message);
+		g_object_unref (win);
 	}
 }
 
@@ -666,49 +724,112 @@ modest_ui_actions_get_msgs_full_error_handler (ModestMailOperation *mail_op,
 static void
 _modest_ui_actions_open (TnyList *headers, ModestWindow *win)
 {
-	ModestWindowMgr *mgr;
-	TnyIterator *iter;
-	ModestMailOperation *mail_op;
-	TnyList *not_opened_headers;
-
+	ModestWindowMgr *mgr = NULL;
+	TnyIterator *iter = NULL;
+	ModestMailOperation *mail_op1 = NULL;
+	ModestMailOperation *mail_op2 = NULL;
+	TnyList *not_opened_headers = NULL;
+	TnyList *not_opened_cached_headers = NULL;
+	TnyHeaderFlags flags;
+		
 	/* Look if we already have a message view for each header. If
 	   true, then remove the header from the list of headers to
 	   open */
 	mgr = modest_runtime_get_window_mgr ();
 	iter = tny_list_create_iterator (headers);
 	not_opened_headers = tny_simple_list_new ();
+	not_opened_cached_headers = tny_simple_list_new ();
 	while (!tny_iterator_is_done (iter)) {
+
 		ModestWindow *window;
 		TnyHeader *header;
+		gboolean found;
 		
 		header = TNY_HEADER (tny_iterator_get_current (iter));
-		window = modest_window_mgr_find_window_by_header (mgr, header);
+		flags = tny_header_get_flags (header);
+
+		window = NULL;
+		found = modest_window_mgr_find_registered_header (mgr, header, &window);
+		
 		/* Do not open again the message and present the
 		   window to the user */
-		if (window)
-			gtk_window_present (GTK_WINDOW (window));
-		else
-			tny_list_append (not_opened_headers, G_OBJECT (header));
-
+		if (found) {
+			if (window)
+				gtk_window_present (GTK_WINDOW (window));
+			else
+				/* the header has been registered already, we don't do
+				 * anything but wait for the window to come up*/
+				g_warning ("debug: header %p already registered, waiting for window",
+					   header);
+		} else {
+			/* register the header before actually creating the window */
+			modest_window_mgr_register_header (mgr, header);
+				
+			if (!(flags & TNY_HEADER_FLAG_CACHED))
+				tny_list_append (not_opened_headers, G_OBJECT (header));
+			/* Check if msg has already been retreived */
+			else
+				tny_list_append (not_opened_cached_headers, G_OBJECT (header));
+		}
 		g_object_unref (header);
 		tny_iterator_next (iter);
 	}
 	
-	/* Open each message */
-	mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, 
-								 G_OBJECT (win), 
-								 modest_ui_actions_get_msgs_full_error_handler, 
-								 NULL);
-	modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
-	modest_mail_operation_get_msgs_full (mail_op, 
-					     not_opened_headers, 
-					     open_msg_cb, 
-					     NULL, 
-					     NULL);
+	/* Open each uncached message */
+	if (tny_list_get_length (not_opened_headers) > 0) {
+		mail_op1 = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, 
+									 G_OBJECT (win), 
+									 modest_ui_actions_get_msgs_full_error_handler, 
+									 NULL);
+		modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op1);
+		if (tny_list_get_length (not_opened_headers) > 1) {
+			modest_mail_operation_get_msgs_full (mail_op1, 
+							     not_opened_headers, 
+							     open_msg_cb, 
+							     NULL, 
+							     NULL);
+		} else {
+			TnyIterator *iter = tny_list_create_iterator (not_opened_headers);
+			TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
+			modest_mail_operation_get_msg (mail_op1, header, open_msg_cb, NULL);
+			g_object_unref (header);
+			g_object_unref (iter);
+		}
+	}
+
+	/* Open each cached message */
+	if (tny_list_get_length (not_opened_cached_headers) > 0) {
+		mail_op2 = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, 
+									 G_OBJECT (win), 
+									 modest_ui_actions_get_msgs_full_error_handler, 
+									 NULL);
+		modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op2);
+		if (tny_list_get_length (not_opened_cached_headers) > 1) {
+			modest_mail_operation_get_msgs_full (mail_op2, 
+							     not_opened_headers, 
+							     open_msg_cb, 
+							     NULL, 
+							     NULL);
+		} else {
+			TnyIterator *iter = tny_list_create_iterator (not_opened_cached_headers);
+			TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
+			modest_mail_operation_get_msg (mail_op2, header, open_msg_cb, NULL);
+			g_object_unref (header);
+			g_object_unref (iter);
+		}
+	}
+
 	/* Clean */
-	g_object_unref (not_opened_headers);
-	g_object_unref (iter);
-	g_object_unref (mail_op);
+	if (not_opened_headers != NULL)
+		g_object_unref (not_opened_headers);
+	if (not_opened_cached_headers != NULL)
+		g_object_unref (not_opened_cached_headers);
+	if (iter != NULL) 
+		g_object_unref (iter);
+	if (mail_op1 != NULL)
+		g_object_unref (mail_op1);
+	if (mail_op2 != NULL) 
+		g_object_unref (mail_op2);
 }
 
 void
@@ -746,11 +867,11 @@ reply_forward_cb (ModestMailOperation *mail_op,
 {
 	TnyMsg *new_msg;
 	ReplyForwardHelper *rf_helper;
-	ModestWindow *msg_win;
+	ModestWindow *msg_win = NULL;
 	ModestEditType edit_type;
-	gchar *from;
+	gchar *from = NULL;
 	TnyAccount *account = NULL;
-	ModestWindowMgr *mgr;
+	ModestWindowMgr *mgr = NULL;
 	gchar *signature = NULL;
 			
 	g_return_if_fail (user_data != NULL);
@@ -821,12 +942,15 @@ reply_forward_cb (ModestMailOperation *mail_op,
 	gtk_widget_show_all (GTK_WIDGET (msg_win));
 
 cleanup:
+	if (msg_win)
+		g_object_unref (msg_win);
 	if (new_msg)
 		g_object_unref (G_OBJECT (new_msg));
 	if (account)
 		g_object_unref (G_OBJECT (account));
-	g_object_unref (msg);
+/* 	g_object_unref (msg); */
 	g_object_unref (header);
+	free_reply_forward_helper (rf_helper);
 }
 
 /*
@@ -842,11 +966,11 @@ static gboolean
 download_uncached_messages (TnyList *header_list, GtkWindow *win)
 {
 	TnyIterator *iter;
-	gboolean found, retval;
+	gboolean retval;
+	gint uncached_messages = 0;
 
 	iter = tny_list_create_iterator (header_list);
-	found = FALSE;
-	while (!tny_iterator_is_done (iter) && !found) {
+	while (!tny_iterator_is_done (iter)) {
 		TnyHeader *header;
 		TnyHeaderFlags flags;
 
@@ -855,7 +979,8 @@ download_uncached_messages (TnyList *header_list, GtkWindow *win)
 		/* TODO: is this the right flag?, it seems that some
 		   headers that have been previously downloaded do not
 		   come with it */
-		found = !(flags & TNY_HEADER_FLAG_CACHED);
+		if (! (flags & TNY_HEADER_FLAG_CACHED))
+			uncached_messages ++;
 		g_object_unref (header);
 		tny_iterator_next (iter);
 	}
@@ -863,11 +988,13 @@ download_uncached_messages (TnyList *header_list, GtkWindow *win)
 
 	/* Ask for user permission to download the messages */
 	retval = TRUE;
-	if (found) {
+	if (uncached_messages > 0) {
 		GtkResponseType response;
 		response = 
 			modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
-								 _("mcen_nc_get_multi_msg_txt"));
+								 ngettext("mcen_nc_get_msg",
+									  "mcen_nc_get_msgs",
+									 uncached_messages));
 		if (response == GTK_RESPONSE_CANCEL)
 			retval = FALSE;
 	}
@@ -889,6 +1016,12 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
 	
 	g_return_if_fail (MODEST_IS_WINDOW(win));
 
+	/* we need an account when editing */
+	if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE)) {
+		run_account_setup_wizard (win);
+		return;
+	}
+	
 	header_list = get_selected_headers (win);
 	if (!header_list)
 		return;
@@ -937,17 +1070,31 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
 		} else
 			reply_forward_cb (NULL, header, msg, rf_helper);
 	} else {
+		TnyHeader *header;
+		TnyIterator *iter;
+
 		/* Retrieve messages */
 		mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, 
 									 G_OBJECT(win),
 									 modest_ui_actions_get_msgs_full_error_handler, 
 									 NULL);
 		modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
-		modest_mail_operation_get_msgs_full (mail_op, 
-						     header_list, 
-						     reply_forward_cb, 
-						     rf_helper, 
-						     free_reply_forward_helper);
+
+		/* Only reply/forward to one message */
+		iter = tny_list_create_iterator (header_list);
+		header = TNY_HEADER (tny_iterator_get_current (iter));
+		g_object_unref (iter);
+
+		modest_mail_operation_get_msg (mail_op,
+					       header,
+					       reply_forward_cb,
+					       rf_helper);
+
+/* 		modest_mail_operation_get_msgs_full (mail_op,  */
+/* 						     header_list,  */
+/* 						     reply_forward_cb,  */
+/* 						     rf_helper,  */
+/* 						     free_reply_forward_helper); */
 
 		/* Clean */
 		g_object_unref(mail_op);
@@ -1040,6 +1187,17 @@ modest_ui_actions_on_sort (GtkAction *action,
 	}
 }
 
+static void
+new_messages_arrived (ModestMailOperation *self, 
+		      gint new_messages,
+		      gpointer user_data)
+{
+	if (new_messages == 0)
+		return;
+
+	modest_platform_on_new_msg ();
+}
+
 /*
  * This function performs the send & receive required actions. The
  * window is used to create the mail operation. Typically it should
@@ -1069,7 +1227,11 @@ modest_ui_actions_do_send_receive (const gchar *account_name, ModestWindow *win)
 	/* Set send/receive operation in progress */	
 	modest_main_window_notify_send_receive_initied (MODEST_MAIN_WINDOW(win));
 
-	mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT(win));
+	mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE,
+								 G_OBJECT (win),
+								 modest_ui_actions_send_receive_error_handler,
+								 NULL);
+
 	g_signal_connect (G_OBJECT(mail_op), "progress-changed", 
 			  G_CALLBACK (_on_send_receive_progress_changed), 
 			  win);
@@ -1082,7 +1244,7 @@ modest_ui_actions_do_send_receive (const gchar *account_name, ModestWindow *win)
 	   internally, so the progress objects will receive the proper
 	   progress information */
 	modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
-	modest_mail_operation_update_account (mail_op, acc_name);
+	modest_mail_operation_update_account (mail_op, acc_name, new_messages_arrived, NULL);
 	g_object_unref (G_OBJECT (mail_op));
 	
 	/* Free */
@@ -1106,9 +1268,9 @@ modest_ui_actions_do_send_receive_all (ModestWindow *win)
 		modest_ui_actions_do_send_receive ((const char*) iter->data, win);
 		iter = g_slist_next (iter);
 	}
-	
-	g_slist_foreach (account_names, (GFunc) g_free, NULL);
-	g_slist_free (account_names);
+
+	modest_account_mgr_free_account_names (account_names);
+	account_names = NULL;
 }
 
 /*
@@ -1174,9 +1336,13 @@ modest_ui_actions_on_header_selected (ModestHeaderView *header_view,
 	/* If no header has been selected then exit */
 	if (!header)
 		return;
-	
+
+	/* Update focus */
+	if (!gtk_widget_is_focus (GTK_WIDGET(header_view)))
+	    gtk_widget_grab_focus (GTK_WIDGET(header_view));
+
 	/* Update Main window title */
-	if (GTK_WIDGET_HAS_FOCUS (header_view)) {
+	if (gtk_widget_is_focus (GTK_WIDGET(header_view))) {
 		const gchar *subject = tny_header_get_subject (header);
 		if (subject && strlen(subject) > 0)
 			gtk_window_set_title (GTK_WINDOW (main_window), subject);
@@ -1228,6 +1394,31 @@ set_active_account_from_tny_account (TnyAccount *account,
 	g_object_unref (modest_server_account);
 }
 
+
+static void
+folder_refreshed_cb (const GObject *obj, 
+		     TnyFolder *folder, 
+		     gpointer user_data)
+{
+	ModestMainWindow *win = NULL;
+	GtkWidget *header_view;
+
+	g_return_if_fail (TNY_IS_FOLDER (folder));
+
+	win = MODEST_MAIN_WINDOW (user_data);
+	header_view = 
+		modest_main_window_get_child_widget(win, MODEST_WIDGET_TYPE_HEADER_VIEW);
+
+	/* Check if folder is empty and set headers view contents style */
+	if (tny_folder_get_all_count (folder) == 0) {
+	printf ("DEBUG: %s: tny_folder_get_all_count() returned 0.\n", __FUNCTION__);
+		modest_main_window_set_contents_style (win,
+						       MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY);
+	} else {
+		printf ("DEBUG: %s: tny_folder_get_all_count() returned >0.\n", __FUNCTION__);
+	}
+}
+
 void 
 modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view,
 					       TnyFolderStore *folder_store, 
@@ -1247,40 +1438,55 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view,
 	conf = modest_runtime_get_conf ();
 
 	if (TNY_IS_ACCOUNT (folder_store)) {
-		/* Update active account */
-		set_active_account_from_tny_account (TNY_ACCOUNT (folder_store), MODEST_WINDOW (main_window));
-		/* Show account details */
-		modest_main_window_set_contents_style (main_window, MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS);
+		if (selected) {
+			/* Update active account */
+			set_active_account_from_tny_account (TNY_ACCOUNT (folder_store), MODEST_WINDOW (main_window));
+			/* Show account details */
+			modest_main_window_set_contents_style (main_window, MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS);
+		}
 	} else {
 		if (TNY_IS_FOLDER (folder_store) && selected) {
 			
-			if (!TNY_IS_MERGE_FOLDER (folder_store)) { /* TnyMergeFolder can have no get_account() implementation. */
-				/* Update the active account */
-				TnyAccount *account = modest_tny_folder_get_account (TNY_FOLDER (folder_store));
+			/* Update the active account */
+			TnyAccount *account = modest_tny_folder_get_account (TNY_FOLDER (folder_store));
+			if (account) {
 				set_active_account_from_tny_account (account, MODEST_WINDOW (main_window));
 				g_object_unref (account);
+				account = NULL;
 			}
-						
-			/* Set folder on header view */
-			modest_header_view_set_folder (MODEST_HEADER_VIEW(header_view),
-						       TNY_FOLDER (folder_store));				
-
-			/* Resore configuration */
-			modest_widget_memory_restore (conf, G_OBJECT(header_view),
-					      MODEST_CONF_HEADER_VIEW_KEY);
-
-			/* Set main view style */
-/* 			modest_main_window_set_contents_style (main_window, */
-/* 							       MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS); */
-/* 			modest_widget_memory_restore (conf, G_OBJECT(header_view), */
-/* 						      MODEST_CONF_HEADER_VIEW_KEY); */
 
+			/* Set the header style by default, it could
+			   be changed later by the refresh callback to
+			   empty */
+			modest_main_window_set_contents_style (main_window, 
+							       MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS);
+
+			/* Set folder on header view. This function
+			   will call tny_folder_refresh_async so we
+			   pass a callback that will be called when
+			   finished. We use that callback to set the
+			   empty view if there are no messages */
+			modest_header_view_set_folder (MODEST_HEADER_VIEW(header_view),
+						       TNY_FOLDER (folder_store),
+						       folder_refreshed_cb,
+						       main_window);
+			
+			/* Restore configuration. We need to do this
+			   *after* the set_folder because the widget
+			   memory asks the header view about its
+			   folder  */
+			modest_widget_memory_restore (modest_runtime_get_conf (), 
+						      G_OBJECT(header_view),
+						      MODEST_CONF_HEADER_VIEW_KEY);
 		} else {
 			/* Update the active account */
 			modest_window_set_active_account (MODEST_WINDOW (main_window), NULL);
-			/* Do not show folder */
-			modest_widget_memory_save (conf, G_OBJECT (header_view), MODEST_CONF_HEADER_VIEW_KEY);
-			modest_header_view_set_folder (MODEST_HEADER_VIEW(header_view), NULL);
+			/* Save only if we're seeing headers */
+			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_CONF_HEADER_VIEW_KEY);
+			modest_header_view_clear (MODEST_HEADER_VIEW(header_view));
 		}
 	}
 
@@ -1298,8 +1504,6 @@ modest_ui_actions_on_item_not_found (ModestHeaderView *header_view,ModestItemTyp
 
 	item = (type == MODEST_ITEM_TYPE_FOLDER) ? "folder" : "message";
 	
-	if (g_main_depth > 0)	
-		gdk_threads_enter ();
 	online = tny_device_is_online (modest_runtime_get_device());
 
 	if (online) {
@@ -1333,8 +1537,6 @@ modest_ui_actions_on_item_not_found (ModestHeaderView *header_view,ModestItemTyp
 		}
 	}
 	gtk_widget_destroy (dialog);
-	if (g_main_depth > 0)	
-		gdk_threads_leave ();
 }
 
 void
@@ -1382,6 +1584,7 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi
 	MsgData *data;
 	gchar *account_name, *from;
 	ModestAccountMgr *account_mgr;
+	gchar *info_text = NULL;
 
 	g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window));
 	
@@ -1438,8 +1641,9 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi
 
 	modest_msg_edit_window_free_msg_data (edit_window, data);
 
-	/* Save settings and close the window */
-	gtk_widget_destroy (GTK_WIDGET (edit_window));
+	info_text = g_strdup_printf (_("mail_va_saved_to_drafts"), _("mcen_me_folder_drafts"));
+	modest_platform_information_banner (NULL, NULL, info_text);
+	g_free (info_text);
 }
 
 /* For instance, when clicking the Send toolbar button when editing a message: */
@@ -1511,6 +1715,8 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
 		}
 	}
 
+	modest_platform_information_banner (NULL, NULL, _("mcen_ib_outbox_waiting_to_be_sent"));
+
 	/* Create the mail operation */
 	ModestMailOperation *mail_operation = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_SEND, G_OBJECT(edit_window));
 	modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_operation);
@@ -1535,6 +1741,7 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
 	g_object_unref (G_OBJECT (mail_operation));
 
 	modest_msg_edit_window_free_msg_data (edit_window, data);
+	modest_msg_edit_window_set_sent (edit_window, TRUE);
 
 	/* Save settings and close the window: */
 	gtk_widget_destroy (GTK_WIDGET (edit_window));
@@ -1685,46 +1892,6 @@ modest_ui_actions_on_remove_attachments (GtkAction *action,
 	modest_msg_edit_window_remove_attachments (window, NULL);
 }
 
-/*
- * Shows a dialog with an entry that asks for some text. The returned
- * value must be freed by the caller. The dialog window title will be
- * set to @title.
- */
-static gchar *
-ask_for_folder_name (GtkWindow *parent_window,
-		     const gchar *title)
-{
-	GtkWidget *dialog, *entry;
-	gchar *folder_name = NULL;
-
-	/* Ask for folder name */
-	dialog = gtk_dialog_new_with_buttons (_("New Folder Name"),
-					      parent_window,
-					      GTK_DIALOG_MODAL,
-					      GTK_STOCK_CANCEL,
-					      GTK_RESPONSE_REJECT,
-					      GTK_STOCK_OK,
-					      GTK_RESPONSE_ACCEPT,
-					      NULL);
-	gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), 
-			    gtk_label_new(title),
-			    FALSE, FALSE, 0);
-		
-	entry = gtk_entry_new_with_max_length (40);
-	gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), 
-			    entry,
-			    TRUE, FALSE, 0);	
-	
-	gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox));
-	
-	if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT)		
-		folder_name = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
-
-	gtk_widget_destroy (dialog);
-
-	return folder_name;
-}
-
 void 
 modest_ui_actions_on_new_folder (GtkAction *action, ModestMainWindow *main_window)
 {
@@ -1779,6 +1946,27 @@ modest_ui_actions_on_new_folder (GtkAction *action, ModestMainWindow *main_windo
 	}
 }
 
+static void
+modest_ui_actions_rename_folder_error_handler (ModestMailOperation *mail_op,
+					       gpointer user_data)
+{
+	GObject *win = modest_mail_operation_get_source (mail_op);
+	const GError *error = NULL;
+	const gchar *message = NULL;
+	
+	/* Get error message */
+	error = modest_mail_operation_get_error (mail_op);
+	if (error != NULL && error->message != NULL) {
+		message = error->message;
+	} else {
+		message = _("!!! FIXME: Unable to rename");
+	}
+	
+	/* Show notification dialog */
+	modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL, message);
+	g_object_unref (win);
+}
+
 void 
 modest_ui_actions_on_rename_folder (GtkAction *action,
 				     ModestMainWindow *main_window)
@@ -1804,17 +1992,27 @@ modest_ui_actions_on_rename_folder (GtkAction *action,
 	
 	if (folder && TNY_IS_FOLDER (folder)) {
 		gchar *folder_name;
-		folder_name = ask_for_folder_name (GTK_WINDOW (main_window),
-						   _("Please enter a new name for the folder"));
+		gint response;
+		const gchar *current_name;
 
-		if (folder_name != NULL && strlen (folder_name) > 0) {
+		current_name = tny_folder_get_name (TNY_FOLDER (folder));
+		response = modest_platform_run_rename_folder_dialog (GTK_WINDOW (main_window), NULL,
+								     current_name, &folder_name);
+
+		if (response == GTK_RESPONSE_ACCEPT && strlen (folder_name) > 0) {
 			ModestMailOperation *mail_op;
 
-			mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_INFO, G_OBJECT(main_window));
+			mail_op = 
+				modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_INFO, 
+									       G_OBJECT(main_window),
+									       modest_ui_actions_rename_folder_error_handler,
+									       NULL);
+
+
 			modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
 							 mail_op);
 
-			modest_header_view_set_folder (MODEST_HEADER_VIEW (header_view), NULL);
+			modest_header_view_clear (MODEST_HEADER_VIEW (header_view));
 
 			modest_mail_operation_rename_folder (mail_op,
 							     TNY_FOLDER (folder),
@@ -1835,6 +2033,7 @@ modest_ui_actions_delete_folder_error_handler (ModestMailOperation *mail_op,
 
 	modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL,
 						_("mail_in_ui_folder_delete_error"));
+	g_object_unref (win);
 }
 
 static void
@@ -1864,7 +2063,7 @@ delete_folder (ModestMainWindow *main_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 (GTK_WINDOW (main_window), 
+	response = modest_platform_run_confirmation_dialog (GTK_WINDOW (main_window),
 							    (const gchar *) message);
 	g_free (message);
 
@@ -2037,12 +2236,8 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
 			const gboolean username_was_changed = 
 				(strcmp (*username, initial_username) != 0);
 			if (username_was_changed) {
-				/* To actually use a changed username, 
-				 * we must reset the connection, according to pvanhoof.
-				 * This _might_ be a sensible way to do that: */
-				 TnyDevice *device = modest_runtime_get_device();
-				 tny_device_force_offline (device);
-				 tny_device_force_online (device);
+				g_warning ("%s: tinymail does not yet support changing the "
+					"username in the get_password() callback.\n", __FUNCTION__);
 			}
 		}
 			
@@ -2100,6 +2295,10 @@ modest_ui_actions_on_cut (GtkAction *action,
 		clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
 		buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focused_widget));
 		gtk_text_buffer_cut_clipboard (buffer, clipboard, TRUE);
+	} else if (MODEST_IS_HEADER_VIEW (focused_widget)) {
+		modest_header_view_cut_selection (MODEST_HEADER_VIEW (focused_widget));
+	} else if (MODEST_IS_FOLDER_VIEW (focused_widget)) {
+ 		modest_folder_view_cut_selection (MODEST_FOLDER_VIEW (focused_widget));
 	}
 }
 
@@ -2112,25 +2311,61 @@ modest_ui_actions_on_copy (GtkAction *action,
 
 	clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
 	focused_widget = gtk_window_get_focus (GTK_WINDOW (window));
+
 	if (GTK_IS_LABEL (focused_widget)) {
 		gtk_clipboard_set_text (clipboard, gtk_label_get_text (GTK_LABEL (focused_widget)), -1);
 	} else if (GTK_IS_EDITABLE (focused_widget)) {
 		gtk_editable_copy_clipboard (GTK_EDITABLE(focused_widget));
 	} else if (GTK_IS_TEXT_VIEW (focused_widget)) {
 		GtkTextBuffer *buffer;
-
 		buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focused_widget));
 		gtk_text_buffer_copy_clipboard (buffer, clipboard);
-	}
+		modest_header_view_copy_selection (MODEST_HEADER_VIEW (focused_widget));
+	} else if (MODEST_IS_HEADER_VIEW (focused_widget)) {
+		TnyList *header_list = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW (focused_widget));
+		TnyIterator *iter = tny_list_create_iterator (header_list);
+		TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
+		TnyFolder *folder = tny_header_get_folder (header);
+		TnyAccount *account = tny_folder_get_account (folder);
+		const gchar *proto_str = tny_account_get_proto (TNY_ACCOUNT (account));
+		/* If it's POP then ask */
+		gboolean ask = (modest_protocol_info_get_transport_store_protocol (proto_str) == 
+		       MODEST_PROTOCOL_STORE_POP) ? TRUE : FALSE;
+		g_object_unref (account);
+		g_object_unref (folder);
+		g_object_unref (header);
+		g_object_unref (iter);
+		
+		/* Check that the messages have been previously downloaded */
+		gboolean continue_download = TRUE;
+		if (ask)
+			continue_download = download_uncached_messages (header_list, GTK_WINDOW (window));
+		if (continue_download)
+			modest_header_view_copy_selection (MODEST_HEADER_VIEW (focused_widget));
+		g_object_unref (header_list);
+	} else if (MODEST_IS_FOLDER_VIEW (focused_widget)) {
+ 		modest_folder_view_copy_selection (MODEST_FOLDER_VIEW (focused_widget));
+	}    
+
+	/* Show information banner */
+	modest_platform_information_banner (NULL, NULL, _CS("ecoc_ib_edwin_copied"));
+	
 }
 
 void
 modest_ui_actions_on_undo (GtkAction *action,
 			   ModestWindow *window)
 {
+	ModestEmailClipboard *clipboard = NULL;
+
 	if (MODEST_IS_MSG_EDIT_WINDOW (window)) {
 		modest_msg_edit_window_undo (MODEST_MSG_EDIT_WINDOW (window));
-	} else {
+	} else if (MODEST_IS_MAIN_WINDOW (window)) {
+		/* Clear clipboard source */
+		clipboard = modest_runtime_get_email_clipboard ();
+		modest_email_clipboard_clear (clipboard); 		
+	}
+	else {
 		g_return_if_reached ();
 	}
 }
@@ -2140,6 +2375,7 @@ modest_ui_actions_on_paste (GtkAction *action,
 			    ModestWindow *window)
 {
 	GtkWidget *focused_widget;
+	ModestMailOperation *mail_op = NULL;
 
 	focused_widget = gtk_window_get_focus (GTK_WINDOW (window));
 	if (GTK_IS_EDITABLE (focused_widget)) {
@@ -2151,6 +2387,52 @@ modest_ui_actions_on_paste (GtkAction *action,
 		clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
 		buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focused_widget));
 		gtk_text_buffer_paste_clipboard (buffer, clipboard, NULL, TRUE);
+	} else if (MODEST_IS_FOLDER_VIEW (focused_widget)) {
+		ModestEmailClipboard *clipboard = NULL;
+		TnyFolder *src_folder = NULL;
+		TnyFolderStore *folder_store = NULL;
+		TnyList *data = NULL;		
+		gboolean delete = FALSE;
+		
+		/* Check clipboard source */
+		clipboard = modest_runtime_get_email_clipboard ();
+		if (modest_email_clipboard_cleared (clipboard)) 
+			return;
+		
+		/* Get elements to paste */
+		modest_email_clipboard_get_data (clipboard, &src_folder, &data, &delete);
+
+		/* Create a new mail operation */
+		mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT(window));
+		modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), 
+						 mail_op);
+		
+		/* Get destination folder */
+		folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (focused_widget));
+
+		/* transfer messages  */
+		if (data != NULL) {
+			modest_mail_operation_xfer_msgs (mail_op, 
+							 data,
+							 TNY_FOLDER (folder_store),
+							 delete,
+							 NULL,
+							 NULL);
+			
+		} else if (src_folder != NULL) {			
+			modest_mail_operation_xfer_folder (mail_op, 
+							   src_folder,
+							   folder_store,
+							   delete);
+		}
+
+		/* Free */
+		if (data != NULL) 
+			g_object_unref (data);
+		if (src_folder != NULL) 
+			g_object_unref (src_folder);
+		if (folder_store != NULL) 
+			g_object_unref (folder_store);
 	}
 }
 
@@ -2175,22 +2457,24 @@ modest_ui_actions_on_select_all (GtkAction *action,
 		gtk_text_buffer_get_start_iter (buffer, &start);
 		gtk_text_buffer_get_end_iter (buffer, &end);
 		gtk_text_buffer_select_range (buffer, &start, &end);
-	}
-	else if ((MODEST_IS_FOLDER_VIEW (focused_widget)) ||
-		 (MODEST_IS_HEADER_VIEW (focused_widget))) {
-		
-		GtkTreeSelection *selection = NULL;
-
-		/* Get header view */		
+	} else if (GTK_IS_HTML (focused_widget)) {
+		gtk_html_select_all (GTK_HTML (focused_widget));
+	} else if (MODEST_IS_MAIN_WINDOW (window)) {
 		GtkWidget *header_view = focused_widget;
-		if (MODEST_IS_FOLDER_VIEW (focused_widget))
+ 		GtkTreeSelection *selection = NULL;
+		
+		if (!(MODEST_IS_HEADER_VIEW (focused_widget)))
 			header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (window),
 									   MODEST_WIDGET_TYPE_HEADER_VIEW);
-
+				
 		/* Select all messages */
 		selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(header_view));
 		gtk_tree_selection_select_all (selection);
+
+		/* Set focuse on header view */
+		gtk_widget_grab_focus (header_view);
 	}
+
 }
 
 void
@@ -2382,15 +2666,20 @@ modest_ui_actions_on_details (GtkAction *action,
 		folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
 								    MODEST_WIDGET_TYPE_FOLDER_VIEW);
 		if (gtk_widget_is_focus (folder_view)) {
-			TnyFolder *folder;
-
-			folder = (TnyFolder *) modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
-
+			TnyFolderStore *folder_store
+				= modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
+			if (!folder_store) {
+				g_warning ("%s: No item was selected.\n", __FUNCTION__);
+				return;	
+			}
 			/* Show only when it's a folder */
-			if (!folder || !TNY_IS_FOLDER (folder))
-				return;
+			/* This function should not be called for account items, 
+			 * because we dim the menu item for them. */
+			if (TNY_IS_FOLDER (folder_store)) {
+				show_folder_details (TNY_FOLDER (folder_store), GTK_WINDOW (win));
+			}
 
-			show_folder_details (folder, GTK_WINDOW (win));
+			g_object_unref (folder_store);
 
 		} else {
 			header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
@@ -2518,7 +2807,7 @@ create_move_to_dialog (ModestWindow *win,
 					 GTK_POLICY_AUTOMATIC);
 
 	/* Create folder view */
-	*tree_view = modest_folder_view_new (NULL);
+	*tree_view = modest_platform_create_folder_view (NULL);
 
 	/* It could happen that we're trying to move a message from a
 	   window (msg window for example) after the main window was
@@ -2539,6 +2828,9 @@ create_move_to_dialog (ModestWindow *win,
 
 	gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox));
 
+	/* Select INBOX or local account */
+	modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (*tree_view));
+
 	return dialog;
 }
 
@@ -2596,21 +2888,21 @@ msgs_move_to_confirmation (GtkWindow *win,
 		g_object_unref (header);
 		g_object_unref (iter);
 
+		/* if no src_folder, message may be an attahcment */
+		if (src_folder == NULL) 
+			return GTK_RESPONSE_CANCEL;
+
 		/* If the source is a remote folder */
 		if (!modest_tny_folder_is_local_folder (src_folder)) {
 			const gchar *message;
 			
-			if (tny_list_get_length (headers) == 1)
-				if (has_retrieved_msgs (headers))
-					message = _("mcen_nc_move_retrieve");
-				else
-					message = _("mcen_nc_move_header");
-			else
-				if (has_retrieved_msgs (headers))
-					message = _("mcen_nc_move_retrieves");
-				else
-					message = _("mcen_nc_move_headers");
-			
+			if (has_retrieved_msgs (headers))
+				message = ngettext ("mcen_nc_move_retrieve", "mcen_nc_move_retrieves",
+						    tny_list_get_length (headers));
+			else 
+				message = ngettext ("mcen_nc_move_header", "mcen_nc_move_headers",
+						    tny_list_get_length (headers));
+
 			response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
 									    (const gchar *) message);
 		}
@@ -2621,16 +2913,25 @@ msgs_move_to_confirmation (GtkWindow *win,
 
 
 static void
-tranasfer_msgs_from_viewer_cb (const GObject *object, gpointer user_data)
+transfer_msgs_from_viewer_cb (const GObject *object, gpointer user_data)
 {
 	ModestMsgViewWindow *self = NULL;
-	gboolean found = FALSE;
+	gboolean last, first;
 
 	g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (object));
 	self = MODEST_MSG_VIEW_WINDOW (object);
-
-	found = modest_msg_view_window_select_first_message (self);
-	g_return_if_fail (found);
+	
+	last = modest_msg_view_window_last_message_selected (self);
+	first = modest_msg_view_window_first_message_selected (self);	
+	if (last & first) {
+		/* No more messages to view, so close this window */
+/* 		gboolean ret_value; */
+/* 		g_signal_emit_by_name (G_OBJECT (self), "delete-event", NULL, &ret_value); */
+		modest_ui_actions_on_close_window (NULL, MODEST_WINDOW(self));
+	} else if (last)
+		modest_msg_view_window_select_previous_message (self);
+	else 
+		modest_msg_view_window_select_next_message (self);
 }
 
 void
@@ -2638,10 +2939,169 @@ modest_ui_actions_move_folder_error_handler (ModestMailOperation *mail_op,
 					     gpointer user_data)
 {
 	GObject *win = modest_mail_operation_get_source (mail_op);
+	const GError *error = NULL;
+	const gchar *message = NULL;
+	
+	/* Get error message */
+	error = modest_mail_operation_get_error (mail_op);
+	if (error != NULL && error->message != NULL) {
+		message = error->message;
+	} else {
+		message = _("mail_in_ui_folder_move_target_error");
+	}
+	
+	/* Show notification dialog */
+	modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL, message);
+	g_object_unref (win);
+}
 
-	/* TODO: show error message */
-	modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL,
-						_("mail_in_ui_folder_move_target_error"));
+void
+modest_ui_actions_send_receive_error_handler (ModestMailOperation *mail_op, 
+					      gpointer user_data)
+{
+	GObject *win = modest_mail_operation_get_source (mail_op);
+	const GError *error = modest_mail_operation_get_error (mail_op);
+
+	g_return_if_fail (error != NULL);
+	if (error->message != NULL)		
+		g_printerr ("modest: %s\n", error->message);
+	else
+		g_printerr ("modest: unkonw error on sedn&receive operation");
+
+	/* Show error message */
+	if (modest_mail_operation_get_id (mail_op) == MODEST_MAIL_OPERATION_TYPE_RECEIVE)
+		modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL,
+							_CS("sfil_ib_unable_to_receive"));
+	else 
+		modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL,
+							_CS("sfil_ib_unable_to_send"));
+		g_object_unref (win);
+}
+
+static void
+open_msg_for_purge_cb (ModestMailOperation *mail_op, 
+		       TnyHeader *header, 
+		       TnyMsg *msg, 
+		       gpointer user_data)
+{
+	TnyList *parts;
+	TnyIterator *iter;
+	gint pending_purges = 0;
+	gboolean some_purged = FALSE;
+	ModestWindow *win = MODEST_WINDOW (user_data);
+	if (!msg)
+		return;
+
+	/* Once the message has been retrieved for purging, we check if
+	 * it's all ok for purging */
+
+	parts = tny_simple_list_new ();
+	tny_mime_part_get_parts (TNY_MIME_PART (msg), parts);
+	iter = tny_list_create_iterator (parts);
+
+	while (!tny_iterator_is_done (iter)) {
+		TnyMimePart *part;
+		part = TNY_MIME_PART (tny_iterator_get_current (iter));
+		if (tny_mime_part_is_attachment (part) || TNY_IS_MSG (part)) {
+			if (tny_mime_part_is_purged (part))
+				some_purged = TRUE;
+			else
+				pending_purges++;
+		}
+		tny_iterator_next (iter);
+	}
+
+	if (pending_purges>0) {
+		gint response;
+		response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win),_("mcen_nc_purge_file_text_inbox"));
+
+		if (response == GTK_RESPONSE_OK) {
+			modest_platform_information_banner (NULL, NULL, _("mcen_ib_removing_attachment"));
+			tny_iterator_first (iter);
+			while (!tny_iterator_is_done (iter)) {
+				TnyMimePart *part;
+				
+				part = TNY_MIME_PART (tny_iterator_get_current (iter));
+				if (tny_mime_part_is_attachment (part) || TNY_IS_MSG (part))
+					tny_mime_part_set_purged (part);
+				tny_iterator_next (iter);
+			}
+			
+			tny_msg_rewrite_cache (msg);
+		}
+	} else {
+		modest_platform_information_banner (NULL, NULL, _("mail_ib_attachment_already_purged"));
+	}
+
+	/* remove attachments */
+	tny_iterator_first (iter);
+	while (!tny_iterator_is_done (iter)) {
+		TnyMimePart *part;
+			
+		part = TNY_MIME_PART (tny_iterator_get_current (iter));
+		g_object_unref (part);
+		tny_iterator_next (iter);
+	}
+
+	g_object_unref (iter);
+	g_object_unref (parts);
+}
+
+static void
+modest_ui_actions_on_main_window_remove_attachments (GtkAction *action,
+						     ModestMainWindow *win)
+{
+	GtkWidget *header_view;
+	TnyList *header_list;
+	TnyIterator *iter;
+	TnyHeader *header;
+	TnyHeaderFlags flags;
+	ModestWindow *msg_view_window =  NULL;
+	gboolean found;
+
+	g_return_if_fail (MODEST_IS_MAIN_WINDOW (win));
+
+	header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
+							   MODEST_WIDGET_TYPE_HEADER_VIEW);
+
+	header_list = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW (header_view));
+
+	if (tny_list_get_length (header_list) == 1) {
+		iter = tny_list_create_iterator (header_list);
+		header = TNY_HEADER (tny_iterator_get_current (iter));
+		g_object_unref (iter);
+	} else {
+		return;
+	}
+
+	found = modest_window_mgr_find_registered_header (modest_runtime_get_window_mgr (),
+							  header, &msg_view_window);
+	flags = tny_header_get_flags (header);
+	if (!(flags & TNY_HEADER_FLAG_CACHED))
+		return;
+	if (found) {
+		if (msg_view_window != NULL) 
+			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);
+		}
+	} else {
+		ModestMailOperation *mail_op = NULL;
+		modest_window_mgr_register_header (modest_runtime_get_window_mgr (), header);
+		mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE,
+									 G_OBJECT (win),
+									 modest_ui_actions_get_msgs_full_error_handler,
+									 NULL);
+		modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
+		modest_mail_operation_get_msg (mail_op, header, open_msg_for_purge_cb, win);
+		
+		g_object_unref (mail_op);
+	}
+	if (header)
+		g_object_unref (header);
+	if (header_list)
+		g_object_unref (header_list);
 }
 
 /*
@@ -2680,7 +3140,8 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action,
 
 	folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (tree_view));
 
-	if (TNY_IS_ACCOUNT (folder_store))
+	if (TNY_IS_ACCOUNT (folder_store) && 
+	    !MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (folder_store))
 		goto end;
 
 	/* Get folder or messages to transfer */
@@ -2689,7 +3150,7 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action,
 		src_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
 
 		/* Clean folder on header view before moving it */
-		modest_header_view_set_folder (MODEST_HEADER_VIEW (header_view), NULL); 
+		modest_header_view_clear (MODEST_HEADER_VIEW (header_view)); 
 
 		if (TNY_IS_FOLDER (src_folder)) {
 			mail_op = 
@@ -2723,7 +3184,11 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action,
 
 			/* Transfer messages */
 			if (response == GTK_RESPONSE_OK) {
-				mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT(win));
+				mail_op = 
+					modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, 
+										       G_OBJECT(win),
+										       modest_ui_actions_move_folder_error_handler,
+										       NULL);
 				modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), 
 								 mail_op);
 
@@ -2739,8 +3204,9 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action,
 			g_object_unref (headers);
 		}
 	}
-	g_object_unref (folder_store);
  end:
+	if (folder_store != NULL)
+		g_object_unref (folder_store);
 	gtk_widget_destroy (dialog);
 }
 
@@ -2780,6 +3246,7 @@ modest_ui_actions_on_msg_view_window_move_to (GtkAction *action,
 
 		/* Create header list */
 		header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win));		
+			
 		headers = tny_simple_list_new ();
 		tny_list_prepend (headers, G_OBJECT (header));
 		g_object_unref (header);
@@ -2803,7 +3270,7 @@ modest_ui_actions_on_msg_view_window_move_to (GtkAction *action,
 							 headers,
 							 TNY_FOLDER (folder_store),
 							 TRUE,
-							 tranasfer_msgs_from_viewer_cb,
+							 transfer_msgs_from_viewer_cb,
 							 NULL);
 			g_object_unref (G_OBJECT (mail_op));
 		}
@@ -2839,22 +3306,34 @@ do_headers_action (ModestWindow *win,
 {
 	TnyList *headers_list;
 	TnyIterator *iter;
+	TnyHeader *header;
+	TnyFolder *folder;
 
 	/* Get headers */
 	headers_list = get_selected_headers (win);
 	if (!headers_list)
 		return;
 
-	/* Call the function for each header */
+	/* Get the folder */
 	iter = tny_list_create_iterator (headers_list);
-	while (!tny_iterator_is_done (iter)) {
-		TnyHeader *header;
+	header = TNY_HEADER (tny_iterator_get_current (iter));
+	folder = tny_header_get_folder (header);
+	g_object_unref (header);
 
+	/* Call the function for each header */
+	while (!tny_iterator_is_done (iter)) {
 		header = TNY_HEADER (tny_iterator_get_current (iter));
 		func (header, win, user_data);
 		g_object_unref (header);
 		tny_iterator_next (iter);
 	}
+
+	/* Trick: do a poke status in order to speed up the signaling
+	   of observers */
+	tny_folder_poke_status (folder);
+
+	/* Frees */
+	g_object_unref (folder);
 	g_object_unref (iter);
 	g_object_unref (headers_list);
 }
@@ -2887,8 +3366,10 @@ void
 modest_ui_actions_remove_attachments (GtkAction *action,
 				      ModestWindow *window)
 {
-	if (MODEST_IS_MSG_VIEW_WINDOW (window)) {
-		modest_msg_view_window_remove_attachments (MODEST_MSG_VIEW_WINDOW (window), NULL);
+	if (MODEST_IS_MAIN_WINDOW (window)) {
+		modest_ui_actions_on_main_window_remove_attachments (action, MODEST_MAIN_WINDOW (window));
+	} else if (MODEST_IS_MSG_VIEW_WINDOW (window)) {
+		modest_msg_view_window_remove_attachments (MODEST_MSG_VIEW_WINDOW (window), FALSE);
 	} else {
 		/* not supported window for this action */
 		g_return_if_reached ();
@@ -2903,7 +3384,7 @@ modest_ui_actions_on_settings (GtkAction *action,
 
 	dialog = modest_platform_get_global_settings_dialog ();
 	gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (win));
-	gtk_widget_show (dialog);
+	gtk_widget_show_all (dialog);
 
 	gtk_dialog_run (GTK_DIALOG (dialog));
 
@@ -2954,6 +3435,7 @@ modest_ui_actions_on_help (GtkAction *action,
 					help_id = NULL;
 				}
 			}
+			g_object_unref (folder_store);
 		} else {
 			help_id = "applications_email_mainview";	
 		}
@@ -3116,3 +3598,5 @@ _on_send_receive_progress_changed (ModestMailOperation  *mail_op,
 		modest_main_window_notify_send_receive_completed (MODEST_MAIN_WINDOW(user_data));
 	
 }
+
+