Modified webpage: now tinymail repository is in gitorious.
[modest] / src / widgets / modest-folder-view.c
index 8be8c19..21aa231 100644 (file)
 #include <gdk/gdkkeysyms.h>
 #include <tny-account-store-view.h>
 #include <tny-gtk-account-list-model.h>
+#include <tny-gtk-folder-list-store.h>
 #include <tny-gtk-folder-store-tree-model.h>
 #include <tny-gtk-header-list-model.h>
+#include <tny-merge-folder.h>
 #include <tny-folder.h>
 #include <tny-folder-store-observer.h>
 #include <tny-account-store.h>
@@ -42,6 +44,7 @@
 #include <tny-camel-folder.h>
 #include <tny-simple-list.h>
 #include <tny-camel-account.h>
+#include <modest-defs.h>
 #include <modest-tny-account.h>
 #include <modest-tny-folder.h>
 #include <modest-tny-local-folders-account.h>
@@ -49,6 +52,7 @@
 #include <modest-marshal.h>
 #include <modest-icon-names.h>
 #include <modest-tny-account-store.h>
+#include <modest-tny-local-folders-account.h>
 #include <modest-text-utils.h>
 #include <modest-runtime.h>
 #include "modest-folder-view.h"
 #include <modest-widget-memory.h>
 #include <modest-ui-actions.h>
 #include "modest-dnd.h"
+#include "modest-ui-constants.h"
 #include "widgets/modest-window.h"
+#include <modest-account-protocol.h>
+#ifdef MODEST_TOOLKIT_HILDON2
+#include <hildon/hildon.h>
+#endif
 
 /* Folder view drag types */
 const GtkTargetEntry folder_view_drag_types[] =
@@ -65,33 +74,50 @@ const GtkTargetEntry folder_view_drag_types[] =
        { GTK_TREE_PATH_AS_STRING_LIST, GTK_TARGET_SAME_APP, MODEST_HEADER_ROW }
 };
 
+/* Default icon sizes for Fremantle style are different */
+#define FOLDER_ICON_SIZE MODEST_ICON_SIZE_BIG
+
+/* Column names depending on we use list store or tree store */
+#define NAME_COLUMN TNY_GTK_FOLDER_LIST_STORE_NAME_COLUMN
+#define UNREAD_COLUMN TNY_GTK_FOLDER_LIST_STORE_UNREAD_COLUMN
+#define ALL_COLUMN TNY_GTK_FOLDER_LIST_STORE_ALL_COLUMN
+#define TYPE_COLUMN TNY_GTK_FOLDER_LIST_STORE_TYPE_COLUMN
+#define INSTANCE_COLUMN TNY_GTK_FOLDER_LIST_STORE_INSTANCE_COLUMN
+
 /* 'private'/'protected' functions */
 static void modest_folder_view_class_init  (ModestFolderViewClass *klass);
 static void modest_folder_view_init        (ModestFolderView *obj);
 static void modest_folder_view_finalize    (GObject *obj);
+static void modest_folder_view_dispose     (GObject *obj);
 
-static void         tny_account_store_view_init (gpointer g, 
+static void         tny_account_store_view_init (gpointer g,
                                                 gpointer iface_data);
 
-static void         modest_folder_view_set_account_store (TnyAccountStoreView *self, 
+static void         modest_folder_view_set_account_store (TnyAccountStoreView *self,
                                                          TnyAccountStore     *account_store);
 
-static void         on_selection_changed   (GtkTreeSelection *sel, gpointer data);
+static void         on_selection_changed   (GtkTreeSelection *sel,
+                                           gpointer data);
+
+static void         on_row_activated       (GtkTreeView *treeview,
+                                           GtkTreePath *path,
+                                           GtkTreeViewColumn *column,
+                                           gpointer userdata);
 
-static void         on_account_removed     (TnyAccountStore *self, 
+static void         on_account_removed     (TnyAccountStore *self,
                                            TnyAccount *account,
                                            gpointer user_data);
 
-static void         on_account_inserted    (TnyAccountStore *self, 
+static void         on_account_inserted    (TnyAccountStore *self,
                                            TnyAccount *account,
                                            gpointer user_data);
 
-static void         on_account_changed    (TnyAccountStore *self, 
+static void         on_account_changed    (TnyAccountStore *self,
                                            TnyAccount *account,
                                            gpointer user_data);
 
-static gint         cmp_rows               (GtkTreeModel *tree_model, 
-                                           GtkTreeIter *iter1, 
+static gint         cmp_rows               (GtkTreeModel *tree_model,
+                                           GtkTreeIter *iter1,
                                            GtkTreeIter *iter2,
                                            gpointer user_data);
 
@@ -99,63 +125,41 @@ 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, 
+static void         on_configuration_key_changed  (ModestConf* conf,
+                                                  const gchar *key,
                                                   ModestConfEvent event,
-                                                  ModestConfNotificationId notification_id, 
+                                                  ModestConfNotificationId notification_id,
                                                   ModestFolderView *self);
 
-/* DnD functions */
-static void         on_drag_data_get       (GtkWidget *widget, 
-                                           GdkDragContext *context, 
-                                           GtkSelectionData *selection_data, 
-                                           guint info, 
-                                           guint time, 
-                                           gpointer data);
-
-static void         on_drag_data_received  (GtkWidget *widget, 
-                                           GdkDragContext *context, 
-                                           gint x, 
-                                           gint y, 
-                                           GtkSelectionData *selection_data, 
-                                           guint info, 
-                                           guint time, 
-                                           gpointer data);
-
-static gboolean     on_drag_motion         (GtkWidget      *widget,
-                                           GdkDragContext *context,
-                                           gint            x,
-                                           gint            y,
-                                           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, 
+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, 
+static void         on_display_name_changed (ModestAccountMgr *self,
                                             const gchar *account,
                                             gpointer user_data);
+static void         update_style (ModestFolderView *self);
+static void         on_notify_style (GObject *obj, GParamSpec *spec, gpointer userdata);
+static gint         get_cmp_pos (TnyFolderType t, TnyFolder *folder_store);
+static gboolean     inbox_is_special (TnyFolderStore *folder_store);
+
+static gboolean     get_inner_models        (ModestFolderView *self,
+                                            GtkTreeModel **filter_model,
+                                            GtkTreeModel **sort_model,
+                                            GtkTreeModel **tny_model);
+static void on_activity_changed (TnyGtkFolderListStore *store,
+                                gboolean activity,
+                                ModestFolderView *folder_view);
 
 enum {
        FOLDER_SELECTION_CHANGED_SIGNAL,
        FOLDER_DISPLAY_NAME_CHANGED_SIGNAL,
+       FOLDER_ACTIVATED_SIGNAL,
+       VISIBLE_ACCOUNT_CHANGED_SIGNAL,
+       ACTIVITY_CHANGED_SIGNAL,
        LAST_SIGNAL
 };
 
@@ -172,24 +176,40 @@ struct _ModestFolderViewPrivate {
        gulong                account_changed_signal;
        gulong                conf_key_signal;
        gulong                display_name_changed_signal;
-       
+
        /* not unref this object, its a singlenton */
        ModestEmailClipboard *clipboard;
 
        /* Filter tree model */
        gchar **hidding_ids;
        guint n_selected;
+       ModestFolderViewFilter filter;
+#ifdef MODEST_TOOLKIT_HILDON2
+       GtkWidget *live_search;
+#endif
 
        TnyFolderStoreQuery  *query;
+       gboolean              do_refresh;
        guint                 timer_expander;
 
        gchar                *local_account_name;
        gchar                *visible_account_id;
+       gchar                *mailbox;
        ModestFolderViewStyle style;
+       ModestFolderViewCellStyle cell_style;
+       gboolean show_message_count;
 
        gboolean  reselect; /* we use this to force a reselection of the INBOX */
        gboolean  show_non_move;
+       TnyList   *list_to_move;
        gboolean  reexpand; /* next time we expose, we'll expand all root folders */
+
+       GtkCellRenderer *messages_renderer;
+
+       gulong                outbox_deleted_handler;
+
+       GSList   *signal_handlers;
+       GdkColor active_color;
 };
 #define MODEST_FOLDER_VIEW_GET_PRIVATE(o)                      \
        (G_TYPE_INSTANCE_GET_PRIVATE((o),                       \
@@ -198,7 +218,7 @@ struct _ModestFolderViewPrivate {
 /* globals */
 static GObjectClass *parent_class = NULL;
 
-static guint signals[LAST_SIGNAL] = {0}; 
+static guint signals[LAST_SIGNAL] = {0};
 
 GType
 modest_folder_view_get_type (void)
@@ -224,13 +244,13 @@ modest_folder_view_get_type (void)
                        NULL          /* interface_data */
                };
 
-                               
+
                my_type = g_type_register_static (GTK_TYPE_TREE_VIEW,
                                                  "ModestFolderView",
                                                  &my_info, 0);
 
-               g_type_add_interface_static (my_type, 
-                                            TNY_TYPE_ACCOUNT_STORE_VIEW, 
+               g_type_add_interface_static (my_type,
+                                            TNY_TYPE_ACCOUNT_STORE_VIEW,
                                             &tny_account_store_view_info);
        }
        return my_type;
@@ -240,15 +260,18 @@ static void
 modest_folder_view_class_init (ModestFolderViewClass *klass)
 {
        GObjectClass *gobject_class;
+       GtkTreeViewClass *treeview_class;
        gobject_class = (GObjectClass*) klass;
+       treeview_class = (GtkTreeViewClass*) klass;
 
        parent_class            = g_type_class_peek_parent (klass);
        gobject_class->finalize = modest_folder_view_finalize;
+       gobject_class->dispose  = modest_folder_view_dispose;
 
        g_type_class_add_private (gobject_class,
                                  sizeof(ModestFolderViewPrivate));
-       
-       signals[FOLDER_SELECTION_CHANGED_SIGNAL] = 
+
+       signals[FOLDER_SELECTION_CHANGED_SIGNAL] =
                g_signal_new ("folder_selection_changed",
                              G_TYPE_FROM_CLASS (gobject_class),
                              G_SIGNAL_RUN_FIRST,
@@ -265,7 +288,7 @@ modest_folder_view_class_init (ModestFolderViewClass *klass)
         * the unread messages count to the folder name to build the
         * folder display name
         */
-       signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL] = 
+       signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL] =
                g_signal_new ("folder-display-name-changed",
                              G_TYPE_FROM_CLASS (gobject_class),
                              G_SIGNAL_RUN_FIRST,
@@ -274,6 +297,85 @@ modest_folder_view_class_init (ModestFolderViewClass *klass)
                              NULL, NULL,
                              g_cclosure_marshal_VOID__STRING,
                              G_TYPE_NONE, 1, G_TYPE_STRING);
+
+       signals[FOLDER_ACTIVATED_SIGNAL] =
+               g_signal_new ("folder_activated",
+                             G_TYPE_FROM_CLASS (gobject_class),
+                             G_SIGNAL_RUN_FIRST,
+                             G_STRUCT_OFFSET (ModestFolderViewClass,
+                                              folder_activated),
+                             NULL, NULL,
+                             g_cclosure_marshal_VOID__POINTER,
+                             G_TYPE_NONE, 1, G_TYPE_POINTER);
+
+       /*
+        * Emitted whenever the visible account changes
+        */
+       signals[VISIBLE_ACCOUNT_CHANGED_SIGNAL] =
+               g_signal_new ("visible-account-changed",
+                             G_TYPE_FROM_CLASS (gobject_class),
+                             G_SIGNAL_RUN_FIRST,
+                             G_STRUCT_OFFSET (ModestFolderViewClass,
+                                              visible_account_changed),
+                             NULL, NULL,
+                             g_cclosure_marshal_VOID__STRING,
+                             G_TYPE_NONE, 1, G_TYPE_STRING);
+
+       /*
+        * Emitted when the underlying GtkListStore is updating data
+        */
+       signals[ACTIVITY_CHANGED_SIGNAL] =
+               g_signal_new ("activity-changed",
+                             G_TYPE_FROM_CLASS (gobject_class),
+                             G_SIGNAL_RUN_FIRST,
+                             G_STRUCT_OFFSET (ModestFolderViewClass,
+                                              activity_changed),
+                             NULL, NULL,
+                             g_cclosure_marshal_VOID__BOOLEAN,
+                             G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+
+       treeview_class->select_cursor_parent = NULL;
+
+#ifdef MODEST_TOOLKIT_HILDON2
+       gtk_rc_parse_string ("class \"ModestFolderView\" style \"fremantle-touchlist\"");
+       
+#endif
+
+}
+
+/* Retrieves the filter, sort and tny models of the folder view. If
+   any of these does not exist then it returns FALSE */
+static gboolean
+get_inner_models (ModestFolderView *self, 
+                 GtkTreeModel **filter_model,
+                 GtkTreeModel **sort_model,
+                 GtkTreeModel **tny_model)
+{
+       GtkTreeModel *s_model, *f_model, *t_model;
+
+       f_model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+       if (!GTK_IS_TREE_MODEL_FILTER(f_model)) {
+               g_debug ("%s: emtpy model or not filter model", __FUNCTION__);
+               return FALSE;
+       }
+
+       s_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (f_model));
+       if (!GTK_IS_TREE_MODEL_SORT(s_model)) {
+               g_warning ("BUG: %s: not a valid sort model", __FUNCTION__);
+               return FALSE;
+       }
+
+       t_model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (s_model));
+
+       /* Assign values */
+       if (filter_model)
+               *filter_model = f_model;
+       if (sort_model)
+               *sort_model = s_model;
+       if (tny_model)
+               *tny_model = t_model;
+
+       return TRUE;
 }
 
 /* Simplify checks for NULLs: */
@@ -294,23 +396,23 @@ 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,
+                           INSTANCE_COLUMN, &instance,
                            -1);
-                           
+
        if (!instance)
                return FALSE; /* keep walking */
-                       
+
        if (!TNY_IS_ACCOUNT (instance)) {
                g_object_unref (instance);
-               return FALSE; /* keep walking */        
-       }    
-       
+               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);
@@ -322,14 +424,14 @@ on_model_foreach_set_name(GtkTreeModel *model, GtkTreePath *path,  GtkTreeIter *
                 * 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 
+typedef struct
 {
        ModestFolderView *self;
        gchar *previous_name;
@@ -341,12 +443,12 @@ 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)), 
+               tny_account_get_name(TNY_ACCOUNT(account)),
                data->previous_name)) {
-       
-               /* Tell the model that the data has changed, so that 
+
+               /* 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));
@@ -359,10 +461,181 @@ on_get_mmc_account_name (TnyStoreAccount* account, gpointer user_data)
 }
 
 static void
-text_cell_data  (GtkTreeViewColumn *column,  
+convert_parent_folders_to_dots (gchar **item_name)
+{
+       gint n_parents = 0;
+       gint n_inbox_parents = 0;
+       gchar *c;
+       gchar *path_start;
+       gchar *last_separator;
+
+       if (item_name == NULL)
+               return;
+
+       path_start = *item_name;
+       for (c = *item_name; *c != '\0'; c++) {
+               if (g_str_has_prefix (c, MODEST_FOLDER_PATH_SEPARATOR)) {
+                       gchar *compare;
+                       if (c != path_start) {
+                               compare = g_strndup (path_start, c - path_start);
+                               compare = g_strstrip (compare);
+                               if (g_ascii_strcasecmp (compare, "inbox") == 0) {
+                                       n_inbox_parents++;
+                               }
+                               g_free (compare);
+                       }
+                       n_parents++;
+                       path_start = c + 1;
+               }
+       }
+
+       last_separator = g_strrstr (*item_name, MODEST_FOLDER_PATH_SEPARATOR);
+       if (last_separator != NULL) {
+               last_separator = last_separator + strlen (MODEST_FOLDER_PATH_SEPARATOR);
+       }
+
+       if (n_parents > 0) {
+               GString *buffer;
+               gint i;
+
+               buffer = g_string_new ("");
+               for (i = 0; i < n_parents - n_inbox_parents; i++) {
+                       buffer = g_string_append (buffer, MODEST_FOLDER_DOT);
+               }
+               buffer = g_string_append (buffer, last_separator);
+               g_free (*item_name);
+               *item_name = g_string_free (buffer, FALSE);
+       }
+
+}
+
+static void
+format_compact_style (gchar **item_name,
+                     GObject *instance,
+                     const gchar *mailbox,
+                     gboolean bold,
+                     gboolean multiaccount,
+                     gboolean *use_markup)
+{
+       TnyFolder *folder;
+       gboolean is_special;
+       TnyFolderType folder_type;
+       gboolean l_use_markup;
+
+       if (!TNY_IS_FOLDER (instance))
+               return;
+
+       folder = (TnyFolder *) instance;
+
+       folder_type = tny_folder_get_folder_type (folder);
+       is_special = (get_cmp_pos (folder_type, folder)!= 4);
+
+       if (mailbox) {
+               /* Remove mailbox prefix if any */
+               gchar *prefix = g_strconcat (mailbox, MODEST_FOLDER_PATH_SEPARATOR, NULL);
+               if (g_str_has_prefix (*item_name, prefix)) {
+                       gchar *new_item_name = g_strdup (*item_name + strlen (prefix));
+                       g_free (*item_name);
+                       *item_name = new_item_name;
+               }
+       }
+
+       if (!is_special || multiaccount) {
+               TnyAccount *account = tny_folder_get_account (folder);
+               const gchar *folder_name;
+               gboolean concat_folder_name = FALSE;
+               GString *buffer;
+
+               /* Should not happen */
+               if (account == NULL)
+                       return;
+
+               /* convert parent folders to dots */
+               convert_parent_folders_to_dots  (item_name);
+
+               folder_name = tny_folder_get_name (folder);
+               if (g_str_has_suffix (*item_name, folder_name)) {
+                       gchar *offset = g_strrstr (*item_name, folder_name);
+                       *offset = '\0';
+                       concat_folder_name = TRUE;
+               }
+
+               buffer = g_string_new ("");
+
+               buffer = g_string_append (buffer, *item_name);
+               if (concat_folder_name) {
+                       if (!is_special && folder_type == TNY_FOLDER_TYPE_DRAFTS) {
+                               buffer = g_string_append (buffer, folder_name);
+                               /* TODO: append a sensitive string to the remote drafts to
+                                * be able to know it's the remote one */
+/*                             buffer = g_string_append (buffer, " (TODO:remote)"); */
+                       } else {
+                               buffer = g_string_append (buffer, folder_name);
+                       }
+               }
+               g_free (*item_name);
+               g_object_unref (account);
+
+               *item_name = g_string_free (buffer, FALSE);
+               l_use_markup = FALSE;
+       } else {
+               l_use_markup = FALSE;
+       }
+       if (use_markup)
+               *use_markup = l_use_markup;
+}
+
+static void
+replace_special_folder_prefix (gchar **item_name)
+{
+       const gchar *separator;
+       gchar *prefix;
+
+       if (item_name == NULL || *item_name == NULL || **item_name == '\0')
+               return;
+       separator = g_strstr_len (*item_name, -1, MODEST_FOLDER_PATH_SEPARATOR);
+       if (separator == NULL)
+               return;
+
+       prefix = g_strndup (*item_name, separator - *item_name);
+       g_strstrip (prefix);
+
+       if (prefix && *prefix != '\0') {
+               TnyFolderType folder_type;
+               gchar *new_name;
+               gchar *downcase;
+
+               downcase = g_utf8_strdown (prefix, -1);
+               g_free (prefix);
+               prefix = downcase;
+
+               if (strcmp (downcase, "inbox") == 0) {
+                       folder_type = TNY_FOLDER_TYPE_INBOX;
+                       new_name = g_strconcat (_("mcen_me_folder_inbox"), separator, NULL);
+                       g_free (*item_name);
+                       *item_name = new_name;
+               } else {
+                       folder_type = modest_local_folder_info_get_type (prefix);
+                       switch (folder_type) {
+                       case TNY_FOLDER_TYPE_INBOX:
+                       case TNY_FOLDER_TYPE_ARCHIVE:
+                               new_name = g_strconcat (modest_local_folder_info_get_type_display_name (folder_type), separator, NULL);
+                               g_free (*item_name);
+                               *item_name = new_name;
+                               break;
+                       default:
+                               break;
+                       }
+               }
+       }
+       g_free (prefix);
+}
+
+static void
+text_cell_data  (GtkTreeViewColumn *column,
                 GtkCellRenderer *renderer,
-                GtkTreeModel *tree_model,  
-                GtkTreeIter *iter,  
+                GtkTreeModel *tree_model,
+                GtkTreeIter *iter,
                 gpointer data)
 {
        ModestFolderViewPrivate *priv;
@@ -370,67 +643,90 @@ text_cell_data  (GtkTreeViewColumn *column,
        gchar *fname = NULL;
        TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
        GObject *instance = NULL;
+       gboolean use_markup = FALSE;
 
        gtk_tree_model_get (tree_model, iter,
-                           TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &fname,
-                           TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
-                           TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &instance,
+                           NAME_COLUMN, &fname,
+                           TYPE_COLUMN, &type,
+                           INSTANCE_COLUMN, &instance,
                            -1);
-
-       if (!fname)
-               return;
-
-       if (!instance) {
-               g_free (fname);
-               return;
-       }
+       if (!fname || !instance)
+               goto end;
 
        ModestFolderView *self = MODEST_FOLDER_VIEW (data);
        priv =  MODEST_FOLDER_VIEW_GET_PRIVATE (self);
-       
+
        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))) {
+               gboolean drafts;
+               gboolean is_local;
+
+               is_local = modest_tny_folder_is_local_folder (TNY_FOLDER (instance)) ||
+                       modest_tny_folder_is_memory_card_folder (TNY_FOLDER (instance));
+
+               if (is_local) {
                        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));
                        }
