* Partially fixes NB#78857, wait for the selected folder synchronization when closin...
[modest] / src / widgets / modest-folder-view.c
index cf4b519..1bcca85 100644 (file)
@@ -41,6 +41,7 @@
 #include <tny-folder.h>
 #include <tny-camel-folder.h>
 #include <tny-simple-list.h>
+#include <tny-camel-account.h>
 #include <modest-tny-account.h>
 #include <modest-tny-folder.h>
 #include <modest-tny-local-folders-account.h>
 #include <modest-text-utils.h>
 #include <modest-runtime.h>
 #include "modest-folder-view.h"
-#include <modest-dnd.h>
 #include <modest-platform.h>
 #include <modest-widget-memory.h>
 #include <modest-ui-actions.h>
+#include "modest-dnd.h"
+#include "widgets/modest-window.h"
+
+/* Folder view drag types */
+const GtkTargetEntry folder_view_drag_types[] =
+{
+       { "GTK_TREE_MODEL_ROW", GTK_TARGET_SAME_WIDGET, MODEST_FOLDER_ROW },
+       { GTK_TREE_PATH_AS_STRING_LIST, GTK_TARGET_SAME_APP, MODEST_HEADER_ROW }
+};
 
 /* 'private'/'protected' functions */
 static void modest_folder_view_class_init  (ModestFolderViewClass *klass);
@@ -67,17 +76,19 @@ static void         tny_account_store_view_init (gpointer g,
 static void         modest_folder_view_set_account_store (TnyAccountStoreView *self, 
                                                          TnyAccountStore     *account_store);
 
-static void         on_selection_changed   (GtkTreeSelection *sel, gpointer data);
+static void         on_selection_changed   (GtkTreeSelection *sel, 
+                                           gpointer data);
 
-static void         on_account_update      (TnyAccountStore *account_store, 
-                                           const gchar *account,
+static void         on_account_removed     (TnyAccountStore *self, 
+                                           TnyAccount *account,
                                            gpointer user_data);
 
-static void         on_account_removed     (TnyAccountStore *self, 
+static void         on_account_inserted    (TnyAccountStore *self, 
                                            TnyAccount *account,
                                            gpointer user_data);
 
-static void         on_accounts_reloaded   (TnyAccountStore *store, 
+static void         on_account_changed    (TnyAccountStore *self, 
+                                           TnyAccount *account,
                                            gpointer user_data);
 
 static gint         cmp_rows               (GtkTreeModel *tree_model, 
@@ -93,10 +104,11 @@ static gboolean     on_key_pressed         (GtkWidget *self,
                                            GdkEventKey *event,
                                            gpointer user_data);
 
-static void         on_configuration_key_changed         (ModestConf* conf, 
-                                                         const gchar *key, 
-                                                         ModestConfEvent event, 
-                                                         ModestFolderView *self);
+static void         on_configuration_key_changed  (ModestConf* conf, 
+                                                  const gchar *key, 
+                                                  ModestConfEvent event,
+                                                  ModestConfNotificationId notification_id, 
+                                                  ModestFolderView *self);
 
 /* DnD functions */
 static void         on_drag_data_get       (GtkWidget *widget, 
@@ -122,17 +134,26 @@ static gboolean     on_drag_motion         (GtkWidget      *widget,
                                            guint           time,
                                            gpointer        user_data);
 
+static void         expand_root_items (ModestFolderView *self);
+
 static gint         expand_row_timeout     (gpointer data);
 
 static void         setup_drag_and_drop    (GtkTreeView *self);
 
-static gboolean     _clipboard_set_selected_data (ModestFolderView *folder_view, gboolean delete);
+static gboolean     _clipboard_set_selected_data (ModestFolderView *folder_view, 
+                                                 gboolean delete);
 
 static void         _clear_hidding_filter (ModestFolderView *folder_view);
 
-static void          on_row_changed_maybe_select_folder (GtkTreeModel *tree_model, GtkTreePath  *path, GtkTreeIter  *iter,
+static void         on_row_inserted_maybe_select_folder (GtkTreeModel     *tree_model, 
+                                                        GtkTreePath      *path, 
+                                                        GtkTreeIter      *iter,
                                                         ModestFolderView *self);
 
+static void         on_display_name_changed (ModestAccountMgr *self, 
+                                            const gchar *account,
+                                            gpointer user_data);
+
 enum {
        FOLDER_SELECTION_CHANGED_SIGNAL,
        FOLDER_DISPLAY_NAME_CHANGED_SIGNAL,
@@ -146,11 +167,12 @@ struct _ModestFolderViewPrivate {
 
        TnyFolder            *folder_to_select; /* folder to select after the next update */
 
-       gulong                account_update_signal;
        gulong                changed_signal;
-       gulong                accounts_reloaded_signal;
+       gulong                account_inserted_signal;
        gulong                account_removed_signal;
+       gulong                account_changed_signal;
        gulong                conf_key_signal;
+       gulong                display_name_changed_signal;
        
        /* not unref this object, its a singlenton */
        ModestEmailClipboard *clipboard;
@@ -166,8 +188,9 @@ struct _ModestFolderViewPrivate {
        gchar                *visible_account_id;
        ModestFolderViewStyle style;
 
-       gboolean              reselect; /* we use this to force a reselection of the INBOX */
-       gboolean                                                        show_non_move;
+       gboolean  reselect; /* we use this to force a reselection of the INBOX */
+       gboolean  show_non_move;
+       gboolean  reexpand; /* next time we expose, we'll expand all root folders */
 };
 #define MODEST_FOLDER_VIEW_GET_PRIVATE(o)                      \
        (G_TYPE_INSTANCE_GET_PRIVATE((o),                       \
@@ -255,7 +278,8 @@ modest_folder_view_class_init (ModestFolderViewClass *klass)
 }
 
 /* Simplify checks for NULLs: */
-static gboolean strings_are_equal (const gchar *a, const gchar *b)
+static gboolean
+strings_are_equal (const gchar *a, const gchar *b)
 {
        if (!a && !b)
                return TRUE;
@@ -267,7 +291,8 @@ static gboolean strings_are_equal (const gchar *a, const gchar *b)
                return FALSE;
 }
 
-static gboolean on_model_foreach_set_name(GtkTreeModel *model, GtkTreePath *path,  GtkTreeIter *iter, gpointer data)
+static gboolean
+on_model_foreach_set_name(GtkTreeModel *model, GtkTreePath *path,  GtkTreeIter *iter, gpointer data)
 {
        GObject *instance = NULL;
        
@@ -311,12 +336,13 @@ typedef struct
        gchar *previous_name;
 } GetMmcAccountNameData;
 
-static void on_get_mmc_account_name (TnyStoreAccount* account, gpointer user_data)
+static void
+on_get_mmc_account_name (TnyStoreAccount* account, gpointer user_data)
 {
        /* printf ("DEBU1G: %s: account name=%s\n", __FUNCTION__, tny_account_get_name (TNY_ACCOUNT(account))); */
 
        GetMmcAccountNameData *data = (GetMmcAccountNameData*)user_data;
-
+       
        if (!strings_are_equal (
                tny_account_get_name(TNY_ACCOUNT(account)), 
                data->previous_name)) {
@@ -334,29 +360,23 @@ static void on_get_mmc_account_name (TnyStoreAccount* account, gpointer user_dat
 }
 
 static void
-text_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
-                GtkTreeModel *tree_model,  GtkTreeIter *iter,  gpointer data)
+text_cell_data  (GtkTreeViewColumn *column,  
+                GtkCellRenderer *renderer,
+                GtkTreeModel *tree_model,  
+                GtkTreeIter *iter,  
+                gpointer data)
 {
        ModestFolderViewPrivate *priv;
-       GObject *rendobj;
+       GObject *rendobj = (GObject *) renderer;
        gchar *fname = NULL;
-       gint unread = 0;
-       gint all = 0;
        TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
        GObject *instance = NULL;
-       
-       g_return_if_fail (column);
-       g_return_if_fail (tree_model);
 
        gtk_tree_model_get (tree_model, iter,
                            TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &fname,
-                           TNY_GTK_FOLDER_STORE_TREE_MODEL_ALL_COLUMN, &all,
-                           TNY_GTK_FOLDER_STORE_TREE_MODEL_UNREAD_COLUMN, &unread,
                            TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
                            TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &instance,
                            -1);
-       rendobj = G_OBJECT(renderer);
-
        if (!fname)
                return;
 
@@ -374,20 +394,26 @@ text_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
        if (type != TNY_FOLDER_TYPE_ROOT) {
                gint number = 0;
                
-               if (modest_tny_folder_is_local_folder (TNY_FOLDER (instance))) {
-                       type = modest_tny_folder_get_local_folder_type (TNY_FOLDER (instance));
+               if (modest_tny_folder_is_local_folder (TNY_FOLDER (instance)) ||
+                   modest_tny_folder_is_memory_card_folder (TNY_FOLDER (instance))) {
+                       type = modest_tny_folder_get_local_or_mmc_folder_type (TNY_FOLDER (instance));
                        if (type != TNY_FOLDER_TYPE_UNKNOWN) {
                                g_free (fname);
-                               fname = g_strdup(modest_local_folder_info_get_type_display_name (type));
+                               fname = g_strdup (modest_local_folder_info_get_type_display_name (type));
                        }
                }
 
-               /* Select the number to show: the unread or unsent messages */
-               if ((type == TNY_FOLDER_TYPE_DRAFTS) || (type == TNY_FOLDER_TYPE_OUTBOX))
-                       number = all;
+               /* note: we cannot reliably get the counts from the tree model, we need
+                * to use explicit calls on tny_folder for some reason.
+                */
+               /* Select the number to show: the unread or unsent messages. in case of outbox/drafts, show all */
+               if ((type == TNY_FOLDER_TYPE_DRAFTS) ||
+                   (type == TNY_FOLDER_TYPE_OUTBOX) ||
+                   (type == TNY_FOLDER_TYPE_MERGE)) /* _OUTBOX actually returns _MERGE... */
+                       number = tny_folder_get_all_count (TNY_FOLDER(instance));
                else
-                       number = unread;
-               
+                       number = tny_folder_get_unread_count (TNY_FOLDER(instance));
+                                                               
                /* Use bold font style if there are unread or unset messages */
                if (number > 0) {
                        item_name = g_strdup_printf ("%s (%d)", fname, number);
@@ -399,18 +425,15 @@ text_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
                
        } else if (TNY_IS_ACCOUNT (instance)) {
                /* If it's a server account */
-               if (modest_tny_account_is_virtual_local_folders (
-                               TNY_ACCOUNT (instance))) {
+               if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (instance))) {
                        item_name = g_strdup (priv->local_account_name);
                        item_weight = 800;
-               } else if (modest_tny_account_is_memory_card_account (
-                               TNY_ACCOUNT (instance))) {
+               } else if (modest_tny_account_is_memory_card_account (TNY_ACCOUNT (instance))) {
                        /* fname is only correct when the items are first 
                         * added to the model, not when the account is 
                         * changed later, so get the name from the account
                         * instance: */
-                       item_name = g_strdup (tny_account_get_name (
-                               TNY_ACCOUNT (instance)));
+                       item_name = g_strdup (tny_account_get_name (TNY_ACCOUNT (instance)));
                        item_weight = 800;
                } else {
                        item_name = g_strdup (fname);
@@ -427,12 +450,11 @@ text_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
                
                /* Notify display name observers */
                /* TODO: What listens for this signal, and how can it use only the new name? */
-               if (G_OBJECT (priv->cur_folder_store) == instance) {
+               if (((GObject *) priv->cur_folder_store) == instance) {
                        g_signal_emit (G_OBJECT(self),
                                               signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL], 0,
                                               item_name);
                }
-               
                g_free (item_name);
                
        }
@@ -452,7 +474,7 @@ text_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
                        callback_data->previous_name = g_strdup (name); 
 
                modest_tny_account_get_mmc_account_name (TNY_STORE_ACCOUNT (instance), 
-                       on_get_mmc_account_name, callback_data);
+                                                        on_get_mmc_account_name, callback_data);
        }
                        
        g_object_unref (G_OBJECT (instance));
@@ -460,127 +482,492 @@ text_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
 }
 
 
+typedef struct {
+       GdkPixbuf *pixbuf;
+       GdkPixbuf *pixbuf_open;
+       GdkPixbuf *pixbuf_close;
+} ThreePixbufs;
 
-static void
-icon_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
-                GtkTreeModel *tree_model,  GtkTreeIter *iter, gpointer data)
+
+static ThreePixbufs*
+get_folder_icons (TnyFolderType type, GObject *instance)
 {
-       GObject *rendobj = NULL, *instance = NULL;
        GdkPixbuf *pixbuf = NULL;
-       TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
-       gchar *fname = NULL;
-       const gchar *account_id = NULL;
-       gint unread = 0;
-       gboolean has_children;
-       
-       rendobj = G_OBJECT(renderer);
-       gtk_tree_model_get (tree_model, iter,
-                           TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
-                           TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &fname,
-                           TNY_GTK_FOLDER_STORE_TREE_MODEL_UNREAD_COLUMN, &unread,
-                           TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &instance,
-                           -1);
-       has_children = gtk_tree_model_iter_has_child (tree_model, iter);
+       GdkPixbuf *pixbuf_open = NULL;
+       GdkPixbuf *pixbuf_close = NULL;
+       ThreePixbufs *retval = g_slice_new (ThreePixbufs);
 
-       if (!fname)
-               return;
+       static GdkPixbuf *inbox_pixbuf = NULL, *outbox_pixbuf = NULL,
+               *junk_pixbuf = NULL, *sent_pixbuf = NULL,
+               *trash_pixbuf = NULL, *draft_pixbuf = NULL,
+               *normal_pixbuf = NULL, *anorm_pixbuf = NULL, 
+               *ammc_pixbuf = NULL, *avirt_pixbuf = NULL;
+
+       static GdkPixbuf *inbox_pixbuf_open = NULL, *outbox_pixbuf_open = NULL,
+               *junk_pixbuf_open = NULL, *sent_pixbuf_open = NULL,
+               *trash_pixbuf_open = NULL, *draft_pixbuf_open = NULL,
+               *normal_pixbuf_open = NULL, *anorm_pixbuf_open = NULL, 
+               *ammc_pixbuf_open = NULL, *avirt_pixbuf_open = NULL;
+
+       static GdkPixbuf *inbox_pixbuf_close = NULL, *outbox_pixbuf_close = NULL,
+               *junk_pixbuf_close = NULL, *sent_pixbuf_close = NULL,
+               *trash_pixbuf_close = NULL, *draft_pixbuf_close = NULL,
+               *normal_pixbuf_close = NULL, *anorm_pixbuf_close = NULL, 
+               *ammc_pixbuf_close = NULL, *avirt_pixbuf_close = NULL;
 
-       if (!instance) {
-               g_free (fname);
-               return;
-       }
 
        /* MERGE is not needed anymore as the folder now has the correct type jschmid */
        /* We include the MERGE type here because it's used to create
           the local OUTBOX folder */
        if (type == TNY_FOLDER_TYPE_NORMAL || 
            type == TNY_FOLDER_TYPE_UNKNOWN) {
-               type = modest_tny_folder_guess_folder_type (TNY_FOLDER (instance));
+               type = modest_tny_folder_guess_folder_type (TNY_FOLDER (instance));             
        }
 
        switch (type) {
+       case TNY_FOLDER_TYPE_INVALID:
+               g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
+               break;
+               
        case TNY_FOLDER_TYPE_ROOT:
                if (TNY_IS_ACCOUNT (instance)) {
                        
                        if (modest_tny_account_is_virtual_local_folders (
                                TNY_ACCOUNT (instance))) {
-                               pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_LOCAL_FOLDERS);
+
+                           if (!avirt_pixbuf)
+                                   avirt_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_LOCAL_FOLDERS,
+                                                                                             MODEST_ICON_SIZE_SMALL));
+                           
+                           if (!avirt_pixbuf_open) {
+                                   GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp",
+                                                                                 MODEST_ICON_SIZE_SMALL);
+                                   avirt_pixbuf_open = gdk_pixbuf_copy (avirt_pixbuf);
+                                   gdk_pixbuf_composite (emblem, avirt_pixbuf_open, 0, 0, 
+                                                         MIN (gdk_pixbuf_get_width (emblem), 
+                                                              gdk_pixbuf_get_width (avirt_pixbuf_open)),
+                                                         MIN (gdk_pixbuf_get_height (emblem), 
+                                                              gdk_pixbuf_get_height (avirt_pixbuf_open)),
+                                                         0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
+                                   g_object_unref (emblem);
+                           }
+
+                           if (!avirt_pixbuf_close) {
+                                   GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp",
+                                                                                 MODEST_ICON_SIZE_SMALL);
+                               avirt_pixbuf_close = gdk_pixbuf_copy (avirt_pixbuf);
+                               gdk_pixbuf_composite (emblem, avirt_pixbuf_close, 0, 0, 
+                                                     MIN (gdk_pixbuf_get_width (emblem), 
+                                                          gdk_pixbuf_get_width (avirt_pixbuf_close)),
+                                                     MIN (gdk_pixbuf_get_height (emblem), 
+                                                          gdk_pixbuf_get_height (avirt_pixbuf_close)),
+                                                     0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
+                               g_object_unref (emblem);
+                           }
+
+
+                           pixbuf = g_object_ref (avirt_pixbuf);
+                           pixbuf_open = g_object_ref (avirt_pixbuf_open);
+                           pixbuf_close = g_object_ref (avirt_pixbuf_close);
+
                        }
                        else {
-                               account_id = tny_account_get_id (TNY_ACCOUNT (instance));
+                               const gchar *account_id = tny_account_get_id (TNY_ACCOUNT (instance));
                                
-                               if (!strcmp (account_id, MODEST_MMC_ACCOUNT_ID))
-                                       pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_MMC);
-                               else
-                                       pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_ACCOUNT);
+                               if (!strcmp (account_id, MODEST_MMC_ACCOUNT_ID)) {                                 
+                                   if (!ammc_pixbuf)
+                                           ammc_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_MMC,
+                                                                                                    MODEST_ICON_SIZE_SMALL));
+                                   
+                                   if (!ammc_pixbuf_open) {
+                                           GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp",
+                                                                                         MODEST_ICON_SIZE_SMALL);
+                                       ammc_pixbuf_open = gdk_pixbuf_copy (ammc_pixbuf);
+                                       gdk_pixbuf_composite (emblem, ammc_pixbuf_open, 0, 0, 
+                                                             MIN (gdk_pixbuf_get_width (emblem), 
+                                                                  gdk_pixbuf_get_width (ammc_pixbuf_open)),
+                                                             MIN (gdk_pixbuf_get_height (emblem), 
+                                                                  gdk_pixbuf_get_height (ammc_pixbuf_open)),
+                                                             0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
+                                       g_object_unref (emblem);
+                                   }
+
+                                   if (!ammc_pixbuf_close) {
+                                           GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp",
+                                                                                         MODEST_ICON_SIZE_SMALL);
+                                       ammc_pixbuf_close = gdk_pixbuf_copy (ammc_pixbuf);
+                                       gdk_pixbuf_composite (emblem, ammc_pixbuf_close, 0, 0, 
+                                                             MIN (gdk_pixbuf_get_width (emblem), 
+                                                                  gdk_pixbuf_get_width (ammc_pixbuf_close)),
+                                                             MIN (gdk_pixbuf_get_height (emblem), 
+                                                                  gdk_pixbuf_get_height (ammc_pixbuf_close)),
+                                                             0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
+                                       g_object_unref (emblem);
+                                   }
+
+
+                                   pixbuf = g_object_ref (ammc_pixbuf);
+                                   pixbuf_open = g_object_ref (ammc_pixbuf_open);
+                                   pixbuf_close = g_object_ref (ammc_pixbuf_close);
+
+                               } else {
+
+                                   if (!anorm_pixbuf)
+                                           anorm_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_ACCOUNT,
+                                                                                                     MODEST_ICON_SIZE_SMALL));
+                                   if (!anorm_pixbuf_open) {
+                                           GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp",
+                                                                                         MODEST_ICON_SIZE_SMALL);
+                                       anorm_pixbuf_open = gdk_pixbuf_copy (anorm_pixbuf);
+                                       gdk_pixbuf_composite (emblem, anorm_pixbuf_open, 0, 0, 
+                                                             MIN (gdk_pixbuf_get_width (emblem), 
+                                                                  gdk_pixbuf_get_width (anorm_pixbuf_open)),
+                                                             MIN (gdk_pixbuf_get_height (emblem), 
+                                                                  gdk_pixbuf_get_height (anorm_pixbuf_open)),
+                                                             0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
+                                       g_object_unref (emblem);
+                                   }
+
+                                   if (!anorm_pixbuf_close) {
+                                           GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp",
+                                                                                         MODEST_ICON_SIZE_SMALL);
+                                       anorm_pixbuf_close = gdk_pixbuf_copy (anorm_pixbuf);
+                                       gdk_pixbuf_composite (emblem, anorm_pixbuf_close, 0, 0, 
+                                                             MIN (gdk_pixbuf_get_width (emblem), 
+                                                                  gdk_pixbuf_get_width (anorm_pixbuf_close)),
+                                                             MIN (gdk_pixbuf_get_height (emblem), 
+                                                                  gdk_pixbuf_get_height (anorm_pixbuf_close)),
+                                                             0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
+                                       g_object_unref (emblem);
+                                   }
+
+
+                                   pixbuf = g_object_ref (anorm_pixbuf);
+                                   pixbuf_open = g_object_ref (anorm_pixbuf_open);
+                                   pixbuf_close = g_object_ref (anorm_pixbuf_close);                             
+
+                               }
                        }
                }
                break;
        case TNY_FOLDER_TYPE_INBOX:
-           pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_INBOX);
+
+           if (!inbox_pixbuf)
+                   inbox_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_INBOX,
+                                                                             MODEST_ICON_SIZE_SMALL));
+
+           if (!inbox_pixbuf_open) {
+                   GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp",
+                                                                 MODEST_ICON_SIZE_SMALL);
+                   inbox_pixbuf_open = gdk_pixbuf_copy (inbox_pixbuf);
+                   gdk_pixbuf_composite (emblem, inbox_pixbuf_open, 0, 0, 
+                                         MIN (gdk_pixbuf_get_width (emblem), 
+                                              gdk_pixbuf_get_width (inbox_pixbuf_open)),
+                                         MIN (gdk_pixbuf_get_height (emblem), 
+                                              gdk_pixbuf_get_height (inbox_pixbuf_open)),
+                                         0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
+                   g_object_unref (emblem);
+           }
+           
+           if (!inbox_pixbuf_close) {
+                   GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp",
+                                                                 MODEST_ICON_SIZE_SMALL);
+                   inbox_pixbuf_close = gdk_pixbuf_copy (inbox_pixbuf);
+                   gdk_pixbuf_composite (emblem, inbox_pixbuf_close, 0, 0, 
+                                         MIN (gdk_pixbuf_get_width (emblem), 
+                                              gdk_pixbuf_get_width (inbox_pixbuf_close)),
+                                         MIN (gdk_pixbuf_get_height (emblem), 
+                                              gdk_pixbuf_get_height (inbox_pixbuf_close)),
+                                         0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
+                   g_object_unref (emblem);
+           }
+           
+
+           pixbuf = g_object_ref (inbox_pixbuf);
+           pixbuf_open = g_object_ref (inbox_pixbuf_open);
+           pixbuf_close = g_object_ref (inbox_pixbuf_close);
+           
            break;
        case TNY_FOLDER_TYPE_OUTBOX:
