Use folder view activity feedback in folder window
[modest] / src / widgets / modest-folder-view.c
index 3e214dd..d23911c 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"
@@ -56,7 +60,9 @@
 #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>
 
 /* Folder view drag types */
 const GtkTargetEntry folder_view_drag_types[] =
@@ -65,34 +71,61 @@ 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 */
+#ifdef MODEST_TOOLKIT_HILDON2
+#define FOLDER_ICON_SIZE MODEST_ICON_SIZE_BIG
+#else
+#define FOLDER_ICON_SIZE MODEST_ICON_SIZE_SMALL
+#endif
+
+/* Column names depending on we use list store or tree store */
+#ifdef MODEST_TOOLKIT_HILDON2
+#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
+#else
+#define NAME_COLUMN TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN
+#define UNREAD_COLUMN TNY_GTK_FOLDER_STORE_TREE_MODEL_UNREAD_COLUMN
+#define ALL_COLUMN TNY_GTK_FOLDER_STORE_TREE_MODEL_ALL_COLUMN
+#define TYPE_COLUMN TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN
+#define INSTANCE_COLUMN TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN
+#endif
+
 /* '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         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, 
+static void         on_selection_changed   (GtkTreeSelection *sel,
                                            gpointer data);
 
-static void         on_account_removed     (TnyAccountStore *self, 
+static void         on_row_activated       (GtkTreeView *treeview,
+                                           GtkTreePath *path,
+                                           GtkTreeViewColumn *column,
+                                           gpointer userdata);
+
+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);
 
@@ -104,27 +137,27 @@ 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, 
+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, 
+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,
@@ -140,23 +173,43 @@ 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, 
+#ifndef MODEST_TOOLKIT_HILDON2
+static void         on_row_inserted_maybe_select_folder (GtkTreeModel     *tree_model,
+                                                        GtkTreePath      *path,
                                                         GtkTreeIter      *iter,
                                                         ModestFolderView *self);
+#endif
 
-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);
+#ifdef MODEST_TOOLKIT_HILDON2
+static void
+on_activity_changed (TnyGtkFolderListStore *store,
+                    gboolean activity,
+                    ModestFolderView *folder_view);
+#endif
 
 enum {
        FOLDER_SELECTION_CHANGED_SIGNAL,
        FOLDER_DISPLAY_NAME_CHANGED_SIGNAL,
+       FOLDER_ACTIVATED_SIGNAL,
+       VISIBLE_ACCOUNT_CHANGED_SIGNAL,
+       ACTIVITY_CHANGED_SIGNAL,
        LAST_SIGNAL
 };
 
@@ -173,24 +226,36 @@ 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;
 
        TnyFolderStoreQuery  *query;
        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;
+
+       guint    activity_changed_handler;
+       gboolean activity;
 };
 #define MODEST_FOLDER_VIEW_GET_PRIVATE(o)                      \
        (G_TYPE_INSTANCE_GET_PRIVATE((o),                       \
@@ -199,7 +264,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)
@@ -225,13 +290,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;
@@ -250,8 +315,8 @@ modest_folder_view_class_init (ModestFolderViewClass *klass)
 
        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,
@@ -268,7 +333,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,
@@ -278,8 +343,84 @@ modest_folder_view_class_init (ModestFolderViewClass *klass)
                              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: */
@@ -300,23 +441,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);
@@ -328,14 +469,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;
@@ -347,12 +488,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));
@@ -365,6 +506,120 @@ on_get_mmc_account_name (TnyStoreAccount* account, gpointer user_data)
 }
 
 static void
+convert_parent_folders_to_dots (gchar **item_name)
+{
+       gint n_parents = 0;
+       gchar *c;
+       gchar *last_separator;
+
+       if (item_name == NULL)
+               return;
+
+       for (c = *item_name; *c != '\0'; c++) {
+               if (g_str_has_prefix (c, MODEST_FOLDER_PATH_SEPARATOR)) {
+                       n_parents++;
+               }
+       }
+
+       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; 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;
+
+       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;
+
+                       new_item_name = g_strdup (*item_name + strlen (prefix));
+                       if (!g_ascii_strcasecmp (new_item_name, "Inbox")) {
+                               g_free (new_item_name);
+                               new_item_name = g_strdup (_("mcen_me_folder_inbox"));
+                       }
+                       g_free (*item_name);
+                       *item_name = new_item_name;
+               }
+       } else if (!g_ascii_strcasecmp (*item_name, "Inbox")) {
+
+               g_free (*item_name);
+               *item_name = g_strdup (_("mcen_me_folder_inbox"));
+       }
+
+       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 (bold) buffer = g_string_append (buffer, "<span weight='bold'>");
+                       buffer = g_string_append (buffer, folder_name);
+                       if (bold) buffer = g_string_append (buffer, "</span>");
+               }
+               g_free (*item_name);
+               g_object_unref (account);
+
+               *item_name = g_string_free (buffer, FALSE);
+               *use_markup = bold;
+       } else {
+               *use_markup = FALSE;
+       }
+}
+
+static void
 text_cell_data  (GtkTreeViewColumn *column,
                 GtkCellRenderer *renderer,
                 GtkTreeModel *tree_model,
@@ -376,24 +631,26 @@ 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 || !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;
-               
+               gboolean drafts;
+
                if (modest_tny_folder_is_local_folder (TNY_FOLDER (instance)) ||
                    modest_tny_folder_is_memory_card_folder (TNY_FOLDER (instance))) {
                        type = modest_tny_folder_get_local_or_mmc_folder_type (TNY_FOLDER (instance));
@@ -401,42 +658,60 @@ text_cell_data  (GtkTreeViewColumn *column,
                                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 */
+               /* 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... */
+                   (type == TNY_FOLDER_TYPE_MERGE)) { /* _OUTBOX actually returns _MERGE... */
                        number = tny_folder_get_all_count (TNY_FOLDER(instance));
-               else
+                       drafts = TRUE;
+               } else {
                        number = tny_folder_get_unread_count (TNY_FOLDER(instance));
-                                                               
-               /* Use bold font style if there are unread or unset messages */
-               if (number > 0) {
-                       if (type == TNY_FOLDER_TYPE_INBOX)
-                               item_name = g_strdup_printf ("%s (%d)", _("mcen_me_folder_inbox"), number);
-                       else
-                               item_name = g_strdup_printf ("%s (%d)", fname, number);
-                       item_weight = 800;
+                       drafts = FALSE;
+               }
+
+               if (priv->cell_style == MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT) {
+                       item_name = g_strdup (fname);
+                       if (number > 0) {
+                               item_weight = 800;
+                       } else {
+                               item_weight = 400;
+                       }
                } else {
-                       if (type == TNY_FOLDER_TYPE_INBOX)
-                               item_name = g_strdup (_("mcen_me_folder_inbox"));
-                       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;
+                               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)));
@@ -446,14 +721,27 @@ text_cell_data  (GtkTreeViewColumn *column,
                        item_weight = 800;
                }
        }
-       
+
        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);
+       }
+
        if (item_name && item_weight) {
                /* Set the name in the treeview cell: */
-               g_object_set (rendobj,"text", item_name, "weight", item_weight, NULL);
-               
+               if (use_markup)
+                       g_object_set (rendobj, "markup", item_name, NULL);
+               else
+                       g_object_set (rendobj, "text", item_name, "weight", item_weight, NULL);
+
                /* Notify display name observers */
                /* TODO: What listens for this signal, and how can it use only the new name? */
                if (((GObject *) priv->cur_folder_store) == instance) {
@@ -462,33 +750,113 @@ 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);
        }
- end:                  
+ 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;
+
+       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);
+
+
+       if (type != TNY_FOLDER_TYPE_ROOT) {
+               gint number = 0;
+               gboolean drafts;
+
+               if (modest_tny_folder_is_local_folder (TNY_FOLDER (instance)) ||
+                   modest_tny_folder_is_memory_card_folder (TNY_FOLDER (instance))) {
+                       type = modest_tny_folder_get_local_or_mmc_folder_type (TNY_FOLDER (instance));
+               } 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... */
+                       number = tny_folder_get_all_count (TNY_FOLDER(instance));
+                       drafts = TRUE;
+               } else {
+                       number = tny_folder_get_unread_count (TNY_FOLDER(instance));
+                       drafts = FALSE;
+               }
+
+               if (priv->cell_style == MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT) {
+                       if (number > 0) {
+                               item_name = g_strdup_printf (drafts?_("mcen_ti_messages"):_("mcen_ti_new_messages"), 
+                                                            number);
+                       } 
+               } 
+
+       } 
+
+       if (!item_name)
+               item_name = g_strdup ("");
+
+       if (item_name) {
+               /* Set the name in the treeview cell: */
+               g_object_set (rendobj,"text", item_name, NULL);
+
+               g_free (item_name);
+
+       }
+
+ end:
+       if (instance)
+               g_object_unref (G_OBJECT (instance));
+}
+
 
 typedef struct {
        GdkPixbuf *pixbuf;
@@ -497,472 +865,296 @@ typedef struct {
 } ThreePixbufs;
 
 
-static ThreePixbufs*
-get_folder_icons (TnyFolderType type, GObject *instance)
+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 = gdk_pixbuf_copy (modest_platform_get_icon (icon_code, FOLDER_ICON_SIZE));
+
+       if (!*pixbuf_open)
+               *pixbuf_open = get_composite_pixbuf ("qgn_list_gene_fldr_exp",
+                                                    FOLDER_ICON_SIZE,
+                                                    *pixbuf);
+
+       if (!*pixbuf_close)
+               *pixbuf_close = get_composite_pixbuf ("qgn_list_gene_fldr_clp",
+                                                     FOLDER_ICON_SIZE,
+                                                     *pixbuf);
+
+       retval = g_slice_new0 (ThreePixbufs);
+       if (*pixbuf)
+               retval->pixbuf = g_object_ref (*pixbuf);
+       if (*pixbuf_open)
+               retval->pixbuf_open = g_object_ref (*pixbuf_open);
+       if (*pixbuf_close)
+               retval->pixbuf_close = g_object_ref (*pixbuf_close);
+
+       return retval;
+}
+
+static inline ThreePixbufs *
+get_account_protocol_pixbufs (ModestFolderView *folder_view,
+                             ModestProtocolType protocol_type,
+                             GObject *object)
 {
-       GdkPixbuf *pixbuf = NULL;
-       GdkPixbuf *pixbuf_open = NULL;
-       GdkPixbuf *pixbuf_close = NULL;
-       ThreePixbufs *retval = g_slice_new (ThreePixbufs);
+       ModestProtocol *protocol;
+       const GdkPixbuf *pixbuf = NULL;
+       ModestFolderViewPrivate *priv;
+
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (folder_view);
+
+       protocol = modest_protocol_registry_get_protocol_by_type (modest_runtime_get_protocol_registry (),
+                                                                 protocol_type);
+
+       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;
+       }
+}
+
+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, 
+               *normal_pixbuf = NULL, *anorm_pixbuf = NULL, *mmc_pixbuf = NULL,
                *ammc_pixbuf = NULL, *avirt_pixbuf = NULL;
 
        static GdkPixbuf *inbox_pixbuf_open = NULL, *outbox_pixbuf_open = NULL,
                *junk_pixbuf_open = NULL, *sent_pixbuf_open = NULL,
                *trash_pixbuf_open = NULL, *draft_pixbuf_open = NULL,
