2007-06-12 Murray Cumming <murrayc@murrayc.com>
[modest] / src / widgets / modest-folder-view.c
index 78a026d..fe8fad9 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 <modest-tny-folder.h>
+#include <modest-tny-local-folders-account.h>
 #include <modest-marshal.h>
 #include <modest-icon-names.h>
 #include <modest-tny-account-store.h>
 #include <modest-runtime.h>
 #include "modest-folder-view.h"
 #include <modest-dnd.h>
+#include <modest-platform.h>
+#include <modest-account-mgr-helpers.h>
+#include <modest-widget-memory.h>
+#include <modest-ui-actions.h>
 
 /* 'private'/'protected' functions */
 static void modest_folder_view_class_init  (ModestFolderViewClass *klass);
@@ -60,9 +66,6 @@ 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_account_update      (TnyAccountStore *account_store, 
@@ -77,6 +80,19 @@ 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, 
+                                                         ModestFolderView *self);
+
 /* DnD functions */
 static void         on_drag_data_get       (GtkWidget *widget, 
                                            GdkDragContext *context, 
@@ -107,22 +123,25 @@ static void         setup_drag_and_drop    (GtkTreeView *self);
 
 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;
 
-       gulong               account_update_signal;
-       gulong               changed_signal;
-       gulong               accounts_reloaded_signal;
+       gulong                account_update_signal;
+       gulong                changed_signal;
+       gulong                accounts_reloaded_signal;
        
-       GtkTreeSelection    *cur_selection;
-       TnyFolderStoreQuery *query;
-       guint                timer_expander;
+       TnyFolderStoreQuery  *query;
+       guint                 timer_expander;
+
+       gchar                *local_account_name;
+       gchar                *visible_account_id;
+       ModestFolderViewStyle style;
 };
 #define MODEST_FOLDER_VIEW_GET_PRIVATE(o)                      \
        (G_TYPE_INSTANCE_GET_PRIVATE((o),                       \
@@ -190,194 +209,283 @@ 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);
+}
 
 static void
 text_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
                 GtkTreeModel *tree_model,  GtkTreeIter *iter,  gpointer data)
 {
+       ModestFolderViewPrivate *priv;
        GObject *rendobj;
        gchar *fname = NULL;
-       gint unread;
-       TnyFolderType type;
-       TnyFolder *folder = NULL;
+       gint unread = 0;
+       gint all = 0;
+       TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
+       GObject *instance = NULL;
        
        g_return_if_fail (column);
        g_return_if_fail (tree_model);
 
        gtk_tree_model_get (tree_model, iter,
                            TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &fname,
+                           TNY_GTK_FOLDER_STORE_TREE_MODEL_ALL_COLUMN, &all,
                            TNY_GTK_FOLDER_STORE_TREE_MODEL_UNREAD_COLUMN, &unread,
                            TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
-                           TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder,
+                           TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &instance,
                            -1);
        rendobj = G_OBJECT(renderer);
  
        if (!fname)
                return;
+
+       if (!instance) {
+               g_free (fname);
+               return;
+       }
+
+       
+       priv =  MODEST_FOLDER_VIEW_GET_PRIVATE (data);
        
-       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);
-                       if (type != TNY_FOLDER_TYPE_UNKNOWN) {
+       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))) {
+                       TnyFolderType folder_type
+                               = modest_tny_folder_get_local_folder_type (TNY_FOLDER (instance));
+                       if (folder_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 (folder_type));
                        }
                }
-       } else if (folder && type == TNY_FOLDER_TYPE_ROOT) {
-               /* FIXME: todo */
-       }
-                       
-       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);
-               
-       g_free (fname);
-       if (folder) g_object_unref (G_OBJECT (folder));
-}
-
 
