* src/widgets/modest-header-view.c:
[modest] / src / widgets / modest-header-view.c
index ca87c24..9e04043 100644 (file)
 #include <tny-list.h>
 #include <tny-simple-list.h>
 #include <tny-folder-monitor.h>
+#include <tny-folder-change.h>
+#include <tny-error.h>
 #include <string.h>
 
 #include <modest-header-view.h>
 #include <modest-header-view-priv.h>
 #include <modest-dnd.h>
 #include <modest-tny-folder.h>
-
+#include <modest-debug.h>
+#include <modest-main-window.h>
+#include <modest-ui-actions.h>
 #include <modest-marshal.h>
 #include <modest-text-utils.h>
 #include <modest-icon-names.h>
 #include <modest-runtime.h>
+#include "modest-platform.h"
+#include <modest-hbox-cell-renderer.h>
+#include <modest-vbox-cell-renderer.h>
 
 static void modest_header_view_class_init  (ModestHeaderViewClass *klass);
 static void modest_header_view_init        (ModestHeaderView *obj);
 static void modest_header_view_finalize    (GObject *obj);
+static void modest_header_view_dispose     (GObject *obj);
 
-static gboolean      on_header_clicked      (GtkWidget *widget, 
-                                           GdkEventButton *event, 
-                                           gpointer user_data);
+static void          on_header_row_activated (GtkTreeView *treeview, GtkTreePath *path,
+                                             GtkTreeViewColumn *column, gpointer userdata);
+
+static gint          cmp_rows               (GtkTreeModel *tree_model,
+                                            GtkTreeIter *iter1,
+                                            GtkTreeIter *iter2,
+                                            gpointer user_data);
 
-static gint          cmp_rows               (GtkTreeModel *tree_model, 
-                                            GtkTreeIter *iter1, 
+static gint          cmp_subject_rows       (GtkTreeModel *tree_model,
+                                            GtkTreeIter *iter1,
                                             GtkTreeIter *iter2,
                                             gpointer user_data);
 
-static void          on_selection_changed   (GtkTreeSelection *sel, 
+static gboolean     filter_row             (GtkTreeModel *model,
+                                           GtkTreeIter *iter,
+                                           gpointer data);
+
+static void         on_account_removed     (TnyAccountStore *self, 
+                                           TnyAccount *account,
+                                           gpointer user_data);
+
+static void          on_selection_changed   (GtkTreeSelection *sel,
                                             gpointer user_data);
 
-static void          setup_drag_and_drop    (GtkTreeView *self);
+static gboolean      on_button_press_event  (GtkWidget * self, GdkEventButton * event,
+                                             gpointer userdata);
+
+static gboolean      on_button_release_event(GtkWidget * self, GdkEventButton * event,
+                                             gpointer userdata);
+
+static void          setup_drag_and_drop    (GtkWidget *self);
+
+static void          enable_drag_and_drop   (GtkWidget *self);
+
+static void          disable_drag_and_drop  (GtkWidget *self);
 
 static GtkTreePath * get_selected_row       (GtkTreeView *self, GtkTreeModel **model);
 
@@ -67,20 +97,73 @@ static gboolean      on_focus_in            (GtkWidget     *sef,
                                             GdkEventFocus *event,
                                             gpointer       user_data);
 
+static gboolean      on_focus_out            (GtkWidget     *self,
+                                             GdkEventFocus *event,
+                                             gpointer       user_data);
+
+static void          folder_monitor_update  (TnyFolderObserver *self, 
+                                            TnyFolderChange *change);
+
+static void          tny_folder_observer_init (TnyFolderObserverIface *klass);
+
+static void          _clipboard_set_selected_data (ModestHeaderView *header_view, gboolean delete);
+
+static void          _clear_hidding_filter (ModestHeaderView *header_view);
+
+static void modest_header_view_notify_observers(
+               ModestHeaderView *header_view,
+               GtkTreeModel *model,
+               const gchar *tny_folder_id);
+
+static gboolean modest_header_view_on_expose_event(
+               GtkTreeView *header_view,
+               GdkEventExpose *event,
+               gpointer user_data);
+
+typedef enum {
+       HEADER_VIEW_NON_EMPTY,
+       HEADER_VIEW_EMPTY,
+       HEADER_VIEW_INIT
+} HeaderViewStatus;
+
 typedef struct _ModestHeaderViewPrivate ModestHeaderViewPrivate;
 struct _ModestHeaderViewPrivate {
        TnyFolder            *folder;
        ModestHeaderViewStyle style;
 
        TnyFolderMonitor     *monitor;
-       GMutex               *monitor_lock;
+       GMutex               *observers_lock;
+
+       /*header-view-observer observer*/
+       GMutex *observer_list_lock;
+       GSList *observer_list;
+
+       /* not unref this object, its a singlenton */
+       ModestEmailClipboard *clipboard;
+
+       /* Filter tree model */
+       gchar **hidding_ids;
+       guint   n_selected;
+
+       gint    sort_colid[2][TNY_FOLDER_TYPE_NUM];
+       gint    sort_type[2][TNY_FOLDER_TYPE_NUM];
 
-       gint                  sort_colid[2][TNY_FOLDER_TYPE_NUM];
-       gint                  sort_type[2][TNY_FOLDER_TYPE_NUM];
+       gulong  selection_changed_handler;
+       gulong  acc_removed_handler;
 
+       GList *drag_begin_cached_selected_rows;
 
+       HeaderViewStatus status;
+       guint status_timeout;
 };
 
+typedef struct _HeadersCountChangedHelper HeadersCountChangedHelper;
+struct _HeadersCountChangedHelper {
+       ModestHeaderView *self;
+       TnyFolderChange  *change;       
+};
+
+
 #define MODEST_HEADER_VIEW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
                                                MODEST_TYPE_HEADER_VIEW, \
                                                 ModestHeaderViewPrivate))
@@ -93,7 +176,8 @@ enum {
        HEADER_SELECTED_SIGNAL,
        HEADER_ACTIVATED_SIGNAL,
        ITEM_NOT_FOUND_SIGNAL,
-       STATUS_UPDATE_SIGNAL,
+       MSG_COUNT_CHANGED_SIGNAL,
+       UPDATING_MSG_LIST_SIGNAL,
        LAST_SIGNAL
 };
 
@@ -120,9 +204,21 @@ modest_header_view_get_type (void)
                        (GInstanceInitFunc) modest_header_view_init,
                        NULL
                };
+
+               static const GInterfaceInfo tny_folder_observer_info = 
+               {
+                       (GInterfaceInitFunc) tny_folder_observer_init, /* interface_init */
+                       NULL,         /* interface_finalize */
+                       NULL          /* interface_data */
+               };
                my_type = g_type_register_static (GTK_TYPE_TREE_VIEW,
                                                  "ModestHeaderView",
                                                  &my_info, 0);
+
+               g_type_add_interface_static (my_type, TNY_TYPE_FOLDER_OBSERVER,
+                                            &tny_folder_observer_info);
+
+
        }
        return my_type;
 }
@@ -135,6 +231,7 @@ modest_header_view_class_init (ModestHeaderViewClass *klass)
 
        parent_class            = g_type_class_peek_parent (klass);
        gobject_class->finalize = modest_header_view_finalize;
+       gobject_class->dispose = modest_header_view_dispose;
        
        g_type_class_add_private (gobject_class, sizeof(ModestHeaderViewPrivate));
        
@@ -166,14 +263,29 @@ modest_header_view_class_init (ModestHeaderViewClass *klass)
                              g_cclosure_marshal_VOID__INT,
                              G_TYPE_NONE, 1, G_TYPE_INT);
 
-       signals[STATUS_UPDATE_SIGNAL] =
-               g_signal_new ("status_update",
+       signals[MSG_COUNT_CHANGED_SIGNAL] =
+               g_signal_new ("msg_count_changed",
+                             G_TYPE_FROM_CLASS (gobject_class),
+                             G_SIGNAL_RUN_FIRST,
+                             G_STRUCT_OFFSET (ModestHeaderViewClass, msg_count_changed),
+                             NULL, NULL,
+                             modest_marshal_VOID__POINTER_POINTER,
+                             G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER);
+
+       signals[UPDATING_MSG_LIST_SIGNAL] =
+               g_signal_new ("updating-msg-list",
                              G_TYPE_FROM_CLASS (gobject_class),
                              G_SIGNAL_RUN_FIRST,
-                             G_STRUCT_OFFSET (ModestHeaderViewClass,status_update),
+                             G_STRUCT_OFFSET (ModestHeaderViewClass, updating_msg_list),
                              NULL, NULL,
-                             modest_marshal_VOID__STRING_INT_INT,
-                             G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT);
+                             g_cclosure_marshal_VOID__BOOLEAN,
+                             G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+}
+
+static void
+tny_folder_observer_init (TnyFolderObserverIface *klass)
+{
+       klass->update = folder_monitor_update;
 }
 
 static GtkTreeViewColumn*
