Fixes RefNULL 11/14
[modest] / src / modest-tny-account-store.c
index 79717d3..d96e8e0 100644 (file)
 #include <string.h>
 #include <glib/gi18n.h>
 
+#include <tny-error.h>
 #include <tny-account.h>
 #include <tny-account-store.h>
 #include <tny-store-account.h>
-#include <tny-error.h>
 #include <tny-transport-account.h>
 #include <tny-simple-list.h>
 #include <tny-account-store.h>
 #include <tny-camel-transport-account.h>
 #include <tny-camel-imap-store-account.h>
 #include <tny-camel-pop-store-account.h>
-
+#include "modest-text-utils.h"
 #include <modest-runtime.h>
 #include <modest-marshal.h>
-#include <modest-protocol-info.h>
+#include <modest-protocol-registry.h>
 #include <modest-local-folder-info.h>
+#include "modest-account-protocol.h"
 #include <modest-tny-account.h>
+#include <modest-tny-local-folders-account.h>
 #include <modest-account-mgr.h>
 #include <modest-account-mgr-helpers.h>
+#include <widgets/modest-window-mgr.h>
+#include <modest-signal-mgr.h>
+#include <modest-debug.h>
 
+#include <modest-defs.h>
 #include "modest-tny-account-store.h"
 #include "modest-tny-platform-factory.h"
 #include <tny-gtk-lockable.h>
 #include <camel/camel.h>
+#include <modest-platform.h>
+#include "modest-ui-actions.h"
+#include <widgets/modest-account-settings-dialog.h>
 
 #ifdef MODEST_PLATFORM_MAEMO
 #include <tny-maemo-conic-device.h>
-#ifdef MODEST_HILDON_VERSION_0
-#include <hildon-widgets/hildon-note.h>
-#else
-#include <hildon/hildon-note.h>
-#endif
+#include <maemo/modest-maemo-utils.h>
 #endif
 
-/* 'private'/'protected' functions */
-static void modest_tny_account_store_class_init   (ModestTnyAccountStoreClass *klass);
-//static void modest_tny_account_store_init         (ModestTnyAccountStore *obj);
-static void modest_tny_account_store_finalize     (GObject *obj);
+#include <libgnomevfs/gnome-vfs-volume-monitor.h>
 
-/* implementations for tny-account-store-iface */
+/* 'private'/'protected' functions */
+static void    modest_tny_account_store_class_init   (ModestTnyAccountStoreClass *klass);
+static void    modest_tny_account_store_finalize     (GObject *obj);
 static void    modest_tny_account_store_instance_init (ModestTnyAccountStore *obj);
 static void    modest_tny_account_store_init          (gpointer g, gpointer iface_data);
+static void    modest_tny_account_store_base_init     (gpointer g_class);
 
+static void    on_account_inserted         (ModestAccountMgr *acc_mgr, 
+                                           const gchar *account,
+                                           gpointer user_data);
 
-static void
-get_server_accounts  (TnyAccountStore *self, TnyList *list, TnyAccountType type);
+static void   add_existing_accounts       (ModestTnyAccountStore *self);
+
+static void    insert_account              (ModestTnyAccountStore *self,
+                                           const gchar *account,
+                                           gboolean notify);
+
+static void    on_account_removed          (ModestAccountMgr *acc_mgr, 
+                                           const gchar *account,
+                                           gpointer user_data);
+
+static gchar*  get_password                (TnyAccount *account, 
+                                           const gchar * prompt_not_used, 
+                                           gboolean *cancel);
+
+static void    forget_password             (TnyAccount *account);
+
+static void    on_vfs_volume_mounted       (GnomeVFSVolumeMonitor *volume_monitor, 
+                                           GnomeVFSVolume *volume, 
+                                           gpointer user_data);
+
+static void    on_vfs_volume_unmounted     (GnomeVFSVolumeMonitor *volume_monitor, 
+                                           GnomeVFSVolume *volume, 
+                                           gpointer user_data);
+
+static void    forget_password_in_memory (ModestTnyAccountStore *self, 
+                                         const gchar *server_account_name);
+
+static void    add_connection_specific_transport_accounts         (ModestTnyAccountStore *self);
 
+static void    remove_connection_specific_transport_accounts      (ModestTnyAccountStore *self);
+
+static inline gboolean only_local_accounts        (ModestTnyAccountStore *self);
 
 /* list my signals */
 enum {
-       ACCOUNT_UPDATE_SIGNAL,
+       ACCOUNT_CHANGED_SIGNAL,
+       ACCOUNT_INSERTED_SIGNAL,
+       ACCOUNT_REMOVED_SIGNAL,
+
        PASSWORD_REQUESTED_SIGNAL,
        LAST_SIGNAL
 };
@@ -91,18 +131,19 @@ struct _ModestTnyAccountStorePrivate {
        ModestAccountMgr   *account_mgr;
        TnySessionCamel    *session;
        TnyDevice          *device;
+
+       GSList *sighandlers;
        
-       /* We cache the lists of accounts here.
-        * They are created in our get_accounts_func() implementation. */
-       GSList             *store_accounts;
-       GSList             *transport_accounts;
+       /* We cache the lists of accounts here */
+       TnyList             *store_accounts;
+       TnyList             *transport_accounts;
+       TnyList             *store_accounts_outboxes;
        
-       /* This is also contained in store_accounts,
-        * but we cached it temporarily separately, 
-        * because we create this while creating the transport accounts, 
-        * but return it when requesting the store accounts: 
-        */
-       GSList             *store_accounts_outboxes;
+       /* Matches transport accounts and outbox folder */
+       GHashTable          *outbox_of_transport;
+
+       /* is sending mail blocked? */
+       gboolean send_mail_blocked;
 };
 
 #define MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
@@ -122,7 +163,7 @@ modest_tny_account_store_get_type (void)
        if (!my_type) {
                static const GTypeInfo my_info = {
                        sizeof(ModestTnyAccountStoreClass),
-                       NULL,           /* base init */
+                       modest_tny_account_store_base_init,     /* base init */
                        NULL,           /* base finalize */
                        (GClassInitFunc) modest_tny_account_store_class_init,
                        NULL,           /* class finalize */
@@ -148,6 +189,56 @@ modest_tny_account_store_get_type (void)
        return my_type;
 }
 
+
+static void
+modest_tny_account_store_base_init (gpointer g_class)
+{
+       static gboolean tny_account_store_initialized = FALSE;
+
+       if (!tny_account_store_initialized) {
+
+               signals[ACCOUNT_CHANGED_SIGNAL] =
+                       g_signal_new ("account_changed",
+                                     MODEST_TYPE_TNY_ACCOUNT_STORE,
+                                     G_SIGNAL_RUN_FIRST,
+                                     G_STRUCT_OFFSET (ModestTnyAccountStoreClass, account_changed),
+                                     NULL, NULL,
+                                     g_cclosure_marshal_VOID__OBJECT,
+                                     G_TYPE_NONE, 1, TNY_TYPE_ACCOUNT);
+
+               signals[ACCOUNT_INSERTED_SIGNAL] =
+                       g_signal_new ("account_inserted",
+                                     MODEST_TYPE_TNY_ACCOUNT_STORE,
+                                     G_SIGNAL_RUN_FIRST,
+                                     G_STRUCT_OFFSET (ModestTnyAccountStoreClass, account_inserted),
+                                     NULL, NULL,
+                                     g_cclosure_marshal_VOID__OBJECT,
+                                     G_TYPE_NONE, 1, TNY_TYPE_ACCOUNT);
+               
+               signals[ACCOUNT_REMOVED_SIGNAL] =
+                       g_signal_new ("account_removed",
+                                     MODEST_TYPE_TNY_ACCOUNT_STORE,
+                                     G_SIGNAL_RUN_FIRST,
+                                     G_STRUCT_OFFSET (ModestTnyAccountStoreClass, account_removed),
+                                     NULL, NULL,
+                                     g_cclosure_marshal_VOID__OBJECT,
+                                     G_TYPE_NONE, 1, TNY_TYPE_ACCOUNT);
+
+               signals[PASSWORD_REQUESTED_SIGNAL] =
+                       g_signal_new ("password_requested",
+                                     MODEST_TYPE_TNY_ACCOUNT_STORE,
+                                     G_SIGNAL_RUN_FIRST,
+                                     G_STRUCT_OFFSET(ModestTnyAccountStoreClass, password_requested),
+                                     NULL, NULL,
+                                     modest_marshal_VOID__STRING_POINTER_POINTER_POINTER_POINTER,
+                                     G_TYPE_NONE, 5, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_POINTER,
+                                     G_TYPE_POINTER);          
+
+               tny_account_store_initialized = TRUE;
+       }
+}
+
+
 static void
 modest_tny_account_store_class_init (ModestTnyAccountStoreClass *klass)
 {
@@ -159,203 +250,460 @@ modest_tny_account_store_class_init (ModestTnyAccountStoreClass *klass)
 
        g_type_class_add_private (gobject_class,
                                  sizeof(ModestTnyAccountStorePrivate));
-
-        signals[ACCOUNT_UPDATE_SIGNAL] =
-               g_signal_new ("account_update",
-                             G_TYPE_FROM_CLASS (gobject_class),
-                             G_SIGNAL_RUN_FIRST,
-                             G_STRUCT_OFFSET(ModestTnyAccountStoreClass, account_update),
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__STRING,
-                             G_TYPE_NONE, 1, G_TYPE_STRING);
-        
-        signals[PASSWORD_REQUESTED_SIGNAL] =
-                g_signal_new ("password_requested",
-                              G_TYPE_FROM_CLASS (gobject_class),
-                              G_SIGNAL_RUN_FIRST,
-                              G_STRUCT_OFFSET(ModestTnyAccountStoreClass, password_requested),
-                              NULL, NULL,
-                              modest_marshal_VOID__STRING_POINTER_POINTER_POINTER_POINTER,
-                              G_TYPE_NONE, 5, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_POINTER,
-                              G_TYPE_POINTER);
 }
-
-
+     
 static void
 modest_tny_account_store_instance_init (ModestTnyAccountStore *obj)
 {
-       ModestTnyAccountStorePrivate *priv =
-               MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(obj);
+       GnomeVFSVolumeMonitor* monitor = NULL;
+       ModestTnyAccountStorePrivate *priv;
+
+       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(obj);
 
        priv->cache_dir              = NULL;
        priv->account_mgr            = NULL;
        priv->session                = NULL;
        priv->device                 = NULL;
+       priv->sighandlers            = NULL;
+       priv->send_mail_blocked      = FALSE;
        
+       priv->outbox_of_transport = g_hash_table_new_full (g_direct_hash,
+                                                          g_direct_equal,
+                                                          NULL,
+                                                          NULL);
+
        /* An in-memory store of passwords, 
         * for passwords that are not remembered in the configuration,
          * so they need to be asked for from the user once in each session:
          */
-       priv->password_hash          = g_hash_table_new_full (g_str_hash, g_str_equal,
-                                                             g_free, g_free);
+       priv->password_hash = g_hash_table_new_full (g_str_hash, g_str_equal,
+                                                    g_free, g_free);
+
+       /* Respond to volume mounts and unmounts, such 
+        * as the insertion/removal of the memory card: */
+       /* This is a singleton, so it does not need to be unrefed. */
+       monitor = gnome_vfs_get_volume_monitor();
+
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, 
+                                                      G_OBJECT(monitor), 
+                                                      "volume-mounted",
+                                                      G_CALLBACK(on_vfs_volume_mounted),
+                                                      obj);
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, 
+                                                      G_OBJECT(monitor), "volume-unmounted",
+                                                      G_CALLBACK(on_vfs_volume_unmounted),
+                                                      obj);
 }
 
+/* disconnect the list of TnyAccounts */
+static void
+account_verify_last_ref (TnyAccount *account, const gchar *str)
+{
+       gchar *txt;
+
+       g_return_if_fail (account && TNY_IS_ACCOUNT(account));
 
+       txt = g_strdup_printf ("%s: %s", str ? str : "?", tny_account_get_name(account));
+       MODEST_DEBUG_VERIFY_OBJECT_LAST_REF(G_OBJECT(account),txt);
+       g_free (txt);
+}
 
 static void
-account_list_free (GSList *accounts)
+foreach_account_append_to_list (gpointer data, 
+                               gpointer user_data)
 {
-       GSList *cursor = accounts;
-
-       while (cursor) {
-               if (G_IS_OBJECT(cursor->data)) { /* check twice... */
-                       const gchar *id = tny_account_get_id(TNY_ACCOUNT(cursor->data));
-                       modest_runtime_verify_object_last_ref(cursor->data,id);
-               }                       
-               g_object_unref (G_OBJECT(cursor->data));
-               cursor = cursor->next;
-       }
-       g_slist_free (accounts);
+       TnyList *list;
+       
+       list = TNY_LIST (user_data);
+       tny_list_append (list, G_OBJECT (data));
 }
 
+/********************************************************************/
+/*           Control the state of the MMC local account             */
+/********************************************************************/
 
+/** Only call this if the memory card is really mounted.
+ */ 
 static void