-               *normal_pixbuf_open = NULL, *anorm_pixbuf_open = NULL, 
+               *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, 
+               *normal_pixbuf_close = NULL, *anorm_pixbuf_close = NULL, *mmc_pixbuf_close = NULL,
                *ammc_pixbuf_close = NULL, *avirt_pixbuf_close = NULL;
 
+       ThreePixbufs *retval = NULL;
+
+       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;
 
-       /* 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 || 
+               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));             
+               type = modest_tny_folder_guess_folder_type (TNY_FOLDER (instance));
+       }
+
+       /* 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))) {
+#ifdef MODEST_TOOLKIT_HILDON2
+               return get_composite_icons (MODEST_FOLDER_ICON_ACCOUNT,
+                                           &anorm_pixbuf,
+                                           &anorm_pixbuf_open,
+                                           &anorm_pixbuf_close);
+#else
+               return get_composite_icons (MODEST_FOLDER_ICON_NORMAL,
+                                           &normal_pixbuf,
+                                           &normal_pixbuf_open,
+                                           &normal_pixbuf_close);
+#endif
        }
 
        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,
-                                                                                             MODEST_ICON_SIZE_SMALL));
-                           
-                           if (!avirt_pixbuf_open) {
-                                   GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp",
-                                                                                 MODEST_ICON_SIZE_SMALL);
-                                   avirt_pixbuf_open = gdk_pixbuf_copy (avirt_pixbuf);
-                                   gdk_pixbuf_composite (emblem, avirt_pixbuf_open, 0, 0, 
-                                                         MIN (gdk_pixbuf_get_width (emblem), 
-                                                              gdk_pixbuf_get_width (avirt_pixbuf_open)),
-                                                         MIN (gdk_pixbuf_get_height (emblem), 
-                                                              gdk_pixbuf_get_height (avirt_pixbuf_open)),
-                                                         0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
-                                   g_object_unref (emblem);
-                           }
-
-                           if (!avirt_pixbuf_close) {
-                                   GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp",
-                                                                                 MODEST_ICON_SIZE_SMALL);
-                               avirt_pixbuf_close = gdk_pixbuf_copy (avirt_pixbuf);
-                               gdk_pixbuf_composite (emblem, avirt_pixbuf_close, 0, 0, 
-                                                     MIN (gdk_pixbuf_get_width (emblem), 
-                                                          gdk_pixbuf_get_width (avirt_pixbuf_close)),
-                                                     MIN (gdk_pixbuf_get_height (emblem), 
-                                                          gdk_pixbuf_get_height (avirt_pixbuf_close)),
-                                                     0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
-                               g_object_unref (emblem);
-                           }
-
-
-                           pixbuf = g_object_ref (avirt_pixbuf);
-                           pixbuf_open = g_object_ref (avirt_pixbuf_open);
-                           pixbuf_close = g_object_ref (avirt_pixbuf_close);
 
-                       }
-                       else {
+                       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)) {                                 
-                                   if (!ammc_pixbuf)
-                                           ammc_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_MMC,
-                                                                                                    MODEST_ICON_SIZE_SMALL));
-                                   
-                                   if (!ammc_pixbuf_open) {
-                                           GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp",
-                                                                                         MODEST_ICON_SIZE_SMALL);
-                                       ammc_pixbuf_open = gdk_pixbuf_copy (ammc_pixbuf);
-                                       gdk_pixbuf_composite (emblem, ammc_pixbuf_open, 0, 0, 
-                                                             MIN (gdk_pixbuf_get_width (emblem), 
-                                                                  gdk_pixbuf_get_width (ammc_pixbuf_open)),
-                                                             MIN (gdk_pixbuf_get_height (emblem), 
-                                                                  gdk_pixbuf_get_height (ammc_pixbuf_open)),
-                                                             0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
-                                       g_object_unref (emblem);
-                                   }
-
-                                   if (!ammc_pixbuf_close) {
-                                           GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp",
-                                                                                         MODEST_ICON_SIZE_SMALL);
-                                       ammc_pixbuf_close = gdk_pixbuf_copy (ammc_pixbuf);
-                                       gdk_pixbuf_composite (emblem, ammc_pixbuf_close, 0, 0, 
-                                                             MIN (gdk_pixbuf_get_width (emblem), 
-                                                                  gdk_pixbuf_get_width (ammc_pixbuf_close)),
-                                                             MIN (gdk_pixbuf_get_height (emblem), 
-                                                                  gdk_pixbuf_get_height (ammc_pixbuf_close)),
-                                                             0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
-                                       g_object_unref (emblem);
-                                   }
-
-
-                                   pixbuf = g_object_ref (ammc_pixbuf);
-                                   pixbuf_open = g_object_ref (ammc_pixbuf_open);
-                                   pixbuf_close = g_object_ref (ammc_pixbuf_close);
 
+                               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 {
-
-                                   if (!anorm_pixbuf)
-                                           anorm_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_ACCOUNT,
-                                                                                                     MODEST_ICON_SIZE_SMALL));
-                                   if (!anorm_pixbuf_open) {
-                                           GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp",
-                                                                                         MODEST_ICON_SIZE_SMALL);
-                                       anorm_pixbuf_open = gdk_pixbuf_copy (anorm_pixbuf);
-                                       gdk_pixbuf_composite (emblem, anorm_pixbuf_open, 0, 0, 
-                                                             MIN (gdk_pixbuf_get_width (emblem), 
-                                                                  gdk_pixbuf_get_width (anorm_pixbuf_open)),
-                                                             MIN (gdk_pixbuf_get_height (emblem), 
-                                                                  gdk_pixbuf_get_height (anorm_pixbuf_open)),
-                                                             0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
-                                       g_object_unref (emblem);
-                                   }
-
-                                   if (!anorm_pixbuf_close) {
-                                           GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp",
-                                                                                         MODEST_ICON_SIZE_SMALL);
-                                       anorm_pixbuf_close = gdk_pixbuf_copy (anorm_pixbuf);
-                                       gdk_pixbuf_composite (emblem, anorm_pixbuf_close, 0, 0, 
-                                                             MIN (gdk_pixbuf_get_width (emblem), 
-                                                                  gdk_pixbuf_get_width (anorm_pixbuf_close)),
-                                                             MIN (gdk_pixbuf_get_height (emblem), 
-                                                                  gdk_pixbuf_get_height (anorm_pixbuf_close)),
-                                                             0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
-                                       g_object_unref (emblem);
-                                   }
-
-
-                                   pixbuf = g_object_ref (anorm_pixbuf);
-                                   pixbuf_open = g_object_ref (anorm_pixbuf_open);
-                                   pixbuf_close = g_object_ref (anorm_pixbuf_close);                             
-
+                                       retval = get_composite_icons (MODEST_FOLDER_ICON_ACCOUNT,
+                                                                     &anorm_pixbuf,
+                                                                     &anorm_pixbuf_open,
+                                                                     &anorm_pixbuf_close);
                                }
                        }
                }
                break;
        case TNY_FOLDER_TYPE_INBOX:
-
-           if (!inbox_pixbuf)
-                   inbox_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_INBOX,
-                                                                             MODEST_ICON_SIZE_SMALL));
-
-           if (!inbox_pixbuf_open) {
-                   GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp",
-                                                                 MODEST_ICON_SIZE_SMALL);
-                   inbox_pixbuf_open = gdk_pixbuf_copy (inbox_pixbuf);
-                   gdk_pixbuf_composite (emblem, inbox_pixbuf_open, 0, 0, 
-                                         MIN (gdk_pixbuf_get_width (emblem), 
-                                              gdk_pixbuf_get_width (inbox_pixbuf_open)),
-                                         MIN (gdk_pixbuf_get_height (emblem), 
-                                              gdk_pixbuf_get_height (inbox_pixbuf_open)),
-                                         0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
-                   g_object_unref (emblem);
-           }
-           
-           if (!inbox_pixbuf_close) {
-                   GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp",
-                                                                 MODEST_ICON_SIZE_SMALL);
-                   inbox_pixbuf_close = gdk_pixbuf_copy (inbox_pixbuf);
-                   gdk_pixbuf_composite (emblem, inbox_pixbuf_close, 0, 0, 
-                                         MIN (gdk_pixbuf_get_width (emblem), 
-                                              gdk_pixbuf_get_width (inbox_pixbuf_close)),
-                                         MIN (gdk_pixbuf_get_height (emblem), 
-                                              gdk_pixbuf_get_height (inbox_pixbuf_close)),
-                                         0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
-                   g_object_unref (emblem);
-           }
-           
-
-           pixbuf = g_object_ref (inbox_pixbuf);
-           pixbuf_open = g_object_ref (inbox_pixbuf_open);
-           pixbuf_close = g_object_ref (inbox_pixbuf_close);
-           
-           break;
+               retval = get_composite_icons (MODEST_FOLDER_ICON_INBOX,
+                                             &inbox_pixbuf,
+                                             &inbox_pixbuf_open,
+                                             &inbox_pixbuf_close);
+               break;
        case TNY_FOLDER_TYPE_OUTBOX:
-               if (!outbox_pixbuf)
-                       outbox_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_OUTBOX,
-                                                                                  MODEST_ICON_SIZE_SMALL));
-
-               if (!outbox_pixbuf_open) {
-                       GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp",
-                                                                     MODEST_ICON_SIZE_SMALL);
-                       outbox_pixbuf_open = gdk_pixbuf_copy (outbox_pixbuf);
-                       gdk_pixbuf_composite (emblem, outbox_pixbuf_open, 0, 0, 
-                                             MIN (gdk_pixbuf_get_width (emblem), 
-                                                  gdk_pixbuf_get_width (outbox_pixbuf_open)),
-                                             MIN (gdk_pixbuf_get_height (emblem), 
-                                                  gdk_pixbuf_get_height (outbox_pixbuf_open)),
-                                             0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
-                       g_object_unref (emblem);
-           }
-
-           if (!outbox_pixbuf_close) {
-                   GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp",
-                                                                 MODEST_ICON_SIZE_SMALL);
-               outbox_pixbuf_close = gdk_pixbuf_copy (outbox_pixbuf);
-               gdk_pixbuf_composite (emblem, outbox_pixbuf_close, 0, 0, 
-                                     MIN (gdk_pixbuf_get_width (emblem), 
-                                          gdk_pixbuf_get_width (outbox_pixbuf_close)),
-                                     MIN (gdk_pixbuf_get_height (emblem), 
-                                          gdk_pixbuf_get_height (outbox_pixbuf_close)),
-                                     0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
-               g_object_unref (emblem);
-           }
-
-
-           pixbuf = g_object_ref (outbox_pixbuf);
-           pixbuf_open = g_object_ref (outbox_pixbuf_open);
-           pixbuf_close = g_object_ref (outbox_pixbuf_close);
-
-           break;
+               retval = get_composite_icons (MODEST_FOLDER_ICON_OUTBOX,
+                                             &outbox_pixbuf,
+                                             &outbox_pixbuf_open,
+                                             &outbox_pixbuf_close);
+               break;
        case TNY_FOLDER_TYPE_JUNK:
-           if (!junk_pixbuf)
-                   junk_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_JUNK,
-                                                                            MODEST_ICON_SIZE_SMALL));
-           if (!junk_pixbuf_open) {
-                   GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp",
-                                                                 MODEST_ICON_SIZE_SMALL);
-                   junk_pixbuf_open = gdk_pixbuf_copy (junk_pixbuf);
-                   gdk_pixbuf_composite (emblem, junk_pixbuf_open, 0, 0, 
-                                         MIN (gdk_pixbuf_get_width (emblem), 
-                                              gdk_pixbuf_get_width (junk_pixbuf_open)),
-                                         MIN (gdk_pixbuf_get_height (emblem), 
-                                              gdk_pixbuf_get_height (junk_pixbuf_open)),
-                                         0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
-                   g_object_unref (emblem);
-           }
-           
-           if (!junk_pixbuf_close) {
-                   GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp",
-                                                                 MODEST_ICON_SIZE_SMALL);
-                   junk_pixbuf_close = gdk_pixbuf_copy (junk_pixbuf);
-                   gdk_pixbuf_composite (emblem, junk_pixbuf_close, 0, 0, 
-                                         MIN (gdk_pixbuf_get_width (emblem), 
-                                              gdk_pixbuf_get_width (junk_pixbuf_close)),
-                                         MIN (gdk_pixbuf_get_height (emblem), 
-                                              gdk_pixbuf_get_height (junk_pixbuf_close)),
-                                         0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
-                   g_object_unref (emblem);
-           }
-           
-           
-           pixbuf = g_object_ref (junk_pixbuf);
-           pixbuf_open = g_object_ref (junk_pixbuf_open);
-           pixbuf_close = g_object_ref (junk_pixbuf_close);
-           
-           break;
-
+               retval = get_composite_icons (MODEST_FOLDER_ICON_JUNK,
+                                             &junk_pixbuf,
+                                             &junk_pixbuf_open,
+                                             &junk_pixbuf_close);
+               break;
        case TNY_FOLDER_TYPE_SENT:
-               if (!sent_pixbuf)
-                       sent_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_SENT,
-                                                                                MODEST_ICON_SIZE_SMALL));
-               
-               if (!sent_pixbuf_open) {
-                       GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp",
-                                                                     MODEST_ICON_SIZE_SMALL);
-                       sent_pixbuf_open = gdk_pixbuf_copy (sent_pixbuf);
-                       gdk_pixbuf_composite (emblem, sent_pixbuf_open, 0, 0, 
-                                             MIN (gdk_pixbuf_get_width (emblem), 
-                                                  gdk_pixbuf_get_width (sent_pixbuf_open)),
-                                             MIN (gdk_pixbuf_get_height (emblem), 
-                                                  gdk_pixbuf_get_height (sent_pixbuf_open)),
-                                             0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
-                       g_object_unref (emblem);
-               }
-               
-               if (!sent_pixbuf_close) {
-                       GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp",
-                                                                     MODEST_ICON_SIZE_SMALL);
-                       sent_pixbuf_close = gdk_pixbuf_copy (sent_pixbuf);
-                       gdk_pixbuf_composite (emblem, sent_pixbuf_close, 0, 0, 
-                                             MIN (gdk_pixbuf_get_width (emblem), 
-                                                  gdk_pixbuf_get_width (sent_pixbuf_close)),
-                                             MIN (gdk_pixbuf_get_height (emblem), 
-                                                  gdk_pixbuf_get_height (sent_pixbuf_close)),
-                                             0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
-                       g_object_unref (emblem);
-               }
-               
-
-           pixbuf = g_object_ref (sent_pixbuf);
-           pixbuf_open = g_object_ref (sent_pixbuf_open);
-           pixbuf_close = g_object_ref (sent_pixbuf_close);
-           
-           break;
-
+               retval = get_composite_icons (MODEST_FOLDER_ICON_SENT,
+                                             &sent_pixbuf,
+                                             &sent_pixbuf_open,
+                                             &sent_pixbuf_close);
+               break;
        case TNY_FOLDER_TYPE_TRASH:
-           if (!trash_pixbuf)
-                   trash_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_TRASH,
-                                                                             MODEST_ICON_SIZE_SMALL));
-           if (!trash_pixbuf_open) {
-                   GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp",
-                                                                 MODEST_ICON_SIZE_SMALL);
-                   trash_pixbuf_open = gdk_pixbuf_copy (trash_pixbuf);
-                   gdk_pixbuf_composite (emblem, trash_pixbuf_open, 0, 0, 
-                                         MIN (gdk_pixbuf_get_width (emblem), 
-                                              gdk_pixbuf_get_width (trash_pixbuf_open)),
-                                         MIN (gdk_pixbuf_get_height (emblem), 
-                                              gdk_pixbuf_get_height (trash_pixbuf_open)),
-                                         0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
-                   g_object_unref (emblem);
-           }
-           
-           if (!trash_pixbuf_close) {
-                   GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp",
-                                                                 MODEST_ICON_SIZE_SMALL);
-                   trash_pixbuf_close = gdk_pixbuf_copy (trash_pixbuf);
-                   gdk_pixbuf_composite (emblem, trash_pixbuf_close, 0, 0, 
-                                         MIN (gdk_pixbuf_get_width (emblem), 
-                                              gdk_pixbuf_get_width (trash_pixbuf_close)),
-                                         MIN (gdk_pixbuf_get_height (emblem), 
-                                              gdk_pixbuf_get_height (trash_pixbuf_close)),
-                                         0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
-                   g_object_unref (emblem);
-           }
-           
-           
-           pixbuf = g_object_ref (trash_pixbuf);
-           pixbuf_open = g_object_ref (trash_pixbuf_open);
-           pixbuf_close = g_object_ref (trash_pixbuf_close);
-
-           break;
+               retval = get_composite_icons (MODEST_FOLDER_ICON_TRASH,
+                                             &trash_pixbuf,
+                                             &trash_pixbuf_open,
+                                             &trash_pixbuf_close);
+               break;
        case TNY_FOLDER_TYPE_DRAFTS:
-          if (!draft_pixbuf)
-                  draft_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_DRAFTS,
-                                                                            MODEST_ICON_SIZE_SMALL));
-          
-           if (!draft_pixbuf_open) {
-                   GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp",
-                                                                 MODEST_ICON_SIZE_SMALL);
-               draft_pixbuf_open = gdk_pixbuf_copy (draft_pixbuf);
-               gdk_pixbuf_composite (emblem, draft_pixbuf_open, 0, 0, 
-                                     MIN (gdk_pixbuf_get_width (emblem), 
-                                          gdk_pixbuf_get_width (draft_pixbuf_open)),
-                                     MIN (gdk_pixbuf_get_height (emblem), 
-                                          gdk_pixbuf_get_height (draft_pixbuf_open)),
-                                     0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
-               g_object_unref (emblem);
-           }
-
-           if (!draft_pixbuf_close) {
-                   GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp",
-                                                                 MODEST_ICON_SIZE_SMALL);
-               draft_pixbuf_close = gdk_pixbuf_copy (draft_pixbuf);
-               gdk_pixbuf_composite (emblem, draft_pixbuf_close, 0, 0, 
-                                     MIN (gdk_pixbuf_get_width (emblem), 
-                                          gdk_pixbuf_get_width (draft_pixbuf_close)),
-                                     MIN (gdk_pixbuf_get_height (emblem), 
-                                          gdk_pixbuf_get_height (draft_pixbuf_close)),
-                                     0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
-               g_object_unref (emblem);
-           }
-
-
-           pixbuf = g_object_ref (draft_pixbuf);
-           pixbuf_open = g_object_ref (draft_pixbuf_open);
-           pixbuf_close = g_object_ref (draft_pixbuf_close);
-
-           break;      
+               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:
-               if (!normal_pixbuf)
-                       normal_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_NORMAL,
-                                                                                  MODEST_ICON_SIZE_SMALL));
-               
-               if (!normal_pixbuf_open) {
-                       GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp",
-                                                                     MODEST_ICON_SIZE_SMALL);
-                       normal_pixbuf_open = gdk_pixbuf_copy (normal_pixbuf);
-                       gdk_pixbuf_composite (emblem, normal_pixbuf_open, 0, 0, 
-                                             MIN (gdk_pixbuf_get_width (emblem), 
-                                                  gdk_pixbuf_get_width (normal_pixbuf_open)),
-                                             MIN (gdk_pixbuf_get_height (emblem), 
-                                                  gdk_pixbuf_get_height (normal_pixbuf_open)),
-                                             0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
-                       g_object_unref (emblem);
-               }
-               
-               if (!normal_pixbuf_close) {
-                       GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp",
-                                                                     MODEST_ICON_SIZE_SMALL);
-                       normal_pixbuf_close = gdk_pixbuf_copy (normal_pixbuf);
-                       gdk_pixbuf_composite (emblem, normal_pixbuf_close, 0, 0, 
-                                             MIN (gdk_pixbuf_get_width (emblem), 
-                                                  gdk_pixbuf_get_width (normal_pixbuf_close)),
-                                             MIN (gdk_pixbuf_get_height (emblem), 
-                                                  gdk_pixbuf_get_height (normal_pixbuf_close)),
-                                             0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
-                       g_object_unref (emblem);
+               /* 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);
                }
-               
-               
-           pixbuf = g_object_ref (normal_pixbuf);
-           pixbuf_open = g_object_ref (normal_pixbuf_open);
-           pixbuf_close = g_object_ref (normal_pixbuf_close);
-
-           break;      
-
+               break;
        }
 
-       retval->pixbuf = pixbuf;
-       retval->pixbuf_open = pixbuf_open;
-       retval->pixbuf_close = pixbuf_close;
-
        return retval;
 }
 
-
 static void
 free_pixbufs (ThreePixbufs *pixbufs)
 {
-       g_object_unref (pixbufs->pixbuf);
-       g_object_unref (pixbufs->pixbuf_open);
-       g_object_unref (pixbufs->pixbuf_close);
+       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,  
+icon_cell_data  (GtkTreeViewColumn *column,
                 GtkCellRenderer *renderer,
-                GtkTreeModel *tree_model,  
-                GtkTreeIter *iter, 
+                GtkTreeModel *tree_model,
+                GtkTreeIter *iter,
                 gpointer data)
 {
        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 */