@@ -190,7 +302,7 @@ get_new_column (const gchar *name, GtkCellRenderer *renderer,
        if (resizable) 
                gtk_tree_view_column_set_expand (column, TRUE);
        
-       if (show_as_text) 
+       if (show_as_text)
                gtk_tree_view_column_add_attribute (column, renderer, "text",
                                                    sort_col_id);
        if (sort_col_id >= 0)
@@ -206,8 +318,6 @@ get_new_column (const gchar *name, GtkCellRenderer *renderer,
 }
 
 
-
-
 static void
 remove_all_columns (ModestHeaderView *obj)
 {
@@ -224,36 +334,85 @@ remove_all_columns (ModestHeaderView *obj)
 gboolean
 modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, TnyFolderType type)
 {
-       GtkTreeModel *sortable;
+       GtkTreeModel *tree_filter, *sortable;
        GtkTreeViewColumn *column=NULL;
        GtkTreeSelection *selection = NULL;
        GtkCellRenderer *renderer_msgtype,*renderer_header,
-               *renderer_attach,  *renderer_comptact_flag, 
-               *renderer_compact_date;
+               *renderer_attach, *renderer_compact_date_or_status;
+       GtkCellRenderer *renderer_compact_header, *renderer_recpt_box, 
+               *renderer_subject, *renderer_subject_box, *renderer_recpt,
+               *renderer_priority;
        ModestHeaderViewPrivate *priv;
+       GtkTreeViewColumn *compact_column = NULL;
        const GList *cursor;
+
+       g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), FALSE);
+       g_return_val_if_fail (type != TNY_FOLDER_TYPE_INVALID, FALSE);
        
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); 
 
        /* FIXME: check whether these renderers need to be freed */
        renderer_msgtype = gtk_cell_renderer_pixbuf_new ();
        renderer_attach  = gtk_cell_renderer_pixbuf_new ();
+       renderer_priority  = gtk_cell_renderer_pixbuf_new ();
        renderer_header  = gtk_cell_renderer_text_new ();
-       renderer_comptact_flag  = gtk_cell_renderer_pixbuf_new ();
-       renderer_compact_date  = gtk_cell_renderer_text_new ();
 
+       renderer_compact_header = modest_vbox_cell_renderer_new ();
+       renderer_recpt_box = modest_hbox_cell_renderer_new ();
+       renderer_subject_box = modest_hbox_cell_renderer_new ();
+       renderer_recpt = gtk_cell_renderer_text_new ();
+       renderer_subject = gtk_cell_renderer_text_new ();
+       renderer_compact_date_or_status  = gtk_cell_renderer_text_new ();
+
+       modest_vbox_cell_renderer_append (MODEST_VBOX_CELL_RENDERER (renderer_compact_header), renderer_subject_box, FALSE);
+       g_object_set_data (G_OBJECT (renderer_compact_header), "subject-box-renderer", renderer_subject_box);
+       modest_vbox_cell_renderer_append (MODEST_VBOX_CELL_RENDERER (renderer_compact_header), renderer_recpt_box, FALSE);
+       g_object_set_data (G_OBJECT (renderer_compact_header), "recpt-box-renderer", renderer_recpt_box);
+       modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_subject_box), renderer_priority, FALSE);
+       g_object_set_data (G_OBJECT (renderer_subject_box), "priority-renderer", renderer_priority);
+       modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_subject_box), renderer_subject, TRUE);
+       g_object_set_data (G_OBJECT (renderer_subject_box), "subject-renderer", renderer_subject);
+       modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_recpt_box), renderer_attach, FALSE);
+       g_object_set_data (G_OBJECT (renderer_recpt_box), "attach-renderer", renderer_attach);
+       modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_recpt_box), renderer_recpt, TRUE);
+       g_object_set_data (G_OBJECT (renderer_recpt_box), "recipient-renderer", renderer_recpt);
+       modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_recpt_box), renderer_compact_date_or_status, FALSE);
+       g_object_set_data (G_OBJECT (renderer_recpt_box), "date-renderer", renderer_compact_date_or_status);
+
+       g_object_set (G_OBJECT (renderer_subject_box), "yalign", 1.0, NULL);
+       gtk_cell_renderer_set_fixed_size (renderer_subject_box, -1, 32);
+       gtk_cell_renderer_set_fixed_size (renderer_recpt_box, -1, 32);
+       g_object_set (G_OBJECT (renderer_recpt_box), "yalign", 0.0, NULL);
        g_object_set(G_OBJECT(renderer_header),
                     "ellipsize", PANGO_ELLIPSIZE_END,
                     NULL);
-       g_object_set(G_OBJECT(renderer_compact_date),
-                    "xalign", 1.0,
+       g_object_set (G_OBJECT (renderer_subject),
+                     "ellipsize", PANGO_ELLIPSIZE_END, "yalign", 1.0,
+                     NULL);
+       gtk_cell_renderer_text_set_fixed_height_from_font (GTK_CELL_RENDERER_TEXT (renderer_subject), 1);
+       g_object_set (G_OBJECT (renderer_recpt),
+                     "ellipsize", PANGO_ELLIPSIZE_END, "yalign", 0.0,
+                     NULL);
+       gtk_cell_renderer_text_set_fixed_height_from_font (GTK_CELL_RENDERER_TEXT (renderer_recpt), 1);
+       g_object_set(G_OBJECT(renderer_compact_date_or_status),
+                    "xalign", 1.0, "yalign", 0.0,
                     NULL);
+       gtk_cell_renderer_text_set_fixed_height_from_font (GTK_CELL_RENDERER_TEXT (renderer_compact_date_or_status), 1);
+       g_object_set (G_OBJECT (renderer_priority),
+                     "yalign", 1.0, NULL);
+       g_object_set (G_OBJECT (renderer_attach),
+                     "yalign", 0.0, NULL);
+
+       gtk_cell_renderer_set_fixed_size (renderer_attach, 32, 26);
+       gtk_cell_renderer_set_fixed_size (renderer_priority, 32, 26);
+       gtk_cell_renderer_set_fixed_size (renderer_compact_header, -1, 64);
        
        remove_all_columns (self);
 
        selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
        gtk_tree_selection_set_mode(selection, GTK_SELECTION_MULTIPLE);
-       sortable = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+       tree_filter = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+       sortable = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER(tree_filter));
 
        /* Add new columns */
        for (cursor = columns; cursor; cursor = g_list_next(cursor)) {
@@ -302,29 +461,24 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn
                                                 GINT_TO_POINTER(FALSE));
                        break;
                        
-               case MODEST_HEADER_VIEW_COLUMN_COMPACT_FLAG:
-                       column = get_new_column (_("F"), renderer_comptact_flag, FALSE,
-                                                TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,
-                                                FALSE,
-                                                (GtkTreeCellDataFunc)_modest_header_view_compact_flag_cell_data,
-                                                NULL);
-                       gtk_tree_view_column_set_fixed_width (column, 45);
-                       break;
-
                case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN:
-                       column = get_new_column (_("Header"), renderer_header, TRUE,
-                                                TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN,
-                                                TRUE,
-                                                (GtkTreeCellDataFunc)_modest_header_view_compact_header_cell_data,
-                                                GINT_TO_POINTER(TRUE));
+                       column = get_new_column (_("Header"), renderer_compact_header, TRUE,
+                                                    TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN,
+                                                    FALSE,
+                                                    (GtkTreeCellDataFunc)_modest_header_view_compact_header_cell_data,
+                                                    GINT_TO_POINTER(MODEST_HEADER_VIEW_COMPACT_HEADER_MODE_IN));
+                       compact_column = column;
                        break;
 
                case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT:
-                       column = get_new_column (_("Header"), renderer_header, TRUE,
+                       column = get_new_column (_("Header"), renderer_compact_header, TRUE,
                                                 TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN,
-                                                TRUE,
+                                                FALSE,
                                                 (GtkTreeCellDataFunc)_modest_header_view_compact_header_cell_data,
-                                                GINT_TO_POINTER(FALSE));
+                                                GINT_TO_POINTER((type == TNY_FOLDER_TYPE_OUTBOX)?
+                                                                MODEST_HEADER_VIEW_COMPACT_HEADER_MODE_OUTBOX:
+                                                                MODEST_HEADER_VIEW_COMPACT_HEADER_MODE_OUT));
+                       compact_column = column;
                        break;
 
                        
@@ -352,23 +506,6 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn
                                                 GINT_TO_POINTER(FALSE));
                        break;
                        
-               case MODEST_HEADER_VIEW_COLUMN_COMPACT_RECEIVED_DATE:
-                       column = get_new_column (_("Received"), renderer_compact_date, FALSE,
-                                                TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN,
-                                                TRUE,
-                                                (GtkTreeCellDataFunc)_modest_header_view_compact_date_cell_data,
-                                                GINT_TO_POINTER(TRUE));
-                       gtk_tree_view_column_set_fixed_width (column, 130);
-                       break;
-                       
-               case MODEST_HEADER_VIEW_COLUMN_COMPACT_SENT_DATE:                                             
-                       column = get_new_column (_("Sent"), renderer_compact_date, FALSE,
-                                                TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN,
-                                                TRUE,
-                                                (GtkTreeCellDataFunc)_modest_header_view_compact_date_cell_data,
-                                                GINT_TO_POINTER(FALSE));
-                       gtk_tree_view_column_set_fixed_width (column, 130);
-                       break;
                case MODEST_HEADER_VIEW_COLUMN_SIZE:
                        column = get_new_column (_("Size"), renderer_header, TRUE,
                                                 TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN,
@@ -377,7 +514,7 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn
                                                 NULL); 
                        break;
                case MODEST_HEADER_VIEW_COLUMN_STATUS:
-                       column = get_new_column (_("Status"), renderer_compact_date, TRUE,
+                       column = get_new_column (_("Status"), renderer_compact_date_or_status, TRUE,
                                                 TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN,
                                                 FALSE,
                                                 (GtkTreeCellDataFunc)_modest_header_view_status_cell_data,
@@ -388,13 +525,6 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn
                        g_return_val_if_reached(FALSE);
                }
 
-               if (sortable) {
-                       gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(sortable),
-                                                        col,
-                                                        (GtkTreeIterCompareFunc) cmp_rows,
-                                                        column, NULL);
-               }
-
                /* we keep the column id around */
                g_object_set_data (G_OBJECT(column), MODEST_HEADER_VIEW_COLUMN,
                                   GINT_TO_POINTER(col));
