X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fdbus_api%2Fmodest-dbus-callbacks.c;h=d9a184a60ba7c66e340b4ed785e82da2c754ce34;hp=857b13c96c41110adb583019cd1cbbc21dfdc9a7;hb=b210e6e647dbddeb50ef2e21199b653ad7e11b06;hpb=3202e152f26d1cd47e4e2d1c03a71ffe308b06ee

diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c
index 857b13c..d9a184a 100644
--- a/src/dbus_api/modest-dbus-callbacks.c
+++ b/src/dbus_api/modest-dbus-callbacks.c
@@ -34,23 +34,31 @@
 #include "modest-tny-account.h"
 #include "modest-tny-folder.h"
 #include "modest-ui-actions.h"
+#include "modest-utils.h"
 #include "modest-debug.h"
 #include "modest-search.h"
 #include "widgets/modest-msg-edit-window.h"
+#include "widgets/modest-window-mgr.h"
 #include "modest-tny-msg.h"
 #include "modest-platform.h"
+#include "modest-defs.h"
 #include <libmodest-dbus-client/libmodest-dbus-client.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <stdio.h>
 #include <string.h>
 #include <glib/gstdio.h>
-#ifdef MODEST_HAVE_HILDON0_WIDGETS
-#include <libgnomevfs/gnome-vfs-mime-utils.h>
-#else
+#include <hildon/hildon-program.h>
 #include <libgnomevfs/gnome-vfs-mime.h>
-#endif
 #include <tny-fs-stream.h>
 
+#ifdef MODEST_TOOLKIT_HILDON2
+#include <hildon/hildon.h>
+#include <modest-accounts-window.h>
+#include <modest-folder-window.h>
+#include <modest-mailboxes-window.h>
+#include <modest-maemo-utils.h>
+#endif
+
 #include <tny-list.h>
 #include <tny-iterator.h>
 #include <tny-simple-list.h>
@@ -59,6 +67,8 @@
 
 #include <modest-text-utils.h>
 
+#define DISABLE_GET_UNREAD_MSGS_FOR_MULTI_MAILBOX 1
+
 typedef struct 
 {
 	gchar *to;
@@ -71,7 +81,6 @@ typedef struct
 
 
 static gboolean notify_error_in_dbus_callback (gpointer user_data);
-static gboolean notify_msg_not_found_in_idle (gpointer user_data);
 static gboolean on_idle_compose_mail(gpointer user_data);
 static gboolean on_idle_top_application (gpointer user_data);
 
@@ -249,7 +258,7 @@ on_mail_to(GArray * arguments, gpointer data, osso_rpc_t * retval)
  	
  	/* Note that we cannot report failures during sending, 
  	 * because that would be asynchronous. */
- 	return OSSO_OK;
+	return OSSO_OK;
 }
 
 
@@ -276,7 +285,7 @@ on_idle_compose_mail(gpointer user_data)
 		gchar **list = g_strsplit(idle_data->attachments, ",", 0);
 		gint i = 0;
 		for (i=0; list[i] != NULL; i++) {
-			attachments = g_slist_append(attachments, g_strdup(list[i]));
+			attachments = g_slist_append(attachments, g_uri_unescape_string (list[i], NULL));
 		}
 		g_strfreev(list);
 	}
@@ -344,7 +353,7 @@ on_compose_mail(GArray * arguments, gpointer data, osso_rpc_t * retval)
 	/* Use g_idle to context-switch into the application's thread: */
   	g_idle_add(on_idle_compose_mail, (gpointer)idle_data);
  	
- 	return OSSO_OK;
+	return OSSO_OK;
 }
 
 static TnyMsg *
@@ -398,18 +407,20 @@ typedef struct {
 	GtkWidget *animation;
 } OpenMsgPerformerInfo;
 
+#ifndef MODEST_TOOLKIT_HILDON2
 static gboolean
 on_show_opening_animation (gpointer userdata)
 {
 	OpenMsgPerformerInfo *info = (OpenMsgPerformerInfo *) userdata;
 	info->animation = modest_platform_animation_banner (NULL, NULL, _("mail_me_opening"));
 	info->animation_timeout = 0;
-	
+
 	return FALSE;
 }
+#endif
 
 static gboolean
-on_hide_opening_animation (gpointer userdata)
+on_find_msg_async_destroy (gpointer userdata)
 {
 	OpenMsgPerformerInfo *info = (OpenMsgPerformerInfo *) userdata;
 
@@ -423,126 +434,232 @@ on_hide_opening_animation (gpointer userdata)
 		info->animation = NULL;
 	}
 
+	if (info->uri)
+		g_free (info->uri);
+	
+	if (info->account)
+		g_object_unref (info->account);
+
 	g_slice_free (OpenMsgPerformerInfo, info);
 	return FALSE;
 }
 
-static void 
-on_open_message_performer (gboolean canceled, 
-			   GError *err,
-			   GtkWindow *parent_window, 
-			   TnyAccount *account, 
-			   gpointer user_data)
+static void     
+find_msg_async_cb (TnyFolder *folder, 
+                   gboolean cancelled, 
+                   TnyMsg *msg, 
+                   GError *err, 
+                   gpointer user_data)
 {
-	OpenMsgPerformerInfo *info;
-	gchar *uri;
-	TnyHeader *header;
-	gchar *msg_uid;
-	ModestWindowMgr *win_mgr;
-	ModestWindow *msg_view = NULL;
-	gboolean is_draft = FALSE;
-	TnyFolder *folder = NULL;
-	TnyMsg *msg = NULL;
-
-	info = (OpenMsgPerformerInfo *) user_data;
-	uri = info->uri;
-
-	if (canceled || err) {
-		goto frees;
-	}
+        TnyHeader *header = NULL;
+        gchar *msg_uid = NULL;
+        ModestWindowMgr *win_mgr;
+        ModestWindow *msg_view = NULL;
+        gboolean is_draft = FALSE;
+        OpenMsgPerformerInfo *info = (OpenMsgPerformerInfo *) user_data;
+
+        if (err || cancelled) {
+		modest_platform_run_information_dialog (NULL, _("mail_ni_ui_folder_get_msg_folder_error"), TRUE);
+		g_idle_add (notify_error_in_dbus_callback, NULL);
+                goto end;
+        }
 
-	/* Get folder */
-	if (!account) {
-		ModestTnyAccountStore *account_store;
-		ModestTnyLocalFoldersAccount *local_folders_account;
-		
-		account_store = modest_runtime_get_account_store ();
-		local_folders_account = MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (
-			modest_tny_account_store_get_local_folders_account (account_store));
-		folder = modest_tny_local_folders_account_get_merged_outbox (local_folders_account);
-		g_object_unref (local_folders_account);
-	} else {
-		folder = tny_store_account_find_folder (TNY_STORE_ACCOUNT (account), uri, NULL);
-	}
-	if (modest_tny_folder_is_local_folder (folder) &&
-	    (modest_tny_folder_get_local_or_mmc_folder_type (folder) == TNY_FOLDER_TYPE_DRAFTS)) {
-		is_draft = TRUE;
-	}
+        header = tny_msg_get_header (msg);
+        if (!header || (tny_header_get_flags (header) & TNY_HEADER_FLAG_DELETED)) {
+		modest_platform_run_information_dialog (NULL, _("mail_ni_ui_folder_get_msg_folder_error"), TRUE);
+		g_idle_add (notify_error_in_dbus_callback, NULL);
+                goto end;
+        }
+
+        msg_uid =  modest_tny_folder_get_header_unique_id (header);
+        win_mgr = modest_runtime_get_window_mgr ();
+
+        if (modest_tny_folder_is_local_folder (folder) &&
+            (modest_tny_folder_get_local_or_mmc_folder_type (folder) == TNY_FOLDER_TYPE_DRAFTS)) {
+                is_draft = TRUE;
+        }
+
+        if (modest_window_mgr_find_registered_header (win_mgr, header, &msg_view)) {
+                gtk_window_present (GTK_WINDOW(msg_view));
+        } else {
+                const gchar *modest_account_name;
+                TnyAccount *account;
+
+                modest_window_mgr_register_header (win_mgr, header, NULL);
+
+                account = tny_folder_get_account (folder);
+                if (account) {
+                        modest_account_name =
+                                modest_tny_account_get_parent_modest_account_name_for_server_account (account);
+                } else {
+                        modest_account_name = NULL;
+                }
+
+                /* Drafts will be opened in the editor, and others will be opened in the viewer */
+                if (is_draft) {
+			gchar *modest_account_name = NULL;
+			gchar *mailbox = NULL;
+			gchar *from_header;
+
+			/* we cannot edit without a valid account... */
+			if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr (), TRUE)) {
+				if (!modest_ui_actions_run_account_setup_wizard(NULL)) {
+					modest_window_mgr_unregister_header (win_mgr, 
+									     header);
+					goto end;
+				}
+			}
+               
+			from_header = tny_header_dup_from (header);
+			modest_account_name = modest_utils_get_account_name_from_recipient (from_header, &mailbox);
+			g_free (from_header);
+			
+			if (modest_account_name == NULL) {
+				ModestAccountMgr *mgr = modest_runtime_get_account_mgr ();
+				modest_account_name = modest_account_mgr_get_default_account (mgr);
+			}
+                        msg_view = modest_msg_edit_window_new (msg, modest_account_name, mailbox, TRUE);
+			if (mailbox)
+				g_free (mailbox);
+			g_free (modest_account_name);
+		} else {
+                        TnyHeader *header;
+			const gchar *modest_account_name;
+
+			if (account) {
+				modest_account_name = 
+					modest_tny_account_get_parent_modest_account_name_for_server_account (account);
+			} else {
+				modest_account_name = NULL;
+			}
 
-	/* Get message */
-	msg = tny_folder_find_msg (folder, uri, NULL);
-	if (!msg) {
-		g_idle_add (notify_msg_not_found_in_idle, NULL);
-		goto frees;
-	}
+                        header = tny_msg_get_header (msg);
+                        msg_view = modest_msg_view_window_new_for_search_result (msg, modest_account_name, NULL, msg_uid);
+                        if (! (tny_header_get_flags (header) & TNY_HEADER_FLAG_SEEN)) {
+				ModestMailOperation *mail_op;
+				
+                                tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN);
+				modest_platform_emit_msg_read_changed_signal (msg_uid, TRUE);
+				/* Sync folder, we need this to save the seen flag */
+				mail_op = modest_mail_operation_new (NULL);
+				modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
+								 mail_op);
+				modest_mail_operation_sync_folder (mail_op, folder, FALSE, NULL, NULL);
+				g_object_unref (mail_op);
+			}
+                        g_object_unref (header);
+                }
+
+		if (msg_view != NULL) {
+			if (!modest_window_mgr_register_window (win_mgr, msg_view, NULL)) {
+				gtk_widget_destroy (GTK_WIDGET (msg_view));
+			} else {
+				gtk_widget_show_all (GTK_WIDGET (msg_view));
+			}
+		}
+        }
 