-static GdkPixbuf*
-get_cached_icon (const gchar *name)
-{
-       GError *err = NULL;
-       gpointer pixbuf;
-       gpointer orig_key;
-       static GHashTable *icon_cache = NULL;
-       
-       g_return_val_if_fail (name, NULL);
+               /* Select the number to show */
+               if ((type == TNY_FOLDER_TYPE_DRAFTS) || (type == TNY_FOLDER_TYPE_OUTBOX))
+                       number = all;
+               else
+                       number = unread;
+
+               /* Use bold font style if there are unread messages */
+               if (unread > 0) {
+                       item_name = g_strdup_printf ("%s (%d)", fname, unread);
+                       item_weight = 800;
+               } else {
+                       item_name = g_strdup (fname);
+                       item_weight = 400;
+               }
 
-       if (G_UNLIKELY(!icon_cache))
-               icon_cache = modest_cache_mgr_get_cache (modest_runtime_get_cache_mgr(),
-                                                        MODEST_CACHE_MGR_CACHE_TYPE_PIXBUF);
+       } 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 = 400;
+               } else {
+                       item_name = g_strdup (fname);
+                       item_weight = 800;
+               }
+       }
        
-       if (!icon_cache || !g_hash_table_lookup_extended (icon_cache, name, &orig_key, &pixbuf)) {
-
-#ifdef MODEST_PLATFORM_GNOME  
-               pixbuf = (gpointer) gdk_pixbuf_new_from_file (name, &err);
-#else
-               GtkIconTheme *current_theme;
-               current_theme = gtk_icon_theme_get_default ();
-               pixbuf = gtk_icon_theme_load_icon (current_theme,
-                                                  name,
-                                                  26,
-                                                  GTK_ICON_LOOKUP_NO_SVG,
-                                                  NULL);
-#endif /*MODEST_PLATFORM_GNOME*/
-
-               if (!pixbuf) {
-                       g_printerr ("modest: error in icon factory while loading '%s': %s\n",
-                                   name, err->message);
-                       g_error_free (err);
+       if (!item_name)
+               item_name = g_strdup ("unknown");
+                       
+       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 */
+               if (G_OBJECT (priv->cur_folder_store) == instance) {
+                       g_signal_emit (G_OBJECT(data),
+                                              signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL], 0,
+                                              item_name);
                }
-               /* if we cannot find it, we still insert (if we have a cache), so we get the error
-                * only once */
-               if (icon_cache)
-                       g_hash_table_insert (icon_cache, g_strdup(name),(gpointer)pixbuf);
+               
+               g_free (item_name);
+               
        }
-       return GDK_PIXBUF(pixbuf);
+       
+       g_object_unref (G_OBJECT (instance));
+       g_free (fname);
 }
 
 
+
 static void
 icon_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
                 GtkTreeModel *tree_model,  GtkTreeIter *iter, gpointer data)
 {
-       GObject *rendobj;
-       GdkPixbuf *pixbuf;
-       TnyFolderType type;
+       GObject *rendobj = NULL, *instance = NULL;
+       GdkPixbuf *pixbuf = NULL;
+       TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
        gchar *fname = NULL;
-       gint unread;
+       const gchar *account_id = NULL;
+       gint unread = 0;
        
        rendobj = G_OBJECT(renderer);
        gtk_tree_model_get (tree_model, iter,
                            TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
                            TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &fname,
-                           TNY_GTK_FOLDER_STORE_TREE_MODEL_UNREAD_COLUMN, &unread, 
+                           TNY_GTK_FOLDER_STORE_TREE_MODEL_UNREAD_COLUMN, &unread,
+                           TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &instance,
                            -1);
-       rendobj = G_OBJECT(renderer);
+
+       if (!fname)
+               return;
+
+       if (!instance) {
+               g_free (fname);
+               return;
+       }
        
        if (type == TNY_FOLDER_TYPE_NORMAL || type == TNY_FOLDER_TYPE_UNKNOWN) {
                type = modest_tny_folder_guess_folder_type_from_name (fname);
        }
-       g_free (fname);
 
        switch (type) {
        case TNY_FOLDER_TYPE_ROOT:
-               pixbuf = get_cached_icon (MODEST_FOLDER_ICON_ACCOUNT);
-                break;
+               if (TNY_IS_ACCOUNT (instance)) {
+                       
+                       if (modest_tny_account_is_virtual_local_folders (
+                               TNY_ACCOUNT (instance))) {
+                               pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_LOCAL_FOLDERS);
+                       }
+                       else {
+                               account_id = tny_account_get_id (TNY_ACCOUNT (instance));
+                               
+                               if (!strcmp (account_id, MODEST_MMC_ACCOUNT_ID))
+                                       pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_MMC);
+                               else
+                                       pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_ACCOUNT);
+                       }
+               }
+               break;
        case TNY_FOLDER_TYPE_INBOX:
-                pixbuf = get_cached_icon (MODEST_FOLDER_ICON_INBOX);
-                break;
-        case TNY_FOLDER_TYPE_OUTBOX:
-                pixbuf = get_cached_icon (MODEST_FOLDER_ICON_OUTBOX);
-                break;
-        case TNY_FOLDER_TYPE_JUNK:
-                pixbuf = get_cached_icon (MODEST_FOLDER_ICON_JUNK);
-                break;
-        case TNY_FOLDER_TYPE_SENT:
-                pixbuf = get_cached_icon (MODEST_FOLDER_ICON_SENT);
-                break;
+           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;
        case TNY_FOLDER_TYPE_TRASH:
-               pixbuf = get_cached_icon (MODEST_FOLDER_ICON_TRASH);
-                break;
+               pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_TRASH);
+               break;
        case TNY_FOLDER_TYPE_DRAFTS:
-               pixbuf = get_cached_icon (MODEST_FOLDER_ICON_DRAFTS);
-                break;
+               pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_DRAFTS);
+               break;
        case TNY_FOLDER_TYPE_NORMAL:
-        default:
-                pixbuf = get_cached_icon (MODEST_FOLDER_ICON_NORMAL);
+       default:
+               pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_NORMAL);
                break;
-        }
+       }
+       
+       g_object_unref (G_OBJECT (instance));
+       g_free (fname);
+
+       /* Set pixbuf */
        g_object_set (rendobj, "pixbuf", pixbuf, NULL);
+
+       if (pixbuf != NULL)
+               g_object_unref (pixbuf);
 }
 
 static void
-modest_folder_view_init (ModestFolderView *obj)
+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);
        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);
 
-       gtk_tree_view_append_column (GTK_TREE_VIEW(obj),column);
+       /* 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;
+
+       /* Initialize the local account name */
+       conf = modest_runtime_get_conf();
+       priv->local_account_name = modest_conf_get_string (conf, MODEST_CONF_DEVICE_NAME, NULL);
+
+       /* 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);
+
+       /*
+        * Track changes in the local account name (in the device it
+        * will be the device name)
+        */
+       g_signal_connect (G_OBJECT(conf), 
+                         "key_changed",
+                         G_CALLBACK(on_configuration_key_changed), obj);
+
 }
 
 static void
@@ -422,6 +530,9 @@ modest_folder_view_finalize (GObject *obj)
        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);
        
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
@@ -463,10 +574,6 @@ modest_folder_view_set_account_store (TnyAccountStoreView *self, TnyAccountStore
                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");
-
        g_object_unref (G_OBJECT (device));
 }
 
@@ -474,8 +581,8 @@ static void
 on_account_update (TnyAccountStore *account_store, const gchar *account,
                   gpointer user_data)
 {
-       if (!update_model (MODEST_FOLDER_VIEW(user_data), 
-                          MODEST_TNY_ACCOUNT_STORE(account_store)))
+       if (!modest_folder_view_update_model (MODEST_FOLDER_VIEW(user_data), 
+                                             account_store))
                g_printerr ("modest: failed to update model for changes in '%s'",
                            account);
 }