@@ -974,8 +1166,6 @@ icon_cell_data  (GtkTreeViewColumn *column,
        }
 
        free_pixbufs (pixbufs);
-
-       return;
 }
 
 static void
@@ -984,23 +1174,57 @@ 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();
+#ifdef MODEST_TOOLKIT_HILDON2
+       g_object_set (renderer,
+                     "xpad", MODEST_MARGIN_DEFAULT,
+                     "ypad", MODEST_MARGIN_DEFAULT,
+                     NULL);
+#endif
        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, 
+#ifdef MODEST_TOOLKIT_HILDON2
+                     "ellipsize", PANGO_ELLIPSIZE_MIDDLE,
+                     "ypad", MODEST_MARGIN_DEFAULT,
+                     "xpad", MODEST_MARGIN_DEFAULT,
+#else
+                     "ellipsize", PANGO_ELLIPSIZE_END,
+#endif
+                     "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, 
+#ifdef MODEST_TOOLKIT_HILDON2
+                     "yalign", 0.0,
+                     "ypad", MODEST_MARGIN_DEFAULT,
+                     "xpad", MODEST_MARGIN_DOUBLE,
+#else
+                     "scale", PANGO_SCALE_X_SMALL,
+                     "scale-set", TRUE,
+#endif
+                     "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);
@@ -1008,7 +1232,7 @@ 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);
 