@@ -405,6 +535,18 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn
                gtk_tree_view_append_column (GTK_TREE_VIEW(self), column);              
        }               
 
+       if (sortable) {
+               gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(sortable),
+                                                TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,
+                                                (GtkTreeIterCompareFunc) cmp_rows,
+                                                compact_column, NULL);
+               gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (sortable),
+                                                TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN,
+                                                (GtkTreeIterCompareFunc) cmp_subject_rows,
+                                                compact_column, NULL);
+       }
+
+
        return TRUE;
 }
 
@@ -419,7 +561,19 @@ modest_header_view_init (ModestHeaderView *obj)
        priv->folder  = NULL;
 
        priv->monitor        = NULL;
-       priv->monitor_lock   = g_mutex_new ();
+       priv->observers_lock = g_mutex_new ();
+
+       priv->status  = HEADER_VIEW_INIT;
+       priv->status_timeout = 0;
+
+       priv->observer_list_lock = g_mutex_new();
+       priv->observer_list = NULL;
+
+       priv->clipboard = modest_runtime_get_email_clipboard ();
+       priv->hidding_ids = NULL;
+       priv->n_selected = 0;
+       priv->selection_changed_handler = 0;
+       priv->acc_removed_handler = 0;
 
        /* Sort parameters */
        for (j=0; j < 2; j++) {
@@ -429,7 +583,35 @@ modest_header_view_init (ModestHeaderView *obj)
                }                       
        }
 
-       setup_drag_and_drop (GTK_TREE_VIEW (obj));
+       setup_drag_and_drop (GTK_WIDGET(obj));
+}
+
+static void
+modest_header_view_dispose (GObject *obj)
+{
+       ModestHeaderView        *self;
+       ModestHeaderViewPrivate *priv;
+       GtkTreeSelection *sel;
+       
+       self = MODEST_HEADER_VIEW(obj);
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+
+       /* Free in the dispose to avoid unref cycles */
+       if (priv->folder) {
+               tny_folder_remove_observer (priv->folder, TNY_FOLDER_OBSERVER (obj));
+               g_object_unref (G_OBJECT (priv->folder));
+               priv->folder = NULL;
+       }
+
+       /* We need to do this here in the dispose because the
+          selection won't exist when finalizing */
+       sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(self));
+       if (sel && g_signal_handler_is_connected (sel, priv->selection_changed_handler)) {
+               g_signal_handler_disconnect (sel, priv->selection_changed_handler);
+               priv->selection_changed_handler = 0;
+       }
+
+       G_OBJECT_CLASS(parent_class)->dispose (obj);
 }
 
 static void
@@ -441,18 +623,27 @@ modest_header_view_finalize (GObject *obj)
        self = MODEST_HEADER_VIEW(obj);
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
 
-       g_mutex_lock (priv->monitor_lock);
+       if (g_signal_handler_is_connected (modest_runtime_get_account_store (), 
+                                          priv->acc_removed_handler)) {
+               g_signal_handler_disconnect (modest_runtime_get_account_store (), 
+                                            priv->acc_removed_handler);
+       }
+
+       /* There is no need to lock because there should not be any
+        * reference to self now. */
+       g_mutex_free(priv->observer_list_lock);
+       g_slist_free(priv->observer_list);
+
+       g_mutex_lock (priv->observers_lock);
        if (priv->monitor) {
                tny_folder_monitor_stop (priv->monitor);
                g_object_unref (G_OBJECT (priv->monitor));
        }
-       g_mutex_unlock (priv->monitor_lock);
-       g_mutex_free (priv->monitor_lock);
+       g_mutex_unlock (priv->observers_lock);
+       g_mutex_free (priv->observers_lock);
 
-       if (priv->folder) {
-               g_object_unref (G_OBJECT (priv->folder));
-               priv->folder   = NULL;
-       }
+       /* Clear hidding array created by cut operation */
+       _clear_hidding_filter (MODEST_HEADER_VIEW (obj));
 
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
@@ -474,7 +665,6 @@ modest_header_view_new (TnyFolder *folder, ModestHeaderViewStyle style)
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
        
        modest_header_view_set_style   (self, style);
-       modest_header_view_set_folder (self, NULL);
 
        gtk_tree_view_columns_autosize (GTK_TREE_VIEW(obj));
        gtk_tree_view_set_fixed_height_mode (GTK_TREE_VIEW(obj),TRUE);
@@ -482,21 +672,69 @@ modest_header_view_new (TnyFolder *folder, ModestHeaderViewStyle style)
        
        gtk_tree_view_set_rules_hint (GTK_TREE_VIEW(obj),
                                      TRUE); /* alternating row colors */
-       sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
-       
-       g_signal_connect (sel, "changed",
-                         G_CALLBACK(on_selection_changed), self);
+
+       sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self)); 
+       priv->selection_changed_handler =
+               g_signal_connect_after (sel, "changed",
+                                       G_CALLBACK(on_selection_changed), self);
        
-       g_signal_connect (self, "button-press-event",
-                         G_CALLBACK(on_header_clicked), NULL);
+       g_signal_connect (self, "row-activated",
+                         G_CALLBACK (on_header_row_activated), NULL);
 
        g_signal_connect (self, "focus-in-event",
                          G_CALLBACK(on_focus_in), NULL);
+       g_signal_connect (self, "focus-out-event",
+                         G_CALLBACK(on_focus_out), NULL);
+
+       g_signal_connect (self, "button-press-event",
+                         G_CALLBACK(on_button_press_event), NULL);
+       g_signal_connect (self, "button-release-event",
+                         G_CALLBACK(on_button_release_event), NULL);
        
+       priv->acc_removed_handler = g_signal_connect (modest_runtime_get_account_store (),
+                                                     "account_removed",
+                                                     G_CALLBACK (on_account_removed),
+                                                     self);
+
+       g_signal_connect (self, "expose-event",
+                       G_CALLBACK(modest_header_view_on_expose_event),
+                       NULL);
+
        return GTK_WIDGET(self);
 }
 
 
+guint
+modest_header_view_count_selected_headers (ModestHeaderView *self)
+{
+       GtkTreeSelection *sel;
+       guint selected_rows;
+
+       g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), 0);
+       
+       /* Get selection object and check selected rows count */
+       sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
+       selected_rows = gtk_tree_selection_count_selected_rows (sel);
+       
+       return selected_rows;
+}
+
+gboolean
+modest_header_view_has_selected_headers (ModestHeaderView *self)
+{
+       GtkTreeSelection *sel;
+       gboolean empty;
+       
+       g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), FALSE);
+       
+       /* Get selection object and check selected rows count */
+       sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
+       empty = gtk_tree_selection_count_selected_rows (sel) == 0;
+       
+       return !empty;
+}
+
+
 TnyList * 
 modest_header_view_get_selected_headers (ModestHeaderView *self)
 {
@@ -508,7 +746,7 @@ modest_header_view_get_selected_headers (ModestHeaderView *self)
        GtkTreeModel *tree_model = NULL;
        GtkTreeIter iter;
 
-       g_return_val_if_fail (self, NULL);
+       g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), NULL);
        
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
 
@@ -582,6 +820,8 @@ modest_header_view_select_next (ModestHeaderView *self)
        GtkTreeModel *model;
        GtkTreePath *path;
 
+       g_return_if_fail (self && MODEST_IS_HEADER_VIEW(self));
+
        sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
        path = get_selected_row (GTK_TREE_VIEW(self), &model);
        if ((path != NULL) && (gtk_tree_model_get_iter(model, &iter, path))) {
@@ -606,6 +846,8 @@ modest_header_view_select_prev (ModestHeaderView *self)
        GtkTreeModel *model;
        GtkTreePath *path;
 
+       g_return_if_fail (self && MODEST_IS_HEADER_VIEW(self));
+
        sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
        path = get_selected_row (GTK_TREE_VIEW(self), &model);
        if ((path != NULL) && (gtk_tree_model_get_iter(model, &iter, path))) {
@@ -627,19 +869,13 @@ modest_header_view_select_prev (ModestHeaderView *self)
 
 GList*
 modest_header_view_get_columns (ModestHeaderView *self)
-{
-       g_return_val_if_fail (self, FALSE);
+{      
+       g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), NULL);
+       
        return gtk_tree_view_get_columns (GTK_TREE_VIEW(self)); 
 }
 
 
-gboolean
-modest_header_view_is_empty (ModestHeaderView *self)
-{
-       g_return_val_if_fail (self, FALSE);
-       return FALSE; /* FIXME */
-}
-
 
 gboolean
 modest_header_view_set_style (ModestHeaderView *self,
@@ -649,10 +885,10 @@ modest_header_view_set_style (ModestHeaderView *self,
        gboolean show_col_headers = FALSE;
        ModestHeaderViewStyle old_style;
        
-       g_return_val_if_fail (self, FALSE);
+       g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), FALSE);
        g_return_val_if_fail (style >= 0 && MODEST_HEADER_VIEW_STYLE_NUM,
                              FALSE);
-
+       
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
        if (priv->style == style)
                return TRUE; /* nothing to do */
@@ -679,10 +915,41 @@ modest_header_view_set_style (ModestHeaderView *self,
 ModestHeaderViewStyle
 modest_header_view_get_style (ModestHeaderView *self)
 {
-       g_return_val_if_fail (self, FALSE);
+       g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), FALSE);
+
        return MODEST_HEADER_VIEW_GET_PRIVATE(self)->style;
 }
 