@@ -484,8 +591,11 @@ static void
 on_accounts_reloaded   (TnyAccountStore *account_store, 
                        gpointer user_data)
 {
-       update_model (MODEST_FOLDER_VIEW (user_data), 
-                     MODEST_TNY_ACCOUNT_STORE(account_store));
+       ModestConf *conf = modest_runtime_get_conf ();
+
+       modest_widget_memory_save (conf, G_OBJECT (user_data), MODEST_CONF_FOLDER_VIEW_KEY);
+       modest_folder_view_update_model (MODEST_FOLDER_VIEW (user_data), account_store);
+       modest_widget_memory_restore (conf, G_OBJECT (user_data), MODEST_CONF_FOLDER_VIEW_KEY);
 }
 
 void
@@ -516,12 +626,14 @@ 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);
+
+       return GTK_WIDGET(self);
 }
 
 /* this feels dirty; any other way to expand all the root items? */
@@ -538,47 +650,123 @@ expand_root_items (ModestFolderView *self)
        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;
 
-       TnyList          *account_list;
-       GtkTreeModel     *model, *sortable;
+       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 (!modest_tny_account_is_virtual_local_folders (acc) &&
+                               strcmp (account_id, MODEST_MMC_ACCOUNT_ID)) { 
+                               /* Show only the visible account id */
+                               ModestFolderViewPrivate *priv = 
+                                       MODEST_FOLDER_VIEW_GET_PRIVATE (data);
+                               if (priv->visible_account_id && strcmp (account_id, priv->visible_account_id))
+                                       retval = FALSE;
+                       }
+               }
+       }
+       
+       /* The virtual local-folders folder store is also shown by default. */
+
+       g_object_unref (instance);
+
+       return retval;
+}
+
+gboolean
+modest_folder_view_update_model (ModestFolderView *self,
+                                TnyAccountStore *account_store)
+{
+       ModestFolderViewPrivate *priv;
+       GtkTreeModel *model /* , *old_model */;
+       /* TnyAccount *local_account; */
+       TnyList *model_as_list;
 
        g_return_val_if_fail (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);
-       
+
        /* 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);
+       
+       /* Deal with the model via its TnyList Interface,
+        * filling the TnyList via a get_accounts() call: */
+       model_as_list = TNY_LIST(model);
 
+       /* 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);
+                                       model_as_list,
+                                       TNY_ACCOUNT_STORE_STORE_ACCOUNTS);
+       g_object_unref (model_as_list);
+       model_as_list = NULL;   
+                                                     
+       GtkTreeModel *filter_model = NULL, *sortable = NULL;
+
+       sortable = gtk_tree_model_sort_new_with_model (model);
+       gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable),
+                                             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 */
+       if (priv->style == MODEST_FOLDER_VIEW_STYLE_SHOW_ONE) {
+               filter_model = gtk_tree_model_filter_new (sortable, NULL);
+               gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (filter_model),
+                                                       filter_row,
+                                                       self,
+                                                       NULL);
        }
+
+       /* Set new model */
+       gtk_tree_view_set_model (GTK_TREE_VIEW(self), 
+                                (filter_model) ? filter_model : sortable);
+       expand_root_items (self); /* expand all account folders */
        
+       g_object_unref (model);
+       
+       if (filter_model)
+               g_object_unref (filter_model);
+                       
+       g_object_unref (sortable);
+                       
        return TRUE;
 }
 
@@ -586,74 +774,59 @@ 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;
+       GtkTreeModel            *model;
+       TnyFolderStore          *folder = NULL;
+       GtkTreeIter             iter;
        ModestFolderView        *tree_view;
        ModestFolderViewPrivate *priv;
-       gint                    type;
 
        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; 
+       if (!gtk_tree_selection_get_selected (sel, &model, &iter)) {
+               if (priv->cur_folder_store)
+                       g_object_unref (priv->cur_folder_store);
+               priv->cur_folder_store = NULL;
+
+               /* Notify the display name observers */
+               g_signal_emit (G_OBJECT(user_data),
+                              signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL], 0,
+                              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);
-
        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 the folder is the same or is a root folder do not notify */