@@ -1021,18 +1245,21 @@ modest_folder_view_init (ModestFolderView *obj)
 {
        ModestFolderViewPrivate *priv;
        ModestConf *conf;
-       
+
        priv =  MODEST_FOLDER_VIEW_GET_PRIVATE(obj);
-       
+
        priv->timer_expander = 0;
        priv->account_store  = NULL;
        priv->query          = NULL;
        priv->style          = MODEST_FOLDER_VIEW_STYLE_SHOW_ALL;
        priv->cur_folder_store   = NULL;
        priv->visible_account_id = NULL;
+       priv->mailbox = NULL;
        priv->folder_to_select = NULL;
-
+       priv->outbox_deleted_handler = 0;
        priv->reexpand = TRUE;
+       priv->activity = FALSE;
+       priv->activity_changed_handler = 0;
 
        /* Initialize the local account name */
        conf = modest_runtime_get_conf();
@@ -1042,8 +1269,11 @@ 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));
@@ -1052,11 +1282,11 @@ modest_folder_view_init (ModestFolderView *obj)
        setup_drag_and_drop (GTK_TREE_VIEW(obj));
 
        /* Connect signals */
-       g_signal_connect (G_OBJECT (obj), 
-                         "key-press-event", 
+       g_signal_connect (G_OBJECT (obj),
+                         "key-press-event",
                          G_CALLBACK (on_key_pressed), NULL);
 
-       priv->display_name_changed_signal = 
+       priv->display_name_changed_signal =
                g_signal_connect (modest_runtime_get_account_mgr (),
                                  "display_name_changed",
                                  G_CALLBACK (on_display_name_changed),
@@ -1066,10 +1296,15 @@ modest_folder_view_init (ModestFolderView *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), 
+       priv->conf_key_signal = g_signal_connect (G_OBJECT(conf),
                                                  "key_changed",
-                                                 G_CALLBACK(on_configuration_key_changed), 
+                                                 G_CALLBACK(on_configuration_key_changed),
                                                  obj);
+
+       update_style (obj);
+       g_signal_connect (G_OBJECT (obj), "notify::style", G_CALLBACK (on_notify_style), (gpointer) obj);
+
+
 }
 
 static void
@@ -1085,9 +1320,10 @@ 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) {
@@ -1095,6 +1331,16 @@ modest_folder_view_finalize (GObject *obj)
                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 (priv->account_store) {
                g_signal_handler_disconnect (G_OBJECT(priv->account_store),
                                             priv->account_inserted_signal);
@@ -1106,24 +1352,31 @@ modest_folder_view_finalize (GObject *obj)
                priv->account_store = NULL;
        }
 
+       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;
+       }
+
        if (priv->query) {
                g_object_unref (G_OBJECT (priv->query));
                priv->query = NULL;
        }
 
-/*     modest_folder_view_disable_next_folder_selection (MODEST_FOLDER_VIEW(obj)); */
        if (priv->folder_to_select) {
                g_object_unref (G_OBJECT(priv->folder_to_select));
                priv->folder_to_select = NULL;
        }
-   
+
        sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(obj));
        if (sel)
                g_signal_handler_disconnect (G_OBJECT(sel), priv->changed_signal);
 
        g_free (priv->local_account_name);
        g_free (priv->visible_account_id);
-       
+       g_free (priv->mailbox);
+
        if (priv->conf_key_signal) {
                g_signal_handler_disconnect (modest_runtime_get_conf (),
                                             priv->conf_key_signal);
@@ -1131,20 +1384,15 @@ modest_folder_view_finalize (GObject *obj)
        }
 
        if (priv->cur_folder_store) {
-               if (TNY_IS_FOLDER(priv->cur_folder_store)) {
-                       ModestMailOperation *mail_op;
-
-                       mail_op = modest_mail_operation_new (NULL);
-                       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
-                                                        mail_op);
-                       modest_mail_operation_sync_folder (mail_op, TNY_FOLDER (priv->cur_folder_store), FALSE);
-                       g_object_unref (mail_op);
-               }
-
                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;
+       }
+
        /* Clear hidding array created by cut operation */
        _clear_hidding_filter (MODEST_FOLDER_VIEW (obj));
 
@@ -1170,20 +1418,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);
 
@@ -1196,17 +1444,41 @@ 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;
+       modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (self));
+
        g_object_unref (G_OBJECT (device));
 }
 
 static void
