X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=9d8fff4061365a274475be345c48abde9cf9d92a;hp=ae9bbf4ff7e34c89baa85852684477ee35785cb2;hb=09072e70ad896177494be0294fbbab01248d2823;hpb=f4a7588d80d2dce8f76e831a82f2383436ad01b9

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index ae9bbf4..9d8fff4 100644
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -177,6 +177,12 @@ static void modest_ui_actions_on_main_window_move_to (GtkAction *action,
 						      GtkWidget *folder_view,
 						      TnyFolderStore *dst_folder,
 						      ModestMainWindow *win);
+#ifdef MODEST_TOOLKIT_HILDON2
+static void modest_ui_actions_on_folder_window_move_to (GtkWidget *folder_view,
+							TnyFolderStore *dst_folder,
+							TnyList *selection,
+							GtkWindow *win);
+#endif
 
 static void modest_ui_actions_on_window_move_to (GtkAction *action,
 						 TnyList *list_to_move,
@@ -600,7 +606,7 @@ modest_ui_actions_on_delete_message_or_folder (GtkAction *action, ModestWindow *
 		w = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
 							 MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
 		if (gtk_widget_is_focus (w)) {
-			modest_ui_actions_on_delete_folder (action, MODEST_MAIN_WINDOW(win));
+			modest_ui_actions_on_delete_folder (action, MODEST_WINDOW(win));
 			return;
 		}
 	}
@@ -946,13 +952,14 @@ get_header_view_from_window (ModestWindow *window)
 }
 
 static gchar *
-get_info_from_header (TnyHeader *header, gboolean *is_draft)
+get_info_from_header (TnyHeader *header, gboolean *is_draft, gboolean *can_open)
 {
 	TnyFolder *folder;
 	gchar *account = NULL;
 	TnyFolderType folder_type = TNY_FOLDER_TYPE_UNKNOWN;
 
 	*is_draft = FALSE;
+	*can_open = TRUE;
 
 	folder = tny_header_get_folder (header);
 	/* Gets folder type (OUTBOX headers will be opened in edit window */
@@ -961,7 +968,7 @@ get_info_from_header (TnyHeader *header, gboolean *is_draft)
 		if (folder_type == TNY_FOLDER_TYPE_INVALID)
 			g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
 	}
-		
+
 	if (folder_type == TNY_FOLDER_TYPE_OUTBOX) {
 		TnyTransportAccount *traccount = NULL;
 		ModestTnyAccountStore *accstore = modest_runtime_get_account_store();
@@ -987,6 +994,7 @@ get_info_from_header (TnyHeader *header, gboolean *is_draft)
 					   open any message from
 					   outbox which is not in
 					   failed state */
+					*can_open = FALSE;
 					g_object_unref(traccount);
                                 }
 #endif
