* src/widgets/modest-folder-view.c:
[modest] / src / widgets / modest-folder-view.c
index 4e55fb6..4d854dd 100644 (file)
 
 #include <glib/gi18n.h>
 #include <string.h>
-
+#include <gdk/gdkkeysyms.h>
 #include <tny-account-store-view.h>
 #include <tny-gtk-account-list-model.h>
 #include <tny-gtk-folder-store-tree-model.h>
 #include <tny-gtk-header-list-model.h>
 #include <tny-folder.h>
+#include <tny-folder-store-observer.h>
 #include <tny-account-store.h>
 #include <tny-account.h>
 #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-tny-outbox-account.h>
 #include <modest-marshal.h>
 #include <modest-icon-names.h>
 #include <modest-tny-account-store.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);
@@ -61,16 +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 gboolean     update_model           (ModestFolderView *self,
-                                           ModestTnyAccountStore *account_store);
+static void         on_selection_changed   (GtkTreeSelection *sel, 
+                                           gpointer data);
 
-static void         on_selection_changed   (GtkTreeSelection *sel, gpointer data);
+static void         on_account_removed     (TnyAccountStore *self, 
+                                           TnyAccount *account,
+                                           gpointer user_data);
 
-static void         on_account_update      (TnyAccountStore *account_store, 
-                                           const gchar *account,
+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, 
@@ -78,6 +96,20 @@ static gint         cmp_rows               (GtkTreeModel *tree_model,
                                            GtkTreeIter *iter2,
                                            gpointer user_data);
 
+static gboolean     filter_row             (GtkTreeModel *model,
+                                           GtkTreeIter *iter,
+                                           gpointer data);
+
+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,
+                                                  ModestConfNotificationId notification_id, 
+                                                  ModestFolderView *self);
+
 /* DnD functions */
 static void         on_drag_data_get       (GtkWidget *widget, 
                                            GdkDragContext *context, 
@@ -102,28 +134,63 @@ 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 void         _clear_hidding_filter (ModestFolderView *folder_view);
+
+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,
        LAST_SIGNAL
 };
 
 typedef struct _ModestFolderViewPrivate ModestFolderViewPrivate;
 struct _ModestFolderViewPrivate {
-       TnyAccountStore     *account_store;
-       TnyFolder           *cur_folder;
-       GtkTreeRowReference *cur_row;
+       TnyAccountStore      *account_store;
+       TnyFolderStore       *cur_folder_store;
+
+       TnyFolder            *folder_to_select; /* folder to select after the next update */
 
-       gulong               account_update_signal;
-       gulong               changed_signal;
-       gulong               accounts_reloaded_signal;
+       gulong                changed_signal;
+       gulong                account_inserted_signal;
+       gulong                account_removed_signal;
+       gulong                account_changed_signal;
+       gulong                conf_key_signal;
+       gulong                display_name_changed_signal;
        
-       GtkTreeSelection    *cur_selection;
-       TnyFolderStoreQuery *query;
-       guint                timer_expander;
+       /* not unref this object, its a singlenton */
+       ModestEmailClipboard *clipboard;
+
+       /* Filter tree model */
+       gchar **hidding_ids;
+       guint n_selected;
+
+       TnyFolderStoreQuery  *query;
+       guint                 timer_expander;
+
+       gchar                *local_account_name;
+       gchar                *visible_account_id;
+       ModestFolderViewStyle style;
+
+       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),                       \
@@ -191,153 +258,810 @@ modest_folder_view_class_init (ModestFolderViewClass *klass)
                              NULL, NULL,
                              modest_marshal_VOID__POINTER_BOOLEAN,
                              G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_BOOLEAN);
+
+       /*
+        * This signal is emitted whenever the currently selected
+        * folder display name is computed. Note that the name could
+        * be different to the folder name, because we could append
+        * the unread messages count to the folder name to build the
+        * folder display name
+        */
+       signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL] = 
+               g_signal_new ("folder-display-name-changed",
+                             G_TYPE_FROM_CLASS (gobject_class),
+                             G_SIGNAL_RUN_FIRST,
+                             G_STRUCT_OFFSET (ModestFolderViewClass,
+                                              folder_display_name_changed),
+                             NULL, NULL,
+                             g_cclosure_marshal_VOID__STRING,
+                             G_TYPE_NONE, 1, G_TYPE_STRING);
+}
+
+/* Simplify checks for NULLs: */
+static gboolean
+strings_are_equal (const gchar *a, const gchar *b)
+{
+       if (!a && !b)
+               return TRUE;
+       if (a && b)
+       {
+               return (strcmp (a, b) == 0);
+       }
+       else
+               return FALSE;
+}
+
+static gboolean
+on_model_foreach_set_name(GtkTreeModel *model, GtkTreePath *path,  GtkTreeIter *iter, gpointer data)
+{
+       GObject *instance = NULL;
+       
+       gtk_tree_model_get (model, iter,
+                           TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &instance,
+                           -1);
+                           
+       if (!instance)
+               return FALSE; /* keep walking */
+                       
+       if (!TNY_IS_ACCOUNT (instance)) {
+               g_object_unref (instance);
+               return FALSE; /* keep walking */        
+       }    
+       
+       /* Check if this is the looked-for account: */
+       TnyAccount *this_account = TNY_ACCOUNT (instance);
+       TnyAccount *account = TNY_ACCOUNT (data);
+       
+       const gchar *this_account_id = tny_account_get_id(this_account);
+       const gchar *account_id = tny_account_get_id(account);
+       g_object_unref (instance);
+       instance = NULL;
+
+       /* printf ("DEBUG: %s: this_account_id=%s, account_id=%s\n", __FUNCTION__, this_account_id, account_id); */
+       if (strings_are_equal(this_account_id, account_id)) {
+               /* Tell the model that the data has changed, so that
+                * it calls the cell_data_func callbacks again: */
+               /* TODO: This does not seem to actually cause the new string to be shown: */
+               gtk_tree_model_row_changed (model, path, iter);
+               
+               return TRUE; /* stop walking */
+       }
+       
+       return FALSE; /* keep walking */
 }
 
+typedef struct 
+{
+       ModestFolderView *self;
+       gchar *previous_name;
+} GetMmcAccountNameData;
+
+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)) {
+       
+               /* Tell the model that the data has changed, so that 
+                * it calls the cell_data_func callbacks again: */
+               ModestFolderView *self = data->self;
+               GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+               if (model)
+                       gtk_tree_model_foreach(model, on_model_foreach_set_name, account);
+       }
 