-on_account_inserted (TnyAccountStore *account_store, 
+on_outbox_deleted_cb (ModestTnyLocalFoldersAccount *local_account,
+                     gpointer user_data)
+{
+       ModestFolderView *self;
+       GtkTreeModel *model, *filter_model;
+       TnyFolder *outbox;
+
+       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,
                     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 */
@@ -1220,70 +1492,65 @@ on_account_inserted (TnyAccountStore *account_store,
           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);
 
-       if (!GTK_IS_TREE_VIEW(user_data)) {
-               g_warning ("BUG: %s: not a valid tree view", __FUNCTION__);
-               return;
-       }
-       
-       /* Get the inner model */
-       /* check, is some rare cases, we did not get the right thing here,
-        * NB#84097 */
-       filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (user_data));
-       if (!GTK_IS_TREE_MODEL_FILTER(filter_model)) {
-               g_warning ("BUG: %s: not a valid filter model", __FUNCTION__);
-               return;
-       }
 
-       /* check, is some rare cases, we did not get the right thing here,
-        * NB#84097 */
-       sort_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model));
-       if (!GTK_IS_TREE_MODEL_SORT(sort_model)) {
-               g_warning ("BUG: %s: not a valid sort model", __FUNCTION__);
+       /* 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)) {
+
+               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 void
-on_account_changed (TnyAccountStore *account_store, 
-                   TnyAccount *tny_account,
-                   gpointer user_data)
+static gboolean
+same_account_selected (ModestFolderView *self,
+                      TnyAccount *account)
 {
        ModestFolderViewPrivate *priv;
-       GtkTreeModel *sort_model, *filter_model;
+       gboolean same_account = FALSE;
 
-       /* Ignore transport account insertions, we're not showing them
-          in the folder view */
-       if (TNY_IS_TRANSPORT_ACCOUNT (tny_account))
-               return;
-
-       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (user_data);
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
 
-       /* 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));
+       if (priv->cur_folder_store) {
+               TnyAccount *selected_folder_account = NULL;
 
-       /* 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));
+               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));
+               }
 
-       /* 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));
+               if (selected_folder_account == account)
+                       same_account = TRUE;
 
-       /* Refilter the model */
-       gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model));
+               g_object_unref (selected_folder_account);
+       }
+       return same_account;
 }
 
 /**
@@ -1302,45 +1569,85 @@ on_idle_select_first_inbox_or_local (gpointer user_data)
        return FALSE;
 }
 
+static void
+on_account_changed (TnyAccountStore *account_store,
+                   TnyAccount *tny_account,
+                   gpointer user_data)
+{
+       ModestFolderView *self;
+       ModestFolderViewPrivate *priv;
+       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));
+
+       /* 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 (model), G_OBJECT (tny_account));
+
+       /* Insert the account in the model */
+       tny_list_append (TNY_LIST (model), G_OBJECT (tny_account));
+
+       /* Refilter the model */
+       gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model));
+
+       /* Select the first INBOX if the currently selected folder
+          belongs to the account that is being deleted */
+       if (same_account && !MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (tny_account))
+               g_idle_add (on_idle_select_first_inbox_or_local, self);
+}
 
 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_selected = FALSE;
+       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);
-                       same_account_selected = TRUE;
-               }
-               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
@@ -1357,11 +1664,21 @@ on_account_removed (TnyAccountStore *account_store,
                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 */
@@ -1370,6 +1687,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),
@@ -1381,7 +1699,7 @@ on_account_removed (TnyAccountStore *account_store,
 
        /* Select the first INBOX if the currently selected folder
           belongs to the account that is being deleted */
-       if (same_account_selected)
+       if (same_account)
                g_idle_add (on_idle_select_first_inbox_or_local, self);
 }
 
@@ -1389,7 +1707,7 @@ void
 modest_folder_view_set_title (ModestFolderView *self, const gchar *title)
 {
        GtkTreeViewColumn *col;
-       
+
        g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self));
 
        col = gtk_tree_view_get_column (GTK_TREE_VIEW(self), 0);
@@ -1404,7 +1722,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)
 {
@@ -1431,7 +1749,7 @@ modest_folder_view_on_map (ModestFolderView *self,
        }
 
        if (priv->reexpand) {
-               expand_root_items (self); 
+               expand_root_items (self);
                priv->reexpand = FALSE;
        }
 
@@ -1444,17 +1762,23 @@ modest_folder_view_new (TnyFolderStoreQuery *query)
        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);
-       
+
        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);
 
        return GTK_WIDGET(self);
@@ -1476,88 +1800,260 @@ 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);
 }
 
-/*
- * 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
+is_parent_of (TnyFolder *a, TnyFolder *b)
 {
-       ModestFolderViewPrivate *priv;
-       gboolean retval = TRUE;
-       TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
-       GObject *instance = NULL;
-       const gchar *id = NULL;
-       guint i;
-       gboolean found = FALSE;
-       gboolean cleared = FALSE;
+       const gchar *a_id;
+       gboolean retval = FALSE;
 
-       g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (data), FALSE);
-       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (data);
+       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,
-                           TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
-                           TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &instance,
+                           INSTANCE_COLUMN, &instance,
                            -1);
 
-       /* Do not show if there is no instance, this could indeed
-          happen when the model is being modified while it's being
-          drawn. This could occur for example when moving folders
-          using drag&drop */
-       if (!instance)
-               return FALSE;
-
-       if (type == TNY_FOLDER_TYPE_ROOT) {
-               /* TNY_FOLDER_TYPE_ROOT means that the instance is an
-                  account instead of a folder. */
-               if (TNY_IS_ACCOUNT (instance)) {
-                       TnyAccount *acc = TNY_ACCOUNT (instance);
-                       const gchar *account_id = tny_account_get_id (acc);
-       
-                       /* If it isn't a special folder, 
-                        * don't show it unless it is the visible account: */
-                       if (priv->style == MODEST_FOLDER_VIEW_STYLE_SHOW_ONE &&
-                           !modest_tny_account_is_virtual_local_folders (acc) &&
-                           strcmp (account_id, MODEST_MMC_ACCOUNT_ID)) {
-                               
-                               /* Show only the visible account id */
-                               if (priv->visible_account_id) {
-                                       if (strcmp (account_id, priv->visible_account_id))
-                                               retval = FALSE;
-                               } else {
-                                       retval = FALSE;
-                               }                               
-                       }
-                       
-                       /* Never show these to the user. They are merged into one folder 
-                        * in the local-folders account instead: */
-                       if (retval && MODEST_IS_TNY_OUTBOX_ACCOUNT (acc))
-                               retval = FALSE;
+       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);
                }
        }
 
-       /* Check hiding (if necessary) */
-       cleared = modest_email_clipboard_cleared (priv->clipboard);            
-       if ((retval) && (!cleared) && (TNY_IS_FOLDER (instance))) {
-               id = tny_folder_get_id (TNY_FOLDER(instance));
+       if (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)
+{
+       ModestFolderViewPrivate *priv;
+       gboolean retval = TRUE;
+       TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
+       GObject *instance = NULL;
+       const gchar *id = NULL;
+       guint i;
+       gboolean found = FALSE;
+       gboolean cleared = FALSE;
+       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,
+                           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) {
+               g_free (fname);
+               return FALSE;
+       }
+
+       if (TNY_IS_ACCOUNT (instance)) {
+               TnyAccount *acc = TNY_ACCOUNT (instance);
+               const gchar *account_id = tny_account_get_id (acc);
+
+               /* If it isn't a special folder,
+                * don't show it unless it is the visible account: */
+               if (priv->style == MODEST_FOLDER_VIEW_STYLE_SHOW_ONE &&
+                   !modest_tny_account_is_virtual_local_folders (acc) &&
+                   strcmp (account_id, MODEST_MMC_ACCOUNT_ID)) {
+
+                       /* Show only the visible account id */
+                       if (priv->visible_account_id) {
+                               if (strcmp (account_id, priv->visible_account_id))
+                                       retval = FALSE;
+                       } else {
+                               retval = FALSE;
+                       }
+               }
+
+               /* Never show these to the user. They are merged into one folder
+                * in the local-folders account instead: */
+               if (retval && MODEST_IS_TNY_OUTBOX_ACCOUNT (acc))
+                       retval = FALSE;
+       } 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);
+       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:
@@ -1569,18 +2065,149 @@ filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
                                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_MESSAGE_ADD);
                }
        }
-       
+
+       /* apply special filters */
+       if (retval && (priv->filter & MODEST_FOLDER_VIEW_FILTER_HIDE_ACCOUNTS)) {
+               if (TNY_IS_ACCOUNT (instance))
+                       return FALSE;
+       }
+
+       if (retval && (priv->filter & MODEST_FOLDER_VIEW_FILTER_HIDE_FOLDERS)) {
+               if (TNY_IS_FOLDER (instance))
+                       return 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)))
+                               return FALSE;
+               } else if (TNY_IS_FOLDER (instance)) {
+                       if (modest_tny_folder_is_local_folder (TNY_FOLDER (instance)))
+                               return 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)))
+                               return FALSE;
+               } else if (TNY_IS_FOLDER (instance)) {
+                       if (modest_tny_folder_is_memory_card_folder (TNY_FOLDER (instance)))
+                               return 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)) {
+                       return FALSE;
+               } else {
+                       const gchar *folder_name;
+                       folder_name = tny_folder_get_name (TNY_FOLDER (instance));
+                       if (!folder_name || strchr (folder_name, '@') == NULL)
+                               return 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;
+               }
+       }
+
        /* Free */
        g_object_unref (instance);
+        g_free (fname);
 
        return retval;
 }
@@ -1591,15 +2218,15 @@ 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 (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),
                       signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0,