-on_account_removed (ModestAccountMgr *acc_mgr, const gchar *account, gboolean server_account,
-                   gpointer user_data)
+add_mmc_account(ModestTnyAccountStore *self, gboolean emit_insert_signal)
 {
-       ModestTnyAccountStore *self        = MODEST_TNY_ACCOUNT_STORE(user_data);
        ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-
-       /* FIXME: make this more finegrained; changes do not really affect _all_
-        * accounts, and some do not affect tny accounts at all (such as 'last_update')
-        */
-       
-       account_list_free (priv->store_accounts);
-       get_server_accounts (TNY_ACCOUNT_STORE(self), NULL, TNY_ACCOUNT_TYPE_STORE);
+       g_return_if_fail (priv->session);
        
-       account_list_free (priv->transport_accounts);
-       get_server_accounts (TNY_ACCOUNT_STORE(self), NULL,
-                                                       TNY_ACCOUNT_TYPE_TRANSPORT);
-               
-       /* TODO: Ref these when we add them? */
-       g_slist_free (priv->store_accounts_outboxes);
-       priv->store_accounts_outboxes = NULL;
-       
-       g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0,
-                      account);
-}
+       TnyAccount *mmc_account = modest_tny_account_new_for_local_folders (priv->account_mgr, 
+                                                                           priv->session, 
+                                                                           g_getenv (MODEST_MMC1_VOLUMEPATH_ENV));
 
+       /* Add to the list of store accounts */
+       tny_list_append (priv->store_accounts, G_OBJECT (mmc_account));
 
-static void
-on_account_changed (ModestAccountMgr *acc_mgr, const gchar *account,
-                   const gchar *key, gboolean server_account, gpointer user_data)
+       if (emit_insert_signal) {
+               g_signal_emit (G_OBJECT (self), 
+                              signals [ACCOUNT_INSERTED_SIGNAL],
+                              0, mmc_account);
+       }
+
+       /* Free */
+       g_object_unref (mmc_account);
+}
 
+static void
+on_vfs_volume_mounted(GnomeVFSVolumeMonitor *volume_monitor, 
+                     GnomeVFSVolume *volume, 
+                     gpointer user_data)
 {
-       ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data);
-       ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+       ModestTnyAccountStore *self;
+       ModestTnyAccountStorePrivate *priv;
+       gchar *volume_path_uri;
+       gchar *uri = NULL;
+
+       self = MODEST_TNY_ACCOUNT_STORE(user_data);
+       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
        
-       /* Ignore the change if it's a change in the last_updated value */
-       if (g_str_has_suffix (key, MODEST_ACCOUNT_LAST_UPDATED))
-               return;
+       /* Check whether this was the external MMC1 card: */
+       uri = gnome_vfs_volume_get_activation_uri (volume);
+
+       volume_path_uri = g_strconcat (MODEST_MMC1_VOLUMEPATH_URI_PREFIX,
+                                      g_getenv (MODEST_MMC1_VOLUMEPATH_ENV),
+                                      NULL);
+       if (uri && (!strcmp (uri, volume_path_uri))) {
+               add_mmc_account (self, TRUE /* emit the insert signal. */);
+       }
+
+       g_free (volume_path_uri);       
+       g_free (uri);
+}
+
+static void
+on_vfs_volume_unmounted(GnomeVFSVolumeMonitor *volume_monitor, 
+                       GnomeVFSVolume *volume, 
+                       gpointer user_data)
+{
+       ModestTnyAccountStore *self;
+       ModestTnyAccountStorePrivate *priv;
+       gchar *uri = NULL;
+       gchar *volume_path_uri;
 
-       /* FIXME: make this more finegrained; changes do not really affect _all_
-        * accounts, and some do not affect tny accounts at all (such as 'last_update')
-        */
-       if (server_account) {
-               if (priv->store_accounts) {
-                       account_list_free (priv->store_accounts);
-                       priv->store_accounts = NULL;
-                       get_server_accounts (TNY_ACCOUNT_STORE(self),
-                                                    NULL, TNY_ACCOUNT_TYPE_STORE);
+       self = MODEST_TNY_ACCOUNT_STORE(user_data);
+       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+       
+       /* Check whether this was the external MMC1 card: */
+       uri = gnome_vfs_volume_get_activation_uri (volume);
+       volume_path_uri = g_strconcat (MODEST_MMC1_VOLUMEPATH_URI_PREFIX,
+                                      g_getenv (MODEST_MMC1_VOLUMEPATH_ENV),
+                                      NULL);
+       if (uri && (strcmp (uri, volume_path_uri) == 0)) {
+               TnyAccount *mmc_account = NULL;
+               gboolean found = FALSE;
+               TnyIterator *iter = NULL;
+
+               iter = tny_list_create_iterator (priv->store_accounts);
+               while (!tny_iterator_is_done (iter) && !found) {
+                       TnyAccount *account;
+
+                       account = TNY_ACCOUNT (tny_iterator_get_current (iter));
+                       if (modest_tny_account_is_memory_card_account (account)) {
+                               found = TRUE;
+                               mmc_account = g_object_ref (account);
+                       }
+                       g_object_unref (account);
+                       tny_iterator_next (iter);
                }
-               
-               if (priv->transport_accounts) {
-                       account_list_free (priv->transport_accounts);
-                       priv->transport_accounts = NULL;
-                       get_server_accounts (TNY_ACCOUNT_STORE(self), NULL,
-                                                    TNY_ACCOUNT_TYPE_TRANSPORT);
+               g_object_unref (iter);
+
+               if (found) {
+                       /* Remove from the list */
+                       tny_list_remove (priv->store_accounts, G_OBJECT (mmc_account));
+                       
+                       /* Notify observers */
+                       g_signal_emit (G_OBJECT (self),
+                                      signals [ACCOUNT_REMOVED_SIGNAL],
+                                      0, mmc_account);
+
+                       g_object_unref (mmc_account);
+               } else {
+                       g_warning ("%s: there was no store account for the unmounted MMC",
+                                  __FUNCTION__);
                }
        }
+       g_free (volume_path_uri);
+       g_free (uri);
+}
+
+/**
+ * forget_password_in_memory
+ * @self: a TnyAccountStore instance
+ * @account: A server account.
+ * 
+ * Forget any password stored in memory for this account.
+ * For instance, this should be called when the user has changed the password in the account settings.
+ */
+static void
+forget_password_in_memory (ModestTnyAccountStore *self, 
+                          const gchar * server_account_name)
+{
+       ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
 
-       g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0,
-                      account);
+       if (server_account_name && priv->password_hash) {
+               g_hash_table_remove (priv->password_hash, server_account_name);
+       }
 }
 
+static void
+on_account_changed (ModestAccountMgr *acc_mgr, 
+                   const gchar *account_name, 
+                   TnyAccountType account_type,
+                   gpointer user_data)
+{
+       ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data);
+       ModestTnyAccountStorePrivate *priv;
+       TnyList* account_list;
+       gboolean found = FALSE;
+       TnyIterator *iter = NULL;
+
+       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+       account_list = (account_type == TNY_ACCOUNT_TYPE_STORE ? 
+                       priv->store_accounts : 
+                       priv->transport_accounts);
+
+       iter = tny_list_create_iterator (account_list);
+       while (!tny_iterator_is_done (iter) && !found) {
+               TnyAccount *tny_account;
+               tny_account = TNY_ACCOUNT (tny_iterator_get_current (iter));
+               if (tny_account) {
+                       if (!strcmp (tny_account_get_id (tny_account), account_name)) {
+                               found = TRUE;
+                               modest_tny_account_update_from_account (tny_account, get_password, forget_password);
+                               g_signal_emit (G_OBJECT(self), signals[ACCOUNT_CHANGED_SIGNAL], 0, tny_account);
+                       }
+                       g_object_unref (tny_account);
+               }
+               tny_iterator_next (iter);
+       }
+       g_object_unref (iter);
+}
 
-static ModestTnyAccountStore*
-get_account_store_for_account (TnyAccount *account)
+static void 
+show_password_warning_only (const gchar *msg)
 {
-       return MODEST_TNY_ACCOUNT_STORE(g_object_get_data (G_OBJECT(account),
-                                                          "account_store"));
+       /* Show an explanatory temporary banner: */
+       if (modest_window_mgr_get_num_windows (modest_runtime_get_window_mgr ()))
+               modest_platform_information_banner (NULL, NULL, msg);
+}
+
+static void 
+show_wrong_password_dialog (TnyAccount *account)
+{ 
+       if (g_object_get_data (G_OBJECT (account), "connection_specific") != NULL) {
+               modest_ui_actions_on_smtp_servers (NULL, NULL);
+       } else {
+               ModestAccountProtocol *proto;
+               ModestProtocolType proto_type;
+               const gchar *modest_account_name;
+               modest_account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (account);
+
+               /* Get proto */
+               proto_type = modest_account_mgr_get_store_protocol (modest_runtime_get_account_mgr (), 
+                                                                   modest_account_name);
+               proto = (ModestAccountProtocol *)
+                       modest_protocol_registry_get_protocol_by_type (modest_runtime_get_protocol_registry (), 
+                                                                      proto_type);
+
+               /* Create and show the dialog */
+               if (proto && MODEST_IS_ACCOUNT_PROTOCOL (proto)) {
+                       ModestAccountSettingsDialog *dialog =
+                               modest_account_protocol_get_account_settings_dialog (proto, modest_account_name);
+                       modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog), NULL);
+                       gtk_widget_show (GTK_WIDGET (dialog));
+               }
+       }
+       /* Show an explanatory temporary banner: */
+       modest_platform_information_banner (NULL, NULL, _("mcen_ib_username_pw_incorrect"));
 }
 
 /* This callback will be called by Tinymail when it needs the password
- * from the user, for instance if the password was not remembered.
+ * from the user or the account settings.
+ * It can also call forget_password() before calling this,
+ * so that we clear wrong passwords out of our account settings.
  * Note that TnyAccount here will be the server account. */
 static gchar*