+               } else {
+                       /* Sometimes an special folder is reported by the server as
+                          NORMAL, like some versions of Dovecot */
+                       if (type == TNY_FOLDER_TYPE_NORMAL ||
+                           type == TNY_FOLDER_TYPE_UNKNOWN) {
+                               type = modest_tny_folder_guess_folder_type (TNY_FOLDER (instance));
+                       }
                }
 
-               /* 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... */
+               /* 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 (is_local && ((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;
+                       drafts = TRUE;
                } else {
+                       number = tny_folder_get_unread_count (TNY_FOLDER(instance));
+                       drafts = FALSE;
+               }
+
+               if (priv->cell_style == MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT) {
                        item_name = g_strdup (fname);
-                       item_weight = 400;
+                       if (number > 0) {
+                               item_weight = 800;
+                       } else {
+                               item_weight = 400;
+                       }
+               } else {
+                       /* Use bold font style if there are unread or unset messages */
+                       if (number > 0) {
+                               if (priv->show_message_count) {
+                                       item_name = g_strdup_printf ("%s (%d)", fname, number);
+                               } else {
+                                       item_name = g_strdup (fname);
+                               }
+                               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 
+                       /* 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)));
@@ -440,14 +736,48 @@ text_cell_data  (GtkTreeViewColumn *column,
                        item_weight = 800;
                }
        }
-       
+
+       /* Convert INBOX */
+       if (type == TNY_FOLDER_TYPE_INBOX &&
+           g_str_has_suffix (fname, "Inbox")) {
+               g_free (item_name);
+               item_name = g_strdup (_("mcen_me_folder_inbox"));
+       }
+
        if (!item_name)
                item_name = g_strdup ("unknown");
-                       
+
+       if (priv->cell_style == MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT) {
+               gboolean multiaccount;
+
+               multiaccount = (priv->style == MODEST_FOLDER_VIEW_STYLE_SHOW_ALL);
+               /* Convert item_name to markup */
+               format_compact_style (&item_name, instance, priv->mailbox,
+                                     item_weight == 800, 
+                                     multiaccount, &use_markup);
+       } else {
+               replace_special_folder_prefix (&item_name);
+       }
+
        if (item_name && item_weight) {
                /* Set the name in the treeview cell: */
-               g_object_set (rendobj,"text", item_name, "weight", item_weight, NULL);
-               
+               if (priv->cell_style == MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT && item_weight == 800 && 
+                   (priv->active_color.red != 0 || priv->active_color.blue != 0 || priv->active_color.green != 0)) {
+                       g_object_set (rendobj, 
+                                     "text", item_name, 
+                                     "weight-set", FALSE,
+                                     "foreground-set", TRUE,
+                                     "foreground-gdk", &(priv->active_color),
+                                     NULL);
+               } else {
+                       g_object_set (rendobj, 
+                                     "text", item_name,
+                                     "foreground-set", FALSE,
+                                     "weight-set", TRUE, 
+                                     "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) {
@@ -456,471 +786,419 @@ text_cell_data  (GtkTreeViewColumn *column,
                                               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) && 
+       if (TNY_IS_STORE_ACCOUNT (instance) &&
                modest_tny_account_is_memory_card_account (TNY_ACCOUNT (instance))) {
 
                /* Get the account name asynchronously: */
-               GetMmcAccountNameData *callback_data = 
+               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); 
+                       callback_data->previous_name = g_strdup (name);
 
-               modest_tny_account_get_mmc_account_name (TNY_STORE_ACCOUNT (instance), 
+               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);
+ end:
+       if (instance)
+               g_object_unref (G_OBJECT (instance));
+       if (fname)
+               g_free (fname);
 }
 
+static void
+messages_cell_data  (GtkTreeViewColumn *column,
+                GtkCellRenderer *renderer,
+                GtkTreeModel *tree_model,
+                GtkTreeIter *iter,
+                gpointer data)
+{
+       ModestFolderView *self; 
+       ModestFolderViewPrivate *priv;
+       GObject *rendobj = (GObject *) renderer;
+       TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
+       GObject *instance = NULL;
+       gchar *item_name = NULL;
 
-typedef struct {
-       GdkPixbuf *pixbuf;
-       GdkPixbuf *pixbuf_open;
-       GdkPixbuf *pixbuf_close;
-} ThreePixbufs;
+       gtk_tree_model_get (tree_model, iter,
+                           TYPE_COLUMN, &type,
+                           INSTANCE_COLUMN, &instance,
+                           -1);
+       if (!instance)
+               goto end;
 
+       self = MODEST_FOLDER_VIEW (data);
+       priv =  MODEST_FOLDER_VIEW_GET_PRIVATE (self);
 
-static ThreePixbufs*
-get_folder_icons (TnyFolderType type, GObject *instance)
-{
-       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;
+       if (type != TNY_FOLDER_TYPE_ROOT) {
+               gint number = 0;
+               gboolean drafts;
+               gboolean is_local;
 
-       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;
+               is_local = modest_tny_folder_is_local_folder (TNY_FOLDER (instance)) ||
+                       modest_tny_folder_is_memory_card_folder (TNY_FOLDER (instance));
 
-       static GdkPixbuf *inbox_pixbuf_close = NULL, *outbox_pixbuf_close = NULL,
-               *junk_pixbuf_close = NULL, *sent_pixbuf_close = NULL,
-               *trash_pixbuf_close = NULL, *draft_pixbuf_close = NULL,
-               *normal_pixbuf_close = NULL, *anorm_pixbuf_close = NULL, 
-               *ammc_pixbuf_close = NULL, *avirt_pixbuf_close = NULL;
+               if (is_local) {
+                       type = modest_tny_folder_get_local_or_mmc_folder_type (TNY_FOLDER (instance));
+               } else {
+                       /* Sometimes an special folder is reported by the server as
+                          NORMAL, like some versions of Dovecot */
+                       if (type == TNY_FOLDER_TYPE_NORMAL ||
+                           type == TNY_FOLDER_TYPE_UNKNOWN) {
+                               type = modest_tny_folder_guess_folder_type (TNY_FOLDER (instance));
+                       }
+               }
 
+               /* 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 (is_local && ((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));
+                       drafts = TRUE;
+               } else {
+                       number = tny_folder_get_unread_count (TNY_FOLDER(instance));
+                       drafts = FALSE;
+               }
 
-       /* 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));             
+               if ((priv->cell_style == MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT) && (number > 0)) {
+                       item_name =
+                               g_strdup_printf (ngettext ((drafts) ? "mcen_ti_message" : "mcen_va_new_message",
+                                                          (drafts) ? "mcen_ti_messages" : "mcen_va_new_messages",
+                                                          number), number);
+               }
        }
 
-       switch (type) {
-       case TNY_FOLDER_TYPE_INVALID:
-               g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
-               break;
-               
-       case TNY_FOLDER_TYPE_ROOT:
-               if (TNY_IS_ACCOUNT (instance)) {
-                       
-                       if (modest_tny_account_is_virtual_local_folders (
-                               TNY_ACCOUNT (instance))) {
-
-                           if (!avirt_pixbuf)
-                                   avirt_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_LOCAL_FOLDERS));
-
-                           if (!avirt_pixbuf_open) {
-                               GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp");
-                               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");
-                               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);
+       if (!item_name)
+               item_name = g_strdup ("");
 
-                       }
-                       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));
-
-                                   if (!ammc_pixbuf_open) {
-                                       GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp");
-                                       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");
-                                       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);
+       if (item_name) {
+               /* Set the name in the treeview cell: */
+               g_object_set (rendobj,"text", item_name, NULL);
 
-                               } else {
+               g_free (item_name);
 
-                                   if (!anorm_pixbuf)
-                                           anorm_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_ACCOUNT));
-
-                                   if (!anorm_pixbuf_open) {
-                                       GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp");
-                                       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");
-                                       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:
+ end:
+       if (instance)
+               g_object_unref (G_OBJECT (instance));
+}
 
-           if (!inbox_pixbuf)
-                   inbox_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_INBOX));
-
-           if (!inbox_pixbuf_open) {
-               GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp");
-               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");
-               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);
-           }
 
+typedef struct {
+       GdkPixbuf *pixbuf;
+       GdkPixbuf *pixbuf_open;
+       GdkPixbuf *pixbuf_close;
+} ThreePixbufs;
 
-           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));
-
-           if (!outbox_pixbuf_open) {
-               GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp");
-               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");
-               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);
+static inline GdkPixbuf *
+get_composite_pixbuf (const gchar *icon_name,
+                     const gint size,
+                     GdkPixbuf *base_pixbuf)
+{
+       GdkPixbuf *emblem, *retval = NULL;
+
+       emblem = modest_platform_get_icon (icon_name, size);
+       if (emblem) {
+               retval = gdk_pixbuf_copy (base_pixbuf);
+               gdk_pixbuf_composite (emblem, retval, 0, 0,
+                                     MIN (gdk_pixbuf_get_width (emblem),
+                                          gdk_pixbuf_get_width (retval)),
+                                     MIN (gdk_pixbuf_get_height (emblem),
+                                          gdk_pixbuf_get_height (retval)),
+                                                 0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
                g_object_unref (emblem);
-           }
+       }
+       return retval;
+}
+
+static inline ThreePixbufs *
+get_composite_icons (const gchar *icon_code,
+                    GdkPixbuf **pixbuf,
+                    GdkPixbuf **pixbuf_open,
+                    GdkPixbuf **pixbuf_close)
+{
+       ThreePixbufs *retval;
 
+       if (pixbuf && !*pixbuf) {
+               GdkPixbuf *icon;
+               icon = modest_platform_get_icon (icon_code, FOLDER_ICON_SIZE);
+               if (icon) {
+                       *pixbuf = gdk_pixbuf_copy (icon);
+               } else {
+                       *pixbuf = NULL;
+               }
+       }
 
-           pixbuf = g_object_ref (outbox_pixbuf);
-           pixbuf_open = g_object_ref (outbox_pixbuf_open);
-           pixbuf_close = g_object_ref (outbox_pixbuf_close);
+       if (pixbuf_open && !*pixbuf_open && pixbuf && *pixbuf)
+               *pixbuf_open = get_composite_pixbuf ("qgn_list_gene_fldr_exp",
+                                                    FOLDER_ICON_SIZE,
+                                                    *pixbuf);
 
-           break;
-       case TNY_FOLDER_TYPE_JUNK:
-           if (!junk_pixbuf)
-               junk_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_JUNK));
-
-           if (!junk_pixbuf_open) {
-               GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp");
-               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");
-               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);
-           }
+       if (pixbuf_close && !*pixbuf_close && pixbuf && *pixbuf)
+               *pixbuf_close = get_composite_pixbuf ("qgn_list_gene_fldr_clp",
+                                                     FOLDER_ICON_SIZE,
+                                                     *pixbuf);
 