@@ -1611,7 +2238,39 @@ modest_folder_view_update_model (ModestFolderView *self,
 
        /* FIXME: the local accounts are not shown when the query
           selects only the subscribed folders */
+#ifdef MODEST_TOOLKIT_HILDON2
+       model = tny_gtk_folder_list_store_new_with_flags (NULL, 
+                                                         TNY_GTK_FOLDER_LIST_STORE_FLAG_SHOW_PATH);
+       tny_gtk_folder_list_store_set_path_separator (TNY_GTK_FOLDER_LIST_STORE (model),
+                                                     MODEST_FOLDER_PATH_SEPARATOR);
+#else
        model = tny_gtk_folder_store_tree_model_new (NULL);
+#endif
+
+       /* 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);
+       }
 
        /* Get the accounts: */
        tny_account_store_get_accounts (TNY_ACCOUNT_STORE(account_store),
@@ -1620,10 +2279,10 @@ modest_folder_view_update_model (ModestFolderView *self,
 
        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 */
@@ -1633,18 +2292,35 @@ modest_folder_view_update_model (ModestFolderView *self,
                                                self,
                                                NULL);
 
+       if (priv->activity_changed_handler > 0) {
+               GtkTreeModel *old_tny_model;
+
+               if (get_inner_models (self, NULL, NULL, &old_tny_model)) {
+                       g_signal_handler_disconnect (G_OBJECT (old_tny_model), priv->activity_changed_handler);
+               }
+               priv->activity_changed_handler = 0;
+       }
+
        /* Set new model */
        gtk_tree_view_set_model (GTK_TREE_VIEW(self), filter_model);
+#ifndef MODEST_TOOLKIT_HILDON2
        g_signal_connect (G_OBJECT(filter_model), "row-inserted",
                          (GCallback) on_row_inserted_maybe_select_folder, self);
+#endif
+
+#ifdef MODEST_TOOLKIT_HILDON2
+       priv->activity_changed_handler = 
+               g_signal_connect (G_OBJECT (model), "activity-changed", G_CALLBACK (on_activity_changed), self);
+#endif
+       priv->activity = FALSE;
 
        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;
 }
 
@@ -1661,7 +2337,7 @@ 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);
@@ -1670,7 +2346,7 @@ on_selection_changed (GtkTreeSelection *sel, gpointer 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 */
@@ -1679,17 +2355,21 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
                        return;
                }
        }
-       
+
        /* Current folder was unselected */
        if (priv->cur_folder_store) {
-               g_signal_emit (G_OBJECT(tree_view), signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0,
-                      priv->cur_folder_store, FALSE);
-
+               /* 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 */
                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_signal_emit (G_OBJECT(tree_view), signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0,
+                      priv->cur_folder_store, FALSE);
 
                g_object_unref (priv->cur_folder_store);
                priv->cur_folder_store = NULL;
@@ -1707,13 +2387,57 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
        }
 }
 
+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 *
 modest_folder_view_get_selected (ModestFolderView *self)
 {
        ModestFolderViewPrivate *priv;
-       
+
        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);
@@ -1726,8 +2450,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;
@@ -1745,30 +2469,151 @@ get_cmp_rows_type_pos (GObject *folder)
        }
 }
 
+static gboolean
+inbox_is_special (TnyFolderStore *folder_store)
+{
+       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_subfolder_type_pos (TnyFolderType t)
+get_cmp_pos (TnyFolderType t, TnyFolder *folder_store)
 {
+       TnyAccount *account;
+       gboolean is_special;
        /* Inbox, Outbox, Drafts, Sent, User */
-       /* 0, 1, 2, 3, 4 */
+       /* 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;
        }
 }
 
+static gint
+compare_account_names (TnyAccount *a1, TnyAccount *a2)
+{
+       const gchar *a1_name, *a2_name;
+
+       a1_name = tny_account_get_name (a1);
+       a2_name = tny_account_get_name (a2);
+
+       return modest_text_utils_utf8_strcmp (a1_name, a2_name, TRUE);
+}
+
+static gint
+compare_accounts (TnyFolderStore *s1, TnyFolderStore *s2)
+{
+       TnyAccount *a1 = NULL, *a2 = NULL;
+       gint cmp;
+
+       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));
+       }
+
+       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));
+       }
+
+       if (!a1 || !a2) {
+               if (!a1 && !a2)
+                       cmp = 0;
+               else if (!a1)
+                       cmp = 1;
+               else
+                       cmp = -1;
+               goto finish;
+       }
+
+       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;
+
+       cmp = compare_account_names (a1, a2);
+
+finish:
+       if (a1)
+               g_object_unref (a1);
+       if (a2)
+               g_object_unref (a2);
+
+       return cmp;
+}
+
+static gint
+compare_accounts_first (TnyFolderStore *s1, TnyFolderStore *s2)
+{
+       gint is_account1, is_account2;
+
+       is_account1 = TNY_IS_ACCOUNT (s1)?1:0;
+       is_account2 = TNY_IS_ACCOUNT (s2)?1:0;
+
+       return is_account2 - is_account1;
+}
+
 /*
  * This function orders the mail accounts according to these rules:
  * 1st - remote accounts
@@ -1788,14 +2633,14 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
        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,
+                           NAME_COLUMN, &name1,
+                           TYPE_COLUMN, &type,
+                           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,
+                           NAME_COLUMN, &name2,
+                           TYPE_COLUMN, &type2,
+                           INSTANCE_COLUMN, &folder2,
                            -1);
 
        /* Return if we get no folder. This could happen when folder
@@ -1805,90 +2650,27 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
        if (!folder1 || !folder2)
                goto finish;
 
-       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)) {
-                               if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (parent_folder))) {
-                                       cmp1 = get_cmp_subfolder_type_pos (modest_tny_folder_get_local_or_mmc_folder_type
-                                                                          (TNY_FOLDER (folder1)));
-                                       cmp2 = get_cmp_subfolder_type_pos (modest_tny_folder_get_local_or_mmc_folder_type
-                                                                          (TNY_FOLDER (folder2)));
-                               } else if (modest_tny_account_is_memory_card_account (TNY_ACCOUNT (parent_folder))) {
-                                       if (modest_local_folder_info_get_type (tny_folder_get_name (TNY_FOLDER (folder1))) == TNY_FOLDER_TYPE_ARCHIVE) {
-                                               cmp1 = 0;
-                                               cmp2 = 1;
-                                               } else if (modest_local_folder_info_get_type (tny_folder_get_name (TNY_FOLDER (folder2))) == TNY_FOLDER_TYPE_ARCHIVE) {
-                                               cmp1 = 1;
-                                               cmp2 = 0;
-                                       }
-                               }
-                       }
-                       g_object_unref (parent_folder);
-               }
-               
-               /* if they are not local folders */
-               if (cmp1 == cmp2) {
-                       cmp1 = get_cmp_subfolder_type_pos (tny_folder_get_folder_type (TNY_FOLDER (folder1)));
-                       cmp2 = get_cmp_subfolder_type_pos (tny_folder_get_folder_type (TNY_FOLDER (folder2)));
-               }
+       /* 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;
 
-               if (cmp1 == cmp2)
-                       cmp = modest_text_utils_utf8_strcmp (name1, name2, TRUE);
-               else 
-                       cmp = (cmp1 - cmp2);
+       /* 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;
        }
 
-finish:        
+       /* Pure sort by name */
+       cmp = modest_text_utils_utf8_strcmp (name1, name2, TRUE);
+ finish:
        if (folder1)
                g_object_unref(G_OBJECT(folder1));
        if (folder2)
@@ -1897,7 +2679,7 @@ finish:
        g_free (name1);
        g_free (name2);
 
-       return cmp;     
+       return cmp;
 }
 
 /*****************************************************************************/
@@ -1909,14 +2691,14 @@ finish:
  * source for dnd after the event drop happened
  */
 static void
-on_drag_data_get (GtkWidget *widget, GdkDragContext *context, GtkSelectionData *selection_data, 
+on_drag_data_get (GtkWidget *widget, GdkDragContext *context, GtkSelectionData *selection_data,
                  guint info, guint time, gpointer data)
 {
        GtkTreeSelection *selection;
        GtkTreeModel *model;
        GtkTreeIter iter;
        GtkTreePath *source_row;
-       
+
        selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget));
        if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
 
@@ -1924,7 +2706,7 @@ on_drag_data_get (GtkWidget *widget, GdkDragContext *context, GtkSelectionData *
                gtk_tree_set_row_drag_data (selection_data,
                                            model,
                                            source_row);
-               
+
                gtk_tree_path_free (source_row);
        }
 }
@@ -1933,70 +2715,26 @@ typedef struct _DndHelper {
        ModestFolderView *folder_view;
        gboolean delete_source;
        GtkTreePath *source_row;
-       GdkDragContext *context;
-       guint time;
 } DndHelper;
 
 static void
 dnd_helper_destroyer (DndHelper *helper)
 {
        /* Free the helper */
-       g_object_unref (helper->folder_view);
        gtk_tree_path_free (helper->source_row);
        g_slice_free (DndHelper, helper);
 }
 
 static void