-               pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_OUTBOX);
-               break;
+               if (!outbox_pixbuf)
+                       outbox_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_OUTBOX,
+                                                                                  MODEST_ICON_SIZE_SMALL));
+
+               if (!outbox_pixbuf_open) {
+                       GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp",
+                                                                     MODEST_ICON_SIZE_SMALL);
+                       outbox_pixbuf_open = gdk_pixbuf_copy (outbox_pixbuf);
+                       gdk_pixbuf_composite (emblem, outbox_pixbuf_open, 0, 0, 
+                                             MIN (gdk_pixbuf_get_width (emblem), 
+                                                  gdk_pixbuf_get_width (outbox_pixbuf_open)),
+                                             MIN (gdk_pixbuf_get_height (emblem), 
+                                                  gdk_pixbuf_get_height (outbox_pixbuf_open)),
+                                             0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
+                       g_object_unref (emblem);
+           }
+
+           if (!outbox_pixbuf_close) {
+                   GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp",
+                                                                 MODEST_ICON_SIZE_SMALL);
+               outbox_pixbuf_close = gdk_pixbuf_copy (outbox_pixbuf);
+               gdk_pixbuf_composite (emblem, outbox_pixbuf_close, 0, 0, 
+                                     MIN (gdk_pixbuf_get_width (emblem), 
+                                          gdk_pixbuf_get_width (outbox_pixbuf_close)),
+                                     MIN (gdk_pixbuf_get_height (emblem), 
+                                          gdk_pixbuf_get_height (outbox_pixbuf_close)),
+                                     0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
+               g_object_unref (emblem);
+           }
+
+
+           pixbuf = g_object_ref (outbox_pixbuf);
+           pixbuf_open = g_object_ref (outbox_pixbuf_open);
+           pixbuf_close = g_object_ref (outbox_pixbuf_close);
+
+           break;
        case TNY_FOLDER_TYPE_JUNK:
-               pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_JUNK);
-               break;
+           if (!junk_pixbuf)
+                   junk_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_JUNK,
+                                                                            MODEST_ICON_SIZE_SMALL));
+           if (!junk_pixbuf_open) {
+                   GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp",
+                                                                 MODEST_ICON_SIZE_SMALL);
+                   junk_pixbuf_open = gdk_pixbuf_copy (junk_pixbuf);
+                   gdk_pixbuf_composite (emblem, junk_pixbuf_open, 0, 0, 
+                                         MIN (gdk_pixbuf_get_width (emblem), 
+                                              gdk_pixbuf_get_width (junk_pixbuf_open)),
+                                         MIN (gdk_pixbuf_get_height (emblem), 
+                                              gdk_pixbuf_get_height (junk_pixbuf_open)),
+                                         0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
+                   g_object_unref (emblem);
+           }
+           
+           if (!junk_pixbuf_close) {
+                   GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp",
+                                                                 MODEST_ICON_SIZE_SMALL);
+                   junk_pixbuf_close = gdk_pixbuf_copy (junk_pixbuf);
+                   gdk_pixbuf_composite (emblem, junk_pixbuf_close, 0, 0, 
+                                         MIN (gdk_pixbuf_get_width (emblem), 
+                                              gdk_pixbuf_get_width (junk_pixbuf_close)),
+                                         MIN (gdk_pixbuf_get_height (emblem), 
+                                              gdk_pixbuf_get_height (junk_pixbuf_close)),
+                                         0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
+                   g_object_unref (emblem);
+           }
+           
+           
+           pixbuf = g_object_ref (junk_pixbuf);
+           pixbuf_open = g_object_ref (junk_pixbuf_open);
+           pixbuf_close = g_object_ref (junk_pixbuf_close);
+           
+           break;
+
        case TNY_FOLDER_TYPE_SENT:
-               pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_SENT);
-               break;
+               if (!sent_pixbuf)
+                       sent_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_SENT,
+                                                                                MODEST_ICON_SIZE_SMALL));
+               
+               if (!sent_pixbuf_open) {
+                       GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp",
+                                                                     MODEST_ICON_SIZE_SMALL);
+                       sent_pixbuf_open = gdk_pixbuf_copy (sent_pixbuf);
+                       gdk_pixbuf_composite (emblem, sent_pixbuf_open, 0, 0, 
+                                             MIN (gdk_pixbuf_get_width (emblem), 
+                                                  gdk_pixbuf_get_width (sent_pixbuf_open)),
+                                             MIN (gdk_pixbuf_get_height (emblem), 
+                                                  gdk_pixbuf_get_height (sent_pixbuf_open)),
+                                             0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
+                       g_object_unref (emblem);
+               }
+               
+               if (!sent_pixbuf_close) {
+                       GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp",
+                                                                     MODEST_ICON_SIZE_SMALL);
+                       sent_pixbuf_close = gdk_pixbuf_copy (sent_pixbuf);
+                       gdk_pixbuf_composite (emblem, sent_pixbuf_close, 0, 0, 
+                                             MIN (gdk_pixbuf_get_width (emblem), 
+                                                  gdk_pixbuf_get_width (sent_pixbuf_close)),
+                                             MIN (gdk_pixbuf_get_height (emblem), 
+                                                  gdk_pixbuf_get_height (sent_pixbuf_close)),
+                                             0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
+                       g_object_unref (emblem);
+               }
+               
+
+           pixbuf = g_object_ref (sent_pixbuf);
+           pixbuf_open = g_object_ref (sent_pixbuf_open);
+           pixbuf_close = g_object_ref (sent_pixbuf_close);
+           
+           break;
+
        case TNY_FOLDER_TYPE_TRASH:
-               pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_TRASH);
-               break;
+           if (!trash_pixbuf)
+                   trash_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_TRASH,
+                                                                             MODEST_ICON_SIZE_SMALL));
+           if (!trash_pixbuf_open) {
+                   GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp",
+                                                                 MODEST_ICON_SIZE_SMALL);
+                   trash_pixbuf_open = gdk_pixbuf_copy (trash_pixbuf);
+                   gdk_pixbuf_composite (emblem, trash_pixbuf_open, 0, 0, 
+                                         MIN (gdk_pixbuf_get_width (emblem), 
+                                              gdk_pixbuf_get_width (trash_pixbuf_open)),
+                                         MIN (gdk_pixbuf_get_height (emblem), 
+                                              gdk_pixbuf_get_height (trash_pixbuf_open)),
+                                         0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
+                   g_object_unref (emblem);
+           }
+           
+           if (!trash_pixbuf_close) {
+                   GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp",
+                                                                 MODEST_ICON_SIZE_SMALL);
+                   trash_pixbuf_close = gdk_pixbuf_copy (trash_pixbuf);
+                   gdk_pixbuf_composite (emblem, trash_pixbuf_close, 0, 0, 
+                                         MIN (gdk_pixbuf_get_width (emblem), 
+                                              gdk_pixbuf_get_width (trash_pixbuf_close)),
+                                         MIN (gdk_pixbuf_get_height (emblem), 
+                                              gdk_pixbuf_get_height (trash_pixbuf_close)),
+                                         0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
+                   g_object_unref (emblem);
+           }
+           
+           
+           pixbuf = g_object_ref (trash_pixbuf);
+           pixbuf_open = g_object_ref (trash_pixbuf_open);
+           pixbuf_close = g_object_ref (trash_pixbuf_close);
+
+           break;
        case TNY_FOLDER_TYPE_DRAFTS:
-               pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_DRAFTS);
-               break;
+          if (!draft_pixbuf)
+                  draft_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_DRAFTS,
+                                                                            MODEST_ICON_SIZE_SMALL));
+          
+           if (!draft_pixbuf_open) {
+                   GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp",
+                                                                 MODEST_ICON_SIZE_SMALL);
+               draft_pixbuf_open = gdk_pixbuf_copy (draft_pixbuf);
+               gdk_pixbuf_composite (emblem, draft_pixbuf_open, 0, 0, 
+                                     MIN (gdk_pixbuf_get_width (emblem), 
+                                          gdk_pixbuf_get_width (draft_pixbuf_open)),
+                                     MIN (gdk_pixbuf_get_height (emblem), 
+                                          gdk_pixbuf_get_height (draft_pixbuf_open)),
+                                     0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
+               g_object_unref (emblem);
+           }
+
+           if (!draft_pixbuf_close) {
+                   GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp",
+                                                                 MODEST_ICON_SIZE_SMALL);
+               draft_pixbuf_close = gdk_pixbuf_copy (draft_pixbuf);
+               gdk_pixbuf_composite (emblem, draft_pixbuf_close, 0, 0, 
+                                     MIN (gdk_pixbuf_get_width (emblem), 
+                                          gdk_pixbuf_get_width (draft_pixbuf_close)),
+                                     MIN (gdk_pixbuf_get_height (emblem), 
+                                          gdk_pixbuf_get_height (draft_pixbuf_close)),
+                                     0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
+               g_object_unref (emblem);
+           }
+
+
+           pixbuf = g_object_ref (draft_pixbuf);
+           pixbuf_open = g_object_ref (draft_pixbuf_open);
+           pixbuf_close = g_object_ref (draft_pixbuf_close);
+
+           break;      
        case TNY_FOLDER_TYPE_NORMAL:
        default:
-               pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_NORMAL);
-               break;
-       }
-       
-       g_object_unref (G_OBJECT (instance));
-       g_free (fname);
-
-       /* Set pixbuf */
-       g_object_set (rendobj, "pixbuf", pixbuf, NULL);
-       if (has_children && (pixbuf != NULL)) {
-               GdkPixbuf *open_pixbuf, *closed_pixbuf;
-               GdkPixbuf *open_emblem, *closed_emblem;
-               open_pixbuf = gdk_pixbuf_copy (pixbuf);
-               closed_pixbuf = gdk_pixbuf_copy (pixbuf);
-               open_emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp");
-               closed_emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp");
-
-               if (open_emblem) {
-                       gdk_pixbuf_composite (open_emblem, open_pixbuf, 0, 0, 
-                                             MIN (gdk_pixbuf_get_width (open_emblem), 
-                                                  gdk_pixbuf_get_width (open_pixbuf)),
-                                             MIN (gdk_pixbuf_get_height (open_emblem), 
-                                                  gdk_pixbuf_get_height (open_pixbuf)),
+               if (!normal_pixbuf)
+                       normal_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_NORMAL,
+                                                                                  MODEST_ICON_SIZE_SMALL));
+               
+               if (!normal_pixbuf_open) {
+                       GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp",
+                                                                     MODEST_ICON_SIZE_SMALL);
+                       normal_pixbuf_open = gdk_pixbuf_copy (normal_pixbuf);
+                       gdk_pixbuf_composite (emblem, normal_pixbuf_open, 0, 0, 
+                                             MIN (gdk_pixbuf_get_width (emblem), 
+                                                  gdk_pixbuf_get_width (normal_pixbuf_open)),
+                                             MIN (gdk_pixbuf_get_height (emblem), 
+                                                  gdk_pixbuf_get_height (normal_pixbuf_open)),
                                              0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
-                       g_object_set (rendobj, "pixbuf-expander-open", open_pixbuf, NULL);
-                       g_object_unref (open_emblem);
+                       g_object_unref (emblem);
                }
-               if (closed_emblem) {
-                       gdk_pixbuf_composite (closed_emblem, closed_pixbuf, 0, 0, 
-                                             MIN (gdk_pixbuf_get_width (closed_emblem), 
-                                                  gdk_pixbuf_get_width (closed_pixbuf)),
-                                             MIN (gdk_pixbuf_get_height (closed_emblem), 
-                                                  gdk_pixbuf_get_height (closed_pixbuf)),
+               
+               if (!normal_pixbuf_close) {
+                       GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp",
+                                                                     MODEST_ICON_SIZE_SMALL);
+                       normal_pixbuf_close = gdk_pixbuf_copy (normal_pixbuf);
+                       gdk_pixbuf_composite (emblem, normal_pixbuf_close, 0, 0, 
+                                             MIN (gdk_pixbuf_get_width (emblem), 
+                                                  gdk_pixbuf_get_width (normal_pixbuf_close)),
+                                             MIN (gdk_pixbuf_get_height (emblem), 
+                                                  gdk_pixbuf_get_height (normal_pixbuf_close)),
                                              0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
-                       g_object_set (rendobj, "pixbuf-expander-closed", closed_pixbuf, NULL);
-                       g_object_unref (closed_emblem);
+                       g_object_unref (emblem);
                }
-               if (closed_pixbuf)
-                       g_object_unref (closed_pixbuf);
-               if (open_pixbuf)
-                       g_object_unref (open_pixbuf);
+               
+               
+           pixbuf = g_object_ref (normal_pixbuf);
+           pixbuf_open = g_object_ref (normal_pixbuf_open);
+           pixbuf_close = g_object_ref (normal_pixbuf_close);
+
+           break;      
+
+       }
+
+       retval->pixbuf = pixbuf;
+       retval->pixbuf_open = pixbuf_open;
+       retval->pixbuf_close = pixbuf_close;
+
+       return retval;
+}
+
+
+static void
+free_pixbufs (ThreePixbufs *pixbufs)
+{
+       g_object_unref (pixbufs->pixbuf);
+       g_object_unref (pixbufs->pixbuf_open);
+       g_object_unref (pixbufs->pixbuf_close);
+       g_slice_free (ThreePixbufs, pixbufs);
+}
+
+static void
+icon_cell_data  (GtkTreeViewColumn *column,  
+                GtkCellRenderer *renderer,
+                GtkTreeModel *tree_model,  
+                GtkTreeIter *iter, 
+                gpointer data)
+{
+       GObject *rendobj = NULL, *instance = NULL;
+       TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
+       gboolean has_children;
+       ThreePixbufs *pixbufs;
+
+       rendobj = (GObject *) renderer;
+
+       gtk_tree_model_get (tree_model, iter,
+                           TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
+                           TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &instance,
+                           -1);
+
+       if (!instance) 
+               return;
+
+       has_children = gtk_tree_model_iter_has_child (tree_model, iter);
+       pixbufs = get_folder_icons (type, instance);    
+       g_object_unref (instance);
+
+       /* Set pixbuf */
+       g_object_set (rendobj, "pixbuf", pixbufs->pixbuf, NULL);
+
+       if (has_children) {
+               g_object_set (rendobj, "pixbuf-expander-open", pixbufs->pixbuf_open, NULL);
+               g_object_set (rendobj, "pixbuf-expander-closed", pixbufs->pixbuf_close, NULL);
        }
 
-       if (pixbuf != NULL)
-               g_object_unref (pixbuf);
+       free_pixbufs (pixbufs);
+
+       return;
 }
 
 static void
@@ -600,7 +987,9 @@ add_columns (GtkWidget *treeview)
                                                icon_cell_data, treeview, NULL);
        
        renderer = gtk_cell_renderer_text_new();
-       gtk_tree_view_column_pack_start (column, renderer, FALSE);
+       g_object_set (renderer, "ellipsize", PANGO_ELLIPSIZE_END, 
+                       "ellipsize-set", TRUE, NULL);
+       gtk_tree_view_column_pack_start (column, renderer, TRUE);
        gtk_tree_view_column_set_cell_data_func(column, renderer,
                                                text_cell_data, treeview, NULL);
        
@@ -635,6 +1024,8 @@ modest_folder_view_init (ModestFolderView *obj)
        priv->visible_account_id = NULL;
        priv->folder_to_select = NULL;
 