+       retval = g_slice_new0 (ThreePixbufs);
+       if (pixbuf && *pixbuf)
+               retval->pixbuf = g_object_ref (*pixbuf);
+       else
+               retval->pixbuf = NULL;
+       if (pixbuf_open && *pixbuf_open)
+               retval->pixbuf_open = g_object_ref (*pixbuf_open);
+       else
+               retval->pixbuf_open = NULL;
+       if (pixbuf_close && *pixbuf_close)
+               retval->pixbuf_close = g_object_ref (*pixbuf_close);
+       else
+               retval->pixbuf_close = NULL;
 
-           pixbuf = g_object_ref (junk_pixbuf);
-           pixbuf_open = g_object_ref (junk_pixbuf_open);
-           pixbuf_close = g_object_ref (junk_pixbuf_close);
+       return retval;
+}
 
-           break;
-       case TNY_FOLDER_TYPE_SENT:
-           if (!sent_pixbuf)
-               sent_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_SENT));
-
-           if (!sent_pixbuf_open) {
-               GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp");
-               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");
-               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);
-           }
+static inline ThreePixbufs *
+get_account_protocol_pixbufs (ModestFolderView *folder_view,
+                             ModestProtocolType protocol_type,
+                             GObject *object)
+{
+       ModestProtocol *protocol;
+       const GdkPixbuf *pixbuf = NULL;
+       ModestFolderViewPrivate *priv;
 
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (folder_view);
 
-           pixbuf = g_object_ref (sent_pixbuf);
-           pixbuf_open = g_object_ref (sent_pixbuf_open);
-           pixbuf_close = g_object_ref (sent_pixbuf_close);
+       protocol = modest_protocol_registry_get_protocol_by_type (modest_runtime_get_protocol_registry (),
+                                                                 protocol_type);
 
-           break;
-       case TNY_FOLDER_TYPE_TRASH:
-           if (!trash_pixbuf)
-               trash_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_TRASH));
-
-           if (!trash_pixbuf_open) {
-               GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp");
-               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");
-               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);
-           }
+       if (MODEST_IS_ACCOUNT_PROTOCOL (protocol)) {
+               pixbuf = modest_account_protocol_get_icon (MODEST_ACCOUNT_PROTOCOL (protocol), 
+                                                          priv->filter & MODEST_FOLDER_VIEW_FILTER_SHOW_ONLY_MAILBOXES?
+                                                          MODEST_ACCOUNT_PROTOCOL_ICON_MAILBOX:
+                                                          MODEST_ACCOUNT_PROTOCOL_ICON_FOLDER,
+                                                          object, FOLDER_ICON_SIZE);
+       }
 
+       if (pixbuf) {
+               ThreePixbufs *retval;
+               retval = g_slice_new0 (ThreePixbufs);
+               retval->pixbuf = g_object_ref ((GObject *) pixbuf);
+               retval->pixbuf_open = g_object_ref ((GObject *) pixbuf);
+               retval->pixbuf_close = g_object_ref ((GObject *) pixbuf);
+               return retval;
+       } else {
+               return NULL;
+       }
+}
 
-           pixbuf = g_object_ref (trash_pixbuf);
-           pixbuf_open = g_object_ref (trash_pixbuf_open);
-           pixbuf_close = g_object_ref (trash_pixbuf_close);
+static inline ThreePixbufs*
+get_folder_icons (ModestFolderView *folder_view, TnyFolderType type, GObject *instance)
+{
+       TnyAccount *account = NULL;
+       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, *mmc_pixbuf = NULL,
+               *ammc_pixbuf = NULL, *avirt_pixbuf = NULL;
 
-           break;
-       case TNY_FOLDER_TYPE_DRAFTS:
-          if (!draft_pixbuf)
-               draft_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_DRAFTS));
-
-           if (!draft_pixbuf_open) {
-               GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp");
-               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");
-               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);
-           }
+       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, *mmc_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, *mmc_pixbuf_close = NULL,
+               *ammc_pixbuf_close = NULL, *avirt_pixbuf_close = NULL;
 
-           pixbuf = g_object_ref (draft_pixbuf);
-           pixbuf_open = g_object_ref (draft_pixbuf_open);
-           pixbuf_close = g_object_ref (draft_pixbuf_close);
+       ThreePixbufs *retval = NULL;
 
-           break;      
-       case TNY_FOLDER_TYPE_NORMAL:
-       default:
-           if (!normal_pixbuf)
-               normal_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_NORMAL));
-
-           if (!normal_pixbuf_open) {
-               GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp");
-               normal_pixbuf_open = gdk_pixbuf_copy (normal_pixbuf);
-               gdk_pixbuf_composite (emblem, draft_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");
-               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);
-           }
+       if (TNY_IS_ACCOUNT (instance)) {
+               account = g_object_ref (instance);
+       } else if (TNY_IS_FOLDER (instance) && !TNY_IS_MERGE_FOLDER (instance)) {
+               account = tny_folder_get_account (TNY_FOLDER (instance));
+       }
 
+       if (account) {
+               ModestProtocolType account_store_protocol;
 
-           pixbuf = g_object_ref (normal_pixbuf);
-           pixbuf_open = g_object_ref (normal_pixbuf_open);
-           pixbuf_close = g_object_ref (normal_pixbuf_close);
+               account_store_protocol = modest_tny_account_get_protocol_type (account);
+               retval = get_account_protocol_pixbufs (folder_view, account_store_protocol, instance);
+               g_object_unref (account);
+       }
+
+       if (retval)
+               return retval;
+
+       /* Sometimes an special folder is reported by the server as
+          NORMAL, like some versions of Dovecot */
+       if (type == TNY_FOLDER_TYPE_NORMAL ||
+           type == TNY_FOLDER_TYPE_UNKNOWN) {
+               type = modest_tny_folder_guess_folder_type (TNY_FOLDER (instance));
+       }
 
-           break;      
+       /* It's not enough with check the folder type. We need to
+          ensure that we're not giving a special folder icon to a
+          normal folder with the same name than a special folder */
+       if (TNY_IS_FOLDER (instance) &&
+           get_cmp_pos (type, TNY_FOLDER (instance)) ==  4)
+               type = TNY_FOLDER_TYPE_NORMAL;
 
+       /* Remote folders should not be treated as special folders */
+       if (TNY_IS_FOLDER_STORE (instance) &&
+           !TNY_IS_ACCOUNT (instance) &&
+           type != TNY_FOLDER_TYPE_INBOX &&
+           modest_tny_folder_store_is_remote (TNY_FOLDER_STORE (instance))) {
+               return get_composite_icons (MODEST_FOLDER_ICON_REMOTE_FOLDER,
+                                           &anorm_pixbuf,
+                                           &anorm_pixbuf_open,
+                                           &anorm_pixbuf_close);
        }
 
-       retval->pixbuf = pixbuf;
-       retval->pixbuf_open = pixbuf_open;
-       retval->pixbuf_close = pixbuf_close;
+       switch (type) {
+
+       case TNY_FOLDER_TYPE_INVALID:
+               g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
+               break;
+
+       case TNY_FOLDER_TYPE_ROOT:
+               if (TNY_IS_ACCOUNT (instance)) {
+
+                       if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (instance))) {
+                               retval = get_composite_icons (MODEST_FOLDER_ICON_LOCAL_FOLDERS,
+                                                             &avirt_pixbuf,
+                                                             &avirt_pixbuf_open,
+                                                             &avirt_pixbuf_close);
+                       } else {
+                               const gchar *account_id = tny_account_get_id (TNY_ACCOUNT (instance));
+
+                               if (!strcmp (account_id, MODEST_MMC_ACCOUNT_ID)) {
+                                       retval = get_composite_icons (MODEST_FOLDER_ICON_MMC,
+                                                                     &ammc_pixbuf,
+                                                                     &ammc_pixbuf_open,
+                                                                     &ammc_pixbuf_close);
+                               } else {
+                                       retval = get_composite_icons (MODEST_FOLDER_ICON_ACCOUNT,
+                                                                     &anorm_pixbuf,
+                                                                     &anorm_pixbuf_open,
+                                                                     &anorm_pixbuf_close);
+                               }
+                       }
+               }
+               break;
+       case TNY_FOLDER_TYPE_INBOX:
+               retval = get_composite_icons (MODEST_FOLDER_ICON_INBOX,
+                                             &inbox_pixbuf,
+                                             &inbox_pixbuf_open,
+                                             &inbox_pixbuf_close);
+               break;
+       case TNY_FOLDER_TYPE_OUTBOX:
+               retval = get_composite_icons (MODEST_FOLDER_ICON_OUTBOX,
+                                             &outbox_pixbuf,
+                                             &outbox_pixbuf_open,
+                                             &outbox_pixbuf_close);
+               break;
+       case TNY_FOLDER_TYPE_JUNK:
+               retval = get_composite_icons (MODEST_FOLDER_ICON_JUNK,
+                                             &junk_pixbuf,
+                                             &junk_pixbuf_open,
+                                             &junk_pixbuf_close);
+               break;
+       case TNY_FOLDER_TYPE_SENT:
+               retval = get_composite_icons (MODEST_FOLDER_ICON_SENT,
+                                             &sent_pixbuf,
+                                             &sent_pixbuf_open,
+                                             &sent_pixbuf_close);
+               break;
+       case TNY_FOLDER_TYPE_TRASH:
+               retval = get_composite_icons (MODEST_FOLDER_ICON_TRASH,
+                                             &trash_pixbuf,
+                                             &trash_pixbuf_open,
+                                             &trash_pixbuf_close);
+               break;
+       case TNY_FOLDER_TYPE_DRAFTS:
+               retval = get_composite_icons (MODEST_FOLDER_ICON_DRAFTS,
+                                             &draft_pixbuf,
+                                             &draft_pixbuf_open,
+                                             &draft_pixbuf_close);
+               break;
+       case TNY_FOLDER_TYPE_ARCHIVE:
+               retval = get_composite_icons (MODEST_FOLDER_ICON_MMC_FOLDER,
+                                             &mmc_pixbuf,
+                                             &mmc_pixbuf_open,
+                                             &mmc_pixbuf_close);
+               break;
+       case TNY_FOLDER_TYPE_NORMAL:
+       default:
+               /* Memory card folders could have an special icon */
+               if (modest_tny_folder_is_memory_card_folder (TNY_FOLDER (instance))) {
+                       retval = get_composite_icons (MODEST_FOLDER_ICON_MMC_FOLDER,
+                                                     &mmc_pixbuf,
+                                                     &mmc_pixbuf_open,
+                                                     &mmc_pixbuf_close);
+               } else {
+                       retval = get_composite_icons (MODEST_FOLDER_ICON_NORMAL,
+                                                     &normal_pixbuf,
+                                                     &normal_pixbuf_open,
+                                                     &normal_pixbuf_close);
+               }
+               break;
+       }
 
        return retval;
 }
 
-
 static void
 free_pixbufs (ThreePixbufs *pixbufs)
 {
-       g_object_unref (pixbufs->pixbuf);
-       g_object_unref (pixbufs->pixbuf_open);
-       g_object_unref (pixbufs->pixbuf_close);
+       if (pixbufs->pixbuf)
+               g_object_unref (pixbufs->pixbuf);
+       if (pixbufs->pixbuf_open)
+               g_object_unref (pixbufs->pixbuf_open);
+       if (pixbufs->pixbuf_close)
+               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)
+icon_cell_data  (GtkTreeViewColumn *column,
+                GtkCellRenderer *renderer,
+                GtkTreeModel *tree_model,
+                GtkTreeIter *iter,
+                gpointer data)
 {
-       GObject *rendobj = (GObject *) renderer, *instance = NULL;
+       GObject *rendobj = NULL, *instance = NULL;
        TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
        gboolean has_children;
        ThreePixbufs *pixbufs;
+       ModestFolderView *folder_view = (ModestFolderView *) data;
+
+       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,
+                           TYPE_COLUMN, &type,
+                           INSTANCE_COLUMN, &instance,
                            -1);
 
-       if (!instance) 
+       if (!instance)
                return;
 
        has_children = gtk_tree_model_iter_has_child (tree_model, iter);
-       pixbufs = get_folder_icons (type, instance);    
+       pixbufs = get_folder_icons (folder_view, type, instance);
        g_object_unref (instance);
 
        /* Set pixbuf */
@@ -932,8 +1210,6 @@ icon_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
        }
 
        free_pixbufs (pixbufs);
-
-       return;
 }
 
 static void
@@ -942,23 +1218,46 @@ add_columns (GtkWidget *treeview)
        GtkTreeViewColumn *column;
        GtkCellRenderer *renderer;
        GtkTreeSelection *sel;
+       ModestFolderViewPrivate *priv;
+
+       priv =  MODEST_FOLDER_VIEW_GET_PRIVATE(treeview);
 
        /* Create column */
-       column = gtk_tree_view_column_new ();   
-       
+       column = gtk_tree_view_column_new ();
+
        /* Set icon and text render function */
        renderer = gtk_cell_renderer_pixbuf_new();
+       g_object_set (renderer,
+                     "xpad", MODEST_MARGIN_DEFAULT,
+                     "ypad", MODEST_MARGIN_DEFAULT,
+                     NULL);
        gtk_tree_view_column_pack_start (column, renderer, FALSE);
        gtk_tree_view_column_set_cell_data_func(column, renderer,
                                                icon_cell_data, treeview, NULL);
-       
+
        renderer = gtk_cell_renderer_text_new();
-       g_object_set (renderer, "ellipsize", PANGO_ELLIPSIZE_END, 
-                       "ellipsize-set", TRUE, NULL);
+       g_object_set (renderer, 
+                     "ellipsize", PANGO_ELLIPSIZE_MIDDLE,
+                     "ypad", MODEST_MARGIN_DEFAULT,
+                     "xpad", MODEST_MARGIN_DEFAULT,
+                     "ellipsize-set", TRUE, NULL);
        gtk_tree_view_column_pack_start (column, renderer, TRUE);
        gtk_tree_view_column_set_cell_data_func(column, renderer,
                                                text_cell_data, treeview, NULL);
-       
+
+       priv->messages_renderer = gtk_cell_renderer_text_new ();
+       g_object_set (priv->messages_renderer, 
+                     "yalign", 0.5,
+                     "ypad", MODEST_MARGIN_DEFAULT,
+                     "xpad", MODEST_MARGIN_DOUBLE,
+                     "alignment", PANGO_ALIGN_RIGHT,
+                     "align-set", TRUE,
+                     "xalign", 1.0,
+                     NULL);
+       gtk_tree_view_column_pack_start (column, priv->messages_renderer, FALSE);
+       gtk_tree_view_column_set_cell_data_func(column, priv->messages_renderer,
+                                               messages_cell_data, treeview, NULL);
+
        /* Set selection mode */
        sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(treeview));
        gtk_tree_selection_set_mode (sel, GTK_SELECTION_SINGLE);
@@ -966,9 +1265,10 @@ add_columns (GtkWidget *treeview)
        /* 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_column_set_fixed_width (column, TRUE);
        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_set_rules_hint ((GtkTreeView *) treeview, TRUE);
 
        /* Add column */
        gtk_tree_view_append_column (GTK_TREE_VIEW(treeview),column);
@@ -979,18 +1279,24 @@ 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->do_refresh     = TRUE;
        priv->style          = MODEST_FOLDER_VIEW_STYLE_SHOW_ALL;
        priv->cur_folder_store   = NULL;
        priv->visible_account_id = NULL;
+       priv->mailbox = NULL;
        priv->folder_to_select = NULL;
-
+       priv->outbox_deleted_handler = 0;
        priv->reexpand = TRUE;
+       priv->signal_handlers = 0;
+#ifdef MODEST_TOOLKIT_HILDON2
+       priv->live_search = NULL;
+#endif
 
        /* Initialize the local account name */
        conf = modest_runtime_get_conf();
@@ -1000,34 +1306,35 @@ modest_folder_view_init (ModestFolderView *obj)
        priv->clipboard = modest_runtime_get_email_clipboard ();
        priv->hidding_ids = NULL;
        priv->n_selected = 0;
+       priv->filter = MODEST_FOLDER_VIEW_FILTER_NONE;
        priv->reselect = FALSE;
        priv->show_non_move = TRUE;
+       priv->list_to_move = NULL;
+       priv->show_message_count = 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);
+       priv->display_name_changed_signal =
+               g_signal_connect (modest_runtime_get_account_mgr (),
+                                 "display_name_changed",
+                                 G_CALLBACK (on_display_name_changed),
+                                 obj);
 
        /*
         * Track changes in the local account name (in the device it
         * will be the device name)
         */