-get_password (TnyAccount *account, const gchar *prompt, gboolean *cancel)
+get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *cancel)
 {
-       /* Initialize the output parameter: */
-       if (cancel)
-         *cancel = FALSE;
-         
-       const gchar *key;
-       const TnyAccountStore *account_store;
-       ModestTnyAccountStore *self;
+       ModestTnyAccountStore *self = NULL;
        ModestTnyAccountStorePrivate *priv;
        gchar *username = NULL;
        gchar *pwd = NULL;
-       gpointer pwd_ptr;
-       gboolean already_asked;
-       
-       key           = tny_account_get_id (account);
-       account_store = TNY_ACCOUNT_STORE(get_account_store_for_account (account));
-       
-       self = MODEST_TNY_ACCOUNT_STORE (account_store);
-        priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+       gpointer pwd_ptr = NULL;
+       gboolean already_asked = FALSE;
+       const gchar *server_account_name;
+       gchar *url_string;
+
+       g_return_val_if_fail (account, NULL);
        
+       MODEST_DEBUG_BLOCK(
+               g_debug ("%s: prompt (not shown) = %s\n", __FUNCTION__, prompt_not_used);
+       );              
+
+       /* Get a reference to myself */
+       self = MODEST_TNY_ACCOUNT_STORE (g_object_get_data (G_OBJECT(account), "account_store"));
+       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+       /* Ensure that we still have this account. It could happen
+          that a set_online was requested *before* removing an
+          account, and due to tinymail emits the get_password
+          function using a g_idle the account could be actually
+          removed *before* this function was really called */
+       url_string = tny_account_get_url_string (account);
+       if (url_string) {
+               TnyAccount *tmp_account;
+
+               tmp_account = tny_account_store_find_account (TNY_ACCOUNT_STORE (self), 
+                                                             url_string);
+               g_free (url_string);
+
+               if (!tmp_account) {
+                       *cancel = TRUE;
+                       return NULL;
+               }
+               g_object_unref (tmp_account);
+       }
+
+       server_account_name = tny_account_get_id (account);
+       if (!server_account_name || !self) {
+               g_warning ("modest: %s: could not retrieve account_store for account %s",
+                          __FUNCTION__, server_account_name ? server_account_name : "<NULL>");
+               if (cancel)
+                       *cancel = TRUE;
+
+               return NULL;
+       }
+
        /* This hash map stores passwords, including passwords that are not stored in gconf. */
-       /* is it in the hash? if it's already there, it must be wrong... */
+       /* Is it in the hash? if it's already there, it must be wrong... */
        pwd_ptr = (gpointer)&pwd; /* pwd_ptr so the compiler does not complained about
                                   * type-punned ptrs...*/
-       already_asked = g_hash_table_lookup_extended (priv->password_hash,
-                                                     key,
+       already_asked = priv->password_hash && 
+                               g_hash_table_lookup_extended (priv->password_hash,
+                                                     server_account_name,
                                                      NULL,
                                                      (gpointer*)&pwd_ptr);
+       MODEST_DEBUG_BLOCK(
+               g_debug ("%s: Already asked = %d\n", __FUNCTION__, already_asked);
+       );
 
-       /* if the password is not already there, try ModestConf */
+       /* If the password is not already there, try ModestConf */
        if (!already_asked) {
-               pwd  = modest_account_mgr_get_string (priv->account_mgr,
-                                                     key, MODEST_ACCOUNT_PASSWORD, TRUE);
-               g_hash_table_insert (priv->password_hash, g_strdup (key), g_strdup (pwd));
+               pwd  = modest_account_mgr_get_server_account_password (priv->account_mgr,
+                                                                      server_account_name);
+               g_hash_table_insert (priv->password_hash, g_strdup (server_account_name), g_strdup (pwd));
        }
 
-       /* if it was already asked, it must have been wrong, so ask again */
+       /* If it was already asked, it must have been wrong, so ask again */
        if (already_asked || !pwd || strlen(pwd) == 0) {
+               gboolean settings_have_password;
+               ModestProtocolType protocol_type;
+
+               /* As per the UI spec, if no password was set in the account settings, 
+                * ask for it now. But if the password is wrong in the account settings, 
+                * then show a banner and the account settings dialog so it can be corrected:
+                */
+               settings_have_password = 
+                       modest_account_mgr_get_server_account_has_password (priv->account_mgr, server_account_name);
+
+               protocol_type = modest_tny_account_get_protocol_type (account);
+
+               /* Show an error and after that ask for a password */
+               if (modest_protocol_registry_protocol_type_has_tag(modest_runtime_get_protocol_registry (), 
+                                                                  protocol_type, MODEST_PROTOCOL_REGISTRY_TRANSPORT_PROTOCOLS)) {
+                       gchar *username = NULL, *msg = NULL;
+                       username = modest_account_mgr_get_server_account_username (priv->account_mgr,
+                                                                                  server_account_name);
+                       if (!username || strlen(username) == 0) {
+                               msg = g_strdup_printf (_("emev_ni_ui_smtp_userid_invalid"), 
+                                                      tny_account_get_name (account),
+                                                      tny_account_get_hostname (account));
+                       } else {
+                               gchar *password;
+                               password  = modest_account_mgr_get_server_account_password (priv->account_mgr,
+                                                                                           server_account_name);
+
+                               if (already_asked)
+                                       msg = g_strdup (_("mcen_ib_username_pw_incorrect"));
+                               else if (!password || strlen(password) == 0)
+                                       msg = g_strdup_printf (_("emev_ni_ui_smtp_passwd_invalid"), 
+                                                              tny_account_get_name (account),
+                                                              tny_account_get_hostname (account));
+                               else
+                                       msg = g_strdup_printf (_("emev_ni_ui_smtp_authentication_fail_error"), 
+                                                              tny_account_get_hostname (account));
+                               if (password)
+                                       g_free (password);
+                       }
+                       if (msg) {
+                               modest_platform_run_information_dialog (NULL, msg, TRUE);
+                               g_free (msg);
+                       }
+                       if (username)
+                               g_free (username);
+               }
+
+               if (settings_have_password) {
+                       /* The password must be wrong, so show the account settings dialog so it can be corrected: */
+                       show_wrong_password_dialog (account);
+
+                       if (cancel)
+                               *cancel = TRUE;
+
+                       return NULL;
+               }
+
                /* we don't have it yet. Get the password from the user */
                const gchar* account_id = tny_account_get_id (account);
                gboolean remember = FALSE;
                pwd = NULL;
-               
-               /* Note that we ignore the returned username here,
-                * because it is enough that it will be stored in gconf 
-                * by the signal handler. */
-               g_signal_emit (G_OBJECT(self), signals[PASSWORD_REQUESTED_SIGNAL], 0,
+
+               if (already_asked) {
+                       const gchar *msg;
+                       gboolean username_known = 
+                               modest_account_mgr_get_server_account_username_has_succeeded(priv->account_mgr, 
+                                                                                            server_account_name);
+                       /* If the login has ever succeeded then show a specific message */
+                       if (username_known)
+                               msg = _CS ("ecdg_ib_set_password_incorrect");
+                       else
+                               msg = _("mcen_ib_username_pw_incorrect");
+                       show_password_warning_only (msg);
+               }
+
+               /* Request password */
+               g_signal_emit (G_OBJECT (self), signals[PASSWORD_REQUESTED_SIGNAL], 0,
                               account_id, /* server_account_name */
                               &username, &pwd, cancel, &remember);
+
                
                if (!*cancel) {
-                       if (remember)
-                               modest_account_mgr_set_string (priv->account_mgr,key,
-                                                              MODEST_ACCOUNT_PASSWORD,
-                                                              pwd, TRUE);
+                       /* The password will be returned as the result,
+                        * but we need to tell tinymail about the username too: */
+
+                       /* WARNING: I disabled setting username as this can cause locks. Anyway,
+                        * as now we have the password dialog username entry always dimmed
+                        * this shouldn't be a problem */
+
+                       /* if (username) */
+                       /*      tny_account_set_user (account, username); */
+                       
+                       /* Do not save the password in gconf, because
+                        * the UI spec says "The password will never
+                        * be saved in the account": */
+
                        /* We need to dup the string even knowing that
                           it's already a dup of the contents of an
                           entry, because it if it's wrong, then camel
                           will free it */
-                       g_hash_table_insert (priv->password_hash, g_strdup (key), g_strdup(pwd));
+                       g_hash_table_insert (priv->password_hash, g_strdup (server_account_name), g_strdup(pwd));
                } else {
-                       g_hash_table_remove (priv->password_hash, key);
+                       g_hash_table_remove (priv->password_hash, server_account_name);
                        
                        g_free (pwd);
                        pwd = NULL;
@@ -364,26 +712,56 @@ get_password (TnyAccount *account, const gchar *prompt, gboolean *cancel)
                g_free (username);
                username = NULL;
        } else
-               *cancel = FALSE;
-    /* printf("  DEBUG: %s: returning %s\n", __FUNCTION__, pwd); */
-       
+               if (cancel)
+                       *cancel = FALSE;        
        return pwd;
 }
 
+void 
+modest_tny_account_store_forget_already_asked (ModestTnyAccountStore *self, TnyAccount *account)
+{
+       g_return_if_fail (account);
+         
+       ModestTnyAccountStorePrivate *priv;
+       gchar *pwd = NULL;
+       gpointer pwd_ptr = NULL;
+       gboolean already_asked = FALSE;
+               
+       const gchar *server_account_name = tny_account_get_id (account);
+
+       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+       
+       /* This hash map stores passwords, including passwords that are not stored in gconf. */
+       pwd_ptr = (gpointer)&pwd; /* pwd_ptr so the compiler does not complained about
+                                  * type-punned ptrs...*/
+       already_asked = priv->password_hash && 
+                               g_hash_table_lookup_extended (priv->password_hash,
+                                                     server_account_name,
+                                                     NULL,
+                                                     (gpointer*)&pwd_ptr);
+
+       if (already_asked) {
+               g_hash_table_remove (priv->password_hash, server_account_name);         
+               g_free (pwd);
+               pwd = NULL;
+       }
+
+       return;
+}
+
 /* tinymail calls this if the connection failed due to an incorrect password.
  * And it seems to call this for any general connection failure. */
 static void
 forget_password (TnyAccount *account)
 {
-       printf ("DEBUG: %s\n", __FUNCTION__);
        ModestTnyAccountStore *self;
        ModestTnyAccountStorePrivate *priv;
        const TnyAccountStore *account_store;
        gchar *pwd;
        const gchar *key;
        
-        account_store = TNY_ACCOUNT_STORE(get_account_store_for_account (account));
+        account_store = TNY_ACCOUNT_STORE(g_object_get_data (G_OBJECT(account),
+                                                            "account_store"));
        self = MODEST_TNY_ACCOUNT_STORE (account_store);
         priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
        key  = tny_account_get_id (account);
@@ -397,18 +775,17 @@ forget_password (TnyAccount *account)
        }
 
        /* Remove from configuration system */
+       /*
        modest_account_mgr_unset (priv->account_mgr,
                                  key, MODEST_ACCOUNT_PASSWORD, TRUE);
+       */
 }
 
-
 static void
 modest_tny_account_store_finalize (GObject *obj)
 {
        ModestTnyAccountStore *self        = MODEST_TNY_ACCOUNT_STORE(obj);
        ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-       
-       //gboolean debug = modest_runtime_get_debug_flags() & MODEST_RUNTIME_DEBUG_DEBUG_OBJECTS;
 
        g_free (priv->cache_dir);
        priv->cache_dir = NULL;
@@ -418,6 +795,14 @@ modest_tny_account_store_finalize (GObject *obj)
                priv->password_hash = NULL;
        }
 
+       if (priv->outbox_of_transport) {
+               g_hash_table_destroy (priv->outbox_of_transport);
+               priv->outbox_of_transport = NULL;
+       }
+
+       modest_signal_mgr_disconnect_all_and_destroy (priv->sighandlers);
+       priv->sighandlers = NULL;       
+
        if (priv->account_mgr) {
                g_object_unref (G_OBJECT(priv->account_mgr));
                priv->account_mgr = NULL;
@@ -428,29 +813,95 @@ modest_tny_account_store_finalize (GObject *obj)
                priv->device = NULL;
        }
 
-       /* this includes the local folder */
-       account_list_free (priv->store_accounts);
-       priv->store_accounts = NULL;
+       /* Destroy all accounts. Disconnect all accounts before they are destroyed */
+       if (priv->store_accounts) {
+               tny_list_foreach (priv->store_accounts, (GFunc)account_verify_last_ref, "store");
+               g_object_unref (priv->store_accounts);
+               priv->store_accounts = NULL;
+       }
        
-       account_list_free (priv->transport_accounts);
-       priv->transport_accounts = NULL;
+       if (priv->transport_accounts) {
+               tny_list_foreach (priv->transport_accounts, (GFunc)account_verify_last_ref, "transport");
+               g_object_unref (priv->transport_accounts);
+               priv->transport_accounts = NULL;
+       }
 
+       if (priv->store_accounts_outboxes) {
+               g_object_unref (priv->store_accounts_outboxes);
+               priv->store_accounts_outboxes = NULL;
+       }
+               
        if (priv->session) {
                camel_object_unref (CAMEL_OBJECT(priv->session));
                priv->session = NULL;
        }
-       
+
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
+gboolean 
+volume_path_is_mounted (const gchar* path)
+{
+       g_return_val_if_fail (path, FALSE);
+
+       gboolean result = FALSE;
+       gchar * path_as_uri = g_filename_to_uri (path, NULL, NULL);
+       g_return_val_if_fail (path_as_uri, FALSE);
+
+       /* Get the monitor singleton: */
+       GnomeVFSVolumeMonitor *monitor = gnome_vfs_get_volume_monitor();
+
+       /* This seems like a simpler way to do this, but it returns a   
+        * GnomeVFSVolume even if the drive is not mounted: */
+       /*
+       GnomeVFSVolume *volume = gnome_vfs_volume_monitor_get_volume_for_path (monitor, 
+                                g_getenv (MODEST_MMC1_VOLUMEPATH_ENV));
+       if (volume) {
+               gnome_vfs_volume_unref(volume);
+       }
+       */
+
+       /* Get the mounted volumes from the monitor: */
+       GList *list = gnome_vfs_volume_monitor_get_mounted_volumes (monitor);
+       GList *iter = list;
+       for (iter = list; iter; iter = g_list_next (iter)) {
+               GnomeVFSVolume *volume = (GnomeVFSVolume*)iter->data;
+               if (volume) {
+                       /*
+                       char *display_name = 
+                               gnome_vfs_volume_get_display_name (volume);
+                       printf ("volume display name=%s\n", display_name);
+                       g_free (display_name);
+                       */
+                       
+                       char *uri = 
+                               gnome_vfs_volume_get_activation_uri (volume);
+                       /* printf ("  uri=%s\n", uri); */
+                       if (uri && (strcmp (uri, path_as_uri) == 0))
+                               result = TRUE;
+
+                       g_free (uri);
 
-ModestTnyAccountStore*
-modest_tny_account_store_new (ModestAccountMgr *account_mgr, TnyDevice *device) {
+                       gnome_vfs_volume_unref (volume);
+               }
+       }
+
+       g_list_free (list);
+
+       g_free (path_as_uri);
+
+       return result;
+}
 
+ModestTnyAccountStore*
+modest_tny_account_store_new (ModestAccountMgr *account_mgr, 
+                             TnyDevice *device) 
+{
        GObject *obj;
        ModestTnyAccountStorePrivate *priv;
-       TnyList *list; 
-       
+       TnyAccount *local_account = NULL;
+       TnyLockable *lockable;  
+
        g_return_val_if_fail (account_mgr, NULL);
        g_return_val_if_fail (device, NULL);
 
@@ -461,432 +912,228 @@ modest_tny_account_store_new (ModestAccountMgr *account_mgr, TnyDevice *device)
        priv->device = g_object_ref (device);
        
        priv->session = tny_session_camel_new (TNY_ACCOUNT_STORE(obj));
+       if (!priv->session) {
+               g_warning ("failed to get TnySessionCamel");
+               return NULL;
+       }
+
+       /* Set the ui locker */
+       lockable = tny_gtk_lockable_new ();
+       tny_session_camel_set_ui_locker (priv->session, lockable);
+       g_object_unref (lockable);
        
-       tny_session_camel_set_ui_locker (priv->session,  tny_gtk_lockable_new ());
-       /* FIXME: unref this in the end? */
-       tny_session_camel_set_async_connecting (priv->session, TRUE);
+       /* Connect signals */
+       priv->sighandlers  =  modest_signal_mgr_connect (priv->sighandlers,
+                                                        G_OBJECT(account_mgr), "account_inserted",
+                                                        G_CALLBACK (on_account_inserted), obj);
+       priv->sighandlers  =  modest_signal_mgr_connect (priv->sighandlers,
+                                                        G_OBJECT(account_mgr), "account_changed",
+                                                        G_CALLBACK (on_account_changed), obj);
+       priv->sighandlers  =  modest_signal_mgr_connect (priv->sighandlers,
+                                                        G_OBJECT(account_mgr), "account_removed",
+                                                        G_CALLBACK (on_account_removed), obj);
+
+       /* Create the lists of accounts */
+       priv->store_accounts = tny_simple_list_new ();
+       priv->transport_accounts = tny_simple_list_new ();
+       priv->store_accounts_outboxes = tny_simple_list_new ();
+
+       /* Create the local folders account */
+       local_account = 
+               modest_tny_account_new_for_local_folders (priv->account_mgr, priv->session, NULL);
+       tny_list_append (priv->store_accounts, G_OBJECT(local_account));
+       g_object_unref (local_account); 
+
+       /* Add the other remote accounts. Do this after adding the
+          local account, because we need to add our outboxes to the
+          global OUTBOX hosted in the local account */
+       add_existing_accounts (MODEST_TNY_ACCOUNT_STORE (obj));
        
-       /* force a cache fill... ugly */
-       list = TNY_LIST(tny_simple_list_new());
-       tny_account_store_get_accounts (TNY_ACCOUNT_STORE(obj), list,
-                                       TNY_ACCOUNT_STORE_BOTH);
-       g_object_unref(list);
+       /* Add connection-specific transport accounts if there are any
+          accounts available */
+       if (!only_local_accounts (MODEST_TNY_ACCOUNT_STORE(obj)))
+               add_connection_specific_transport_accounts (MODEST_TNY_ACCOUNT_STORE(obj));
+       
+       /* This is a singleton, so it does not need to be unrefed. */
+       if (volume_path_is_mounted (g_getenv (MODEST_MMC1_VOLUMEPATH_ENV))) {
+               /* It is mounted: */
+               add_mmc_account (MODEST_TNY_ACCOUNT_STORE (obj), FALSE /* don't emit the insert signal. */); 
+       }
        
-       /* Connect signals */
-       g_signal_connect (G_OBJECT(account_mgr), "account_changed",
-                                      G_CALLBACK (on_account_changed), obj);
-       g_signal_connect (G_OBJECT(account_mgr), "account_removed",
-                                      G_CALLBACK (on_account_removed), obj);
-
        return MODEST_TNY_ACCOUNT_STORE(obj);
 }
 
-/** Fill the TnyList from the appropriate cached GSList of accounts. */
 static void
-get_cached_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type)
+modest_tny_account_store_get_accounts  (TnyAccountStore *self, 
+                                       TnyList *list,
+                                       TnyGetAccountsRequestType request_type)
 {
        ModestTnyAccountStorePrivate *priv;
-       GSList                       *accounts, *cursor;
        
-       priv     = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-       accounts = (type == TNY_ACCOUNT_TYPE_STORE ? priv->store_accounts : priv->transport_accounts);
-
-       cursor = accounts;
-       while (cursor) {
-               tny_list_prepend (list, G_OBJECT(cursor->data));
-               cursor = cursor->next;
+       g_return_if_fail (self);
+       g_return_if_fail (TNY_IS_LIST(list));
+       
+       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+       
+       switch (request_type) {
+       case TNY_ACCOUNT_STORE_BOTH:
+               tny_list_foreach (priv->store_accounts, foreach_account_append_to_list, list);
+               tny_list_foreach (priv->transport_accounts, foreach_account_append_to_list, list);
+               break;
+       case TNY_ACCOUNT_STORE_STORE_ACCOUNTS:
+               tny_list_foreach (priv->store_accounts, foreach_account_append_to_list, list);
+               break;
+       case TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS:
+               tny_list_foreach (priv->transport_accounts, foreach_account_append_to_list, list);
+               break;
+       default:
+               g_return_if_reached ();
        }
+
+       /* Initialize session. Why do we need this ??? */
+       tny_session_camel_set_initialized (priv->session);
 }
 
-static void
-create_per_account_local_outbox_folders (TnyAccountStore *self)
+
+static const gchar*
+modest_tny_account_store_get_cache_dir (TnyAccountStore *self)
 {
-       g_return_if_fail (self);
-       
-       ModestTnyAccountStorePrivate *priv = 
-               MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-       
-       /* printf("DEBUG: %s: priv->store_accounts_outboxes = %p\n", __FUNCTION__, priv->store_accounts_outboxes); */
-       
-       GSList *accounts = NULL;
-       
-       GSList *account_names  = modest_account_mgr_account_names (priv->account_mgr, 
-               TRUE /* including disabled accounts */);
-       
-       GSList *iter = NULL;
-       for (iter = account_names; iter; iter = g_slist_next (iter)) {
-               
-               const gchar* account_name = (const gchar*)iter->data;
-               
-               /* Create a per-account local outbox folder (a _store_ account) 
-                * for each _transport_ account: */
-               TnyAccount *tny_account_outbox =
-                       modest_tny_account_new_for_per_account_local_outbox_folder (
-                               priv->account_mgr, account_name, priv->session);
-                               
-               accounts = g_slist_append (accounts, tny_account_outbox); /* cache it */
-       };
-       
-       g_slist_free (account_names);
+       ModestTnyAccountStorePrivate *priv;
+       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
        
-       priv->store_accounts_outboxes = accounts;
+       if (!priv->cache_dir)
+               priv->cache_dir = g_build_filename (g_get_home_dir(), 
+                                                   MODEST_DIR, MODEST_CACHE_DIR, NULL);
+       return priv->cache_dir;
 }
 
-/* This function fills the TnyList, and also stores a GSList of the accounts,
- * for caching purposes. It creates the TnyAccount objects if necessary.
- * The @list parameter may be NULL, if you just want to fill the cache.
+
+/*
+ * callers need to unref
  */
-static void
-get_server_accounts  (TnyAccountStore *self, TnyList *list, TnyAccountType type)
+static TnyDevice*
+modest_tny_account_store_get_device (TnyAccountStore *self)
 {
-       g_return_if_fail (self);
+       ModestTnyAccountStorePrivate *priv;
+
+       g_return_val_if_fail (self, NULL);
        
-       /* printf ("DEBUG: %s: list=%p, type=%d\n", __FUNCTION__, list, type); */
-               
-       ModestTnyAccountStorePrivate *priv = 
-               MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-               
-       /* Do nothing if the accounts are already cached: */
-       if (type == TNY_ACCOUNT_TYPE_STORE) {
-               if (priv->store_accounts)
-                       return;
-       } else if (type == TNY_ACCOUNT_TYPE_TRANSPORT) {
-               if (priv->transport_accounts)
-                       return;
-       }
+       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
        
-       GSList                       *account_names = NULL, *cursor = NULL;
-       GSList                       *accounts = NULL;
-
-       /* These are account names, not server_account names */
-       account_names = modest_account_mgr_account_names (priv->account_mgr,FALSE);
-               
-       for (cursor = account_names; cursor; cursor = cursor->next) {
-               
-               gchar *account_name = (gchar*)cursor->data;
-               
-               /* we get the server_accounts for enabled accounts */
-               if (modest_account_mgr_get_enabled(priv->account_mgr, account_name)) {
-                               
-                       /* Add the account: */
-                       TnyAccount *tny_account = 
-                               modest_tny_account_new_from_account (priv->account_mgr,
-                                                                    account_name,
-                                                                    type, priv->session,
-                                                                    get_password,
-                                                                    forget_password);
-                       if (tny_account) {
-                               g_object_set_data (G_OBJECT(tny_account), "account_store",
-                                                  (gpointer)self);
-                               if (list)
-                                       tny_list_prepend (list, G_OBJECT(tny_account));
-                               
-                               accounts = g_slist_append (accounts, tny_account); /* cache it */               
-                       } else
-                               g_printerr ("modest: failed to create account for %s\n",
-                                           account_name);
-                       }
-       }
-       
-       if (type == TNY_ACCOUNT_TYPE_STORE) {
-               /* Also add the local folder pseudo-account: */
-               TnyAccount *tny_account =
-                       modest_tny_account_new_for_local_folders (priv->account_mgr, priv->session);
-               if (list)
-                       tny_list_prepend (list, G_OBJECT(tny_account));
-               accounts = g_slist_append (accounts, tny_account); /* cache it */
-       }
-
-       /* And add the connection-specific transport accounts, if any.
-        * Note that these server account instances might never be used 
-        * if their connections are never active: */
-       /* Look at each modest account: */
-       if (type == TNY_ACCOUNT_TYPE_TRANSPORT) {
-               GSList *iter_account_names = account_names;
-               while (iter_account_names) {
-                       const gchar* account_name = (const gchar*)(iter_account_names->data);
-                       GSList *list_specifics = modest_account_mgr_get_list (priv->account_mgr,
-                               account_name, 
-                               MODEST_ACCOUNT_CONNECTION_SPECIFIC_SMTP_LIST,
-                               MODEST_CONF_VALUE_STRING, FALSE);
-                               
-                       /* Look at each connection-specific transport account for the 
-                        * modest account: */
-                       GSList *iter = list_specifics;
-                       while (iter) {
-                               /* const gchar* this_connection_name = (const gchar*)(iter->data); */
-                               iter = g_slist_next (iter);
-                               if (iter) {
-                                       const gchar* transport_account_name = (const gchar*)(iter->data);
-                                       if (transport_account_name) {
-                                               TnyAccount * tny_account = NULL;
-                                               /* Add the account: */
-                                               tny_account = modest_tny_account_new_from_server_account_name (
-                                                       priv->account_mgr, transport_account_name);
-                                               if (tny_account) {
-                                                       g_object_set_data (G_OBJECT(tny_account), "account_store",
-                                                                          (gpointer)self);
-                                                       if (list)
-                                                               tny_list_prepend (list, G_OBJECT(tny_account));
-                                                       
-                                                       accounts = g_slist_append (accounts, tny_account); /* cache it */               
-                                               } else
-                                                       g_printerr ("modest: failed to create smtp-specific account for %s\n",
-                                                                   transport_account_name);
-                                       }
-                               }
-                               
-                               iter = g_slist_next (iter);
-                       }
-                       
-                       iter_account_names = g_slist_next (iter_account_names);
-               }               
-       }
-       
-       g_slist_free (account_names);
-       account_names = NULL;
-       
-       /* TODO: Delete the strings in the GSList */
-       
-       
-       /* We also create a per-account local outbox folder (a _store_ account) 
-        * for each _transport_ account. */
-       if (type == TNY_ACCOUNT_TYPE_TRANSPORT) {
-               /* Now would be a good time to create the per-account local outbox folder 
-                * _store_ accounts corresponding to each transport account: */
-               if (!priv->store_accounts_outboxes) {
-                       create_per_account_local_outbox_folders (self);
-               }
-       }
-       
-       /* But we only return the per-account local outbox folder when 
-        * _store_ accounts are requested. */
-       if (type == TNY_ACCOUNT_TYPE_STORE) {
-               /* Create them if necessary, 
-                * (which also requires creating the transport accounts, 
-                * if necessary.) */
-               if (!priv->store_accounts_outboxes) {
-                       create_per_account_local_outbox_folders (self);
-               }
-       
-               /* Add them to the TnyList: */
-               if (priv->store_accounts_outboxes) {
-                       GSList *iter = NULL;
-                       for (iter = priv->store_accounts_outboxes; iter; iter = g_slist_next (iter)) {
-                               TnyAccount *outbox_account = (TnyAccount*)iter->data;
-                               if (list && outbox_account)
-                                       tny_list_prepend (list,  G_OBJECT(outbox_account));
-                                       
-                               accounts = g_slist_append (accounts, outbox_account);
-                       }
-               }
-       }
-               
-       if (type == TNY_ACCOUNT_TYPE_STORE) {
-                       /* Store the cache: */
-                       priv->store_accounts = accounts;
-       } else if (type == TNY_ACCOUNT_TYPE_TRANSPORT) {
-                       /* Store the cache: */
-                       priv->transport_accounts = accounts;
-       }
-}      
-
-
-static void
-modest_tny_account_store_get_accounts  (TnyAccountStore *self, TnyList *list,
-                                       TnyGetAccountsRequestType request_type)
-{
-       ModestTnyAccountStorePrivate *priv;
-       
-       g_return_if_fail (self);
-       g_return_if_fail (TNY_IS_LIST(list));
-       
-       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-       
-       if (request_type == TNY_ACCOUNT_STORE_BOTH) {
-               modest_tny_account_store_get_accounts (self, list,
-                                                      TNY_ACCOUNT_STORE_STORE_ACCOUNTS);
-               modest_tny_account_store_get_accounts (self, list,
-                                                      TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS);
-               return;
-       }
-       
-       if (request_type == TNY_ACCOUNT_STORE_STORE_ACCOUNTS)  {
-               if (!priv->store_accounts)
-                       get_server_accounts (self, list, TNY_ACCOUNT_TYPE_STORE);
-               else
-                       get_cached_accounts (self, list, TNY_ACCOUNT_TYPE_STORE);
-               
-       } else if (request_type == TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS) {
-               if (!priv->transport_accounts)
-                       get_server_accounts (self, list, TNY_ACCOUNT_TYPE_TRANSPORT);
-               else
-                       get_cached_accounts (self, list, TNY_ACCOUNT_TYPE_TRANSPORT);
-       } else
-               g_return_if_reached (); /* incorrect req type */
-}
-
-
-static const gchar*
-modest_tny_account_store_get_cache_dir (TnyAccountStore *self)
-{
-       ModestTnyAccountStorePrivate *priv;
-       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-       
-       if (!priv->cache_dir)
-               priv->cache_dir = g_build_filename (g_get_home_dir(), 
-                                                   MODEST_DIR, MODEST_CACHE_DIR, NULL);
-       return priv->cache_dir;
-}
-
-
-/*
- * callers need to unref
- */
-static TnyDevice*
-modest_tny_account_store_get_device (TnyAccountStore *self)
-{
-       ModestTnyAccountStorePrivate *priv;
-
-       g_return_val_if_fail (self, NULL);
-       
-       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-
-       if (priv->device)
-               return g_object_ref (G_OBJECT(priv->device));
-       else
-               return NULL;
-}
+       if (priv->device) 
+               return g_object_ref (G_OBJECT(priv->device));
+       else
+               return NULL;
+}
 
 
 static TnyAccount*
 modest_tny_account_store_find_account_by_url (TnyAccountStore *self, const gchar* url_string)
 {
-       TnyAccount *account = NULL;
-       ModestTnyAccountStorePrivate *priv;     
-       GSList *cursor;
-       
-       g_return_val_if_fail (self, NULL);
-       g_return_val_if_fail (url_string, NULL);
-       
-       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-
-       for (cursor = priv->store_accounts; cursor ; cursor = cursor->next) {
-               if (tny_account_matches_url_string (TNY_ACCOUNT(cursor->data), url_string)) {
-                       account = TNY_ACCOUNT(cursor->data);
-                       break;
-               }
-       }
-
-       if (!account) {
-               for (cursor = priv->transport_accounts; !account && cursor ; cursor = cursor->next) {
-                       if (tny_account_matches_url_string (TNY_ACCOUNT(cursor->data), url_string)) {
-                               account = TNY_ACCOUNT(cursor->data);
-                               break;
-                       }
-               }
-       }
-
-       if (account)
-               g_object_ref (G_OBJECT(account));
-
-       return account;
+       return modest_tny_account_store_get_tny_account_by (MODEST_TNY_ACCOUNT_STORE (self), 
+                                                           MODEST_TNY_ACCOUNT_STORE_QUERY_URL,
+                                                           url_string);
 }
 
 
 
 static gboolean
-modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type,
-                               gboolean question, const GError *error)
+modest_tny_account_store_alert (TnyAccountStore *self, 
+                               TnyAccount *account, 
+                               TnyAlertType type,
+                               gboolean question, 
+                               GError *error)
 {
-       g_return_val_if_fail (error, FALSE);
+       ModestProtocolType protocol_type = MODEST_PROTOCOL_REGISTRY_TYPE_INVALID;
+       ModestProtocol *protocol = NULL;
+       const gchar* server_name = "";
+       gchar *prompt = NULL;
+       gboolean retval = TRUE;
 
-       if ((error->domain != TNY_ACCOUNT_ERROR) 
-               && (error->domain != TNY_ACCOUNT_STORE_ERROR)) {
-               g_warning("%s: Unexpected error domain: != TNY_ACCOUNT_ERROR: %d, message=%s", 
-                       __FUNCTION__, error->domain, error->message); 
-               return FALSE;
-       }
-       
-       /* printf("DEBUG: %s: error->message=%s\n", __FUNCTION__, error->message); */
+       /* NOTE: account may be NULL in some cases */
+       g_return_val_if_fail (error, FALSE);
        
+       /* Get the server name: */
+       if (account) {
+               server_name = tny_account_get_hostname (account);
+               protocol_type = modest_tny_account_get_protocol_type (account);
+               if (protocol_type == MODEST_PROTOCOL_REGISTRY_TYPE_INVALID){
+                       g_warning("modest: %s: account with id=%s has no proto.\n", __FUNCTION__, 
+                                 tny_account_get_id (account));
+                       return FALSE;
+               }
+               protocol = modest_protocol_registry_get_protocol_by_type (modest_runtime_get_protocol_registry (),
+                                                                         protocol_type);
+       }
 
-       /* const gchar *prompt = NULL; */
-       gchar *prompt = NULL;
        switch (error->code) {
-               case TNY_ACCOUNT_ERROR_TRY_CONNECT:
-               /* The tinymail camel implementation just sends us this for almost 
-                * everything, so we have to guess at the cause.
-                * It could be a wrong password, or inability to resolve a hostname, 
-                * or lack of network, or something entirely different: */
-               case TNY_ACCOUNT_STORE_ERROR_UNKNOWN_ALERT: 
-                   g_debug ("%s: Handling GError domain=%d, code=%d, message=%s", 
-                               __FUNCTION__, error->domain, error->code, error->message);
+       case TNY_SYSTEM_ERROR_CANCEL:
+               /* Don't show waste the user's time by showing him a dialog telling 
+                * him that he has just cancelled something: */
+               return TRUE;
+
+       case TNY_SERVICE_ERROR_PROTOCOL:
+               /* Like a BAD from IMAP (protocol error) */
+       case TNY_SERVICE_ERROR_LOST_CONNECTION:
+               /* Lost the connection with the service */
+       case TNY_SERVICE_ERROR_UNAVAILABLE:
+               /* You must be working online for this operation */
+       case TNY_SERVICE_ERROR_CONNECT:
+               if (protocol) {
+                       prompt = modest_protocol_get_translation (protocol, MODEST_PROTOCOL_TRANSLATION_CONNECT_ERROR, server_name);
+               }
+               if (!prompt) {
+                       g_return_val_if_reached (FALSE);
+               }
+               break;
+               
+       case TNY_SERVICE_ERROR_AUTHENTICATE:
+               /* It seems that there's no better error to show with
+                * POP and IMAP because TNY_SERVICE_ERROR_AUTHENTICATE
+                * may appear if there's a timeout during auth */
+               if (protocol) {
+                       prompt = modest_protocol_get_translation (protocol, MODEST_PROTOCOL_TRANSLATION_AUTH_ERROR, server_name);
+               }
+               if (!prompt) {
+                       g_return_val_if_reached (FALSE);
+               }
+               break;
                        
-                       /* TODO: Remove the internal error message for the real release.
-                        * This is just so the testers can give us more information: */
-                       /* prompt = _("Modest account not yet fully configured."); */
-                       prompt = g_strdup_printf(_("Modest account not yet fully configured. Error=%s"), 
-                               error->message);
-                       break;
-               default:
-                       g_warning ("%s: Unhandled GError code: %d, message=%s", 
-                               __FUNCTION__, error->code, error->message);
-                       prompt = NULL;
+       case TNY_SERVICE_ERROR_CERTIFICATE:
+               /* We'll show the proper dialog later */
                break;
-       }
-       
-       if (!prompt)
-               return FALSE;
 
-#ifdef MODEST_PLATFORM_MAEMO
-       /* The Tinymail documentation says that we should show Yes and No buttons, 
-        * when it is a question.
-        * Obviously, we need tinymail to use more specific error codes instead,
-        * so we know what buttons to show. */
-        GtkWidget *dialog = NULL;
-        if (question) {
-               dialog = GTK_WIDGET (hildon_note_new_confirmation (NULL, 
-                       prompt));
-        } else {
-               dialog = GTK_WIDGET (hildon_note_new_information (NULL, 
-                       prompt));
-        }
-#else
+       case TNY_SYSTEM_ERROR_MEMORY:
+               /* Can't allocate memory for this operation */
 
-       GtkMessageType gtktype = GTK_MESSAGE_ERROR;
-       switch (type)
-       {
-               case TNY_ALERT_TYPE_INFO:
-               gtktype = GTK_MESSAGE_INFO;
-               break;
-               case TNY_ALERT_TYPE_WARNING:
-               gtktype = GTK_MESSAGE_WARNING;
-               break;
-               case TNY_ALERT_TYPE_ERROR:
-               default:
-               gtktype = GTK_MESSAGE_ERROR;
-               break;
+       case TNY_SERVICE_ERROR_UNKNOWN: 
+               return FALSE;                   
+       default:
+               g_debug ("Unexpected error %d", error->code);
+               g_return_val_if_reached (FALSE);
        }
        
-       GtkWidget *dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
-               gtktype, GTK_BUTTONS_YES_NO, prompt);
-#endif /* #ifdef MODEST_PLATFORM_MAEMO */
 
-       gboolean retval = TRUE;
-       const int response = gtk_dialog_run (GTK_DIALOG (dialog));
-       if (question) {
-               retval = (response == GTK_RESPONSE_YES) ||
-                                (response == GTK_RESPONSE_OK); 
-       }
+       if (error->code == TNY_SERVICE_ERROR_CERTIFICATE)
+               retval = modest_platform_run_certificate_confirmation_dialog (server_name,
+                                                                             error->message);
+       else if (error->code == TNY_SERVICE_ERROR_AUTHENTICATE ||
+                error->code == TNY_SERVICE_ERROR_CONNECT) {
 
-       gtk_widget_destroy (dialog);
-       
-       /* TODO: Don't free this when we no longer strdup the message for testers. */
-       g_free (prompt);
+               modest_platform_run_information_dialog (NULL, prompt, TRUE);
+
+               /* Show the account dialog if it was wrong */
+               if (error->code == TNY_SERVICE_ERROR_AUTHENTICATE)
+                       show_wrong_password_dialog (account);
 
+               retval = TRUE;
+       }
 
-       /* printf("DEBUG: %s: returning %d\n", __FUNCTION__, retval); */
+       g_debug ("%s: error code %d (%s", __FUNCTION__, error->code, error->message);
+       
+       if (prompt)
+               g_free (prompt);
+       
        return retval;
 }
 