+       g_free (data->previous_name);
+       g_slice_free (GetMmcAccountNameData, data);
+}
 
 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)
 {
-       GObject *rendobj;
+       ModestFolderViewPrivate *priv;
+       GObject *rendobj = (GObject *) renderer;
        gchar *fname = NULL;
-       gint unread;
-       TnyFolderType type;
-       TnyFolder *folder = NULL;
-       
-       g_return_if_fail (column);
-       g_return_if_fail (tree_model);
+       TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
+       GObject *instance = NULL;
 
        gtk_tree_model_get (tree_model, iter,
                            TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &fname,
-                           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, &folder,
+                           TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &instance,
                            -1);
-       rendobj = G_OBJECT(renderer);
        if (!fname)
                return;
+
+       if (!instance) {
+               g_free (fname);
+               return;
+       }
+
+       ModestFolderView *self = MODEST_FOLDER_VIEW (data);
+       priv =  MODEST_FOLDER_VIEW_GET_PRIVATE (self);
        
-       if (folder && type != TNY_FOLDER_TYPE_ROOT) { /* FIXME: tnymail bug? crashes with root folders */
-               if (modest_tny_folder_is_local_folder (folder)) {
-                       TnyFolderType type;
-                       type = modest_tny_folder_get_local_folder_type (folder);
+       gchar *item_name = NULL;
+       gint item_weight = 400;
+       
+       if (type != TNY_FOLDER_TYPE_ROOT) {
+               gint number = 0;
+               
+               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));
                        }
                }
-       } else if (folder && type == TNY_FOLDER_TYPE_ROOT) {
-               /* FIXME: todo */
+
+               /* 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 = 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);
+                       item_weight = 800;
+               } else {
+                       item_name = g_strdup (fname);
+                       item_weight = 400;
+               }
+               
+       } else if (TNY_IS_ACCOUNT (instance)) {
+               /* If it's a server account */
+               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))) {
+                       /* 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_weight = 800;
+               } else {
+                       item_name = g_strdup (fname);
+                       item_weight = 800;
+               }
        }
+       
+       if (!item_name)
+               item_name = g_strdup ("unknown");
                        
-       if (unread > 0) {
-               gchar *folder_title = g_strdup_printf ("%s (%d)", fname, unread);
-               g_object_set (rendobj,"text", folder_title,  "weight", 800, NULL);
-               g_free (folder_title);
-       } else 
-               g_object_set (rendobj,"text", fname, "weight", 400, NULL);
+       if (item_name && item_weight) {
+               /* Set the name in the treeview cell: */
+               g_object_set (rendobj,"text", item_name, "weight", item_weight, NULL);
+               
+               /* Notify display name observers */
+               /* TODO: What listens for this signal, and how can it use only the new name? */
+               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);
                
+       }
+       
+       /* If it is a Memory card account, make sure that we have the correct name.
+        * This function will be trigerred again when the name has been retrieved: */
+       if (TNY_IS_STORE_ACCOUNT (instance) && 
+               modest_tny_account_is_memory_card_account (TNY_ACCOUNT (instance))) {
+
+               /* Get the account name asynchronously: */
+               GetMmcAccountNameData *callback_data = 
+                       g_slice_new0(GetMmcAccountNameData);
+               callback_data->self = self;
+
+               const gchar *name = tny_account_get_name (TNY_ACCOUNT(instance));
+               if (name)
+                       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);
+       }
+                       
+       g_object_unref (G_OBJECT (instance));
        g_free (fname);
-       if (folder) g_object_unref (G_OBJECT (folder));
 }
 
 
+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;
-       GdkPixbuf *pixbuf;
-       TnyFolderType type;
-       gchar *fname = NULL;
-       gint unread;
-       
-       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, 
-                           -1);
-       rendobj = G_OBJECT(renderer);
-       
-       if (type == TNY_FOLDER_TYPE_NORMAL || type == TNY_FOLDER_TYPE_UNKNOWN) {
-               type = modest_tny_folder_guess_folder_type_from_name (fname);
+       GdkPixbuf *pixbuf = NULL;
+       GdkPixbuf *pixbuf_open = NULL;
+       GdkPixbuf *pixbuf_close = NULL;
+       ThreePixbufs *retval = g_slice_new (ThreePixbufs);
+
+       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;
+
+
+       /* 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));             
        }
-       g_free (fname);
 
        switch (type) {
+       case TNY_FOLDER_TYPE_INVALID:
+               g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
+               break;
+               
        case TNY_FOLDER_TYPE_ROOT:
-               pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_ACCOUNT);
-                break;
+               if (TNY_IS_ACCOUNT (instance)) {
+                       
+                       if (modest_tny_account_is_virtual_local_folders (
+                               TNY_ACCOUNT (instance))) {
+
+                           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 {
+                               const gchar *account_id = tny_account_get_id (TNY_ACCOUNT (instance));
+                               
+                               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);
-                break;
-        case TNY_FOLDER_TYPE_OUTBOX:
-                pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_OUTBOX);
-                break;
-        case TNY_FOLDER_TYPE_JUNK:
-                pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_JUNK);
-                break;
-        case TNY_FOLDER_TYPE_SENT:
-                pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_SENT);
-                break;
+
+           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:
+               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:
+           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:
+               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_set (rendobj, "pixbuf", pixbuf, NULL);
+       default:
+               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_unref (emblem);
+               }
+               
+               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_unref (emblem);
+               }
+               
+               
+           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
-modest_folder_view_init (ModestFolderView *obj)
+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);
+       }
+
+       free_pixbufs (pixbufs);
+
+       return;
+}
+
+static void
+add_columns (GtkWidget *treeview)
 {
-       ModestFolderViewPrivate *priv;
        GtkTreeViewColumn *column;
        GtkCellRenderer *renderer;
        GtkTreeSelection *sel;
-       
-       priv =  MODEST_FOLDER_VIEW_GET_PRIVATE(obj);
-       
-       priv->timer_expander = 0;
-       priv->account_store  = NULL;
-       priv->cur_folder     = NULL;
-       priv->cur_row        = NULL;
-       priv->query          = NULL;
 
+       /* Create column */
        column = gtk_tree_view_column_new ();   
        
+       /* Set icon and text render function */
        renderer = gtk_cell_renderer_pixbuf_new();
        gtk_tree_view_column_pack_start (column, renderer, FALSE);
        gtk_tree_view_column_set_cell_data_func(column, renderer,
-                                               icon_cell_data, NULL, NULL);
+                                               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, NULL, NULL);
+                                               text_cell_data, treeview, NULL);
        
-       sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(obj));
+       /* Set selection mode */
+       sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(treeview));
        gtk_tree_selection_set_mode (sel, GTK_SELECTION_SINGLE);
 
+       /* Set treeview appearance */
        gtk_tree_view_column_set_spacing (column, 2);
        gtk_tree_view_column_set_resizable (column, TRUE);
        gtk_tree_view_column_set_fixed_width (column, TRUE);            