-       if ((type == TNY_FOLDER_TYPE_ROOT) || (priv->cur_folder == folder)) {
+       /* If the folder is the same do not notify */
+       if (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);
+               g_object_unref (priv->cur_folder_store);
        }
 
-       if (priv->cur_row)
-               gtk_tree_row_reference_free (priv->cur_row);
-
        /* 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);
-
-       /* Frees */
-       gtk_tree_path_free (path);
+       priv->cur_folder_store = folder;
 
        /* New folder has been selected */
-       g_signal_emit (G_OBJECT(tree_view), 
-                      signals[FOLDER_SELECTION_CHANGED_SIGNAL], 
-                      0, folder, TRUE); 
+       g_signal_emit (G_OBJECT(tree_view),
+                      signals[FOLDER_SELECTION_CHANGED_SIGNAL],
+                      0, folder, TRUE);
 }
 
-TnyFolder *
+TnyFolderStore *
 modest_folder_view_get_selected (ModestFolderView *self)
 {
        ModestFolderViewPrivate *priv;
@@ -661,21 +834,53 @@ modest_folder_view_get_selected (ModestFolderView *self)
        g_return_val_if_fail (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 */
+       }
+}
+
+/*
+ * 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;
-       
+       gchar *name1 = NULL;
+       gchar *name2 = NULL;
+       TnyFolderType type = 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,
@@ -686,25 +891,51 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
                            TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder2,
                            -1);
 
-       /* local_folders should be the last one */
        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 
-                       cmp = modest_text_utils_utf8_strcmp (name1, name2, TRUE);
-       } 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)
+                               return 0;
+                       else if (!account_id)
+                               return -1;
+                       else if (!account_id2)
+                               return +1;
+                       else if (!strcmp (account_id, MODEST_MMC_ACCOUNT_ID))
+                               cmp = +1;
+                       else
+                               cmp = modest_text_utils_utf8_strcmp (name1, name2, TRUE);
+               }
+       } else {
                cmp = modest_text_utils_utf8_strcmp (name1, name2, TRUE);
-
+       }
        
        if (folder1)
                g_object_unref(G_OBJECT(folder1));
        if (folder2)
                g_object_unref(G_OBJECT(folder2));
-       
+
        g_free (name1);
        g_free (name2);
 
@@ -729,25 +960,18 @@ on_drag_data_get (GtkWidget *widget,
                  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);
-
-       /* 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_selection_get_selected (selection, &model, &iter);
+       source_row = gtk_tree_model_get_path (model, &iter);
 
        gtk_tree_set_row_drag_data (selection_data,
                                    model,
                                    source_row);
 
-       gtk_tree_path_free (source_row_sort);
        gtk_tree_path_free (source_row);
 }
 
@@ -761,7 +985,7 @@ typedef struct _DndHelper {
 
 /*
  * This function is the callback of the
- * modest_mail_operation_xfer_msg() and
+ * modest_mail_operation_xfer_msgs () 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
@@ -769,18 +993,19 @@ typedef struct _DndHelper {
  * and drop action
  */
 static void