+/* This is used to automatically select the first header if the user
+ * has not selected any header yet.
+ */
+static gboolean 
+modest_header_view_on_expose_event(GtkTreeView *header_view,
+                                  GdkEventExpose *event,
+                                  gpointer user_data)
+{
+       GtkTreeSelection *sel;
+       GtkTreeModel *model;
+       GtkTreeIter tree_iter;
+
+       model = gtk_tree_view_get_model(header_view);
+
+       if (!model)
+               return FALSE;
+
+       sel = gtk_tree_view_get_selection(header_view);
+       if(!gtk_tree_selection_count_selected_rows(sel))
+               if (gtk_tree_model_get_iter_first(model, &tree_iter)) {
+                       /* Prevent the widget from getting the focus
+                          when selecting the first item */
+                       g_object_set(header_view, "can-focus", FALSE, NULL);
+                       gtk_tree_selection_select_iter(sel, &tree_iter);
+                       g_object_set(header_view, "can-focus", TRUE, NULL);
+               }
+
+       return FALSE;
+}
+
 /* 
  * This function sets a sortable model in the header view. It's just
  * used for developing purposes, because it only does a
@@ -691,27 +958,26 @@ modest_header_view_get_style (ModestHeaderView *self)
 static void
 modest_header_view_set_model (GtkTreeView *header_view, GtkTreeModel *model)
 {
-       GtkTreeModel *old_model_sort = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view));
-
-       if (old_model_sort && GTK_IS_TREE_MODEL_SORT (old_model_sort)) { 
-               GtkTreeModel *old_model;
-               ModestHeaderViewPrivate *priv;
-
-               priv = MODEST_HEADER_VIEW_GET_PRIVATE (header_view);
-               old_model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (old_model_sort));
-
-               /* Set new model */
-               gtk_tree_view_set_model (header_view, model);
-       } else
-               gtk_tree_view_set_model (header_view, model);
-
-       return;
+/*     GtkTreeModel *old_model_sort = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)); */
+/*     if (old_model_sort && GTK_IS_TREE_MODEL_SORT (old_model_sort)) { */
+/*             GtkTreeModel *old_model; */
+/*             ModestHeaderViewPrivate *priv; */
+/*             priv = MODEST_HEADER_VIEW_GET_PRIVATE (header_view); */
+/*             old_model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (old_model_sort)); */
+
+/*             /\* Set new model *\/ */
+/*             gtk_tree_view_set_model (header_view, model); */
+/*     } else */
+       gtk_tree_view_set_model (header_view, model);
 }
 
 TnyFolder*
 modest_header_view_get_folder (ModestHeaderView *self)
 {
        ModestHeaderViewPrivate *priv;
+
+       g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), NULL);
+
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
 
        if (priv->folder)
@@ -727,7 +993,7 @@ modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder)
        TnyList *headers;
        ModestHeaderViewPrivate *priv;
        GList *cols, *cursor;
-       GtkTreeModel *sortable; 
+       GtkTreeModel *filter_model, *sortable; 
        guint sort_colid;
        GtkSortType sort_type;
 
@@ -736,10 +1002,11 @@ modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder)
        headers = TNY_LIST (tny_gtk_header_list_model_new ());
 
        tny_gtk_header_list_model_set_folder (TNY_GTK_HEADER_LIST_MODEL(headers),
-                                             folder, FALSE);
+                                             folder, FALSE, NULL, NULL, NULL);
 
-       /* Add a folder observer */
-       g_mutex_lock (priv->monitor_lock);
+       /* Add IDLE observer (monitor) and another folder observer for
+          new messages (self) */
+       g_mutex_lock (priv->observers_lock);
        if (priv->monitor) {
                tny_folder_monitor_stop (priv->monitor);
                g_object_unref (G_OBJECT (priv->monitor));
@@ -747,40 +1014,56 @@ modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder)
        priv->monitor = TNY_FOLDER_MONITOR (tny_folder_monitor_new (folder));
        tny_folder_monitor_add_list (priv->monitor, TNY_LIST (headers));
        tny_folder_monitor_start (priv->monitor);
-       g_mutex_unlock (priv->monitor_lock);
-
+       g_mutex_unlock (priv->observers_lock);
 
        sortable = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL(headers));
        g_object_unref (G_OBJECT (headers));
 
+       /* Init filter_row function to examine empty status */
+       priv->status  = HEADER_VIEW_INIT;
+
+       /* Create a tree model filter to hide and show rows for cut operations  */
+       filter_model = gtk_tree_model_filter_new (sortable, NULL);
+       gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (filter_model),
+                                               filter_row,
+                                               self,
+                                               NULL);
+       g_object_unref (G_OBJECT (sortable));
+
        /* install our special sorting functions */
        cursor = cols = gtk_tree_view_get_columns (GTK_TREE_VIEW(self));
-       while (cursor) {
-               gint col_id = GPOINTER_TO_INT (g_object_get_data(G_OBJECT(cursor->data),
-                                                                MODEST_HEADER_VIEW_COLUMN));
-               gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(sortable),
-                                                col_id,
-                                                (GtkTreeIterCompareFunc) cmp_rows,
-                                                cursor->data, NULL);
-               cursor = g_list_next(cursor);
-       }
 
        /* Restore sort column id */
        if (cols) {
                type  = modest_tny_folder_guess_folder_type (folder);
+               if (type == TNY_FOLDER_TYPE_INVALID)
+                       g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
+               
                sort_colid = modest_header_view_get_sort_column_id (self, type); 
                sort_type = modest_header_view_get_sort_type (self, type); 
                gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable),
                                                      sort_colid,
                                                      sort_type);
+               gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(sortable),
+                                                TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,
+                                                (GtkTreeIterCompareFunc) cmp_rows,
+                                                cols->data, NULL);
+               gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(sortable),
+                                                TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN,
+                                                (GtkTreeIterCompareFunc) cmp_subject_rows,
+                                                cols->data, NULL);
        }
 
        /* Set new model */
-       modest_header_view_set_model (GTK_TREE_VIEW (self), sortable);
-       g_object_unref (G_OBJECT (sortable));
+       modest_header_view_set_model (GTK_TREE_VIEW (self), filter_model);
+       modest_header_view_notify_observers(self, GTK_TREE_MODEL(filter_model),
+                       tny_folder_get_id(folder));
+       g_object_unref (G_OBJECT (filter_model));
+/*     modest_header_view_set_model (GTK_TREE_VIEW (self), sortable); */
+/*     g_object_unref (G_OBJECT (sortable)); */
 
        /* Free */
-       g_list_free (cols);     
+       g_list_free (cols);
 }
 
 void
@@ -789,25 +1072,29 @@ modest_header_view_sort_by_column_id (ModestHeaderView *self,
                                      GtkSortType sort_type)
 {
        ModestHeaderViewPrivate *priv = NULL;
-       GtkTreeModel *sortable = NULL; 
+       GtkTreeModel *tree_filter, *sortable = NULL; 
        TnyFolderType type;
 
+       g_return_if_fail (self && MODEST_IS_HEADER_VIEW(self));
+       g_return_if_fail (sort_type == GTK_SORT_ASCENDING || sort_type == GTK_SORT_DESCENDING);
+       
        /* Get model and private data */
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);            
-       sortable = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+       tree_filter = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+       sortable = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER(tree_filter));
+/*     sortable = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); */
        
        /* Sort tree model */
        type  = modest_tny_folder_guess_folder_type (priv->folder);
-       gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable),
+       if (type == TNY_FOLDER_TYPE_INVALID)
+               g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
+       else {
+               gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable),
                                              sort_colid,
                                              sort_type);
-       /* Store new sort parameters */
-       modest_header_view_set_sort_params (self, sort_colid, sort_type, type);
-
-       /* Save GConf parameters */
-/*     modest_widget_memory_save (modest_runtime_get_conf(), */
-/*                                G_OBJECT(self), "header-view"); */
-       
+               /* Store new sort parameters */
+               modest_header_view_set_sort_params (self, sort_colid, sort_type, type);
+       }       
 }
 
 void
@@ -818,7 +1105,11 @@ modest_header_view_set_sort_params (ModestHeaderView *self,
 {
        ModestHeaderViewPrivate *priv;
        ModestHeaderViewStyle style;
-
+       
+       g_return_if_fail (self && MODEST_IS_HEADER_VIEW(self));
+       g_return_if_fail (sort_type == GTK_SORT_ASCENDING || sort_type == GTK_SORT_DESCENDING);
+       g_return_if_fail (type != TNY_FOLDER_TYPE_INVALID);
+       
        style = modest_header_view_get_style   (self);
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
 
@@ -833,6 +1124,9 @@ modest_header_view_get_sort_column_id (ModestHeaderView *self,
        ModestHeaderViewPrivate *priv;
        ModestHeaderViewStyle style;
 
+       g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), 0);
+       g_return_val_if_fail (type != TNY_FOLDER_TYPE_INVALID, 0);
+       
        style = modest_header_view_get_style   (self);
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
 
@@ -845,107 +1139,223 @@ modest_header_view_get_sort_type (ModestHeaderView *self,
 {
        ModestHeaderViewPrivate *priv;
        ModestHeaderViewStyle style;
-
+       
+       g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), GTK_SORT_DESCENDING);
+       g_return_val_if_fail (type != TNY_FOLDER_TYPE_INVALID, GTK_SORT_DESCENDING);
+       
        style = modest_header_view_get_style   (self);
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
 
        return priv->sort_type[style][type];
 }
 
