* src/widgets/modest-header-view.c:
[modest] / src / widgets / modest-header-view.c
index e6ddf2d..776d15e 100644 (file)
 #include <modest-header-view.h>
 #include <modest-header-view-priv.h>
 #include <modest-dnd.h>
+#include <modest-tny-folder.h>
+
+#include <modest-main-window.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 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_subject_rows       (GtkTreeModel *tree_model,
+                                            GtkTreeIter *iter1,
+                                            GtkTreeIter *iter2,
+                                            gpointer user_data);
+
+static gboolean     filter_row             (GtkTreeModel *model,
+                                           GtkTreeIter *iter,
+                                           gpointer data);
+
+static void          on_selection_changed   (GtkTreeSelection *sel, 
+                                            gpointer user_data);
 
-static gboolean     on_header_clicked      (GtkWidget *widget, 
-                                           GdkEventButton *event, 
-                                           gpointer user_data);
+static void          setup_drag_and_drop    (GtkTreeView *self);
 
-static gint         cmp_rows               (GtkTreeModel *tree_model, 
-                                           GtkTreeIter *iter1, 
-                                           GtkTreeIter *iter2,
-                                           gpointer user_data);
+static GtkTreePath * get_selected_row       (GtkTreeView *self, GtkTreeModel **model);
 
-static void         on_selection_changed   (GtkTreeSelection *sel, 
-                                           gpointer user_data);
+static gboolean      on_focus_in            (GtkWidget     *sef,
+                                            GdkEventFocus *event,
+                                            gpointer       user_data);
 
-static void         setup_drag_and_drop    (GtkTreeView *self);
+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);
 
 
 typedef struct _ModestHeaderViewPrivate ModestHeaderViewPrivate;