-       gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(obj), FALSE);
-       gtk_tree_view_set_enable_search     (GTK_TREE_VIEW(obj), FALSE);
+       gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(treeview), FALSE);
+       gtk_tree_view_set_enable_search (GTK_TREE_VIEW(treeview), FALSE);
+
+       /* Add column */
+       gtk_tree_view_append_column (GTK_TREE_VIEW(treeview),column);
+}
+
+static void
+modest_folder_view_init (ModestFolderView *obj)
+{
+       ModestFolderViewPrivate *priv;
+       ModestConf *conf;
+       
+       priv =  MODEST_FOLDER_VIEW_GET_PRIVATE(obj);
+       
+       priv->timer_expander = 0;
+       priv->account_store  = NULL;
+       priv->query          = NULL;
+       priv->style          = MODEST_FOLDER_VIEW_STYLE_SHOW_ALL;
+       priv->cur_folder_store   = NULL;
+       priv->visible_account_id = NULL;
+       priv->folder_to_select = NULL;
+
+       priv->reexpand = TRUE;
 
-       gtk_tree_view_append_column (GTK_TREE_VIEW(obj),column);
+       /* Initialize the local account name */
+       conf = modest_runtime_get_conf();
+       priv->local_account_name = modest_conf_get_string (conf, MODEST_CONF_DEVICE_NAME, NULL);
 
+       /* Init email clipboard */
+       priv->clipboard = modest_runtime_get_email_clipboard ();
+       priv->hidding_ids = NULL;
+       priv->n_selected = 0;
+       priv->reselect = FALSE;
+       priv->show_non_move = TRUE;
+
+       /* Build treeview */
+       add_columns (GTK_WIDGET (obj));
+
+       /* Setup drag and drop */
        setup_drag_and_drop (GTK_TREE_VIEW(obj));
+
+       /* Connect signals */
+       g_signal_connect (G_OBJECT (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);
 }
 
 static void
@@ -345,9 +1069,7 @@ tny_account_store_view_init (gpointer g, gpointer iface_data)
 {
        TnyAccountStoreViewIface *klass = (TnyAccountStoreViewIface *)g;
 
-       klass->set_account_store_func = modest_folder_view_set_account_store;
-
-       return;
+       klass->set_account_store = modest_folder_view_set_account_store;
 }
 
 static void
@@ -367,9 +1089,11 @@ modest_folder_view_finalize (GObject *obj)
 
        if (priv->account_store) {
                g_signal_handler_disconnect (G_OBJECT(priv->account_store),
-                                            priv->account_update_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->accounts_reloaded_signal);
+                                            priv->account_changed_signal);
                g_object_unref (G_OBJECT(priv->account_store));
                priv->account_store = NULL;
        }
@@ -379,10 +1103,42 @@ 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;
+       }
+   
        sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(obj));
        if (sel)
                g_signal_handler_disconnect (G_OBJECT(sel), priv->changed_signal);
+
+       g_free (priv->local_account_name);
+       g_free (priv->visible_account_id);
        
+       if (priv->conf_key_signal) {
+               g_signal_handler_disconnect (modest_runtime_get_conf (),
+                                            priv->conf_key_signal);
+               priv->conf_key_signal = 0;
+       }
+
+       if (priv->cur_folder_store) {
+               if (TNY_IS_FOLDER(priv->cur_folder_store)) {
+                       ModestMailOperation *mail_op;
+
+                       mail_op = modest_mail_operation_new (NULL);
+                       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
+                                                        mail_op);
+                       modest_mail_operation_sync_folder (mail_op, TNY_FOLDER (priv->cur_folder_store), FALSE);
+               }
+
+               g_object_unref (priv->cur_folder_store);
+               priv->cur_folder_store = NULL;
+       }
+
+       /* Clear hidding array created by cut operation */
+       _clear_hidding_filter (MODEST_FOLDER_VIEW (obj));
+
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
@@ -401,51 +1157,202 @@ 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_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_update_signal))
+                                                  priv->account_removed_signal))
                        g_signal_handler_disconnect (G_OBJECT (priv->account_store), 
-                                                    priv->account_update_signal);
+                                                    priv->account_removed_signal);
                if (g_signal_handler_is_connected (G_OBJECT (priv->account_store), 
-                                                  priv->accounts_reloaded_signal))
+                                                  priv->account_changed_signal))
                        g_signal_handler_disconnect (G_OBJECT (priv->account_store), 
-                                                    priv->accounts_reloaded_signal);
-
+                                                    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);
-       
-       if (!update_model (MODEST_FOLDER_VIEW (self),
-                          MODEST_TNY_ACCOUNT_STORE (priv->account_store)))
-               g_printerr ("modest: failed to update model\n");
+       priv->account_inserted_signal =
+               g_signal_connect (G_OBJECT(account_store), "account_inserted",
+                                 G_CALLBACK (on_account_inserted), self);
 
+       priv->account_changed_signal =
+               g_signal_connect (G_OBJECT(account_store), "account_changed",
+                                 G_CALLBACK (on_account_changed), self);
+
+       modest_folder_view_update_model (MODEST_FOLDER_VIEW (self), account_store);
+       
        g_object_unref (G_OBJECT (device));
 }
 
 static void
-on_account_update (TnyAccountStore *account_store, const gchar *account,
-                  gpointer user_data)
+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));
+
+       /* 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)
 {
-       if (!update_model (MODEST_FOLDER_VIEW(user_data), 
-                          MODEST_TNY_ACCOUNT_STORE(account_store)))
-               g_printerr ("modest: failed to update model for changes in '%s'",
-                           account);
+       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 (tny_account))
+               return;
+
+       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));
 }
 
-static void 
-on_accounts_reloaded   (TnyAccountStore *account_store, 
-                       gpointer user_data)
+/**
+ *
+ * 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_removed (TnyAccountStore *account_store, 
+                   TnyAccount *account,
+                   gpointer user_data)
 {
-       update_model (MODEST_FOLDER_VIEW (user_data), 
-                     MODEST_TNY_ACCOUNT_STORE(account_store));
+       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;
+
+       self = MODEST_FOLDER_VIEW (user_data);
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
+
+       /* 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);
+       }
+
+       /* Refilter the model */
+       gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model));
+
+       /* 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
@@ -453,7 +1360,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) {
@@ -466,6 +1373,41 @@ modest_folder_view_set_title (ModestFolderView *self, const gchar *title)
                                           title != NULL);
 }
 
+static gboolean
+modest_folder_view_on_map (ModestFolderView *self, 
+                          GdkEventExpose *event,
+                          gpointer data)
+{
+       ModestFolderViewPrivate *priv;
+
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
+
+       /* This won't happen often */
+       if (G_UNLIKELY (priv->reselect)) {
+               /* Select the first inbox or the local account if not found */
+
+               /* TODO: this could cause a lock at startup, so we
+                  comment it for the moment. We know that this will
+                  be a bug, because the INBOX is not selected, but we
+                  need to rewrite some parts of Modest to avoid the
+                  deathlock situation */
+               /* 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;
+}
+
 GtkWidget*
 modest_folder_view_new (TnyFolderStoreQuery *query)
 {
@@ -476,12 +1418,16 @@ modest_folder_view_new (TnyFolderStoreQuery *query)
        self = G_OBJECT (g_object_new (MODEST_TYPE_FOLDER_VIEW, NULL));
        priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
 
-       priv->query = g_object_ref (query);
+       if (query)
+               priv->query = g_object_ref (query);
        
        sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
        priv->changed_signal = g_signal_connect (sel, "changed",
                                                 G_CALLBACK (on_selection_changed), self);
-       return GTK_WIDGET(self);
+
+       g_signal_connect (self, "expose-event", G_CALLBACK (modest_folder_view_on_map), NULL);
+
+       return GTK_WIDGET(self);
 }
 
 /* this feels dirty; any other way to expand all the root items? */
@@ -489,56 +1435,187 @@ 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);
 }
 