-	header = tny_msg_get_header (msg);
-	if (header && (tny_header_get_flags (header)&TNY_HEADER_FLAG_DELETED)) {
+end:
+	if (header)
 		g_object_unref (header);
-		g_object_unref (msg);
-		g_idle_add (notify_msg_not_found_in_idle, NULL);
-		goto frees;
-	}
-	msg_uid =  modest_tny_folder_get_header_unique_id (header); 
-	win_mgr = modest_runtime_get_window_mgr ();
+	if (msg_uid)
+		g_free (msg_uid);
+        on_find_msg_async_destroy (info);
+}
 
-	if (modest_window_mgr_find_registered_header (win_mgr, header, &msg_view)) {
-		gtk_window_present (GTK_WINDOW(msg_view));
-	} else {
-		const gchar *modest_account_name;
 
-		/* g_debug ("creating new window for this msg"); */
-		modest_window_mgr_register_header (win_mgr, header, NULL);
+static void
+on_open_message_performer (gboolean canceled,
+			   GError *err,
+			   ModestWindow *parent_window,
+			   TnyAccount *account,
+			   gpointer user_data)
+{
+	OpenMsgPerformerInfo *info;
+	TnyFolder *folder = NULL;
+	ModestTnyAccountStore *account_store;
+	ModestTnyLocalFoldersAccount *local_folders_account;
+ 
+	account_store = modest_runtime_get_account_store ();
+	local_folders_account = MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (
+		modest_tny_account_store_get_local_folders_account (account_store));
 
-		if (account) {
-			modest_account_name = 
-				modest_tny_account_get_parent_modest_account_name_for_server_account (account);
-		} else {
-			modest_account_name = NULL;
-		}
-			
-		/* Drafts will be opened in the editor, and others will be opened in the viewer */
-		if (is_draft) {
-			msg_view = modest_msg_edit_window_new (msg, modest_account_name, TRUE);
+	info = (OpenMsgPerformerInfo *) user_data;
+        if (canceled || err) {
+		if (!canceled)
+			modest_platform_run_information_dialog (NULL, _("mail_ni_ui_folder_get_msg_folder_error"), TRUE);
+		g_idle_add (notify_error_in_dbus_callback, NULL);
+                on_find_msg_async_destroy (info);
+                return;
+        }
+
+        /* Get folder */
+        if (!account) {
+                folder = modest_tny_local_folders_account_get_merged_outbox (local_folders_account);
+                g_object_unref (local_folders_account);
+        } else if (account == TNY_ACCOUNT (local_folders_account)) {
+                folder = tny_store_account_find_folder (TNY_STORE_ACCOUNT (account), info->uri, NULL);
+        } else {
+		folder = NULL;
+	}
+        if (!(folder && modest_tny_folder_is_local_folder (folder) &&
+	      (modest_tny_folder_get_local_or_mmc_folder_type (folder) == TNY_FOLDER_TYPE_DRAFTS))) {
+		ModestWindowMgr *win_mgr;
+		ModestWindow *msg_view;
+
+		win_mgr = modest_runtime_get_window_mgr ();
+		if (modest_window_mgr_find_registered_message_uid (win_mgr, info->uri, &msg_view)) {
+			gtk_window_present (GTK_WINDOW(msg_view));
 		} else {
-			TnyHeader *header;
-			header = tny_msg_get_header (msg);
-			msg_view = modest_msg_view_window_new_for_search_result (msg, modest_account_name, msg_uid);
-			if (! (tny_header_get_flags (header) & TNY_HEADER_FLAG_SEEN))
-				tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN);
-			g_object_unref (header);
+			const gchar *modest_account_name;
+			if (account) {
+				modest_account_name =
+					modest_tny_account_get_parent_modest_account_name_for_server_account (account);
+			} else {
+				modest_account_name = NULL;
+			}
 			
-		}		
-		modest_window_mgr_register_window (win_mgr, msg_view);
-		gtk_widget_show_all (GTK_WIDGET (msg_view));
-	}
-	g_object_unref (header);
-	g_object_unref (msg);
-	g_object_unref (folder);
+			msg_view = modest_msg_view_window_new_from_uid (modest_account_name, NULL, info->uri);
+			if (msg_view != NULL) {
+				if (!modest_window_mgr_register_window (win_mgr, msg_view, NULL)) {
+					gtk_widget_destroy (GTK_WIDGET (msg_view));
+				} else {
+					gtk_widget_show_all (GTK_WIDGET (msg_view));
+				}
+			}
+			if (account)
+				g_object_unref (account);
 
- frees:
-	g_free (info->uri);
-	if (info->account)
-		g_object_unref (info->account);
-	g_idle_add (on_hide_opening_animation, info);
+		}
+		on_find_msg_async_destroy (info);
+		return;
+        }
+
+#ifndef MODEST_TOOLKIT_HILDON2
+	info->animation_timeout = g_timeout_add (1000, on_show_opening_animation, info);
+#endif
+        /* Get message */
+        tny_folder_find_msg_async (folder, info->uri, find_msg_async_cb, NULL, info);
+        g_object_unref (folder);
 }
 
 static gboolean
 on_idle_open_message_performer (gpointer user_data)
 {
-	ModestWindow *main_win = NULL;
+	ModestWindow *top_win = NULL;
 	OpenMsgPerformerInfo *info = (OpenMsgPerformerInfo *) user_data;
 
-	main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(),
-						      FALSE); /* don't create */
+	top_win = modest_window_mgr_get_current_top (modest_runtime_get_window_mgr());
 
 	/* Lock before the call as we're in an idle handler */
 	gdk_threads_enter ();
 	if (info->connect) {
-		modest_platform_connect_and_perform (GTK_WINDOW (main_win), TRUE, info->account, 
+		modest_platform_connect_and_perform (top_win, TRUE,
+						     info->account,
 						     on_open_message_performer, info);
 	} else {
-		on_open_message_performer (FALSE, NULL, GTK_WINDOW (main_win), info->account, info);
+		on_open_message_performer (FALSE, NULL, top_win,
+					   info->account, info);
 	}
 	gdk_threads_leave ();
 
@@ -573,33 +690,46 @@ on_open_message (GArray * arguments, gpointer data, osso_rpc_t * retval)
 	if (is_merge || account) {
 		OpenMsgPerformerInfo *info;
 		TnyFolder *folder = NULL;
+		ModestTnyAccountStore *account_store;
+		ModestTnyLocalFoldersAccount *local_folders_account;
 
 		info = g_slice_new0 (OpenMsgPerformerInfo);
 		if (account) 
 			info->account = g_object_ref (account);
 		info->uri = uri;
 		info->connect = TRUE;
-		info->animation_timeout = g_timeout_add (1000, on_show_opening_animation, info);
+		info->animation = NULL;
+		info->animation_timeout = 0;
+
+		account_store = modest_runtime_get_account_store ();
+		local_folders_account = MODEST_TNY_LOCAL_FOLDERS_ACCOUNT 
+			(modest_tny_account_store_get_local_folders_account (account_store));
 
 		/* Try to get the message, if it's already downloaded
 		   we don't need to connect */
 		if (account) {
-			folder = tny_store_account_find_folder (TNY_STORE_ACCOUNT (account), uri, NULL);
+			TnyDevice *device;
+			gboolean device_online;
+
+			device = modest_runtime_get_device ();
+			device_online = tny_device_is_online (device);
+			if (!device_online || TNY_ACCOUNT (local_folders_account) == account) {
+				folder = tny_store_account_find_folder (TNY_STORE_ACCOUNT (account), uri, NULL);
+			} else {
+				folder = NULL;
+			}
 		} else {
-			ModestTnyAccountStore *account_store;
-			ModestTnyLocalFoldersAccount *local_folders_account;
-
-			account_store = modest_runtime_get_account_store ();
-			local_folders_account = MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (
-				modest_tny_account_store_get_local_folders_account (account_store));
 			folder = modest_tny_local_folders_account_get_merged_outbox (local_folders_account);
 			g_object_unref (local_folders_account);
+			info->connect = FALSE;
 		}
 		if (folder) {
 			TnyMsg *msg = tny_folder_find_msg (folder, uri, NULL);
 			if (msg) {
 				info->connect = FALSE;
 				g_object_unref (msg);
+			} else {
+				info->connect = TRUE;
 			}
 			g_object_unref (folder);
 		}
@@ -620,60 +750,96 @@ on_open_message (GArray * arguments, gpointer data, osso_rpc_t * retval)
 	return osso_retval;
 }
 
-static gboolean
-on_idle_delete_message (gpointer user_data)
+static void 
+on_remove_msgs_finished (ModestMailOperation *mail_op,
+			 gpointer user_data)
+{	
+	TnyHeader *header;
+	ModestWindow *top_win = NULL, *msg_view = NULL;
+
+	header = (TnyHeader *) user_data;
+
+	/* Get the main window if exists */
+	top_win = modest_window_mgr_get_current_top (modest_runtime_get_window_mgr());
+	if (!top_win) {
+		g_object_unref (header);
+		return;
+	}
+
+	if (modest_window_mgr_find_registered_header (modest_runtime_get_window_mgr(),
+						      header, &msg_view)) {
+		if (MODEST_IS_MSG_VIEW_WINDOW (msg_view))
+			modest_ui_actions_refresh_message_window_after_delete (MODEST_MSG_VIEW_WINDOW (msg_view));
+	}	
+	g_object_unref (header);
+
+	/* Refilter the header views explicitely */
+
+	/* TODO: call modest_window_mgr_refilter_header_views */
+	/* this call will go through all the windows, get the header views and refilter them */
+}
+
+static gpointer
+thread_prepare_delete_message (gpointer userdata)
 {
-	TnyList *headers = NULL;
+	TnyList *headers = NULL, *tmp_headers = NULL;
 	TnyFolder *folder = NULL;
 	TnyIterator *iter = NULL; 
 	TnyHeader *header = NULL, *msg_header = NULL;
 	TnyMsg *msg = NULL;
 	TnyAccount *account = NULL;
-	const char *uri = NULL, *uid = NULL;
-	gint res = 0;
+	char *uri;
+	gchar *uid = NULL;
 	ModestMailOperation *mail_op = NULL;
-	ModestWindow *main_win = NULL, *msg_view = NULL;
+	ModestWindow *top_win = NULL;
+
+	uri = (char *) userdata;
 
-	uri = (char *) user_data;
-	
 	msg = find_message_by_url (uri, &account);
+	if (account)
+		g_object_unref (account);
 
 	if (!msg) {
-		g_warning ("%s: Could not find message '%s'", __FUNCTION__, uri);
+		g_debug ("%s: Could not find message '%s'", __FUNCTION__, uri);
 		g_idle_add (notify_error_in_dbus_callback, NULL);
-		return OSSO_ERROR; 
+		g_free (uri);
+		return FALSE; 
 	}
-	
-	main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(),
-						      FALSE); /* don't create */
-	
-	msg_header = tny_msg_get_header (msg);
-	uid = tny_header_get_uid (msg_header);
-	folder = tny_msg_get_folder (msg);
 
+	top_win = modest_window_mgr_get_current_top (modest_runtime_get_window_mgr());
+
+	folder = tny_msg_get_folder (msg);
 	if (!folder) {
-		g_warning ("%s: Could not find folder (uri:'%s')", __FUNCTION__, uri);
+		g_debug ("%s: Could not find folder (uri:'%s')", __FUNCTION__, uri);
 		g_object_unref (msg);
 		g_idle_add (notify_error_in_dbus_callback, NULL);
-		return OSSO_ERROR; 
+		g_free (uri);
+		return FALSE; 
 	}
 
+	/* Get UID */
+	msg_header = tny_msg_get_header (msg);
+	uid = tny_header_dup_uid (msg_header);
+	g_object_unref (msg);
+	g_object_unref (msg_header);
+
 	headers = tny_simple_list_new ();
 	tny_folder_get_headers (folder, headers, TRUE, NULL);
 	iter = tny_list_create_iterator (headers);
-	header = NULL;
 
 	while (!tny_iterator_is_done (iter)) {
-		const char *cur_id = NULL;
+		gchar *cur_id = NULL;
 
 		header = TNY_HEADER (tny_iterator_get_current (iter));
 		if (header)
-			cur_id = tny_header_get_uid (header);
+			cur_id = tny_header_dup_uid (header);
 		
 		if (cur_id && uid && g_str_equal (cur_id, uid)) {
+			g_free (cur_id);
 			/* g_debug ("Found corresponding header from folder"); */
 			break;
 		}
+		g_free (cur_id);
 
 		if (header) {
 			g_object_unref (header);
@@ -682,80 +848,58 @@ on_idle_delete_message (gpointer user_data)
 		
 		tny_iterator_next (iter);
 	}
-
+	g_free (uid);
 	g_object_unref (iter);
-	iter = NULL;
 	g_object_unref (headers);
-	headers = NULL;
-	
-	g_object_unref (msg_header);
-	msg_header = NULL;
-	g_object_unref (msg);
-	msg = NULL;
 
 	if (header == NULL) {
 		if (folder)
 			g_object_unref (folder);
 		g_idle_add (notify_error_in_dbus_callback, NULL);			
-		return OSSO_ERROR;
+		g_free (uri);
+		return FALSE;
 	}
 		
-	res = OSSO_OK;
-
 	/* This is a GDK lock because we are an idle callback and
 	 * the code below is or does Gtk+ code */
 	gdk_threads_enter (); /* CHECKED */
 
-	mail_op = modest_mail_operation_new (main_win ? G_OBJECT(main_win) : NULL);
+	mail_op = modest_mail_operation_new (top_win ? G_OBJECT(top_win) : NULL);
 	modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
-	modest_mail_operation_remove_msg (mail_op, header, FALSE);
+
+	g_signal_connect (G_OBJECT (mail_op),
+			  "operation-finished",
+			  G_CALLBACK (on_remove_msgs_finished),
+			  g_object_ref (header));
+
+	tmp_headers = tny_simple_list_new ();
+	tny_list_append (tmp_headers, (GObject *) header);
+
+	modest_mail_operation_remove_msgs (mail_op, tmp_headers, FALSE);
+
+	g_object_unref (tmp_headers);
 	g_object_unref (G_OBJECT (mail_op));
-	
-	if (main_win) { /* no need if there's no window */ 
-		if (modest_window_mgr_find_registered_header (modest_runtime_get_window_mgr(),
-							      header, &msg_view)) {
-			if (MODEST_IS_MSG_VIEW_WINDOW (msg_view))
-				modest_ui_actions_refresh_message_window_after_delete (MODEST_MSG_VIEW_WINDOW (msg_view));
-		}
-	}
 	gdk_threads_leave (); /* CHECKED */
 	
+	/* Clean */
 	if (header)
 		g_object_unref (header);
+	g_free (uri);
 	
-	if (folder) {
-		/* Trick: do a poke status in order to speed up the signaling
-		   of observers.
-		   A delete via the menu does this, in do_headers_action(), 
-		   though I don't know why.
-		 */
-		tny_folder_poke_status (folder);
-	
-		g_object_unref (folder);
-	}
-	
-	if (account)
-		g_object_unref (account);
-		
-	/* Refilter the header view explicitly, to make sure that 
-	 * deleted emails are really removed from view. 
-	 * (They are not really deleted until contact is made with the server, 
-	 * so they would appear with a strike-through until then):
-	 */
-	if (main_win) { /* only needed when there's a mainwindow / UI */
-
-		/* This is a GDK lock because we are an idle callback and
-		 * the code below is or does Gtk+ code */
-		gdk_threads_enter (); /* CHECKED */
-		ModestHeaderView *header_view = (ModestHeaderView *)
-			modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(main_win),
-							     MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
-		if (header_view && MODEST_IS_HEADER_VIEW (header_view))
-			modest_header_view_refilter (header_view);
-		gdk_threads_leave ();
-	}
+	return FALSE;
+}
+
+static gboolean
+on_idle_delete_message (gpointer user_data)
+{
+	const char *uri = NULL;
+
+	uri = (char *) user_data;
+
+	g_thread_create (thread_prepare_delete_message, g_strdup (uri), FALSE, NULL);
+
+	return FALSE;
 	
-	return res;
 }
 
 
@@ -773,18 +917,31 @@ on_delete_message (GArray *arguments, gpointer data, osso_rpc_t *retval)
 	/* Use g_idle to context-switch into the application's thread: */
  	g_idle_add(on_idle_delete_message, (gpointer)uri);
  	
- 	return OSSO_OK;
+	return OSSO_OK;
+}
+
+typedef struct _SendReceivePerformerData {
+	gchar *account_id;
+	gboolean manual;
+	ModestMailOperation *mail_op;
+} SendReceivePerformerData;
+
+static void send_receive_performer_data_free (SendReceivePerformerData *data)
+{
+	if (data->mail_op) {
+		g_object_unref (data->mail_op);
+	}
+	g_free (data->account_id);
+	g_slice_free (SendReceivePerformerData, data);
 }
 
 static gboolean
 on_idle_send_receive(gpointer user_data)
 {
 	gboolean auto_update;
-	ModestWindow *main_win = NULL;
-
-	main_win =
-		modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
-						   FALSE); /* don't create */
+	SendReceivePerformerData *data = (SendReceivePerformerData *) user_data;
+	ModestConnectedVia connect_when;
+	gboolean right_connection = FALSE;
 
 	gdk_threads_enter (); /* CHECKED */
 