+typedef struct {
+       ModestHeaderView *header_view;
+       RefreshAsyncUserCallback cb;
+       gpointer user_data;
+} SetFolderHelper;
+
+static void
+folder_refreshed_cb (ModestMailOperation *mail_op,
+                    TnyFolder *folder,
+                    gpointer user_data)
+{
+       ModestHeaderViewPrivate *priv;
+       SetFolderHelper *info;
+       info = (SetFolderHelper*) user_data;
+
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(info->header_view);
+
+       /* User callback */
+       if (info->cb)
+               info->cb (mail_op, folder, info->user_data);
+
+       /* Start the folder count changes observer. We do not need it
+          before the refresh. Note that the monitor could still be
+          called for this refresh but now we know that the callback
+          was previously called */
+       g_mutex_lock (priv->observers_lock);
+       tny_folder_add_observer (folder, TNY_FOLDER_OBSERVER (info->header_view));
+       g_mutex_unlock (priv->observers_lock);
+
+       /* Notify the observers that the update is over */
+       g_signal_emit (G_OBJECT (info->header_view), 
+                      signals[UPDATING_MSG_LIST_SIGNAL], 0, FALSE, NULL);
+
+       /* Frees */
+       g_object_unref (info->header_view);
+       g_free (info);
+}
+
+static void
+refresh_folder_error_handler (ModestMailOperation *mail_op, 
+                             gpointer user_data)
+{
+       const GError *error = modest_mail_operation_get_error (mail_op);
+
+       if (error->code == TNY_SYSTEM_ERROR_MEMORY ||
+           error->code == TNY_IO_ERROR_WRITE ||
+           error->code == TNY_IO_ERROR_READ) {
+               ModestMailOperationStatus st = modest_mail_operation_get_status (mail_op);
+               /* If the mail op has been cancelled then it's not an error: don't show any message */
+               if (st != MODEST_MAIL_OPERATION_STATUS_CANCELED) {
+                       modest_platform_information_banner (NULL, NULL,
+                                                           dgettext("ke-recv",
+                                                                    "cerm_device_memory_full"));
+               }
+       }
+}
+
 void
-modest_header_view_set_folder (ModestHeaderView *self, TnyFolder *folder)
+modest_header_view_set_folder (ModestHeaderView *self, 
+                              TnyFolder *folder,
+                              RefreshAsyncUserCallback callback,
+                              gpointer user_data)
 {
        ModestHeaderViewPrivate *priv;
+       SetFolderHelper *info;
+       ModestWindow *main_win;
+       
+       g_return_if_fail (self);
 
-       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+       priv =     MODEST_HEADER_VIEW_GET_PRIVATE(self);
 
+       main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
+                                                     FALSE); /* don't create */
+       if (!main_win) {
+               g_warning ("%s: BUG: no main window", __FUNCTION__);
+               return;
+       }
+                                                     
        if (priv->folder) {
+               if (priv->status_timeout)
+                       g_source_remove (priv->status_timeout);
+
+               g_mutex_lock (priv->observers_lock);
+               tny_folder_remove_observer (priv->folder, TNY_FOLDER_OBSERVER (self));
                g_object_unref (priv->folder);
                priv->folder = NULL;
+               g_mutex_unlock (priv->observers_lock);
        }
 
        if (folder) {
-               ModestMailOperation *mail_op;
+               ModestMailOperation *mail_op = NULL;
+               GtkTreeSelection *selection;
 
                /* Set folder in the model */
                modest_header_view_set_folder_intern (self, folder);
-
+               
                /* Pick my reference. Nothing to do with the mail operation */
                priv->folder = g_object_ref (folder);
 
-               /* no message selected */
+               /* Clear the selection if exists */
+               selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
+               gtk_tree_selection_unselect_all(selection);
                g_signal_emit (G_OBJECT(self), signals[HEADER_SELECTED_SIGNAL], 0, NULL);
 
-               /* Create the mail operation */
-               mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_RECEIVE);
+               /* Notify the observers that the update begins */
+               g_signal_emit (G_OBJECT (self), signals[UPDATING_MSG_LIST_SIGNAL], 
+                              0, TRUE, NULL);
+
+               /* create the helper */
+               info = g_malloc0 (sizeof(SetFolderHelper));
+               info->header_view = g_object_ref (self);
+               info->cb = callback;
+               info->user_data = user_data;
+
+               /* Create the mail operation (source will be the parent widget) */
+               mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT(main_win),
+                                                                        refresh_folder_error_handler,
+                                                                        NULL, NULL);
                modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
                                                 mail_op);
 
                /* Refresh the folder asynchronously */
-               modest_mail_operation_refresh_folder (mail_op, folder);
+               modest_mail_operation_refresh_folder (mail_op,
+                                                     folder,
+                                                     folder_refreshed_cb,
+                                                     info);
 
                /* Free */
                g_object_unref (mail_op);
-
        } else {
-               g_mutex_lock (priv->monitor_lock);
-               modest_header_view_set_model (GTK_TREE_VIEW (self), NULL); 
+               g_mutex_lock (priv->observers_lock);
 
                if (priv->monitor) {
                        tny_folder_monitor_stop (priv->monitor);
                        g_object_unref (G_OBJECT (priv->monitor));
                        priv->monitor = NULL;
                }
-               g_mutex_unlock (priv->monitor_lock);
+               modest_header_view_set_model (GTK_TREE_VIEW (self), NULL); 
+
+               modest_header_view_notify_observers(self, NULL, NULL);
+
+               g_mutex_unlock (priv->observers_lock);
+
+               /* Notify the observers that the update is over */
+               g_signal_emit (G_OBJECT (self), signals[UPDATING_MSG_LIST_SIGNAL], 
+                              0, FALSE, NULL);
        }
 }
 
-static gboolean
-on_header_clicked (GtkWidget *widget, GdkEventButton *event, gpointer user_data)
+static void
+on_header_row_activated (GtkTreeView *treeview, GtkTreePath *path,
+                        GtkTreeViewColumn *column, gpointer userdata)
 {
        ModestHeaderView *self = NULL;
        ModestHeaderViewPrivate *priv = NULL;
-       GtkTreePath *path = NULL;
        GtkTreeIter iter;
        GtkTreeModel *model = NULL;
-       TnyHeader *header;
-       /* ignore everything but doubleclick */
-       if (event->type != GDK_2BUTTON_PRESS)
-               return FALSE;
+       TnyHeader *header = NULL;
+       TnyHeaderFlags flags;
 
-       self = MODEST_HEADER_VIEW (widget);
+       self = MODEST_HEADER_VIEW (treeview);
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
-       
-       path = get_selected_row (GTK_TREE_VIEW(self), &model);
+
+       model = gtk_tree_view_get_model (treeview);     
        if ((path == NULL) || (!gtk_tree_model_get_iter(model, &iter, path))) 
-               return FALSE;
-                       
+               goto frees;
+
        /* get the first selected item */
        gtk_tree_model_get (model, &iter,
-                           TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
-                           &header, -1);
+                           TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
+                           TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &header, 
+                           -1);
+
+       /* Dont open DELETED messages */
+       if (flags & TNY_HEADER_FLAG_DELETED) {
+               GtkWidget *win;
+               gchar *msg;
+               win = gtk_widget_get_ancestor (GTK_WIDGET (treeview), GTK_TYPE_WINDOW);
+               msg = modest_ui_actions_get_msg_already_deleted_error_msg (MODEST_WINDOW (win));
+               modest_platform_information_banner (NULL, NULL, msg);
+               g_free (msg);
+               goto frees;
+       }
+
        /* Emit signal */
        g_signal_emit (G_OBJECT(self), 
                       signals[HEADER_ACTIVATED_SIGNAL], 
                       0, header);
 
        /* Free */
-       g_object_unref (G_OBJECT (header));
-       gtk_tree_path_free(path);
+ frees:
+       if (header != NULL) 
+               g_object_unref (G_OBJECT (header));     
 
-       return TRUE;
 }
 
-
 static void
 on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
 {
        GtkTreeModel *model;
-       TnyHeader *header;
+       TnyHeader *header = NULL;
        GtkTreePath *path = NULL;       
        GtkTreeIter iter;
        ModestHeaderView *self;
        ModestHeaderViewPrivate *priv;
+       GList *selected = NULL;
        
        g_return_if_fail (sel);
        g_return_if_fail (user_data);
@@ -953,7 +1363,9 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
        self = MODEST_HEADER_VIEW (user_data);
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);    
 
-       path = get_selected_row (GTK_TREE_VIEW(self), &model);
+       selected = gtk_tree_selection_get_selected_rows (sel, &model);
+       if (selected != NULL) 
+               path = (GtkTreePath *) selected->data;
        if ((path == NULL) || (!gtk_tree_model_get_iter(model, &iter, path)))
                return; /* msg was _un_selected */
 
@@ -967,7 +1379,10 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
                       0, header);
 
        g_object_unref (G_OBJECT (header));
-       gtk_tree_path_free(path);
+
+       /* free all items in 'selected' */
+       g_list_foreach (selected, (GFunc)gtk_tree_path_free, NULL);
+       g_list_free (selected);
 }
 
 
@@ -980,11 +1395,33 @@ _modest_header_view_change_selection (GtkTreeSelection *selection,
                                      gpointer user_data)
 {
        g_return_if_fail (GTK_IS_TREE_SELECTION (selection));
-       g_return_if_fail (MODEST_IS_HEADER_VIEW (user_data));
-
+       g_return_if_fail (user_data && MODEST_IS_HEADER_VIEW (user_data));
+       
        on_selection_changed (selection, user_data);
 }
 
+static gint
+compare_priorities (TnyHeaderFlags p1, TnyHeaderFlags p2)
+{
+       /* HH, LL, NN */
+       if (p1 == p2)
+               return 0;
+
+       /* HL HN */
+       if (p1 == TNY_HEADER_FLAG_HIGH_PRIORITY)
+               return 1;
+
+       /* LH LN */
+       if (p1 == TNY_HEADER_FLAG_LOW_PRIORITY)
+               return -1;
+
+       /* NH */
+       if ((p1 == TNY_HEADER_FLAG_NORMAL_PRIORITY) && (p2 == TNY_HEADER_FLAG_HIGH_PRIORITY))
+               return -1;
+
+       /* NL */
+       return 1;
+}
 
 static gint
 cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