@@ -67,9 +97,28 @@ struct _ModestHeaderViewPrivate {
        ModestHeaderViewStyle style;
 
        TnyFolderMonitor     *monitor;
-       GMutex               *monitor_lock;
+       GMutex               *observers_lock;
+
+       /* 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];
+
+
+};
+
+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))
@@ -82,7 +131,7 @@ enum {
        HEADER_SELECTED_SIGNAL,
        HEADER_ACTIVATED_SIGNAL,
        ITEM_NOT_FOUND_SIGNAL,
-       STATUS_UPDATE_SIGNAL,
+       MSG_COUNT_CHANGED_SIGNAL,
        LAST_SIGNAL
 };
 
@@ -109,9 +158,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;
 }
@@ -124,6 +185,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));
        
@@ -155,14 +217,20 @@ 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,status_update),
+                             G_STRUCT_OFFSET (ModestHeaderViewClass, msg_count_changed),
                              NULL, NULL,
-                             modest_marshal_VOID__STRING_INT_INT,
-                             G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT);
+                             modest_marshal_VOID__POINTER_POINTER,
+                             G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER);
+}
+
+static void
+tny_folder_observer_init (TnyFolderObserverIface *klass)
+{
+       klass->update_func = folder_monitor_update;
 }
 
 static GtkTreeViewColumn*
@@ -195,13 +263,11 @@ get_new_column (const gchar *name, GtkCellRenderer *renderer,
 }
 
 
-
-
 static void
 remove_all_columns (ModestHeaderView *obj)
 {
        GList *columns, *cursor;
-
+       
        columns = gtk_tree_view_get_columns (GTK_TREE_VIEW(obj));
 
        for (cursor = columns; cursor; cursor = cursor->next)
@@ -211,13 +277,18 @@ remove_all_columns (ModestHeaderView *obj)
 }
 
 gboolean
-modest_header_view_set_columns (ModestHeaderView *self, const GList *columns)
+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_attach, *renderer_compact_date;
+       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;
        
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); 
@@ -225,11 +296,54 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns)
        /* 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_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  = 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, FALSE);
+       g_object_set_data (G_OBJECT (renderer_recpt_box), "date-renderer", renderer_compact_date);
+
+       g_object_set(G_OBJECT(renderer_header),
+                    "ellipsize", PANGO_ELLIPSIZE_END,
+                    NULL);
+       g_object_set (G_OBJECT (renderer_subject),
+                     "ellipsize", PANGO_ELLIPSIZE_END,
+                     NULL);
+       g_object_set (G_OBJECT (renderer_recpt),
+                     "ellipsize", PANGO_ELLIPSIZE_END,
+                     NULL);
+       g_object_set(G_OBJECT(renderer_compact_date),
+                    "xalign", 1.0,
+                    NULL);
+
+       gtk_cell_renderer_set_fixed_size (renderer_attach, 32, 32);
+       gtk_cell_renderer_set_fixed_size (renderer_priority, 32, 32);
        
        remove_all_columns (self);
 
-       sortable = gtk_tree_view_get_model (GTK_TREE_VIEW (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)) {
@@ -279,19 +393,21 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns)
                        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(TRUE));
+                       compact_column = column;
                        break;
 
                case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT:
-                       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(FALSE));
+                       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(FALSE));
+                       compact_column = column;
                        break;
 
                        
@@ -311,7 +427,7 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns)
                                                 GINT_TO_POINTER(TRUE));
                        break;
                        
-               case MODEST_HEADER_VIEW_COLUMN_SENT_DATE:
+               case MODEST_HEADER_VIEW_COLUMN_SENT_DATE:  
                        column = get_new_column (_("Sent"), renderer_header, TRUE,
                                                 TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN,
                                                 TRUE,
@@ -326,16 +442,18 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns)
                                                 (GtkTreeCellDataFunc)_modest_header_view_size_cell_data,
                                                 NULL); 
                        break;
+               case MODEST_HEADER_VIEW_COLUMN_STATUS:
+                       column = get_new_column (_("Status"), renderer_compact_date, TRUE,
+                                                TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN,
+                                                FALSE,
+                                                (GtkTreeCellDataFunc)_modest_header_view_status_cell_data,
+                                                NULL); 
+                       break;
 
                default:
                        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));
@@ -344,7 +462,19 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns)
                g_object_set_data (G_OBJECT(column), MODEST_HEADER_VIEW_PTR,
                                   self);
                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;
 }
@@ -353,19 +483,49 @@ static void
 modest_header_view_init (ModestHeaderView *obj)
 {
        ModestHeaderViewPrivate *priv;
+       guint i, j;
 
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(obj); 
 
        priv->folder  = NULL;
 
        priv->monitor        = NULL;
-       priv->monitor_lock   = g_mutex_new ();
-
+       priv->observers_lock = g_mutex_new ();
+
+       priv->clipboard = modest_runtime_get_email_clipboard ();
+       priv->hidding_ids = NULL;
+       priv->n_selected = 0;
+
+       /* Sort parameters */
+       for (j=0; j < 2; j++) {
+               for (i=0; i < TNY_FOLDER_TYPE_NUM; i++) {
+                       priv->sort_colid[j][i] = -1;
+                       priv->sort_type[j][i] = GTK_SORT_DESCENDING;
+               }                       
+       }
 
        setup_drag_and_drop (GTK_TREE_VIEW (obj));
 }
 
 static void
+modest_header_view_dispose (GObject *obj)
+{
+       ModestHeaderView        *self;
+       ModestHeaderViewPrivate *priv;
+       
+       self = MODEST_HEADER_VIEW(obj);
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+
+       if (priv->folder) {
+               tny_folder_remove_observer (priv->folder, TNY_FOLDER_OBSERVER (obj));
+               g_object_unref (G_OBJECT (priv->folder));
+               priv->folder   = NULL;
+       }
+
+       G_OBJECT_CLASS(parent_class)->dispose (obj);
+}
+
+static void
 modest_header_view_finalize (GObject *obj)
 {
        ModestHeaderView        *self;
@@ -374,19 +534,17 @@ modest_header_view_finalize (GObject *obj)
        self = MODEST_HEADER_VIEW(obj);
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
 
-       g_mutex_lock (priv->monitor_lock);
+       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);
+
+       /* Clear hidding array created by cut operation */
+       _clear_hidding_filter (MODEST_HEADER_VIEW (obj));
 