+       priv->reexpand = TRUE;
+
        /* Initialize the local account name */
        conf = modest_runtime_get_conf();
        priv->local_account_name = modest_conf_get_string (conf, MODEST_CONF_DEVICE_NAME, NULL);
@@ -657,14 +1048,20 @@ modest_folder_view_init (ModestFolderView *obj)
                          "key-press-event", 
                          G_CALLBACK (on_key_pressed), NULL);
 
+       priv->display_name_changed_signal = 
+               g_signal_connect (modest_runtime_get_account_mgr (),
+                                 "display_name_changed",
+                                 G_CALLBACK (on_display_name_changed),
+                                 obj);
+
        /*
         * Track changes in the local account name (in the device it
         * will be the device name)
         */
-       priv->conf_key_signal = 
-               g_signal_connect (G_OBJECT(conf), 
-                                 "key_changed",
-                                 G_CALLBACK(on_configuration_key_changed), obj);
+       priv->conf_key_signal = g_signal_connect (G_OBJECT(conf), 
+                                                 "key_changed",
+                                                 G_CALLBACK(on_configuration_key_changed), 
+                                                 obj);
 }
 
 static void
@@ -694,11 +1091,11 @@ modest_folder_view_finalize (GObject *obj)
 
        if (priv->account_store) {
                g_signal_handler_disconnect (G_OBJECT(priv->account_store),
-                                            priv->account_update_signal);
-               g_signal_handler_disconnect (G_OBJECT(priv->account_store),
-                                            priv->accounts_reloaded_signal);
+                                            priv->account_inserted_signal);
                g_signal_handler_disconnect (G_OBJECT(priv->account_store),
                                             priv->account_removed_signal);
+               g_signal_handler_disconnect (G_OBJECT(priv->account_store),
+                                            priv->account_changed_signal);
                g_object_unref (G_OBJECT(priv->account_store));
                priv->account_store = NULL;
        }
@@ -708,6 +1105,7 @@ modest_folder_view_finalize (GObject *obj)
                priv->query = NULL;
        }
 
+/*     modest_folder_view_disable_next_folder_selection (MODEST_FOLDER_VIEW(obj)); */
        if (priv->folder_to_select) {
                g_object_unref (G_OBJECT(priv->folder_to_select));
                priv->folder_to_select = NULL;
@@ -729,7 +1127,6 @@ modest_folder_view_finalize (GObject *obj)
        if (priv->cur_folder_store) {
                if (TNY_IS_FOLDER(priv->cur_folder_store))
                        tny_folder_sync (TNY_FOLDER(priv->cur_folder_store), FALSE, NULL);
-                       /* FALSE --> expunge the message */
 
                g_object_unref (priv->cur_folder_store);
                priv->cur_folder_store = NULL;
@@ -756,88 +1153,224 @@ modest_folder_view_set_account_store (TnyAccountStoreView *self, TnyAccountStore
 
        if (G_UNLIKELY (priv->account_store)) {
 
-               if (g_signal_handler_is_connected (G_OBJECT (priv->account_store), 
-                                                  priv->account_update_signal))
-                       g_signal_handler_disconnect (G_OBJECT (priv->account_store), 
-                                                    priv->account_update_signal);
-               if (g_signal_handler_is_connected (G_OBJECT (priv->account_store), 
-                                                  priv->accounts_reloaded_signal))
-                       g_signal_handler_disconnect (G_OBJECT (priv->account_store), 
-                                                    priv->accounts_reloaded_signal);
+               if (g_signal_handler_is_connected (G_OBJECT (priv->account_store),
+                                                  priv->account_inserted_signal))
+                       g_signal_handler_disconnect (G_OBJECT (priv->account_store),
+                                                    priv->account_inserted_signal);
                if (g_signal_handler_is_connected (G_OBJECT (priv->account_store), 
                                                   priv->account_removed_signal))
                        g_signal_handler_disconnect (G_OBJECT (priv->account_store), 
                                                     priv->account_removed_signal);
-
+               if (g_signal_handler_is_connected (G_OBJECT (priv->account_store), 
+                                                  priv->account_changed_signal))
+                       g_signal_handler_disconnect (G_OBJECT (priv->account_store), 
+                                                    priv->account_changed_signal);
                g_object_unref (G_OBJECT (priv->account_store));
        }
 
        priv->account_store = g_object_ref (G_OBJECT (account_store));
 
-       priv->account_update_signal = 
-               g_signal_connect (G_OBJECT(account_store), "account_update",
-                                 G_CALLBACK (on_account_update), self);
-
        priv->account_removed_signal = 
                g_signal_connect (G_OBJECT(account_store), "account_removed",
                                  G_CALLBACK (on_account_removed), self);
 
-       priv->accounts_reloaded_signal = 
-               g_signal_connect (G_OBJECT(account_store), "accounts_reloaded",
-                                 G_CALLBACK (on_accounts_reloaded), self);
+       priv->account_inserted_signal =
+               g_signal_connect (G_OBJECT(account_store), "account_inserted",
+                                 G_CALLBACK (on_account_inserted), self);
 
-       g_signal_connect (G_OBJECT(account_store), "connecting_finished",
-                               G_CALLBACK (on_accounts_reloaded), self);
+       priv->account_changed_signal =
+               g_signal_connect (G_OBJECT(account_store), "account_changed",
+                                 G_CALLBACK (on_account_changed), self);
 
-       on_accounts_reloaded (account_store, (gpointer ) self);
+       modest_folder_view_update_model (MODEST_FOLDER_VIEW (self), account_store);
        
        g_object_unref (G_OBJECT (device));
 }
 
 static void
-on_account_removed (TnyAccountStore *account_store, 
-                   TnyAccount *account,
+on_connection_status_changed (TnyAccount *self, 
+                             TnyConnectionStatus status, 
+                             gpointer user_data)
+{
+       /* If the account becomes online then refresh it */
+       if (status == TNY_CONNECTION_STATUS_CONNECTED) {
+               const gchar *acc_name;
+               GtkWidget *my_window;
+
+               my_window = gtk_widget_get_ancestor (GTK_WIDGET (user_data), MODEST_TYPE_WINDOW);
+               acc_name = modest_tny_account_get_parent_modest_account_name_for_server_account (self);
+               modest_ui_actions_do_send_receive (acc_name, MODEST_WINDOW (my_window));
+       }
+}
+
+static void
+on_account_inserted (TnyAccountStore *account_store, 
+                    TnyAccount *account,
+                    gpointer user_data)
+{
+       ModestFolderViewPrivate *priv;
+       GtkTreeModel *sort_model, *filter_model;
+
+       /* Ignore transport account insertions, we're not showing them
+          in the folder view */
+       if (TNY_IS_TRANSPORT_ACCOUNT (account))
+               return;
+
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (user_data);
+
+       /* If we're adding a new account, and there is no previous
+          one, we need to select the visible server account */
+       if (priv->style == MODEST_FOLDER_VIEW_STYLE_SHOW_ONE &&
+           !priv->visible_account_id)
+               modest_widget_memory_restore (modest_runtime_get_conf(), 
+                                             G_OBJECT (user_data),
+                                             MODEST_CONF_FOLDER_VIEW_KEY);
+
+       /* Get the inner model */
+       filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (user_data));
+       sort_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model));
+
+       /* Insert the account in the model */
+       tny_list_append (TNY_LIST (gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (sort_model))),
+                        G_OBJECT (account));
+
+
+       /* When the store account gets online refresh it */
+       g_signal_connect (account, "connection_status_changed", 
+                         G_CALLBACK (on_connection_status_changed), 
+                         MODEST_FOLDER_VIEW (user_data));
+
+       /* Refilter the model */
+       gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model));
+}
+
+
+static void
+on_account_changed (TnyAccountStore *account_store, 
+                   TnyAccount *tny_account,
                    gpointer user_data)
 {
-       ModestFolderView *self = MODEST_FOLDER_VIEW (user_data);
        ModestFolderViewPrivate *priv;
+       GtkTreeModel *sort_model, *filter_model;
 
-       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
+       /* Ignore transport account insertions, we're not showing them
+          in the folder view */
+       if (TNY_IS_TRANSPORT_ACCOUNT (tny_account))
+               return;
 
-       /* If the removed account is the currently viewed one then
-          clear the configuration value. The new visible account will be the default account */
-       if (!strcmp (priv->visible_account_id, tny_account_get_id (account))) {
-               modest_folder_view_set_account_id_of_visible_server_account (self, NULL);
-       }
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (user_data);
+
+       /* Get the inner model */
+       filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (user_data));
+       sort_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model));
+
+       /* Remove the account from the model */
+       tny_list_remove (TNY_LIST (gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (sort_model))),
+                        G_OBJECT (tny_account));
+
+       /* Insert the account in the model */
+       tny_list_append (TNY_LIST (gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (sort_model))),
+                        G_OBJECT (tny_account));
+
+       /* Refilter the model */
+       gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model));
 }
 
+/**
+ *
+ * Selects the first inbox or the local account in an idle
+ */
+static gboolean
+on_idle_select_first_inbox_or_local (gpointer user_data)
+{
+       ModestFolderView *self = MODEST_FOLDER_VIEW (user_data);
+
+       modest_folder_view_select_first_inbox_or_local (self);
+
+       return FALSE;
+}
+
+
 static void
-on_account_update (TnyAccountStore *account_store, 
-                  const gchar *account,
-                  gpointer user_data)
+on_account_removed (TnyAccountStore *account_store, 
+                   TnyAccount *account,
+                   gpointer user_data)
 {
        ModestFolderView *self = NULL;
        ModestFolderViewPrivate *priv;
+       GtkTreeModel *sort_model, *filter_model;
+       GtkTreeSelection *sel = NULL;
+       gboolean same_account_selected = FALSE;
+
+       /* Ignore transport account removals, we're not showing them
+          in the folder view */
+       if (TNY_IS_TRANSPORT_ACCOUNT (account))
+               return;
 
-       g_return_if_fail (MODEST_IS_FOLDER_VIEW (user_data));
        self = MODEST_FOLDER_VIEW (user_data);
        priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
 
-       if (!priv->visible_account_id)
+       /* Invalidate the cur_folder_store only if the selected folder
+          belongs to the account that is being removed */
+       if (priv->cur_folder_store) {
+               TnyAccount *selected_folder_account = NULL;
+
+               if (TNY_IS_FOLDER (priv->cur_folder_store)) {
+                       selected_folder_account = 
+                               tny_folder_get_account (TNY_FOLDER (priv->cur_folder_store));
+               } else {
+                       selected_folder_account = 
+                               TNY_ACCOUNT (g_object_ref (priv->cur_folder_store));
+               }
+
+               if (selected_folder_account == account) {
+                       sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
+                       gtk_tree_selection_unselect_all (sel);
+                       same_account_selected = TRUE;
+               }
+               g_object_unref (selected_folder_account);
+       }
+
+       /* Invalidate row to select only if the folder to select
+          belongs to the account that is being removed*/
+       if (priv->folder_to_select) {
+               TnyAccount *folder_to_select_account = NULL;
+
+               folder_to_select_account = tny_folder_get_account (priv->folder_to_select);
+               if (folder_to_select_account == account) {
+                       modest_folder_view_disable_next_folder_selection (self);
+                       g_object_unref (priv->folder_to_select);
+                       priv->folder_to_select = NULL;
+               }
+               g_object_unref (folder_to_select_account);
+       }
+
+       /* Remove the account from the model */
+       filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+       sort_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model));
+       tny_list_remove (TNY_LIST (gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (sort_model))),
+                        G_OBJECT (account));
+
+       /* If the removed account is the currently viewed one then
+          clear the configuration value. The new visible account will be the default account */
+       if (priv->visible_account_id &&
+           !strcmp (priv->visible_account_id, tny_account_get_id (account))) {
+
+               /* Clear the current visible account_id */
+               modest_folder_view_set_account_id_of_visible_server_account (self, NULL);
+
+               /* Call the restore method, this will set the new visible account */
                modest_widget_memory_restore (modest_runtime_get_conf(), G_OBJECT(self),
                                              MODEST_CONF_FOLDER_VIEW_KEY);
+       }
 
-       if (!modest_folder_view_update_model (self, account_store))
-               g_printerr ("modest: failed to update model for changes in '%s'",
-                           account);
-}
+       /* Refilter the model */
+       gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model));
 
-static void 
-on_accounts_reloaded   (TnyAccountStore *account_store, 
-                       gpointer user_data)
-{
-       g_return_if_fail (MODEST_IS_FOLDER_VIEW (user_data));
-       modest_folder_view_update_model (MODEST_FOLDER_VIEW (user_data), account_store);
+       /* Select the first INBOX if the currently selected folder
+          belongs to the account that is being deleted */
+       if (same_account_selected)
+               g_idle_add (on_idle_select_first_inbox_or_local, self);
 }
 
 void