-static gboolean
-update_model (ModestFolderView *self, ModestTnyAccountStore *account_store)
+/*
+ * We use this function to implement the
+ * MODEST_FOLDER_VIEW_STYLE_SHOW_ONE style. We only show the default
+ * account in this case, and the local folders.
+ */
+static gboolean 
+filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
 {
        ModestFolderViewPrivate *priv;
+       gboolean retval = TRUE;
+       TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
+       GObject *instance = NULL;
+       const gchar *id = NULL;
+       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);
+
+       gtk_tree_model_get (model, iter,
+                           TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
+                           TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &instance,
+                           -1);
+
+       /* Do not show if there is no instance, this could indeed
+          happen when the model is being modified while it's being
+          drawn. This could occur for example when moving folders
+          using drag&drop */
+       if (!instance)
+               return FALSE;
+
+       if (type == TNY_FOLDER_TYPE_ROOT) {
+               /* TNY_FOLDER_TYPE_ROOT means that the instance is an
+                  account instead of a folder. */
+               if (TNY_IS_ACCOUNT (instance)) {
+                       TnyAccount *acc = TNY_ACCOUNT (instance);
+                       const gchar *account_id = tny_account_get_id (acc);
+       
+                       /* If it isn't a special folder, 
+                        * don't show it unless it is the visible account: */
+                       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) {
+                                       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 
+                        * in the local-folders account instead: */
+                       if (retval && MODEST_IS_TNY_OUTBOX_ACCOUNT (acc))
+                               retval = FALSE;
+               }
+       }
+
+       /* Check hiding (if necessary) */
+       cleared = modest_email_clipboard_cleared (priv->clipboard);            
+       if ((retval) && (!cleared) && (TNY_IS_FOLDER (instance))) {
+               id = tny_folder_get_id (TNY_FOLDER(instance));
+               if (priv->hidding_ids != NULL)
+                       for (i=0; i < priv->n_selected && !found; i++)
+                               if (priv->hidding_ids[i] != NULL && id != NULL)
+                                       found = (!strcmp (priv->hidding_ids[i], id));
+               
+               retval = !found;
+       }
+       
+       
+       /* 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;
+               }
+       }
+       
+       /* Free */
+       g_object_unref (instance);
+
+       return retval;
+}
 
-       TnyList          *account_list;
-       GtkTreeModel     *model, *sortable;
 
-       g_return_val_if_fail (account_store, FALSE);
+gboolean
+modest_folder_view_update_model (ModestFolderView *self,
+                                TnyAccountStore *account_store)
+{
+       ModestFolderViewPrivate *priv;
+       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*/
+       /* Notify that there is no folder selected */
        g_signal_emit (G_OBJECT(self), 
                       signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0,
-                      NULL, TRUE);
-       
+                      NULL, FALSE);
+       if (priv->cur_folder_store) {
+               g_object_unref (priv->cur_folder_store);
+               priv->cur_folder_store = NULL;
+       }
+
        /* 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);
-       account_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),
-                                       account_list,
-                                       TNY_ACCOUNT_STORE_STORE_ACCOUNTS);      
-       if (account_list) {
-               sortable = gtk_tree_model_sort_new_with_model (model);
-               gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable),
-                                                     TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, 
-                                                     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);
-
-               /* Set new model */
-               gtk_tree_view_set_model (GTK_TREE_VIEW(self), sortable);
-               expand_root_items (self); /* expand all account folders */
-               g_object_unref (account_list);
-       }
+                                       TNY_LIST (model),
+                                       TNY_ACCOUNT_STORE_STORE_ACCOUNTS);
+
+       sortable = gtk_tree_model_sort_new_with_model (model);
+       gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable),
+                                             TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, 
+                                             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);
+
+       /* Create filter model */
+       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-inserted",
+                         (GCallback) on_row_inserted_maybe_select_folder, self);
+
+
+       g_object_unref (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;
+                       
        return TRUE;
 }
 
@@ -546,96 +1623,141 @@ update_model (ModestFolderView *self, ModestTnyAccountStore *account_store)
 static void
 on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
 {
-       GtkTreeModel            *model_sort, *model;
-       TnyFolder               *folder = NULL;
-       GtkTreeIter             iter, iter_sort;
-       GtkTreePath            *path;
-       ModestFolderView        *tree_view;
-       ModestFolderViewPrivate *priv;
-       gint                    type;
+       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);
-       priv->cur_selection = sel;
-       
-       /* folder was _un_selected if true */
-       if (!gtk_tree_selection_get_selected (sel, &model_sort, &iter_sort)) {
-               if (priv->cur_folder)
-                       g_object_unref (priv->cur_folder);
-               if (priv->cur_row)
-                       gtk_tree_row_reference_free (priv->cur_row);
-               priv->cur_folder = NULL;
-               priv->cur_row = NULL;
-               return; 
-       }
 
-       model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (model_sort));
-       gtk_tree_model_sort_convert_iter_to_child_iter (GTK_TREE_MODEL_SORT (model_sort),
-                                                       &iter,
-                                                       &iter_sort);
+       selected = gtk_tree_selection_get_selected (sel, &model, &iter);
 
        tree_view = MODEST_FOLDER_VIEW (user_data);
 
-       gtk_tree_model_get (model, &iter,
-                           TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
-                           TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder,
-                           -1);
+       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 ((type == TNY_FOLDER_TYPE_ROOT) || (priv->cur_folder == folder)) {
-               g_object_unref (folder);
-               return;
+               /* 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) {
+       if (priv->cur_folder_store) {
                g_signal_emit (G_OBJECT(tree_view), signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0,
-                              priv->cur_folder, FALSE);
-               g_object_unref (priv->cur_folder);
-       }
+                      priv->cur_folder_store, FALSE);
 
-       if (priv->cur_row)
-               gtk_tree_row_reference_free (priv->cur_row);
+               if (TNY_IS_FOLDER(priv->cur_folder_store))
+                       tny_folder_sync_async (TNY_FOLDER(priv->cur_folder_store),
+                                              FALSE, NULL, NULL, NULL);
 
-       /* New current references */
-       path = gtk_tree_model_get_path (model_sort, &iter_sort);
-       priv->cur_folder = folder;
-       priv->cur_row = gtk_tree_row_reference_new (model_sort, path);
+               /* FALSE --> don't expunge the messages */
 
-       /* Frees */
-       gtk_tree_path_free (path);
+               g_object_unref (priv->cur_folder_store);
+               priv->cur_folder_store = NULL;
+       }
 