-       if (priv->folder) {
-               g_object_unref (G_OBJECT (priv->folder));
-               priv->folder   = NULL;
-       }
-       
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
@@ -407,7 +565,7 @@ 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);
+/*     modest_header_view_set_folder (self, NULL, NULL, NULL); */
 
        gtk_tree_view_columns_autosize (GTK_TREE_VIEW(obj));
        gtk_tree_view_set_fixed_height_mode (GTK_TREE_VIEW(obj),TRUE);
@@ -420,13 +578,47 @@ modest_header_view_new (TnyFolder *folder, ModestHeaderViewStyle style)
        g_signal_connect (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);
        
        return GTK_WIDGET(self);
 }
 
 
+guint
+modest_header_view_count_selected_headers (ModestHeaderView *self)
+{
+       GtkTreeSelection *sel;
+       guint selected_rows;
+
+       g_return_val_if_fail (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, 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)
 {
@@ -475,7 +667,7 @@ modest_header_view_get_selected_headers (ModestHeaderView *self)
 static void
 scroll_to_selected (ModestHeaderView *self, GtkTreeIter *iter, gboolean up)
 {
-#if MODEST_PLATFORM_ID==1  /* MODES_PLATFORM_ID: 1 ==> gnome, 2==> maemo */ 
+#ifdef MODEST_PLATFORM_GNOME 
 
        GtkTreePath *selected_path;
        GtkTreePath *start, *end;
@@ -500,7 +692,7 @@ scroll_to_selected (ModestHeaderView *self, GtkTreeIter *iter, gboolean up)
        gtk_tree_path_free (start);
        gtk_tree_path_free (end);
 
-#endif /* MODEST_PLATFORM_ID */
+#endif /* MODEST_PLATFORM_GNOME */
 }
 
 
@@ -510,14 +702,22 @@ modest_header_view_select_next (ModestHeaderView *self)
        GtkTreeSelection *sel;
        GtkTreeIter iter;
        GtkTreeModel *model;
+       GtkTreePath *path;
 
        sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
-       if (gtk_tree_selection_get_selected (sel, &model, &iter)) {
+       path = get_selected_row (GTK_TREE_VIEW(self), &model);
+       if ((path != NULL) && (gtk_tree_model_get_iter(model, &iter, path))) {
+               /* Unselect previous path */
+               gtk_tree_selection_unselect_path (sel, path);
+               
+               /* Move path down and selects new one  */
                if (gtk_tree_model_iter_next (model, &iter)) {
                        gtk_tree_selection_select_iter (sel, &iter);
                        scroll_to_selected (self, &iter, FALSE);        
                }
+               gtk_tree_path_free(path);
        }
+       
 }
 
 void 
@@ -529,8 +729,10 @@ modest_header_view_select_prev (ModestHeaderView *self)
        GtkTreePath *path;
 
        sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
-       if (gtk_tree_selection_get_selected (sel, &model, &iter)) {             
-               path = gtk_tree_model_get_path (model, &iter);
+       path = get_selected_row (GTK_TREE_VIEW(self), &model);
+       if ((path != NULL) && (gtk_tree_model_get_iter(model, &iter, path))) {
+               /* Unselect previous path */
+               gtk_tree_selection_unselect_path (sel, path);
 
                /* Move path up */
                if (gtk_tree_path_prev (path)) {
@@ -552,6 +754,7 @@ modest_header_view_get_columns (ModestHeaderView *self)
        return gtk_tree_view_get_columns (GTK_TREE_VIEW(self)); 
 }
 
+
 gboolean
 modest_header_view_is_empty (ModestHeaderView *self)
 {
@@ -610,74 +813,17 @@ 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);
-
-               modest_runtime_verify_object_death (old_model, "");
-               modest_runtime_verify_object_death (old_model_sort, "");
-       } else
-               gtk_tree_view_set_model (header_view, model);
-
-       return;
-}
-
-static void
-on_progress_changed (ModestMailOperation *mail_op,
-                    ModestHeaderView *self)
-{
-       GtkTreeModel *sortable; 
-       ModestHeaderViewPrivate *priv;
-       GList *cols, *cursor;
-       TnyList *headers;
-
-       if (!modest_mail_operation_is_finished (mail_op))
-               return;
-
-       if (modest_mail_operation_get_error (mail_op))
-               return;
-       
-       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
-
-       headers = TNY_LIST (tny_gtk_header_list_model_new ());
-
-       tny_gtk_header_list_model_set_folder (TNY_GTK_HEADER_LIST_MODEL(headers),
-                                             priv->folder, TRUE);
-
-       sortable = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL(headers));
-       g_object_unref (G_OBJECT (headers));
-
-       /* 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);
-       }
-       g_list_free (cols);
-
-       /* Set new model */
-       modest_header_view_set_model (GTK_TREE_VIEW (self), sortable);
-       g_object_unref (G_OBJECT (sortable));
-
-       /* Add a folder observer */
-       g_mutex_lock (priv->monitor_lock);
-       priv->monitor = TNY_FOLDER_MONITOR (tny_folder_monitor_new (priv->folder));
-       tny_folder_monitor_add_list (priv->monitor, TNY_LIST (headers));
-       tny_folder_monitor_start (priv->monitor);
-       g_mutex_unlock (priv->monitor_lock);
+/*     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*
@@ -695,10 +841,13 @@ modest_header_view_get_folder (ModestHeaderView *self)
 static void
 modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder)
 {
+       TnyFolderType type;
        TnyList *headers;
        ModestHeaderViewPrivate *priv;
        GList *cols, *cursor;
-       GtkTreeModel *sortable; 
+       GtkTreeModel *filter_model, *sortable; 
+       guint sort_colid;
+       GtkSortType sort_type;
 
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
 
@@ -707,8 +856,9 @@ modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder)
        tny_gtk_header_list_model_set_folder (TNY_GTK_HEADER_LIST_MODEL(headers),
                                              folder, FALSE);
 
-       /* 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));
@@ -716,46 +866,150 @@ 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);
-
+       tny_folder_add_observer (folder, TNY_FOLDER_OBSERVER (self));
+       g_mutex_unlock (priv->observers_lock);
 
        sortable = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL(headers));
        g_object_unref (G_OBJECT (headers));
 
+       /* 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));
+
+       /* Restore sort column id */
+       if (cols) {
+               type  = modest_tny_folder_guess_folder_type (folder);
+               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),
-                                                col_id,
+                                                TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,
                                                 (GtkTreeIterCompareFunc) cmp_rows,
-                                                cursor->data, NULL);
-               cursor = g_list_next(cursor);
+                                                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);
        }
