Removed extra references when deleting folders
[modest] / src / widgets / modest-folder-view.c
index 6f29b8f..770fb2a 100644 (file)
@@ -44,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>
@@ -61,6 +62,7 @@
 #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[] =
@@ -95,6 +97,7 @@ const GtkTargetEntry folder_view_drag_types[] =
 static void modest_folder_view_class_init  (ModestFolderViewClass *klass);
 static void modest_folder_view_init        (ModestFolderView *obj);
 static void modest_folder_view_finalize    (GObject *obj);
+static void modest_folder_view_dispose     (GObject *obj);
 
 static void         tny_account_store_view_init (gpointer g,
                                                 gpointer iface_data);
@@ -189,16 +192,24 @@ static void         on_display_name_changed (ModestAccountMgr *self,
 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
 };
 
@@ -225,20 +236,27 @@ struct _ModestFolderViewPrivate {
        ModestFolderViewFilter filter;
 
        TnyFolderStoreQuery  *query;
+       gboolean              do_refresh;
        guint                 timer_expander;
 
        gchar                *local_account_name;
        gchar                *visible_account_id;
+       gchar                *mailbox;
        ModestFolderViewStyle style;
        ModestFolderViewCellStyle cell_style;
+       gboolean show_message_count;
 
        gboolean  reselect; /* we use this to force a reselection of the INBOX */
        gboolean  show_non_move;
+       TnyList   *list_to_move;
        gboolean  reexpand; /* next time we expose, we'll expand all root folders */
 
        GtkCellRenderer *messages_renderer;
 
        gulong                outbox_deleted_handler;
+
+       GSList   *signal_handlers;
+       GdkColor active_color;
 };
 #define MODEST_FOLDER_VIEW_GET_PRIVATE(o)                      \
        (G_TYPE_INSTANCE_GET_PRIVATE((o),                       \
@@ -295,6 +313,7 @@ modest_folder_view_class_init (ModestFolderViewClass *klass)
 
        parent_class            = g_type_class_peek_parent (klass);
        gobject_class->finalize = modest_folder_view_finalize;
+       gobject_class->dispose  = modest_folder_view_dispose;
 
        g_type_class_add_private (gobject_class,
                                  sizeof(ModestFolderViewPrivate));
@@ -336,6 +355,32 @@ modest_folder_view_class_init (ModestFolderViewClass *klass)
                              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
@@ -357,7 +402,7 @@ get_inner_models (ModestFolderView *self,
 
        f_model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
        if (!GTK_IS_TREE_MODEL_FILTER(f_model)) {
-               g_warning ("BUG: %s: not a valid filter model", __FUNCTION__);
+               g_debug ("%s: emtpy model or not filter model", __FUNCTION__);
                return FALSE;
        }
 
@@ -466,15 +511,28 @@ static void
 convert_parent_folders_to_dots (gchar **item_name)
 {
        gint n_parents = 0;
+       gint n_inbox_parents = 0;
        gchar *c;
+       gchar *path_start;
        gchar *last_separator;
 
        if (item_name == NULL)
                return;
 
+       path_start = *item_name;
        for (c = *item_name; *c != '\0'; c++) {
                if (g_str_has_prefix (c, MODEST_FOLDER_PATH_SEPARATOR)) {
+                       gchar *compare;
+                       if (c != path_start) {
+                               compare = g_strndup (path_start, c - path_start);
+                               compare = g_strstrip (compare);
+                               if (g_ascii_strcasecmp (compare, "inbox") == 0) {
+                                       n_inbox_parents++;
+                               }
+                               g_free (compare);
+                       }
                        n_parents++;
+                       path_start = c + 1;
                }
        }
 
@@ -488,7 +546,7 @@ convert_parent_folders_to_dots (gchar **item_name)
                gint i;
 
                buffer = g_string_new ("");
-               for (i = 0; i < n_parents; i++) {
+               for (i = 0; i < n_parents - n_inbox_parents; i++) {
                        buffer = g_string_append (buffer, MODEST_FOLDER_DOT);
                }
                buffer = g_string_append (buffer, last_separator);
@@ -499,8 +557,9 @@ convert_parent_folders_to_dots (gchar **item_name)
 }
 
 static void
-format_compact_style (gchar **item_name, 
+format_compact_style (gchar **item_name,
                      GObject *instance,
+                     const gchar *mailbox,
                      gboolean bold,
                      gboolean multiaccount,
                      gboolean *use_markup)
@@ -517,6 +576,16 @@ format_compact_style (gchar **item_name,
        folder_type = tny_folder_get_folder_type (folder);
        is_special = (get_cmp_pos (folder_type, folder)!= 4);
 
+       if (mailbox) {
+               /* Remove mailbox prefix if any */
+               gchar *prefix = g_strconcat (mailbox, MODEST_FOLDER_PATH_SEPARATOR, NULL);
+               if (g_str_has_prefix (*item_name, prefix)) {
+                       gchar *new_item_name = g_strdup (*item_name + strlen (prefix));
+                       g_free (*item_name);
+                       *item_name = new_item_name;
+               }
+       }
+
        if (!is_special || multiaccount) {
                TnyAccount *account = tny_folder_get_account (folder);
                const gchar *folder_name;
@@ -541,15 +610,20 @@ format_compact_style (gchar **item_name,
 
                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>");
+                       if (!is_special && folder_type == TNY_FOLDER_TYPE_DRAFTS) {
+                               buffer = g_string_append (buffer, folder_name);
+                               /* TODO: append a sensitive string to the remote drafts to
+                                * be able to know it's the remote one */
+/*                             buffer = g_string_append (buffer, " (TODO:remote)"); */
+                       } else {
+                               buffer = g_string_append (buffer, folder_name);
+                       }
                }
                g_free (*item_name);
                g_object_unref (account);
 
                *item_name = g_string_free (buffer, FALSE);
-               *use_markup = bold;
+               *use_markup = FALSE;
        } else {
                *use_markup = FALSE;
        }
@@ -586,9 +660,12 @@ text_cell_data  (GtkTreeViewColumn *column,
        if (type != TNY_FOLDER_TYPE_ROOT) {
                gint number = 0;
                gboolean drafts;
+               gboolean is_local;
 
-               if (modest_tny_folder_is_local_folder (TNY_FOLDER (instance)) ||
-                   modest_tny_folder_is_memory_card_folder (TNY_FOLDER (instance))) {
+               is_local = modest_tny_folder_is_local_folder (TNY_FOLDER (instance)) ||
+                       modest_tny_folder_is_memory_card_folder (TNY_FOLDER (instance));
+
+               if (is_local) {
                        type = modest_tny_folder_get_local_or_mmc_folder_type (TNY_FOLDER (instance));
                        if (type != TNY_FOLDER_TYPE_UNKNOWN) {
                                g_free (fname);
@@ -603,18 +680,14 @@ text_cell_data  (GtkTreeViewColumn *column,
                        }
                }
 
-               if (type == TNY_FOLDER_TYPE_INBOX) {
-                       g_free (fname);
-                       fname = g_strdup (_("mcen_me_folder_inbox"));
-               }
-
-               /* note: we cannot reliably get the counts from the tree model, we need
-                * to use explicit calls on tny_folder for some reason.
-                */
-               /* Select the number to show: the unread or unsent messages. in case of outbox/drafts, show all */
-               if ((type == TNY_FOLDER_TYPE_DRAFTS) ||
-                   (type == TNY_FOLDER_TYPE_OUTBOX) ||
-                   (type == TNY_FOLDER_TYPE_MERGE)) { /* _OUTBOX actually returns _MERGE... */
+               /* note: we cannot reliably get the counts from the
+                * tree model, we need to use explicit calls on
+                * tny_folder for some reason. Select the number to
+                * show: the unread or unsent messages. in case of
+                * outbox/drafts, show all */
+               if (is_local && ((type == TNY_FOLDER_TYPE_DRAFTS) ||
+                                (type == TNY_FOLDER_TYPE_OUTBOX) ||
+                                (type == TNY_FOLDER_TYPE_MERGE))) { /* _OUTBOX actually returns _MERGE... */
                        number = tny_folder_get_all_count (TNY_FOLDER(instance));
                        drafts = TRUE;
                } else {
@@ -632,7 +705,11 @@ text_cell_data  (GtkTreeViewColumn *column,
                } else {
                        /* Use bold font style if there are unread or unset messages */
                        if (number > 0) {
-                               item_name = g_strdup_printf ("%s (%d)", fname, number);
+                               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);
@@ -658,6 +735,13 @@ text_cell_data  (GtkTreeViewColumn *column,
                }
        }
 
+       /* Convert INBOX */
+       if (type == TNY_FOLDER_TYPE_INBOX &&
+           g_str_has_suffix (fname, "Inbox")) {
+               g_free (item_name);
+               item_name = g_strdup (_("mcen_me_folder_inbox"));
+       }
+
        if (!item_name)
                item_name = g_strdup ("unknown");
 
@@ -666,17 +750,29 @@ text_cell_data  (GtkTreeViewColumn *column,
 
                multiaccount = (priv->style == MODEST_FOLDER_VIEW_STYLE_SHOW_ALL);
                /* Convert item_name to markup */
-               format_compact_style (&item_name, instance, 
+               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: */
-               if (use_markup)
-                       g_object_set (rendobj, "markup", item_name, NULL);
-               else
-                       g_object_set (rendobj, "text", item_name, "weight", item_weight, NULL);
+               if (priv->cell_style == MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT && item_weight == 800 && 
+                   (priv->active_color.red != 0 || priv->active_color.blue != 0 || priv->active_color.green != 0)) {
+                       g_object_set (rendobj, 
+                                     "text", item_name, 
+                                     "weight-set", FALSE,
+                                     "foreground-set", TRUE,
+                                     "foreground-gdk", &(priv->active_color),
+                                     NULL);
+               } else {
+                       g_object_set (rendobj, 
+                                     "text", item_name,
+                                     "foreground-set", FALSE,
+                                     "weight-set", TRUE, 
+                                     "weight", item_weight,
+                                     NULL);
+               }
 
                /* Notify display name observers */
                /* TODO: What listens for this signal, and how can it use only the new name? */
@@ -741,9 +837,12 @@ messages_cell_data  (GtkTreeViewColumn *column,
        if (type != TNY_FOLDER_TYPE_ROOT) {
                gint number = 0;
                gboolean drafts;
+               gboolean is_local;
 
-               if (modest_tny_folder_is_local_folder (TNY_FOLDER (instance)) ||
-                   modest_tny_folder_is_memory_card_folder (TNY_FOLDER (instance))) {
+               is_local = modest_tny_folder_is_local_folder (TNY_FOLDER (instance)) ||
+                       modest_tny_folder_is_memory_card_folder (TNY_FOLDER (instance));
+
+               if (is_local) {
                        type = modest_tny_folder_get_local_or_mmc_folder_type (TNY_FOLDER (instance));
                } else {
                        /* Sometimes an special folder is reported by the server as
@@ -758,9 +857,9 @@ messages_cell_data  (GtkTreeViewColumn *column,
                 * 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... */
+               if (is_local && ((type == TNY_FOLDER_TYPE_DRAFTS) ||
+                                (type == TNY_FOLDER_TYPE_OUTBOX) ||
+                                (type == TNY_FOLDER_TYPE_MERGE))) { /* _OUTBOX actually returns _MERGE... */
                        number = tny_folder_get_all_count (TNY_FOLDER(instance));
                        drafts = TRUE;
                } else {
@@ -768,14 +867,13 @@ messages_cell_data  (GtkTreeViewColumn *column,
                        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 ((priv->cell_style == MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT) && (number > 0)) {
+                       item_name =
+                               g_strdup_printf (ngettext ((drafts) ? "mcen_ti_message" : "mcen_va_new_message",
+                                                          (drafts) ? "mcen_ti_messages" : "mcen_va_new_messages",
+                                                          number), number);
+               }
+       }
 
        if (!item_name)
                item_name = g_strdup ("");
@@ -830,33 +928,81 @@ get_composite_icons (const gchar *icon_code,
 {
        ThreePixbufs *retval;
 
-       if (!*pixbuf)
-               *pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (icon_code, FOLDER_ICON_SIZE));
+       if (pixbuf && !*pixbuf) {
+               GdkPixbuf *icon;
+               icon = modest_platform_get_icon (icon_code, FOLDER_ICON_SIZE);
+               if (icon) {
+                       *pixbuf = gdk_pixbuf_copy (icon);
+               } else {
+                       *pixbuf = NULL;
+               }
+       }
 
-       if (!*pixbuf_open)
+       if (pixbuf_open && !*pixbuf_open && pixbuf && *pixbuf)
                *pixbuf_open = get_composite_pixbuf ("qgn_list_gene_fldr_exp",
                                                     FOLDER_ICON_SIZE,
                                                     *pixbuf);
 
-       if (!*pixbuf_close)
+       if (pixbuf_close && !*pixbuf_close && pixbuf && *pixbuf)
                *pixbuf_close = get_composite_pixbuf ("qgn_list_gene_fldr_clp",
                                                      FOLDER_ICON_SIZE,
                                                      *pixbuf);
 
        retval = g_slice_new0 (ThreePixbufs);
-       if (*pixbuf)
+       if (pixbuf && *pixbuf)
                retval->pixbuf = g_object_ref (*pixbuf);
-       if (*pixbuf_open)
+       else
+               retval->pixbuf = NULL;
+       if (pixbuf_open && *pixbuf_open)
                retval->pixbuf_open = g_object_ref (*pixbuf_open);
-       if (*pixbuf_close)
+       else
+               retval->pixbuf_open = NULL;
+       if (pixbuf_close && *pixbuf_close)
                retval->pixbuf_close = g_object_ref (*pixbuf_close);
+       else
+               retval->pixbuf_close = NULL;
 
        return retval;
 }
 
+static inline ThreePixbufs *
+get_account_protocol_pixbufs (ModestFolderView *folder_view,
+                             ModestProtocolType protocol_type,
+                             GObject *object)
+{
+       ModestProtocol *protocol;
+       const GdkPixbuf *pixbuf = NULL;
+       ModestFolderViewPrivate *priv;
+
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (folder_view);
+
+       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 (TnyFolderType type, GObject *instance)
+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,
@@ -877,6 +1023,23 @@ get_folder_icons (TnyFolderType type, GObject *instance)
 
        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;
+
+               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 ||
@@ -884,13 +1047,20 @@ get_folder_icons (TnyFolderType type, GObject *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,
+               return get_composite_icons (MODEST_FOLDER_ICON_REMOTE_FOLDER,
                                            &anorm_pixbuf,
                                            &anorm_pixbuf_open,
                                            &anorm_pixbuf_close);
@@ -1018,6 +1188,7 @@ icon_cell_data  (GtkTreeViewColumn *column,
        TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
        gboolean has_children;
        ThreePixbufs *pixbufs;
+       ModestFolderView *folder_view = (ModestFolderView *) data;
 
        rendobj = (GObject *) renderer;
 
@@ -1030,7 +1201,7 @@ icon_cell_data  (GtkTreeViewColumn *column,
                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 */
@@ -1059,6 +1230,12 @@ add_columns (GtkWidget *treeview)
 
        /* 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);
@@ -1067,6 +1244,8 @@ add_columns (GtkWidget *treeview)
        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
@@ -1077,8 +1256,14 @@ add_columns (GtkWidget *treeview)
 
        priv->messages_renderer = gtk_cell_renderer_text_new ();
        g_object_set (priv->messages_renderer, 
+#ifdef MODEST_TOOLKIT_HILDON2
+                     "yalign", 0.5,
+                     "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,
@@ -1113,12 +1298,15 @@ modest_folder_view_init (ModestFolderView *obj)
        priv->timer_expander = 0;
        priv->account_store  = NULL;
        priv->query          = NULL;
+       priv->do_refresh     = TRUE;
        priv->style          = MODEST_FOLDER_VIEW_STYLE_SHOW_ALL;
        priv->cur_folder_store   = NULL;
        priv->visible_account_id = NULL;
+       priv->mailbox = NULL;
        priv->folder_to_select = NULL;
        priv->outbox_deleted_handler = 0;
        priv->reexpand = TRUE;
+       priv->signal_handlers = 0;
 
        /* Initialize the local account name */
        conf = modest_runtime_get_conf();
@@ -1131,6 +1319,8 @@ modest_folder_view_init (ModestFolderView *obj)
        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));
@@ -1139,29 +1329,30 @@ 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_CALLBACK (on_key_pressed), NULL);
+       g_signal_connect (G_OBJECT (obj),
+                         "key-press-event",
+                         G_CALLBACK (on_key_pressed), NULL);
 
-       priv->display_name_changed_signal =
-               g_signal_connect (modest_runtime_get_account_mgr (),
-                                 "display_name_changed",
-                                 G_CALLBACK (on_display_name_changed),
-                                 obj);
+       priv->display_name_changed_signal =
+               g_signal_connect (modest_runtime_get_account_mgr (),
+                                 "display_name_changed",
+                                 G_CALLBACK (on_display_name_changed),
+                                 obj);
 
        /*
         * Track changes in the local account name (in the device it
         * will be the device name)
         */
-       priv->conf_key_signal = g_signal_connect (G_OBJECT(conf),
-                                                 "key_changed",
-                                                 G_CALLBACK(on_configuration_key_changed),
-                                                 obj);
-
-       update_style (obj);
-       g_signal_connect (G_OBJECT (obj), "notify::style", G_CALLBACK (on_notify_style), (gpointer) obj);
+       priv->conf_key_signal = g_signal_connect (G_OBJECT(conf),
+                                                 "key_changed",
+                                                 G_CALLBACK(on_configuration_key_changed),
+                                                 obj);
 
+       gdk_color_parse ("000", &priv->active_color);
 
+       update_style (obj);
+       g_signal_connect (G_OBJECT (obj), "notify::style", 
+                         G_CALLBACK (on_notify_style), (gpointer) obj);
 }
 
 static void
@@ -1173,6 +1364,55 @@ tny_account_store_view_init (gpointer g, gpointer iface_data)
 }
 
 static void
+modest_folder_view_dispose (GObject *obj)
+{
+       ModestFolderViewPrivate *priv;
+
+       priv =  MODEST_FOLDER_VIEW_GET_PRIVATE (obj);
+
+#ifdef MODEST_TOOLKIT_HILDON2
+       if (priv->signal_handlers) {
+               modest_signal_mgr_disconnect_all_and_destroy (priv->signal_handlers);
+               priv->signal_handlers = NULL;
+       }
+#endif
+
+       /* Free external references */
+       if (priv->account_store) {
+               g_signal_handler_disconnect (G_OBJECT(priv->account_store),
+                                            priv->account_inserted_signal);
+               g_signal_handler_disconnect (G_OBJECT(priv->account_store),
+                                            priv->account_removed_signal);
+               g_signal_handler_disconnect (G_OBJECT(priv->account_store),
+                                            priv->account_changed_signal);
+               g_object_unref (G_OBJECT(priv->account_store));
+               priv->account_store = NULL;
+       }
+
+       if (priv->query) {
+               g_object_unref (G_OBJECT (priv->query));
+               priv->query = NULL;
+       }
+
+       if (priv->folder_to_select) {
+               g_object_unref (G_OBJECT(priv->folder_to_select));
+               priv->folder_to_select = NULL;
+       }
+
+       if (priv->cur_folder_store) {
+               g_object_unref (priv->cur_folder_store);
+               priv->cur_folder_store = NULL;
+       }
+
+       if (priv->list_to_move) {
+               g_object_unref (priv->list_to_move);
+               priv->list_to_move = NULL;
+       }
+
+       G_OBJECT_CLASS(parent_class)->dispose (obj);
+}
+
+static void
 modest_folder_view_finalize (GObject *obj)
 {
        ModestFolderViewPrivate *priv;
@@ -1189,7 +1429,7 @@ modest_folder_view_finalize (GObject *obj)
        }
 
        local_account = (TnyAccount *)
-               modest_tny_account_store_get_local_folders_account ((ModestTnyAccountStore *)priv->account_store);
+               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))
@@ -1198,17 +1438,6 @@ modest_folder_view_finalize (GObject *obj)
                g_object_unref (local_account);
        }
 
-       if (priv->account_store) {
-               g_signal_handler_disconnect (G_OBJECT(priv->account_store),
-                                            priv->account_inserted_signal);
-               g_signal_handler_disconnect (G_OBJECT(priv->account_store),
-                                            priv->account_removed_signal);
-               g_signal_handler_disconnect (G_OBJECT(priv->account_store),
-                                            priv->account_changed_signal);
-               g_object_unref (G_OBJECT(priv->account_store));
-               priv->account_store = NULL;
-       }
-
        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 (),
@@ -1216,22 +1445,13 @@ modest_folder_view_finalize (GObject *obj)
                priv->display_name_changed_signal = 0;
        }
 
-       if (priv->query) {
-               g_object_unref (G_OBJECT (priv->query));
-               priv->query = NULL;
-       }
-
-       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 (),
@@ -1239,14 +1459,11 @@ modest_folder_view_finalize (GObject *obj)
                priv->conf_key_signal = 0;
        }
 
-       if (priv->cur_folder_store) {
-               g_object_unref (priv->cur_folder_store);
-               priv->cur_folder_store = NULL;
-       }
-
        /* Clear hidding array created by cut operation */
        _clear_hidding_filter (MODEST_FOLDER_VIEW (obj));
 
+       gdk_color_parse ("000", &priv->active_color);
+
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
@@ -1538,6 +1755,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),
@@ -1609,6 +1827,12 @@ modest_folder_view_on_map (ModestFolderView *self,
 GtkWidget*
 modest_folder_view_new (TnyFolderStoreQuery *query)
 {
+       return modest_folder_view_new_full (query, TRUE);
+}
+
+GtkWidget*
+modest_folder_view_new_full (TnyFolderStoreQuery *query, gboolean do_refresh)
+{
        GObject *self;
        ModestFolderViewPrivate *priv;
        GtkTreeSelection *sel;
@@ -1623,6 +1847,8 @@ modest_folder_view_new (TnyFolderStoreQuery *query)
        if (query)
                priv->query = g_object_ref (query);
 
+       priv->do_refresh = do_refresh;
+
        sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
        priv->changed_signal = g_signal_connect (sel, "changed",
                                                 G_CALLBACK (on_selection_changed), self);
@@ -1654,6 +1880,138 @@ expand_root_items (ModestFolderView *self)
        gtk_tree_path_free (path);
 }
 
+static gboolean
+is_parent_of (TnyFolder *a, TnyFolder *b)
+{
+       const gchar *a_id;
+       gboolean retval = FALSE;
+
+       a_id = tny_folder_get_id (a);
+       if (a_id) {
+               gchar *string_to_match;
+               const gchar *b_id;
+
+               string_to_match = g_strconcat (a_id, "/", NULL);
+               b_id = tny_folder_get_id (b);
+               retval = g_str_has_prefix (b_id, string_to_match);
+               g_free (string_to_match);
+       }
+       
+       return retval;
+}
+
+typedef struct _ForeachFolderInfo {
+       gchar *needle;
+       gboolean found;
+} ForeachFolderInfo;
+
+static gboolean 
+foreach_folder_with_id (GtkTreeModel *model,
+                       GtkTreePath *path,
+                       GtkTreeIter *iter,
+                       gpointer data)
+{
+       ForeachFolderInfo *info;
+       GObject *instance;
+
+       info = (ForeachFolderInfo *) data;
+       gtk_tree_model_get (model, iter,
+                           INSTANCE_COLUMN, &instance,
+                           -1);
+
+       if (TNY_IS_FOLDER (instance)) {
+               const gchar *id;
+               gchar *collate;
+               id = tny_folder_get_id (TNY_FOLDER (instance));
+               if (id) {
+                       collate = g_utf8_collate_key (id, -1);
+                       info->found = !strcmp (info->needle, collate);
+                       g_free (collate);
+               }
+       }
+
+       if (instance)
+               g_object_unref (instance);
+
+       return info->found;
+       
+}
+
+
+static gboolean
+has_folder_with_id (ModestFolderView *self, const gchar *id)
+{
+       GtkTreeModel *model;
+       ForeachFolderInfo info = {NULL, FALSE};
+
+       model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+       info.needle = g_utf8_collate_key (id, -1);
+       
+       gtk_tree_model_foreach (model, foreach_folder_with_id, &info);
+       g_free (info.needle);
+
+       return info.found;
+}
+
+static gboolean
+has_child_with_name_of (ModestFolderView *self, TnyFolder *a, TnyFolder *b)
+{
+       const gchar *a_id;
+       gboolean retval = FALSE;
+
+       a_id = tny_folder_get_id (a);
+       if (a_id) {
+               const gchar *b_id;
+               b_id = tny_folder_get_id (b);
+               
+               if (b_id) {
+                       const gchar *last_bar;
+                       gchar *string_to_match;
+                       last_bar = g_strrstr (b_id, "/");
+                       if (last_bar)
+                               last_bar++;
+                       else
+                               last_bar = b_id;
+                       string_to_match = g_strconcat (a_id, "/", last_bar, NULL);
+                       retval = has_folder_with_id (self, string_to_match);
+                       g_free (string_to_match);
+               }
+       }
+
+       return retval;
+}
+
+static gboolean
+check_move_to_this_folder_valid (ModestFolderView *self, TnyFolder *folder)
+{
+       ModestFolderViewPrivate *priv;
+       TnyIterator *iterator;
+       gboolean retval = TRUE;
+
+       g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (self), FALSE);
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
+
+       for (iterator = tny_list_create_iterator (priv->list_to_move);
+            retval && !tny_iterator_is_done (iterator);
+            tny_iterator_next (iterator)) {
+               GObject *instance;
+               instance = tny_iterator_get_current (iterator);
+               if (instance == (GObject *) folder) {
+                       retval = FALSE;
+               } else if (TNY_IS_FOLDER (instance)) {
+                       retval = !is_parent_of (TNY_FOLDER (instance), folder);
+                       if (retval) {
+                               retval = !has_child_with_name_of (self, folder, TNY_FOLDER (instance));
+                       }
+               }
+               g_object_unref (instance);
+       }
+       g_object_unref (iterator);
+
+       return retval;
+}
+
+
 /*
  * We use this function to implement the
  * MODEST_FOLDER_VIEW_STYLE_SHOW_ONE style. We only show the default
@@ -1671,11 +2029,13 @@ filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
        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);
@@ -1684,14 +2044,12 @@ filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
           happen when the model is being modified while it's being
           drawn. This could occur for example when moving folders
           using drag&drop */
-       if (!instance)
+       if (!instance) {
+               g_free (fname);
                return FALSE;
+       }
 
        if (TNY_IS_ACCOUNT (instance)) {
-#ifdef MODEST_TOOLKIT_HILDON2
-               /* In hildon 2.2 we don't show the account rows */
-               return FALSE;
-#else
                TnyAccount *acc = TNY_ACCOUNT (instance);
                const gchar *account_id = tny_account_get_id (acc);
 
@@ -1714,7 +2072,6 @@ filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
                 * in the local-folders account instead: */
                if (retval && MODEST_IS_TNY_OUTBOX_ACCOUNT (acc))
                        retval = FALSE;
-#endif
        } else {
                if (priv->style == MODEST_FOLDER_VIEW_STYLE_SHOW_ONE) {
                        /* Only show special folders for current account if needed */
@@ -1730,8 +2087,17 @@ filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
                                            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;
+                                                 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);
@@ -1755,8 +2121,15 @@ filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
 
        /* 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:
@@ -1767,7 +2140,7 @@ filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
                                type = modest_tny_folder_guess_folder_type(TNY_FOLDER(instance));
                                if (type == TNY_FOLDER_TYPE_INVALID)
                                        g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
-
+                               
                                if (type == TNY_FOLDER_TYPE_OUTBOX ||
                                    type == TNY_FOLDER_TYPE_SENT
                                    || type == TNY_FOLDER_TYPE_DRAFTS)
@@ -1775,31 +2148,85 @@ filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
                                break;
                        default:
                                break;
+                       }
+               }
+               if (retval && TNY_IS_ACCOUNT (instance) &&
+                   modest_tny_folder_store_is_remote (TNY_FOLDER_STORE (instance))) {
+                       ModestProtocolType protocol_type;
+
+                       protocol_type = modest_tny_account_get_protocol_type (TNY_ACCOUNT (instance));
+                       retval  = !modest_protocol_registry_protocol_type_has_tag
+                               (modest_runtime_get_protocol_registry (),
+                                protocol_type,
+                                MODEST_PROTOCOL_REGISTRY_STORE_FORBID_INCOMING_XFERS);
                }
        }
 
        /* apply special filters */
+       if (retval && (priv->filter & MODEST_FOLDER_VIEW_FILTER_HIDE_ACCOUNTS)) {
+               if (TNY_IS_ACCOUNT (instance))
+                       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)) {
-                       TnyFolderCaps capabilities;
-
-                       capabilities = tny_folder_get_caps (TNY_FOLDER (instance));
-                       retval = !(capabilities & TNY_FOLDER_CAPS_NOCHILDREN);
+                       /* Check folder rules */
+                       ModestTnyFolderRules rules;
 
-                       if (retval) {
-                               retval = ((type != TNY_FOLDER_TYPE_DRAFTS) &&
-                                         (type != TNY_FOLDER_TYPE_OUTBOX) &&
-                                         (type != TNY_FOLDER_TYPE_SENT));
-                       }
+                       rules = modest_tny_folder_get_rules (TNY_FOLDER (instance));
+                       retval = !(rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE);
                } else if (TNY_IS_ACCOUNT (instance)) {
-                       retval = FALSE;
+                       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 {
@@ -1820,7 +2247,7 @@ filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
                        default:
                                break;
                        }
-                       
+
                } else if (TNY_IS_ACCOUNT (instance)) {
                        retval = FALSE;
                }
@@ -1856,6 +2283,7 @@ filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
 
        /* Free */
        g_object_unref (instance);
+        g_free (fname);
 
        return retval;
 }
@@ -1866,7 +2294,7 @@ 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);
@@ -1887,8 +2315,14 @@ 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
+       TnyGtkFolderListStoreFlags flags;
+       flags = TNY_GTK_FOLDER_LIST_STORE_FLAG_SHOW_PATH;
+       if (priv->do_refresh)
+               flags |= TNY_GTK_FOLDER_LIST_STORE_FLAG_DELAYED_REFRESH;
+       else
+               flags |= TNY_GTK_FOLDER_LIST_STORE_FLAG_NO_REFRESH;
        model = tny_gtk_folder_list_store_new_with_flags (NULL, 
-                                                         TNY_GTK_FOLDER_LIST_STORE_FLAG_SHOW_PATH);
+                                                         flags);
        tny_gtk_folder_list_store_set_path_separator (TNY_GTK_FOLDER_LIST_STORE (model),
                                                      MODEST_FOLDER_PATH_SEPARATOR);
 #else
@@ -1940,6 +2374,15 @@ modest_folder_view_update_model (ModestFolderView *self,
                                                self,
                                                NULL);
 
+       GtkTreeModel *old_tny_model = NULL;
+       if (get_inner_models (self, NULL, NULL, &old_tny_model)) {
+               if (priv->signal_handlers > 0) {
+                       priv->signal_handlers = modest_signal_mgr_disconnect (priv->signal_handlers,
+                                                                             G_OBJECT (old_tny_model), 
+                                                                             "activity-changed");
+               }
+       }
+
        /* Set new model */
        gtk_tree_view_set_model (GTK_TREE_VIEW(self), filter_model);
 #ifndef MODEST_TOOLKIT_HILDON2
@@ -1947,6 +2390,14 @@ modest_folder_view_update_model (ModestFolderView *self,
                          (GCallback) on_row_inserted_maybe_select_folder, self);
 #endif
 
+#ifdef MODEST_TOOLKIT_HILDON2
+       priv->signal_handlers = modest_signal_mgr_connect (priv->signal_handlers,
+                                                          G_OBJECT (model),
+                                                          "activity-changed",
+                                                          G_CALLBACK (on_activity_changed),
+                                                          self);
+#endif
+
        g_object_unref (model);
        g_object_unref (filter_model);
        g_object_unref (sortable);
@@ -1997,9 +2448,11 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
                   cause (and it actually does it) a free of the
                   summary of the folder (because the main window will
                   clear the headers view */
+#ifndef MODEST_TOOLKIT_HILDON2
                if (TNY_IS_FOLDER(priv->cur_folder_store))
                        tny_folder_sync_async (TNY_FOLDER(priv->cur_folder_store),
                                               FALSE, NULL, NULL, NULL);
+#endif
 
                g_signal_emit (G_OBJECT(tree_view), signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0,
                       priv->cur_folder_store, FALSE);
@@ -2102,13 +2555,39 @@ 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_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;
@@ -2117,12 +2596,18 @@ get_cmp_pos (TnyFolderType t, TnyFolder *folder_store)
        {
                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 2;
+               return (TNY_IS_MERGE_FOLDER (folder_store))?2:4;
                break;
        case TNY_FOLDER_TYPE_DRAFTS:
        {
@@ -2159,21 +2644,31 @@ compare_account_names (TnyAccount *a1, TnyAccount *a2)
 static gint
 compare_accounts (TnyFolderStore *s1, TnyFolderStore *s2)
 {
-       TnyAccount *a1, *a2;
+       TnyAccount *a1 = NULL, *a2 = NULL;
        gint cmp;
 
        if (TNY_IS_ACCOUNT (s1)) {
                a1 = TNY_ACCOUNT (g_object_ref (s1));
-       } else {
+       } 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 {
+       } 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;
@@ -2186,8 +2681,10 @@ compare_accounts (TnyFolderStore *s1, TnyFolderStore *s2)
        cmp = compare_account_names (a1, a2);
 
 finish:
-       g_object_unref (a1);
-       g_object_unref (a2);
+       if (a1)
+               g_object_unref (a1);
+       if (a2)
+               g_object_unref (a2);
 
        return cmp;
 }
@@ -2203,6 +2700,51 @@ compare_accounts_first (TnyFolderStore *s1, TnyFolderStore *s2)
        return is_account2 - is_account1;
 }
 
+static gint
+compare_folders (const gchar *name1, const gchar *name2)
+{
+       const gchar *separator1, *separator2;
+       const gchar *next1, *next2;
+       gchar *top1, *top2;
+       gint cmp;
+
+       if (name1 == NULL || name1[0] == '\0')
+               return -1;
+       if (name2 == NULL || name2[0] == '\0')
+               return 1;
+
+       separator1 = strstr (name1, MODEST_FOLDER_PATH_SEPARATOR);
+       if (separator1) {
+               top1 = g_strndup (name1, separator1 - name1);
+       } else {
+               top1 = g_strdup (name1);
+       }
+
+       separator2 = strstr (name2, MODEST_FOLDER_PATH_SEPARATOR);
+       if (separator2) {
+               top2 = g_strndup (name2, separator2 - name2);
+       } else {
+               top2 = g_strdup (name2);
+       }
+
+
+       cmp = modest_text_utils_utf8_strcmp (top1, top2, TRUE);
+       g_free (top1);
+       g_free (top2);
+
+       if (cmp != 0)
+               return cmp;
+
+       if (separator1 == NULL && separator2 == NULL)
+               return 0;
+
+       next1 = (separator1 != NULL)?separator1 + strlen (MODEST_FOLDER_PATH_SEPARATOR):NULL;
+       next2 = (separator2 != NULL)?separator2 + strlen (MODEST_FOLDER_PATH_SEPARATOR):NULL;
+
+       return compare_folders (next1, next2);
+}
+
+
 /*
  * This function orders the mail accounts according to these rules:
  * 1st - remote accounts
@@ -2245,17 +2787,20 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
                goto finish;
 
        /* Now we sort using the account of each folder */
-       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;
+       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;
+       }
 
        /* Pure sort by name */
-       cmp = modest_text_utils_utf8_strcmp (name1, name2, TRUE);
+       cmp = compare_folders (name1, name2);
  finish:
        if (folder1)
                g_object_unref(G_OBJECT(folder1));
@@ -3062,6 +3607,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 *
@@ -3112,6 +3662,7 @@ find_inbox_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *inbox_iter
 void
 modest_folder_view_select_first_inbox_or_local (ModestFolderView *self)
 {
+#ifndef MODEST_TOOLKIT_HILDON2
        GtkTreeModel *model;
        GtkTreeIter iter, inbox_iter;
        GtkTreeSelection *sel;
@@ -3143,6 +3694,7 @@ modest_folder_view_select_first_inbox_or_local (ModestFolderView *self)
 
        /* set focus */
        gtk_widget_grab_focus (GTK_WIDGET(self));
+#endif
 }
 
 
@@ -3355,11 +3907,23 @@ 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)) {
+               modest_signal_mgr_disconnect (dst_priv->signal_handlers,
+                                             G_OBJECT (old_tny_model),
+                                             "activity-changed");
+       }
        filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (folder_view_src));
        model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER(filter_model));
 
@@ -3369,11 +3933,25 @@ modest_folder_view_copy_model (ModestFolderView *folder_view_src,
                                                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);
+       dst_priv->signal_handlers = modest_signal_mgr_connect (dst_priv->signal_handlers,
+                                                              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->signal_handlers = modest_signal_mgr_connect (dst_priv->signal_handlers,
+                                                                      G_OBJECT (new_tny_model),
+                                                                      "activity-changed",
+                                                                      G_CALLBACK (on_activity_changed),
+                                                                      folder_view_dst);
+       }
 #endif
 
        /* Free */
@@ -3401,6 +3979,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,
@@ -3479,7 +4073,7 @@ modest_folder_view_set_cell_style (ModestFolderView *self,
        priv->cell_style = cell_style;
 
        g_object_set (G_OBJECT (priv->messages_renderer),
-                     "visible", (cell_style == MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT),
+                     "visible", (cell_style == MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT && priv->show_message_count),
                      NULL);
        
        gtk_widget_queue_draw (GTK_WIDGET (self));
@@ -3489,19 +4083,46 @@ static void
 update_style (ModestFolderView *self)
 {
        ModestFolderViewPrivate *priv;
-       GdkColor style_color;
+       GdkColor style_color, style_active_color;
+       PangoAttrList *attr_list;
+       GtkStyle *style;
+       PangoAttribute *attr;
 
        g_return_if_fail (MODEST_IS_FOLDER_VIEW (self));
        priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
 
+       /* Set color */
+
+       attr_list = pango_attr_list_new ();
        if (!gtk_style_lookup_color (GTK_WIDGET (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);
+       }
 
-       g_object_set (G_OBJECT (priv->messages_renderer),
-                     "foreground-gdk", &style_color,
-                     "foreground-set", TRUE,
-                     NULL);
+       if (gtk_style_lookup_color (GTK_WIDGET (self)->style, "ActiveTextColor", &style_active_color)) {
+               priv->active_color = style_active_color;
+       } else {
+               gdk_color_parse ("000", &(priv->active_color));
+       }
 }
 
 static void 
@@ -3523,10 +4144,143 @@ modest_folder_view_set_filter (ModestFolderView *self,
        g_return_if_fail (MODEST_IS_FOLDER_VIEW (self));
        priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
 
-       priv->filter = filter;
+       priv->filter |= filter;
+
+       filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+       if (GTK_IS_TREE_MODEL_FILTER(filter_model)) {
+               gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model));  
+       }
+}
+
+void 
+modest_folder_view_unset_filter (ModestFolderView *self,
+                                ModestFolderViewFilter filter)
+{
+       ModestFolderViewPrivate *priv;
+       GtkTreeModel *filter_model;
+
+       g_return_if_fail (MODEST_IS_FOLDER_VIEW (self));
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
+
+       priv->filter &= ~filter;
 
        filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
        if (GTK_IS_TREE_MODEL_FILTER(filter_model)) {
                gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model));  
        }
 }
+
+gboolean
+modest_folder_view_any_folder_fulfils_rules (ModestFolderView *self,
+                                            ModestTnyFolderRules rules)
+{
+       GtkTreeModel *filter_model;
+       GtkTreeIter iter;
+       gboolean fulfil = FALSE;
+
+       if (!get_inner_models (self, &filter_model, NULL, NULL))
+               return FALSE;
+
+       if (!gtk_tree_model_get_iter_first (filter_model, &iter))
+               return FALSE;
+
+       do {
+               TnyFolderStore *folder;
+
+               gtk_tree_model_get (filter_model, &iter, INSTANCE_COLUMN, &folder, -1);
+               if (folder) {
+                       if (TNY_IS_FOLDER (folder)) {
+                               ModestTnyFolderRules folder_rules = modest_tny_folder_get_rules (TNY_FOLDER (folder));
+                               /* Folder rules are negative: non_writable, non_deletable... */
+                               if (!(folder_rules & rules))
+                                       fulfil = TRUE;
+                       }
+                       g_object_unref (folder);
+               }
+
+       } while (gtk_tree_model_iter_next (filter_model, &iter) && !fulfil);
+
+       return fulfil;
+}
+
+void 
+modest_folder_view_set_list_to_move (ModestFolderView *self,
+                                    TnyList *list)
+{
+       ModestFolderViewPrivate *priv;
+
+       g_return_if_fail (MODEST_IS_FOLDER_VIEW (self));
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
+
+       if (priv->list_to_move)
+               g_object_unref (priv->list_to_move);
+
+       if (list)
+               g_object_ref (list);
+
+       priv->list_to_move = list;
+}
+
+void
+modest_folder_view_set_mailbox (ModestFolderView *self, const gchar *mailbox)
+{
+       ModestFolderViewPrivate *priv;
+
+       g_return_if_fail (MODEST_IS_FOLDER_VIEW (self));
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
+
+       if (priv->mailbox)
+               g_free (priv->mailbox);
+
+       priv->mailbox = g_strdup (mailbox);
+
+       /* Notify observers */
+       g_signal_emit (G_OBJECT(self),
+                      signals[VISIBLE_ACCOUNT_CHANGED_SIGNAL], 0,
+                      priv->visible_account_id);
+}
+
+const gchar *
+modest_folder_view_get_mailbox (ModestFolderView *self)
+{
+       ModestFolderViewPrivate *priv;
+
+       g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (self), NULL);
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
+
+       return (const gchar *) priv->mailbox;
+}
+
+gboolean 
+modest_folder_view_get_activity (ModestFolderView *self)
+{
+       ModestFolderViewPrivate *priv;
+       GtkTreeModel *inner_model;
+
+       g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (self), FALSE);
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
+       g_return_val_if_fail (get_inner_models (self, NULL, NULL, &inner_model), FALSE);
+
+       if (TNY_IS_GTK_FOLDER_LIST_STORE (inner_model)) {
+               return tny_gtk_folder_list_store_get_activity (TNY_GTK_FOLDER_LIST_STORE (inner_model));
+       } else {
+               return FALSE;
+       }
+}
+
+#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);
+
+       g_signal_emit (G_OBJECT (folder_view), signals[ACTIVITY_CHANGED_SIGNAL], 0,
+                      activity);
+}
+#endif