@@ -845,7 +1378,7 @@ modest_folder_view_set_title (ModestFolderView *self, const gchar *title)
 {
        GtkTreeViewColumn *col;
        
-       g_return_if_fail (self);
+       g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self));
 
        col = gtk_tree_view_get_column (GTK_TREE_VIEW(self), 0);
        if (!col) {
@@ -876,9 +1409,20 @@ modest_folder_view_on_map (ModestFolderView *self,
                   be a bug, because the INBOX is not selected, but we
                   need to rewrite some parts of Modest to avoid the
                   deathlock situation */
-/*             modest_folder_view_select_first_inbox_or_local (self); */
+               /* TODO: check if this is still the case */
                priv->reselect = FALSE;
+               modest_folder_view_select_first_inbox_or_local (self);
+               /* Notify the display name observers */
+               g_signal_emit (G_OBJECT(self),
+                              signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL], 0,
+                              NULL);
        }
+
+       if (priv->reexpand) {
+               expand_root_items (self); 
+               priv->reexpand = FALSE;
+       }
+
        return FALSE;
 }
 
@@ -909,11 +1453,17 @@ static void
 expand_root_items (ModestFolderView *self)
 {
        GtkTreePath *path;
+       GtkTreeModel *model;
+       GtkTreeIter iter;
+
+       model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
        path = gtk_tree_path_new_first ();
 
        /* all folders should have child items, so.. */
-       while (gtk_tree_view_expand_row (GTK_TREE_VIEW(self), path, FALSE))
+       do {
+               gtk_tree_view_expand_row (GTK_TREE_VIEW(self), path, FALSE);
                gtk_tree_path_next (path);
+       } while (gtk_tree_model_get_iter (model, &iter, path));
        
        gtk_tree_path_free (path);
 }
@@ -924,9 +1474,7 @@ expand_root_items (ModestFolderView *self)
  * account in this case, and the local folders.
  */
 static gboolean 
-filter_row (GtkTreeModel *model,
-           GtkTreeIter *iter,
-           gpointer data)
+filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
 {
        ModestFolderViewPrivate *priv;
        gboolean retval = TRUE;
@@ -936,7 +1484,7 @@ filter_row (GtkTreeModel *model,
        guint i;
        gboolean found = FALSE;
        gboolean cleared = FALSE;
-       
+
        g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (data), FALSE);
        priv = MODEST_FOLDER_VIEW_GET_PRIVATE (data);
 
@@ -961,11 +1509,17 @@ filter_row (GtkTreeModel *model,
        
                        /* If it isn't a special folder, 
                         * don't show it unless it is the visible account: */
-                       if (!modest_tny_account_is_virtual_local_folders (acc) &&
-                               strcmp (account_id, MODEST_MMC_ACCOUNT_ID)) { 
+                       if (priv->style == MODEST_FOLDER_VIEW_STYLE_SHOW_ONE &&
+                           !modest_tny_account_is_virtual_local_folders (acc) &&
+                           strcmp (account_id, MODEST_MMC_ACCOUNT_ID)) {
+                               
                                /* Show only the visible account id */
-                               if (priv->visible_account_id && strcmp (account_id, priv->visible_account_id))
+                               if (priv->visible_account_id) {
+                                       if (strcmp (account_id, priv->visible_account_id))
+                                               retval = FALSE;
+                               } else {
                                        retval = FALSE;
+                               }                               
                        }
                        
                        /* Never show these to the user. They are merged into one folder 
@@ -974,8 +1528,6 @@ filter_row (GtkTreeModel *model,
                                retval = FALSE;
                }
        }
-       
-       /* The virtual local-folders folder store is also shown by default. */
 
        /* Check hiding (if necessary) */
        cleared = modest_email_clipboard_cleared (priv->clipboard);            
@@ -989,17 +1541,30 @@ filter_row (GtkTreeModel *model,
                retval = !found;
        }
        
-       if (!priv->show_non_move)
-       {
-               switch (type)
-               {
+       
+       /* If this is a move to dialog, hide Sent, Outbox and Drafts
+       folder as no message can be move there according to UI specs */
+       if (!priv->show_non_move) {
+               switch (type) {
                        case TNY_FOLDER_TYPE_OUTBOX:
                        case TNY_FOLDER_TYPE_SENT:
+                       case TNY_FOLDER_TYPE_DRAFTS:
                                retval = FALSE;
                                break;
+                       case TNY_FOLDER_TYPE_UNKNOWN:
+                       case TNY_FOLDER_TYPE_NORMAL:
+                               type = modest_tny_folder_guess_folder_type(TNY_FOLDER(instance));
+                               if (type == TNY_FOLDER_TYPE_INVALID)
+                                       g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
+                               
+                               if (type == TNY_FOLDER_TYPE_OUTBOX || 
+                                   type == TNY_FOLDER_TYPE_SENT
+                                   || type == TNY_FOLDER_TYPE_DRAFTS)
+                                       retval = FALSE;
+                               break;
                        default:
-                               break;  
-               }       
+                               break;
+               }
        }
        
        /* Free */
@@ -1014,13 +1579,13 @@ modest_folder_view_update_model (ModestFolderView *self,
                                 TnyAccountStore *account_store)
 {
        ModestFolderViewPrivate *priv;
-       GtkTreeModel *model /* , *old_model */;
-       /* TnyAccount *local_account; */
-       TnyList *model_as_list;
-
-       g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (self), FALSE);
-       g_return_val_if_fail (account_store, FALSE);
+       GtkTreeModel *model /* , *old_model */;                                                    
+       GtkTreeModel *filter_model = NULL, *sortable = NULL;
 
+       g_return_val_if_fail (self && MODEST_IS_FOLDER_VIEW (self), FALSE);
+       g_return_val_if_fail (account_store && MODEST_IS_TNY_ACCOUNT_STORE(account_store),
+                             FALSE);
+       
        priv =  MODEST_FOLDER_VIEW_GET_PRIVATE(self);
        
        /* Notify that there is no folder selected */
@@ -1033,22 +1598,13 @@ modest_folder_view_update_model (ModestFolderView *self,
        }
 
        /* FIXME: the local accounts are not shown when the query
-          selects only the subscribed folders. */
-/*     model        = tny_gtk_folder_store_tree_model_new (TRUE, priv->query); */
-       model        = tny_gtk_folder_store_tree_model_new (TRUE, NULL);
-       
-       /* Deal with the model via its TnyList Interface,
-        * filling the TnyList via a get_accounts() call: */
-       model_as_list = TNY_LIST(model);
+          selects only the subscribed folders */
+       model        = tny_gtk_folder_store_tree_model_new (NULL);
 
        /* Get the accounts: */
        tny_account_store_get_accounts (TNY_ACCOUNT_STORE(account_store),
-                                       model_as_list,
+                                       TNY_LIST (model),
                                        TNY_ACCOUNT_STORE_STORE_ACCOUNTS);
-       g_object_unref (model_as_list);
-       model_as_list = NULL;   
-                                                     
-       GtkTreeModel *filter_model = NULL, *sortable = NULL;
 
        sortable = gtk_tree_model_sort_new_with_model (model);
        gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable),
@@ -1056,7 +1612,7 @@ modest_folder_view_update_model (ModestFolderView *self,
                                              GTK_SORT_ASCENDING);
        gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (sortable),
                                         TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN,
-                                cmp_rows, NULL, NULL);
+                                        cmp_rows, NULL, NULL);
 
        /* Create filter model */
        filter_model = gtk_tree_model_filter_new (sortable, NULL);
@@ -1064,33 +1620,17 @@ modest_folder_view_update_model (ModestFolderView *self,
                                                filter_row,
                                                self,
                                                NULL);
-/*     if (priv->style == MODEST_FOLDER_VIEW_STYLE_SHOW_ONE) { */
-/*             filter_model = gtk_tree_model_filter_new (sortable, NULL); */
-/*             gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (filter_model), */
-/*                                                     filter_row, */
-/*                                                     self, */
-/*                                                     NULL); */
-/*     } */
 
        /* Set new model */
        gtk_tree_view_set_model (GTK_TREE_VIEW(self), filter_model);
-       g_signal_connect (G_OBJECT(filter_model), "row-changed",
-                         (GCallback)on_row_changed_maybe_select_folder, self);
        g_signal_connect (G_OBJECT(filter_model), "row-inserted",
-                         (GCallback)on_row_changed_maybe_select_folder, self);
-
-       
+                         (GCallback) on_row_inserted_maybe_select_folder, self);
 
-/*     gtk_tree_view_set_model (GTK_TREE_VIEW(self),  */
-/*                              (filter_model) ? filter_model : sortable); */
 
        g_object_unref (model);
-       g_object_unref (filter_model);
-/*     if (filter_model) */
-/*             g_object_unref (filter_model); */
-                       
+       g_object_unref (filter_model);          
        g_object_unref (sortable);
-
+       
        /* Force a reselection of the INBOX next time the widget is shown */
        priv->reselect = TRUE;
                        