@@ -792,20 +949,43 @@ on_idle_send_receive(gpointer user_data)
 	auto_update = modest_conf_get_bool (modest_runtime_get_conf (), 
 					    MODEST_CONF_AUTO_UPDATE, NULL);
 
-	if (auto_update)
-		/* Do send receive */
-		modest_ui_actions_do_send_receive_all (main_win, FALSE, FALSE, FALSE);
-	else
+	if (auto_update) {
+		/* Do send receive. Never set the current top window
+		   as we always assume that DBus send/receive requests
+		   are not user driven */
+
+		connect_when = modest_conf_get_int (modest_runtime_get_conf (), 
+						    MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, NULL);
+		/* Perform a send and receive if the user selected to connect
+		   via any mean or if the current connection method is the
+		   same as the one specified by the user */
+		if (connect_when == MODEST_CONNECTED_VIA_ANY ||
+		    connect_when == modest_platform_get_current_connection ()) {
+			right_connection = TRUE;
+		}
+	} else {
 		/* Disable auto update */
 		modest_platform_set_update_interval (0);
+	}
+
+	if ((auto_update && right_connection) || data->manual) {
+		if (data->account_id) {
+			modest_ui_actions_do_send_receive (data->account_id, data->manual, FALSE, data->manual, NULL);
+		} else {
+			modest_ui_actions_do_send_receive_all (NULL, data->manual, FALSE, data->manual);
+		}
+	}
+
+	modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (),
+					    data->mail_op);
+
+	send_receive_performer_data_free (data);
 
 	gdk_threads_leave (); /* CHECKED */
 	
 	return FALSE;
 }
 
