Activate a modal dialog only on UI DBus requests
[modest] / src / dbus_api / modest-dbus-callbacks.c
index 6e1f505..d9a184a 100644 (file)
 #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>
@@ -60,6 +67,8 @@
 
 #include <modest-text-utils.h>
 
+#define DISABLE_GET_UNREAD_MSGS_FOR_MULTI_MAILBOX 1
+
 typedef struct 
 {
        gchar *to;
@@ -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,15 +407,17 @@ 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_find_msg_async_destroy (gpointer userdata)
@@ -440,8 +451,8 @@ find_msg_async_cb (TnyFolder *folder,
                    GError *err, 
                    gpointer user_data)
 {
-        TnyHeader *header;
-        gchar *msg_uid;
+        TnyHeader *header = NULL;
+        gchar *msg_uid = NULL;
         ModestWindowMgr *win_mgr;
         ModestWindow *msg_view = NULL;
         gboolean is_draft = FALSE;
@@ -454,8 +465,7 @@ find_msg_async_cb (TnyFolder *folder,
         }
 
         header = tny_msg_get_header (msg);
-        if (header && (tny_header_get_flags (header) & TNY_HEADER_FLAG_DELETED)) {
-                g_object_unref (header);
+        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;
@@ -484,30 +494,33 @@ find_msg_async_cb (TnyFolder *folder,
                 } 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 cleanup;
+                                       goto end;
                                }
                        }
                
                        from_header = tny_header_dup_from (header);
-                       modest_account_name = modest_utils_get_account_name_from_recipient (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, TRUE);
+                        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;
@@ -521,48 +534,60 @@ find_msg_async_cb (TnyFolder *folder,
                        }
 
                         header = tny_msg_get_header (msg);
-                        msg_view = modest_msg_view_window_new_for_search_result (msg, modest_account_name, msg_uid);
+                        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);
+                               modest_mail_operation_sync_folder (mail_op, folder, FALSE, NULL, NULL);
                                g_object_unref (mail_op);
                        }
                         g_object_unref (header);
                 }
 
                if (msg_view != NULL) {
-                       modest_window_mgr_register_window (win_mgr, msg_view, NULL);
-                       gtk_widget_show_all (GTK_WIDGET (msg_view));
+                       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));
+                       }
                }
         }
 
-cleanup:
-        g_object_unref (header);
-
 end:
+       if (header)
+               g_object_unref (header);
+       if (msg_uid)
+               g_free (msg_uid);
         on_find_msg_async_destroy (info);
 }
 
 