@@ -993,218 +1430,182 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
        gint col_id;
        gint t1, t2;
        gint val1, val2;
-       gchar *s1, *s2;
-       gint cmp;       
-       gint sort_colid;
-       static int counter = 0;
+       gint cmp;
+/*     static int counter = 0; */
 
        g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN(user_data), 0);
-       col_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(user_data), MODEST_HEADER_VIEW_COLUMN));
+/*     col_id = gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (tree_model)); */
+       col_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(user_data), MODEST_HEADER_VIEW_FLAG_SORT));
+
        
-       if (!(++counter % 100)) {
-               GObject *header_view = g_object_get_data(G_OBJECT(user_data),
-                                                        MODEST_HEADER_VIEW_PTR);
-               g_signal_emit (header_view,
-                              signals[STATUS_UPDATE_SIGNAL],
-                              0, _("Sorting..."), 0, 0);
-       }       
-       switch (col_id) {               
-       case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN:
-       case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT:
-               sort_colid = gtk_tree_view_column_get_sort_column_id (GTK_TREE_VIEW_COLUMN(user_data));
-               gtk_tree_model_get (tree_model, iter1,
-                                   sort_colid, &s1,
-                                   TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1,
-                                   -1);
-               gtk_tree_model_get (tree_model, iter2,
-                                   sort_colid, &s2,
-                                   TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2,
-                                   -1);
-               cmp = modest_text_utils_utf8_strcmp (s1, s2, TRUE);
-               g_free (s1);
-               g_free (s2);
-               
-               return cmp ? cmp : t1 - t2;
-               
-               break;
-
-       case MODEST_HEADER_VIEW_COLUMN_COMPACT_RECEIVED_DATE:
-       case MODEST_HEADER_VIEW_COLUMN_RECEIVED_DATE:
-
-               gtk_tree_model_get (tree_model, iter1,
-                                   TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN,
-                                   &t1,-1);
-               gtk_tree_model_get (tree_model, iter2,
-                                   TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN,
-                                   &t2,-1);
-               return t1 - t2;
-
-       case MODEST_HEADER_VIEW_COLUMN_COMPACT_SENT_DATE:
-       case MODEST_HEADER_VIEW_COLUMN_SENT_DATE:
-               gtk_tree_model_get (tree_model, iter1,
-                                   TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN,
-                                   &t1,-1);
-               gtk_tree_model_get (tree_model, iter2,
-                                   TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN,
-                                   &t2,-1);
-               return t1 - t2;
-
-               
-               /* next ones, we try the search criteria first, if they're the same, then we use 'sent date' */
-               /* FIXME: what about received-date? */
-       case MODEST_HEADER_VIEW_COLUMN_SUBJECT: {
-
-               gtk_tree_model_get (tree_model, iter1,
-                                   TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN, &s1,
-                                   TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1,
-                                   -1);
-               gtk_tree_model_get (tree_model, iter2,
-                                   TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN, &s2,
-                                   TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2,
-                                   -1);
-
-               /* the prefix ('Re:', 'Fwd:' etc.) we ignore */ 
-               cmp = modest_text_utils_utf8_strcmp (s1 + modest_text_utils_get_subject_prefix_len(s1),
-                                                    s2 + modest_text_utils_get_subject_prefix_len(s2),
-                                                    TRUE);
-               g_free (s1);
-               g_free (s2);
-               
-               return cmp ? cmp : t1 - t2;
-       }
-               
-       case MODEST_HEADER_VIEW_COLUMN_FROM:
-               
-               gtk_tree_model_get (tree_model, iter1,
-                                   TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN, &s1,
-                                   TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1,
-                                   -1);
-               gtk_tree_model_get (tree_model, iter2,
-                                   TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN, &s2,
-                                   TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2,
-                                   -1);
-               cmp = modest_text_utils_utf8_strcmp (s1, s2, TRUE);
-               g_free (s1);
-               g_free (s2);
-               
-               return cmp ? cmp : t1 - t2;
-               
-       case MODEST_HEADER_VIEW_COLUMN_TO: 
-               
-               gtk_tree_model_get (tree_model, iter1,
-                                   TNY_GTK_HEADER_LIST_MODEL_TO_COLUMN, &s1,
-                                   TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1,
-                                   -1);
-               gtk_tree_model_get (tree_model, iter2,
-                                   TNY_GTK_HEADER_LIST_MODEL_TO_COLUMN, &s2,
-                                   TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2,
-                                   -1);
-               cmp = modest_text_utils_utf8_strcmp (s1, s2, TRUE);
-               g_free (s1);
-               g_free (s2);
-               
-               return cmp ? cmp : t1 - t2;
-
-       case MODEST_HEADER_VIEW_COLUMN_ATTACH:
+       switch (col_id) {
+       case TNY_HEADER_FLAG_ATTACHMENTS:
 
                gtk_tree_model_get (tree_model, iter1, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &val1,
                                    TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1, -1);
                gtk_tree_model_get (tree_model, iter2, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &val2,
                                    TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2, -1);
-               
+
                cmp = (val1 & TNY_HEADER_FLAG_ATTACHMENTS) -
                        (val2 & TNY_HEADER_FLAG_ATTACHMENTS);
 
                return cmp ? cmp : t1 - t2;
                
-       case MODEST_HEADER_VIEW_COLUMN_MSGTYPE:
-               gtk_tree_model_get (tree_model, iter1, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &val1,
+       case TNY_HEADER_FLAG_PRIORITY_MASK: {
+               TnyHeader *header1 = NULL, *header2 = NULL;
+
+               gtk_tree_model_get (tree_model, iter1, TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &header1,
                                    TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1,-1);
-               gtk_tree_model_get (tree_model, iter2, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &val2,
+               gtk_tree_model_get (tree_model, iter2, TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &header2,
                                    TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2,-1);
-               cmp =  (val1 & TNY_HEADER_FLAG_SEEN) - (val2 & TNY_HEADER_FLAG_SEEN);
 
-               return cmp ? cmp : t1 - t2;
+               /* This is for making priority values respect the intuitive sort relationship 
+                * as HIGH is 01, LOW is 10, and NORMAL is 00 */
 
-       case MODEST_HEADER_VIEW_COLUMN_COMPACT_FLAG:
-               gtk_tree_model_get (tree_model, iter1, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &val1,
-                                   TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1, -1);
-               gtk_tree_model_get (tree_model, iter2, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &val2,
-                                   TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2, -1);
+               if (header1 && header2) {
+                       cmp =  compare_priorities (tny_header_get_priority (header1), 
+                               tny_header_get_priority (header2));
+                       g_object_unref (header1);
+                       g_object_unref (header2);
 
-               int flag_sort = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(user_data), MODEST_HEADER_VIEW_FLAG_SORT));
-               switch (flag_sort) {
-               case TNY_HEADER_FLAG_ATTACHMENTS:
-                       cmp = (val1 & TNY_HEADER_FLAG_ATTACHMENTS) -
-                               (val2 & TNY_HEADER_FLAG_ATTACHMENTS);
-                       break;
-               case TNY_HEADER_FLAG_PRIORITY:
-                       cmp = (val1 & TNY_HEADER_FLAG_PRIORITY) -
-                               (val2 & TNY_HEADER_FLAG_PRIORITY);
-                       break;
-               default:
-                       cmp = (val1 & TNY_HEADER_FLAG_PRIORITY) -
-                               (val2 & TNY_HEADER_FLAG_PRIORITY);
+                       return cmp ? cmp : t1 - t2;
                }
-               
-               return cmp ? cmp : t1 - t2;
+
+               return t1 - t2;
+       }
        default:
                return &iter1 - &iter2; /* oughhhh  */
        }
 }
 
+static gint
+cmp_subject_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
+                 gpointer user_data)
+{
+       gint t1, t2;
+       gchar *val1, *val2;
+       gint cmp;
+/*     static int counter = 0; */
+
+       g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN(user_data), 0);
+
+       gtk_tree_model_get (tree_model, iter1, TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN, &val1,
+                           TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1, -1);
+       gtk_tree_model_get (tree_model, iter2, TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN, &val2,
+                           TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2, -1);
+
+       cmp = modest_text_utils_utf8_strcmp (val1 + modest_text_utils_get_subject_prefix_len(val1),
+                                            val2 + modest_text_utils_get_subject_prefix_len(val2),
+                                            TRUE);
+       g_free (val1);
+       g_free (val2);
+       return cmp;
+}
+
 /* Drag and drop stuff */
 static void