@@ -1101,19 +1641,19 @@ modest_folder_view_update_model (ModestFolderView *self,
 static void
 on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
 {
-       GtkTreeModel            *model;
-       TnyFolderStore          *folder = NULL;
-       GtkTreeIter             iter;
-       ModestFolderView        *tree_view;
-       ModestFolderViewPrivate *priv;
+       GtkTreeModel *model = NULL;
+       TnyFolderStore *folder = NULL;
+       GtkTreeIter iter;
+       ModestFolderView *tree_view = NULL;
+       ModestFolderViewPrivate *priv = NULL;
+       gboolean selected = FALSE;
 
        g_return_if_fail (sel);
        g_return_if_fail (user_data);
        
        priv = MODEST_FOLDER_VIEW_GET_PRIVATE(user_data);
 
-       if(!gtk_tree_selection_get_selected (sel, &model, &iter))
-               return;
+       selected = gtk_tree_selection_get_selected (sel, &model, &iter);
 
        /* Notify the display name observers */
        g_signal_emit (G_OBJECT(user_data),
@@ -1121,25 +1661,30 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
                       NULL);
 
        tree_view = MODEST_FOLDER_VIEW (user_data);
-       gtk_tree_model_get (model, &iter,
-                           TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder,
-                           -1);
 
-       /* If the folder is the same do not notify */
-       if (priv->cur_folder_store == folder && folder) {
-               g_object_unref (folder);
-               return;
+       if (selected) {
+               gtk_tree_model_get (model, &iter,
+                                   TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder,
+                                   -1);
+
+               /* If the folder is the same do not notify */
+               if (folder && priv->cur_folder_store == folder) {
+                       g_object_unref (folder);
+                       return;
+               }
        }
        
        /* Current folder was unselected */
        if (priv->cur_folder_store) {
+               g_signal_emit (G_OBJECT(tree_view), signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0,
+                      priv->cur_folder_store, FALSE);
+
                if (TNY_IS_FOLDER(priv->cur_folder_store))
-                       tny_folder_sync_async (TNY_FOLDER(priv->cur_folder_store), 
+                       tny_folder_sync_async (TNY_FOLDER(priv->cur_folder_store),
                                               FALSE, NULL, NULL, NULL);
+
                /* FALSE --> don't expunge the messages */
 
-               g_signal_emit (G_OBJECT(tree_view), signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0,
-                      priv->cur_folder_store, FALSE);
                g_object_unref (priv->cur_folder_store);
                priv->cur_folder_store = NULL;
        }
@@ -1147,18 +1692,21 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
        /* New current references */
        priv->cur_folder_store = folder;
 
-       /* New folder has been selected */
-       g_signal_emit (G_OBJECT(tree_view),
-                      signals[FOLDER_SELECTION_CHANGED_SIGNAL],
-                      0, priv->cur_folder_store, TRUE);
+       /* New folder has been selected. Do not notify if there is
+          nothing new selected */
+       if (selected) {
+               g_signal_emit (G_OBJECT(tree_view),
+                              signals[FOLDER_SELECTION_CHANGED_SIGNAL],
+                              0, priv->cur_folder_store, TRUE);
+       }
 }
 
 TnyFolderStore *
 modest_folder_view_get_selected (ModestFolderView *self)
 {
        ModestFolderViewPrivate *priv;
-
-       g_return_val_if_fail (self, NULL);
+       
+       g_return_val_if_fail (self && MODEST_IS_FOLDER_VIEW(self), NULL);
        
        priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
        if (priv->cur_folder_store)
@@ -1225,7 +1773,7 @@ static gint
 cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
          gpointer user_data)
 {
-       gint cmp;
+       gint cmp = 0;
        gchar *name1 = NULL;
        gchar *name2 = NULL;
        TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
@@ -1249,7 +1797,7 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
           folder copy/move actually occurs, so there could be
           situations where the model to be drawn is not correct */
        if (!folder1 || !folder2)
-               return 0;
+               goto finish;
 
        if (type == TNY_FOLDER_TYPE_ROOT) {
                /* Compare the types, so that 
@@ -1276,16 +1824,17 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
                        const gchar *account_id = account1 ? tny_account_get_id (account1) : NULL;
                        const gchar *account_id2 = account2 ? tny_account_get_id (account2) : NULL;
        
-                       if (!account_id && !account_id2)
-                               return 0;
-                       else if (!account_id)
-                               return -1;
-                       else if (!account_id2)
-                               return +1;
-                       else if (!strcmp (account_id, MODEST_MMC_ACCOUNT_ID))
+                       if (!account_id && !account_id2) {
+                               cmp = 0;
+                       } else if (!account_id) {
+                               cmp = -1;
+                       } else if (!account_id2) {
                                cmp = +1;
-                       else
+                       } else if (!strcmp (account_id, MODEST_MMC_ACCOUNT_ID)) {
+                               cmp = +1;
+                       } else {
                                cmp = modest_text_utils_utf8_strcmp (name1, name2, TRUE);
+                       }
                }
        } else {
                gint cmp1 = 0, cmp2 = 0;
@@ -1304,12 +1853,14 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
                        if ((parent_type == TNY_FOLDER_TYPE_ROOT) &&
                            TNY_IS_ACCOUNT (parent_folder) &&
                            modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (parent_folder))) {
-                               cmp1 = get_cmp_subfolder_type_pos (modest_tny_folder_get_local_folder_type (TNY_FOLDER (folder1)));
-                               cmp2 = get_cmp_subfolder_type_pos (modest_tny_folder_get_local_folder_type (TNY_FOLDER (folder2)));
+                               cmp1 = get_cmp_subfolder_type_pos (modest_tny_folder_get_local_or_mmc_folder_type
+                                                                  (TNY_FOLDER (folder1)));
+                               cmp2 = get_cmp_subfolder_type_pos (modest_tny_folder_get_local_or_mmc_folder_type
+                                                                  (TNY_FOLDER (folder2)));
                        }
                        g_object_unref (parent_folder);
                }
-
+               
                /* if they are not local folders */
                if (cmp1 == cmp2) {
                        cmp1 = get_cmp_subfolder_type_pos (tny_folder_get_folder_type (TNY_FOLDER (folder1)));
@@ -1321,7 +1872,8 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
                else 
                        cmp = (cmp1 - cmp2);
        }
-       
+
+finish:        
        if (folder1)
                g_object_unref(G_OBJECT(folder1));
        if (folder2)
@@ -1336,34 +1888,30 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
 /*****************************************************************************/
 /*                        DRAG and DROP stuff                                */
 /*****************************************************************************/
-
 /*
  * This function fills the #GtkSelectionData with the row and the
  * model that has been dragged. It's called when this widget is a
  * source for dnd after the event drop happened
  */
 static void
-on_drag_data_get (GtkWidget *widget, 
-                 GdkDragContext *context, 
-                 GtkSelectionData *selection_data, 
-                 guint info, 
-                 guint time, 
-                 gpointer data)
+on_drag_data_get (GtkWidget *widget, GdkDragContext *context, GtkSelectionData *selection_data, 
+                 guint info, guint time, gpointer data)
 {
        GtkTreeSelection *selection;
        GtkTreeModel *model;
        GtkTreeIter iter;
        GtkTreePath *source_row;
-
+       
        selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget));
-       gtk_tree_selection_get_selected (selection, &model, &iter);
-       source_row = gtk_tree_model_get_path (model, &iter);
-
-       gtk_tree_set_row_drag_data (selection_data,
-                                   model,
-                                   source_row);
+       if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
 
-       gtk_tree_path_free (source_row);
+               source_row = gtk_tree_model_get_path (model, &iter);
+               gtk_tree_set_row_drag_data (selection_data,
+                                           model,
+                                           source_row);
+               
+               gtk_tree_path_free (source_row);
+       }
 }
 
 typedef struct _DndHelper {
@@ -1373,6 +1921,13 @@ typedef struct _DndHelper {
        guint time;
 } DndHelper;
 
+static void
+dnd_helper_destroyer (DndHelper *helper)
+{
+       /* Free the helper */
+       gtk_tree_path_free (helper->source_row);
+       g_slice_free (DndHelper, helper);
+}
 
 /*
  * This function is the callback of the
@@ -1384,19 +1939,16 @@ typedef struct _DndHelper {
  * and drop action
  */
 static void
-on_progress_changed (ModestMailOperation *mail_op, 
-                    ModestMailOperationState *state,
-                    gpointer user_data)
+xfer_cb (ModestMailOperation *mail_op, 
+        gpointer user_data)
 {
        gboolean success;
        DndHelper *helper;
 
        helper = (DndHelper *) user_data;
 
-       if (!state->finished)
-               return;
-
-       if (state->status == MODEST_MAIL_OPERATION_STATUS_SUCCESS) {
+       if (modest_mail_operation_get_status (mail_op) == 
+           MODEST_MAIL_OPERATION_STATUS_SUCCESS) {
                success = TRUE;
        } else {
                success = FALSE;
@@ -1407,8 +1959,22 @@ on_progress_changed (ModestMailOperation *mail_op,
        gtk_drag_finish (helper->context, success, FALSE, helper->time);
 
        /* Free the helper */
-       gtk_tree_path_free (helper->source_row);        
-       g_slice_free (DndHelper, helper);
+       dnd_helper_destroyer (helper);
+}
+
+/* get the folder for the row the treepath refers to. */
+/* folder must be unref'd */
+static TnyFolderStore *
+tree_path_to_folder (GtkTreeModel *model, GtkTreePath *path)
+{
+       GtkTreeIter iter;
+       TnyFolderStore *folder = NULL;
+       
+       if (gtk_tree_model_get_iter (model,&iter, path))
+               gtk_tree_model_get (model, &iter,
+                                   TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder,
+                                   -1);
+       return folder;
 }
 
 /*
@@ -1420,67 +1986,202 @@ static void
 drag_and_drop_from_header_view (GtkTreeModel *source_model,
                                GtkTreeModel *dest_model,
                                GtkTreePath  *dest_row,
+                               GtkSelectionData *selection_data,
                                DndHelper    *helper)
 {
        TnyList *headers = NULL;
-       TnyHeader *header = NULL;
        TnyFolder *folder = NULL;
+       TnyFolderType folder_type;
        ModestMailOperation *mail_op = NULL;
        GtkTreeIter source_iter, dest_iter;
+       ModestWindowMgr *mgr = NULL;
+       ModestWindow *main_win = NULL;
+       gchar **uris, **tmp;
+       gint response;
 
-       g_return_if_fail (GTK_IS_TREE_MODEL(source_model));
-       g_return_if_fail (GTK_IS_TREE_MODEL(dest_model));
-       g_return_if_fail (dest_row);
-       g_return_if_fail (helper);
-       
-       /* Get header */
-       gtk_tree_model_get_iter (source_model, &source_iter, helper->source_row);
-       gtk_tree_model_get (source_model, &source_iter, 
-                           TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, 
-                           &header, -1);
-       if (!TNY_IS_HEADER(header)) {
-               g_warning ("BUG: %s could not get a valid header", __FUNCTION__);
-               goto cleanup;
+       /* Build the list of headers */
+       mgr = modest_runtime_get_window_mgr ();
+       headers = tny_simple_list_new ();
+       uris = modest_dnd_selection_data_get_paths (selection_data);
+       tmp = uris;
+
+       while (*tmp != NULL) {
+               TnyHeader *header;
+               GtkTreePath *path;
+
+               /* Get header */
+               path = gtk_tree_path_new_from_string (*tmp);
+               gtk_tree_model_get_iter (source_model, &source_iter, path);
+               gtk_tree_model_get (source_model, &source_iter, 
+                                   TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, 
+                                   &header, -1);
+
+               /* Do not enable d&d of headers already opened */
+               if (!modest_window_mgr_find_registered_header(mgr, header, NULL))
+                       tny_list_append (headers, G_OBJECT (header));
+
+               /* Free and go on */
+               gtk_tree_path_free (path);
+               g_object_unref (header);
+               tmp++;
        }
-       
-       /* Get Folder */
+       g_strfreev (uris);
+
+       /* Get the target folder */
        gtk_tree_model_get_iter (dest_model, &dest_iter, dest_row);
        gtk_tree_model_get (dest_model, &dest_iter, 
-                           TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, 
+                           TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN,
                            &folder, -1);
-
-       if (!TNY_IS_FOLDER(folder)) {
-               g_warning ("BUG: %s could not get a valid folder", __FUNCTION__);
+       
+       if (!folder || !TNY_IS_FOLDER(folder)) {
+/*             g_warning ("%s: not a valid target folder (%p)", __FUNCTION__, folder); */
                goto cleanup;
        }
+       
+       folder_type = modest_tny_folder_guess_folder_type (folder);
+       if (folder_type == TNY_FOLDER_TYPE_INVALID) {
+/*             g_warning ("%s: invalid target folder", __FUNCTION__); */
+               goto cleanup;  /* cannot move messages there */
+       }
+       
+       if (modest_tny_folder_get_rules((TNY_FOLDER(folder))) & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE) {
+/*             g_warning ("folder not writable"); */
+               goto cleanup; /* verboten! */
+       }
+       
+       /* Ask for confirmation to move */
+       main_win = modest_window_mgr_get_main_window (mgr, FALSE); /* don't create */
+       if (!main_win) {
+               g_warning ("%s: BUG: no main window found", __FUNCTION__);
+               goto cleanup;
+       }
+
+       response = modest_ui_actions_msgs_move_to_confirmation (main_win, folder, 
+                                                               TRUE, headers);
+       if (response == GTK_RESPONSE_CANCEL)
+               goto cleanup;
+
+       /* Transfer messages */
+       mail_op = modest_mail_operation_new_with_error_handling ((GObject *) main_win,
+                                                                modest_ui_actions_move_folder_error_handler,
+                                                                NULL, NULL);
 
-       /* Transfer message */
-       mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, NULL);
        modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
                                         mail_op);
-       g_signal_connect (G_OBJECT (mail_op), "progress-changed",
-                         G_CALLBACK (on_progress_changed), helper);
 
-       headers = tny_simple_list_new ();
-       tny_list_append (headers, G_OBJECT (header));
-       modest_mail_operation_xfer_msgs (mail_op, 
+       modest_mail_operation_xfer_msgs (mail_op,
                                         headers, 
                                         folder, 
                                         helper->delete_source, 
-                                        NULL, NULL);
+                                        xfer_cb, helper);
        
        /* Frees */
 cleanup:
        if (G_IS_OBJECT(mail_op))
                g_object_unref (G_OBJECT (mail_op));
-       if (G_IS_OBJECT(header))
-               g_object_unref (G_OBJECT (header));
        if (G_IS_OBJECT(folder))
                g_object_unref (G_OBJECT (folder));
        if (G_IS_OBJECT(headers))
                g_object_unref (headers);
 }
 
+typedef struct {
+       TnyFolderStore *src_folder;
+       TnyFolderStore *dst_folder;
+       DndHelper *helper; 
+} DndFolderInfo;
+
+static void
+dnd_folder_info_destroyer (DndFolderInfo *info)
+{
+       if (info->src_folder)
+               g_object_unref (info->src_folder);
+       if (info->dst_folder)
+               g_object_unref (info->dst_folder);
+       g_slice_free (DndFolderInfo, info);
+}
+
+static void
+dnd_on_connection_failed_destroyer (DndFolderInfo *info,
+                                   GtkWindow *parent_window,
+                                   TnyAccount *account)
+{
+       time_t dnd_time = info->helper->time;
+       GdkDragContext *context = info->helper->context;
+       
+       /* Show error */
+       modest_ui_actions_on_account_connection_error (parent_window, account);
+
+       /* Free the helper & info */
+       dnd_helper_destroyer (info->helper);
+       dnd_folder_info_destroyer (info);
+       
+       /* Notify the drag source. Never call delete, the monitor will
+          do the job if needed */
+       gtk_drag_finish (context, FALSE, FALSE, dnd_time);
+       return;
+}
+
+static void
+drag_and_drop_from_folder_view_src_folder_performer (gboolean canceled, 
+                                                    GError *err,
+                                                    GtkWindow *parent_window, 
+                                                    TnyAccount *account, 
+                                                    gpointer user_data)
+{
+       DndFolderInfo *info = NULL;
+       ModestMailOperation *mail_op;
+
+       info = (DndFolderInfo *) user_data;
+
+       if (err || canceled) {
+               dnd_on_connection_failed_destroyer (info, parent_window, account);
+               return;
+       }
+
+       /* Do the mail operation */
+       mail_op = modest_mail_operation_new_with_error_handling ((GObject *) parent_window,
+                                                                modest_ui_actions_move_folder_error_handler,
+                                                                info->src_folder, NULL);
+
+       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
+                                        mail_op);
+
+       /* Transfer the folder */
+       modest_mail_operation_xfer_folder (mail_op,
+                                          TNY_FOLDER (info->src_folder),
+                                          info->dst_folder,
+                                          info->helper->delete_source,
+                                          xfer_cb,
+                                          info->helper);
+       
+       g_object_unref (G_OBJECT (mail_op));
+}
+
+
+static void
+drag_and_drop_from_folder_view_dst_folder_performer (gboolean canceled, 
+                                                    GError *err,
+                                                    GtkWindow *parent_window, 
+                                                    TnyAccount *account, 
+                                                    gpointer user_data)
+{
+       DndFolderInfo *info = NULL;
+
+       info = (DndFolderInfo *) user_data;
+
+       if (err || canceled) {
+               dnd_on_connection_failed_destroyer (info, parent_window, account);
+               return;
+       }
+
+       /* Connect to source folder and perform the copy/move */
+       modest_platform_connect_if_remote_and_perform (NULL, 
+                                                      info->src_folder,
+                                                      drag_and_drop_from_folder_view_src_folder_performer,
+                                                      info);
+}
+
 /*
  * This function is used by drag_data_received_cb to manage drag and
  * drop of a folder, i.e, and drag from the folder view to the same
@@ -1493,18 +2194,49 @@ drag_and_drop_from_folder_view (GtkTreeModel     *source_model,
                                GtkSelectionData *selection_data,
                                DndHelper        *helper)
 {
-       ModestMailOperation *mail_op = NULL;
-       GtkTreeIter parent_iter, iter;
-       TnyFolderStore *parent_folder = NULL;
-       TnyFolder *folder = NULL;
+       GtkTreeIter dest_iter, iter;
+       TnyFolderStore *dest_folder = NULL;
+       TnyFolderStore *folder = NULL;
+       gboolean forbidden = FALSE;
+       ModestWindow *win;
+       DndFolderInfo *info = NULL;
 
-       /* Check if the drag is possible */
-/*     if (!gtk_tree_path_compare (helper->source_row, dest_row) || */
-/*         !gtk_tree_drag_dest_row_drop_possible (GTK_TREE_DRAG_DEST (dest_model), */
-/*                                                dest_row, */
-/*                                                selection_data)) { */
-       if (!gtk_tree_path_compare (helper->source_row, dest_row)) {
+       win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(), FALSE); /* don't create */
+       if (!win) {
+               g_warning ("%s: BUG: no main window", __FUNCTION__);
+               return;
+       }
+       
+       if (!forbidden) {
+               /* check the folder rules for the destination */
+               folder = tree_path_to_folder (dest_model, dest_row);
+               if (TNY_IS_FOLDER(folder)) {
+                       ModestTnyFolderRules rules =
+                               modest_tny_folder_get_rules (TNY_FOLDER (folder));
+                       forbidden = rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE;
+               } else if (TNY_IS_FOLDER_STORE(folder)) {
+                       /* enable local root as destination for folders */
+                       if (!MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (folder)
+                                       && TNY_IS_ACCOUNT (folder))
+                               forbidden = TRUE;
+               }
+               g_object_unref (folder);
+       }
+       if (!forbidden) {
+               /* check the folder rules for the source */
+               folder = tree_path_to_folder (source_model, helper->source_row);
+               if (TNY_IS_FOLDER(folder)) {
+                       ModestTnyFolderRules rules =
+                               modest_tny_folder_get_rules (TNY_FOLDER (folder));
+                       forbidden = rules & MODEST_FOLDER_RULES_FOLDER_NON_MOVEABLE;
+               } else
+                       forbidden = TRUE;
+               g_object_unref (folder);
+       }
 
+       
+       /* Check if the drag is possible */
+       if (forbidden || !gtk_tree_path_compare (helper->source_row, dest_row)) {
                gtk_drag_finish (helper->context, FALSE, FALSE, helper->time);
                gtk_tree_path_free (helper->source_row);        
                g_slice_free (DndHelper, helper);
@@ -1512,40 +2244,30 @@ drag_and_drop_from_folder_view (GtkTreeModel     *source_model,
        }
 
        /* Get data */
-       gtk_tree_model_get_iter (source_model, &parent_iter, dest_row);
-       gtk_tree_model_get_iter (source_model, &iter, helper->source_row);
-       gtk_tree_model_get (source_model, &parent_iter, 
+       gtk_tree_model_get_iter (dest_model, &dest_iter, dest_row);
+       gtk_tree_model_get (dest_model, &dest_iter, 
                            TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, 
-                           &parent_folder, -1);
+                           &dest_folder, -1);
+       gtk_tree_model_get_iter (source_model, &iter, helper->source_row);
        gtk_tree_model_get (source_model, &iter,
                            TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN,
                            &folder, -1);
 
-       /* Offer the connection dialog if necessary, for the destination parent folder and source folder: */
-       if (modest_platform_connect_and_wait_if_network_folderstore (NULL, parent_folder) && 
-               modest_platform_connect_and_wait_if_network_folderstore (NULL, TNY_FOLDER_STORE (folder))) {
-               /* Do the mail operation */
-               mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, 
-                                                                NULL,
-                                                                modest_ui_actions_move_folder_error_handler,
-                                                                NULL);
-               modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), 
-                                        mail_op);
-               g_signal_connect (G_OBJECT (mail_op), "progress-changed",
-                                 G_CALLBACK (on_progress_changed), helper);
-
-               modest_mail_operation_xfer_folder (mail_op, 
-                                          folder, 
-                                          parent_folder,
-                                          helper->delete_source,
-                                          NULL,
-                                          NULL);
-       }
+       /* Create the info for the performer */
+       info = g_slice_new (DndFolderInfo);
+       info->src_folder = g_object_ref (folder);
+       info->dst_folder = g_object_ref (dest_folder);
+       info->helper = helper;
+
+       /* Connect to the destination folder and perform the copy/move */
+       modest_platform_connect_if_remote_and_perform (GTK_WINDOW (win), 
+                                                      dest_folder,
+                                                      drag_and_drop_from_folder_view_dst_folder_performer,
+                                                      info);
        
        /* Frees */
-       g_object_unref (G_OBJECT (parent_folder));
-       g_object_unref (G_OBJECT (folder));
-       g_object_unref (G_OBJECT (mail_op));
+       g_object_unref (dest_folder);
+       g_object_unref (folder);
 }
 
 /*
@@ -1586,16 +2308,8 @@ on_drag_data_received (GtkWidget *widget,
                   the operation, because the operation won't start if
                   the folder is in use */
                if (source_widget == widget) {
-                       ModestFolderViewPrivate *priv;
-
-                       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (widget);
-                       if (priv->cur_folder_store) {
-                               g_object_unref (priv->cur_folder_store);
-                               priv->cur_folder_store = NULL;
-                       }
-
-                       g_signal_emit (G_OBJECT (widget), 
-                                      signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0, NULL, FALSE);
+                       GtkTreeSelection *sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget));
+                       gtk_tree_selection_unselect_all (sel);
                }
        }
 