-       g_list_free (cols);
-
 
        /* 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);
+       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);
 }
 
 void
-modest_header_view_set_folder (ModestHeaderView *self, TnyFolder *folder)
+modest_header_view_sort_by_column_id (ModestHeaderView *self, 
+                                     guint sort_colid,
+                                     GtkSortType sort_type)
+{
+       ModestHeaderViewPrivate *priv = NULL;
+       GtkTreeModel *tree_filter, *sortable = NULL; 
+       TnyFolderType type;
+
+       /* Get model and private data */
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(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),
+                                             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"); */
+       
+}
+
+void
+modest_header_view_set_sort_params (ModestHeaderView *self, 
+                                   guint sort_colid, 
+                                   GtkSortType sort_type,
+                                   TnyFolderType type)
+{
+       ModestHeaderViewPrivate *priv;
+       ModestHeaderViewStyle style;
+
+       style = modest_header_view_get_style   (self);
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+
+       priv->sort_colid[style][type] = sort_colid;
+       priv->sort_type[style][type] = sort_type;
+}
+
+gint
+modest_header_view_get_sort_column_id (ModestHeaderView *self, 
+                                      TnyFolderType type)
+{
+       ModestHeaderViewPrivate *priv;
+       ModestHeaderViewStyle style;
+
+       style = modest_header_view_get_style   (self);
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+
+       return priv->sort_colid[style][type];
+}
+
+GtkSortType
+modest_header_view_get_sort_type (ModestHeaderView *self, 
+                                 TnyFolderType type)
 {
        ModestHeaderViewPrivate *priv;
+       ModestHeaderViewStyle style;
 
+       style = modest_header_view_get_style   (self);
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+
+       return priv->sort_type[style][type];
+}
+
+void
+modest_header_view_set_folder (ModestHeaderView *self, 
+                              TnyFolder *folder,
+                              RefreshAsyncUserCallback callback,
+                              gpointer user_data)
+{
+       ModestHeaderViewPrivate *priv;
+       ModestWindowMgr *mgr = NULL;
+       GObject *source = NULL;
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
 
        if (priv->folder) {
+               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;
+
+               /* Get main window to use it as source of mail operation */
+               mgr = modest_runtime_get_window_mgr ();
+               source = G_OBJECT (modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()));
 
+               /* Set folder in the model */
                modest_header_view_set_folder_intern (self, folder);
 
                /* Pick my reference. Nothing to do with the mail operation */
@@ -764,57 +1018,50 @@ modest_header_view_set_folder (ModestHeaderView *self, TnyFolder *folder)
                /* no message selected */
                g_signal_emit (G_OBJECT(self), signals[HEADER_SELECTED_SIGNAL], 0, NULL);
 
-               /* Create the mail operation */
-               mail_op = modest_mail_operation_new ();
+               /* Create the mail operation (source will be the parent widget) */
+               mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, source);
                modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
                                                 mail_op);
 