-on_progress_changed (ModestMailOperation *mail_op, gpointer user_data)
+on_progress_changed (ModestMailOperation *mail_op, 
+                    ModestMailOperationState *state,
+                    gpointer user_data)
 {
        gboolean success;
        DndHelper *helper;
 
        helper = (DndHelper *) user_data;
 
-       if (!modest_mail_operation_is_finished (mail_op))
+       if (!state->finished)
                return;
 
-       if (modest_mail_operation_get_status (mail_op) == 
-           MODEST_MAIL_OPERATION_STATUS_SUCCESS) {
+       if (state->status == MODEST_MAIL_OPERATION_STATUS_SUCCESS) {
                success = TRUE;
        } else {
                success = FALSE;
@@ -806,36 +1031,63 @@ drag_and_drop_from_header_view (GtkTreeModel *source_model,
                                GtkTreePath  *dest_row,
                                DndHelper    *helper)
 {
-       TnyHeader *header;
-       TnyFolder *folder;
-       ModestMailOperation *mail_op;
+       TnyList *headers = NULL;
+       TnyHeader *header = NULL;
+       TnyFolder *folder = NULL;
+       ModestMailOperation *mail_op = NULL;
        GtkTreeIter source_iter, dest_iter;
 
+       g_return_if_fail (GTK_IS_TREE_MODEL(source_model));
+       g_return_if_fail (GTK_IS_TREE_MODEL(dest_model));
+       g_return_if_fail (dest_row);
+       g_return_if_fail (helper);
+       
        /* Get header */
        gtk_tree_model_get_iter (source_model, &source_iter, helper->source_row);
        gtk_tree_model_get (source_model, &source_iter, 
                            TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, 
                            &header, -1);
-
+       if (!TNY_IS_HEADER(header)) {
+               g_warning ("BUG: %s could not get a valid header", __FUNCTION__);
+               goto cleanup;
+       }
+       
        /* Get 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, 
                            &folder, -1);
 
+       if (!TNY_IS_FOLDER(folder)) {
+               g_warning ("BUG: %s could not get a valid folder", __FUNCTION__);
+               goto cleanup;
+       }
+
        /* Transfer message */
-       mail_op = modest_mail_operation_new ();
-       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), 
+       mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, NULL);
+       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
                                         mail_op);
        g_signal_connect (G_OBJECT (mail_op), "progress-changed",
                          G_CALLBACK (on_progress_changed), helper);
 
-       modest_mail_operation_xfer_msg (mail_op, header, folder, helper->delete_source);
-
+       headers = tny_simple_list_new ();
+       tny_list_append (headers, G_OBJECT (header));
+       modest_mail_operation_xfer_msgs (mail_op, 
+                                        headers, 
+                                        folder, 
+                                        helper->delete_source, 
+                                        NULL, NULL);
+       
        /* Frees */
-       g_object_unref (G_OBJECT (mail_op));
-       g_object_unref (G_OBJECT (header));
-       g_object_unref (G_OBJECT (folder));
+cleanup:
+       if (G_IS_OBJECT(mail_op))
+               g_object_unref (G_OBJECT (mail_op));
+       if (G_IS_OBJECT(header))
+               g_object_unref (G_OBJECT (header));
+       if (G_IS_OBJECT(folder))
+               g_object_unref (G_OBJECT (folder));
+       if (G_IS_OBJECT(headers))
+               g_object_unref (headers);
 }
 
 /*
@@ -856,10 +1108,11 @@ drag_and_drop_from_folder_view (GtkTreeModel     *source_model,
        TnyFolder *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 (!gtk_tree_path_compare (helper->source_row, dest_row) || */
+/*         !gtk_tree_drag_dest_row_drop_possible (GTK_TREE_DRAG_DEST (dest_model), */
+/*                                                dest_row, */
+/*                                                selection_data)) { */
+       if (!gtk_tree_path_compare (helper->source_row, dest_row)) {
 
                gtk_drag_finish (helper->context, FALSE, FALSE, helper->time);
                gtk_tree_path_free (helper->source_row);        
@@ -878,7 +1131,10 @@ drag_and_drop_from_folder_view (GtkTreeModel     *source_model,
                            &folder, -1);
 
        /* Do the mail operation */
-       mail_op = modest_mail_operation_new ();
+       mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, 
+                                                                NULL,
+                                                                modest_ui_actions_move_folder_error_handler,
+                                                                NULL);
        modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), 
                                         mail_op);
        g_signal_connect (G_OBJECT (mail_op), "progress-changed",
@@ -888,7 +1144,7 @@ drag_and_drop_from_folder_view (GtkTreeModel     *source_model,
                                           folder, 
                                           parent_folder,
                                           helper->delete_source);
-
+       
        /* Frees */
        g_object_unref (G_OBJECT (parent_folder));
        g_object_unref (G_OBJECT (folder));
@@ -912,35 +1168,45 @@ 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)
+                       g_signal_emit (G_OBJECT (widget), 
+                                      signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0, NULL, TRUE);
+       }
+
        /* 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
@@ -960,32 +1226,26 @@ on_drag_data_received (GtkWidget *widget,
        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);
-
        /* Drags from the header view */
        if (source_widget != widget) {
 
                drag_and_drop_from_header_view (source_model,
                                                dest_model,
-                                               child_dest_row,
+                                               dest_row,
                                                helper);
        } else {
 
 
                drag_and_drop_from_folder_view (source_model,
                                                dest_model,
-                                               child_dest_row,
+                                               dest_row,
                                                selection_data, 
                                                helper);
        }
 
        /* Frees */
        gtk_tree_path_free (source_row);