@@ -900,15 +1147,15 @@ modest_tny_account_store_init (gpointer g, gpointer iface_data)
 
        klass = (TnyAccountStoreIface *)g;
 
-       klass->get_accounts_func =
+       klass->get_accounts =
                modest_tny_account_store_get_accounts;
-       klass->get_cache_dir_func =
+       klass->get_cache_dir =
                modest_tny_account_store_get_cache_dir;
-       klass->get_device_func =
+       klass->get_device =
                modest_tny_account_store_get_device;
-       klass->alert_func =
+       klass->alert =
                modest_tny_account_store_alert;
-       klass->find_account_func =
+       klass->find_account =
                modest_tny_account_store_find_account_by_url;
 }
 
@@ -927,106 +1174,184 @@ modest_tny_account_store_get_session  (TnyAccountStore *self)
        return MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self)->session;
 }
 
+static TnyAccount*
+get_tny_account_by (TnyList *accounts,
+                   ModestTnyAccountStoreQueryType type,
+                   const gchar *str)
+{
+       TnyIterator *iter = NULL;
+       gboolean found = FALSE;
+       TnyAccount *retval = NULL;
+
+       g_return_val_if_fail (TNY_IS_LIST(accounts), NULL);
+
+       if (tny_list_get_length(accounts) == 0) {
+               g_warning ("%s: account list is empty", __FUNCTION__);
+               return NULL;
+       }
+       
+       iter = tny_list_create_iterator (accounts);
+       while (!tny_iterator_is_done (iter) && !found) {
+               TnyAccount *tmp_account = NULL;
+               const gchar *val = NULL;
+
+               tmp_account = TNY_ACCOUNT (tny_iterator_get_current (iter));
+               if (!TNY_IS_ACCOUNT(tmp_account)) {
+                       g_warning ("%s: not a valid account", __FUNCTION__);
+                       tmp_account = NULL;
+                       break;
+               }
+
+               switch (type) {
+               case MODEST_TNY_ACCOUNT_STORE_QUERY_ID:
+                       val = tny_account_get_id (tmp_account);
+                       break;
+               case MODEST_TNY_ACCOUNT_STORE_QUERY_URL:
+                       val = tny_account_get_url_string (tmp_account);
+                       break;
+               }
+               
+               if (type == MODEST_TNY_ACCOUNT_STORE_QUERY_URL && 
+                   tny_account_matches_url_string (tmp_account, str)) {
+                       retval = g_object_ref (tmp_account);
+                       found = TRUE;
+               } else {
+                       if (val && str && strcmp (val, str) == 0) {
+                               retval = g_object_ref (tmp_account);
+                               found = TRUE;
+                       }
+               }
+               g_object_unref (tmp_account);
+               tny_iterator_next (iter);
+       }
+       g_object_unref (iter);
+
+       return retval;
+}
 
 TnyAccount*