-       priv->conf_key_signal = g_signal_connect (G_OBJECT(conf), 
-                                                 "key_changed",
-                                                 G_CALLBACK(on_configuration_key_changed), 
-                                                 obj);
+       priv->conf_key_signal = g_signal_connect (G_OBJECT(conf),
+                                                 "key_changed",
+                                                 G_CALLBACK(on_configuration_key_changed),
+                                                 obj);
+
+       gdk_color_parse ("000", &priv->active_color);
+
+       update_style (obj);
+       g_signal_connect (G_OBJECT (obj), "notify::style", 
+                         G_CALLBACK (on_notify_style), (gpointer) obj);
 }
 
 static void
@@ -1035,26 +1342,22 @@ 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
-modest_folder_view_finalize (GObject *obj)
+modest_folder_view_dispose (GObject *obj)
 {
        ModestFolderViewPrivate *priv;
-       GtkTreeSelection    *sel;
-       
-       g_return_if_fail (obj);
-       
-       priv =  MODEST_FOLDER_VIEW_GET_PRIVATE(obj);
 
-       if (priv->timer_expander != 0) {
-               g_source_remove (priv->timer_expander);
-               priv->timer_expander = 0;
+       priv =  MODEST_FOLDER_VIEW_GET_PRIVATE (obj);
+
+       if (priv->signal_handlers) {
+               modest_signal_mgr_disconnect_all_and_destroy (priv->signal_handlers);
+               priv->signal_handlers = NULL;
        }
 
+       /* Free external references */
        if (priv->account_store) {
                g_signal_handler_disconnect (G_OBJECT(priv->account_store),
                                             priv->account_inserted_signal);
@@ -1071,37 +1374,76 @@ 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;
        }
-   
+
+       if (priv->cur_folder_store) {
+               g_object_unref (priv->cur_folder_store);
+               priv->cur_folder_store = NULL;
+       }
+
+       if (priv->list_to_move) {
+               g_object_unref (priv->list_to_move);
+               priv->list_to_move = NULL;
+       }
+
+       G_OBJECT_CLASS(parent_class)->dispose (obj);
+}
+
+static void
+modest_folder_view_finalize (GObject *obj)
+{
+       ModestFolderViewPrivate *priv;
+       GtkTreeSelection    *sel;
+       TnyAccount *local_account;
+
+       g_return_if_fail (obj);
+
+       priv =  MODEST_FOLDER_VIEW_GET_PRIVATE(obj);
+
+       if (priv->timer_expander != 0) {
+               g_source_remove (priv->timer_expander);
+               priv->timer_expander = 0;
+       }
+
+       local_account = (TnyAccount *)
+               modest_tny_account_store_get_local_folders_account (modest_runtime_get_account_store ());
+       if (local_account) {
+               if (g_signal_handler_is_connected (local_account,
+                                                  priv->outbox_deleted_handler))
+                       g_signal_handler_disconnect (local_account,
+                                                    priv->outbox_deleted_handler);
+               g_object_unref (local_account);
+       }
+
+       if (g_signal_handler_is_connected (modest_runtime_get_account_mgr (), 
+                                          priv->display_name_changed_signal)) {
+               g_signal_handler_disconnect (modest_runtime_get_account_mgr (),
+                                            priv->display_name_changed_signal);
+               priv->display_name_changed_signal = 0;
+       }
+
        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_free (priv->mailbox);
+
        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))
-                       tny_folder_sync (TNY_FOLDER(priv->cur_folder_store), FALSE, NULL);
-                       /* FALSE --> expunge the message */
-
-               g_object_unref (priv->cur_folder_store);
-               priv->cur_folder_store = NULL;
-       }
-
        /* Clear hidding array created by cut operation */
        _clear_hidding_filter (MODEST_FOLDER_VIEW (obj));
 
+       gdk_color_parse ("000", &priv->active_color);
+
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
@@ -1124,20 +1466,20 @@ modest_folder_view_set_account_store (TnyAccountStoreView *self, TnyAccountStore
                                                   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), 
+               if (g_signal_handler_is_connected (G_OBJECT (priv->account_store),
                                                   priv->account_removed_signal))
-                       g_signal_handler_disconnect (G_OBJECT (priv->account_store), 
+                       g_signal_handler_disconnect (G_OBJECT (priv->account_store),
                                                     priv->account_removed_signal);
-               if (g_signal_handler_is_connected (G_OBJECT (priv->account_store), 
+               if (g_signal_handler_is_connected (G_OBJECT (priv->account_store),
                                                   priv->account_changed_signal))
-                       g_signal_handler_disconnect (G_OBJECT (priv->account_store), 
+                       g_signal_handler_disconnect (G_OBJECT (priv->account_store),
                                                     priv->account_changed_signal);
                g_object_unref (G_OBJECT (priv->account_store));
        }
 
        priv->account_store = g_object_ref (G_OBJECT (account_store));
 
-       priv->account_removed_signal = 
+       priv->account_removed_signal =
                g_signal_connect (G_OBJECT(account_store), "account_removed",
                                  G_CALLBACK (on_account_removed), self);
 
@@ -1150,33 +1492,40 @@ modest_folder_view_set_account_store (TnyAccountStoreView *self, TnyAccountStore
                                  G_CALLBACK (on_account_changed), self);
 
        modest_folder_view_update_model (MODEST_FOLDER_VIEW (self), account_store);
-       
+       priv->reselect = FALSE;
+
        g_object_unref (G_OBJECT (device));
 }
 
 static void
-on_connection_status_changed (TnyAccount *self, 
-                             TnyConnectionStatus status, 
-                             gpointer user_data)
+on_outbox_deleted_cb (ModestTnyLocalFoldersAccount *local_account,
+                     gpointer user_data)
 {
-       /* If the account becomes online then refresh it */
-       if (status == TNY_CONNECTION_STATUS_CONNECTED) {
-               const gchar *acc_name;
-               GtkWidget *my_window;
+       ModestFolderView *self;
+       GtkTreeModel *model, *filter_model;
+       TnyFolder *outbox;
 
-               my_window = gtk_widget_get_ancestor (GTK_WIDGET (user_data), MODEST_TYPE_WINDOW);
-               acc_name = modest_tny_account_get_parent_modest_account_name_for_server_account (self);
-               modest_ui_actions_do_send_receive (acc_name, MODEST_WINDOW (my_window));
-       }
+       self = MODEST_FOLDER_VIEW (user_data);
+
+       if (!get_inner_models (self, &filter_model, NULL, &model))
+               return;
+
+       /* Remove outbox from model */
+       outbox = modest_tny_local_folders_account_get_merged_outbox (local_account);
+       tny_list_remove (TNY_LIST (model), G_OBJECT (outbox));
+       g_object_unref (outbox);
+
+       /* Refilter view */
+       gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model));
 }
 
 static void
-on_account_inserted (TnyAccountStore *account_store, 
+on_account_inserted (TnyAccountStore *account_store,
                     TnyAccount *account,
                     gpointer user_data)
 {
        ModestFolderViewPrivate *priv;
-       GtkTreeModel *sort_model, *filter_model;
+       GtkTreeModel *model, *filter_model;
 
        /* Ignore transport account insertions, we're not showing them
           in the folder view */
@@ -1185,104 +1534,148 @@ on_account_inserted (TnyAccountStore *account_store,
 
        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(), 
+               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));
+
+       /* Get models */
+       if (!get_inner_models (MODEST_FOLDER_VIEW (user_data),
+                              &filter_model, NULL, &model))
+               return;
 
        /* 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));
+       tny_list_append (TNY_LIST (model), G_OBJECT (account));
 
+       /* When the model is a list store (plain representation) the
+          outbox is not a child of any account so we have to manually
+          delete it because removing the local folders account won't
+          delete it (because tny_folder_get_account() is not defined
+          for a merge folder */
+       if (TNY_IS_GTK_FOLDER_LIST_STORE (model) &&
+           MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (account)) {
 
-       /* When the store account gets online refresh it */
-       g_signal_connect (account, "connection_status_changed", 
-                         G_CALLBACK (on_connection_status_changed), 
-                         MODEST_FOLDER_VIEW (user_data));
+               priv->outbox_deleted_handler =
+                       g_signal_connect (account,
+                                         "outbox-deleted",
+                                         G_CALLBACK (on_outbox_deleted_cb),
+                                         user_data);
+       }
 
        /* Refilter the model */
        gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model));
 }
 
 
+static gboolean
+same_account_selected (ModestFolderView *self,
+                      TnyAccount *account)
+{
+       ModestFolderViewPrivate *priv;
+       gboolean same_account = FALSE;
+
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
+
+       if (priv->cur_folder_store) {
+               TnyAccount *selected_folder_account = NULL;
+
+               if (TNY_IS_FOLDER (priv->cur_folder_store)) {
+                       selected_folder_account =
+                               modest_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)
+                       same_account = TRUE;
+
+               g_object_unref (selected_folder_account);
+       }
+       return same_account;
+}
+
 static void
-on_account_changed (TnyAccountStore *account_store, 
+on_account_changed (TnyAccountStore *account_store,
                    TnyAccount *tny_account,
                    gpointer user_data)
 {
-       /* do nothing */
+       ModestFolderView *self;
        ModestFolderViewPrivate *priv;
-       GtkTreeModel *sort_model, *filter_model;
+       GtkTreeModel *model, *filter_model;
+       GtkTreeSelection *sel;
+       gboolean same_account;
 
        /* Ignore transport account insertions, we're not showing them
           in the folder view */
        if (TNY_IS_TRANSPORT_ACCOUNT (tny_account))
                return;
 
+       self = MODEST_FOLDER_VIEW (user_data);
        priv = MODEST_FOLDER_VIEW_GET_PRIVATE (user_data);
 
        /* Get the inner model */
+       if (!get_inner_models (MODEST_FOLDER_VIEW (user_data),
+                              &filter_model, NULL, &model))
+               return;
+
        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));
-       
+
+       /* Invalidate the cur_folder_store only if the selected folder
+          belongs to the account that is being removed */
+       same_account = same_account_selected (self, tny_account);
+       if (same_account) {
+               sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
+               gtk_tree_selection_unselect_all (sel);
+       }
+
        /* 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));
+       tny_list_remove (TNY_LIST (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));
+       tny_list_append (TNY_LIST (model), G_OBJECT (tny_account));
 
        /* Refilter the model */
        gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model));
-}
-
 
+}
 
 static void
-on_account_removed (TnyAccountStore *account_store, 
+on_account_removed (TnyAccountStore *account_store,
                    TnyAccount *account,
                    gpointer user_data)
 {
        ModestFolderView *self = NULL;
        ModestFolderViewPrivate *priv;
-       GtkTreeModel *sort_model, *filter_model;
+       GtkTreeModel *model, *filter_model;
        GtkTreeSelection *sel = NULL;
+       gboolean same_account = FALSE;
 
        /* Ignore transport account removals, we're not showing them
           in the folder view */
        if (TNY_IS_TRANSPORT_ACCOUNT (account))
                return;
 
+       if (!MODEST_IS_FOLDER_VIEW(user_data)) {
+               g_warning ("BUG: %s: not a valid folder view", __FUNCTION__);
+               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);
-               }
-               g_object_unref (selected_folder_account);
-       }
+       same_account = same_account_selected (self, account);
+       if (same_account) {
+               sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
+               gtk_tree_selection_unselect_all (sel);
+       }
 
        /* Invalidate row to select only if the folder to select
           belongs to the account that is being removed*/
@@ -1291,18 +1684,28 @@ on_account_removed (TnyAccountStore *account_store,
 
                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); */
+                       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);
        }
 
+       if (!get_inner_models (MODEST_FOLDER_VIEW (user_data),
+                              &filter_model, NULL, &model))
+               return;
+
+       /* Disconnect the signal handler */
+       if (TNY_IS_GTK_FOLDER_LIST_STORE (model) &&
+           MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (account)) {
+               if (g_signal_handler_is_connected (account,
+                                                  priv->outbox_deleted_handler))
+                       g_signal_handler_disconnect (account,
+                                                    priv->outbox_deleted_handler);
+       }
+
        /* 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));
+       tny_list_remove (TNY_LIST (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 */
@@ -1311,6 +1714,7 @@ on_account_removed (TnyAccountStore *account_store,
 
                /* Clear the current visible account_id */
                modest_folder_view_set_account_id_of_visible_server_account (self, NULL);
+               modest_folder_view_set_mailbox (self, NULL);
 
                /* Call the restore method, this will set the new visible account */
                modest_widget_memory_restore (modest_runtime_get_conf(), G_OBJECT(self),
@@ -1320,26 +1724,14 @@ on_account_removed (TnyAccountStore *account_store,
        /* 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 (priv->cur_folder_store) {
-               TnyAccount *folder_selected_account;
-
-               folder_selected_account = (TNY_IS_FOLDER (priv->cur_folder_store)) ?
-                       modest_tny_folder_get_account (TNY_FOLDER (priv->cur_folder_store)) :
-                       TNY_ACCOUNT (g_object_ref (priv->cur_folder_store));
-               if (account == folder_selected_account)
-                       modest_folder_view_select_first_inbox_or_local (self);
-               g_object_unref (folder_selected_account);
-       }
 }
 
 void
 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) {
@@ -1353,7 +1745,7 @@ modest_folder_view_set_title (ModestFolderView *self, const gchar *title)
 }
 
 static gboolean
-modest_folder_view_on_map (ModestFolderView *self, 
+modest_folder_view_on_map (ModestFolderView *self,
                           GdkEventExpose *event,
                           gpointer data)
 {
@@ -1372,7 +1764,6 @@ modest_folder_view_on_map (ModestFolderView *self,
                   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,
@@ -1380,7 +1771,7 @@ modest_folder_view_on_map (ModestFolderView *self,
        }
 
        if (priv->reexpand) {
-               expand_root_items (self); 
+               expand_root_items (self);
                priv->reexpand = FALSE;
        }
 
@@ -1390,22 +1781,39 @@ modest_folder_view_on_map (ModestFolderView *self,
 GtkWidget*
 modest_folder_view_new (TnyFolderStoreQuery *query)
 {
+       return modest_folder_view_new_full (query, TRUE);
+}
+
+GtkWidget*
+modest_folder_view_new_full (TnyFolderStoreQuery *query, gboolean do_refresh)
+{
        GObject *self;
        ModestFolderViewPrivate *priv;
        GtkTreeSelection *sel;
-       
-       self = G_OBJECT (g_object_new (MODEST_TYPE_FOLDER_VIEW, NULL));
+
+       self = G_OBJECT (g_object_new (MODEST_TYPE_FOLDER_VIEW, 
+#ifdef MODEST_TOOLKIT_HILDON2
+                                      "hildon-ui-mode", HILDON_UI_MODE_NORMAL,
+#endif
+                                      NULL));
        priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
 
        if (query)
                priv->query = g_object_ref (query);
-       
+
+       priv->do_refresh = do_refresh;
+
        sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
        priv->changed_signal = g_signal_connect (sel, "changed",
                                                 G_CALLBACK (on_selection_changed), self);
 
+       g_signal_connect (self, "row-activated", G_CALLBACK (on_row_activated), self);
+
        g_signal_connect (self, "expose-event", G_CALLBACK (modest_folder_view_on_map), NULL);
 
+       /* Hide headers by default */
+       gtk_tree_view_set_headers_visible ((GtkTreeView *)self, FALSE);
+
        return GTK_WIDGET(self);
 }
 
@@ -1425,19 +1833,149 @@ expand_root_items (ModestFolderView *self)
                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
+is_parent_of (TnyFolder *a, TnyFolder *b)
+{
+       const gchar *a_id;
+       gboolean retval = FALSE;
+
+       a_id = tny_folder_get_id (a);
+       if (a_id) {
+               gchar *string_to_match;
+               const gchar *b_id;
+
+               string_to_match = g_strconcat (a_id, "/", NULL);
+               b_id = tny_folder_get_id (b);
+               retval = g_str_has_prefix (b_id, string_to_match);
+               g_free (string_to_match);
+       }
+       
+       return retval;
+}
+
+typedef struct _ForeachFolderInfo {
+       gchar *needle;
+       gboolean found;
+} ForeachFolderInfo;
+
+static gboolean 
+foreach_folder_with_id (GtkTreeModel *model,
+                       GtkTreePath *path,
+                       GtkTreeIter *iter,
+                       gpointer data)
+{
+       ForeachFolderInfo *info;
+       GObject *instance;
+
+       info = (ForeachFolderInfo *) data;
+       gtk_tree_model_get (model, iter,
+                           INSTANCE_COLUMN, &instance,
+                           -1);
+
+       if (TNY_IS_FOLDER (instance)) {
+               const gchar *id;
+               gchar *collate;
+               id = tny_folder_get_id (TNY_FOLDER (instance));
+               if (id) {
+                       collate = g_utf8_collate_key (id, -1);
+                       info->found = !strcmp (info->needle, collate);
+                       g_free (collate);
+               }
+       }
+
+       if (instance)
+               g_object_unref (instance);
+
+       return info->found;
+       
+}
+
+
+static gboolean
+has_folder_with_id (ModestFolderView *self, const gchar *id)
+{
+       GtkTreeModel *model;
+       ForeachFolderInfo info = {NULL, FALSE};
+
+       model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+       info.needle = g_utf8_collate_key (id, -1);
+       
+       gtk_tree_model_foreach (model, foreach_folder_with_id, &info);
+       g_free (info.needle);
+
+       return info.found;
+}
+
+static gboolean
+has_child_with_name_of (ModestFolderView *self, TnyFolder *a, TnyFolder *b)
+{
+       const gchar *a_id;
+       gboolean retval = FALSE;
+
+       a_id = tny_folder_get_id (a);
+       if (a_id) {
+               const gchar *b_id;
+               b_id = tny_folder_get_id (b);
+               
+               if (b_id) {
+                       const gchar *last_bar;
+                       gchar *string_to_match;
+                       last_bar = g_strrstr (b_id, "/");
+                       if (last_bar)
+                               last_bar++;
+                       else
+                               last_bar = b_id;
+                       string_to_match = g_strconcat (a_id, "/", last_bar, NULL);
+                       retval = has_folder_with_id (self, string_to_match);
+                       g_free (string_to_match);
+               }
+       }
+
+       return retval;
+}
+
+static gboolean
+check_move_to_this_folder_valid (ModestFolderView *self, TnyFolder *folder)
+{
+       ModestFolderViewPrivate *priv;
+       TnyIterator *iterator;
+       gboolean retval = TRUE;
+
+       g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (self), FALSE);
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
+
+       for (iterator = tny_list_create_iterator (priv->list_to_move);
+            retval && !tny_iterator_is_done (iterator);
+            tny_iterator_next (iterator)) {
+               GObject *instance;
+               instance = tny_iterator_get_current (iterator);
+               if (instance == (GObject *) folder) {
+                       retval = FALSE;
+               } else if (TNY_IS_FOLDER (instance)) {
+                       retval = !is_parent_of (TNY_FOLDER (instance), folder);
+                       if (retval) {
+                               retval = !has_child_with_name_of (self, folder, TNY_FOLDER (instance));
+                       }
+               }
+               g_object_unref (instance);
+       }
+       g_object_unref (iterator);
+
+       return retval;
+}
+
+
 /*
  * 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)
+static gboolean
+filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
 {
        ModestFolderViewPrivate *priv;
        gboolean retval = TRUE;
@@ -1447,68 +1985,108 @@ filter_row (GtkTreeModel *model,
        guint i;
        gboolean found = FALSE;
        gboolean cleared = FALSE;
+       ModestTnyFolderRules rules = 0;
+       gchar *fname;
 
        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,
+                           NAME_COLUMN, &fname,
+                           TYPE_COLUMN, &type,
+                           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)
+       if (!instance) {
+               g_free (fname);
                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 {
+       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;
-                               }                               
-                       }
-                       
-                       /* 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))
+                       } 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;
+       } else {
+               if (priv->style == MODEST_FOLDER_VIEW_STYLE_SHOW_ONE) {
+                       /* Only show special folders for current account if needed */
+                       if (TNY_IS_FOLDER (instance) && !TNY_IS_MERGE_FOLDER (instance)) {
+                               TnyAccount *account;
+
+                               account = tny_folder_get_account (TNY_FOLDER (instance));
+
+                               if (TNY_IS_ACCOUNT (account)) {
+                                       const gchar *account_id = tny_account_get_id (account);
+
+                                       if (!modest_tny_account_is_virtual_local_folders (account) &&
+                                           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 if (priv->mailbox) {
+                                                         /* Filter mailboxes */
+                                                         if (!g_str_has_prefix (fname, priv->mailbox)) {
+                                                                 retval = FALSE;
+                                                         } else if (!strcmp (fname, priv->mailbox)) {
+                                                                 /* Hide mailbox parent */
+                                                                 retval = FALSE;
+                                                         }
+                                                 }
+                                               }
+                                       }
+                                               g_object_unref (account);
+                               }
+                       }
+
                }
        }
 
        /* Check hiding (if necessary) */