-
-
 static gint 
 on_dbus_method_dump_send_queues (DBusConnection *con, DBusMessage *message)
 {
@@ -835,18 +1015,21 @@ on_dbus_method_dump_send_queues (DBusConnection *con, DBusMessage *message)
 			modest_runtime_get_account_store(), accname,
 			TNY_ACCOUNT_TYPE_TRANSPORT);
 		if (TNY_IS_ACCOUNT(acc)) {
-			gchar *tmp, *url = tny_account_get_url_string (acc);
+			gchar *tmp = NULL, *url = tny_account_get_url_string (acc);
 			ModestTnySendQueue *sendqueue =
-				modest_runtime_get_send_queue (TNY_TRANSPORT_ACCOUNT(acc));
-			gchar *queue_str = modest_tny_send_queue_to_string (sendqueue);
+				modest_runtime_get_send_queue (TNY_TRANSPORT_ACCOUNT(acc), TRUE);
+
+			if (TNY_IS_SEND_QUEUE (sendqueue)) {
+				gchar *queue_str = modest_tny_send_queue_to_string (sendqueue);
 			
-			tmp = g_strdup_printf ("%s[%s]: '%s': %s\n%s",
-					       str, accname, tny_account_get_id (acc), url,
-					       queue_str);
-			g_free(queue_str);
+				tmp = g_strdup_printf ("%s[%s]: '%s': %s\n%s",
+						       str, accname, tny_account_get_id (acc), url,
+						       queue_str);
+				g_free(queue_str);
+				g_free (str);
+				str = tmp;
+			}
 			g_free (url);
-			g_free (str);
-			str = tmp;
 
 			g_object_unref (acc);
 		}
@@ -866,8 +1049,11 @@ on_dbus_method_dump_send_queues (DBusConnection *con, DBusMessage *message)
 		dbus_connection_flush (con);
 		dbus_message_unref (reply);
 	}
-	
 	g_free (str);
+
+	/* Let modest die */
+	g_idle_add (notify_error_in_dbus_callback, NULL);
+
 	return OSSO_OK;
 }
 
@@ -903,9 +1089,12 @@ on_dbus_method_dump_operation_queue (DBusConnection *con, DBusMessage *message)
 		dbus_connection_send (con, reply, &serial);
 		dbus_connection_flush (con);
 		dbus_message_unref (reply);
-	}
-	
+	}	
 	g_free (str);
+
+	/* Let modest die */
+	g_idle_add (notify_error_in_dbus_callback, NULL);
+
 	return OSSO_OK;
 }
 
@@ -940,8 +1129,9 @@ on_dbus_method_dump_accounts (DBusConnection *con, DBusMessage *message)
 			TNY_ACCOUNT_TYPE_STORE);
 		if (TNY_IS_ACCOUNT(acc)) {
 			gchar *tmp, *url = tny_account_get_url_string (acc);
-			tmp = g_strdup_printf ("%sstore    : '%s': %s\n",
-					       str, tny_account_get_id (acc), url);
+			tmp = g_strdup_printf ("%sstore    : '%s': %s (refs: %d)\n",
+					       str, tny_account_get_id (acc), url, 
+					       ((GObject*)acc)->ref_count-1);
 			g_free (str);
 			str = tmp;
 			g_free (url);
@@ -954,8 +1144,9 @@ on_dbus_method_dump_accounts (DBusConnection *con, DBusMessage *message)
 			TNY_ACCOUNT_TYPE_TRANSPORT);
 		if (TNY_IS_ACCOUNT(acc)) {
 			gchar *tmp, *url = tny_account_get_url_string (acc);
-			tmp = g_strdup_printf ("%stransport: '%s': %s\n",
-					       str, tny_account_get_id (acc), url);
+			tmp = g_strdup_printf ("%stransport: '%s': %s (refs: %d)\n",
+					       str, tny_account_get_id (acc), url, 
+					       ((GObject*)acc)->ref_count-1);
 			g_free (str);
 			str = tmp;
 			g_free (url);
@@ -977,152 +1168,462 @@ on_dbus_method_dump_accounts (DBusConnection *con, DBusMessage *message)
 		dbus_connection_send (con, reply, &serial);
 		dbus_connection_flush (con);
 		dbus_message_unref (reply);
-	}
-	
+	}	
 	g_free (str);
+
+	/* Let modest die */
+	g_idle_add (notify_error_in_dbus_callback, NULL);
+
 	return OSSO_OK;
 }
 
+static void
+on_send_receive_performer(gboolean canceled, 
+			  GError *err,
+			  ModestWindow *parent_window,
+			  TnyAccount *account,
+			  gpointer user_data)
+{
+	SendReceivePerformerData *data = (SendReceivePerformerData *) user_data;
 
+	if (err || canceled || data == NULL) {
+		g_idle_add (notify_error_in_dbus_callback, NULL);
+		if (data) {
+			send_receive_performer_data_free (data);
+		}
+		return;
+	}
 
+	data->mail_op = modest_mail_operation_new (NULL);
+	modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
+					 data->mail_op);
+	if (data->manual) {
+		g_idle_add (on_idle_send_receive, data);
+	} else {
+		modest_heartbeat_add (on_idle_send_receive, data);
+	}
+}
 
-static gint 
+
+static gint
 on_send_receive(GArray *arguments, gpointer data, osso_rpc_t * retval)
-{ 	
-	ModestConnectedVia connect_when;
+{
+	TnyDevice *device = modest_runtime_get_device ();
+	SendReceivePerformerData *srp_data;
 
-	connect_when = modest_conf_get_int (modest_runtime_get_conf (), 
-					    MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, NULL);
-	
-	/* Perform a send and receive if the user selected to connect
-	   via any mean or if the current connection method is the
-	   same as the one specified by the user */
-	if (connect_when == MODEST_CONNECTED_VIA_ANY ||
-	    connect_when == modest_platform_get_current_connection ()) {
-		/* Use g_idle to context-switch into the application's thread: */
-		g_idle_add (on_idle_send_receive, NULL);
+	srp_data = g_slice_new0 (SendReceivePerformerData);
+	srp_data->account_id = NULL;
+	srp_data->manual = FALSE;
+	srp_data->mail_op = NULL;
+
+	if (!tny_device_is_online (device))
+		modest_platform_connect_and_perform (NULL, FALSE, NULL, on_send_receive_performer, srp_data);
+	else
+		on_send_receive_performer (FALSE, NULL, NULL, NULL, srp_data);
+
+	return OSSO_OK;
+}
+
+static gint
+on_send_receive_full (GArray *arguments, gpointer data, osso_rpc_t * retval)
+{
+ 	osso_rpc_t val;
+	gchar *account_id;
+	gboolean manual;
+	TnyDevice *device;
+	SendReceivePerformerData *srp_data;
+
+	val = g_array_index (arguments, osso_rpc_t, MODEST_DBUS_SEND_RECEIVE_FULL_ARG_ACCOUNT_ID);
+	account_id = g_strdup (val.value.s);
+	val = g_array_index (arguments, osso_rpc_t, MODEST_DBUS_SEND_RECEIVE_FULL_ARG_MANUAL);
+	manual = val.value.b;
+
+	srp_data = g_slice_new0 (SendReceivePerformerData);
+	srp_data->manual = manual;
+	if (account_id && account_id[0] != '\0') {
+		srp_data->account_id = account_id;
 	} else {
-		/* We need this to allow modest to finish */
-		g_idle_add (notify_error_in_dbus_callback, NULL);
+		srp_data->account_id = NULL;
+		g_free (account_id);
 	}
- 	
- 	return OSSO_OK;
+	srp_data->mail_op = NULL;
+	device = modest_runtime_get_device ();
+	if (!tny_device_is_online (device))
+		modest_platform_connect_and_perform (NULL, FALSE, NULL, on_send_receive_performer, srp_data);
+	else
+		on_send_receive_performer (FALSE, NULL, NULL, NULL, srp_data);
+
+	return OSSO_OK;
 }
 
 static gboolean
-on_idle_open_default_inbox(gpointer user_data)
+on_idle_update_folder_counts (gpointer userdata)
 {
-	ModestWindow *main_win;
-	GtkWidget *folder_view;
-	
-	if (!check_and_offer_account_creation ()) /* this has it's only lock already */
-		return FALSE;
+	ModestMailOperation *mail_op;
+	gchar *account_id = (gchar *) userdata;
 
-	/* This is a GDK lock because we are an idle callback and
-	 * the code below is or does Gtk+ code */
-	gdk_threads_enter (); /* CHECKED */
+	mail_op = modest_mail_operation_new (NULL);
+	modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
+					 mail_op);
+	modest_mail_operation_update_folder_counts (mail_op, account_id);
+	g_object_unref (mail_op);
+	g_free (account_id);
+
+	return FALSE;
 
-	main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
-						      TRUE); /* create if non-existent */
-	if (!main_win) {
-		g_warning ("%s: BUG: no main window", __FUNCTION__);
-		gdk_threads_leave (); /* CHECKED */
-		return FALSE; /* don't call me again */
-	}
-		
-	/* Get the folder view */
-	folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (main_win),
-							   MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
-	modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (folder_view));
-	
-	gdk_threads_leave (); /* CHECKED */
-	
-	/* This D-Bus method is obviously meant to result in the UI being visible,
-	 * so show it, by calling this idle handler directly: */
-	on_idle_top_application(user_data);
-	
-	return FALSE; /* Do not call this callback again. */
 }
 
-static gint 
-on_open_default_inbox(GArray * arguments, gpointer data, osso_rpc_t * retval)
+static gint
+on_update_folder_counts (GArray *arguments, gpointer data, osso_rpc_t * retval)
 {
-	/* Use g_idle to context-switch into the application's thread: */
- 	g_idle_add(on_idle_open_default_inbox, NULL);
- 	
- 	return OSSO_OK;
-}
+ 	osso_rpc_t val;
+	gchar *account_id;
 
+	val = g_array_index (arguments, osso_rpc_t, MODEST_DBUS_SEND_RECEIVE_FULL_ARG_ACCOUNT_ID);
+	account_id = g_strdup (val.value.s);
 