@@ -1603,17 +2317,8 @@ on_drag_data_received (GtkWidget *widget,
        if (selection_data == NULL || selection_data->length < 0)
                gtk_drag_finish (context, success, FALSE, time);
 
-       /* Get the models */
-       gtk_tree_get_row_drag_data (selection_data,
-                                   &source_model,
-                                   &source_row);
-
        /* Select the destination model */
-       if (source_widget == widget) {
-               dest_model = source_model;
-       } else {
-               dest_model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
-       }
+       dest_model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));  
 
        /* Get the path to the destination row. Can not call
           gtk_tree_view_get_drag_dest_row() because the source row
@@ -1622,35 +2327,43 @@ on_drag_data_received (GtkWidget *widget,
                                           &dest_row, &pos);
 
        /* Only allow drops IN other rows */
-       if (!dest_row || pos == GTK_TREE_VIEW_DROP_BEFORE || pos == GTK_TREE_VIEW_DROP_AFTER)
+       if (!dest_row || 
+           pos == GTK_TREE_VIEW_DROP_BEFORE || 
+           pos == GTK_TREE_VIEW_DROP_AFTER)
                gtk_drag_finish (context, success, FALSE, time);
 
        /* Create the helper */
        helper = g_slice_new0 (DndHelper);
        helper->delete_source = delete_source;
-       helper->source_row = gtk_tree_path_copy (source_row);
        helper->context = context;
        helper->time = time;
 
        /* Drags from the header view */
        if (source_widget != widget) {
+               source_model = gtk_tree_view_get_model (GTK_TREE_VIEW (source_widget));
 
                drag_and_drop_from_header_view (source_model,
                                                dest_model,
                                                dest_row,
+                                               selection_data,
                                                helper);
        } else {
-
+               /* Get the source model and row */
+               gtk_tree_get_row_drag_data (selection_data,
+                                           &source_model,
+                                           &source_row);
+               helper->source_row = gtk_tree_path_copy (source_row);
 
                drag_and_drop_from_folder_view (source_model,
                                                dest_model,
                                                dest_row,
                                                selection_data, 
                                                helper);
+
+               gtk_tree_path_free (source_row);
        }
 
        /* Frees */
-       gtk_tree_path_free (source_row);
        gtk_tree_path_free (dest_row);
 }
 
@@ -1696,7 +2409,7 @@ expand_row_timeout (gpointer data)
        GtkTreeViewDropPosition pos;
        gboolean result = FALSE;
        
-       GDK_THREADS_ENTER ();
+       gdk_threads_enter ();
        
        gtk_tree_view_get_drag_dest_row (tree_view,
                                         &dest_path,
@@ -1715,7 +2428,7 @@ expand_row_timeout (gpointer data)
                result = TRUE;
        }
        
-       GDK_THREADS_LEAVE ();
+       gdk_threads_leave ();
 
        return result;
 }
@@ -1738,9 +2451,11 @@ on_drag_motion (GtkWidget      *widget,
 {
        GtkTreeViewDropPosition pos;
        GtkTreePath *dest_row;
+       GtkTreeModel *dest_model;
        ModestFolderViewPrivate *priv;
        GdkDragAction suggested_action;
        gboolean valid_location = FALSE;
+       TnyFolderStore *folder = NULL;
 
        priv = MODEST_FOLDER_VIEW_GET_PRIVATE (widget);
 
@@ -1766,6 +2481,18 @@ on_drag_motion (GtkWidget      *widget,
                valid_location = TRUE;
        }
 
+       /* Check that the destination folder is writable */
+       dest_model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
+       folder = tree_path_to_folder (dest_model, dest_row);
+       if (folder && TNY_IS_FOLDER (folder)) {
+               ModestTnyFolderRules rules = modest_tny_folder_get_rules(TNY_FOLDER (folder));
+
+               if (rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE) {
+                       valid_location = FALSE;
+                       goto out;
+               }
+       }
+
        /* Expand the selected row after 1/2 second */
        if (!gtk_tree_view_row_expanded (GTK_TREE_VIEW (widget), dest_row)) {
                gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (widget), dest_row, pos);
@@ -1785,20 +2512,15 @@ on_drag_motion (GtkWidget      *widget,
             gdk_drag_status(context, GDK_ACTION_DEFAULT, time);
 
  out:
+       if (folder)
+               g_object_unref (folder);
        if (dest_row)
                gtk_tree_path_free (dest_row);
        g_signal_stop_emission_by_name (widget, "drag-motion");
+
        return valid_location;
 }
 
-
-/* Folder view drag types */
-const GtkTargetEntry folder_view_drag_types[] =
-{
-       { "GTK_TREE_MODEL_ROW", GTK_TARGET_SAME_WIDGET, MODEST_FOLDER_ROW },
-       { "GTK_TREE_MODEL_ROW", GTK_TARGET_SAME_APP,    MODEST_HEADER_ROW }
-};
-
 /*
  * This function sets the treeview as a source and a target for dnd
  * events. It also connects all the requirede signals.
@@ -1891,13 +2613,12 @@ on_key_pressed (GtkWidget *self,
 static void 
 on_configuration_key_changed (ModestConf* conf, 
                              const gchar *key, 
-                             ModestConfEvent event, 
+                             ModestConfEvent event,
+                             ModestConfNotificationId id, 
                              ModestFolderView *self)
 {
        ModestFolderViewPrivate *priv;
 
-       if (!key)
-               return;
 
        g_return_if_fail (MODEST_IS_FOLDER_VIEW (self));
        priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
@@ -1912,24 +2633,31 @@ on_configuration_key_changed (ModestConf* conf,
                                                                           MODEST_CONF_DEVICE_NAME, NULL);
 
                /* Force a redraw */
-#if GTK_CHECK_VERSION(2, 8, 0) /* gtk_tree_view_column_queue_resize is only available in GTK+ 2.8 */
-               GtkTreeViewColumn * tree_column = gtk_tree_view_get_column (GTK_TREE_VIEW (self), 
-                                                                           TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN);
+#if GTK_CHECK_VERSION(2, 8, 0)
+               GtkTreeViewColumn * tree_column;
+
+               tree_column = gtk_tree_view_get_column (GTK_TREE_VIEW (self), 
+                                                       TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN);
                gtk_tree_view_column_queue_resize (tree_column);
+#else
+               gtk_widget_queue_draw (GTK_WIDGET (self));
 #endif
        }
 }
 
-void 
+void
 modest_folder_view_set_style (ModestFolderView *self,
                              ModestFolderViewStyle style)
 {
        ModestFolderViewPrivate *priv;
 
-       g_return_if_fail (self);
+       g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self));
+       g_return_if_fail (style == MODEST_FOLDER_VIEW_STYLE_SHOW_ALL ||
+                         style == MODEST_FOLDER_VIEW_STYLE_SHOW_ONE);
        
        priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
 