-       cleared = modest_email_clipboard_cleared (priv->clipboard);            
+       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) {
+       if (retval && !priv->show_non_move) {
+               if (priv->list_to_move && 
+                   tny_list_get_length (priv->list_to_move) > 0 &&
+                   TNY_IS_FOLDER (instance)) {
+                       retval = check_move_to_this_folder_valid (MODEST_FOLDER_VIEW (data), TNY_FOLDER (instance));
+               }
+               if (retval && TNY_IS_FOLDER (instance) && 
+                   modest_tny_folder_is_local_folder (TNY_FOLDER (instance))) {
+                       switch (type) {
                        case TNY_FOLDER_TYPE_OUTBOX:
                        case TNY_FOLDER_TYPE_SENT:
                        case TNY_FOLDER_TYPE_DRAFTS:
@@ -1520,18 +2098,193 @@ filter_row (GtkTreeModel *model,
                                if (type == TNY_FOLDER_TYPE_INVALID)
                                        g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
                                
-                               if (type == TNY_FOLDER_TYPE_OUTBOX || 
+                               if (type == TNY_FOLDER_TYPE_OUTBOX ||
                                    type == TNY_FOLDER_TYPE_SENT
                                    || type == TNY_FOLDER_TYPE_DRAFTS)
                                        retval = FALSE;
                                break;
                        default:
                                break;
+                       }
+               }
+               if (retval && TNY_IS_ACCOUNT (instance) &&
+                   modest_tny_folder_store_is_remote (TNY_FOLDER_STORE (instance))) {
+                       ModestProtocolType protocol_type;
+
+                       protocol_type = modest_tny_account_get_protocol_type (TNY_ACCOUNT (instance));
+                       retval  = !modest_protocol_registry_protocol_type_has_tag
+                               (modest_runtime_get_protocol_registry (),
+                                protocol_type,
+                                MODEST_PROTOCOL_REGISTRY_STORE_FORBID_INCOMING_XFERS);
                }
        }
-       
+
+       /* apply special filters */
+       if (retval && (priv->filter & MODEST_FOLDER_VIEW_FILTER_HIDE_ACCOUNTS)) {
+               if (TNY_IS_ACCOUNT (instance))
+                       retval = FALSE;
+       }
+
+       if (retval && (priv->filter & MODEST_FOLDER_VIEW_FILTER_HIDE_FOLDERS)) {
+               if (TNY_IS_FOLDER (instance))
+                       retval = FALSE;
+       }
+
+       if (retval && (priv->filter & MODEST_FOLDER_VIEW_FILTER_HIDE_LOCAL_FOLDERS)) {
+               if (TNY_IS_ACCOUNT (instance)) {
+                       if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (instance)))
+                               retval = FALSE;
+               } else if (TNY_IS_FOLDER (instance)) {
+                       if (modest_tny_folder_is_local_folder (TNY_FOLDER (instance)))
+                               retval = FALSE;
+               }
+       }
+
+       if (retval && (priv->filter & MODEST_FOLDER_VIEW_FILTER_HIDE_MCC_FOLDERS)) {
+               if (TNY_IS_ACCOUNT (instance)) {
+                       if (modest_tny_account_is_memory_card_account (TNY_ACCOUNT (instance)))
+                               retval = FALSE;
+               } else if (TNY_IS_FOLDER (instance)) {
+                       if (modest_tny_folder_is_memory_card_folder (TNY_FOLDER (instance)))
+                               retval = FALSE;
+               }
+       }
+
+       if (retval && (priv->filter & MODEST_FOLDER_VIEW_FILTER_SHOW_ONLY_MAILBOXES)) {
+               /* A mailbox is a fake folder with an @ in the middle of the name */
+               if (!TNY_IS_FOLDER (instance) ||
+                   !(tny_folder_get_caps (TNY_FOLDER (instance)) & TNY_FOLDER_CAPS_NOSELECT)) {
+                       retval = FALSE;
+               } else {
+                       const gchar *folder_name;
+                       folder_name = tny_folder_get_name (TNY_FOLDER (instance));
+                       if (!folder_name || strchr (folder_name, '@') == NULL)
+                               retval = FALSE;
+               }
+               
+       }
+
+       if (retval && (priv->filter & MODEST_FOLDER_VIEW_FILTER_CAN_HAVE_FOLDERS)) {
+               if (TNY_IS_FOLDER (instance)) {
+                       /* Check folder rules */
+                       ModestTnyFolderRules rules;
+
+                       rules = modest_tny_folder_get_rules (TNY_FOLDER (instance));
+                       retval = !(rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE);
+               } else if (TNY_IS_ACCOUNT (instance)) {
+                       if (modest_tny_folder_store_is_remote (TNY_FOLDER_STORE (instance))) {
+                               retval = FALSE;
+                       } else {
+                               retval = TRUE;
+                       }
+               }
+       }
+
+       if (retval && (priv->filter & MODEST_FOLDER_VIEW_FILTER_HIDE_MANDATORY_FOLDERS)) {
+               if (TNY_IS_FOLDER (instance)) {
+                       TnyFolderType guess_type;
+
+                       if (TNY_FOLDER_TYPE_NORMAL) {
+                               guess_type = modest_tny_folder_guess_folder_type (TNY_FOLDER (instance));
+                       } else {
+                               guess_type = type;
+                       }
+
+                       switch (type) {
+                       case TNY_FOLDER_TYPE_OUTBOX:
+                       case TNY_FOLDER_TYPE_SENT:
+                       case TNY_FOLDER_TYPE_DRAFTS:
+                       case TNY_FOLDER_TYPE_ARCHIVE:
+                       case TNY_FOLDER_TYPE_INBOX:
+                               retval = FALSE;
+                               break;
+                       case TNY_FOLDER_TYPE_UNKNOWN:
+                       case TNY_FOLDER_TYPE_NORMAL:
+                               break;
+                       default:
+                               break;
+                       }
+
+               } else if (TNY_IS_ACCOUNT (instance)) {
+                       retval = FALSE;
+               }
+       }
+
+       if (retval && TNY_IS_FOLDER (instance)) {
+               rules = modest_tny_folder_get_rules (TNY_FOLDER (instance));
+       }
+
+       if (retval && (priv->filter & MODEST_FOLDER_VIEW_FILTER_DELETABLE)) {
+               if (TNY_IS_FOLDER (instance)) {
+                       retval = !(rules & MODEST_FOLDER_RULES_FOLDER_NON_DELETABLE);
+               } else if (TNY_IS_ACCOUNT (instance)) {
+                       retval = FALSE;
+               }
+       }
+
+       if (retval && (priv->filter & MODEST_FOLDER_VIEW_FILTER_RENAMEABLE)) {
+               if (TNY_IS_FOLDER (instance)) {
+                       retval = !(rules & MODEST_FOLDER_RULES_FOLDER_NON_RENAMEABLE);
+               } else if (TNY_IS_ACCOUNT (instance)) {
+                       retval = FALSE;
+               }
+       }
+
+       if (retval && (priv->filter & MODEST_FOLDER_VIEW_FILTER_MOVEABLE)) {
+               if (TNY_IS_FOLDER (instance)) {
+                       retval = !(rules & MODEST_FOLDER_RULES_FOLDER_NON_MOVEABLE);
+               } else if (TNY_IS_ACCOUNT (instance)) {
+                       retval = FALSE;
+               }
+       }
+
+#ifdef MODEST_TOOLKIT_HILDON2
+       if (retval && (priv->live_search)) {
+               const gchar *needle;
+               needle = hildon_live_search_get_text (HILDON_LIVE_SEARCH (priv->live_search));
+               if (needle && needle[0] != '\0') {
+                       gchar *haystack;
+                       gboolean is_local;
+                       
+                       haystack = g_strdup (fname);
+                       if (type != TNY_FOLDER_TYPE_ROOT) {
+                               is_local = modest_tny_folder_is_local_folder (TNY_FOLDER (instance)) ||
+                                       modest_tny_folder_is_memory_card_folder (TNY_FOLDER (instance));
+                               if (is_local) {
+                                       TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
+                                       type = modest_tny_folder_get_local_or_mmc_folder_type (TNY_FOLDER (instance));
+                                       if (type != TNY_FOLDER_TYPE_UNKNOWN) {
+                                               g_free (haystack);
+                                               haystack = g_strdup (modest_local_folder_info_get_type_display_name (type));
+                                       }
+                               } else {
+                               }
+                       } else {
+                               if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (instance))) {
+                                       g_free (haystack);
+                                       haystack = g_strdup (priv->local_account_name);
+                               } else if (modest_tny_account_is_memory_card_account (TNY_ACCOUNT (instance))) {
+                                       g_free (haystack);
+                                       haystack = g_strdup (tny_account_get_name (TNY_ACCOUNT (instance)));
+                               }
+                       }
+
+                       if (type == TNY_FOLDER_TYPE_INBOX &&
+                           g_str_has_suffix (haystack, "Inbox")) {
+                               g_free (haystack);
+                               haystack = g_strdup (_("mcen_me_folder_inbox"));
+                       }
+                       format_compact_style (&haystack, instance, priv->mailbox, FALSE, 
+                                     priv->style == MODEST_FOLDER_VIEW_STYLE_SHOW_ALL, NULL);
+                       retval = modest_text_utils_live_search_find (haystack, needle);
+                       g_free (haystack);
+               }
+       }
+#endif
+
        /* Free */
        g_object_unref (instance);
+        g_free (fname);
 
        return retval;
 }