-static gboolean 
-on_idle_top_application (gpointer user_data)
+	if (account_id != NULL) {
+		g_idle_add (on_idle_update_folder_counts, g_strdup (account_id));
+	}
+
+	g_free (account_id);
+
+	return OSSO_OK;
+}
+
+static gint
+on_open_default_inbox(GArray * arguments, gpointer data, osso_rpc_t * retval)
+{
+ 	g_idle_add(on_idle_top_application, NULL);
+
+	return OSSO_OK;
+}
+
+
+static gboolean
+on_idle_open_account (gpointer user_data)
+{
+	ModestWindow *top;
+	ModestWindowMgr *mgr;
+	gchar *acc_name;
+
+	gdk_threads_enter ();
+
+	acc_name = (gchar *) user_data;
+	mgr = modest_runtime_get_window_mgr ();
+
+	top = modest_window_mgr_get_current_top (mgr);
+	if (!top)
+		top = modest_window_mgr_show_initial_window (mgr);
+
+#ifdef MODEST_TOOLKIT_HILDON2
+	GtkWidget *new_window;
+	ModestProtocolType store_protocol;
+	gboolean mailboxes_protocol;
+
+	store_protocol = modest_account_mgr_get_store_protocol (modest_runtime_get_account_mgr (), 
+								acc_name);
+	mailboxes_protocol = 
+		modest_protocol_registry_protocol_type_has_tag (modest_runtime_get_protocol_registry (),
+								store_protocol,
+								MODEST_PROTOCOL_REGISTRY_MULTI_MAILBOX_PROVIDER_PROTOCOLS);
+
+	if (mailboxes_protocol) {
+		new_window = GTK_WIDGET (modest_mailboxes_window_new (acc_name));
+	} else {
+		new_window = GTK_WIDGET (modest_folder_window_new (NULL));
+		modest_folder_window_set_account (MODEST_FOLDER_WINDOW (new_window),
+						  acc_name);
+	}
+
+	if (modest_window_mgr_register_window (mgr, MODEST_WINDOW (new_window), NULL)) {
+		gtk_widget_show (new_window);
+	} else {
+		gtk_widget_destroy (new_window);
+		new_window = NULL;
+	}
+#else
+	if (MODEST_IS_MAIN_WINDOW (top)) {
+		gchar *server_name;
+		GtkWidget *folder_view;
+
+		folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (top),
+								   MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
+		server_name = modest_account_mgr_get_server_account_name (modest_runtime_get_account_mgr (), 
+									  acc_name, TNY_ACCOUNT_TYPE_STORE);
+		if (server_name) {
+			modest_folder_view_set_account_id_of_visible_server_account (MODEST_FOLDER_VIEW (folder_view),
+										     server_name);
+			g_free (server_name);
+		}
+	}
+#endif
+
+	gdk_threads_leave ();
+	g_free (acc_name);
+	return FALSE;
+}
+
+static gint
+on_open_account (GArray *arguments, gpointer data, osso_rpc_t *retval)
+{
+ 	osso_rpc_t val;
+ 	gchar *account_id;
+
+	/* Get the arguments: */
+ 	val = g_array_index(arguments, osso_rpc_t, MODEST_DBUS_OPEN_MESSAGE_ARG_URI);
+ 	account_id = g_strdup (val.value.s);
+
+ 	g_idle_add (on_idle_open_account, account_id);
+
+	return OSSO_OK;
+}
+
+#ifdef MODEST_TOOLKIT_HILDON2
+static gboolean
+on_idle_top_application (gpointer user_data)
+{
+	HildonWindowStack *stack;
+	GtkWidget *window;
+
+	/* This is a GDK lock because we are an idle callback and
+	 * the code below is or does Gtk+ code */
+
+	gdk_threads_enter (); /* CHECKED */
+
+	stack = hildon_window_stack_get_default ();
+	window = GTK_WIDGET (hildon_window_stack_peek (stack));
+
+	if (window) {
+		gtk_window_present (GTK_WINDOW (window));
+	} else {
+		ModestWindowMgr *mgr;
+
+		mgr = modest_runtime_get_window_mgr ();
+		window = (GtkWidget *) modest_window_mgr_show_initial_window (mgr);
+	}
+
+	gdk_threads_leave (); /* CHECKED */
+
+	return FALSE; /* Do not call this callback again. */
+}
+#else
+static gboolean
+on_idle_top_application (gpointer user_data)
 {
 	ModestWindow *main_win;
-	
+	gboolean new_window = FALSE;
+
 	/* This is a GDK lock because we are an idle callback and
 	 * the code below is or does Gtk+ code */
 
 	gdk_threads_enter (); /* CHECKED */
-	
+
 	main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
-						      TRUE); /* create if non-existent */
+						      FALSE);
+
+	if (!main_win) {
+		main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
+							      TRUE);
+		new_window = TRUE;
+	}
+
+	if (main_win) {
+		/* If we're showing an already existing window then
+		   reselect the INBOX */
+		if (!new_window) {
+			GtkWidget *folder_view;
+			folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (main_win),
+									   MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
+			modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (folder_view));
+		}
+	}
+
 	if (main_win) {
-		/* Ideally, we would just use gtk_widget_show(), 
-		 * but this widget is not coded correctly to support that: */
 		gtk_widget_show_all (GTK_WIDGET (main_win));
 		gtk_window_present (GTK_WINDOW (main_win));
-	} else
-		g_warning ("%s: BUG: no main window", __FUNCTION__);
+	}
 
 	gdk_threads_leave (); /* CHECKED */
-	
+
 	return FALSE; /* Do not call this callback again. */
 }
+#endif
 
-static gint 
+static gint
 on_top_application(GArray * arguments, gpointer data, osso_rpc_t * retval)
 {
 	/* Use g_idle to context-switch into the application's thread: */
  	g_idle_add(on_idle_top_application, NULL);
- 	
- 	return OSSO_OK;
+
+	return OSSO_OK;
 }
-                      
+
+static gboolean
+on_idle_open_edit_accounts_dialog (gpointer user_data)
+{
+	ModestWindow *top;
+	ModestWindowMgr *mgr;
+	gboolean closed;
+
+	/* This is a GDK lock because we are an idle callback and
+	 * the code below is or does Gtk+ code */
+
+	gdk_threads_enter (); /* CHECKED */
+
+	mgr = modest_runtime_get_window_mgr ();
+	closed = modest_window_mgr_close_all_but_initial (mgr);
+	top = modest_window_mgr_get_current_top (mgr);
+
+	if (closed) {
+		/* Show edit accounts dialog */
+		modest_ui_actions_on_accounts (NULL, top);
+	} else {
+		gboolean has_accounts;
+
+		has_accounts = modest_account_mgr_has_accounts (modest_runtime_get_account_mgr (),
+								TRUE);
+
+		/* Present the current top window */
+		gdk_threads_leave ();
+		on_idle_top_application (NULL);
+		gdk_threads_enter ();
+
+		/* Show edit accounts dialog if we're launching the
+		   program and there is no account (if there is at
+		   least one account then on_idle_top_application will
+		   show the accounts wizard */
+		if (!top && has_accounts) {
+			top = modest_window_mgr_get_current_top (mgr);
+			modest_ui_actions_on_accounts (NULL, top);
+		}
+	}
+
+	gdk_threads_leave (); /* CHECKED */
+
+	return FALSE; /* Do not call this callback again. */
+}
+
+static gint
+on_open_edit_accounts_dialog (GArray * arguments, gpointer data, osso_rpc_t * retval)
+{
+	/* Use g_idle to context-switch into the application's thread: */
+	g_idle_add (on_idle_open_edit_accounts_dialog, NULL);
+
+	return OSSO_OK;
+}
+
+static gboolean 
+on_idle_show_memory_low (gpointer user_data)
+{
+	ModestWindow *main_win = NULL;
+
+	gdk_threads_enter ();
+	main_win = modest_window_mgr_get_current_top (modest_runtime_get_window_mgr ());
+	modest_platform_run_information_dialog (GTK_WINDOW (main_win),
+						dgettext("ke-recv","memr_ib_operation_disabled"),
+						TRUE);
+	gdk_threads_leave ();
+
+	return FALSE;
+}
+
+static gboolean
+on_idle_present_modal (gpointer user_data)
+{
+	GtkWindow *current, *transient;
+	gdk_threads_enter ();
+	current = (GtkWindow *) user_data;
+	while (GTK_IS_DIALOG (current)) {
+		transient = gtk_window_get_transient_for (GTK_WINDOW (current));
+		if (transient == NULL)
+			break;
+		else
+			current = transient;
+	}
+	gtk_window_present (current);
+	gdk_threads_leave ();
+
+	return FALSE;
+}
+
+/**
+  * This function checks if a modal dialog should be activated
+  * instead of other UI components on a DBus request, and if yes, starts the request
+  * @return TRUE if a modal dialog is about to be acitvated
+  * @note This function should be used before activating any Modest UI element on DBus request
+  */
+static gboolean
+modest_dbus_check_present_modal ()
+{
+	GtkWindow *dialog;
+
+	/* Check if there is already a dialog or note open */
+	dialog = modest_window_mgr_get_modal (modest_runtime_get_window_mgr());
+	if (dialog) {
+		g_idle_add (on_idle_present_modal, dialog);
+	}
+
+	return (NULL != dialog);
+}
+
 /* Callback for normal D-BUS messages */