-       gtk_tree_path_free (child_dest_row);
+       gtk_tree_path_free (dest_row);
 }
 
 /*
@@ -1090,7 +1350,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);
@@ -1105,7 +1365,6 @@ on_drag_motion (GtkWidget      *widget,
                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);
 
        /* Select the desired action. By default we pick MOVE */
        suggested_action = GDK_ACTION_MOVE;
@@ -1120,6 +1379,8 @@ on_drag_motion (GtkWidget      *widget,
             gdk_drag_status(context, GDK_ACTION_DEFAULT, time);
 
  out:
+       if (dest_row)
+               gtk_tree_path_free (dest_row);
        g_signal_stop_emission_by_name (widget, "drag-motion");
        return valid_location;
 }
@@ -1176,3 +1437,201 @@ 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, 
+                             ModestFolderView *self)
+{
+       ModestFolderViewPrivate *priv;
+
+       if (!key)
+               return;
+
+       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) /* gtk_tree_view_column_queue_resize is only available in GTK+ 2.8 */
+               GtkTreeViewColumn * tree_column = gtk_tree_view_get_column (GTK_TREE_VIEW (self), 
+                                                                           TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN);
+               gtk_tree_view_column_queue_resize (tree_column);
+#endif
+       }
+}
+
+void 
+modest_folder_view_set_style (ModestFolderView *self,
+                             ModestFolderViewStyle style)
+{
+       ModestFolderViewPrivate *priv;
+
+       g_return_if_fail (self);
+       
+       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);
+       
+       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 = 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));
+}
+
+const gchar *
+modest_folder_view_get_account_id_of_visible_server_account (ModestFolderView *self)
+{
+       ModestFolderViewPrivate *priv;
+
+       g_return_val_if_fail (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;
+               gchar *name = NULL;
+
+               gtk_tree_model_get (model, iter, 
+                                       TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &name,
+                                   TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, 
+                                   &type, -1);
+
+               /*
+               printf ("DEBUG: %s: name=%s, type=%d, TNY_FOLDER_TYPE_INBOX=%d\n", 
+                       __FUNCTION__, name, type, TNY_FOLDER_TYPE_INBOX);
+               */
+                       
+               gboolean result = FALSE;
+               if (type == TNY_FOLDER_TYPE_INBOX) {
+                       result = TRUE;
+               } else if (type == TNY_FOLDER_TYPE_NORMAL) {
+                       /* tinymail's camel implementation only provides TNY_FOLDER_TYPE_NORMAL
+                        * when getting folders from the cache, before connectin, so we do 
+                        * an extra check. We could fix this in tinymail, but it's easier 
+                        * to do here.
+                        */
+                        if (strcmp (name, "Inbox") == 0)
+                               result = TRUE;
+               }
+               
+               g_free (name);
+               
+               if (result) {
+                       *inbox_iter = *iter;
+                       return TRUE;
+               }
+
+               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;
+
+       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));
+
+       gtk_tree_model_get_iter_first (model, &iter);
+       if (find_inbox_iter (model, &iter, &inbox_iter)) {
+               gtk_tree_selection_select_iter (sel, &inbox_iter);
+       }
+       else {
+               gtk_tree_model_get_iter_first (model, &iter);
+               gtk_tree_selection_select_iter (sel, &iter);
+       }
+}