@@ -1542,16 +2295,17 @@ modest_folder_view_update_model (ModestFolderView *self,
                                 TnyAccountStore *account_store)
 {
        ModestFolderViewPrivate *priv;
-       GtkTreeModel *model /* , *old_model */;                                                    
+       GtkTreeModel *model;
        GtkTreeModel *filter_model = NULL, *sortable = NULL;
 
-       g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (self), FALSE);
-       g_return_val_if_fail (account_store, FALSE);
+       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 */
-       g_signal_emit (G_OBJECT(self), 
+       g_signal_emit (G_OBJECT(self),
                       signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0,
                       NULL, FALSE);
        if (priv->cur_folder_store) {
@@ -1561,19 +2315,91 @@ modest_folder_view_update_model (ModestFolderView *self,
 
        /* FIXME: the local accounts are not shown when the query
           selects only the subscribed folders */
-       model        = tny_gtk_folder_store_tree_model_new (NULL);
-
-       /* Get the accounts: */
-       tny_account_store_get_accounts (TNY_ACCOUNT_STORE(account_store),
-                                       TNY_LIST (model),
-                                       TNY_ACCOUNT_STORE_STORE_ACCOUNTS);
+       TnyGtkFolderListStoreFlags flags;
+       flags = TNY_GTK_FOLDER_LIST_STORE_FLAG_SHOW_PATH;
+       if (priv->do_refresh)
+               flags |= TNY_GTK_FOLDER_LIST_STORE_FLAG_DELAYED_REFRESH;
+       else
+               flags |= TNY_GTK_FOLDER_LIST_STORE_FLAG_NO_REFRESH;
+       model = tny_gtk_folder_list_store_new_with_flags (NULL, 
+                                                         flags);
+       tny_gtk_folder_list_store_set_path_separator (TNY_GTK_FOLDER_LIST_STORE (model),
+                                                     MODEST_FOLDER_PATH_SEPARATOR);
+
+       /* When the model is a list store (plain representation) the
+          outbox is not a child of any account so we have to manually
+          delete it because removing the local folders account won't
+          delete it (because tny_folder_get_account() is not defined
+          for a merge folder */
+       if (TNY_IS_GTK_FOLDER_LIST_STORE (model)) {
+               TnyAccount *account;
+               ModestTnyAccountStore *acc_store;
+
+               acc_store = modest_runtime_get_account_store ();
+               account = modest_tny_account_store_get_local_folders_account (acc_store);
+
+               if (g_signal_handler_is_connected (account,
+                                                  priv->outbox_deleted_handler))
+                       g_signal_handler_disconnect (account,
+                                                    priv->outbox_deleted_handler);
+
+               priv->outbox_deleted_handler =
+                       g_signal_connect (account,
+                                         "outbox-deleted",
+                                         G_CALLBACK (on_outbox_deleted_cb),
+                                         self);
+               g_object_unref (account);
+       }
+
+       if (priv->style == MODEST_FOLDER_VIEW_STYLE_SHOW_ALL) {
+               /* Get the accounts */
+               tny_account_store_get_accounts (TNY_ACCOUNT_STORE(account_store),
+                                               TNY_LIST (model),
+                                               TNY_ACCOUNT_STORE_STORE_ACCOUNTS);
+       } else {
+               if (priv->visible_account_id) {
+                       TnyAccount *account;
+
+                       /* Add local folders account */
+                      account = modest_tny_account_store_get_local_folders_account ((ModestTnyAccountStore *) account_store);
+
+                       if (account) {
+                               tny_list_append (TNY_LIST (model), (GObject *) account);
+                               g_object_unref (account);
+                       }
+
+                      account = modest_tny_account_store_get_mmc_folders_account ((ModestTnyAccountStore *) account_store);
+
+                       if (account) {
+                               tny_list_append (TNY_LIST (model), (GObject *) account);
+                               g_object_unref (account);
+                       }
+
+                       /* Add visible account */
+                      account = modest_tny_account_store_get_tny_account_by ((ModestTnyAccountStore *) account_store,
+                                                                             MODEST_TNY_ACCOUNT_STORE_QUERY_ID,
+                                                                              priv->visible_account_id);
+                       if (account) {
+                               tny_list_append (TNY_LIST (model), (GObject *) account);
+                               g_object_unref (account);
+                       } else {
+                               g_warning ("You need to set an account first");
+                               g_object_unref (model);
+                               return FALSE;
+                       }
+               } else {
+                       g_warning ("You need to set an account first");
+                       g_object_unref (model);
+                       return FALSE;
+               }
+       }
 
        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, 
+                                             NAME_COLUMN,
                                              GTK_SORT_ASCENDING);
        gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (sortable),
-                                        TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN,
+                                        NAME_COLUMN,
                                         cmp_rows, NULL, NULL);
 
        /* Create filter model */
@@ -1583,19 +2409,31 @@ modest_folder_view_update_model (ModestFolderView *self,
                                                self,
                                                NULL);
 
+       GtkTreeModel *old_tny_model = NULL;
+       if (get_inner_models (self, NULL, NULL, &old_tny_model)) {
+               if (priv->signal_handlers > 0) {
+                       priv->signal_handlers = modest_signal_mgr_disconnect (priv->signal_handlers,
+                                                                             G_OBJECT (old_tny_model), 
+                                                                             "activity-changed");
+               }
+       }
+
        /* 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);
 
+       priv->signal_handlers = modest_signal_mgr_connect (priv->signal_handlers,
+                                                          G_OBJECT (model),
+                                                          "activity-changed",
+                                                          G_CALLBACK (on_activity_changed),
+                                                          self);
 
        g_object_unref (model);
-       g_object_unref (filter_model);          
+       g_object_unref (filter_model);
        g_object_unref (sortable);
-       
+
        /* Force a reselection of the INBOX next time the widget is shown */
        priv->reselect = TRUE;
-                       
+
        return TRUE;
 }
 
@@ -1612,21 +2450,16 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
 
        g_return_if_fail (sel);
        g_return_if_fail (user_data);
-       
+
        priv = MODEST_FOLDER_VIEW_GET_PRIVATE(user_data);
 
        selected = gtk_tree_selection_get_selected (sel, &model, &iter);
 
-       /* Notify the display name observers */
-       g_signal_emit (G_OBJECT(user_data),
-                      signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL], 0,
-                      NULL);
-
        tree_view = MODEST_FOLDER_VIEW (user_data);
 
        if (selected) {
                gtk_tree_model_get (model, &iter,
-                                   TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder,
+                                   INSTANCE_COLUMN, &folder,
                                    -1);
 
                /* If the folder is the same do not notify */
@@ -1635,18 +2468,19 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
                        return;
                }
        }
-       
+
        /* Current folder was unselected */
        if (priv->cur_folder_store) {
+               /* We must do this firstly because a libtinymail-camel
+                  implementation detail. If we issue the signal
+                  before doing the sync_async, then that signal could
+                  cause (and it actually does it) a free of the
+                  summary of the folder (because the main window will
+                  clear the headers view */
+
                g_signal_emit (G_OBJECT(tree_view), signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0,
                       priv->cur_folder_store, FALSE);
 
-               if (TNY_IS_FOLDER(priv->cur_folder_store))
-                       tny_folder_sync_async (TNY_FOLDER(priv->cur_folder_store),
-                                              FALSE, NULL, NULL, NULL);
-
-               /* FALSE --> don't expunge the messages */
-
                g_object_unref (priv->cur_folder_store);
                priv->cur_folder_store = NULL;
        }
@@ -1654,10 +2488,57 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
        /* New current references */
        priv->cur_folder_store = folder;
 
-       /* New folder has been selected */
-       g_signal_emit (G_OBJECT(tree_view),
-                      signals[FOLDER_SELECTION_CHANGED_SIGNAL],
-                      0, priv->cur_folder_store, TRUE);
+       /* New folder has been selected. Do not notify if there is
+          nothing new selected */
+       if (selected) {
+               g_signal_emit (G_OBJECT(tree_view),
+                              signals[FOLDER_SELECTION_CHANGED_SIGNAL],
+                              0, priv->cur_folder_store, TRUE);
+       }
+}
+
+static void
+on_row_activated (GtkTreeView *treeview,
+                 GtkTreePath *treepath,
+                 GtkTreeViewColumn *column,
+                 gpointer user_data)
+{
+       GtkTreeModel *model = NULL;
+       TnyFolderStore *folder = NULL;
+       GtkTreeIter iter;
+       ModestFolderView *self = NULL;
+       ModestFolderViewPrivate *priv = NULL;
+
+       g_return_if_fail (treeview);
+       g_return_if_fail (user_data);
+
+       self = MODEST_FOLDER_VIEW (user_data);
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE(user_data);
+
+       model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+
+       if (!gtk_tree_model_get_iter (model, &iter, treepath))
+               return;
+
+       gtk_tree_model_get (model, &iter,
+                           INSTANCE_COLUMN, &folder,
+                           -1);
+
+       g_signal_emit (G_OBJECT(self),
+                      signals[FOLDER_ACTIVATED_SIGNAL],
+                      0, folder);
+
+#ifdef MODEST_TOOLKIT_HILDON2
+       HildonUIMode ui_mode;
+       g_object_get (G_OBJECT (self), "hildon-ui-mode", &ui_mode, NULL);
+       if (ui_mode == HILDON_UI_MODE_NORMAL) {
+               if (priv->cur_folder_store)
+                       g_object_unref (priv->cur_folder_store);
+               priv->cur_folder_store = g_object_ref (folder);
+       }
+#endif
+
+       g_object_unref (folder);
 }
 
 TnyFolderStore *
@@ -1665,8 +2546,8 @@ modest_folder_view_get_selected (ModestFolderView *self)
 {
        ModestFolderViewPrivate *priv;
 
-       g_return_val_if_fail (self, NULL);
-       
+       g_return_val_if_fail (self && MODEST_IS_FOLDER_VIEW(self), NULL);
+
        priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
        if (priv->cur_folder_store)
                g_object_ref (priv->cur_folder_store);
@@ -1679,8 +2560,8 @@ get_cmp_rows_type_pos (GObject *folder)
 {
        /* Remote accounts -> Local account -> MMC account .*/
        /* 0, 1, 2 */
-       
-       if (TNY_IS_ACCOUNT (folder) && 
+
+       if (TNY_IS_ACCOUNT (folder) &&
                modest_tny_account_is_virtual_local_folders (
                        TNY_ACCOUNT (folder))) {
                return 1;
@@ -1698,779 +2579,265 @@ get_cmp_rows_type_pos (GObject *folder)
        }
 }
 
-static gint
-get_cmp_subfolder_type_pos (TnyFolderType t)
+static gboolean
+inbox_is_special (TnyFolderStore *folder_store)
 {
-       /* Inbox, Outbox, Drafts, Sent, User */
-       /* 0, 1, 2, 3, 4 */
-
-       switch (t) {
+       gboolean is_special = TRUE;
+
+       if (TNY_IS_FOLDER (folder_store)) {
+               const gchar *id;
+               gchar *downcase;
+               gchar *last_bar;
+               gchar *last_inbox_bar;
+
+               id = tny_folder_get_id (TNY_FOLDER (folder_store));
+               downcase = g_utf8_strdown (id, -1);
+               last_bar = g_strrstr (downcase, "/");
+               if (last_bar) {
+                       last_inbox_bar = g_strrstr  (downcase, "inbox/");
+                       if ((last_inbox_bar == NULL) || (last_inbox_bar + 5 != last_bar))
+                               is_special = FALSE;
+               } else {
+                       is_special = FALSE;
+               }
+               g_free (downcase);
+       }
+       return is_special;
+}
+
+static gint
+get_cmp_pos (TnyFolderType t, TnyFolder *folder_store)
+{
+       TnyAccount *account;
+       gboolean is_special;
+       /* Inbox, Outbox, Drafts, Sent, User */
+       /* 0, 1, 2, 3, 4 */
+
+       if (!TNY_IS_FOLDER (folder_store))
+               return 4;
+       switch (t) {
        case TNY_FOLDER_TYPE_INBOX:
-               return 0;
-               break;
+       {
+               account = tny_folder_get_account (folder_store);
+               is_special = (get_cmp_rows_type_pos (G_OBJECT (account)) == 0);
+
+               /* In inbox case we need to know if the inbox is really the top
+                * inbox of the account, or if it's a submailbox inbox. To do
+                * this we'll apply an heuristic rule: Find last "/" and check
+                * if it's preceeded by another Inbox */
+               is_special = is_special && !inbox_is_special (TNY_FOLDER_STORE (folder_store));
+               g_object_unref (account);
+               return is_special?0:4;
+       }
+       break;
        case TNY_FOLDER_TYPE_OUTBOX:
-               return 1;
+               return (TNY_IS_MERGE_FOLDER (folder_store))?2:4;
                break;
        case TNY_FOLDER_TYPE_DRAFTS:
-               return 2;
-               break;
+       {
+               account = tny_folder_get_account (folder_store);
+               is_special = (get_cmp_rows_type_pos (G_OBJECT (account)) == 1);
+               g_object_unref (account);
+               return is_special?1:4;
+       }
+       break;
        case TNY_FOLDER_TYPE_SENT:
-               return 3;
-               break;
+       {
+               account = tny_folder_get_account (folder_store);
+               is_special = (get_cmp_rows_type_pos (G_OBJECT (account)) == 1);
+               g_object_unref (account);
+               return is_special?3:4;
+       }
+       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)
+compare_account_names (TnyAccount *a1, TnyAccount *a2)
 {
-       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,
-                           TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder1,
-                           -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);
+       const gchar *a1_name, *a2_name;
 
-       /* 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;
+       a1_name = tny_account_get_name (a1);
+       a2_name = tny_account_get_name (a2);
 
-       if (type == TNY_FOLDER_TYPE_ROOT) {
-               /* 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 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) &&
-                           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)));
-                       }
-                       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 = (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);
-
-       return cmp;     
+       return modest_text_utils_utf8_strcmp (a1_name, a2_name, TRUE);
 }
 
-/*****************************************************************************/
-/*                        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)
-{
-       GtkTreeSelection *selection;
-       GtkTreeModel *model;
-       GtkTreeIter iter;
-       GtkTreePath *source_row;
-
-       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget));
-       if (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);
-       }
-}
-
-typedef struct _DndHelper {
-       gboolean delete_source;
-       GtkTreePath *source_row;
-       GdkDragContext *context;
-       guint time;
-} DndHelper;
-
-
-/*
- * This function is the callback of the
- * 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
- * to check that the operation went fine and then finalize the drag
- * and drop action
- */
-static void
-xfer_cb (ModestMailOperation *mail_op, 
-        gpointer user_data)
+static gint
+compare_accounts (TnyFolderStore *s1, TnyFolderStore *s2)
 {
-       gboolean success;
-       DndHelper *helper;
-
-       helper = (DndHelper *) user_data;
+       TnyAccount *a1 = NULL, *a2 = NULL;
+       gint cmp;
 
-       if (modest_mail_operation_get_status (mail_op) == 
-           MODEST_MAIL_OPERATION_STATUS_SUCCESS) {
-               success = TRUE;
-       } else {
-               success = FALSE;
+       if (TNY_IS_ACCOUNT (s1)) {
+               a1 = TNY_ACCOUNT (g_object_ref (s1));
+       } else if (!TNY_IS_MERGE_FOLDER (s1)) {
+               a1 = tny_folder_get_account (TNY_FOLDER (s1));
        }
 
-       /* Notify the drag source. Never call delete, the monitor will
-          do the job if needed */
-       gtk_drag_finish (helper->context, success, FALSE, helper->time);
-
-       /* Free the helper */
-       gtk_tree_path_free (helper->source_row);
-       g_slice_free (DndHelper, helper);
-}
-
-/* get the folder for the row the treepath refers to. */
-/* folder must be unref'd */
-static TnyFolderStore *
-tree_path_to_folder (GtkTreeModel *model, GtkTreePath *path)
-{
-       GtkTreeIter iter;
-       TnyFolderStore *folder = NULL;
-       
-       if (gtk_tree_model_get_iter (model,&iter, path))
-               gtk_tree_model_get (model, &iter,
-                                   TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder,
-                                   -1);
-       return folder;
-}
-
-/*
- * This function is used by drag_data_received_cb to manage drag and
- * drop of a header, i.e, and drag from the header view to the folder
- * view.
- */
-static void
-drag_and_drop_from_header_view (GtkTreeModel *source_model,
-                               GtkTreeModel *dest_model,
-                               GtkTreePath  *dest_row,
-                               GtkSelectionData *selection_data,
-                               DndHelper    *helper)
-{
-       TnyList *headers = NULL;
-       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++;
+       if (TNY_IS_ACCOUNT (s2)) {
+               a2 = TNY_ACCOUNT (g_object_ref (s2));
+       } else  if (!TNY_IS_MERGE_FOLDER (s2)) {
+               a2 = tny_folder_get_account (TNY_FOLDER (s2));
        }
-       g_strfreev (uris);
 
-       /* Get the target folder */
-       gtk_tree_model_get_iter (dest_model, &dest_iter, dest_row);
-       gtk_tree_model_get (dest_model, &dest_iter, 
-                           TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN,
-                           &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;
-       }
-
-       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_queue_add (modest_runtime_get_mail_operation_queue (),
-                                        mail_op);
-
-       modest_mail_operation_xfer_msgs (mail_op,
-                                        headers, 
-                                        folder, 
-                                        helper->delete_source, 
-                                        xfer_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);
-}
-
-/*
- * This function is used by drag_data_received_cb to manage drag and
- * drop of a folder, i.e, and drag from the folder view to the same
- * folder view.
- */
-static void
-drag_and_drop_from_folder_view (GtkTreeModel     *source_model,
-                               GtkTreeModel     *dest_model,
-                               GtkTreePath      *dest_row,
-                               GtkSelectionData *selection_data,
-                               DndHelper        *helper)
-{
-       ModestMailOperation *mail_op = NULL;
-       GtkTreeIter dest_iter, iter;
-       TnyFolderStore *dest_folder = NULL;
-       TnyFolderStore *folder = NULL;
-       gboolean forbidden = FALSE;
-       ModestWindow *win;
-
-       win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(), FALSE); /* don't create */
-       if (!win) {
-               g_warning ("%s: BUG: no main window", __FUNCTION__);
-               return;
-       }
-       
-       if (!forbidden) {
-               /* check the folder rules for the destination */
-               folder = tree_path_to_folder (dest_model, dest_row);
-               if (TNY_IS_FOLDER(folder)) {
-                       ModestTnyFolderRules rules =
-                               modest_tny_folder_get_rules (TNY_FOLDER (folder));
-                       forbidden = rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE;
-               } else if (TNY_IS_FOLDER_STORE(folder)) {
-                       /* enable local root as destination for folders */
-                       if (!MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (folder)
-                                       && TNY_IS_ACCOUNT (folder))
-                               forbidden = TRUE;
-               }
-               g_object_unref (folder);
-       }
-       if (!forbidden) {
-               /* check the folder rules for the source */
-               folder = tree_path_to_folder (source_model, helper->source_row);
-               if (TNY_IS_FOLDER(folder)) {
-                       ModestTnyFolderRules rules =
-                               modest_tny_folder_get_rules (TNY_FOLDER (folder));
-                       forbidden = rules & MODEST_FOLDER_RULES_FOLDER_NON_MOVEABLE;
-               } else
-                       forbidden = TRUE;
-               g_object_unref (folder);
-       }
-
-       
-       /* Check if the drag is possible */
-       if (forbidden || !gtk_tree_path_compare (helper->source_row, dest_row)) {
-               gtk_drag_finish (helper->context, FALSE, FALSE, helper->time);
-               gtk_tree_path_free (helper->source_row);        
-               g_slice_free (DndHelper, helper);
-               return;
-       }
-
-       /* Get data */
-       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, 
-                           &dest_folder, -1);
-       gtk_tree_model_get_iter (source_model, &iter, helper->source_row);
-       gtk_tree_model_get (source_model, &iter,
-                           TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN,
-                           &folder, -1);
-
-       /* Offer the connection dialog if necessary, for the destination parent folder and source folder: */
-       if (modest_platform_connect_and_wait_if_network_folderstore (NULL, dest_folder) && 
-           modest_platform_connect_and_wait_if_network_folderstore (NULL, TNY_FOLDER_STORE (folder))) {
-       
-               /* Do the mail operation */
-               mail_op = modest_mail_operation_new_with_error_handling ((GObject *) win,
-                                                                        modest_ui_actions_move_folder_error_handler,
-                                                                        folder, NULL);
-
-               modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), 
-                                                mail_op);
-
-               modest_mail_operation_xfer_folder (mail_op, 
-                                                  TNY_FOLDER (folder), 
-                                                  dest_folder,
-                                                  helper->delete_source,
-                                                  xfer_cb,
-                                                  helper);
-
-               g_object_unref (G_OBJECT (mail_op));
+       if (!a1 || !a2) {
+               if (!a1 && !a2)
+                       cmp = 0;
+               else if (!a1)
+                       cmp = 1;
+               else
+                       cmp = -1;
+               goto finish;
        }
-       
-       /* Frees */
-       g_object_unref (G_OBJECT (dest_folder));
-       g_object_unref (G_OBJECT (folder));
-}
 
-/*
- * This function receives the data set by the "drag-data-get" signal
- * handler. This information comes within the #GtkSelectionData. This
- * function will manage both the drags of folders of the treeview and
- * drags of headers of the header view widget.
- */
-static void 
-on_drag_data_received (GtkWidget *widget, 
-                      GdkDragContext *context, 
-                      gint x, 
-                      gint y, 
-                      GtkSelectionData *selection_data, 
-                      guint target_type, 
-                      guint time, 
-                      gpointer data)
-{
-       GtkWidget *source_widget;
-       GtkTreeModel *dest_model, *source_model;
-       GtkTreePath *source_row, *dest_row;
-       GtkTreeViewDropPosition pos;
-       gboolean success = FALSE, delete_source = FALSE;
-       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) {
-               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);
-               }
+       if (a1 == a2) {
+               cmp = 0;
+               goto finish;
        }
+       /* First we sort with the type of account */
+       cmp = get_cmp_rows_type_pos (G_OBJECT (a1)) - get_cmp_rows_type_pos (G_OBJECT (a2));
+       if (cmp != 0)
+               goto finish;
 
-       /* Check if the get_data failed */
-       if (selection_data == NULL || selection_data->length < 0)
-               gtk_drag_finish (context, success, FALSE, time);
-
-       /* Select the destination model */
-       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
-          is not selected anymore */
-       gtk_tree_view_get_dest_row_at_pos (GTK_TREE_VIEW (widget), x, y,
-                                          &dest_row, &pos);
-
-       /* Only allow drops IN other rows */
-       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->context = context;
-       helper->time = time;
-
-       /* Drags from the header view */
-       if (source_widget != widget) {
-               source_model = gtk_tree_view_get_model (GTK_TREE_VIEW (source_widget));
-
-               drag_and_drop_from_header_view (source_model,
-                                               dest_model,
-                                               dest_row,
-                                               selection_data,
-                                               helper);
-       } else {
-               /* Get the source model and row */
-               gtk_tree_get_row_drag_data (selection_data,
-                                           &source_model,
-                                           &source_row);
-               helper->source_row = gtk_tree_path_copy (source_row);
-
-               drag_and_drop_from_folder_view (source_model,
-                                               dest_model,
-                                               dest_row,
-                                               selection_data, 
-                                               helper);
+       cmp = compare_account_names (a1, a2);
 
-               gtk_tree_path_free (source_row);
-       }
+finish:
+       if (a1)
+               g_object_unref (a1);
+       if (a2)
+               g_object_unref (a2);
 
-       /* Frees */
-       gtk_tree_path_free (dest_row);
+       return cmp;
 }
 