-               /* Register a mail operation observer */
-               g_signal_connect (mail_op, "progress-changed", 
-                                 G_CALLBACK (on_progress_changed), self);
-
                /* Refresh the folder asynchronously */
-               modest_mail_operation_refresh_folder (mail_op, folder);
+               modest_mail_operation_refresh_folder (mail_op, folder,
+                                                     callback,
+                                                     user_data);
 
                /* 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); 
+
+               g_mutex_unlock (priv->observers_lock);
        }
 }
 
-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;
-       ModestHeaderViewPrivate *priv;
+       ModestHeaderView *self = NULL;
+       ModestHeaderViewPrivate *priv = NULL;
        GtkTreeIter iter;
-       GtkTreeSelection *sel;
-       GtkTreeModel *model;
+       GtkTreeModel *model = NULL;
        TnyHeader *header;
 
-       /* ignore everything but doubleclick */
-       if (event->type != GDK_2BUTTON_PRESS)
-               return FALSE;
-
-       self = MODEST_HEADER_VIEW (widget);
+       self = MODEST_HEADER_VIEW (treeview);
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
-       
-       sel   = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
-       model = gtk_tree_view_get_model (GTK_TREE_VIEW(self));
-       
-       if (!gtk_tree_selection_get_selected (sel, &model, &iter)) 
-               return FALSE; /* msg was _un_selected */
 
+       model = gtk_tree_view_get_model (treeview);
+       
+       if ((path == NULL) || (!gtk_tree_model_get_iter(model, &iter, path))) 
+               return;
+                       
        /* get the first selected item */
        gtk_tree_model_get (model, &iter,
                            TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
@@ -827,26 +1074,29 @@ on_header_clicked (GtkWidget *widget, GdkEventButton *event, gpointer user_data)
        /* Free */
        g_object_unref (G_OBJECT (header));
 
-       return TRUE;
 }
 