-xfer_cb (ModestMailOperation *mail_op, 
-        gpointer user_data)
-{
-       gboolean success;
-       DndHelper *helper;
-
-       helper = (DndHelper *) user_data;
-
-       if (modest_mail_operation_get_status (mail_op) == 
-           MODEST_MAIL_OPERATION_STATUS_SUCCESS) {
-               success = TRUE;
-       } else {
-               success = FALSE;
-       }
-
-       /* 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 */
-       dnd_helper_destroyer (helper);
-}
-
-static void
-xfer_msgs_cb (ModestMailOperation *mail_op, 
-             gpointer user_data)
-{
-       /* Common part */
-       xfer_cb (mail_op, user_data);
-}
-
-static void
-xfer_folder_cb (ModestMailOperation *mail_op, 
+xfer_folder_cb (ModestMailOperation *mail_op,
                TnyFolder *new_folder,
                gpointer user_data)
 {
-       DndHelper *helper;
-       GtkWidget *folder_view;
-
-       helper = (DndHelper *) user_data;
-       folder_view = g_object_ref (helper->folder_view);
-
-       /* Common part */
-       xfer_cb (mail_op, user_data);
-
-       /* Select the folder */
-       if (new_folder)
-               modest_folder_view_select_folder (MODEST_FOLDER_VIEW (folder_view),
+       if (new_folder) {
+               /* Select the folder */
+               modest_folder_view_select_folder (MODEST_FOLDER_VIEW (user_data),
                                                  new_folder, FALSE);
-       g_object_unref (folder_view);
+       }
 }
 
 
@@ -2007,14 +2745,15 @@ 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,
+                                   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
@@ -2024,18 +2763,15 @@ static void
 drag_and_drop_from_header_view (GtkTreeModel *source_model,
                                GtkTreeModel *dest_model,
                                GtkTreePath  *dest_row,
-                               GtkSelectionData *selection_data,
-                               DndHelper    *helper)
+                               GtkSelectionData *selection_data)
 {
        TnyList *headers = NULL;
-       TnyFolder *folder = NULL;
+       TnyFolder *folder = NULL, *src_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 ();
@@ -2046,18 +2782,24 @@ drag_and_drop_from_header_view (GtkTreeModel *source_model,
        while (*tmp != NULL) {
                TnyHeader *header;
                GtkTreePath *path;
+               gboolean first = TRUE;
 
                /* 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, 
+               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));
 
+               if (G_UNLIKELY (first)) {
+                       src_folder = tny_header_get_folder (header);
+                       first = FALSE;
+               }
+
                /* Free and go on */
                gtk_tree_path_free (path);
                g_object_unref (header);
@@ -2065,28 +2807,34 @@ drag_and_drop_from_header_view (GtkTreeModel *source_model,
        }
        g_strfreev (uris);
 
+       /* This could happen ig we perform a d&d very quickly over the
+          same row that row could dissapear because message is
+          transferred */
+       if (!TNY_IS_FOLDER (src_folder))
+               goto cleanup;
+
        /* 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,
+       gtk_tree_model_get (dest_model, &dest_iter,
+                           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) {
@@ -2094,29 +2842,14 @@ drag_and_drop_from_header_view (GtkTreeModel *source_model,
                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);
+       /* Transfer messages */
+       modest_ui_actions_transfer_messages_helper (GTK_WINDOW (main_win), src_folder,
+                                                   headers, folder);
 
-       modest_mail_operation_xfer_msgs (mail_op,
-                                        headers, 
-                                        folder, 
-                                        helper->delete_source, 
-                                        xfer_msgs_cb, helper);
-       
        /* Frees */
 cleanup:
-       if (G_IS_OBJECT(mail_op))
-               g_object_unref (G_OBJECT (mail_op));
+       if (G_IS_OBJECT (src_folder))
+               g_object_unref (src_folder);
        if (G_IS_OBJECT(folder))
                g_object_unref (G_OBJECT (folder));
        if (G_IS_OBJECT(headers))
@@ -2127,7 +2860,7 @@ typedef struct {
        TnyFolderStore *src_folder;
        TnyFolderStore *dst_folder;
        ModestFolderView *folder_view;
-       DndHelper *helper; 
+       DndHelper *helper;
 } DndFolderInfo;
 
 static void
@@ -2137,8 +2870,6 @@ dnd_folder_info_destroyer (DndFolderInfo *info)
                g_object_unref (info->src_folder);
        if (info->dst_folder)
                g_object_unref (info->dst_folder);
-       if (info->folder_view)
-               g_object_unref (info->folder_view);
        g_slice_free (DndFolderInfo, info);
 }
 
@@ -2147,27 +2878,19 @@ dnd_on_connection_failed_destroyer (DndFolderInfo *info,
                                    GtkWindow *parent_window,
                                    TnyAccount *account)
 {
-       time_t dnd_time = info->helper->time;
-       GdkDragContext *context = info->helper->context;
-       
        /* Show error */
        modest_ui_actions_on_account_connection_error (parent_window, account);
 
        /* Free the helper & info */
        dnd_helper_destroyer (info->helper);
        dnd_folder_info_destroyer (info);
-       
-       /* Notify the drag source. Never call delete, the monitor will
-          do the job if needed */
-       gtk_drag_finish (context, FALSE, FALSE, dnd_time);
-       return;
 }
 
 static void
-drag_and_drop_from_folder_view_src_folder_performer (gboolean canceled, 
+drag_and_drop_from_folder_view_src_folder_performer (gboolean canceled,
                                                     GError *err,
-                                                    GtkWindow *parent_window, 
-                                                    TnyAccount *account, 
+                                                    GtkWindow *parent_window,
+                                                    TnyAccount *account,
                                                     gpointer user_data)
 {
        DndFolderInfo *info = NULL;
@@ -2194,20 +2917,20 @@ drag_and_drop_from_folder_view_src_folder_performer (gboolean canceled,
                                           info->dst_folder,
                                           info->helper->delete_source,
                                           xfer_folder_cb,
-                                          info->helper);
-       
-/*     modest_folder_view_select_folder (MODEST_FOLDER_VIEW(info->folder_view), */
-/*                                       TNY_FOLDER (info->dst_folder), TRUE); */
+                                          info->helper->folder_view);
 
+       /* Frees */
        g_object_unref (G_OBJECT (mail_op));
+       dnd_helper_destroyer (info->helper);
+       dnd_folder_info_destroyer (info);
 }
 
 
 static void
-drag_and_drop_from_folder_view_dst_folder_performer (gboolean canceled, 
+drag_and_drop_from_folder_view_dst_folder_performer (gboolean canceled,
                                                     GError *err,
-                                                    GtkWindow *parent_window, 
-                                                    TnyAccount *account, 
+                                                    GtkWindow *parent_window,
+                                                    TnyAccount *account,
                                                     gpointer user_data)
 {
        DndFolderInfo *info = NULL;
@@ -2248,9 +2971,10 @@ drag_and_drop_from_folder_view (GtkTreeModel     *source_model,
        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__);
+               dnd_helper_destroyer (helper);
                return;
        }
-       
+
        if (!forbidden) {
                /* check the folder rules for the destination */
                folder = tree_path_to_folder (dest_model, dest_row);
@@ -2260,7 +2984,7 @@ drag_and_drop_from_folder_view (GtkTreeModel     *source_model,
                        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) && 
+                       if (!MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (folder) &&
                            !modest_tny_account_is_memory_card_account (TNY_ACCOUNT (folder)))
                                forbidden = TRUE;
                }
@@ -2278,30 +3002,39 @@ drag_and_drop_from_folder_view (GtkTreeModel     *source_model,
                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);
+               /* Show error */
+               modest_platform_run_information_dialog ((GtkWindow *) win, 
+                                                       _("mail_in_ui_folder_move_target_error"), 
+                                                       FALSE);
+               /* Restore the previous selection */
+               folder = tree_path_to_folder (source_model, helper->source_row);
+               if (folder) {
+                       if (TNY_IS_FOLDER (folder))
+                               modest_folder_view_select_folder (helper->folder_view, 
+                                                                 TNY_FOLDER (folder), FALSE);
+                       g_object_unref (folder);
+               }
+               dnd_helper_destroyer (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, 
+       gtk_tree_model_get (dest_model, &dest_iter,
+                           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,
+                           INSTANCE_COLUMN,
                            &folder, -1);
 
        /* Create the info for the performer */
-       info = g_slice_new (DndFolderInfo);
+       info = g_slice_new0 (DndFolderInfo);
        info->src_folder = g_object_ref (folder);
        info->dst_folder = g_object_ref (dest_folder);
-       info->folder_view = g_object_ref (helper->folder_view);
        info->helper = helper;
 
        /* Connect to the destination folder and perform the copy/move */
@@ -2309,7 +3042,7 @@ drag_and_drop_from_folder_view (GtkTreeModel     *source_model,
                                                       dest_folder,
                                                       drag_and_drop_from_folder_view_dst_folder_performer,
                                                       info);
-       
+
        /* Frees */
        g_object_unref (dest_folder);
        g_object_unref (folder);
@@ -2321,22 +3054,22 @@ drag_and_drop_from_folder_view (GtkTreeModel     *source_model,
  * 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, 
+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; 
+       gboolean delete_source = FALSE;
+       gboolean success = FALSE;
 
        /* Do not allow further process */
        g_signal_stop_emission_by_name (widget, "drag-data-received");
@@ -2360,10 +3093,10 @@ on_drag_data_received (GtkWidget *widget,
 
        /* Check if the get_data failed */
        if (selection_data == NULL || selection_data->length < 0)
-               gtk_drag_finish (context, success, FALSE, time);
+               goto end;
 
        /* Select the destination model */
-       dest_model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));  
+       dest_model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
 
        /* Get the path to the destination row. Can not call
           gtk_tree_view_get_drag_dest_row() because the source row
@@ -2372,18 +3105,12 @@ on_drag_data_received (GtkWidget *widget,
                                           &dest_row, &pos);
 
        /* Only allow drops IN other rows */
-       if (!dest_row || 
-           pos == GTK_TREE_VIEW_DROP_BEFORE || 
+       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;
-       helper->folder_view = g_object_ref (widget);
+               goto end;
 
+       success = TRUE;
        /* Drags from the header view */
        if (source_widget != widget) {
                source_model = gtk_tree_view_get_model (GTK_TREE_VIEW (source_widget));
@@ -2391,19 +3118,25 @@ on_drag_data_received (GtkWidget *widget,
                drag_and_drop_from_header_view (source_model,
                                                dest_model,
                                                dest_row,
-                                               selection_data,
-                                               helper);
+                                               selection_data);
        } else {
+               DndHelper *helper = NULL;
+
                /* Get the source model and row */
                gtk_tree_get_row_drag_data (selection_data,
                                            &source_model,
                                            &source_row);
+
+               /* Create the helper */
+               helper = g_slice_new0 (DndHelper);
+               helper->delete_source = delete_source;
                helper->source_row = gtk_tree_path_copy (source_row);
+               helper->folder_view = MODEST_FOLDER_VIEW (widget);
 
                drag_and_drop_from_folder_view (source_model,
                                                dest_model,
                                                dest_row,
-                                               selection_data, 
+                                               selection_data,
                                                helper);
 
                gtk_tree_path_free (source_row);
@@ -2411,6 +3144,10 @@ on_drag_data_received (GtkWidget *widget,
 
        /* Frees */
        gtk_tree_path_free (dest_row);
+
+ end:
+       /* Finish the drag and drop */
+       gtk_drag_finish (context, success, FALSE, time);
 }
 
 /*
@@ -2426,7 +3163,7 @@ drag_drop_cb (GtkWidget      *widget,
              gint            x,
              gint            y,
              guint           time,
-             gpointer        user_data) 
+             gpointer        user_data)
 {
        gpointer target;
 
@@ -2454,13 +3191,13 @@ expand_row_timeout (gpointer 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)) {
@@ -2470,10 +3207,10 @@ expand_row_timeout (gpointer data)
        else {
                if (dest_path)
                        gtk_tree_path_free (dest_path);
-               
+
                result = TRUE;
        }
-       
+
        gdk_threads_leave ();
 
        return result;
@@ -2493,7 +3230,7 @@ on_drag_motion (GtkWidget      *widget,
                gint            x,
                gint            y,
                guint           time,
-               gpointer        user_data)  
+               gpointer        user_data)
 {
        GtkTreeViewDropPosition pos;
        GtkTreePath *dest_row;
@@ -2578,6 +3315,9 @@ 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 */
+#ifdef MODEST_TOOLKIT_HILDON2
+       return;
+#endif
        gtk_drag_dest_set (GTK_WIDGET (self),
                           GTK_DEST_DEFAULT_HIGHLIGHT,
                           folder_view_drag_types,
@@ -2601,7 +3341,7 @@ setup_drag_and_drop (GtkTreeView *self)
                          "drag_motion",
                          G_CALLBACK (on_drag_motion),
                          NULL);
-       
+
        g_signal_connect (G_OBJECT (self),
                          "drag_data_get",
                          G_CALLBACK (on_drag_data_get),
@@ -2657,11 +3397,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;
@@ -2683,8 +3423,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));
@@ -2701,10 +3441,10 @@ modest_folder_view_set_style (ModestFolderView *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;
 }
 
@@ -2716,7 +3456,7 @@ modest_folder_view_set_account_id_of_visible_server_account (ModestFolderView *s
        GtkTreeModel *model;
 
        g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self));
-       
+
        priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
 
        /* This will be used by the filter_row callback,
@@ -2736,6 +3476,11 @@ modest_folder_view_set_account_id_of_visible_server_account (ModestFolderView *s
        /* Save settings to gconf */
        modest_widget_memory_save (modest_runtime_get_conf (), G_OBJECT(self),
                                   MODEST_CONF_FOLDER_VIEW_KEY);
+
+       /* Notify observers */
+       g_signal_emit (G_OBJECT(self),
+                      signals[VISIBLE_ACCOUNT_CHANGED_SIGNAL], 0,
+                      account_id);
 }
 
 const gchar *
@@ -2744,7 +3489,7 @@ modest_folder_view_get_account_id_of_visible_server_account (ModestFolderView *s
        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;
@@ -2757,14 +3502,14 @@ find_inbox_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *inbox_iter
                GtkTreeIter child;
                TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
 
-               gtk_tree_model_get (model, iter, 
-                                   TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, 
+               gtk_tree_model_get (model, iter,
+                                   TYPE_COLUMN,
                                    &type, -1);
-                       
+
                gboolean result = FALSE;
                if (type == TNY_FOLDER_TYPE_INBOX) {
                        result = TRUE;
-               }               
+               }
                if (result) {
                        *inbox_iter = *iter;
                        return TRUE;
@@ -2783,16 +3528,17 @@ find_inbox_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *inbox_iter
 
 
 
-void 
+void
 modest_folder_view_select_first_inbox_or_local (ModestFolderView *self)
 {
+#ifndef MODEST_TOOLKIT_HILDON2
        GtkTreeModel *model;
        GtkTreeIter iter, inbox_iter;
        GtkTreeSelection *sel;
        GtkTreePath *path = NULL;
 
        g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self));
-       
+
        model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
        if (!model)
                return;
@@ -2817,12 +3563,13 @@ modest_folder_view_select_first_inbox_or_local (ModestFolderView *self)
 
        /* set focus */
        gtk_widget_grab_focus (GTK_WIDGET(self));
+#endif
 }
 
 
 /* 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 {
@@ -2830,12 +3577,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) {
@@ -2844,9 +3591,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;
                }
 
@@ -2855,10 +3602,10 @@ find_folder_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *folder_it
        return FALSE;
 }
 
-
+#ifndef MODEST_TOOLKIT_HILDON2
 static void
-on_row_inserted_maybe_select_folder (GtkTreeModel *tree_model, 
-                                    GtkTreePath *path, 
+on_row_inserted_maybe_select_folder (GtkTreeModel *tree_model,
+                                    GtkTreePath *path,
                                     GtkTreeIter *iter,
                                     ModestFolderView *self)
 {
@@ -2869,49 +3616,51 @@ on_row_inserted_maybe_select_folder (GtkTreeModel *tree_model,
 
        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,
+       gtk_tree_model_get (tree_model, iter,
+                           TYPE_COLUMN, &type,
+                           INSTANCE_COLUMN, &instance,
                            -1);
+
+       if (!instance)
+               return;
+
        if (type == TNY_FOLDER_TYPE_INBOX && priv->folder_to_select == NULL) {
                priv->folder_to_select = g_object_ref (instance);
        }
        g_object_unref (instance);
 
-       
        if (priv->folder_to_select) {
-               
+
                if (!modest_folder_view_select_folder (self, priv->folder_to_select,
                                                       FALSE)) {
                        GtkTreePath *path;
                        path = gtk_tree_model_get_path (tree_model, iter);
                        gtk_tree_view_expand_to_path (GTK_TREE_VIEW(self), path);
-                       
+
                        sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
 
                        gtk_tree_selection_select_iter (sel, iter);
                        gtk_tree_view_set_cursor (GTK_TREE_VIEW(self), path, NULL, FALSE);
 
                        gtk_tree_path_free (path);
-               
                }
 
                /* Disable next */
                modest_folder_view_disable_next_folder_selection (self);
-               
+
                /* Refilter the model */
                gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (tree_model));
        }
 }
-
+#endif
 
 void
-modest_folder_view_disable_next_folder_selection (ModestFolderView *self) 
+modest_folder_view_disable_next_folder_selection (ModestFolderView *self)
 {
        ModestFolderViewPrivate *priv;
 
@@ -2921,22 +3670,22 @@ modest_folder_view_disable_next_folder_selection (ModestFolderView *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 (self && MODEST_IS_FOLDER_VIEW (self), FALSE);     
-       g_return_val_if_fail (folder && 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) {
@@ -2948,7 +3697,7 @@ 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;
@@ -2961,7 +3710,7 @@ modest_folder_view_select_folder (ModestFolderView *self, TnyFolder *folder,
                g_warning ("%s: model is empty", __FUNCTION__);
                return FALSE;
        }
-       
+
        if (find_folder_iter (model, &iter, &folder_iter, folder)) {
                GtkTreePath *path;
 
@@ -2979,16 +3728,16 @@ modest_folder_view_select_folder (ModestFolderView *self, TnyFolder *folder,
 }
 
 
-void 
+void
 modest_folder_view_copy_selection (ModestFolderView *self)
 {
        g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self));
-       
+
        /* Copy selection */
        _clipboard_set_selected_data (self, FALSE);
 }
 
-void 
+void
 modest_folder_view_cut_selection (ModestFolderView *folder_view)
 {
        ModestFolderViewPrivate *priv = NULL;
@@ -3004,16 +3753,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));
@@ -3027,24 +3776,46 @@ modest_folder_view_copy_model (ModestFolderView *folder_view_src,
        GtkTreeModel *filter_model = NULL;
        GtkTreeModel *model = NULL;
        GtkTreeModel *new_filter_model = NULL;
-       
+       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)) {
+               g_signal_handler_disconnect (G_OBJECT (old_tny_model), dst_priv->activity_changed_handler);
+               dst_priv->activity_changed_handler = 0;
+       }
        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);