-/*
- * We define a "drag-drop" signal handler because we do not want to
- * use the default one, because the default one always calls
- * gtk_drag_finish and we prefer to do it in the "drag-data-received"
- * signal handler, because there we have all the information available
- * to know if the dnd was a success or not.
- */
-static gboolean
-drag_drop_cb (GtkWidget      *widget,
-             GdkDragContext *context,
-             gint            x,
-             gint            y,
-             guint           time,
-             gpointer        user_data) 
+static gint
+compare_accounts_first (TnyFolderStore *s1, TnyFolderStore *s2)
 {
-       gpointer target;
-
-       if (!context->targets)
-               return FALSE;
+       gint is_account1, is_account2;
 
-       /* Check if we're dragging a folder row */
-       target = gtk_drag_dest_find_target (widget, context, NULL);
+       is_account1 = TNY_IS_ACCOUNT (s1)?1:0;
+       is_account2 = TNY_IS_ACCOUNT (s2)?1:0;
 
-       /* Request the data from the source. */
-       gtk_drag_get_data(widget, context, target, time);
-
-    return TRUE;
+       return is_account2 - is_account1;
 }
 
-/*
- * This function expands a node of a tree view if it's not expanded
- * yet. Not sure why it needs the threads stuff, but gtk+`example code
- * does that, so that's why they're here.
- */
 static gint
-expand_row_timeout (gpointer data)
+compare_folders (const gchar *name1, const gchar *name2)
 {
-       GtkTreeView *tree_view = data;
-       GtkTreePath *dest_path = NULL;
-       GtkTreeViewDropPosition pos;
-       gboolean result = FALSE;
-       
-       gdk_threads_enter ();
-       
-       gtk_tree_view_get_drag_dest_row (tree_view,
-                                        &dest_path,
-                                        &pos);
-       
-       if (dest_path &&
-           (pos == GTK_TREE_VIEW_DROP_INTO_OR_AFTER ||
-            pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE)) {
-               gtk_tree_view_expand_row (tree_view, dest_path, FALSE);
-               gtk_tree_path_free (dest_path);
-       }
-       else {
-               if (dest_path)
-                       gtk_tree_path_free (dest_path);
-               
-               result = TRUE;
-       }
-       
-       gdk_threads_leave ();
-
-       return result;
-}
-
-/*
- * This function is called whenever the pointer is moved over a widget
- * while dragging some data. It installs a timeout that will expand a
- * node of the treeview if not expanded yet. This function also calls
- * gdk_drag_status in order to set the suggested action that will be
- * used by the "drag-data-received" signal handler to know if we
- * should do a move or just a copy of the data.
- */
-static gboolean
-on_drag_motion (GtkWidget      *widget,
-               GdkDragContext *context,
-               gint            x,
-               gint            y,
-               guint           time,
-               gpointer        user_data)  
-{
-       GtkTreeViewDropPosition pos;
-       GtkTreePath *dest_row;
-       GtkTreeModel *dest_model;
-       ModestFolderViewPrivate *priv;
-       GdkDragAction suggested_action;
-       gboolean valid_location = FALSE;
-       TnyFolderStore *folder;
-
-       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (widget);
+       const gchar *separator1, *separator2;
+       const gchar *next1, *next2;
+       gchar *top1, *top2;
+       gint cmp;
+
+       if (name1 == NULL || name1[0] == '\0')
+               return -1;
+       if (name2 == NULL || name2[0] == '\0')
+               return 1;
 
-       if (priv->timer_expander != 0) {
-               g_source_remove (priv->timer_expander);
-               priv->timer_expander = 0;
+       separator1 = strstr (name1, MODEST_FOLDER_PATH_SEPARATOR);
+       if (separator1) {
+               top1 = g_strndup (name1, separator1 - name1);
+       } else {
+               top1 = g_strdup (name1);
        }
 
-       gtk_tree_view_get_dest_row_at_pos (GTK_TREE_VIEW (widget),
-                                          x, y,
-                                          &dest_row,
-                                          &pos);
-
-       /* Do not allow drops between folders */
-       if (!dest_row ||
-           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);
-               valid_location = FALSE;
-               goto out;
+       separator2 = strstr (name2, MODEST_FOLDER_PATH_SEPARATOR);
+       if (separator2) {
+               top2 = g_strndup (name2, separator2 - name2);
        } else {
-               valid_location = TRUE;
+               top2 = g_strdup (name2);
        }
 
-       /* 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;
-               }
-       }
-       g_object_unref (folder);
-
-       /* 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);
-       }
+       cmp = modest_text_utils_utf8_strcmp (top1, top2, TRUE);
+       g_free (top1);
+       g_free (top2);
 
-       /* Select the desired action. By default we pick MOVE */
-       suggested_action = GDK_ACTION_MOVE;
+       if (cmp != 0)
+               return cmp;
 
-        if (context->actions == GDK_ACTION_COPY)
-            gdk_drag_status(context, GDK_ACTION_COPY, time);
-       else if (context->actions == GDK_ACTION_MOVE)
-            gdk_drag_status(context, GDK_ACTION_MOVE, time);
-       else if (context->actions & suggested_action)
-            gdk_drag_status(context, suggested_action, time);
-       else
-            gdk_drag_status(context, GDK_ACTION_DEFAULT, time);
+       if (separator1 == NULL && separator2 == NULL)
+               return 0;
 
- out:
-       if (dest_row)
-               gtk_tree_path_free (dest_row);
-       g_signal_stop_emission_by_name (widget, "drag-motion");
+       next1 = (separator1 != NULL)?separator1 + strlen (MODEST_FOLDER_PATH_SEPARATOR):NULL;
+       next2 = (separator2 != NULL)?separator2 + strlen (MODEST_FOLDER_PATH_SEPARATOR):NULL;
 
-       return valid_location;
+       return compare_folders (next1, next2);
 }
 
-/*
- * This function sets the treeview as a source and a target for dnd
- * events. It also connects all the requirede signals.
- */
-static void
-setup_drag_and_drop (GtkTreeView *self)
-{
-       /* Set up the folder view as a dnd destination. Set only the
-          highlight flag, otherwise gtk will have a different
-          behaviour */
-       gtk_drag_dest_set (GTK_WIDGET (self),
-                          GTK_DEST_DEFAULT_HIGHLIGHT,
-                          folder_view_drag_types,
-                          G_N_ELEMENTS (folder_view_drag_types),
-                          GDK_ACTION_MOVE | GDK_ACTION_COPY);
-
-       g_signal_connect (G_OBJECT (self),
-                         "drag_data_received",
-                         G_CALLBACK (on_drag_data_received),
-                         NULL);
-
-
-       /* Set up the treeview as a dnd source */
-       gtk_drag_source_set (GTK_WIDGET (self),
-                            GDK_BUTTON1_MASK,
-                            folder_view_drag_types,
-                            G_N_ELEMENTS (folder_view_drag_types),
-                            GDK_ACTION_MOVE | GDK_ACTION_COPY);
-
-       g_signal_connect (G_OBJECT (self),
-                         "drag_motion",
-                         G_CALLBACK (on_drag_motion),
-                         NULL);
-       
-       g_signal_connect (G_OBJECT (self),
-                         "drag_data_get",
-                         G_CALLBACK (on_drag_data_get),
-                         NULL);
-
-       g_signal_connect (G_OBJECT (self),
-                         "drag_drop",
-                         G_CALLBACK (drag_drop_cb),
-                         NULL);
-}
 
 /*
- * This function manages the navigation through the folders using the
- * keyboard or the hardware keys in the device
+ * This function orders the mail accounts according to these rules:
+ * 1st - remote accounts
+ * 2nd - local account
+ * 3rd - MMC account
  */
-static gboolean
-on_key_pressed (GtkWidget *self,
-               GdkEventKey *event,
-               gpointer user_data)
+static gint
+cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
+         gpointer user_data)
 {
-       GtkTreeSelection *selection;
-       GtkTreeIter iter;
-       GtkTreeModel *model;
-       gboolean retval = FALSE;
+       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;
 
-       /* 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;
+       gtk_tree_model_get (tree_model, iter1,
+                           NAME_COLUMN, &name1,
+                           TYPE_COLUMN, &type,
+                           INSTANCE_COLUMN, &folder1,
+                           -1);
+       gtk_tree_model_get (tree_model, iter2,
+                           NAME_COLUMN, &name2,
+                           TYPE_COLUMN, &type2,
+                           INSTANCE_COLUMN, &folder2,
+                           -1);
 
-                       path = gtk_tree_model_get_path (model, &iter);
+       /* 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 (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;
+       /* Sort by type. First the special folders, then the archives */
+       cmp = get_cmp_pos (type, (TnyFolder *) folder1) - get_cmp_pos (type2, (TnyFolder *) folder2);
+       if (cmp != 0)
+               goto finish;
+
+       /* Now we sort using the account of each folder */
+       if (TNY_IS_FOLDER_STORE (folder1) && 
+           TNY_IS_FOLDER_STORE (folder2)) {
+               cmp = compare_accounts (TNY_FOLDER_STORE (folder1), TNY_FOLDER_STORE (folder2));
+               if (cmp != 0)
+                       goto finish;
+
+               /* Each group is preceeded by its account */
+               cmp = compare_accounts_first (TNY_FOLDER_STORE (folder1), TNY_FOLDER_STORE (folder2));
+               if (cmp != 0)
+                       goto finish;
        }
 
-       return retval;
+       /* Pure sort by name */
+       cmp = compare_folders (name1, name2);
+ finish:
+       if (folder1)
+               g_object_unref(G_OBJECT(folder1));
+       if (folder2)
+               g_object_unref(G_OBJECT(folder2));
+
+       g_free (name1);
+       g_free (name2);
+
+       return cmp;
 }
 
+
 /*
  * 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
@@ -2479,11 +2846,11 @@ on_key_pressed (GtkWidget *self,
  * tree view refresh. It's better to cache it and change whenever
  * necessary.
  */
-static void 
-on_configuration_key_changed (ModestConf* conf, 
-                             const gchar *key, 
+static void
+on_configuration_key_changed (ModestConf* conf,
+                             const gchar *key,
                              ModestConfEvent event,
-                             ModestConfNotificationId id, 
+                             ModestConfNotificationId id,
                              ModestFolderView *self)
 {
        ModestFolderViewPrivate *priv;
@@ -2505,8 +2872,8 @@ on_configuration_key_changed (ModestConf* conf,
 #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);
+               tree_column = gtk_tree_view_get_column (GTK_TREE_VIEW (self),
+                                                       NAME_COLUMN);
                gtk_tree_view_column_queue_resize (tree_column);
 #else
                gtk_widget_queue_draw (GTK_WIDGET (self));
@@ -2520,10 +2887,13 @@ modest_folder_view_set_style (ModestFolderView *self,
 {
        ModestFolderViewPrivate *priv;
 
-       g_return_if_fail (self);
-       
+       g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self));
+       g_return_if_fail (style == MODEST_FOLDER_VIEW_STYLE_SHOW_ALL ||
+                         style == MODEST_FOLDER_VIEW_STYLE_SHOW_ONE);
+
        priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
 
+
        priv->style = style;
 }
 
@@ -2534,8 +2904,8 @@ modest_folder_view_set_account_id_of_visible_server_account (ModestFolderView *s
        ModestFolderViewPrivate *priv;
        GtkTreeModel *model;
 
-       g_return_if_fail (self);
-       
+       g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self));
+
        priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
 
        /* This will be used by the filter_row callback,
@@ -2547,99 +2917,39 @@ modest_folder_view_set_account_id_of_visible_server_account (ModestFolderView *s
        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, 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;
-
-       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);
+       /* 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));
        else
-               path = gtk_tree_path_new_first ();
+               modest_folder_view_update_model(self,
+                                               (TnyAccountStore *) modest_runtime_get_account_store());
 
-       /* 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);
+       /* Save settings to gconf */
+       modest_widget_memory_save (modest_runtime_get_conf (), G_OBJECT(self),
+                                  MODEST_CONF_FOLDER_VIEW_KEY);
 
-       /* set focus */
-       gtk_widget_grab_focus (GTK_WIDGET(self));
+       /* Notify observers */
+       g_signal_emit (G_OBJECT(self),
+                      signals[VISIBLE_ACCOUNT_CHANGED_SIGNAL], 0,
+                      account_id);
 }
 