-drag_data_get_cb (GtkWidget *widget, GdkDragContext *context, 
+drag_data_get_cb (GtkWidget *widget, 
+                 GdkDragContext *context, 
                  GtkSelectionData *selection_data, 
-                 guint info,  guint time, gpointer data)
+                 guint info,  
+                 guint time, 
+                 gpointer data)
 {
-       GtkTreeModel *model;
-       GtkTreeIter iter;
-       GtkTreePath *source_row;
-       
-       source_row = get_selected_row (GTK_TREE_VIEW(widget), &model);
-       if ((source_row == NULL) || (!gtk_tree_model_get_iter(model, &iter, source_row))) return;
+       ModestHeaderView *self = NULL;
+       ModestHeaderViewPrivate *priv = NULL;
 
-       switch (info) {
-       case MODEST_HEADER_ROW:
-               gtk_tree_set_row_drag_data (selection_data, model, source_row);
-               break;
-       case MODEST_MSG: {
-               TnyHeader *hdr;
-               gtk_tree_model_get (model, &iter,
-                                   TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &hdr,
-                                   -1);
-               if (hdr) {
-                       g_object_unref (G_OBJECT(hdr));
-               }
-               break;
-       }
-       default:
-               g_message ("default");
-       }
+       self = MODEST_HEADER_VIEW (widget);
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
 
-       gtk_tree_path_free (source_row);
+       /* Set the data. Do not use the current selection because it
+          could be different than the selection at the beginning of
+          the d&d */
+       modest_dnd_selection_data_set_paths (selection_data, 
+                                            priv->drag_begin_cached_selected_rows);
+}
+
+/**
+ * We're caching the selected rows at the beginning because the
+ * selection could change between drag-begin and drag-data-get, for
+ * example if we have a set of rows already selected, and then we
+ * click in one of them (without SHIFT key pressed) and begin a drag,
+ * the selection at that moment contains all the selected lines, but
+ * after dropping the selection, the release event provokes that only
+ * the row used to begin the drag is selected, so at the end the
+ * drag&drop affects only one rows instead of all the selected ones.
+ *
+ */
+static void
+drag_begin_cb (GtkWidget *widget, 
+              GdkDragContext *context, 
+              gpointer data)
+{
+       ModestHeaderView *self = NULL;
+       ModestHeaderViewPrivate *priv = NULL;
+       GtkTreeSelection *selection;
+
+       self = MODEST_HEADER_VIEW (widget);
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+
+       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget));
+       priv->drag_begin_cached_selected_rows = 
+               gtk_tree_selection_get_selected_rows (selection, NULL);
+}
+
+/**
+ * We use the drag-end signal to clear the cached selection, we use
+ * this because this allways happens, whether or not the d&d was a
+ * success
+ */
+static void
+drag_end_cb (GtkWidget *widget, 
+            GdkDragContext *dc, 
+            gpointer data)
+{
+       ModestHeaderView *self = NULL;
+       ModestHeaderViewPrivate *priv = NULL;
+
+       self = MODEST_HEADER_VIEW (widget);
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+
+       /* Free cached data */
+       g_list_foreach (priv->drag_begin_cached_selected_rows, (GFunc) gtk_tree_path_free, NULL);
+       g_list_free (priv->drag_begin_cached_selected_rows);
+       priv->drag_begin_cached_selected_rows = NULL;
 }
 
 /* Header view drag types */
 const GtkTargetEntry header_view_drag_types[] = {
-       { "GTK_TREE_MODEL_ROW", GTK_TARGET_SAME_APP, MODEST_HEADER_ROW },
-       { "text/uri-list",      0,                   MODEST_MSG },
+       { GTK_TREE_PATH_AS_STRING_LIST, GTK_TARGET_SAME_APP, MODEST_HEADER_ROW }
 };
 
 static void
-setup_drag_and_drop (GtkTreeView *self)
+enable_drag_and_drop (GtkWidget *self)
 {
-       gtk_drag_source_set (GTK_WIDGET (self),
-                            GDK_BUTTON1_MASK,
+       gtk_drag_source_set (self, GDK_BUTTON1_MASK,
                             header_view_drag_types,
                             G_N_ELEMENTS (header_view_drag_types),
                             GDK_ACTION_MOVE | GDK_ACTION_COPY);
+}
 
+static void
+disable_drag_and_drop (GtkWidget *self)
+{
+       gtk_drag_source_unset (self);
+}
+
+static void
+setup_drag_and_drop (GtkWidget *self)
+{
+       enable_drag_and_drop(self);
        g_signal_connect(G_OBJECT (self), "drag_data_get",
                         G_CALLBACK(drag_data_get_cb), NULL);
+
+       g_signal_connect(G_OBJECT (self), "drag_begin",
+                        G_CALLBACK(drag_begin_cb), NULL);
+
+       g_signal_connect(G_OBJECT (self), "drag_end",
+                        G_CALLBACK(drag_end_cb), NULL);
 }
 
 static GtkTreePath *
@@ -1266,6 +1667,7 @@ on_focus_in (GtkWidget     *self,
 
        /* Need to get the all the rows because is selection multiple */
        selected = gtk_tree_selection_get_selected_rows (selection, &model);
+       if (selected == NULL) return FALSE;
        selected_path = (GtkTreePath *) selected->data;
 
        /* Check if we need to scroll */
@@ -1288,6 +1690,11 @@ on_focus_in (GtkWidget     *self,
                                                      0.0);
                }
        }
+       if (start_path)
+               gtk_tree_path_free (start_path);
+       if (end_path)
+               gtk_tree_path_free (end_path);
+
        #endif /* GTK_CHECK_VERSION */
 
        /* Frees */     
@@ -1296,3 +1703,429 @@ on_focus_in (GtkWidget     *self,
 
        return FALSE;
 }