-gint 
+gint
 modest_dbus_req_handler(const gchar * interface, const gchar * method,
 			GArray * arguments, gpointer data,
 			osso_rpc_t * retval)
 {
+	/* Check memory low conditions */
+	if (modest_platform_check_memory_low (NULL, FALSE)) {
+		g_idle_add (on_idle_show_memory_low, NULL);
+		goto param_error;
+	}
+
 	if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_MAIL_TO) == 0) {
 		if (arguments->len != MODEST_DBUS_MAIL_TO_ARGS_COUNT)
 			goto param_error;
-		return on_mail_to (arguments, data, retval);		
+		return modest_dbus_check_present_modal () ? OSSO_OK : on_mail_to (arguments, data, retval);
 	} else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_OPEN_MESSAGE) == 0) {
 		if (arguments->len != MODEST_DBUS_OPEN_MESSAGE_ARGS_COUNT)
 			goto param_error;
-		return on_open_message (arguments, data, retval);
+		return modest_dbus_check_present_modal () ? OSSO_OK : on_open_message (arguments, data, retval);
+	} else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_OPEN_ACCOUNT) == 0) {
+		if (arguments->len != MODEST_DBUS_OPEN_ACCOUNT_ARGS_COUNT)
+			goto param_error;
+		return modest_dbus_check_present_modal () ? OSSO_OK : on_open_account (arguments, data, retval);
 	} else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_SEND_RECEIVE) == 0) {
 		if (arguments->len != 0)
 			goto param_error;
-		return on_send_receive (arguments, data, retval);
+		return modest_dbus_check_present_modal () ? OSSO_OK : on_send_receive (arguments, data, retval);
+	} else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_SEND_RECEIVE_FULL) == 0) {
+		if (arguments->len != MODEST_DBUS_SEND_RECEIVE_FULL_ARGS_COUNT)
+			goto param_error;
+		return modest_dbus_check_present_modal () ? OSSO_OK : on_send_receive_full (arguments, data, retval);
+	} else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_UPDATE_FOLDER_COUNTS) == 0) {
+		if (arguments->len != MODEST_DBUS_UPDATE_FOLDER_COUNTS_ARGS_COUNT)
+			goto param_error;
+		return on_update_folder_counts (arguments, data, retval);
 	} else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_COMPOSE_MAIL) == 0) {
 		if (arguments->len != MODEST_DBUS_COMPOSE_MAIL_ARGS_COUNT)
 			goto param_error;
-		return on_compose_mail (arguments, data, retval);
+		return modest_dbus_check_present_modal () ? OSSO_OK : on_compose_mail (arguments, data, retval);
 	} else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_DELETE_MESSAGE) == 0) {
 		if (arguments->len != MODEST_DBUS_DELETE_MESSAGE_ARGS_COUNT)
 			goto param_error;
-		return on_delete_message (arguments,data, retval);
+		return modest_dbus_check_present_modal () ? OSSO_OK : on_delete_message (arguments,data, retval);
 	} else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_OPEN_DEFAULT_INBOX) == 0) {
 		if (arguments->len != 0)
 			goto param_error;
-		return on_open_default_inbox (arguments, data, retval);
+		return modest_dbus_check_present_modal () ? OSSO_OK : on_open_default_inbox (arguments, data, retval);
 	} else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_TOP_APPLICATION) == 0) {
 		if (arguments->len != 0)
 			goto param_error;
-		return on_top_application (arguments, data, retval); 
-	} else { 
+		return modest_dbus_check_present_modal () ? OSSO_OK : on_top_application (arguments, data, retval);
+	} else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_OPEN_EDIT_ACCOUNTS_DIALOG) == 0) {
+		if (arguments->len != 0)
+			goto param_error;
+		return modest_dbus_check_present_modal () ? OSSO_OK : on_open_edit_accounts_dialog (arguments, data, retval);
+	} else {
 		/* We need to return INVALID here so
 		 * libosso will return DBUS_HANDLER_RESULT_NOT_YET_HANDLED,
 		 * so that our modest_dbus_req_filter will then be tried instead.
@@ -1134,7 +1635,7 @@ modest_dbus_req_handler(const gchar * interface, const gchar * method,
 	g_idle_add (notify_error_in_dbus_callback, NULL);
 	return OSSO_ERROR;
 }
-					 
+
 /* A complex D-Bus type (like a struct),
  * used to return various information about a search hit.
  */
@@ -1150,6 +1651,23 @@ modest_dbus_req_handler(const gchar * interface, const gchar * method,
 	DBUS_TYPE_INT64_AS_STRING /* timestamp */ \
 	DBUS_STRUCT_END_CHAR_AS_STRING
 
+#define ACCOUNT_HIT_DBUS_TYPE \
+	DBUS_STRUCT_BEGIN_CHAR_AS_STRING \
+	DBUS_TYPE_INT64_AS_STRING /* timestamp */ \
+	DBUS_TYPE_STRING_AS_STRING /* subject */ \
+	DBUS_STRUCT_END_CHAR_AS_STRING
+
+
+#define ACCOUNTS_HIT_DBUS_TYPE \
+	DBUS_STRUCT_BEGIN_CHAR_AS_STRING \
+	DBUS_TYPE_STRING_AS_STRING \
+	DBUS_TYPE_STRING_AS_STRING \
+	DBUS_TYPE_STRING_AS_STRING \
+	DBUS_TYPE_INT64_AS_STRING \
+	DBUS_TYPE_ARRAY_AS_STRING \
+	ACCOUNT_HIT_DBUS_TYPE \
+	DBUS_STRUCT_END_CHAR_AS_STRING
+
 static DBusMessage *
 search_result_to_message (DBusMessage *reply,
 			   GList       *hits)
@@ -1353,12 +1871,12 @@ on_dbus_method_search (DBusConnection *con, DBusMessage *message)
 	}
 
 	if (sd_v > 0) {
-		search->flags |= MODEST_SEARCH_BEFORE;
+		search->flags |= MODEST_SEARCH_AFTER;
 		search->start_date = start_date;
 	}
 
 	if (ed_v > 0) {
-		search->flags |= MODEST_SEARCH_AFTER;
+		search->flags |= MODEST_SEARCH_BEFORE;
 		search->end_date = end_date;
 	}
 
@@ -1382,6 +1900,456 @@ on_dbus_method_search (DBusConnection *con, DBusMessage *message)
 	modest_search_all_accounts (search, search_all_cb, helper);
 }
 