+       
        priv->style = style;
 }
 
@@ -1940,7 +2668,7 @@ modest_folder_view_set_account_id_of_visible_server_account (ModestFolderView *s
        ModestFolderViewPrivate *priv;
        GtkTreeModel *model;
 
-       g_return_if_fail (self);
+       g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self));
        
        priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
 
@@ -1968,7 +2696,7 @@ modest_folder_view_get_account_id_of_visible_server_account (ModestFolderView *s
 {
        ModestFolderViewPrivate *priv;
 
-       g_return_val_if_fail (self, NULL);
+       g_return_val_if_fail (self && MODEST_IS_FOLDER_VIEW(self), NULL);
        
        priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
 
@@ -1981,33 +2709,15 @@ find_inbox_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *inbox_iter
        do {
                GtkTreeIter child;
                TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
-               gchar *name = NULL;
 
                gtk_tree_model_get (model, iter, 
-                                   TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &name,
                                    TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, 
                                    &type, -1);
-
-               /*
-               printf ("DEBUG: %s: name=%s, type=%d, TNY_FOLDER_TYPE_INBOX=%d\n", 
-                       __FUNCTION__, name, type, TNY_FOLDER_TYPE_INBOX);
-               */
                        
                gboolean result = FALSE;
                if (type == TNY_FOLDER_TYPE_INBOX) {
                        result = TRUE;
-               } else if (type == TNY_FOLDER_TYPE_NORMAL) {
-                       /* tinymail's camel implementation only provides TNY_FOLDER_TYPE_NORMAL
-                        * when getting folders from the cache, before connectin, so we do 
-                        * an extra check. We could fix this in tinymail, but it's easier 
-                        * to do here.
-                        */
-                        if (strcmp (name, "Inbox") == 0)
-                               result = TRUE;
-               }
-               
-               g_free (name);
-               
+               }               
                if (result) {
                        *inbox_iter = *iter;
                        return TRUE;
@@ -2032,11 +2742,10 @@ modest_folder_view_select_first_inbox_or_local (ModestFolderView *self)
        GtkTreeModel *model;
        GtkTreeIter iter, inbox_iter;
        GtkTreeSelection *sel;
+       GtkTreePath *path = NULL;
 
-/*     /\* Do not set it if the folder view was not painted *\/ */
-/*     if (!GTK_WIDGET_MAPPED (self)) */
-/*             return; */
-
+       g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self));
+       
        model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
        if (!model)
                return;
@@ -2044,16 +2753,23 @@ modest_folder_view_select_first_inbox_or_local (ModestFolderView *self)
        expand_root_items (self);
        sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
 
-       gtk_tree_model_get_iter_first (model, &iter);
-       gtk_tree_selection_unselect_all (sel);
-
-       if (find_inbox_iter (model, &iter, &inbox_iter)) {
-               gtk_tree_selection_select_iter (sel, &inbox_iter);
-       }
-       else {
-               gtk_tree_model_get_iter_first (model, &iter);
-               gtk_tree_selection_select_iter (sel, &iter);
+       if (!gtk_tree_model_get_iter_first (model, &iter)) {
+               g_warning ("%s: model is empty", __FUNCTION__);
+               return;
        }
+
+       if (find_inbox_iter (model, &iter, &inbox_iter))
+               path = gtk_tree_model_get_path (model, &inbox_iter);
+       else
+               path = gtk_tree_path_new_first ();
+
+       /* Select the row and free */
+       gtk_tree_view_set_cursor (GTK_TREE_VIEW (self), path, NULL, FALSE);
+       gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (self), path, NULL, FALSE, 0.0, 0.0);
+       gtk_tree_path_free (path);
+
+       /* set focus */
+       gtk_widget_grab_focus (GTK_WIDGET(self));
 }
 
 
@@ -2073,8 +2789,6 @@ find_folder_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *folder_it
                                    TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &name,
                                    TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type, 
                                    -1);                
-       
-               g_debug ("===> %s (%p ---- %p)", name, a_folder, folder);
                g_free (name);
 
                if (folder == a_folder) {
@@ -2096,33 +2810,74 @@ find_folder_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *folder_it
 
 
 static void
-on_row_changed_maybe_select_folder (GtkTreeModel *tree_model, GtkTreePath  *path, GtkTreeIter *iter,
-                                   ModestFolderView *self)
+on_row_inserted_maybe_select_folder (GtkTreeModel *tree_model, GtkTreePath  *path, GtkTreeIter *iter,
+                                    ModestFolderView *self)
 {
        ModestFolderViewPrivate *priv = NULL;
        GtkTreeSelection *sel;
+       TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
+       GObject *instance = NULL;
 
        if (!MODEST_IS_FOLDER_VIEW(self))
                return;
        
-       g_return_if_fail (MODEST_IS_FOLDER_VIEW (self));
        priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
-       
-       sel  = gtk_tree_view_get_selection (GTK_TREE_VIEW(self));
+
+       priv->reexpand = TRUE;
+
+       gtk_tree_model_get (tree_model, iter, 
+                           TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
+                           TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &instance,
+                           -1);
+       if (type == TNY_FOLDER_TYPE_INBOX && priv->folder_to_select == NULL) {
+               priv->folder_to_select = g_object_ref (instance);
+       }
+       g_object_unref (instance);
+
        
        if (priv->folder_to_select) {
+               
                if (!modest_folder_view_select_folder (self, priv->folder_to_select,
                                                       FALSE)) {
+                       GtkTreePath *path;
+                       path = gtk_tree_model_get_path (tree_model, iter);
+                       gtk_tree_view_expand_to_path (GTK_TREE_VIEW(self), path);
+                       
                        sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
+
                        gtk_tree_selection_select_iter (sel, iter);
-                       g_debug ("could not find changed folder");
-               } 
-               g_object_unref (priv->folder_to_select);
-               priv->folder_to_select = NULL;
-       } 
+                       gtk_tree_view_set_cursor (GTK_TREE_VIEW(self), path, NULL, FALSE);
+
+                       gtk_tree_path_free (path);
+               
+               }
+
+               /* Disable next */
+               modest_folder_view_disable_next_folder_selection (self);
+/*             g_object_unref (priv->folder_to_select); */
+/*             priv->folder_to_select = NULL; */
+               
+               /* Refilter the model */
+               gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (tree_model));
+       }
 }
 
 
+void
+modest_folder_view_disable_next_folder_selection (ModestFolderView *self) 
+{
+       ModestFolderViewPrivate *priv;
+
+       g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self));
+
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
+
+       if (priv->folder_to_select)
+               g_object_unref(priv->folder_to_select);
+       
+       priv->folder_to_select = NULL;
+}
+
 gboolean
 modest_folder_view_select_folder (ModestFolderView *self, TnyFolder *folder, 
                                  gboolean after_change)
@@ -2132,12 +2887,15 @@ modest_folder_view_select_folder (ModestFolderView *self, TnyFolder *folder,
        GtkTreeSelection *sel;
        ModestFolderViewPrivate *priv = NULL;
        
-       g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (self), FALSE);     
-       g_return_val_if_fail (TNY_IS_FOLDER (folder), FALSE);   
+       g_return_val_if_fail (self && MODEST_IS_FOLDER_VIEW (self), FALSE);     
+       g_return_val_if_fail (folder && TNY_IS_FOLDER (folder), FALSE); 
                
        priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
 
        if (after_change) {
+               sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
+               gtk_tree_selection_unselect_all (sel);
+
                if (priv->folder_to_select)
                        g_object_unref(priv->folder_to_select);
                priv->folder_to_select = TNY_FOLDER(g_object_ref(folder));
@@ -2148,12 +2906,26 @@ modest_folder_view_select_folder (ModestFolderView *self, TnyFolder *folder,
        if (!model)
                return FALSE;
 
-       sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
-               
-       gtk_tree_model_get_iter_first (model, &iter);
+
+       /* Refilter the model, before selecting the folder */
+       gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model));
+
+       if (!gtk_tree_model_get_iter_first (model, &iter)) {
+               g_warning ("%s: model is empty", __FUNCTION__);
+               return FALSE;
+       }
+       
        if (find_folder_iter (model, &iter, &folder_iter, folder)) {
-               gtk_tree_selection_unselect_all (sel);
+               GtkTreePath *path;
+
+               path = gtk_tree_model_get_path (model, &folder_iter);
+               gtk_tree_view_expand_to_path (GTK_TREE_VIEW(self), path);
+
+               sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
                gtk_tree_selection_select_iter (sel, &folder_iter);
+               gtk_tree_view_set_cursor (GTK_TREE_VIEW(self), path, NULL, FALSE);
+
+               gtk_tree_path_free (path);
                return TRUE;
        }
        return FALSE;
@@ -2161,10 +2933,12 @@ modest_folder_view_select_folder (ModestFolderView *self, TnyFolder *folder,
 
 
 void 
-modest_folder_view_copy_selection (ModestFolderView *folder_view)
+modest_folder_view_copy_selection (ModestFolderView *self)
 {
+       g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self));
+       
        /* Copy selection */
-       _clipboard_set_selected_data (folder_view, FALSE);
+       _clipboard_set_selected_data (self, FALSE);
 }
 
 void 
@@ -2175,7 +2949,7 @@ modest_folder_view_cut_selection (ModestFolderView *folder_view)
        const gchar **hidding = NULL;
        guint i, n_selected;
 
-       g_return_if_fail (MODEST_IS_FOLDER_VIEW (folder_view));
+       g_return_if_fail (folder_view && MODEST_IS_FOLDER_VIEW (folder_view));
        priv = MODEST_FOLDER_VIEW_GET_PRIVATE (folder_view);
 
        /* Copy selection */
@@ -2200,13 +2974,54 @@ modest_folder_view_cut_selection (ModestFolderView *folder_view)
 }
 
 void
+modest_folder_view_copy_model (ModestFolderView *folder_view_src,
+                              ModestFolderView *folder_view_dst)
+{
+       GtkTreeModel *filter_model = NULL;
+       GtkTreeModel *model = NULL;
+       GtkTreeModel *new_filter_model = NULL;
+       
+       g_return_if_fail (folder_view_src && MODEST_IS_FOLDER_VIEW (folder_view_src));
+       g_return_if_fail (folder_view_dst && MODEST_IS_FOLDER_VIEW (folder_view_dst));
+       
+       /* Get src model*/
+       filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (folder_view_src));
+       model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER(filter_model));
+
+       /* Build new filter model */
+       new_filter_model = gtk_tree_model_filter_new (model, NULL);     
+       gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (new_filter_model),
+                                               filter_row,
+                                               folder_view_dst,
+                                               NULL);
+       /* Set copied model */
+       gtk_tree_view_set_model (GTK_TREE_VIEW (folder_view_dst), new_filter_model);
+       g_signal_connect (G_OBJECT(new_filter_model), "row-inserted",
+                         (GCallback) on_row_inserted_maybe_select_folder, folder_view_dst);
+
+       /* Free */
+       g_object_unref (new_filter_model);
+}
+
+void
 modest_folder_view_show_non_move_folders (ModestFolderView *folder_view,
-                                   gboolean show)
+                                         gboolean show)
 {
-       ModestFolderViewPrivate* priv = MODEST_FOLDER_VIEW_GET_PRIVATE(folder_view);
+       GtkTreeModel *model = NULL;
+       ModestFolderViewPrivate* priv;
+
+       g_return_if_fail (folder_view && MODEST_IS_FOLDER_VIEW (folder_view));
+
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE(folder_view);     
        priv->show_non_move = show;
-       modest_folder_view_update_model(folder_view,
-                                                                                                                                       TNY_ACCOUNT_STORE(modest_runtime_get_account_store()));
+/*     modest_folder_view_update_model(folder_view, */
+/*                                     TNY_ACCOUNT_STORE(modest_runtime_get_account_store())); */
+
+       /* Hide special folders */
+       model = gtk_tree_view_get_model (GTK_TREE_VIEW (folder_view));
+       if (GTK_IS_TREE_MODEL_FILTER (model)) {
+               gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model));
+       }
 }
 
 /* Returns FALSE if it did not selected anything */
@@ -2254,3 +3069,23 @@ _clear_hidding_filter (ModestFolderView *folder_view)
 }
 
 
+static void 
+on_display_name_changed (ModestAccountMgr *mgr, 
+                        const gchar *account,
+                        gpointer user_data)
+{
+       ModestFolderView *self;
+
+       self = MODEST_FOLDER_VIEW (user_data);
+
+       /* Force a redraw */
+#if GTK_CHECK_VERSION(2, 8, 0)
+       GtkTreeViewColumn * tree_column;
+       
+       tree_column = gtk_tree_view_get_column (GTK_TREE_VIEW (self), 
+                                               TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN);
+       gtk_tree_view_column_queue_resize (tree_column);
+#else
+       gtk_widget_queue_draw (GTK_WIDGET (self));
+#endif
+}