-static void 
-on_open_message_performer (gboolean canceled, 
+static void
+on_open_message_performer (gboolean canceled,
                           GError *err,
-                          GtkWindow *parent_window, 
-                          TnyAccount *account, 
+                          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));
 
        info = (OpenMsgPerformerInfo *) user_data;
         if (canceled || err) {
-               modest_platform_run_information_dialog (NULL, _("mail_ni_ui_folder_get_msg_folder_error"), TRUE);
+               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;
@@ -570,25 +595,49 @@ on_open_message_performer (gboolean canceled,
 
         /* 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 {
+        } 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 {
+                       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;
+                       }
+                       
+                       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);
+
+               }
+               on_find_msg_async_destroy (info);
+               return;
         }
-        if (!folder) {
-               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;
-        }
-        
+
+#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);
@@ -597,19 +646,20 @@ on_open_message_performer (gboolean canceled,
 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 ();
 
@@ -640,6 +690,8 @@ 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) 
@@ -649,36 +701,35 @@ on_open_message (GArray * arguments, gpointer data, osso_rpc_t * retval)
                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);
-               } else {
-                       ModestTnyAccountStore *account_store;
-                       ModestTnyLocalFoldersAccount *local_folders_account;
+                       TnyDevice *device;
+                       gboolean device_online;
 
-                       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));
+                       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 {
                        folder = modest_tny_local_folders_account_get_merged_outbox (local_folders_account);
                        g_object_unref (local_folders_account);
+                       info->connect = FALSE;
                }
                if (folder) {
-                       TnyDevice *device;
-                       gboolean device_online;
-
-                       device = modest_runtime_get_device();
-                       device_online = tny_device_is_online (device);
-                       if (device_online) {
-                               info->connect = TRUE;
+                       TnyMsg *msg = tny_folder_find_msg (folder, uri, NULL);
+                       if (msg) {
+                               info->connect = FALSE;
+                               g_object_unref (msg);
                        } else {
-                               TnyMsg *msg = tny_folder_find_msg (folder, uri, NULL);
-                               if (msg) {
-                                       info->connect = FALSE;
-                                       g_object_unref (msg);
-                               } else {
-                                       info->connect = TRUE;
-                               }
+                               info->connect = TRUE;
                        }
                        g_object_unref (folder);
                }
@@ -704,15 +755,13 @@ on_remove_msgs_finished (ModestMailOperation *mail_op,
                         gpointer user_data)
 {      
        TnyHeader *header;
-       ModestWindow *main_win = NULL, *msg_view = NULL;
-       ModestHeaderView *header_view;
+       ModestWindow *top_win = NULL, *msg_view = NULL;
 
        header = (TnyHeader *) user_data;
 
        /* Get the main window if exists */
-       main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(),
-                                                     FALSE); /* don't create */
-       if (!main_win) {
+       top_win = modest_window_mgr_get_current_top (modest_runtime_get_window_mgr());
+       if (!top_win) {
                g_object_unref (header);
                return;
        }
@@ -724,12 +773,10 @@ on_remove_msgs_finished (ModestMailOperation *mail_op,
        }       
        g_object_unref (header);
 
-       /* Refilter the header view explicitly */
-       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);
+       /* 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
@@ -744,7 +791,7 @@ thread_prepare_delete_message (gpointer userdata)
        char *uri;
        gchar *uid = NULL;
        ModestMailOperation *mail_op = NULL;
-       ModestWindow *main_win = NULL;
+       ModestWindow *top_win = NULL;
 
        uri = (char *) userdata;
 
@@ -753,18 +800,17 @@ thread_prepare_delete_message (gpointer userdata)
                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);
                g_free (uri);
                return FALSE; 
        }
-       
-       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());
+
        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);
                g_free (uri);
@@ -818,7 +864,7 @@ thread_prepare_delete_message (gpointer userdata)
         * 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);
 
        g_signal_connect (G_OBJECT (mail_op),
@@ -871,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 */
 
@@ -890,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)
 {
@@ -1098,66 +1180,245 @@ on_dbus_method_dump_accounts (DBusConnection *con, DBusMessage *message)
 static void
 on_send_receive_performer(gboolean canceled, 
                          GError *err,
-                         GtkWindow *parent_window,
+                         ModestWindow *parent_window,
                          TnyAccount *account,
                          gpointer user_data)
 {
-       ModestConnectedVia connect_when;
+       SendReceivePerformerData *data = (SendReceivePerformerData *) user_data;
 
-       if (err || canceled) {
+       if (err || canceled || data == NULL) {
                g_idle_add (notify_error_in_dbus_callback, NULL);
+               if (data) {
+                       send_receive_performer_data_free (data);
+               }
                return;
        }
 
-       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 ()) {
-               g_idle_add (on_idle_send_receive, NULL);
+       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 {
-               /* We need this to allow modest to finish */
-               g_idle_add (notify_error_in_dbus_callback, NULL);
+               modest_heartbeat_add (on_idle_send_receive, data);
        }
 }
 
 
-static gint 
+static gint
 on_send_receive(GArray *arguments, gpointer data, osso_rpc_t * retval)
-{      
+{
        TnyDevice *device = modest_runtime_get_device ();
+       SendReceivePerformerData *srp_data;
+
+       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, NULL);
+               modest_platform_connect_and_perform (NULL, FALSE, NULL, on_send_receive_performer, srp_data);
        else
-               on_send_receive_performer (FALSE, NULL, NULL, NULL, NULL);
-       
-       return OSSO_OK;
+               on_send_receive_performer (FALSE, NULL, NULL, NULL, srp_data);
+
+       return OSSO_OK;
 }
 
-static gint 
+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 {
+               srp_data->account_id = NULL;
+               g_free (account_id);
+       }
+       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_update_folder_counts (gpointer userdata)
+{
+       ModestMailOperation *mail_op;
+       gchar *account_id = (gchar *) userdata;
+
+       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;
+
+}
+
+static gint
+on_update_folder_counts (GArray *arguments, gpointer data, osso_rpc_t * retval)
+{
+       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);
+
+       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;
+
+       return OSSO_OK;
 }
 
 
-static gboolean 
+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 (),
                                                      FALSE);
 
@@ -1178,18 +1439,78 @@ on_idle_top_application (gpointer user_data)
                }
        }
 
+       if (main_win) {
+               gtk_widget_show_all (GTK_WIDGET (main_win));
+               gtk_window_present (GTK_WINDOW (main_win));
+       }
+
        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 
@@ -1198,17 +1519,56 @@ on_idle_show_memory_low (gpointer user_data)
        ModestWindow *main_win = NULL;
 
        gdk_threads_enter ();
-       main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), FALSE);
+       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)
@@ -1222,32 +1582,48 @@ modest_dbus_req_handler(const gchar * interface, const gchar * method,
        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.
@@ -1259,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.
  */
@@ -1275,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)
@@ -1478,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;
        }
 
@@ -1507,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.
@@ -1657,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);
@@ -1857,6 +2701,22 @@ modest_dbus_req_filter (DBusConnection *con,
                }
                                
        } 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)) {
                on_dbus_method_get_folders (con, message);
@@ -1907,3 +2767,115 @@ notify_error_in_dbus_callback (gpointer user_data)
 
        return FALSE;
 }
+
+gboolean
+modest_dbus_emit_account_created_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_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;
+}