-
 static void
 on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
 {
        GtkTreeModel *model;
        TnyHeader *header;
+       GtkTreePath *path = NULL;       
        GtkTreeIter iter;
        ModestHeaderView *self;
        ModestHeaderViewPrivate *priv;
+       GList *selected = NULL;
        
        g_return_if_fail (sel);
        g_return_if_fail (user_data);
        
        self = MODEST_HEADER_VIEW (user_data);
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);    
-       
-       if (!gtk_tree_selection_get_selected (sel, &model, &iter)) 
+
+       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 */
 
        gtk_tree_model_get (model, &iter,
@@ -859,6 +1109,7 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
                       0, header);
 
        g_object_unref (G_OBJECT (header));
+       gtk_tree_path_free(path);
 }
 
 
@@ -876,6 +1127,16 @@ _modest_header_view_change_selection (GtkTreeSelection *selection,
        on_selection_changed (selection, user_data);
 }
 
+static gint compare_priorities (TnyHeaderFlags p1, TnyHeaderFlags p2)
+{
+       p1 = p1 & TNY_HEADER_FLAG_PRIORITY;
+       p2 = p2 & TNY_HEADER_FLAG_PRIORITY;
+       if (p1 == 0) 
+               p1 = TNY_HEADER_FLAG_LOW_PRIORITY + 1;
+       if (p2 == 0) 
+               p2 = TNY_HEADER_FLAG_LOW_PRIORITY + 1;
+       return p1 - p2;
+}
 
 static gint
 cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
@@ -884,117 +1145,36 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
        gint col_id;
        gint t1, t2;
        gint val1, val2;
-       gchar *s1, *s2;
        gint cmp;
-       
-       static int counter = 0;
-       col_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(user_data), MODEST_HEADER_VIEW_COLUMN));
-       
-       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) {
-
-               /* first one, we decide based on the time */
-       case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN:
-       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_HEADER_OUT:
-       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: {
+/*     static int counter = 0; */
 
-               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);
+       g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN(user_data), 0);
+/*     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));
 
-               /* 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:
+       case TNY_HEADER_FLAG_PRIORITY:
                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_SEEN) - (val2 & TNY_HEADER_FLAG_SEEN);
+
+               /* This is for making priority values respect the intuitive sort relationship 
+                * as HIGH is 11, LOW is 01, and we put NORMAL AS 10 (2) */
+               cmp =  compare_priorities (val1, val2);
 
                return cmp ? cmp : t1 - t2;
 
@@ -1003,20 +1183,42 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
        }
 }
 
+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, 
                  GtkSelectionData *selection_data, 
                  guint info,  guint time, gpointer data)
 {
-       GtkTreeSelection *selection;
-       GtkTreeModel *model;
+       GtkTreeModel *model = NULL;
        GtkTreeIter iter;
-       GtkTreePath *source_row;
-
-       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget));
-       gtk_tree_selection_get_selected (selection, &model, &iter);
-       source_row = gtk_tree_model_get_path (model, &iter);
+       GtkTreePath *source_row = NULL;
+       
+       source_row = get_selected_row (GTK_TREE_VIEW (widget), &model);
+       if ((source_row == NULL) || (!gtk_tree_model_get_iter(model, &iter, source_row))) return;
 
        switch (info) {
        case MODEST_HEADER_ROW:
@@ -1033,7 +1235,7 @@ drag_data_get_cb (GtkWidget *widget, GdkDragContext *context,
                break;
        }
        default:
-               g_message ("default");
+               g_message ("%s: default switch case.", __FUNCTION__);
        }
 
        gtk_tree_path_free (source_row);