+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;
+}
 
 /* recursive */
 static gboolean
-find_folder_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *folder_iter, 
+find_folder_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *folder_iter,
                  TnyFolder* folder)
 {
        do {
@@ -2647,12 +2957,12 @@ find_folder_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *folder_it
                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);                
+
+               gtk_tree_model_get (model, iter,
+                                   INSTANCE_COLUMN, &a_folder,
+                                   NAME_COLUMN, &name,
+                                   TYPE_COLUMN, &type,
+                                   -1);
                g_free (name);
 
                if (folder == a_folder) {
@@ -2661,9 +2971,9 @@ find_folder_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *folder_it
                        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)) 
+                       if (find_folder_iter (model, &child, folder_iter, folder))
                                return TRUE;
                }
 
@@ -2673,87 +2983,36 @@ find_folder_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *folder_it
 }
 
 
-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);
-/*             g_object_unref (priv->folder_to_select); */
-/*             priv->folder_to_select = NULL; */
-       }
-}
-
-
 void
-modest_folder_view_disable_next_folder_selection (ModestFolderView *self) 
+modest_folder_view_disable_next_folder_selection (ModestFolderView *self)
 {
-       ModestFolderViewPrivate *priv = NULL;
+       ModestFolderViewPrivate *priv;
+
+       g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self));
 
-       g_return_if_fail (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, 
+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 (MODEST_IS_FOLDER_VIEW (self), FALSE);     
-       g_return_val_if_fail (TNY_IS_FOLDER (folder), FALSE);   
-               
+
+       g_return_val_if_fail (self && MODEST_IS_FOLDER_VIEW (self), FALSE);
+       g_return_val_if_fail (folder && TNY_IS_FOLDER (folder), FALSE);
+
        priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
 
        if (after_change) {
-
                sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
                gtk_tree_selection_unselect_all (sel);
 
@@ -2762,16 +3021,20 @@ modest_folder_view_select_folder (ModestFolderView *self, TnyFolder *folder,
                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;
 
@@ -2789,14 +3052,16 @@ modest_folder_view_select_folder (ModestFolderView *self, TnyFolder *folder,
 }
 
 
-void 
-modest_folder_view_copy_selection (ModestFolderView *folder_view)
+void
+modest_folder_view_copy_selection (ModestFolderView *self)
 {
+       g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self));
+
        /* Copy selection */
-       _clipboard_set_selected_data (folder_view, FALSE);
+       _clipboard_set_selected_data (self, FALSE);
 }
 
-void 
+void
 modest_folder_view_cut_selection (ModestFolderView *folder_view)
 {
        ModestFolderViewPrivate *priv = NULL;
@@ -2804,7 +3069,7 @@ modest_folder_view_cut_selection (ModestFolderView *folder_view)
        const gchar **hidding = NULL;
        guint i, n_selected;
 
-       g_return_if_fail (MODEST_IS_FOLDER_VIEW (folder_view));
+       g_return_if_fail (folder_view && MODEST_IS_FOLDER_VIEW (folder_view));
        priv = MODEST_FOLDER_VIEW_GET_PRIVATE (folder_view);
 
        /* Copy selection */
@@ -2812,16 +3077,16 @@ modest_folder_view_cut_selection (ModestFolderView *folder_view)
                return;
 
        /* Get hidding ids */
-       hidding = modest_email_clipboard_get_hidding_ids (priv->clipboard, &n_selected); 
-       
+       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]);            
+       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));
@@ -2835,24 +3100,44 @@ modest_folder_view_copy_model (ModestFolderView *folder_view_src,
        GtkTreeModel *filter_model = NULL;
        GtkTreeModel *model = NULL;
        GtkTreeModel *new_filter_model = NULL;
-       
-       g_return_if_fail (MODEST_IS_FOLDER_VIEW (folder_view_src));
-       g_return_if_fail (MODEST_IS_FOLDER_VIEW (folder_view_dst));
+       GtkTreeModel *old_tny_model = NULL;
+       GtkTreeModel *new_tny_model = NULL;
+       ModestFolderViewPrivate *dst_priv;
+
+       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));
+
+       dst_priv = MODEST_FOLDER_VIEW_GET_PRIVATE (folder_view_dst);
+       if (!get_inner_models (folder_view_src, NULL, NULL, &new_tny_model))
+               new_tny_model = NULL;
 
        /* Get src model*/
+       if (get_inner_models (folder_view_dst, NULL, NULL, &old_tny_model)) {
+               modest_signal_mgr_disconnect (dst_priv->signal_handlers,
+                                             G_OBJECT (old_tny_model),
+                                             "activity-changed");
+       }
        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);     
+       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);
+       if (new_tny_model) {
+               dst_priv->signal_handlers = modest_signal_mgr_connect (dst_priv->signal_handlers,
+                                                                      G_OBJECT (new_tny_model),
+                                                                      "activity-changed",
+                                                                      G_CALLBACK (on_activity_changed),
+                                                                      folder_view_dst);
+       }
 
        /* Free */
        g_object_unref (new_filter_model);
@@ -2863,7 +3148,11 @@ modest_folder_view_show_non_move_folders (ModestFolderView *folder_view,
                                          gboolean show)
 {
        GtkTreeModel *model = NULL;
-       ModestFolderViewPrivate* priv = MODEST_FOLDER_VIEW_GET_PRIVATE(folder_view);
+       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())); */
@@ -2875,6 +3164,22 @@ modest_folder_view_show_non_move_folders (ModestFolderView *folder_view,
        }
 }
 
+void
+modest_folder_view_show_message_count (ModestFolderView *folder_view,
+                                         gboolean show)
+{
+       ModestFolderViewPrivate* priv;
+
+       g_return_if_fail (folder_view && MODEST_IS_FOLDER_VIEW (folder_view));
+
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE(folder_view);
+       priv->show_message_count = show;
+
+       g_object_set (G_OBJECT (priv->messages_renderer),
+                     "visible", (priv->cell_style == MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT && priv->show_message_count),
+                     NULL);
+}
+
 /* Returns FALSE if it did not selected anything */
 static gboolean
 _clipboard_set_selected_data (ModestFolderView *folder_view,
@@ -2886,7 +3191,7 @@ _clipboard_set_selected_data (ModestFolderView *folder_view,
 
        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);
@@ -2904,24 +3209,24 @@ _clipboard_set_selected_data (ModestFolderView *folder_view,
 }
 
 static void
-_clear_hidding_filter (ModestFolderView *folder_view) 
+_clear_hidding_filter (ModestFolderView *folder_view)
 {
        ModestFolderViewPrivate *priv;
        guint i;
-       
-       g_return_if_fail (MODEST_IS_FOLDER_VIEW (folder_view)); 
+
+       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++) 
+               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, 
+static void
+on_display_name_changed (ModestAccountMgr *mgr,
                         const gchar *account,
                         gpointer user_data)
 {
@@ -2932,11 +3237,282 @@ on_display_name_changed (ModestAccountMgr *mgr,
        /* 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);
+
+       tree_column = gtk_tree_view_get_column (GTK_TREE_VIEW (self),
+                                               NAME_COLUMN);
        gtk_tree_view_column_queue_resize (tree_column);
 #else
        gtk_widget_queue_draw (GTK_WIDGET (self));
 #endif
 }
+
+void 
+modest_folder_view_set_cell_style (ModestFolderView *self,
+                                  ModestFolderViewCellStyle cell_style)
+{
+       ModestFolderViewPrivate *priv = NULL;
+
+       g_return_if_fail (MODEST_IS_FOLDER_VIEW (self));
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
+
+       priv->cell_style = cell_style;
+
+       g_object_set (G_OBJECT (priv->messages_renderer),
+                     "visible", (cell_style == MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT && priv->show_message_count),
+                     NULL);
+       
+       gtk_widget_queue_draw (GTK_WIDGET (self));
+}
+
+static void
+update_style (ModestFolderView *self)
+{
+       ModestFolderViewPrivate *priv;
+       GdkColor style_color, style_active_color;
+       PangoAttrList *attr_list;
+       GtkStyle *style;
+       PangoAttribute *attr;
+
+       g_return_if_fail (MODEST_IS_FOLDER_VIEW (self));
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
+
+       /* Set color */
+
+       attr_list = pango_attr_list_new ();
+
+       if (!gtk_style_lookup_color (gtk_widget_get_style (GTK_WIDGET (self)), "SecondaryTextColor", &style_color)) {
+               gdk_color_parse (MODEST_SECONDARY_COLOR, &style_color);
+       }
+       attr = pango_attr_foreground_new (style_color.red, style_color.green, style_color.blue);
+       pango_attr_list_insert (attr_list, attr);
+       
+       /* set font */
+       style = gtk_rc_get_style_by_paths (gtk_widget_get_settings
+                                          (GTK_WIDGET(self)),
+                                          "SmallSystemFont", NULL,
+                                          G_TYPE_NONE);
+       if (style) {
+               attr = pango_attr_font_desc_new (pango_font_description_copy
+                                                (style->font_desc));
+               pango_attr_list_insert (attr_list, attr);
+
+               g_object_set (G_OBJECT (priv->messages_renderer),
+                             "foreground-gdk", &style_color,
+                             "foreground-set", TRUE,
+                             "attributes", attr_list,
+                             NULL);
+               pango_attr_list_unref (attr_list);
+       }
+
+       if (gtk_style_lookup_color (gtk_widget_get_style (GTK_WIDGET (self)), "ActiveTextColor", &style_active_color)) {
+               priv->active_color = style_active_color;
+       } else {
+               gdk_color_parse ("000", &(priv->active_color));
+       }
+}
+
+static void 
+on_notify_style (GObject *obj, GParamSpec *spec, gpointer userdata)
+{
+       if (strcmp ("style", spec->name) == 0) {
+               update_style (MODEST_FOLDER_VIEW (obj));
+               gtk_widget_queue_draw (GTK_WIDGET (obj));
+       } 
+}
+
+void 
+modest_folder_view_set_filter (ModestFolderView *self,
+                              ModestFolderViewFilter filter)
+{
+       ModestFolderViewPrivate *priv;
+       GtkTreeModel *filter_model;
+
+       g_return_if_fail (MODEST_IS_FOLDER_VIEW (self));
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
+
+       priv->filter |= filter;
+
+       filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+       if (GTK_IS_TREE_MODEL_FILTER(filter_model)) {
+               gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model));  
+       }
+}
+
+void 
+modest_folder_view_unset_filter (ModestFolderView *self,
+                                ModestFolderViewFilter filter)
+{
+       ModestFolderViewPrivate *priv;
+       GtkTreeModel *filter_model;
+
+       g_return_if_fail (MODEST_IS_FOLDER_VIEW (self));
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
+
+       priv->filter &= ~filter;
+
+       filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+       if (GTK_IS_TREE_MODEL_FILTER(filter_model)) {
+               gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model));  
+       }
+}
+
+gboolean
+modest_folder_view_any_folder_fulfils_rules (ModestFolderView *self,
+                                            ModestTnyFolderRules rules)
+{
+       GtkTreeModel *filter_model;
+       GtkTreeIter iter;
+       gboolean fulfil = FALSE;
+
+       if (!get_inner_models (self, &filter_model, NULL, NULL))
+               return FALSE;
+
+       if (!gtk_tree_model_get_iter_first (filter_model, &iter))
+               return FALSE;
+
+       do {
+               TnyFolderStore *folder;
+
+               gtk_tree_model_get (filter_model, &iter, INSTANCE_COLUMN, &folder, -1);
+               if (folder) {
+                       if (TNY_IS_FOLDER (folder)) {
+                               ModestTnyFolderRules folder_rules = modest_tny_folder_get_rules (TNY_FOLDER (folder));
+                               /* Folder rules are negative: non_writable, non_deletable... */
+                               if (!(folder_rules & rules))
+                                       fulfil = TRUE;
+                       }
+                       g_object_unref (folder);
+               }
+
+       } while (gtk_tree_model_iter_next (filter_model, &iter) && !fulfil);
+
+       return fulfil;
+}
+
+void 
+modest_folder_view_set_list_to_move (ModestFolderView *self,
+                                    TnyList *list)
+{
+       ModestFolderViewPrivate *priv;
+
+       g_return_if_fail (MODEST_IS_FOLDER_VIEW (self));
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
+
+       if (priv->list_to_move)
+               g_object_unref (priv->list_to_move);
+
+       if (list)
+               g_object_ref (list);
+
+       priv->list_to_move = list;
+}
+
+void
+modest_folder_view_set_mailbox (ModestFolderView *self, const gchar *mailbox)
+{
+       ModestFolderViewPrivate *priv;
+
+       g_return_if_fail (MODEST_IS_FOLDER_VIEW (self));
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
+
+       if (priv->mailbox)
+               g_free (priv->mailbox);
+
+       priv->mailbox = g_strdup (mailbox);
+
+       /* Notify observers */
+       g_signal_emit (G_OBJECT(self),
+                      signals[VISIBLE_ACCOUNT_CHANGED_SIGNAL], 0,
+                      priv->visible_account_id);
+}
+
+const gchar *
+modest_folder_view_get_mailbox (ModestFolderView *self)
+{
+       ModestFolderViewPrivate *priv;
+
+       g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (self), NULL);
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
+
+       return (const gchar *) priv->mailbox;
+}
+
+gboolean 
+modest_folder_view_get_activity (ModestFolderView *self)
+{
+       ModestFolderViewPrivate *priv;
+       GtkTreeModel *inner_model;
+
+       g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (self), FALSE);
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
+
+       if (!get_inner_models (self, NULL, NULL, &inner_model))
+               return FALSE;
+
+       if (TNY_IS_GTK_FOLDER_LIST_STORE (inner_model)) {
+               return tny_gtk_folder_list_store_get_activity (TNY_GTK_FOLDER_LIST_STORE (inner_model));
+       } else {
+               return FALSE;
+       }
+}
+
+static void
+on_activity_changed (TnyGtkFolderListStore *store,
+                    gboolean activity,
+                    ModestFolderView *folder_view)
+{
+       ModestFolderViewPrivate *priv;
+
+       g_return_if_fail (MODEST_IS_FOLDER_VIEW (folder_view));
+       g_return_if_fail (TNY_IS_GTK_FOLDER_LIST_STORE (store));
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (folder_view);
+
+       g_signal_emit (G_OBJECT (folder_view), signals[ACTIVITY_CHANGED_SIGNAL], 0,
+                      activity);
+}
+
+TnyList *
+modest_folder_view_get_model_tny_list (ModestFolderView *self)
+{
+       GtkTreeModel *model;
+       TnyList *ret_value;
+
+       ret_value = NULL;
+       model = NULL;
+
+       if (get_inner_models (MODEST_FOLDER_VIEW (self), NULL, NULL, (GtkTreeModel **) &model)) {
+               ret_value = TNY_LIST (model);
+               g_object_ref (ret_value);
+       }
+
+       return ret_value;
+
+}
+
+#ifdef MODEST_TOOLKIT_HILDON2
+static gboolean
+on_live_search_refilter (HildonLiveSearch *livesearch,
+                        ModestFolderView *self)
+{
+       GtkTreeModel *filter_model;
+
+       if (get_inner_models (self, &filter_model, NULL, NULL))
+               gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model));
+
+       return TRUE;
+}
+
+GtkWidget *
+modest_folder_view_setup_live_search (ModestFolderView *self)
+{
+       ModestFolderViewPrivate *priv;
+
+       g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (self), NULL);
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
+       priv->live_search = hildon_live_search_new ();
+
+       g_signal_connect (G_OBJECT (priv->live_search), "refilter", G_CALLBACK (on_live_search_refilter), self);
+
+       return priv->live_search;
+}
+#endif