@@ -1017,8 +1025,9 @@ open_msg_cb (ModestMailOperation *mail_op,
 	ModestWindow *win = NULL;
 	gchar *account = NULL;
 	gboolean open_in_editor = FALSE;
+	gboolean can_open;
 	OpenMsgHelper *helper = (OpenMsgHelper *) user_data;
-	
+
 	/* Do nothing if there was any problem with the mail
 	   operation. The error will be shown by the error_handler of
 	   the mail operation */
@@ -1030,14 +1039,14 @@ open_msg_cb (ModestMailOperation *mail_op,
 	/* Mark header as read */
 	headers_action_mark_as_read (header, MODEST_WINDOW(parent_win), NULL);
 
-	account = get_info_from_header (header, &open_in_editor);
+	account = get_info_from_header (header, &open_in_editor, &can_open);
 
 	/* Get account */
 	if (!account)
 		account = g_strdup (modest_window_get_active_account (MODEST_WINDOW (parent_win)));
 	if (!account)
 		account = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr());
-	
+
 	if (open_in_editor) {
 		ModestAccountMgr *mgr = modest_runtime_get_account_mgr ();
 		gchar *from_header = NULL, *acc_name;
@@ -1065,7 +1074,7 @@ open_msg_cb (ModestMailOperation *mail_op,
 	} else {
 		gchar *uid = modest_tny_folder_get_header_unique_id (header);
 
-		if (helper->rowref && helper->model) {		
+		if (helper->rowref && helper->model) {
 			win = modest_msg_view_window_new_with_header_model (msg, account, (const gchar*) uid,
 									    helper->model, helper->rowref);
 		} else {
@@ -1073,7 +1082,7 @@ open_msg_cb (ModestMailOperation *mail_op,
 		}
 		g_free (uid);
 	}
-	
+
 	/* Register and show new window */
 	if (win != NULL) {
 		mgr = modest_runtime_get_window_mgr ();
@@ -1279,6 +1288,9 @@ open_msg_performer(gboolean canceled,
 	TnyConnectionStatus status;
 	gboolean show_open_draft = FALSE;
 	OpenMsgHelper *helper = NULL;
+	ModestProtocol *protocol;
+	ModestProtocolRegistry *protocol_registry;
+	gchar *subject;
 
 	helper = (OpenMsgHelper *) user_data;
 
@@ -1287,10 +1299,10 @@ open_msg_performer(gboolean canceled,
 		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);
-		
+
 		goto clean;
 	}
 
@@ -1299,11 +1311,7 @@ open_msg_performer(gboolean canceled,
 	if (proto == MODEST_PROTOCOL_REGISTRY_TYPE_INVALID) {
 		proto = MODEST_PROTOCOLS_STORE_MAILDIR;
 	}
-	
-	ModestProtocol *protocol;
-	ModestProtocolRegistry *protocol_registry;
-	gchar *subject;
-		
+
 	protocol_registry = modest_runtime_get_protocol_registry ();
 	subject = tny_header_dup_subject (helper->header);
 
@@ -1311,7 +1319,7 @@ open_msg_performer(gboolean canceled,
 	error_msg = modest_protocol_get_translation (protocol, MODEST_PROTOCOL_TRANSLATION_MSG_NOT_AVAILABLE, subject);
 	if (subject)
 		g_free (subject);
-		
+
 	if (error_msg == NULL) {
 		error_msg = g_strdup (_("mail_ni_ui_folder_get_msg_folder_error"));
 	}
@@ -1330,7 +1338,15 @@ open_msg_performer(gboolean canceled,
 
 #ifdef MODEST_TOOLKIT_HILDON2
 	gboolean is_draft;
-	gchar *account_name = get_info_from_header (helper->header, &is_draft);
+	gboolean can_open;
+	gchar *account_name = get_info_from_header (helper->header, &is_draft, &can_open);
+
+	if (!can_open) {
+		modest_window_mgr_unregister_header (modest_runtime_get_window_mgr (), helper->header);
+		g_free (account_name);
+		open_msg_helper_destroyer (helper);
+		goto clean;
+	}
 
 	if (!is_draft) {
 		ModestWindow *window;
@@ -3120,11 +3136,10 @@ modest_ui_actions_on_select_editor_background_color (GtkAction *action,
 }
 
 void 
-modest_ui_actions_on_insert_image (GtkAction *action,
+modest_ui_actions_on_insert_image (GObject *object,
 				   ModestMsgEditWindow *window)
 {
 	g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
-	g_return_if_fail (GTK_IS_ACTION (action));
 
 
 	if (modest_platform_check_memory_low (MODEST_WINDOW(window), TRUE))
@@ -3154,7 +3169,6 @@ modest_ui_actions_on_remove_attachments (GtkAction *action,
 					 ModestMsgEditWindow *window)
 {
 	g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
-	g_return_if_fail (GTK_IS_ACTION (action));
 
 	modest_msg_edit_window_remove_attachments (window, NULL);
 }
@@ -3258,20 +3272,22 @@ do_create_folder_cb (ModestMailOperation *mail_op,
 
 static void
 do_create_folder (GtkWindow *parent_window, 
-		  TnyFolderStore *parent_folder, 
+		  TnyFolderStore *suggested_parent, 
 		  const gchar *suggested_name)
 {
 	gint result;
 	gchar *folder_name = NULL;
+	TnyFolderStore *parent_folder = NULL;
 
 	result = modest_platform_run_new_folder_dialog (GTK_WINDOW (parent_window),
-							parent_folder,
+							suggested_parent,
 							(gchar *) suggested_name,
-							&folder_name);
-	
-	if (result == GTK_RESPONSE_ACCEPT) {
+							&folder_name,
+							&parent_folder);
+
+	if (result == GTK_RESPONSE_ACCEPT && parent_folder) {
 		ModestMailOperation *mail_op;
-		
+
 		mail_op  = modest_mail_operation_new ((GObject *) parent_window);
 		modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), 
 						 mail_op);
@@ -3282,6 +3298,9 @@ do_create_folder (GtkWindow *parent_window,
 						     folder_name);
 		g_object_unref (mail_op);
 	}
+
+	if (parent_folder)
+		g_object_unref (parent_folder);
 }
 
 static void
@@ -3312,22 +3331,41 @@ modest_ui_actions_create_folder(GtkWidget *parent_window,
 {
 	TnyFolderStore *parent_folder;
 
+#ifdef MODEST_TOOLKIT_HILDON2
+	const gchar *active_account;
+	TnyAccount *account;
+	ModestTnyAccountStore *acc_store;
+
+	/* In hildon 2.2 we use the current account as default parent */
+	acc_store = modest_runtime_get_account_store ();
+	active_account = modest_window_get_active_account (MODEST_WINDOW (parent_window));
+	if (active_account) {
+		account = modest_tny_account_store_get_server_account (acc_store,
+								       active_account,
+								       TNY_ACCOUNT_TYPE_STORE);
+		parent_folder = TNY_FOLDER_STORE (account);
+	} else {
+		parent_folder = (TnyFolderStore *) 
+			modest_tny_account_store_get_local_folders_account (acc_store);
+	}
+#else
 	parent_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view));
-	
+#endif
+
 	if (parent_folder) {
 		/* The parent folder will be freed in the callback */
-		modest_platform_connect_if_remote_and_perform (GTK_WINDOW (parent_window), 
+		modest_platform_connect_if_remote_and_perform (GTK_WINDOW (parent_window),
 							       TRUE,
 							       parent_folder,
-							       create_folder_performer, 
+							       create_folder_performer,
 							       parent_folder);
 	}
 }
 
-void 
+void
 modest_ui_actions_on_new_folder (GtkAction *action, ModestWindow *window)
 {
-	
+
 	g_return_if_fail (MODEST_IS_WINDOW(window));
 
 	if (MODEST_IS_MAIN_WINDOW (window)) {
@@ -3392,8 +3430,8 @@ on_rename_folder_cb (ModestMailOperation *mail_op,
 {
 	ModestFolderView *folder_view;
 
-	/* If the window was closed when renaming a folder this could
-	   happen */
+	/* If the window was closed when renaming a folder, or if
+	 * it's not a main window this will happen */
 	if (!MODEST_IS_FOLDER_VIEW (user_data))
 		return;
 
@@ -3422,11 +3460,7 @@ on_rename_folder_performer (gboolean canceled,
 	if (canceled || err) {
 		/* In memory full conditions we could get this error here */
 		check_memory_full_error ((GtkWidget *) parent_window, err);
-	} else if (MODEST_IS_MAIN_WINDOW(parent_window)) {
-
-		folder_view = modest_main_window_get_child_widget (
-				MODEST_MAIN_WINDOW (parent_window),
-				MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
+	} else {
 
 		mail_op = 
 			modest_mail_operation_new_with_error_handling (G_OBJECT(parent_window),
@@ -3436,9 +3470,18 @@ on_rename_folder_performer (gboolean canceled,
 		modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
 				mail_op);
 
-		/* Clear the headers view */
-		sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (folder_view));
- 		gtk_tree_selection_unselect_all (sel);
+		if (MODEST_IS_MAIN_WINDOW(parent_window)) {
+
+			folder_view = modest_main_window_get_child_widget (
+				MODEST_MAIN_WINDOW (parent_window),
+				MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
+
+			/* Clear the headers view */
+			sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (folder_view));
+			gtk_tree_selection_unselect_all (sel);
+		} else {
+			folder_view = NULL;
+		}
 
 		/* Actually rename the folder */
 		modest_mail_operation_rename_folder (mail_op,
@@ -3456,40 +3499,48 @@ on_rename_folder_performer (gboolean canceled,
 
 void 
 modest_ui_actions_on_rename_folder (GtkAction *action,
-				     ModestMainWindow *main_window)
+				     ModestWindow *window)
+{
+	modest_ui_actions_on_edit_mode_rename_folder (window);
+}
+
+gboolean 
+modest_ui_actions_on_edit_mode_rename_folder (ModestWindow *window)
 {
 	TnyFolderStore *folder;
 	GtkWidget *folder_view;
-	GtkWidget *header_view;	
+	gboolean do_rename = TRUE;
 
-	g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
+	g_return_val_if_fail (MODEST_IS_WINDOW(window), FALSE);
 
-	folder_view = modest_main_window_get_child_widget (main_window,
-							   MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
-	if (!folder_view)
-		return;
+	if (MODEST_IS_MAIN_WINDOW (window)) {
+		folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (window),
+								   MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
+		if (!folder_view)
+			return FALSE;
 
-	header_view = modest_main_window_get_child_widget (main_window,
-							   MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
-	
-	if (!header_view)
-		return;
+#ifdef MODEST_TOOLKIT_HILDON2
+	} else if (MODEST_IS_FOLDER_WINDOW (window)) {
+		folder_view = GTK_WIDGET (modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (window)));
+#endif
+	} else {
+		return FALSE;
+	}
 
 	folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view));
 
 	if (!folder)
-		return;
+		return FALSE;
 
 	if (TNY_IS_FOLDER (folder)) {
 		gchar *folder_name = NULL;
 		gint response;
 		const gchar *current_name;
 		TnyFolderStore *parent;
-		gboolean do_rename = TRUE;
 
 		current_name = tny_folder_get_name (TNY_FOLDER (folder));
 		parent = tny_folder_get_folder_store (TNY_FOLDER (folder));
-		response = modest_platform_run_rename_folder_dialog (GTK_WINDOW (main_window), 
+		response = modest_platform_run_rename_folder_dialog (GTK_WINDOW (window),
 								     parent, current_name, 
 								     &folder_name);
 		g_object_unref (parent);
@@ -3500,11 +3551,12 @@ modest_ui_actions_on_rename_folder (GtkAction *action,
 			RenameFolderInfo *rename_folder_data = g_new0 (RenameFolderInfo, 1);
 			rename_folder_data->folder = g_object_ref (folder);
 			rename_folder_data->new_name = folder_name;
-			modest_platform_connect_if_remote_and_perform (GTK_WINDOW(main_window), TRUE,
+			modest_platform_connect_if_remote_and_perform (GTK_WINDOW(window), TRUE,
 					folder, on_rename_folder_performer, rename_folder_data);
 		}
 	}
 	g_object_unref (folder);
+	return do_rename;
 }
 
 static void
@@ -3536,15 +3588,25 @@ on_delete_folder_cb (gboolean canceled,
 	ModestMailOperation *mail_op;
 	GtkTreeSelection *sel;
 	
-	if (!MODEST_IS_MAIN_WINDOW(parent_window) || canceled || (err!=NULL)) {
+	if (!MODEST_IS_WINDOW(parent_window) || canceled || (err!=NULL)) {
 		g_object_unref (G_OBJECT (info->folder));
 		g_free (info);
 		return;
 	}
 	
-	folder_view = modest_main_window_get_child_widget (
+	if (MODEST_IS_MAIN_WINDOW (parent_window)) {
+		folder_view = modest_main_window_get_child_widget (
 			MODEST_MAIN_WINDOW (parent_window),
 			MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
+#ifdef MODEST_TOOLKIT_HILDON2
+	} else if (MODEST_IS_FOLDER_WINDOW (parent_window)) {
+		folder_view = GTK_WIDGET (modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (parent_window)));
+#endif
+	} else {
+		g_object_unref (G_OBJECT (info->folder));
+		g_free (info);
+		return;
+	}
 
 	/* Unselect the folder before deleting it to free the headers */
 	sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (folder_view));
@@ -3567,36 +3629,45 @@ on_delete_folder_cb (gboolean canceled,
 	g_free (info);
 }
 
-static void
-delete_folder (ModestMainWindow *main_window, gboolean move_to_trash)
+static gboolean
+delete_folder (ModestWindow *window, gboolean move_to_trash)
 {
 	TnyFolderStore *folder;
 	GtkWidget *folder_view;
 	gint response;
 	gchar *message;
 	
-	g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
+	g_return_val_if_fail (MODEST_IS_WINDOW(window), FALSE);
 
-	folder_view = modest_main_window_get_child_widget (main_window,
-							   MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
+	if (MODEST_IS_MAIN_WINDOW (window)) {
+
+		folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (window),
+								   MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
+#ifdef MODEST_TOOLKIT_HILDON2
+	} else if (MODEST_IS_FOLDER_WINDOW (window)) {
+		folder_view = GTK_WIDGET (modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (window)));
+#endif
+	} else {
+		return FALSE;
+	}
 	if (!folder_view)
-		return;
+		return FALSE;
 
 	folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
 
 	/* Show an error if it's an account */
 	if (!TNY_IS_FOLDER (folder)) {
-		modest_platform_run_information_dialog (GTK_WINDOW (main_window),
+		modest_platform_run_information_dialog (GTK_WINDOW (window),
 							_("mail_in_ui_folder_delete_error"),
 							FALSE);
 		g_object_unref (G_OBJECT (folder));
-		return;
+		return FALSE;
 	}
 
 	/* 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 (window),
 							    (const gchar *) message);
 	g_free (message);
 
@@ -3607,22 +3678,31 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash)
 		info->move_to_trash = move_to_trash;
 		g_object_ref (G_OBJECT (info->folder));
 		TnyAccount *account = tny_folder_get_account (TNY_FOLDER (folder));
-		modest_platform_connect_if_remote_and_perform (GTK_WINDOW (main_window), 
+		modest_platform_connect_if_remote_and_perform (GTK_WINDOW (window), 
 							       TRUE,
 							       TNY_FOLDER_STORE (account), 
 							       on_delete_folder_cb, info);
 		g_object_unref (account);
+		return TRUE;
+	} else {
+		return FALSE;
 	}
 	g_object_unref (G_OBJECT (folder));
 }
 
-void 
+void
 modest_ui_actions_on_delete_folder (GtkAction *action,
-				     ModestMainWindow *main_window)
+				    ModestWindow *window)
 {
-	g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
+	modest_ui_actions_on_edit_mode_delete_folder (window);
+}
+
+gboolean
+modest_ui_actions_on_edit_mode_delete_folder (ModestWindow *window)
+{
+	g_return_val_if_fail (MODEST_IS_WINDOW(window), TRUE);
 	
-	delete_folder (main_window, FALSE);
+	return delete_folder (window, FALSE);
 }
 
 void 
@@ -3630,7 +3710,7 @@ modest_ui_actions_on_move_folder_to_trash_folder (GtkAction *action, ModestMainW
 {
 	g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
 	
-	delete_folder (main_window, TRUE);
+	delete_folder (MODEST_WINDOW (main_window), TRUE);
 }
 
 
@@ -4738,7 +4818,7 @@ on_move_to_dialog_response (GtkDialog *dialog,
 		TnyFolderStore *dst_folder;
 
 	case MODEST_GTK_RESPONSE_NEW_FOLDER:
-		modest_ui_actions_create_folder (GTK_WIDGET (dialog), folder_view);
+		modest_ui_actions_create_folder (GTK_WIDGET (parent_win), folder_view);
 		return;
 	case GTK_RESPONSE_NONE:
 	case GTK_RESPONSE_CANCEL:
@@ -4752,6 +4832,13 @@ on_move_to_dialog_response (GtkDialog *dialog,
 								  folder_view,
 								  dst_folder,
 								  MODEST_MAIN_WINDOW (parent_win));
+#ifdef MODEST_TOOLKIT_HILDON2
+		} else if (MODEST_IS_FOLDER_WINDOW (parent_win)) {
+			modest_ui_actions_on_folder_window_move_to (folder_view,
+								    dst_folder,
+								    helper->list,
+								    GTK_WINDOW (parent_win));
+#endif
 		} else {
 			/* Moving from headers window in edit mode */
 			modest_ui_actions_on_window_move_to (NULL, helper->list,
@@ -4768,7 +4855,8 @@ on_move_to_dialog_response (GtkDialog *dialog,
 	}
 
 	/* Free the helper and exit */
-	g_object_unref (helper->list);
+	if (helper->list)
+		g_object_unref (helper->list);
 	g_slice_free (MoveToInfo, helper);
 	gtk_widget_destroy (GTK_WIDGET (dialog));
 }
@@ -4936,40 +5024,42 @@ move_to_cb (ModestMailOperation *mail_op,
 	    gpointer user_data)
 {
 	MoveToHelper *helper = (MoveToHelper *) user_data;
+	GObject *object = modest_mail_operation_get_source (mail_op);
 
 	/* Note that the operation could have failed, in that case do
 	   nothing */
-	if (modest_mail_operation_get_status (mail_op) == 
-	    MODEST_MAIL_OPERATION_STATUS_SUCCESS) {
-
-		GObject *object = modest_mail_operation_get_source (mail_op);
-		if (MODEST_IS_MSG_VIEW_WINDOW (object)) {
-			ModestMsgViewWindow *self = MODEST_MSG_VIEW_WINDOW (object);
+	if (modest_mail_operation_get_status (mail_op) != 
+	    MODEST_MAIL_OPERATION_STATUS_SUCCESS)
+		goto frees;
 
-			if (!modest_msg_view_window_select_next_message (self) &&
-			    !modest_msg_view_window_select_previous_message (self)) {
-				/* No more messages to view, so close this window */
-				modest_ui_actions_on_close_window (NULL, MODEST_WINDOW(self));
-			}
-		} else if (MODEST_IS_MAIN_WINDOW (object) && 
-			   gtk_tree_row_reference_valid (helper->reference)) {
-			GtkWidget *header_view;
-			GtkTreePath *path;
-			GtkTreeSelection *sel;
+	if (MODEST_IS_MSG_VIEW_WINDOW (object)) {
+		ModestMsgViewWindow *self = MODEST_MSG_VIEW_WINDOW (object);
 
-			header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(object),
-									   MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
-			sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (header_view));
-			path = gtk_tree_row_reference_get_path (helper->reference);
-			/* We need to unselect the previous one
-			   because we could be copying instead of
-			   moving */
-			gtk_tree_selection_unselect_all (sel);
-			gtk_tree_selection_select_path (sel, path);
-			gtk_tree_path_free (path);
+		if (!modest_msg_view_window_select_next_message (self) &&
+		    !modest_msg_view_window_select_previous_message (self)) {
+			/* No more messages to view, so close this window */
+			modest_ui_actions_on_close_window (NULL, MODEST_WINDOW(self));
 		}
-		g_object_unref (object);
-        }
+	} else if (MODEST_IS_MAIN_WINDOW (object) && 
+		   gtk_tree_row_reference_valid (helper->reference)) {
+		GtkWidget *header_view;
+		GtkTreePath *path;
+		GtkTreeSelection *sel;
+
+		header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(object),
+								   MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
+		sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (header_view));
+		path = gtk_tree_row_reference_get_path (helper->reference);
+		/* We need to unselect the previous one
+		   because we could be copying instead of
+		   moving */
+		gtk_tree_selection_unselect_all (sel);
+		gtk_tree_selection_select_path (sel, path);
+		gtk_tree_path_free (path);
+	}
+	g_object_unref (object);
+
+ frees:
 	/* Destroy the helper */
 	move_to_helper_destroyer (helper);
 }
@@ -4983,13 +5073,17 @@ folder_move_to_cb (ModestMailOperation *mail_op,
 	GObject *object;
 
 	object = modest_mail_operation_get_source (mail_op);
-	folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(object),
-							   MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
-	g_object_ref (folder_view);
-	g_object_unref (object);
-	move_to_cb (mail_op, user_data);
-	modest_folder_view_select_folder (MODEST_FOLDER_VIEW (folder_view), new_folder, FALSE);
-	g_object_unref (folder_view);
+	if (MODEST_IS_MAIN_WINDOW (object)) {
+		folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(object),
+								   MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
+		g_object_ref (folder_view);
+		g_object_unref (object);
+		move_to_cb (mail_op, user_data);
+		modest_folder_view_select_folder (MODEST_FOLDER_VIEW (folder_view), new_folder, FALSE);
+		g_object_unref (folder_view);
+	} else {
+		move_to_cb (mail_op, user_data);
+	}
 }
 
 static void
@@ -5258,20 +5352,12 @@ static void
 xfer_messages_error_handler (ModestMailOperation *mail_op, 
 			     gpointer user_data)
 {
-	ModestWindow *main_window = NULL;
-
-	/* Disable next automatic folder selection */
-	main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
-							 FALSE); /* don't create */
-	if (main_window) {
-		GObject *win = modest_mail_operation_get_source (mail_op);
-		modest_platform_run_information_dialog ((GtkWindow *) win, 
-							_("mail_in_ui_folder_move_target_error"), 
-							FALSE);
-		if (win)
-			g_object_unref (win);
-	}
-	move_to_helper_destroyer (user_data);
+	GObject *win = modest_mail_operation_get_source (mail_op);
+	modest_platform_run_information_dialog ((GtkWindow *) win, 
+						_("mail_in_ui_folder_move_target_error"), 
+						FALSE);
+	if (win)
+		g_object_unref (win);
 }
 
 typedef struct {
@@ -5325,12 +5411,15 @@ xfer_messages_performer  (gboolean canceled,
 	}
 
 	movehelper = g_new0 (MoveToHelper, 1);
+
+#ifndef MODEST_TOOLKIT_HILDON2
 	movehelper->banner = modest_platform_animation_banner (GTK_WIDGET (win), NULL,
 							       _CS("ckct_nw_pasting"));
 	if (movehelper->banner != NULL)  {
 		g_object_ref (movehelper->banner);
 		gtk_widget_show (GTK_WIDGET (movehelper->banner));
 	}
+#endif
 
 	if (MODEST_IS_MAIN_WINDOW (win)) {
 		GtkWidget *header_view = 
@@ -5374,14 +5463,14 @@ on_move_folder_cb (gboolean canceled, GError *err, GtkWindow *parent_window,
 	MoveFolderInfo *info = (MoveFolderInfo*)user_data;
 	GtkTreeSelection *sel;
 	ModestMailOperation *mail_op = NULL;
-	
-	if (canceled || err || !MODEST_IS_MAIN_WINDOW (parent_window)) {
+
+	if (canceled || err || !MODEST_IS_WINDOW (parent_window)) {
 		g_object_unref (G_OBJECT (info->src_folder));
 		g_object_unref (G_OBJECT (info->dst_folder));
 		g_free (info);
 		return;
 	}
-	
+
 	MoveToHelper *helper = g_new0 (MoveToHelper, 1);
 	helper->banner = modest_platform_animation_banner (GTK_WIDGET (parent_window), NULL,
 			_CS("ckct_nw_pasting"));
@@ -5414,8 +5503,10 @@ on_move_folder_cb (gboolean canceled, GError *err, GtkWindow *parent_window,
 	/* 			modest_folder_view_select_folder (MODEST_FOLDER_VIEW(folder_view), */
 	/* 							  TNY_FOLDER (src_folder), TRUE); */
 
-	modest_folder_view_select_folder (MODEST_FOLDER_VIEW(info->folder_view),
-					  TNY_FOLDER (info->dst_folder), TRUE);
+	if (MODEST_IS_MAIN_WINDOW (parent_window)) {
+		modest_folder_view_select_folder (MODEST_FOLDER_VIEW(info->folder_view),
+						  TNY_FOLDER (info->dst_folder), TRUE);
+	}
 	modest_mail_operation_xfer_folder (mail_op,
 			TNY_FOLDER (info->src_folder),
 			info->dst_folder,
@@ -5511,6 +5602,62 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action,
 	g_object_unref (src_folder);
 }
 
+#ifdef MODEST_TOOLKIT_HILDON2
+/*
+ * UI handler for the "Move to" action when invoked from the
+ * ModestFolderWindow
+ */
+static void 
+modest_ui_actions_on_folder_window_move_to (GtkWidget *folder_view,
+					    TnyFolderStore *dst_folder,
+					    TnyList *selection,
+					    GtkWindow *win)
+{
+	TnyFolderStore *src_folder = NULL;
+	TnyIterator *iterator;
+
+	if (tny_list_get_length (selection) != 1)
+		return;
+
+	iterator = tny_list_create_iterator (selection);
+	src_folder = TNY_FOLDER_STORE (tny_iterator_get_current (iterator));
+	g_object_unref (iterator);
+
+
+	gboolean do_xfer = TRUE;
+
+	/* Allow only to transfer folders to the local root folder */
+	if (TNY_IS_ACCOUNT (dst_folder) && 
+	    !MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (dst_folder) &&
+	    !modest_tny_account_is_memory_card_account (TNY_ACCOUNT (dst_folder))) {
+		do_xfer = FALSE;
+	} else if (!TNY_IS_FOLDER (src_folder)) {
+		g_warning ("%s: src_folder is not a TnyFolder.\n", __FUNCTION__);
+		do_xfer = FALSE;
+	}
+
+	if (do_xfer) {
+		MoveFolderInfo *info = g_new0 (MoveFolderInfo, 1);
+		DoubleConnectionInfo *connect_info = g_slice_new (DoubleConnectionInfo);
+		
+		info->src_folder = g_object_ref (src_folder);
+		info->dst_folder = g_object_ref (dst_folder);
+		info->delete_original = TRUE;
+		info->folder_view = folder_view;
+
+		connect_info->callback = on_move_folder_cb;
+		connect_info->dst_account = get_account_from_folder_store (TNY_FOLDER_STORE (dst_folder));
+		connect_info->data = info;
+
+		modest_platform_double_connect_and_perform(GTK_WINDOW (win), TRUE,
+							   TNY_FOLDER_STORE (src_folder), 
+							   connect_info);
+	}
+	/* Frees */
+	g_object_unref (src_folder);
+}
+#endif
+
 
 void
 modest_ui_actions_transfer_messages_helper (GtkWindow *win,
@@ -5595,11 +5742,17 @@ void
 modest_ui_actions_on_move_to (GtkAction *action, 
 			      ModestWindow *win)
 {
+	modest_ui_actions_on_edit_mode_move_to (win);
+}
+
+gboolean 
+modest_ui_actions_on_edit_mode_move_to (ModestWindow *win)
+{
 	GtkWidget *dialog = NULL, *folder_view = NULL;
 	ModestMainWindow *main_window;
 	MoveToInfo *helper = NULL;
 
-	g_return_if_fail (MODEST_IS_WINDOW (win));
+	g_return_val_if_fail (MODEST_IS_WINDOW (win), FALSE);
 
 	/* Get the main window if exists */
 	if (MODEST_IS_MAIN_WINDOW (win))
@@ -5632,6 +5785,8 @@ modest_ui_actions_on_move_to (GtkAction *action,
 
 	/* Show the dialog */
 	gtk_widget_show (dialog);
+
+	return TRUE;
 }
 
 /*
@@ -6003,12 +6158,19 @@ modest_ui_actions_on_open_addressbook (GtkAction *action, ModestWindow *win)
 
 
 void
-modest_ui_actions_on_toggle_find_in_page (GtkToggleAction *action,
+modest_ui_actions_on_toggle_find_in_page (GtkAction *action,
 					  ModestWindow *window)
 {
+	gboolean active;
 	g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
 
-	modest_msg_edit_window_toggle_find_toolbar (MODEST_MSG_EDIT_WINDOW (window), gtk_toggle_action_get_active (action));
+	if (GTK_IS_TOGGLE_ACTION (action))
+		active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
+	else
+		active = TRUE;
+
+	modest_msg_edit_window_toggle_find_toolbar (MODEST_MSG_EDIT_WINDOW (window), 
+						    active);
 }
 
 static void