-       /* New folder has been selected */
-       g_signal_emit (G_OBJECT(tree_view), 
-                      signals[FOLDER_SELECTION_CHANGED_SIGNAL], 
-                      0, folder, TRUE); 
+       /* New current references */
+       priv->cur_folder_store = folder;
+
+       /* 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);
+       }
 }
 
-TnyFolder *
+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)
-               g_object_ref (priv->cur_folder);
+       if (priv->cur_folder_store)
+               g_object_ref (priv->cur_folder_store);
 
-       return priv->cur_folder;
+       return priv->cur_folder_store;
 }
 
 static gint
+get_cmp_rows_type_pos (GObject *folder)
+{
+       /* Remote accounts -> Local account -> MMC account .*/
+       /* 0, 1, 2 */
+       
+       if (TNY_IS_ACCOUNT (folder) && 
+               modest_tny_account_is_virtual_local_folders (
+                       TNY_ACCOUNT (folder))) {
+               return 1;
+       } else if (TNY_IS_ACCOUNT (folder)) {
+               TnyAccount *account = TNY_ACCOUNT (folder);
+               const gchar *account_id = tny_account_get_id (account);
+               if (!strcmp (account_id, MODEST_MMC_ACCOUNT_ID))
+                       return 2;
+               else
+                       return 0;
+       }
+       else {
+               printf ("DEBUG: %s: unexpected type.\n", __FUNCTION__);
+               return -1; /* Should never happen */
+       }
+}
+
+static gint
+get_cmp_subfolder_type_pos (TnyFolderType t)
+{
+       /* Inbox, Outbox, Drafts, Sent, User */
+       /* 0, 1, 2, 3, 4 */
+
+       switch (t) {
+       case TNY_FOLDER_TYPE_INBOX:
+               return 0;
+               break;
+       case TNY_FOLDER_TYPE_OUTBOX:
+               return 1;
+               break;
+       case TNY_FOLDER_TYPE_DRAFTS:
+               return 2;
+               break;
+       case TNY_FOLDER_TYPE_SENT:
+               return 3;
+               break;
+       default:
+               return 4;
+       }
+}
+
+/*
+ * This function orders the mail accounts according to these rules:
+ * 1st - remote accounts
+ * 2nd - local account
+ * 3rd - MMC account
+ */
+static gint
 cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
          gpointer user_data)
 {
-       gint cmp;
-       gchar         *name1, *name2;
-       TnyFolderType type;
-       TnyFolder     *folder1, *folder2;
-       
+       gint cmp = 0;
+       gchar *name1 = NULL;
+       gchar *name2 = NULL;
+       TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
+       TnyFolderType type2 = TNY_FOLDER_TYPE_UNKNOWN;
+       GObject *folder1 = NULL;
+       GObject *folder2 = NULL;
+
        gtk_tree_model_get (tree_model, iter1,
                            TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &name1,
                            TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
@@ -643,28 +1765,106 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
                            -1);
        gtk_tree_model_get (tree_model, iter2,
                            TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &name2,
+                           TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type2,
                            TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder2,
                            -1);
 
-       /* local_folders should be the last one */
+       /* Return if we get no folder. This could happen when folder
+          operations are happening. The model is updated after the
+          folder copy/move actually occurs, so there could be
+          situations where the model to be drawn is not correct */
+       if (!folder1 || !folder2)
+               goto finish;
+
        if (type == TNY_FOLDER_TYPE_ROOT) {
-               /* the account name is also the name of the root folder
-                * in case of local folders */
-               if (name1 && strcmp (name1, MODEST_LOCAL_FOLDERS_ACCOUNT_NAME) == 0)
-                       cmp = +1;
-               else if (name2 && strcmp (name2, MODEST_LOCAL_FOLDERS_ACCOUNT_NAME) == 0)
+               /* Compare the types, so that 
+                * Remote accounts -> Local account -> MMC account .*/
+               const gint pos1 = get_cmp_rows_type_pos (folder1);
+               const gint pos2 = get_cmp_rows_type_pos (folder2);
+               /* printf ("DEBUG: %s:\n  type1=%s, pos1=%d\n  type2=%s, pos2=%d\n", 
+                       __FUNCTION__, G_OBJECT_TYPE_NAME(folder1), pos1, G_OBJECT_TYPE_NAME(folder2), pos2); */
+               if (pos1 <  pos2)
                        cmp = -1;
-               else 
+               else if (pos1 > pos2)
+                       cmp = 1;
+               else {
+                       /* Compare items of the same type: */
+                       
+                       TnyAccount *account1 = NULL;
+                       if (TNY_IS_ACCOUNT (folder1))
+                               account1 = TNY_ACCOUNT (folder1);
+                               
+                       TnyAccount *account2 = NULL;
+                       if (TNY_IS_ACCOUNT (folder2))
+                               account2 = TNY_ACCOUNT (folder2);
+                               
+                       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) {
+                               cmp = 0;
+                       } else if (!account_id) {
+                               cmp = -1;
+                       } else if (!account_id2) {
+                               cmp = +1;
+                       } 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;
+               /* get the parent to know if it's a local folder */
+
+               GtkTreeIter parent;
+               gboolean has_parent;
+               has_parent = gtk_tree_model_iter_parent (tree_model, &parent, iter1);
+               if (has_parent) {
+                       GObject *parent_folder;
+                       TnyFolderType parent_type = TNY_FOLDER_TYPE_UNKNOWN;
+                       gtk_tree_model_get (tree_model, &parent, 
+                                           TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &parent_type,
+                                           TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &parent_folder,
+                                           -1);
+                       if ((parent_type == TNY_FOLDER_TYPE_ROOT) &&
+                           TNY_IS_ACCOUNT (parent_folder)) {
+                               if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (parent_folder))) {
+                                       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)));
+                               } else if (modest_tny_account_is_memory_card_account (TNY_ACCOUNT (parent_folder))) {
+                                       if (modest_local_folder_info_get_type (tny_folder_get_name (TNY_FOLDER (folder1))) == TNY_FOLDER_TYPE_ARCHIVE) {
+                                               cmp1 = 0;
+                                               cmp2 = 1;
+                                               } else if (modest_local_folder_info_get_type (tny_folder_get_name (TNY_FOLDER (folder2))) == TNY_FOLDER_TYPE_ARCHIVE) {
+                                               cmp1 = 1;
+                                               cmp2 = 0;
+                                       }
+                               }
+                       }
+                       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)));
+                       cmp2 = get_cmp_subfolder_type_pos (tny_folder_get_folder_type (TNY_FOLDER (folder2)));
+               }
+
+               if (cmp1 == cmp2)
                        cmp = modest_text_utils_utf8_strcmp (name1, name2, TRUE);