+static gint
+headers_cmp (TnyHeader *a, TnyHeader *b)
+{
+	time_t date_a, date_b;
+	date_a = tny_header_get_date_received (a);
+	date_b = tny_header_get_date_received (b);
+
+	return date_a - date_b;
+}
+
+/**
+  * The helper structure for handling GetUnreadMessages DBus request
+  */
+typedef struct {
+	TnyList *accounts_list;
+	TnyList *inboxes_list;
+	gint unread_msgs_count;
+	DBusConnection *con;
+	DBusMessage *message;
+	GList *account_hits_list;
+	ModestMailOperation *mail_op;
+	guint folder_requests_total; /**< Total get-folder requests number for multi-mailbox accounts */
+	guint folder_requests_done; /**< Done get-folder requests number for multi-mailbox accounts */
+} GetUnreadMessagesHelper;
+
+typedef struct {
+	gchar *account_id;
+	gchar *account_name;
+	gchar *store_protocol;
+	gchar *mailbox_id;
+	gint unread_count;
+	GList *header_list;
+} AccountHits;
+
+static void return_results (GetUnreadMessagesHelper *helper)
+{
+	DBusMessage *reply;
+
+	reply = dbus_message_new_method_return (helper->message);
+	if (reply) {
+		dbus_uint32_t serial = 0;
+		GList *node;
+		DBusMessageIter iter;
+		DBusMessageIter array_iter;
+
+		dbus_message_iter_init_append (reply, &iter);
+		dbus_message_iter_open_container (&iter,
+						  DBUS_TYPE_ARRAY,
+						  ACCOUNTS_HIT_DBUS_TYPE,
+						  &array_iter);
+		for (node = helper->account_hits_list; node != NULL; node = g_list_next (node)) {
+			AccountHits *ah = (AccountHits *) node->data;
+			const char *account_id;
+			const char *account_name;
+			const char *store_protocol;
+			gint64 unread_count;
+			DBusMessageIter ah_struct_iter;
+			DBusMessageIter sh_array_iter;
+			GList *result_node;
+
+			dbus_message_iter_open_container (&array_iter,
+							  DBUS_TYPE_STRUCT,
+							  NULL,
+							  &ah_struct_iter);
+			account_id = ah->account_id;
+			account_name = ah->account_name;
+			store_protocol = ah->store_protocol;
+			unread_count = ah->unread_count;
+			dbus_message_iter_append_basic (&ah_struct_iter,
+							DBUS_TYPE_STRING,
+							&account_id);
+			dbus_message_iter_append_basic (&ah_struct_iter,
+							DBUS_TYPE_STRING,
+							&account_name);
+			dbus_message_iter_append_basic (&ah_struct_iter,
+							DBUS_TYPE_STRING,
+							&store_protocol);
+			dbus_message_iter_append_basic (&ah_struct_iter,
+							DBUS_TYPE_INT64,
+							&unread_count);
+
+			dbus_message_iter_open_container (&ah_struct_iter,
+							  DBUS_TYPE_ARRAY,
+							  ACCOUNT_HIT_DBUS_TYPE,
+							  &sh_array_iter);
+			for (result_node = ah->header_list; result_node != NULL; result_node = g_list_next (result_node)) {
+				TnyHeader *header = (TnyHeader *) result_node->data;
+				DBusMessageIter sh_struct_iter;
+				gint64 ts = tny_header_get_date_received (header);
+				gchar *subject = tny_header_dup_subject (header);
+
+				dbus_message_iter_open_container (&sh_array_iter,
+								  DBUS_TYPE_STRUCT,
+								  NULL,
+								  &sh_struct_iter);
+				dbus_message_iter_append_basic (&sh_struct_iter,
+								DBUS_TYPE_INT64,
+								&ts);
+				dbus_message_iter_append_basic (&sh_struct_iter,
+								DBUS_TYPE_STRING,
+								(const gchar **) &subject); 
+
+				dbus_message_iter_close_container (&sh_array_iter,
+							   &sh_struct_iter); 
+				g_object_unref (header);
+			}
+			dbus_message_iter_close_container (&ah_struct_iter,
+							   &sh_array_iter); 
+
+			dbus_message_iter_close_container (&array_iter,
+							   &ah_struct_iter); 
+			g_free (ah->account_id);
+			g_free (ah->account_name);
+			g_free (ah->store_protocol);
+			g_list_free (ah->header_list);
+		}
+
+		dbus_message_iter_close_container (&iter,
+						   &array_iter); 
+		dbus_connection_send (helper->con, reply, &serial);
+		dbus_connection_flush (helper->con);
+		dbus_message_unref (reply);
+
+	}
+	g_list_free (helper->account_hits_list);
+	dbus_message_unref (helper->message);
+	g_object_unref (helper->accounts_list);
+	modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (),
+					    helper->mail_op);
+	g_object_unref (helper->mail_op);
+	g_slice_free (GetUnreadMessagesHelper, helper);
+}
+
+static void get_unread_messages_get_account (GetUnreadMessagesHelper *helper);
+static void get_unread_messages_get_headers (GetUnreadMessagesHelper *helper);
+
+
+static void get_unread_messages_get_headers_cb (TnyFolder *self,
+						gboolean cancelled, 
+						TnyList *headers,
+						GError *err, 
+						GetUnreadMessagesHelper *helper)
+{
+	TnyIterator *acc_iterator;
+	TnyAccount *account;
+	TnyIterator *headers_iterator;
+	GList *result_list = NULL;
+	gint members_count = 0;
+	AccountHits *account_hits;
+	const gchar *folder_id;
+	const gchar *bar;
+	ModestProtocolType store_protocol_type;
+	ModestProtocol *store_protocol;
+	gint unread_count;
+	ModestProtocolRegistry *registry;
+
+	acc_iterator = tny_list_create_iterator (helper->accounts_list);
+	account = TNY_ACCOUNT (tny_iterator_get_current (acc_iterator));
+
+	headers_iterator = tny_list_create_iterator (headers);
+	unread_count = 0;
+	while (!tny_iterator_is_done (headers_iterator)) {
+		TnyHeader *header;
+		TnyHeaderFlags flags;
+
+		header = TNY_HEADER (tny_iterator_get_current (headers_iterator));
+		flags = tny_header_get_flags (header);
+		if (!(flags & TNY_HEADER_FLAG_SEEN)) {
+			unread_count++;
+			result_list = g_list_insert_sorted (result_list, g_object_ref (header), (GCompareFunc) headers_cmp);
+			if (members_count == helper->unread_msgs_count) {
+				g_object_unref (result_list->data);
+				result_list = g_list_delete_link (result_list, result_list);
+			} else {
+				members_count++;
+			}
+		}
+
+		g_object_unref (header);
+		tny_iterator_next (headers_iterator);
+	}
+	g_object_unref (headers_iterator);
+
+	registry = modest_runtime_get_protocol_registry ();
+	store_protocol_type = modest_tny_account_get_protocol_type (account);
+
+	/* Get the number of unread messages for plug-in based accounts */
+	if (modest_protocol_registry_protocol_type_is_provider (registry, store_protocol_type)) {
+		unread_count = tny_folder_get_unread_count (self);
+	}
+
+	account_hits = g_slice_new (AccountHits);
+	account_hits->account_id = g_strdup (modest_tny_account_get_parent_modest_account_name_for_server_account (account));
+	account_hits->account_name = g_strdup (tny_account_get_name (account));
+	store_protocol = modest_protocol_registry_get_protocol_by_type (registry, store_protocol_type);
+	account_hits->store_protocol = g_strdup (modest_protocol_get_name (store_protocol));
+	account_hits->header_list = result_list;
+	account_hits->mailbox_id = NULL;
+	account_hits->unread_count = unread_count;
+
+	folder_id = tny_folder_get_id (self);
+	bar = g_strstr_len (folder_id, -1, "/");
+	if (bar) {
+		gchar *prefix;
+		prefix = g_strndup (folder_id, bar - folder_id);
+		if (g_strstr_len (prefix, -1, "@")) {
+			account_hits->mailbox_id = g_strdup (prefix);
+		}
+		g_free (prefix);
+	}
+
+	helper->account_hits_list = g_list_prepend (helper->account_hits_list, account_hits);
+
+	get_unread_messages_get_headers (helper);
+
+}
+
+static void
+get_unread_messages_get_headers (GetUnreadMessagesHelper *helper)
+{
+	TnyIterator *iterator;
+
+	iterator = tny_list_create_iterator (helper->inboxes_list);
+	if (tny_iterator_is_done (iterator)) {
+		TnyIterator *accounts_iter;
+		TnyAccount *account;
+		g_object_unref (helper->inboxes_list);
+		helper->inboxes_list = NULL;
+
+		accounts_iter = tny_list_create_iterator (helper->accounts_list);
+		account = TNY_ACCOUNT (tny_iterator_get_current (accounts_iter));
+		g_object_unref (accounts_iter);
+
+		tny_list_remove (helper->accounts_list, (GObject *) account);
+		g_object_unref (account);
+		get_unread_messages_get_account (helper);
+	} else {
+		TnyFolder *folder;
+
+		folder = TNY_FOLDER (tny_iterator_get_current (iterator));
+		if (folder) {
+			TnyList *headers_list;
+
+			headers_list = TNY_LIST (tny_simple_list_new ());
+			tny_folder_get_headers_async (folder, headers_list, FALSE, (TnyGetHeadersCallback) get_unread_messages_get_headers_cb, NULL, helper);
+			g_object_unref (headers_list);
+			tny_list_remove (helper->inboxes_list, G_OBJECT (folder));
+			g_object_unref (folder);
+		}
+	}
+	g_object_unref (iterator);
+}
+
+static void get_account_folders_cb (TnyFolderStore *self, gboolean cancelled, TnyList *list, GError *err, gpointer user_data)
+{
+	GetUnreadMessagesHelper *helper = (GetUnreadMessagesHelper *) user_data;
+	TnyIterator *iterator;
+
+	iterator = tny_list_create_iterator (list);
+	while (!tny_iterator_is_done (iterator)) {
+		TnyFolder *folder;
+
+		folder = TNY_FOLDER (tny_iterator_get_current (iterator));
+		if (tny_folder_get_folder_type (folder) == TNY_FOLDER_TYPE_INBOX) {
+			tny_list_prepend (helper->inboxes_list, G_OBJECT (folder));
+			g_object_unref (folder);
+			break;
+		}
+		g_object_unref (folder);
+		tny_iterator_next (iterator);
+	}
+	g_object_unref (iterator);
+	
+	get_unread_messages_get_headers (helper);
+}
+
+static void get_multi_mailbox_account_folders_cb (TnyFolderStore *self, gboolean cancelled, TnyList *list, GError *err, gpointer user_data)
+{
+	GetUnreadMessagesHelper *helper = (GetUnreadMessagesHelper *) user_data;
+	TnyIterator *iterator;
+
+	/* another request has been finished */
+	helper->folder_requests_done += 1;
+
+	/* analize the folders we got */
+	iterator = tny_list_create_iterator (list);
+	while (!tny_iterator_is_done (iterator)) {
+		TnyFolder *folder;
+
+		folder = TNY_FOLDER (tny_iterator_get_current (iterator));
+		if (tny_folder_get_folder_type (folder) == TNY_FOLDER_TYPE_INBOX) {
+			tny_list_prepend (helper->inboxes_list, G_OBJECT (folder));
+		}
+
+		/* Try to check if we have inbox sub-folders in this folder */
+		if (TNY_IS_FOLDER_STORE (folder)) {
+			TnyFolderStore *folder_store;
+
+			folder_store = TNY_FOLDER_STORE (folder);
+			if (folder_store) {
+				TnyList *folders_list;
+
+				helper->folder_requests_total += 1;
+				folders_list = tny_simple_list_new ();
+				tny_folder_store_get_folders_async (folder_store, folders_list,
+					NULL, FALSE, get_multi_mailbox_account_folders_cb, NULL, helper);
+				g_object_unref (folders_list);
+			}
+		}
+		g_object_unref (folder);
+		tny_iterator_next (iterator);
+	}
+	g_object_unref (iterator);
+
+	/* Check if we have handled all the inbox folders for multi-mailbox accounts */
+	if (helper->folder_requests_done == helper->folder_requests_total) {
+		TnyIterator *inboxes_it;
+		TnyIterator *accounts_it;
+		TnyAccount *account;
+		guint unread_messages;
+		AccountHits* account_hits;
+		ModestProtocol *store_protocol;
+		ModestProtocolType store_protocol_type;
+
+		/* Store the number of unread messages for the handled account */
+		unread_messages = 0;
+		accounts_it = tny_list_create_iterator (helper->accounts_list);
+		account = TNY_ACCOUNT (tny_iterator_get_current (accounts_it));
+		g_object_unref (accounts_it);
+		inboxes_it = tny_list_create_iterator (helper->inboxes_list);
+		while (!tny_iterator_is_done (inboxes_it)) {
+			TnyFolder *folder;
+
+			folder = TNY_FOLDER (tny_iterator_get_current (inboxes_it));
+			if (folder) {
+				unread_messages += tny_folder_get_unread_count (folder);
+			}
+			tny_iterator_next (inboxes_it);
+		}
+		g_object_unref (inboxes_it);
+		g_object_unref (helper->inboxes_list);
+		helper->inboxes_list = NULL;
+		account_hits = g_slice_new (AccountHits);
+		account_hits->account_id = g_strdup (
+			modest_tny_account_get_parent_modest_account_name_for_server_account (account));
+		account_hits->account_name = g_strdup (tny_account_get_name (account));
+		store_protocol_type = modest_tny_account_get_protocol_type (account);
+		store_protocol = modest_protocol_registry_get_protocol_by_type (
+			modest_runtime_get_protocol_registry (), store_protocol_type);
+		account_hits->store_protocol = g_strdup (modest_protocol_get_name (store_protocol));
+		account_hits->mailbox_id = NULL;
+		account_hits->header_list = NULL;
+		account_hits->unread_count = unread_messages;
+		helper->account_hits_list = g_list_prepend (helper->account_hits_list, account_hits);
+
+		/* remove the handled account from the accounts_list */
+		tny_list_remove (helper->accounts_list, G_OBJECT (account));
+		g_object_unref (account);
+
+		get_unread_messages_get_account (helper);
+	}
+}
+
+static void
+get_unread_messages_get_account (GetUnreadMessagesHelper *helper)
+{
+	TnyIterator *iterator;
+
+	/* Search through all accounts */
+	iterator = tny_list_create_iterator (helper->accounts_list);
+	if (tny_iterator_is_done (iterator)) {
+		/* all results, then finish */
+		return_results (helper);
+	} else {
+		TnyAccount *account;
+		TnyList *folders_list;
+		ModestProtocolType protocol_type;
+
+		account = TNY_ACCOUNT (tny_iterator_get_current (iterator));
+		protocol_type = modest_tny_account_get_protocol_type (account);
+
+		folders_list = tny_simple_list_new ();
+		helper->inboxes_list =  tny_simple_list_new ();
+		if (MODEST_PROTOCOL_REGISTRY_TYPE_INVALID != protocol_type &&
+			modest_protocol_registry_protocol_type_has_tag (modest_runtime_get_protocol_registry (),
+				protocol_type, MODEST_PROTOCOL_REGISTRY_MULTI_MAILBOX_PROVIDER_PROTOCOLS)) {
+			/* For multi-mailbox protocols we only can get the number of unread messages,
+			   we will not even try to get their email headers */
+			helper->folder_requests_done = 0;
+			helper->folder_requests_total = 1;
+			tny_folder_store_get_folders_async (TNY_FOLDER_STORE (account),
+				folders_list, NULL, FALSE, get_multi_mailbox_account_folders_cb, NULL, helper);
+		}
+		else {
+			/* For non-multi-mailbox protocols we will get their email headers */
+			tny_folder_store_get_folders_async (TNY_FOLDER_STORE (account),
+				folders_list, NULL, FALSE, get_account_folders_cb, NULL, helper);
+		}
+		g_object_unref (folders_list);
+		g_object_unref (account);
+
+	}
+	g_object_unref (iterator);
+}
+
+static gboolean
+on_idle_get_unread_messages (GetUnreadMessagesHelper *helper)
+{
+	ModestTnyAccountStore *astore;
+	astore = modest_runtime_get_account_store ();
+
+	tny_account_store_get_accounts (TNY_ACCOUNT_STORE (astore),
+					helper->accounts_list,
+					TNY_ACCOUNT_STORE_STORE_ACCOUNTS);
+
+	get_unread_messages_get_account (helper);
+
+	return FALSE;
+}
+
+static void
+on_dbus_method_get_unread_messages (DBusConnection *con, DBusMessage *message)
+{
+	dbus_bool_t  res;
+	dbus_int64_t unread_msgs_count_v;
+	DBusError error;
+	GetUnreadMessagesHelper *helper;
+
+	dbus_error_init (&error);
+
+	res = dbus_message_get_args (message,
+				     &error,
+				     DBUS_TYPE_INT32, &unread_msgs_count_v,
+				     DBUS_TYPE_INVALID);
+
+	helper = g_slice_new (GetUnreadMessagesHelper);
+	helper->unread_msgs_count = unread_msgs_count_v;
+	dbus_message_ref (message);
+	helper->message = message;
+	helper->con = con;
+	helper->account_hits_list = NULL;
+	helper->inboxes_list = NULL;
+	helper->accounts_list = TNY_LIST (tny_simple_list_new ());
+	helper->mail_op = modest_mail_operation_new (NULL);
+	modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
+					 helper->mail_op);
+
+	g_idle_add ((GSourceFunc) on_idle_get_unread_messages, helper);
+}
+
 
 /* A complex D-Bus type (like a struct),
  * used to return various information about a folder.
@@ -1532,6 +2500,7 @@ add_folders_to_list (TnyFolderStore *folder_store, GList** list)
 	tny_folder_store_get_folders (folder_store,
 				      all_folders,
 				      NULL /* query */,