@@ -1042,8 +1244,7 @@ drag_data_get_cb (GtkWidget *widget, GdkDragContext *context,
 /* 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 },
+       { "text/uri-list",      0,                   MODEST_MSG }, 
 };
 
 static void
@@ -1058,3 +1259,295 @@ setup_drag_and_drop (GtkTreeView *self)
        g_signal_connect(G_OBJECT (self), "drag_data_get",
                         G_CALLBACK(drag_data_get_cb), NULL);
 }
+
+static GtkTreePath *
+get_selected_row (GtkTreeView *self, GtkTreeModel **model) 
+{
+       GtkTreePath *path = NULL;
+       GtkTreeSelection *sel = NULL;   
+       GList *rows = NULL;
+
+       sel   = gtk_tree_view_get_selection(self);
+       rows = gtk_tree_selection_get_selected_rows (sel, model);
+       
+       if ((rows == NULL) || (g_list_length(rows) != 1))
+               goto frees;
+
+       path = gtk_tree_path_copy(g_list_nth_data (rows, 0));
+       
+
+       /* Free */
+ frees:
+       g_list_foreach(rows,(GFunc) gtk_tree_path_free, NULL);
+       g_list_free(rows);
+
+       return path;
+}
+
+/*
+ * This function moves the tree view scroll to the current selected
+ * row when the widget grabs the focus 
+ */
+static gboolean 
+on_focus_in (GtkWidget     *self,
+            GdkEventFocus *event,
+            gpointer       user_data)
+{
+       GtkTreeSelection *selection;
+       GtkTreeModel *model;
+       GList *selected = NULL;
+       GtkTreePath *selected_path = NULL;
+
+       model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+       if (!model)
+               return FALSE;
+
+       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
+       /* If none selected yet, pick the first one */
+       if (gtk_tree_selection_count_selected_rows (selection) == 0) {
+               GtkTreeIter iter;
+               GtkTreePath *path;
+
+               /* Return if the model is empty */
+               if (!gtk_tree_model_get_iter_first (model, &iter))
+                       return FALSE;
+
+               path = gtk_tree_model_get_path (model, &iter);
+               gtk_tree_selection_select_path (selection, path);
+               gtk_tree_path_free (path);
+       }
+
+       /* 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 */
+       #if GTK_CHECK_VERSION(2, 8, 0) /* TODO: gtk_tree_view_get_visible_range() is only available in GTK+ 2.8 */
+       GtkTreePath *start_path = NULL;
+       GtkTreePath *end_path = NULL;
+       if (gtk_tree_view_get_visible_range (GTK_TREE_VIEW (self),
+                                            &start_path,
+                                            &end_path)) {
+
+               if ((gtk_tree_path_compare (start_path, selected_path) != -1) ||
+                   (gtk_tree_path_compare (end_path, selected_path) != 1)) {
+
+                       /* Scroll to first path */
+                       gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (self),
+                                                     selected_path,
+                                                     NULL,
+                                                     TRUE,
+                                                     0.5,
+                                                     0.0);
+               }
+       }
+       #endif /* GTK_CHECK_VERSION */
+
+       /* Frees */     
+       g_list_foreach (selected, (GFunc) gtk_tree_path_free, NULL);
+       g_list_free (selected);
+
+       return FALSE;
+}
+
+static gboolean
+idle_notify_added_headers (gpointer data)
+{
+       modest_platform_on_new_msg ();
+
+       return FALSE;
+}
+
+static void
+idle_notify_headers_count_changed_destroy (gpointer data)
+{
+       HeadersCountChangedHelper *helper = NULL;
+
+       g_return_if_fail (data != NULL);
+       helper = (HeadersCountChangedHelper *) data; 
+
+       g_object_unref (helper->change);
+       g_slice_free (HeadersCountChangedHelper, helper);
+}
+
+static gboolean
+idle_notify_headers_count_changed (gpointer data)
+{
+       TnyFolder *folder = NULL;
+       ModestHeaderViewPrivate *priv = NULL;
+       HeadersCountChangedHelper *helper = NULL;
+
+       g_return_val_if_fail (data != NULL, FALSE);
+       helper = (HeadersCountChangedHelper *) data; 
+       g_return_val_if_fail (MODEST_IS_HEADER_VIEW(helper->self), FALSE);
+       g_return_val_if_fail (TNY_FOLDER_CHANGE(helper->change), FALSE);
+
+       folder = tny_folder_change_get_folder (helper->change);
+
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE (helper->self);
+       g_mutex_lock (priv->observers_lock);
+
+       /* Emmit signal to evaluate how headers changes affects to the window view  */
+       g_signal_emit (G_OBJECT(helper->self), signals[MSG_COUNT_CHANGED_SIGNAL], 0, folder, helper->change);
+               
+       /* Added or removed headers, so data sotred on cliboard are invalid  */
+       modest_email_clipboard_clear (priv->clipboard);
+
+       g_mutex_unlock (priv->observers_lock);
+
+       return FALSE;
+}
+
+static void
+folder_monitor_update (TnyFolderObserver *self, 
+                      TnyFolderChange *change)
+{
+       TnyFolderChangeChanged changed;
+       HeadersCountChangedHelper *helper = NULL;
+
+       changed = tny_folder_change_get_changed (change);
+
+       /* We need an idle because this function is called from within
+          a thread, so it could cause problems if the modest platform
+          code calls dbus for example */
+       if (changed & TNY_FOLDER_CHANGE_CHANGED_ADDED_HEADERS)
+               g_idle_add (idle_notify_added_headers, NULL);
+       
+       /* Check folder count */
+       if ((changed & TNY_FOLDER_CHANGE_CHANGED_ADDED_HEADERS) ||
+           (changed & TNY_FOLDER_CHANGE_CHANGED_REMOVED_HEADERS)) {
+               helper = g_slice_new0 (HeadersCountChangedHelper);
+               helper->self = MODEST_HEADER_VIEW(self);
+               helper->change = g_object_ref(change);
+               
+               g_idle_add_full (G_PRIORITY_DEFAULT, 
+                                idle_notify_headers_count_changed, 
+                                helper,
+                                idle_notify_headers_count_changed_destroy);
+       }       
+}
+
+void
+modest_header_view_clear (ModestHeaderView *self)
+{
+       modest_header_view_set_folder (self, NULL, NULL, NULL);
+}
+
+void 
+modest_header_view_copy_selection (ModestHeaderView *header_view)
+{
+       /* Copy selection */
+       _clipboard_set_selected_data (header_view, FALSE);
+}
+
+void 
+modest_header_view_cut_selection (ModestHeaderView *header_view)
+{
+       ModestHeaderViewPrivate *priv = NULL;
+       GtkTreeModel *model = NULL;
+       const gchar **hidding = NULL;
+       guint i, n_selected;
+
+       g_return_if_fail (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 */
+       model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view));
+       if (GTK_IS_TREE_MODEL_FILTER (model))
+               gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model));
+}
+
+
+
+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);
+}
+
+
+
+static gboolean
+filter_row (GtkTreeModel *model,
+           GtkTreeIter *iter,
+           gpointer user_data)
+{
+       ModestHeaderViewPrivate *priv = NULL;
+       TnyHeader *header = NULL;
+       guint i;
+       gchar *id = NULL;
+       gboolean found = FALSE;
+       
+       g_return_val_if_fail (MODEST_IS_HEADER_VIEW (user_data), FALSE);
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE (user_data);
+
+       /* If no data on clipboard, return always TRUE */
+       if (modest_email_clipboard_cleared(priv->clipboard)) return TRUE;
+               
+       /* Get header from model */
+       gtk_tree_model_get (model, iter,
+                           TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &header,
+                           -1);
+       
+       /* Get message id from header (ensure is a valid id) */
+       if (!header) return FALSE;
+       id = g_strdup(tny_header_get_message_id (header));
+       
+       /* Check hiding */
+       if (priv->hidding_ids != NULL)
+               for (i=0; i < priv->n_selected && !found; i++)
+                       if (priv->hidding_ids[i] != NULL && id != NULL)
+                               found = (!strcmp (priv->hidding_ids[i], id));
+       
+       /* Free */
+       g_object_unref (header);
+       g_free(id);
+
+       return !found;
+}
+
+static void
+_clear_hidding_filter (ModestHeaderView *header_view) 
+{
+       ModestHeaderViewPrivate *priv;
+       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);
+       }       
+}