-       } else 
-               cmp = modest_text_utils_utf8_strcmp (name1, name2, TRUE);
+               else 
+                       cmp = (cmp1 - cmp2);
+       }
 
-       
+finish:        
        if (folder1)
                g_object_unref(G_OBJECT(folder1));
        if (folder2)
                g_object_unref(G_OBJECT(folder2));
-       
+
        g_free (name1);
        g_free (name2);
 
@@ -674,71 +1874,58 @@ 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_sort, *model;
+       GtkTreeModel *model;
        GtkTreeIter iter;
-       GtkTreePath *source_row_sort;
        GtkTreePath *source_row;
-
+       
        selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget));
-       gtk_tree_selection_get_selected (selection, &model_sort, &iter);
-       source_row_sort = gtk_tree_model_get_path (model_sort, &iter);
+       if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
 
-       /* Get the unsorted path and model */
-       model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (model_sort));
-       source_row = gtk_tree_model_sort_convert_path_to_child_path (GTK_TREE_MODEL_SORT (model_sort),
-                                                                    source_row_sort);
-
-       gtk_tree_set_row_drag_data (selection_data,
-                                   model,
-                                   source_row);
-
-       gtk_tree_path_free (source_row_sort);
-       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 {
+       ModestFolderView *folder_view;
        gboolean delete_source;
        GtkTreePath *source_row;
        GdkDragContext *context;
        guint time;
 } DndHelper;
 
+static void
+dnd_helper_destroyer (DndHelper *helper)
+{
+       /* Free the helper */
+       g_object_unref (helper->folder_view);
+       gtk_tree_path_free (helper->source_row);
+       g_slice_free (DndHelper, helper);
+}
 
-/*
- * This function is the callback of the
- * modest_mail_operation_xfer_msg() and
- * modest_mail_operation_xfer_folder() calls. We check here if the
- * message/folder was correctly asynchronously transferred. The reason
- * to use the same callback is that the code is the same, it only has
- * to check that the operation went fine and then finalize the drag
- * and drop action
- */
 static void
-on_progress_changed (ModestMailOperation *mail_op, gpointer user_data)
+xfer_cb (ModestMailOperation *mail_op, 
+        gpointer user_data)
 {
        gboolean success;
        DndHelper *helper;
 
        helper = (DndHelper *) user_data;
 
-       if (!modest_mail_operation_is_finished (mail_op))
-               return;
-
        if (modest_mail_operation_get_status (mail_op) == 
            MODEST_MAIL_OPERATION_STATUS_SUCCESS) {
                success = TRUE;
@@ -751,8 +1938,52 @@ on_progress_changed (ModestMailOperation *mail_op, gpointer user_data)
        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);
+}
+
+static void
+xfer_msgs_cb (ModestMailOperation *mail_op, 
+             gpointer user_data)
+{
+       /* Common part */
+       xfer_cb (mail_op, user_data);
+}
+
+static void
+xfer_folder_cb (ModestMailOperation *mail_op, 
+               TnyFolder *new_folder,
+               gpointer user_data)
+{
+       DndHelper *helper;
+       GtkWidget *folder_view;
+
+       helper = (DndHelper *) user_data;
+       folder_view = g_object_ref (helper->folder_view);
+
+       /* Common part */
+       xfer_cb (mail_op, user_data);
+
+       /* Select the folder */
+       if (new_folder)
+               modest_folder_view_select_folder (MODEST_FOLDER_VIEW (folder_view),
+                                                 new_folder, FALSE);
+       g_object_unref (folder_view);
+}
+
+
+/* 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;
 }
 
 /*
@@ -764,38 +1995,206 @@ static void
 drag_and_drop_from_header_view (GtkTreeModel *source_model,
                                GtkTreeModel *dest_model,
                                GtkTreePath  *dest_row,
+                               GtkSelectionData *selection_data,
                                DndHelper    *helper)
 {
-       TnyHeader *header;
-       TnyFolder *folder;
-       ModestMailOperation *mail_op;
+       TnyList *headers = 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;
+
+       /* 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++;
+       }
+       g_strfreev (uris);
 
-       /* 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);
-
-       /* Get Folder */
+       /* 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 (!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;
+       }
 
-       /* Transfer message */
-       mail_op = modest_mail_operation_new ();
-       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);
+       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);
 
-       modest_mail_operation_xfer_msg (mail_op, header, folder, helper->delete_source);
+       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
+                                        mail_op);
 
+       modest_mail_operation_xfer_msgs (mail_op,
+                                        headers, 
+                                        folder, 
+                                        helper->delete_source, 
+                                        xfer_msgs_cb, helper);
+       
        /* Frees */
+cleanup:
+       if (G_IS_OBJECT(mail_op))
+               g_object_unref (G_OBJECT (mail_op));
+       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;
+       ModestFolderView *folder_view;
+       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);
+       if (info->folder_view)
+               g_object_unref (info->folder_view);
+       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_folder_cb,
+                                          info->helper);
+       
+/*     modest_folder_view_select_folder (MODEST_FOLDER_VIEW(info->folder_view), */
+/*                                       TNY_FOLDER (info->dst_folder), TRUE); */
+
        g_object_unref (G_OBJECT (mail_op));
-       g_object_unref (G_OBJECT (header));
-       g_object_unref (G_OBJECT (folder));
+}
+
+
+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, TRUE,
+                                                      info->src_folder,
+                                                      drag_and_drop_from_folder_view_src_folder_performer,
+                                                      info);
 }
 
 /*
@@ -810,17 +2209,49 @@ drag_and_drop_from_folder_view (GtkTreeModel     *source_model,
                                GtkSelectionData *selection_data,
                                DndHelper        *helper)
 {
-       ModestMailOperation *mail_op;
-       GtkTreeIter parent_iter, iter;
-       TnyFolderStore *parent_folder;
-       TnyFolder *folder;
+       GtkTreeIter dest_iter, iter;
+       TnyFolderStore *dest_folder = NULL;
+       TnyFolderStore *folder = NULL;
+       gboolean forbidden = FALSE;
+       ModestWindow *win;
+       DndFolderInfo *info = NULL;
+
+       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) && 
+                           !modest_tny_account_is_memory_card_account (TNY_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 (!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 (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);
@@ -828,31 +2259,31 @@ 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);
 
-       /* Do the mail operation */
-       mail_op = modest_mail_operation_new ();
-       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);
-
+       /* 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->folder_view = g_object_ref (helper->folder_view);
+       info->helper = helper;
+
+       /* Connect to the destination folder and perform the copy/move */
+       modest_platform_connect_if_remote_and_perform (GTK_WINDOW (win), TRUE,
+                                                      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);
 }
 
 /*
@@ -872,36 +2303,38 @@ on_drag_data_received (GtkWidget *widget,
                       gpointer data)
 {
        GtkWidget *source_widget;
-       GtkTreeModel *model_sort, *dest_model, *source_model;
-       GtkTreePath *source_row, *dest_row, *child_dest_row;
+       GtkTreeModel *dest_model, *source_model;
+       GtkTreePath *source_row, *dest_row;
        GtkTreeViewDropPosition pos;
        gboolean success = FALSE, delete_source = FALSE;
-       DndHelper *helper;
+       DndHelper *helper = NULL; 
 
        /* Do not allow further process */
        g_signal_stop_emission_by_name (widget, "drag-data-received");