+				      FALSE,
 				      NULL /* error */);
 
 	TnyIterator *iter = tny_list_create_iterator (all_folders);
@@ -1684,6 +2653,25 @@ on_dbus_method_get_folders (DBusConnection *con, DBusMessage *message)
 }
 
 
+static void
+reply_empty_results (DBusConnection *con, DBusMessage *msg)
+{
+	DBusMessage *reply = dbus_message_new_method_return (msg);
+	if (reply) {
+		dbus_uint32_t serial = 0;
+		/* we simply return an empty list, otherwise
+		   global-search gets confused */
+		search_result_to_message (reply, NULL);
+
+		dbus_connection_send (con, reply, &serial);
+		dbus_connection_flush (con);
+		dbus_message_unref (reply);
+	} else
+		g_warning ("%s: failed to send reply",
+			__FUNCTION__);
+}
+
+
 /** This D-Bus handler is used when the main osso-rpc 
  * D-Bus handler has not handled something.
  * We use this for D-Bus methods that need to use more complex types 
@@ -1699,8 +2687,35 @@ modest_dbus_req_filter (DBusConnection *con,
 	if (dbus_message_is_method_call (message,
 					 MODEST_DBUS_IFACE,
 					 MODEST_DBUS_METHOD_SEARCH)) {
-		on_dbus_method_search (con, message);
-		handled = TRUE;			 	
+		
+	/* don't try to search when there not enough mem */
+		if (modest_platform_check_memory_low (NULL, TRUE)) {
+			g_warning ("%s: not enough memory for searching",
+				   __FUNCTION__);
+			reply_empty_results (con, message);
+			handled = TRUE;
+
+		} else {
+			on_dbus_method_search (con, message);
+			handled = TRUE;
+		}
+			 	
+	} else if (dbus_message_is_method_call (message,
+					 MODEST_DBUS_IFACE,
+					 MODEST_DBUS_METHOD_GET_UNREAD_MESSAGES)) {
+		
+	/* don't try to get unread messages when there not enough mem */
+		if (modest_platform_check_memory_low (NULL, TRUE)) {
+			g_warning ("%s: not enough memory for searching",
+				   __FUNCTION__);
+			reply_empty_results (con, message);
+			handled = TRUE;
+
+		} else {
+			on_dbus_method_get_unread_messages (con, message);
+			handled = TRUE;
+		}
+			 	
 	} else if (dbus_message_is_method_call (message,
 						MODEST_DBUS_IFACE,
 						MODEST_DBUS_METHOD_GET_FOLDERS)) {
@@ -1753,10 +2768,114 @@ notify_error_in_dbus_callback (gpointer user_data)
 	return FALSE;
 }
 
-static gboolean
-notify_msg_not_found_in_idle (gpointer user_data)
+gboolean
+modest_dbus_emit_account_created_signal (DBusConnection *con, 
+					 const gchar *account_id)
 {
-	modest_platform_run_information_dialog (NULL, _("mail_ni_ui_folder_get_msg_folder_error"));
+	DBusMessage *signal;
+	dbus_bool_t result;
 
-	return FALSE;
+	signal = dbus_message_new_signal (MODEST_DBUS_OBJECT, MODEST_DBUS_IFACE,
+					  MODEST_DBUS_SIGNAL_ACCOUNT_CREATED);
+
+	if (signal == NULL)
+		return FALSE;
+
+	if (!dbus_message_append_args  (signal,
+					DBUS_TYPE_STRING, &account_id,
+					DBUS_TYPE_INVALID)) {
+		dbus_message_unref (signal);
+		return FALSE;
+	}
+
+	result = dbus_connection_send (con, signal, NULL);
+
+	dbus_message_unref (signal);
+
+	return result?TRUE:FALSE;
+}
+
+gboolean
+modest_dbus_emit_account_removed_signal (DBusConnection *con,
+					 const gchar *account_id)
+{
+	DBusMessage *signal;
+	dbus_bool_t result;
+
+	signal = dbus_message_new_signal (MODEST_DBUS_OBJECT, MODEST_DBUS_IFACE,
+					  MODEST_DBUS_SIGNAL_ACCOUNT_REMOVED);
+
+	if (signal == NULL)
+		return FALSE;
+
+	if (!dbus_message_append_args  (signal,
+					DBUS_TYPE_STRING, &account_id,
+					DBUS_TYPE_INVALID)) {
+		dbus_message_unref (signal);
+		return FALSE;
+	}
+
+	result = dbus_connection_send (con, signal, NULL);
+
+	dbus_message_unref (signal);
+
+	return result?TRUE:FALSE;
+}
+
+gboolean
+modest_dbus_emit_folder_updated_signal (DBusConnection *con, 
+					const gchar *account_id,
+					const gchar *folder_path)
+{
+	DBusMessage *signal;
+	dbus_bool_t result;
+
+	signal = dbus_message_new_signal (MODEST_DBUS_OBJECT, MODEST_DBUS_IFACE,
+					  MODEST_DBUS_SIGNAL_FOLDER_UPDATED);
+
+	if (signal == NULL)
+		return FALSE;
+
+	if (!dbus_message_append_args  (signal,
+					DBUS_TYPE_STRING, &account_id,
+					DBUS_TYPE_STRING, &folder_path,
+					DBUS_TYPE_INVALID)) {
+		dbus_message_unref (signal);
+		return FALSE;
+	}
+
+	result = dbus_connection_send (con, signal, NULL);
+
+	dbus_message_unref (signal);
+
+	return result?TRUE:FALSE;
+}
+
+gboolean
+modest_dbus_emit_msg_read_changed_signal (DBusConnection *con,
+					  const gchar *uid,
+					  gboolean is_read)
+{
+	DBusMessage *signal;
+	dbus_bool_t result;
+
+	signal = dbus_message_new_signal (MODEST_DBUS_OBJECT, MODEST_DBUS_IFACE,
+					  MODEST_DBUS_SIGNAL_MSG_READ_CHANGED);
+
+	if (signal == NULL)
+		return FALSE;
+
+	if (!dbus_message_append_args  (signal,
+					DBUS_TYPE_STRING, &uid,
+					DBUS_TYPE_BOOLEAN, &is_read,
+					DBUS_TYPE_INVALID)) {
+		dbus_message_unref (signal);
+		return FALSE;
+	}
+
+	result = dbus_connection_send (con, signal, NULL);
+
+	dbus_message_unref (signal);
+
+	return result?TRUE:FALSE;
 }