+#ifndef MODEST_TOOLKIT_HILDON2
        g_signal_connect (G_OBJECT(new_filter_model), "row-inserted",
                          (GCallback) on_row_inserted_maybe_select_folder, folder_view_dst);
+#endif
+#ifdef MODEST_TOOLKIT_HILDON2
+       if (new_tny_model)
+               dst_priv->activity_changed_handler = g_signal_connect (G_OBJECT (new_tny_model), "activity-changed",
+                                                                      G_CALLBACK (on_activity_changed), folder_view_dst);
+#endif
+       dst_priv->activity = FALSE;
 
        /* Free */
        g_object_unref (new_filter_model);
@@ -3059,7 +3830,7 @@ modest_folder_view_show_non_move_folders (ModestFolderView *folder_view,
 
        g_return_if_fail (folder_view && MODEST_IS_FOLDER_VIEW (folder_view));
 
-       priv = MODEST_FOLDER_VIEW_GET_PRIVATE(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())); */
@@ -3071,6 +3842,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,
@@ -3082,7 +3869,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);
@@ -3100,24 +3887,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)
 {
@@ -3128,11 +3915,225 @@ 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;
+       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 (self)->style, "SecondaryTextColor", &style_color)) {
+               gdk_color_parse ("grey", &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);
+       }
+}
+
+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;
+
+       g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (self), FALSE);
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
+
+       return priv->activity;
+}
+
+#ifdef MODEST_TOOLKIT_HILDON2
+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);
+
+       priv->activity = activity;
+
+       g_signal_emit (G_OBJECT (folder_view), signals[ACTIVITY_CHANGED_SIGNAL], 0,
+                      activity);
+}
+#endif