+       source_widget = gtk_drag_get_source_widget (context);
 
        /* Get the action */
-       if (context->action == GDK_ACTION_MOVE)
+       if (context->action == GDK_ACTION_MOVE) {
                delete_source = TRUE;
 
+               /* Notify that there is no folder selected. We need to
+                  do this in order to update the headers view (and
+                  its monitors, because when moving, the old folder
+                  won't longer exist. We can not wait for the end of
+                  the operation, because the operation won't start if
+                  the folder is in use */
+               if (source_widget == widget) {
+                       GtkTreeSelection *sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget));
+                       gtk_tree_selection_unselect_all (sel);
+               }
+       }
+
        /* Check if the get_data failed */
        if (selection_data == NULL || selection_data->length < 0)
                gtk_drag_finish (context, success, FALSE, time);
 
-       /* Get the models */
-       source_widget = gtk_drag_get_source_widget (context);
-       gtk_tree_get_row_drag_data (selection_data,
-                                   &source_model,
-                                   &source_row);
-
-       model_sort = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
        /* Select the destination model */
-       if (source_widget == widget) {
-               dest_model = source_model;
-       } else {
-               dest_model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (model_sort));
-       }
+       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
@@ -910,42 +2343,45 @@ 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;
-
-       /* Get path from the unsorted model */
-       child_dest_row = 
-               gtk_tree_model_sort_convert_path_to_child_path (GTK_TREE_MODEL_SORT (model_sort),
-                                                               dest_row);
-       gtk_tree_path_free (dest_row);
+       helper->folder_view = g_object_ref (widget);
 
        /* 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,
-                                               child_dest_row,
+                                               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,
-                                               child_dest_row,
+                                               dest_row,
                                                selection_data, 
                                                helper);
+
+               gtk_tree_path_free (source_row);
        }
 
        /* Frees */
-       gtk_tree_path_free (source_row);
-       gtk_tree_path_free (child_dest_row);
+       gtk_tree_path_free (dest_row);
 }
 
 /*
@@ -990,7 +2426,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,
@@ -1009,7 +2445,7 @@ expand_row_timeout (gpointer data)
                result = TRUE;
        }
        
-       GDK_THREADS_LEAVE ();
+       gdk_threads_leave ();
 
        return result;
 }
@@ -1032,9 +2468,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);
 
@@ -1050,7 +2488,7 @@ on_drag_motion (GtkWidget      *widget,
 
        /* Do not allow drops between folders */
        if (!dest_row ||
-           pos == GTK_TREE_VIEW_DROP_BEFORE || 
+           pos == GTK_TREE_VIEW_DROP_BEFORE ||
            pos == GTK_TREE_VIEW_DROP_AFTER) {
                gtk_tree_view_set_drag_dest_row(GTK_TREE_VIEW (widget), NULL, 0);
                gdk_drag_status(context, 0, time);
@@ -1060,12 +2498,23 @@ 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);
                priv->timer_expander = g_timeout_add (500, expand_row_timeout, widget);
        }
-       gtk_tree_path_free (dest_row);
+       gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (widget), dest_row, pos);
 
        /* Select the desired action. By default we pick MOVE */
        suggested_action = GDK_ACTION_MOVE;
@@ -1080,18 +2529,16 @@ 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.
@@ -1136,3 +2583,527 @@ setup_drag_and_drop (GtkTreeView *self)
                          G_CALLBACK (drag_drop_cb),
                          NULL);
 }