+
+static gboolean 
+on_focus_out (GtkWidget     *self,
+            GdkEventFocus *event,
+            gpointer       user_data)
+{
+
+       if (!gtk_widget_is_focus (self)) {
+               GtkTreeSelection *selection = NULL;
+               GList *selected_rows = NULL;
+               selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
+               if (gtk_tree_selection_count_selected_rows (selection) > 1) {
+                       selected_rows = gtk_tree_selection_get_selected_rows (selection, NULL);
+                       g_signal_handlers_block_by_func (selection, on_selection_changed, self);
+                       gtk_tree_selection_unselect_all (selection);
+                       gtk_tree_selection_select_path (selection, (GtkTreePath *) selected_rows->data);
+                       g_signal_handlers_unblock_by_func (selection, on_selection_changed, self);
+                       g_list_foreach (selected_rows, (GFunc) gtk_tree_path_free, NULL);
+                       g_list_free (selected_rows);
+               }
+       }
+       return FALSE;
+}
+
+static gboolean
+on_button_release_event(GtkWidget * self, GdkEventButton * event, gpointer userdata)
+{
+       enable_drag_and_drop(self);
+       return FALSE;
+}
+
+static gboolean
+on_button_press_event(GtkWidget * self, GdkEventButton * event, gpointer userdata)
+{
+       GtkTreeSelection *selection = NULL;
+       GtkTreePath *path = NULL;
+       gboolean already_selected = FALSE;
+
+       if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(self), event->x, event->y, &path, NULL, NULL, NULL)) {
+               selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
+               already_selected = gtk_tree_selection_path_is_selected (selection, path);
+       }
+
+       /* Enable drag and drop onlly if the user clicks on a row that
+          it's already selected. If not, let him select items using
+          the pointer */
+       if (!already_selected) {
+               disable_drag_and_drop(self);
+       }
+
+       if (path != NULL) {
+               gtk_tree_path_free(path);
+       }
+
+       return FALSE;
+}
+
+static void
+folder_monitor_update (TnyFolderObserver *self, 
+                      TnyFolderChange *change)
+{
+       ModestHeaderViewPrivate *priv = NULL;
+       TnyFolderChangeChanged changed;
+       TnyFolder *folder = NULL;
+
+       changed = tny_folder_change_get_changed (change);
+       
+       /* Do not notify the observers if the folder of the header
+          view has changed before this call to the observer
+          happens */
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE (MODEST_HEADER_VIEW (self));
+       folder = tny_folder_change_get_folder (change);
+       if (folder != priv->folder)
+               goto frees;
+
+       MODEST_DEBUG_BLOCK (
+                           if (changed & TNY_FOLDER_CHANGE_CHANGED_ADDED_HEADERS)
+                                   g_print ("ADDED %d/%d (r/t) \n", 
+                                            tny_folder_change_get_new_unread_count (change),
+                                            tny_folder_change_get_new_all_count (change));
+                           if (changed & TNY_FOLDER_CHANGE_CHANGED_ALL_COUNT)
+                                   g_print ("ALL COUNT %d\n", 
+                                            tny_folder_change_get_new_all_count (change));
+                           if (changed & TNY_FOLDER_CHANGE_CHANGED_UNREAD_COUNT)
+                                   g_print ("UNREAD COUNT %d\n", 
+                                            tny_folder_change_get_new_unread_count (change));
+                           if (changed & TNY_FOLDER_CHANGE_CHANGED_EXPUNGED_HEADERS)
+                                   g_print ("EXPUNGED %d/%d (r/t) \n", 
+                                            tny_folder_change_get_new_unread_count (change),
+                                            tny_folder_change_get_new_all_count (change));
+                           if (changed & TNY_FOLDER_CHANGE_CHANGED_FOLDER_RENAME)
+                                   g_print ("FOLDER RENAME\n");
+                           if (changed & TNY_FOLDER_CHANGE_CHANGED_MSG_RECEIVED)
+                                   g_print ("MSG RECEIVED %d/%d (r/t) \n", 
+                                            tny_folder_change_get_new_unread_count (change),
+                                            tny_folder_change_get_new_all_count (change));
+                           g_print ("---------------------------------------------------\n");
+                           );
+
+       /* Check folder count */
+       if ((changed & TNY_FOLDER_CHANGE_CHANGED_ADDED_HEADERS) ||
+           (changed & TNY_FOLDER_CHANGE_CHANGED_EXPUNGED_HEADERS)) {
+
+               g_mutex_lock (priv->observers_lock);
+
+               /* Emit signal to evaluate how headers changes affects
+                  to the window view  */
+               g_signal_emit (G_OBJECT(self), 
+                              signals[MSG_COUNT_CHANGED_SIGNAL], 
+                              0, folder, change);
+               
+               /* Added or removed headers, so data stored on cliboard are invalid  */
+               if (modest_email_clipboard_check_source_folder (priv->clipboard, folder))
+                       modest_email_clipboard_clear (priv->clipboard);
+           
+               g_mutex_unlock (priv->observers_lock);
+       }       
+
+       /* Free */
+ frees:
+       if (folder != NULL)
+               g_object_unref (folder);
+}
+
+gboolean
+modest_header_view_is_empty (ModestHeaderView *self)
+{
+       ModestHeaderViewPrivate *priv;
+       
+       g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), TRUE);
+       
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE (MODEST_HEADER_VIEW (self));
+
+       return priv->status == HEADER_VIEW_EMPTY;
+}
+
+void
+modest_header_view_clear (ModestHeaderView *self)
+{
+       g_return_if_fail (self && MODEST_IS_HEADER_VIEW(self));
+       
+       modest_header_view_set_folder (self, NULL, NULL, NULL);
+}
+
+void 
+modest_header_view_copy_selection (ModestHeaderView *header_view)
+{
+       g_return_if_fail (header_view && MODEST_IS_HEADER_VIEW(header_view));
+       
+       /* Copy selection */
+       _clipboard_set_selected_data (header_view, FALSE);
+}
+
+void 
+modest_header_view_cut_selection (ModestHeaderView *header_view)
+{
+       ModestHeaderViewPrivate *priv = NULL;
+       const gchar **hidding = NULL;
+       guint i, n_selected;
+
+       g_return_if_fail (header_view && MODEST_IS_HEADER_VIEW (header_view));
+       
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE (header_view);
+
+       /* Copy selection */
+       _clipboard_set_selected_data (header_view, TRUE);
+
+       /* Get hidding ids */
+       hidding = modest_email_clipboard_get_hidding_ids (priv->clipboard, &n_selected); 
+       
+       /* Clear hidding array created by previous cut operation */
+       _clear_hidding_filter (MODEST_HEADER_VIEW (header_view));
+
+       /* Copy hidding array */
+       priv->n_selected = n_selected;
+       priv->hidding_ids = g_malloc0(sizeof(gchar *) * n_selected);
+       for (i=0; i < n_selected; i++) 
+               priv->hidding_ids[i] = g_strdup(hidding[i]);            
+
+       /* Hide cut headers */
+       modest_header_view_refilter (header_view);
+}
+
+
+
+static void
+_clipboard_set_selected_data (ModestHeaderView *header_view,
+                             gboolean delete)
+{
+       ModestHeaderViewPrivate *priv = NULL;
+       TnyList *headers = NULL;
+
+       g_return_if_fail (MODEST_IS_HEADER_VIEW (header_view));
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE (header_view);
+               
+       /* Set selected data on clipboard   */
+       g_return_if_fail (MODEST_IS_EMAIL_CLIPBOARD (priv->clipboard));
+       headers = modest_header_view_get_selected_headers (header_view);
+       modest_email_clipboard_set_data (priv->clipboard, priv->folder, headers, delete);
+
+       /* Free */
+       g_object_unref (headers);
+}
+
+typedef struct {
+       ModestHeaderView *self;
+       TnyFolder *folder;
+} NotifyFilterInfo;
+
+static gboolean
+notify_filter_change (gpointer data)
+{
+       NotifyFilterInfo *info = (NotifyFilterInfo *) data;
+
+       g_signal_emit (info->self, 
+                      signals[MSG_COUNT_CHANGED_SIGNAL], 
+                      0, info->folder, NULL);
+
+       return FALSE;
+}
+
+static void
+notify_filter_change_destroy (gpointer data)
+{
+       NotifyFilterInfo *info = (NotifyFilterInfo *) data;
+
+       g_object_unref (info->self);
+       g_object_unref (info->folder);
+       g_slice_free (NotifyFilterInfo, info);
+}
+
+static gboolean
+filter_row (GtkTreeModel *model,
+           GtkTreeIter *iter,
+           gpointer user_data)
+{
+       ModestHeaderViewPrivate *priv = NULL;
+       TnyHeaderFlags flags;
+       TnyHeader *header = NULL;
+       guint i;
+       gchar *id = NULL;
+       gboolean visible = TRUE;
+       gboolean found = FALSE;
+       GValue value = {0,};
+       HeaderViewStatus old_status;
+
+       g_return_val_if_fail (MODEST_IS_HEADER_VIEW (user_data), FALSE);
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE (user_data);
+
+       /* Get header from model */
+       gtk_tree_model_get_value (model, iter, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &value);
+       flags = (TnyHeaderFlags) g_value_get_int (&value);
+       g_value_unset (&value);
+       gtk_tree_model_get_value (model, iter, TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &value);
+       header = (TnyHeader *) g_value_get_object (&value);
+       g_value_unset (&value);
+       
+       /* Hide deleted and mark as deleted heders */
+       if (flags & TNY_HEADER_FLAG_DELETED ||
+           flags & TNY_HEADER_FLAG_EXPUNGED) {
+               visible = FALSE;
+               goto frees;
+       }
+
+       /* If no data on clipboard, return always TRUE */
+       if (modest_email_clipboard_cleared(priv->clipboard)) {
+               visible = TRUE;
+               goto frees;
+       }               
+
+       /* Get message id from header (ensure is a valid id) */
+       if (!header) {
+               visible = FALSE;
+               goto frees;
+       }
+       
+       /* Check hiding */
+       if (priv->hidding_ids != NULL) {
+               id = g_strdup(tny_header_get_message_id (header));
+               for (i=0; i < priv->n_selected && !found; i++)
+                       if (priv->hidding_ids[i] != NULL && id != NULL)
+                               found = (!strcmp (priv->hidding_ids[i], id));
+       
+               visible = !found;
+               g_free(id);
+       }
+
+ frees:
+       old_status = priv->status;
+       priv->status = ((gboolean) priv->status) && !visible;
+       if (priv->status != old_status) {
+               NotifyFilterInfo *info;
+
+               if (priv->status_timeout)
+                       g_source_remove (priv->status_timeout);
+
+               info = g_slice_new0 (NotifyFilterInfo);
+               info->self = g_object_ref (G_OBJECT (user_data));
+               info->folder = tny_header_get_folder (header);
+               priv->status_timeout = g_timeout_add_full (G_PRIORITY_DEFAULT, 1000,
+                                                          notify_filter_change,
+                                                          info,
+                                                          notify_filter_change_destroy);
+       }
+
+       return visible;
+}
+
+static void
+_clear_hidding_filter (ModestHeaderView *header_view) 
+{
+       ModestHeaderViewPrivate *priv = NULL;
+       guint i;
+       
+       g_return_if_fail (MODEST_IS_HEADER_VIEW (header_view)); 
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(header_view);
+
+       if (priv->hidding_ids != NULL) {
+               for (i=0; i < priv->n_selected; i++) 
+                       g_free (priv->hidding_ids[i]);
+               g_free(priv->hidding_ids);
+       }       
+}
+
+void 
+modest_header_view_refilter (ModestHeaderView *header_view)
+{
+       GtkTreeModel *model = NULL;
+       ModestHeaderViewPrivate *priv = NULL;
+
+       g_return_if_fail (header_view && MODEST_IS_HEADER_VIEW (header_view));
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(header_view);
+       
+       /* Hide cut headers */
+       model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view));
+       if (GTK_IS_TREE_MODEL_FILTER (model)) {
+               priv->status = HEADER_VIEW_INIT;
+               gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model));
+       }
+}
+
+/* 
+ * Called when an account is removed. If I'm showing a folder of the
+ * account that has been removed then clear the view
+ */
+static void
+on_account_removed (TnyAccountStore *self, 
+                   TnyAccount *account,
+                   gpointer user_data)
+{
+       ModestHeaderViewPrivate *priv = NULL;
+
+       /* Ignore changes in transport accounts */
+       if (TNY_IS_TRANSPORT_ACCOUNT (account))
+               return;
+
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE (user_data);
+
+       if (priv->folder) {
+               TnyAccount *my_account;
+
+               my_account = tny_folder_get_account (priv->folder);
+               if (my_account == account)
+                       modest_header_view_clear (MODEST_HEADER_VIEW (user_data));
+               g_object_unref (account);
+       }
+}
+
+void
+modest_header_view_add_observer(ModestHeaderView *header_view,
+                                    ModestHeaderViewObserver *observer)
+{
+       ModestHeaderViewPrivate *priv;
+       
+       g_return_if_fail (header_view && MODEST_IS_HEADER_VIEW(header_view));
+       g_return_if_fail (observer && MODEST_IS_HEADER_VIEW_OBSERVER(observer));
+
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(header_view);
+
+       g_mutex_lock(priv->observer_list_lock);
+       priv->observer_list = g_slist_prepend(priv->observer_list, observer);
+       g_mutex_unlock(priv->observer_list_lock);
+}
+
+void 
+modest_header_view_remove_observer(ModestHeaderView *header_view,
+                                  ModestHeaderViewObserver *observer)
+{
+       ModestHeaderViewPrivate *priv;
+
+       g_return_if_fail (header_view && MODEST_IS_HEADER_VIEW(header_view));
+       g_return_if_fail (observer && MODEST_IS_HEADER_VIEW_OBSERVER(observer));
+
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(header_view);
+
+       g_mutex_lock(priv->observer_list_lock);
+       priv->observer_list = g_slist_remove(priv->observer_list, observer);
+       g_mutex_unlock(priv->observer_list_lock);
+}
+
+static void 
+modest_header_view_notify_observers(ModestHeaderView *header_view,
+                                   GtkTreeModel *model,
+                                   const gchar *tny_folder_id)
+{
+       ModestHeaderViewPrivate *priv = NULL;
+       GSList *iter;
+       ModestHeaderViewObserver *observer;
+
+
+       g_return_if_fail (header_view && MODEST_IS_HEADER_VIEW(header_view));
+       
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(header_view);
+
+       g_mutex_lock(priv->observer_list_lock);
+       iter = priv->observer_list;
+       while(iter != NULL){
+               observer = MODEST_HEADER_VIEW_OBSERVER(iter->data);
+               modest_header_view_observer_update(observer, model,
+                               tny_folder_id);
+               iter = g_slist_next(iter);
+       }
+       g_mutex_unlock(priv->observer_list_lock);
+}
+