-modest_tny_account_store_get_tny_account_by_id  (ModestTnyAccountStore *self, const gchar *id)
+modest_tny_account_store_get_tny_account_by (ModestTnyAccountStore *self, 
+                                            ModestTnyAccountStoreQueryType type,
+                                            const gchar *str)
 {
        TnyAccount *account = NULL;
        ModestTnyAccountStorePrivate *priv;     
-       GSList *cursor;
-
+       
        g_return_val_if_fail (self, NULL);
-       g_return_val_if_fail (id, NULL);
+       g_return_val_if_fail (str, NULL);
        
        priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+       
+       /* Search in store accounts */
+       account = get_tny_account_by (priv->store_accounts, type, str);
 
+       /* If we already found something, no need to search the transport accounts */
+       if (!account) {
+               account = get_tny_account_by (priv->transport_accounts, type, str);
 
-       for (cursor = priv->store_accounts; cursor ; cursor = cursor->next) {
-               const gchar *acc_id = tny_account_get_id (TNY_ACCOUNT(cursor->data));
-               if (acc_id && strcmp (acc_id, id) == 0) {
-                       account = TNY_ACCOUNT(cursor->data);
-                       break;
-               }
+               /* If we already found something, no need to search the
+                  per-account outbox accounts */
+               if (!account)
+                       account = get_tny_account_by (priv->store_accounts_outboxes, type, str);
        }
-               
-       /* if we already found something, no need to search the transport accounts */
-       for (cursor = priv->transport_accounts; !account && cursor ; cursor = cursor->next) {
-               const gchar *acc_id = tny_account_get_id (TNY_ACCOUNT(cursor->data));
-               if (acc_id && strcmp (acc_id, id) == 0) {
-                       account = TNY_ACCOUNT(cursor->data);
-                       break;
-               }
+
+       /* Warn if nothing was found. This is generally unusual. */
+       if (!account) {
+               g_warning("%s: Failed to find account with %s=%s\n", 
+                         __FUNCTION__, 
+                         (type == MODEST_TNY_ACCOUNT_STORE_QUERY_ID) ? "ID" : "URL",                     
+                         str);
        }
 
-       if (account)
-               g_object_ref (G_OBJECT(account));
-       
+       /* Returns a new reference to the account if found */   
        return account;
 }
 
+
 TnyAccount*
-modest_tny_account_store_get_tny_account_by_account (ModestTnyAccountStore *self,
-                                                    const gchar *account_name,
-                                                    TnyAccountType type)
+modest_tny_account_store_get_server_account (ModestTnyAccountStore *self,
+                                            const gchar *account_name,
+                                            TnyAccountType type)
 {
-       TnyAccount *account = NULL;
-       gchar *id = NULL;
-       ModestTnyAccountStorePrivate *priv;     
+       ModestTnyAccountStorePrivate *priv = NULL;
+       TnyAccount *retval = NULL;
+       TnyList *account_list = NULL;
+       TnyIterator *iter = NULL;
+       gboolean found;
 
        g_return_val_if_fail (self, NULL);
        g_return_val_if_fail (account_name, NULL);
-       g_return_val_if_fail (type == TNY_ACCOUNT_TYPE_STORE || type == TNY_ACCOUNT_TYPE_TRANSPORT,
+       g_return_val_if_fail (type == TNY_ACCOUNT_TYPE_STORE || 
+                             type == TNY_ACCOUNT_TYPE_TRANSPORT,
                              NULL);
        
        priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
 
-       /* Special case for the local account */
-       if (!strcmp (account_name, MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID) && 
-           type == TNY_ACCOUNT_TYPE_STORE) {
-               id = g_strdup (MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID);
-       } else {
-               ModestAccountData *account_data;
+       account_list = (type == TNY_ACCOUNT_TYPE_STORE) ? 
+               priv->store_accounts : 
+               priv->transport_accounts;
 
-               account_data = modest_account_mgr_get_account_data (priv->account_mgr, account_name);
-               if (!account_data) {
-                       g_printerr ("modest: %s: cannot get account data for account '%s'\n", __FUNCTION__, account_name);
-                       return NULL;
+       if (!account_list) {
+               g_printerr ("%s: No server accounts of type %s\n", __FUNCTION__, 
+                       (type == TNY_ACCOUNT_TYPE_STORE) ? "store" : "transport");
+               return NULL;
+       }
+       
+       /* Look for the server account */
+       found = FALSE;
+       iter = tny_list_create_iterator (account_list);
+       while (!tny_iterator_is_done (iter) && !found) {
+               const gchar *modest_acc_name;
+               TnyAccount *tmp_account;
+
+               tmp_account = TNY_ACCOUNT (tny_iterator_get_current (iter));
+               modest_acc_name = 
+                       modest_tny_account_get_parent_modest_account_name_for_server_account (tmp_account);
+               
+               if (account_name && modest_acc_name && !strcmp (account_name, modest_acc_name)) {
+                       found = TRUE;
+                       retval = g_object_ref (tmp_account);
                }
-
-               if (type == TNY_ACCOUNT_TYPE_STORE && account_data->store_account)
-                       id = g_strdup (account_data->store_account->account_name);
-               else if (account_data->transport_account)
-                       id = g_strdup (account_data->transport_account->account_name);
-
-               modest_account_mgr_free_account_data (priv->account_mgr, account_data);
+               /* Free and continue */
+               g_object_unref (tmp_account);
+               tny_iterator_next (iter);
        }
+       g_object_unref (iter);
 
-       if (!id)
-               g_printerr ("modest: could not get an id for account %s\n",
-                           account_name);
-       else    
-               account = modest_tny_account_store_get_tny_account_by_id (self, id);
-
-       if (!account)
-               g_printerr ("modest: could not get tny %s account for %s (id=%s)\n",
-                           type == TNY_ACCOUNT_TYPE_STORE? "store" : "transport",
-                           account_name, id ? id : "<none>");
+       if (!found) {
+               g_printerr ("modest: %s: could not get tny %s account for %s\n." \
+                           "Number of server accounts of this type=%d\n", __FUNCTION__,
+                           (type == TNY_ACCOUNT_TYPE_STORE) ? "store" : "transport",
+                           account_name, tny_list_get_length (account_list));
+       }
 
-       return account; 
+       /* Returns a new reference */
+       return retval;
 }
 
-static TnyAccount*
-get_smtp_specific_transport_account_for_open_connection (ModestTnyAccountStore *self,
-                                                        const gchar *account_name)
+TnyAccount*
+modest_tny_account_store_get_smtp_specific_transport_account_for_open_connection (
+       ModestTnyAccountStore *self, const gchar *account_name)
 {
+       TnyDevice *device;
+
+       g_return_val_if_fail (self && MODEST_IS_TNY_ACCOUNT_STORE(self), NULL);
+       g_return_val_if_fail (account_name, NULL);
+
        /* Get the current connection: */
-       TnyDevice *device = modest_runtime_get_device ();
-       
+       device = modest_runtime_get_device ();
+
+       if (!device) {
+               g_warning ("%s: could not get device", __FUNCTION__);
+               return NULL;
+       }
+               
        if (!tny_device_is_online (device))
                return NULL;
-
-#ifdef MODEST_PLATFORM_MAEMO
-       g_assert (TNY_IS_MAEMO_CONIC_DEVICE (device));
+       
+#ifdef MODEST_HAVE_CONIC
+       g_return_val_if_fail (TNY_IS_MAEMO_CONIC_DEVICE (device), NULL);
+       
        TnyMaemoConicDevice *maemo_device = TNY_MAEMO_CONIC_DEVICE (device);    
        const gchar* iap_id = tny_maemo_conic_device_get_current_iap_id (maemo_device);
        /* printf ("DEBUG: %s: iap_id=%s\n", __FUNCTION__, iap_id); */
@@ -1037,33 +1362,41 @@ get_smtp_specific_transport_account_for_open_connection (ModestTnyAccountStore *
        if (!connection)
                return NULL;
                
-       const gchar *connection_name = con_ic_iap_get_name (connection);
-       /* printf ("DEBUG: %s: connection_name=%s\n", __FUNCTION__, connection_name); */
-       if (!connection_name)
+       const gchar *connection_id = con_ic_iap_get_id (connection);
+       /* printf ("DEBUG: %s: connection_id=%s\n", __FUNCTION__, connection_id); */
+       if (!connection_id)
                return NULL;
        
        /*  Get the connection-specific transport acccount, if any: */
        ModestAccountMgr *account_manager = modest_runtime_get_account_mgr ();
+
+       /* Check if this account has connection-specific SMTP enabled */
+       if (!modest_account_mgr_get_use_connection_specific_smtp (account_manager, account_name)) {
+               return NULL;
+       }
+
        gchar* server_account_name = modest_account_mgr_get_connection_specific_smtp (account_manager, 
-               account_name, connection_name);
+               connection_id);
 
        /* printf ("DEBUG: %s: server_account_name=%s\n", __FUNCTION__, server_account_name); */
        if (!server_account_name) {
                return NULL; /* No connection-specific SMTP server was specified for this connection. */
        }
-               
-       TnyAccount* account = modest_tny_account_store_get_tny_account_by_id (self, server_account_name);
+
+       TnyAccount* account = modest_tny_account_store_get_tny_account_by (self, 
+                                                                          MODEST_TNY_ACCOUNT_STORE_QUERY_ID, 
+                                                                          server_account_name);
 
        /* printf ("DEBUG: %s: account=%p\n", __FUNCTION__, account); */
-       g_free (server_account_name);   
+       g_free (server_account_name);
 
        /* Unref the get()ed object, as required by the tny_maemo_conic_device_get_iap() documentation. */
        g_object_unref (connection);
-       
+
        return account;
 #else
        return NULL; /* TODO: Implement this for GNOME, instead of just Maemo? */
-#endif /* MODEST_PLATFORM_MAEMO */
+#endif /* MODEST_HAVE_CONIC */
 }
 
                                                                 
@@ -1071,23 +1404,807 @@ TnyAccount*
 modest_tny_account_store_get_transport_account_for_open_connection (ModestTnyAccountStore *self,
                                                                    const gchar *account_name)
 {
+       g_return_val_if_fail (self, NULL);
+       g_return_val_if_fail (account_name, NULL);
+
+       if (!account_name || !self)
+               return NULL;
+       
        /*  Get the connection-specific transport acccount, if any: */
-       TnyAccount *account = get_smtp_specific_transport_account_for_open_connection (self, account_name);
+       /* Note: This gives us a reference: */
+       TnyAccount *account =
+               modest_tny_account_store_get_smtp_specific_transport_account_for_open_connection (self, account_name);
                        
        /* If there is no connection-specific transport account (the common case), 
         * just get the regular transport account: */
        if (!account) {
-               /* printf("DEBUG: %s: using regular transport account for account %s.\n", __FUNCTION__, account_name); */
-               account = modest_tny_account_store_get_tny_account_by_account (self, account_name, 
+               /* The special local folders don't have transport accounts. */
+               if (strcmp (account_name, MODEST_LOCAL_FOLDERS_ACCOUNT_ID) == 0)
+                       account = NULL;
+               else {
+                       /* Note: This gives us a reference: */
+                       account = modest_tny_account_store_get_server_account (self, account_name, 
                                                     TNY_ACCOUNT_TYPE_TRANSPORT);
+               }
+       }
+                       
+       /* returns a reference. */     
+       return account;
+}
+
+TnyAccount*
+modest_tny_account_store_get_local_folders_account (ModestTnyAccountStore *self)
+{
+       TnyAccount *account = NULL;
+       ModestTnyAccountStorePrivate *priv;
+       TnyIterator *iter;
+       gboolean found;
+
+       g_return_val_if_fail (MODEST_IS_TNY_ACCOUNT_STORE (self), NULL);
+       
+       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+       found = FALSE;
+       iter = tny_list_create_iterator (priv->store_accounts);
+       while (!tny_iterator_is_done (iter) && !found) {
+               TnyAccount *tmp_account;
+
+               tmp_account = TNY_ACCOUNT (tny_iterator_get_current (iter));
+               if (modest_tny_account_is_virtual_local_folders (tmp_account)) {
+                       account = g_object_ref (tmp_account);
+                       found = TRUE;
+               }
+               g_object_unref (tmp_account);
+               tny_iterator_next (iter);
+       }
+       g_object_unref (iter);
+
+       /* Returns a new reference to the account */
+       return account;
+}
+
+TnyAccount*
+modest_tny_account_store_get_mmc_folders_account (ModestTnyAccountStore *self)
+{
+       g_return_val_if_fail (MODEST_IS_TNY_ACCOUNT_STORE (self), NULL);
+       
+       /* New reference */
+       return modest_tny_account_store_get_tny_account_by (self, MODEST_TNY_ACCOUNT_STORE_QUERY_ID,
+                                                           MODEST_MMC_ACCOUNT_ID);
+
+}
+
+/*********************************************************************************/
+static void
+add_existing_accounts (ModestTnyAccountStore *self)
+{
+       GSList *account_names = NULL, *iter = NULL;
+       ModestTnyAccountStorePrivate *priv = NULL;
+       
+       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+       /* These are account names, not server_account names */
+       account_names = modest_account_mgr_account_names (priv->account_mgr, FALSE);
+
+       for (iter = account_names; iter != NULL; iter = g_slist_next (iter)) {
+               const gchar *account_name = (const gchar*) iter->data;
+               
+               /* Insert all enabled accounts without notifying */
+               if (modest_account_mgr_get_enabled (priv->account_mgr, account_name))
+                       insert_account (self, account_name, FALSE);
+       }
+       modest_account_mgr_free_account_names (account_names);
+}
+
+static TnyAccount*
+create_tny_account (ModestTnyAccountStore *self,
+                   const gchar *name,
+                   TnyAccountType type,
+                   gboolean notify)
+{
+       TnyAccount *account = NULL;
+       ModestTnyAccountStorePrivate *priv = NULL;
+
+       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+       account = modest_tny_account_new_from_account (priv->account_mgr,
+                                                      name, type, 
+                                                      priv->session,
+                                                      get_password,
+                                                      forget_password);
+
+       if (account) {
+               /* Forget any cached password for the account, so that
+                  we use a new account if any */
+               forget_password_in_memory (self, tny_account_get_id (account));
+
+               /* Set the account store */
+               g_object_set_data (G_OBJECT(account), "account_store", self);
+       } else {
+               g_printerr ("modest: failed to create account for %s\n", name);
        }
-                            
+
        return account;
 }
 
-gboolean modest_tny_folder_store_is_virtual_local_folders (TnyFolderStore *self)
+typedef struct _AddOutboxInfo {
+       ModestTnyAccountStore *account_store;
+       TnyAccount *transport_account;
+} AddOutboxInfo;
+
+static void
+add_outbox_from_transport_account_to_global_outbox_get_folders_cb (TnyFolderStore *folder_store,
+                                                                  gboolean cancelled,
+                                                                  TnyList *list,
+                                                                  GError *err,
+                                                                  gpointer userdata)
+{
+       TnyIterator *iter_folders;
+       TnyFolder *per_account_outbox;
+       TnyAccount *local_account = NULL;
+       AddOutboxInfo *info = (AddOutboxInfo *) userdata;
+       ModestTnyAccountStorePrivate *priv = NULL;
+       ModestTnyAccountStore *self;
+
+       self = MODEST_TNY_ACCOUNT_STORE (info->account_store);
+       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+       
+       /* Note that this could happen if there is not enough space
+          available on disk, then the outbox folder could not be
+          created */
+       if (tny_list_get_length (list) != 1) {
+               g_warning ("%s: could not create outbox folder (%d folders found)", __FUNCTION__,
+                          tny_list_get_length (list));
+               goto frees;
+       }
+                       
+       iter_folders = tny_list_create_iterator (list);
+       per_account_outbox = TNY_FOLDER (tny_iterator_get_current (iter_folders));
+       g_object_unref (iter_folders);
+       g_object_unref (list);
+
+       /* Add the outbox of the new per-account-local-outbox account
+          to the global local merged OUTBOX of the local folders
+          account */
+       local_account = modest_tny_account_store_get_local_folders_account (info->account_store);
+       modest_tny_local_folders_account_add_folder_to_outbox (MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (local_account),
+                                                              per_account_outbox);
+       /* Add the pair to the hash table */
+       g_hash_table_insert (priv->outbox_of_transport,
+                            info->transport_account,
+                            per_account_outbox);
+       
+       /* Notify that the local account changed */
+       g_signal_emit (G_OBJECT (self), signals [ACCOUNT_CHANGED_SIGNAL], 0, local_account);
+       g_object_unref (local_account);
+       g_object_unref (per_account_outbox);
+
+ frees:
+       g_object_unref (info->transport_account);
+       g_slice_free (AddOutboxInfo, info);
+}
+                                                                  
+
+static void
+add_outbox_from_transport_account_to_global_outbox (ModestTnyAccountStore *self,
+                                                   const gchar *account_name,
+                                                   TnyAccount *transport_account)
+{
+       TnyList *folders = NULL;
+       TnyAccount *account_outbox = NULL;
+       ModestTnyAccountStorePrivate *priv = NULL;
+       AddOutboxInfo *info;
+
+       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+       /* Create per account local outbox */
+       account_outbox = 
+               modest_tny_account_new_for_per_account_local_outbox_folder (priv->account_mgr, 
+                                                                           account_name, 
+                                                                           priv->session);
+
+       if (!G_IS_OBJECT (account_outbox)) {
+               g_warning ("%s: could not create per account local outbox folder", __FUNCTION__);
+               return;
+       }
+
+       tny_list_append (priv->store_accounts_outboxes, G_OBJECT (account_outbox));
+       
+       /* Get the outbox folder */
+       folders = tny_simple_list_new ();
+       info = g_slice_new0 (AddOutboxInfo);
+       info->account_store = self;
+       info->transport_account = g_object_ref (transport_account);
+       tny_folder_store_get_folders_async (TNY_FOLDER_STORE (account_outbox), folders, NULL, FALSE, 
+                                           add_outbox_from_transport_account_to_global_outbox_get_folders_cb, NULL, (gpointer) info);
+       g_object_unref (account_outbox);
+}
+
+/*
+ * This function will be used for both adding new accounts and for the
+ * initialization. In the initialization we do not want to emit
+ * signals so notify will be FALSE, in the case of account additions
+ * we do want to notify the observers
+ */
+static void
+insert_account (ModestTnyAccountStore *self,
+               const gchar *account,
+               gboolean notify)
+{
+       ModestTnyAccountStorePrivate *priv = NULL;
+       TnyAccount *store_account = NULL, *transport_account = NULL;
+       
+       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+       /* Get the server and the transport account */
+       store_account = create_tny_account (self, account, TNY_ACCOUNT_TYPE_STORE, notify);
+       if (!store_account || !TNY_IS_ACCOUNT(store_account)) {
+               g_warning ("%s: failed to create store account", __FUNCTION__);
+               return;
+       }
+
+       transport_account = create_tny_account (self, account, TNY_ACCOUNT_TYPE_TRANSPORT, notify);
+       if (!transport_account || !TNY_IS_ACCOUNT(transport_account)) {
+               g_warning ("%s: failed to create transport account", __FUNCTION__);
+               g_object_unref (store_account);
+               return;
+       }
+
+       /* Add accounts to the lists */
+       tny_list_append (priv->store_accounts, G_OBJECT (store_account));
+       tny_list_append (priv->transport_accounts, G_OBJECT (transport_account));
+       
+       /* Create a new pseudo-account with an outbox for this
+          transport account and add it to the global outbox
+          in the local account */
+       add_outbox_from_transport_account_to_global_outbox (self, account, transport_account);  
+
+       /* Notify the observers. We do it after everything is
+          created */
+       if (notify) {
+               g_signal_emit (G_OBJECT (self), signals [ACCOUNT_INSERTED_SIGNAL], 0, store_account);   
+               g_signal_emit (G_OBJECT (self), signals [ACCOUNT_INSERTED_SIGNAL], 0, transport_account);
+       }
+
+       /* Frees */
+       g_object_unref (store_account);
+       g_object_unref (transport_account);
+}
+
+static inline gboolean
+only_local_accounts (ModestTnyAccountStore *self)
+{
+       return (modest_tny_account_store_get_num_remote_accounts (self) > 0) ? FALSE : TRUE;
+}
+
+static void
+on_account_inserted (ModestAccountMgr *acc_mgr, 
+                    const gchar *account,
+                    gpointer user_data)
+{
+       gboolean add_specific;
+
+       add_specific = only_local_accounts (MODEST_TNY_ACCOUNT_STORE (user_data));
+               
+       /* Insert the account and notify the observers */
+       insert_account (MODEST_TNY_ACCOUNT_STORE (user_data), account, TRUE);
+
+       /* If it's the first remote account then add the connection
+          specific SMTP servers as well */
+       if (add_specific)
+               add_connection_specific_transport_accounts (MODEST_TNY_ACCOUNT_STORE (user_data));
+
+}
+
+/* This is the callback of the tny_camel_account_set_online called in
+   on_account_removed to disconnect the account */
+static void
+on_account_disconnect_when_removing (TnyCamelAccount *account, 
+                                    gboolean canceled, 
+                                    GError *err, 
+                                    gpointer user_data)
+{
+       ModestTnyAccountStore *self;
+       ModestTnyAccountStorePrivate *priv;
+
+       self = MODEST_TNY_ACCOUNT_STORE (user_data);
+       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self);
+
+       /* Cancel all pending operations */
+       tny_account_cancel (TNY_ACCOUNT (account));
+       
+       /* Unref the extra reference added by get_server_account */
+       g_object_unref (account);
+
+       /* Clear the cache if it's an store account */
+       if (TNY_IS_STORE_ACCOUNT (account)) {
+               tny_store_account_delete_cache (TNY_STORE_ACCOUNT (account));
+       } else if (TNY_IS_TRANSPORT_ACCOUNT (account)) {
+               ModestTnySendQueue* send_queue;
+               send_queue = modest_runtime_get_send_queue (TNY_TRANSPORT_ACCOUNT (account), FALSE);
+               if (TNY_IS_SEND_QUEUE (send_queue)) {
+                       if (modest_tny_send_queue_sending_in_progress (send_queue))
+                               tny_send_queue_cancel (TNY_SEND_QUEUE (send_queue),
+                                                      TNY_SEND_QUEUE_CANCEL_ACTION_REMOVE, 
+                                                      NULL);
+                       modest_runtime_remove_send_queue (TNY_TRANSPORT_ACCOUNT (account));
+               }
+       }
+}
+
+/*
+ * We use this one for both removing "normal" and "connection
+ * specific" transport accounts
+ */
+static void
+remove_transport_account (ModestTnyAccountStore *self,
+                         TnyTransportAccount *transport_account)
+{
+       ModestTnyAccountStorePrivate *priv;
+       TnyFolder *outbox = NULL;
+       
+       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self);
+
+       /* Remove it from the list of accounts and notify the
+          observers. Do not need to wait for account
+          disconnection */
+       g_signal_emit (G_OBJECT (self), signals [ACCOUNT_REMOVED_SIGNAL], 0, transport_account);
+       tny_list_remove (priv->transport_accounts, (GObject *) transport_account);
+               
+       /* Remove the OUTBOX of the account from the global outbox */
+       outbox = g_hash_table_lookup (priv->outbox_of_transport, transport_account);
+
+       if (TNY_IS_FOLDER (outbox)) {
+               TnyAccount *local_account = NULL;
+               TnyAccount *outbox_account = tny_folder_get_account (outbox);
+
+               if (outbox_account) {
+                       tny_list_remove (priv->store_accounts_outboxes, G_OBJECT (outbox_account));
+                       /* Remove existing emails to send */
+                       tny_store_account_delete_cache (TNY_STORE_ACCOUNT (outbox_account));
+                       g_object_unref (outbox_account);
+               }
+
+               local_account = modest_tny_account_store_get_local_folders_account (self);
+               modest_tny_local_folders_account_remove_folder_from_outbox (MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (local_account),
+                                                                           outbox);
+
+               g_hash_table_remove (priv->outbox_of_transport, transport_account);
+
+               /* Notify the change in the local account */
+               g_signal_emit (G_OBJECT (self), signals [ACCOUNT_CHANGED_SIGNAL], 0, local_account);
+               g_object_unref (local_account);
+       } else {
+               g_warning ("Removing a transport account that has no outbox");
+       }
+
+       /* Cancel all pending operations */
+       tny_account_cancel (TNY_ACCOUNT (transport_account));
+
+       /* Disconnect and notify the observers. The callback will free the reference */
+       tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (transport_account), FALSE,
+                                     on_account_disconnect_when_removing, self);
+}
+
+static gboolean
+images_cache_remove_filter (TnyStreamCache *self, const gchar *id, const gchar *account_name)
+{
+       gchar *account_name_with_separator;
+       gboolean result;
+       if (account_name == NULL || account_name[0] == '\0')
+               return FALSE;
+
+       if (id == NULL || id[0] == '\0')
+               return FALSE;
+
+       account_name_with_separator = g_strconcat (account_name, "__", NULL);
+
+       result = (g_str_has_prefix (id, account_name));
+       g_free (account_name_with_separator);
+
+       return result;
+}
+
+static void
+on_account_removed (ModestAccountMgr *acc_mgr, 
+                   const gchar *account,
+                   gpointer user_data)
+{
+       TnyAccount *store_account = NULL, *transport_account = NULL;
+       ModestTnyAccountStore *self;
+       ModestTnyAccountStorePrivate *priv;
+       TnyStreamCache *stream_cache;
+       
+       self = MODEST_TNY_ACCOUNT_STORE (user_data);
+       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self);
+
+       /* Get the server and the transport account */
+       store_account = 
+               modest_tny_account_store_get_server_account (self, account, 
+                                                            TNY_ACCOUNT_TYPE_STORE);
+       transport_account = 
+               modest_tny_account_store_get_server_account (self, account,
+                                                            TNY_ACCOUNT_TYPE_TRANSPORT);
+       
+       /* If there was any problem creating the account, for example,
+          with the configuration system this could not exist */
+       if (TNY_IS_STORE_ACCOUNT(store_account)) {
+               /* Forget any cached password for the account */
+               forget_password_in_memory (self, tny_account_get_id (store_account));
+
+               /* Remove it from the list of accounts and notify the
+                  observers. Do not need to wait for account
+                  disconnection */
+               tny_list_remove (priv->store_accounts, (GObject *) store_account);
+               g_signal_emit (G_OBJECT (self), signals [ACCOUNT_REMOVED_SIGNAL], 0, store_account);
+
+               /* Cancel all pending operations */
+               tny_account_cancel (TNY_ACCOUNT (store_account));
+
+               /* Disconnect before deleting the cache, because the
+                  disconnection will rewrite the cache to the
+                  disk */
+               tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (store_account), FALSE,
+                                             on_account_disconnect_when_removing, self);
+       } else {
+               g_warning ("%s: no store account for account %s\n", 
+                          __FUNCTION__, account);
+       }
+
+       /* If there was any problem creating the account, for example,
+          with the configuration system this could not exist */
+       if (TNY_IS_TRANSPORT_ACCOUNT(transport_account)) {
+
+               /* Forget any cached password for the account */
+               forget_password_in_memory (self, tny_account_get_id (transport_account));
+
+               /* Remove transport account. It'll free the reference
+                  added by get_server_account */
+               remove_transport_account (self, TNY_TRANSPORT_ACCOUNT (transport_account));
+       } else {
+               g_warning ("%s: no transport account for account %s\n", 
+                          __FUNCTION__, account);
+       }
+
+       /* Remove cached images */
+       stream_cache = modest_runtime_get_images_cache ();
+       tny_stream_cache_remove (stream_cache, (TnyStreamCacheRemoveFilter) images_cache_remove_filter, (gpointer) account);
+
+       /* If there are no more user accounts then delete the
+          transport specific SMTP servers */
+       if (only_local_accounts (self))
+               remove_connection_specific_transport_accounts (self);
+}
+
+TnyTransportAccount *
+modest_tny_account_store_new_connection_specific_transport_account (ModestTnyAccountStore *self,
+                                                                   const gchar *name)
+{
+       ModestTnyAccountStorePrivate *priv = NULL;
+       TnyAccount * tny_account = NULL;
+
+       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+       /* Add the account: */
+       tny_account = 
+               modest_tny_account_new_from_server_account_name (priv->account_mgr, 
+                                                                priv->session, 
+                                                                name,
+                                                                get_password,
+                                                                forget_password);
+       if (tny_account) {
+               g_object_set_data (G_OBJECT(tny_account), 
+                                  "account_store", 
+                                  (gpointer)self);
+               g_object_set_data (G_OBJECT(tny_account), 
+                                  "connection_specific", 
+                                  GINT_TO_POINTER (TRUE));
+               
+               tny_list_append (priv->transport_accounts, G_OBJECT (tny_account));
+               add_outbox_from_transport_account_to_global_outbox (self, 
+                                                                   name, 
+                                                                   tny_account);
+               
+       } else
+               g_printerr ("modest: failed to create smtp-specific account for %s\n",
+                           name);
+
+       return TNY_TRANSPORT_ACCOUNT (tny_account);
+}
+
+static void 
+foreach_free_string(gpointer data,
+                   gpointer user_data)
+{
+       g_free (data);
+}
+
+static void
+add_connection_specific_transport_accounts (ModestTnyAccountStore *self)
+{
+       ModestTnyAccountStorePrivate *priv = NULL;
+       GSList *list_specifics = NULL, *iter = NULL;
+       GError *err = NULL;
+
+       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+       list_specifics = modest_conf_get_list (modest_runtime_get_conf (),
+                                              MODEST_CONF_CONNECTION_SPECIFIC_SMTP_LIST,
+                                              MODEST_CONF_VALUE_STRING, &err);
+       if (err) {
+               g_error_free (err);
+               g_return_if_reached ();
+               return;
+       }
+                               
+       /* Look at each connection-specific transport account for the 
+        * modest account: */
+       iter = list_specifics;
+       while (iter) {
+               /* The list alternates between the connection name and the transport name: */
+               iter = g_slist_next (iter);
+               if (iter) {
+                       const gchar* transport_account_name = (const gchar*) (iter->data);
+                       TnyTransportAccount * account = NULL;
+                       account = modest_tny_account_store_new_connection_specific_transport_account (
+                               self, transport_account_name);
+                       if (account)
+                               g_object_unref (account);
+               }                               
+               iter = g_slist_next (iter);
+       }
+
+       /* Free the list */
+       g_slist_foreach (list_specifics, foreach_free_string, NULL);
+       g_slist_free (list_specifics);
+}
+
+static void
+remove_connection_specific_transport_accounts (ModestTnyAccountStore *self)
+{
+       ModestTnyAccountStorePrivate *priv = NULL;
+       GSList *list_specifics = NULL, *iter = NULL;
+       GError *err = NULL;
+
+       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+       err = NULL;
+       list_specifics = modest_conf_get_list (modest_runtime_get_conf (),
+                                              MODEST_CONF_CONNECTION_SPECIFIC_SMTP_LIST,
+                                              MODEST_CONF_VALUE_STRING, &err);
+       if (err) {
+               g_error_free (err);
+               g_return_if_reached ();
+               return;
+       }
+                               
+       /* Look at each connection-specific transport account for the 
+        * modest account: */
+       iter = list_specifics;
+       while (iter) {
+               /* The list alternates between the connection name and the transport name: */
+               iter = g_slist_next (iter);
+               if (iter) {
+                       const gchar* transport_account_name = (const gchar*) (iter->data);
+                       TnyAccount * account;
+                       account = modest_tny_account_store_get_server_account (self,
+                                                                              transport_account_name,
+                                                                              TNY_ACCOUNT_TYPE_TRANSPORT);
+
+                       /* the call will free the reference */
+                       if (account)
+                               remove_transport_account (self, TNY_TRANSPORT_ACCOUNT (account));
+               }                               
+               iter = g_slist_next (iter);
+       }
+
+       /* Free the list */
+       g_slist_foreach (list_specifics, foreach_free_string, NULL);
+       g_slist_free (list_specifics);
+}
+
+
+TnyMsg *
+modest_tny_account_store_find_msg_in_outboxes (ModestTnyAccountStore *self, 
+                                              const gchar *uri,
+                                              TnyAccount **ac_out)
+{
+       TnyIterator *acc_iter;
+       ModestTnyAccountStorePrivate *priv;
+       TnyMsg *msg = NULL;
+       TnyAccount *msg_account = NULL;
+
+       g_return_val_if_fail (MODEST_IS_TNY_ACCOUNT_STORE (self), NULL);
+       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self);
+
+       acc_iter = tny_list_create_iterator (priv->store_accounts_outboxes);
+       while (!msg && !tny_iterator_is_done (acc_iter)) {
+               TnyList *folders = tny_simple_list_new ();
+               TnyAccount *account = TNY_ACCOUNT (tny_iterator_get_current (acc_iter));
+               TnyIterator *folders_iter = NULL;
+
+               tny_folder_store_get_folders (TNY_FOLDER_STORE (account), folders, NULL, FALSE, NULL);
+               folders_iter = tny_list_create_iterator (folders);
+
+               while (msg == NULL && !tny_iterator_is_done (folders_iter)) {
+                       TnyFolder *folder = TNY_FOLDER (tny_iterator_get_current (folders_iter));
+                       msg = tny_folder_find_msg (folder, uri, NULL);
+
+                       if (msg)
+                               msg_account = g_object_ref (account);
+
+                       g_object_unref (folder);
+                       tny_iterator_next (folders_iter);
+               }
+               g_object_unref (folders_iter);
+
+               g_object_unref (folders);
+               g_object_unref (account);
+               tny_iterator_next (acc_iter);
+       }
+
+       g_object_unref (acc_iter);
+
+       if (ac_out != NULL)
+               *ac_out = msg_account;
+
+       return msg;
+}
+
+TnyTransportAccount *
+modest_tny_account_store_get_transport_account_from_outbox_header(ModestTnyAccountStore *self, TnyHeader *header)
 {
-       /* We should make this more sophisticated if we ever use ModestTnySimpleFolderStore 
-        * for anything else. */
-       return MODEST_IS_TNY_SIMPLE_FOLDER_STORE (self);
+       TnyIterator *acc_iter;
+       ModestTnyAccountStorePrivate *priv;
+       TnyTransportAccount *header_acc = NULL;
+       gchar *msg_id;
+
+       g_return_val_if_fail (MODEST_IS_TNY_ACCOUNT_STORE (self), NULL);
+       g_return_val_if_fail (TNY_IS_HEADER (header), NULL);
+       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self);
+       msg_id = modest_tny_send_queue_get_msg_id (header);
+       acc_iter = tny_list_create_iterator (priv->transport_accounts);
+       while (!header_acc && !tny_iterator_is_done (acc_iter)) {
+               TnyTransportAccount *account = TNY_TRANSPORT_ACCOUNT (tny_iterator_get_current (acc_iter));
+               ModestTnySendQueue *send_queue;
+               ModestTnySendQueueStatus status;
+               send_queue = modest_runtime_get_send_queue(TNY_TRANSPORT_ACCOUNT(account), TRUE);
+               if (TNY_IS_SEND_QUEUE (send_queue)) {
+                       status = modest_tny_send_queue_get_msg_status(send_queue, msg_id);
+                       if (status != MODEST_TNY_SEND_QUEUE_UNKNOWN)
+                               header_acc = g_object_ref(account);
+               }
+               g_object_unref (account);
+               tny_iterator_next (acc_iter);
+       }
+       g_object_unref(acc_iter);
+       g_free (msg_id);
+
+       /* New reference */
+       return header_acc;
+}
+
+typedef struct {
+       ModestTnyAccountStore *account_store;
+       ModestTnyAccountStoreShutdownCallback callback;
+       gpointer userdata;
+       gint pending;
+} ShutdownOpData;
+
+static void
+account_shutdown_callback (TnyCamelAccount *account, gboolean canceled, GError *err, gpointer userdata)
+{
+       ShutdownOpData *op_data = (ShutdownOpData *) userdata;
+       op_data->pending--;
+       if (op_data->pending == 0) {
+               if (op_data->callback)
+                       op_data->callback (op_data->account_store, op_data->userdata);
+               g_object_unref (op_data->account_store);
+               g_free (op_data);
+       } else {
+               g_object_unref (op_data->account_store);
+       }
+}
+
+static void
+account_shutdown (TnyAccount *account, ShutdownOpData *op_data)
+{
+       g_return_if_fail (account && TNY_IS_ACCOUNT(account));
+
+       if (TNY_IS_STORE_ACCOUNT (account) && 
+           !modest_tny_folder_store_is_remote (TNY_FOLDER_STORE (account)))
+               goto frees;
+
+       /* Disconnect account */
+       if (tny_account_get_connection_status (account) == TNY_CONNECTION_STATUS_CONNECTED) {
+               tny_camel_account_set_online (TNY_CAMEL_ACCOUNT(account), FALSE, 
+                                             account_shutdown_callback, op_data);
+               return;
+       }
+
+ frees:
+       op_data->pending--;
+       g_object_unref (op_data->account_store);
+}
+
+
+void 
+modest_tny_account_store_shutdown (ModestTnyAccountStore *self,
+                                  ModestTnyAccountStoreShutdownCallback callback,
+                                  gpointer userdata)
+{
+       gint i, num_accounts;
+       ShutdownOpData *op_data;
+       ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self);
+
+       /* Get references */
+       num_accounts = tny_list_get_length (priv->store_accounts) + 
+               tny_list_get_length (priv->transport_accounts);
+       for (i = 0 ; i < num_accounts ; i++)
+               g_object_ref (self);
+
+       /* Create the helper object */
+       op_data = g_new0 (ShutdownOpData, 1);
+       op_data->callback = callback;
+       op_data->userdata = userdata;
+       op_data->pending = num_accounts;
+       op_data->account_store = self;
+
+       /* Destroy all accounts. Disconnect all accounts before they are destroyed */
+       if (priv->store_accounts) {
+               tny_list_foreach (priv->store_accounts, (GFunc)account_shutdown, op_data);
+       }
+       
+       if (priv->transport_accounts) {
+               tny_list_foreach (priv->transport_accounts, (GFunc)account_shutdown, op_data);
+       }
+
+       if (op_data->pending == 0) {
+               if (op_data->callback)
+                       op_data->callback (op_data->account_store, op_data->userdata);
+               g_free (op_data);
+       }
+}
+
+gboolean 
+modest_tny_account_store_is_send_mail_blocked (ModestTnyAccountStore *self)
+{
+       ModestTnyAccountStorePrivate *priv;
+
+       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+       return priv->send_mail_blocked;
+}
+
+void 
+modest_tny_account_store_set_send_mail_blocked (ModestTnyAccountStore *self, 
+                                               gboolean blocked)
+{
+       ModestTnyAccountStorePrivate *priv;
+
+       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+       priv->send_mail_blocked = blocked;
+}
+
+static void
+count_remote_accounts (gpointer data, gpointer user_data)
+{
+       TnyFolderStore *account = TNY_FOLDER_STORE (data);
+       gint *count = (gint *) user_data;
+
+       if (modest_tny_folder_store_is_remote (account))
+               (*count)++;
+}
+
+guint
+modest_tny_account_store_get_num_remote_accounts (ModestTnyAccountStore *self)
+{
+       ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self);
+       gint count = 0;
+
+       /* Count remote accounts */
+       tny_list_foreach (priv->store_accounts, (GFunc) count_remote_accounts, &count);
+
+       return count;
 }