+
+/*
+ * This function manages the navigation through the folders using the
+ * keyboard or the hardware keys in the device
+ */
+static gboolean
+on_key_pressed (GtkWidget *self,
+               GdkEventKey *event,
+               gpointer user_data)
+{
+       GtkTreeSelection *selection;
+       GtkTreeIter iter;
+       GtkTreeModel *model;
+       gboolean retval = FALSE;
+
+       /* Up and Down are automatically managed by the treeview */
+       if (event->keyval == GDK_Return) {
+               /* Expand/Collapse the selected row */
+               selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
+               if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
+                       GtkTreePath *path;
+
+                       path = gtk_tree_model_get_path (model, &iter);
+
+                       if (gtk_tree_view_row_expanded (GTK_TREE_VIEW (self), path))
+                               gtk_tree_view_collapse_row (GTK_TREE_VIEW (self), path);
+                       else
+                               gtk_tree_view_expand_row (GTK_TREE_VIEW (self), path, FALSE);
+                       gtk_tree_path_free (path);
+               }
+               /* No further processing */
+               retval = TRUE;
+       }
+
+       return retval;
+}
+
+/*
+ * We listen to the changes in the local folder account name key,
+ * because we want to show the right name in the view. The local
+ * folder account name corresponds to the device name in the Maemo
+ * version. We do this because we do not want to query gconf on each
+ * tree view refresh. It's better to cache it and change whenever
+ * necessary.
+ */
+static void 
+on_configuration_key_changed (ModestConf* conf, 
+                             const gchar *key, 
+                             ModestConfEvent event,
+                             ModestConfNotificationId id, 
+                             ModestFolderView *self)
+{
+       ModestFolderViewPrivate *priv;
+
+
+       g_return_if_fail (MODEST_IS_FOLDER_VIEW (self));
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
+
+       if (!strcmp (key, MODEST_CONF_DEVICE_NAME)) {
+               g_free (priv->local_account_name);
+
+               if (event == MODEST_CONF_EVENT_KEY_UNSET)
+                       priv->local_account_name = g_strdup (MODEST_LOCAL_FOLDERS_DEFAULT_DISPLAY_NAME);
+               else
+                       priv->local_account_name = modest_conf_get_string (modest_runtime_get_conf(),
+                                                                          MODEST_CONF_DEVICE_NAME, NULL);
+
+               /* 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
+       }
+}
+
+void
+modest_folder_view_set_style (ModestFolderView *self,
+                             ModestFolderViewStyle style)
+{
+       ModestFolderViewPrivate *priv;
+
+       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;
+}
+
+void
+modest_folder_view_set_account_id_of_visible_server_account (ModestFolderView *self,
+                                                            const gchar *account_id)
+{
+       ModestFolderViewPrivate *priv;
+       GtkTreeModel *model;
+
+       g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self));
+       
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
+
+       /* This will be used by the filter_row callback,
+        * to decided which rows to show: */
+       if (priv->visible_account_id) {
+               g_free (priv->visible_account_id);
+               priv->visible_account_id = NULL;
+       }
+       if (account_id)
+               priv->visible_account_id = g_strdup (account_id);
+
+       /* Refilter */
+       model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+       if (GTK_IS_TREE_MODEL_FILTER (model))
+               gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model));
+
+       /* Save settings to gconf */
+       modest_widget_memory_save (modest_runtime_get_conf (), G_OBJECT(self),
+                                  MODEST_CONF_FOLDER_VIEW_KEY);
+}
+
+const gchar *
+modest_folder_view_get_account_id_of_visible_server_account (ModestFolderView *self)
+{
+       ModestFolderViewPrivate *priv;
+
+       g_return_val_if_fail (self && MODEST_IS_FOLDER_VIEW(self), NULL);
+       
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
+
+       return (const gchar *) priv->visible_account_id;
+}
+
+static gboolean
+find_inbox_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *inbox_iter)
+{
+       do {
+               GtkTreeIter child;
+               TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
+
+               gtk_tree_model_get (model, iter, 
+                                   TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, 
+                                   &type, -1);
+                       
+               gboolean result = FALSE;
+               if (type == TNY_FOLDER_TYPE_INBOX) {
+                       result = TRUE;
+               }               
+               if (result) {
+                       *inbox_iter = *iter;
+                       return TRUE;
+               }
+
+               if (gtk_tree_model_iter_children (model, &child, iter)) {
+                       if (find_inbox_iter (model, &child, inbox_iter))
+                               return TRUE;
+               }
+
+       } while (gtk_tree_model_iter_next (model, iter));
+
+       return FALSE;
+}
+
+
+
+
+void 
+modest_folder_view_select_first_inbox_or_local (ModestFolderView *self)
+{
+       GtkTreeModel *model;
+       GtkTreeIter iter, inbox_iter;
+       GtkTreeSelection *sel;
+       GtkTreePath *path = NULL;
+
+       g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self));
+       
+       model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+       if (!model)
+               return;
+
+       expand_root_items (self);
+       sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
+
+       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));
+}
+
+
+/* recursive */
+static gboolean
+find_folder_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *folder_iter, 
+                 TnyFolder* folder)
+{
+       do {
+               GtkTreeIter child;
+               TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
+               TnyFolder* a_folder;
+               gchar *name = NULL;
+               
+               gtk_tree_model_get (model, iter, 
+                                   TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &a_folder,
+                                   TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &name,
+                                   TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type, 
+                                   -1);                
+               g_free (name);
+
+               if (folder == a_folder) {
+                       g_object_unref (a_folder);
+                       *folder_iter = *iter;
+                       return TRUE;
+               }
+               g_object_unref (a_folder);
+               
+               if (gtk_tree_model_iter_children (model, &child, iter)) {
+                       if (find_folder_iter (model, &child, folder_iter, folder)) 
+                               return TRUE;
+               }
+
+       } while (gtk_tree_model_iter_next (model, iter));
+
+       return FALSE;
+}
+
+
+static void
+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;
+       
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (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);
+                       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);
+               
+               /* 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)
+{
+       GtkTreeModel *model;
+       GtkTreeIter iter, folder_iter;
+       GtkTreeSelection *sel;
+       ModestFolderViewPrivate *priv = NULL;
+       
+       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));
+               return TRUE;
+       }
+               
+       model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+       if (!model)
+               return FALSE;
+
+
+       /* 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)) {
+               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;
+}
+
+
+void 
+modest_folder_view_copy_selection (ModestFolderView *self)
+{
+       g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self));
+       
+       /* Copy selection */
+       _clipboard_set_selected_data (self, FALSE);
+}
+
+void 
+modest_folder_view_cut_selection (ModestFolderView *folder_view)
+{
+       ModestFolderViewPrivate *priv = NULL;
+       GtkTreeModel *model = NULL;
+       const gchar **hidding = NULL;
+       guint i, n_selected;
+
+       g_return_if_fail (folder_view && MODEST_IS_FOLDER_VIEW (folder_view));
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (folder_view);
+
+       /* Copy selection */
+       if (!_clipboard_set_selected_data (folder_view, TRUE))
+               return;
+
+       /* Get hidding ids */
+       hidding = modest_email_clipboard_get_hidding_ids (priv->clipboard, &n_selected); 
+       
+       /* Clear hidding array created by previous cut operation */
+       _clear_hidding_filter (MODEST_FOLDER_VIEW (folder_view));
+
+       /* Copy hidding array */
+       priv->n_selected = n_selected;
+       priv->hidding_ids = g_malloc0(sizeof(gchar *) * n_selected);
+       for (i=0; i < n_selected; i++) 
+               priv->hidding_ids[i] = g_strdup(hidding[i]);            
+
+       /* Hide cut folders */
+       model = gtk_tree_view_get_model (GTK_TREE_VIEW (folder_view));
+       gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model));
+}
+
+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)
+{
+       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())); */
+
+       /* 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 */
+static gboolean
+_clipboard_set_selected_data (ModestFolderView *folder_view,
+                             gboolean delete)
+{
+       ModestFolderViewPrivate *priv = NULL;
+       TnyFolderStore *folder = NULL;
+       gboolean retval = FALSE;
+
+       g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (folder_view), FALSE);
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (folder_view);
+               
+       /* Set selected data on clipboard   */
+       g_return_val_if_fail (MODEST_IS_EMAIL_CLIPBOARD (priv->clipboard), FALSE);
+       folder = modest_folder_view_get_selected (folder_view);
+
+       /* Do not allow to select an account */
+       if (TNY_IS_FOLDER (folder)) {
+               modest_email_clipboard_set_data (priv->clipboard, TNY_FOLDER(folder), NULL, delete);
+               retval = TRUE;
+       }
+
+       /* Free */
+       g_object_unref (folder);
+
+       return retval;
+}
+
+static void
+_clear_hidding_filter (ModestFolderView *folder_view) 
+{
+       ModestFolderViewPrivate *priv;
+       guint i;
+       
+       g_return_if_fail (MODEST_IS_FOLDER_VIEW (folder_view)); 
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE(folder_view);
+
+       if (priv->hidding_ids != NULL) {
+               for (i=0; i < priv->n_selected; i++) 
+                       g_free (priv->hidding_ids[i]);
+               g_free(priv->hidding_ids);
+       }       
+}
+
+
+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
+}