* Fix some detected memory leaks
[modest] / src / widgets / modest-header-view.c
index 016ad53..5b3f5e3 100644 (file)
 #include <glib/gi18n.h>
 #include <tny-list.h>
 #include <tny-simple-list.h>
+#include <tny-folder-monitor.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-marshal.h>
 #include <modest-text-utils.h>
 #include <modest-icon-names.h>
-#include <modest-icon-factory.h>
+#include <modest-runtime.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 on_selection_changed (GtkTreeSelection *sel, gpointer user_data);
+static gboolean      on_header_clicked      (GtkWidget *widget, 
+                                           GdkEventButton *event, 
+                                           gpointer user_data);
 
-#define MODEST_HEADER_VIEW_PTR "modest-header-view"
+static gint          cmp_rows               (GtkTreeModel *tree_model, 
+                                            GtkTreeIter *iter1, 
+                                            GtkTreeIter *iter2,
+                                            gpointer user_data);
 
-enum {
-       MESSAGE_SELECTED_SIGNAL,
-       ITEM_NOT_FOUND_SIGNAL,
-       STATUS_UPDATE_SIGNAL,
-       LAST_SIGNAL
-};
+static void          on_selection_changed   (GtkTreeSelection *sel, 
+                                            gpointer user_data);
 
+static void          setup_drag_and_drop    (GtkTreeView *self);
+
+static GtkTreePath * get_selected_row       (GtkTreeView *self, GtkTreeModel **model);
+
+static gboolean      on_focus_in            (GtkWidget     *sef,
+                                            GdkEventFocus *event,
+                                            gpointer       user_data);
 
 typedef struct _ModestHeaderViewPrivate ModestHeaderViewPrivate;
 struct _ModestHeaderViewPrivate {
        TnyFolder            *folder;
-       TnyList              *headers;
-       GMutex               *lock;
        ModestHeaderViewStyle style;
-       gulong               sig1;
+
+       TnyFolderMonitor     *monitor;
+       GMutex               *monitor_lock;
+
+       gint                  sort_colid[2][TNY_FOLDER_TYPE_NUM];
+       gint                  sort_type[2][TNY_FOLDER_TYPE_NUM];
+
 
 };
+
 #define MODEST_HEADER_VIEW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
                                                MODEST_TYPE_HEADER_VIEW, \
                                                 ModestHeaderViewPrivate))
 
-typedef struct _GetMsgAsyncHelper {
-       ModestHeaderView *view;
-       TnyHeader *header;
-} GetMsgAsyncHelper;
+
+
+#define MODEST_HEADER_VIEW_PTR "modest-header-view"
+
+enum {
+       HEADER_SELECTED_SIGNAL,
+       HEADER_ACTIVATED_SIGNAL,
+       ITEM_NOT_FOUND_SIGNAL,
+       STATUS_UPDATE_SIGNAL,
+       LAST_SIGNAL
+};
 
 /* globals */
 static GObjectClass *parent_class = NULL;
@@ -113,15 +138,25 @@ modest_header_view_class_init (ModestHeaderViewClass *klass)
        
        g_type_class_add_private (gobject_class, sizeof(ModestHeaderViewPrivate));
        
-       signals[MESSAGE_SELECTED_SIGNAL] = 
-               g_signal_new ("message_selected",
+       signals[HEADER_SELECTED_SIGNAL] = 
+               g_signal_new ("header_selected",
                              G_TYPE_FROM_CLASS (gobject_class),
                              G_SIGNAL_RUN_FIRST,
-                             G_STRUCT_OFFSET (ModestHeaderViewClass,message_selected),
+                             G_STRUCT_OFFSET (ModestHeaderViewClass,header_selected),
                              NULL, NULL,
                              g_cclosure_marshal_VOID__POINTER,
                              G_TYPE_NONE, 1, G_TYPE_POINTER);
 
+       signals[HEADER_ACTIVATED_SIGNAL] = 
+               g_signal_new ("header_activated",
+                             G_TYPE_FROM_CLASS (gobject_class),
+                             G_SIGNAL_RUN_FIRST,
+                             G_STRUCT_OFFSET (ModestHeaderViewClass,header_activated),
+                             NULL, NULL,
+                             g_cclosure_marshal_VOID__POINTER,
+                             G_TYPE_NONE, 1, G_TYPE_POINTER);
+       
+       
        signals[ITEM_NOT_FOUND_SIGNAL] = 
                g_signal_new ("item_not_found",
                              G_TYPE_FROM_CLASS (gobject_class),
@@ -131,167 +166,16 @@ modest_header_view_class_init (ModestHeaderViewClass *klass)
                              g_cclosure_marshal_VOID__INT,
                              G_TYPE_NONE, 1, G_TYPE_INT);
 
-       signals[STATUS_UPDATE_SIGNAL] = 
+       signals[STATUS_UPDATE_SIGNAL] =
                g_signal_new ("status_update",
                              G_TYPE_FROM_CLASS (gobject_class),
                              G_SIGNAL_RUN_FIRST,
-                             G_STRUCT_OFFSET (ModestHeaderViewClass,message_selected),
+                             G_STRUCT_OFFSET (ModestHeaderViewClass,status_update),
                              NULL, NULL,
                              modest_marshal_VOID__STRING_INT_INT,
-                             G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT);   
-}
-
-static void
-msgtype_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
-                  GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data)
-{
-       TnyHeaderFlags flags;
-       GdkPixbuf *pixbuf = NULL;
-       
-       gtk_tree_model_get (tree_model, iter, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,
-                           &flags, -1);
-
-       if (flags & TNY_HEADER_FLAG_DELETED)
-               pixbuf = modest_icon_factory_get_small_icon (MODEST_HEADER_ICON_DELETED);
-       else if (flags & TNY_HEADER_FLAG_SEEN)
-               pixbuf = modest_icon_factory_get_small_icon (MODEST_HEADER_ICON_READ);
-       else
-               pixbuf = modest_icon_factory_get_small_icon (MODEST_HEADER_ICON_UNREAD);
-               
-       g_object_set (G_OBJECT (renderer), "pixbuf", pixbuf, NULL);
-}
-
-static void
-attach_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
-                 GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data)
-{
-       TnyHeaderFlags flags;
-       GdkPixbuf *pixbuf = NULL;
-
-       gtk_tree_model_get (tree_model, iter, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,
-                           &flags, -1);
-
-       if (flags & TNY_HEADER_FLAG_ATTACHMENTS)
-               pixbuf = modest_icon_factory_get_small_icon (MODEST_HEADER_ICON_ATTACH);
-
-       g_object_set (G_OBJECT (renderer), "pixbuf", pixbuf, NULL);
-}
-
-
-static void
-header_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
-                 GtkTreeModel *tree_model,  GtkTreeIter *iter,  gpointer user_data)
-{
-       TnyHeaderFlags flags;
-       
-       gtk_tree_model_get (tree_model, iter, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,
-                           &flags, -1);
-
-       g_object_set (G_OBJECT(renderer),
-                     "weight", (flags & TNY_HEADER_FLAG_SEEN) ? 400: 800,
-                     "style",  (flags & TNY_HEADER_FLAG_DELETED) ?
-                                PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL,
-                     NULL);    
-}
-
-
-static void
-sender_receiver_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
-                           GtkTreeModel *tree_model,  GtkTreeIter *iter,  gboolean is_sender)
-{
-       TnyHeaderFlags flags;
-       gchar *address;
-       gint sender_receiver_col;
-
-       if (is_sender)
-               sender_receiver_col = TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN;
-       else
-               sender_receiver_col = TNY_GTK_HEADER_LIST_MODEL_TO_COLUMN;
-               
-       gtk_tree_model_get (tree_model, iter,
-                           sender_receiver_col,  &address,
-                           TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
-                           -1);
-       
-       g_object_set (G_OBJECT(renderer),
-                     "text",
-                     modest_text_utils_display_address (address),
-                     "weight",
-                     (flags & TNY_HEADER_FLAG_SEEN) ? 400 : 800,
-                     "style",
-                     (flags & TNY_HEADER_FLAG_DELETED)?PANGO_STYLE_ITALIC:PANGO_STYLE_NORMAL,
-                     NULL);
-
-       g_free (address);       
+                             G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT);
 }
 
-
-
-
-/* not reentrant/thread-safe */
-const gchar*
-display_date (time_t date)
-{
-       struct tm date_tm, now_tm; 
-       time_t now;
-
-       const gint buf_size = 64; 
-       static gchar date_buf[64]; /* buf_size is not ... */
-       static gchar now_buf[64];  /* ...const enough... */
-       
-       now = time (NULL);
-       
-       localtime_r(&now, &now_tm);
-       localtime_r(&date, &date_tm);
-
-       /* get today's date */
-       modest_text_utils_strftime (date_buf, buf_size, "%x", &date_tm);
-       modest_text_utils_strftime (now_buf,  buf_size, "%x",  &now_tm);
-       /* today */
-
-       /* if this is today, get the time instead of the date */
-       if (strcmp (date_buf, now_buf) == 0)
-               strftime (date_buf, buf_size, _("%X"), &date_tm); 
-               
-       return date_buf;
-}
-
-
-static void
-compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
-                          GtkTreeModel *tree_model,  GtkTreeIter *iter,  gpointer user_data)
-{
-       GObject *rendobj;
-       TnyHeaderFlags flags;
-       gchar *from, *subject;
-       gchar *header;
-       time_t date;
-               
-       gtk_tree_model_get (tree_model, iter,
-                           TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
-                           TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN,  &from,
-                           TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN, &subject,
-                           TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN, &date,   
-                           -1);
-       rendobj = G_OBJECT(renderer);           
-
-       header = g_strdup_printf ("%s %s\n%s",
-                                 modest_text_utils_display_address (from),
-                                 display_date(date),
-                                 subject);
-       
-       g_object_set (G_OBJECT(renderer),
-                     "text",  header,
-                     "weight", (flags & TNY_HEADER_FLAG_SEEN) ? 400: 800,
-                     "style",  (flags & TNY_HEADER_FLAG_DELETED) ?
-                                PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL,
-                     NULL);    
-       g_free (header);
-       g_free (from);
-       g_free (subject);
-}
-
-
 static GtkTreeViewColumn*
 get_new_column (const gchar *name, GtkCellRenderer *renderer,
                gboolean resizable, gint sort_col_id, gboolean show_as_text,
@@ -303,8 +187,8 @@ get_new_column (const gchar *name, GtkCellRenderer *renderer,
        gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
 
        gtk_tree_view_column_set_resizable (column, resizable);
-       if (resizable)
-               gtk_tree_view_column_set_min_width (column, 100);
+       if (resizable) 
+               gtk_tree_view_column_set_expand (column, TRUE);
        
        if (show_as_text) 
                gtk_tree_view_column_add_attribute (column, renderer, "text",
@@ -314,7 +198,7 @@ get_new_column (const gchar *name, GtkCellRenderer *renderer,
 
        gtk_tree_view_column_set_sort_indicator (column, FALSE);
        gtk_tree_view_column_set_reorderable (column, TRUE);
-
+       
        if (cell_data_func)
                gtk_tree_view_column_set_cell_data_func(column, renderer, cell_data_func,
                                                        user_data, NULL);
@@ -328,7 +212,7 @@ 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)
@@ -337,16 +221,15 @@ remove_all_columns (ModestHeaderView *obj)
        g_list_free (columns);  
 }
 
-
-
 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;
        GtkTreeViewColumn *column=NULL;
-       GtkCellRenderer *renderer_msgtype,
-               *renderer_header,
-               *renderer_attach;
-
+       GtkTreeSelection *selection = NULL;
+       GtkCellRenderer *renderer_msgtype,*renderer_header,
+               *renderer_attach,  *renderer_comptact_flag, 
+               *renderer_compact_date;
        ModestHeaderViewPrivate *priv;
        const GList *cursor;
        
@@ -355,10 +238,24 @@ 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_header  = gtk_cell_renderer_text_new (); 
+       renderer_header  = gtk_cell_renderer_text_new ();
+       renderer_comptact_flag  = gtk_cell_renderer_pixbuf_new ();
+       renderer_compact_date  = gtk_cell_renderer_text_new ();
+
+       g_object_set(G_OBJECT(renderer_header),
+                    "ellipsize", PANGO_ELLIPSIZE_END,
+                    NULL);
+       g_object_set(G_OBJECT(renderer_compact_date),
+                    "xalign", 1.0,
+                    NULL);
        
        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));
+
+       /* Add new columns */
        for (cursor = columns; cursor; cursor = g_list_next(cursor)) {
                ModestHeaderViewColumn col =
                        (ModestHeaderViewColumn) GPOINTER_TO_INT(cursor->data);
@@ -373,64 +270,129 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns)
                case MODEST_HEADER_VIEW_COLUMN_MSGTYPE:
                        column = get_new_column (_("M"), renderer_msgtype, FALSE,
                                                 TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,
-                                                FALSE, (GtkTreeCellDataFunc)msgtype_cell_data,
+                                                FALSE,
+                                                (GtkTreeCellDataFunc)_modest_header_view_msgtype_cell_data,
                                                 NULL);
-                       gtk_tree_view_column_set_fixed_width (column, 32);
+                       gtk_tree_view_column_set_fixed_width (column, 45);
                        break;
 
                case MODEST_HEADER_VIEW_COLUMN_ATTACH:
                        column = get_new_column (_("A"), renderer_attach, FALSE,
                                                 TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,
-                                                FALSE, (GtkTreeCellDataFunc)attach_cell_data,
-                                                NULL);
-                       gtk_tree_view_column_set_fixed_width (column, 32);
-                       break;
-               
-               case MODEST_HEADER_VIEW_COLUMN_RECEIVED_DATE:
-                       column = get_new_column (_("Received"), renderer_header, TRUE,
-                                                TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_COLUMN,
-                                                TRUE, (GtkTreeCellDataFunc)header_cell_data,
+                                                FALSE,
+                                                (GtkTreeCellDataFunc)_modest_header_view_attach_cell_data,
                                                 NULL);
+                       gtk_tree_view_column_set_fixed_width (column, 45);
                        break;
+
                        
                case MODEST_HEADER_VIEW_COLUMN_FROM:
                        column = get_new_column (_("From"), renderer_header, TRUE,
                                                 TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN,
-                                                TRUE, (GtkTreeCellDataFunc)sender_receiver_cell_data,
+                                                TRUE,
+                                                (GtkTreeCellDataFunc)_modest_header_view_sender_receiver_cell_data,
                                                 GINT_TO_POINTER(TRUE));
                        break;
 
                case MODEST_HEADER_VIEW_COLUMN_TO:
                        column = get_new_column (_("To"), renderer_header, TRUE,
                                                 TNY_GTK_HEADER_LIST_MODEL_TO_COLUMN,
-                                                TRUE, (GtkTreeCellDataFunc)sender_receiver_cell_data,
+                                                TRUE,
+                                                (GtkTreeCellDataFunc)_modest_header_view_sender_receiver_cell_data,
                                                 GINT_TO_POINTER(FALSE));
                        break;
                        
-               case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER:
+               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)compact_header_cell_data,
-                                                NULL);
+                                                TRUE,
+                                                (GtkTreeCellDataFunc)_modest_header_view_compact_header_cell_data,
+                                                GINT_TO_POINTER(TRUE));
                        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));
+                       break;
+
                        
                case MODEST_HEADER_VIEW_COLUMN_SUBJECT:
                        column = get_new_column (_("Subject"), renderer_header, TRUE,
                                                 TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN,
-                                                TRUE, (GtkTreeCellDataFunc)header_cell_data,
+                                                TRUE,
+                                                (GtkTreeCellDataFunc)_modest_header_view_header_cell_data,
                                                 NULL);
                        break;
                        
+               case MODEST_HEADER_VIEW_COLUMN_RECEIVED_DATE:
+                       column = get_new_column (_("Received"), renderer_header, TRUE,
+                                                TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN,
+                                                TRUE,
+                                                (GtkTreeCellDataFunc)_modest_header_view_date_cell_data,
+                                                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_COLUMN,
-                                                TRUE, (GtkTreeCellDataFunc)header_cell_data,
-                                                NULL);
+                                                TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN,
+                                                TRUE,
+                                                (GtkTreeCellDataFunc)_modest_header_view_date_cell_data,
+                                                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,
+                                                FALSE,
+                                                (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_assert_not_reached ();
+                       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 */
@@ -440,23 +402,34 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns)
                /* we need this ptr when sorting the rows */
                g_object_set_data (G_OBJECT(column), MODEST_HEADER_VIEW_PTR,
                                   self);
-               
-               gtk_tree_view_column_set_visible   (column, TRUE);
                gtk_tree_view_append_column (GTK_TREE_VIEW(self), column);              
-       }       
+       }               
+
        return TRUE;
 }
 
-
-
 static void
 modest_header_view_init (ModestHeaderView *obj)
 {
        ModestHeaderViewPrivate *priv;
+       guint i, j;
+
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(obj); 
 
-       priv->lock = g_mutex_new ();
-       priv->sig1 = 0;
+       priv->folder  = NULL;
+
+       priv->monitor        = NULL;
+       priv->monitor_lock   = g_mutex_new ();
+
+       /* 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
@@ -464,66 +437,62 @@ modest_header_view_finalize (GObject *obj)
 {
        ModestHeaderView        *self;
        ModestHeaderViewPrivate *priv;
-       GtkTreeSelection        *sel;
        
        self = MODEST_HEADER_VIEW(obj);
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
 
-       if (priv->headers)      
-               g_object_unref (G_OBJECT(priv->headers));
-
-       sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
-
-       if (sel && priv->sig1 != 0) {
-               g_signal_handler_disconnect (G_OBJECT(sel), priv->sig1);
-               priv->sig1 = 0;
+       g_mutex_lock (priv->monitor_lock);
+       if (priv->monitor) {
+               tny_folder_monitor_stop (priv->monitor);
+               g_object_unref (G_OBJECT (priv->monitor));
        }
-               
-       if (priv->lock) {
-               g_mutex_free (priv->lock);
-               priv->lock = NULL;
+       g_mutex_unlock (priv->monitor_lock);
+       g_mutex_free (priv->monitor_lock);
+
+       if (priv->folder) {
+               g_object_unref (G_OBJECT (priv->folder));
+               priv->folder   = NULL;
        }
 
-       priv->headers  = NULL;
-       priv->folder   = NULL;
-       
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
-       
+
+
 GtkWidget*
-modest_header_view_new (TnyFolder *folder, const GList *columns,
-                       ModestHeaderViewStyle style)
+modest_header_view_new (TnyFolder *folder, ModestHeaderViewStyle style)
 {
        GObject *obj;
        GtkTreeSelection *sel;
        ModestHeaderView *self;
        ModestHeaderViewPrivate *priv;
        
+       g_return_val_if_fail (style >= 0 && style < MODEST_HEADER_VIEW_STYLE_NUM,
+                             NULL);
+       
        obj  = G_OBJECT(g_object_new(MODEST_TYPE_HEADER_VIEW, NULL));
        self = MODEST_HEADER_VIEW(obj);
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
        
-       if (!modest_header_view_set_folder (self, NULL)) {
-               g_warning ("could not set the folder");
-               g_object_unref (obj);
-               return NULL;
-       }
-       
        modest_header_view_set_style   (self, style);
-       modest_header_view_set_columns (self, columns);
-       
-       /* all cols */
-       gtk_tree_view_set_headers_visible   (GTK_TREE_VIEW(obj), TRUE);
-       gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(obj), TRUE);
+       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);
+       gtk_tree_view_set_enable_search (GTK_TREE_VIEW(obj), TRUE);
        
        gtk_tree_view_set_rules_hint (GTK_TREE_VIEW(obj),
                                      TRUE); /* alternating row colors */
-
        sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
        
-       priv->sig1 = g_signal_connect (sel, "changed",
-                                      G_CALLBACK(on_selection_changed), self);
+       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, "focus-in-event",
+                         G_CALLBACK(on_focus_in), NULL);
+       
        return GTK_WIDGET(self);
 }
 
@@ -538,6 +507,8 @@ modest_header_view_get_selected_headers (ModestHeaderView *self)
        GList *list, *tmp = NULL;
        GtkTreeModel *tree_model = NULL;
        GtkTreeIter iter;
+
+       g_return_val_if_fail (self, NULL);
        
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
 
@@ -552,16 +523,14 @@ modest_header_view_get_selected_headers (ModestHeaderView *self)
                tmp = list;
                while (tmp) {                   
                        /* get header from selection */
-                       gtk_tree_model_get_iter (tree_model,
-                                                &iter,
-                                                (GtkTreePath *) (tmp->data));
-                                                                         
+                       gtk_tree_model_get_iter (tree_model, &iter, (GtkTreePath *) (tmp->data));
                        gtk_tree_model_get (tree_model, &iter,
                                            TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
                                            &header, -1);
-
                        /* Prepend to list */
                        tny_list_prepend (header_list, G_OBJECT (header));
+                       g_object_unref (G_OBJECT (header));
+
                        tmp = g_list_next (tmp);
                }
                /* Clean up*/
@@ -572,6 +541,90 @@ modest_header_view_get_selected_headers (ModestHeaderView *self)
 }
 
 
+/* scroll our list view so the selected item is visible */
+static void
+scroll_to_selected (ModestHeaderView *self, GtkTreeIter *iter, gboolean up)
+{
+#ifdef MODEST_PLATFORM_GNOME 
+
+       GtkTreePath *selected_path;
+       GtkTreePath *start, *end;
+       
+       GtkTreeModel *model;
+       
+       model         = gtk_tree_view_get_model (GTK_TREE_VIEW(self));
+       selected_path = gtk_tree_model_get_path (model, iter);
+
+       start = gtk_tree_path_new ();
+       end   = gtk_tree_path_new ();
+
+       gtk_tree_view_get_visible_range (GTK_TREE_VIEW(self), &start, &end);
+
+       if (gtk_tree_path_compare (selected_path, start) < 0 ||
+           gtk_tree_path_compare (end, selected_path) < 0)
+               gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW(self),
+                                             selected_path, NULL, TRUE,
+                                             up ? 0.0 : 1.0,
+                                             up ? 0.0 : 1.0);
+       gtk_tree_path_free (selected_path);
+       gtk_tree_path_free (start);
+       gtk_tree_path_free (end);
+
+#endif /* MODEST_PLATFORM_GNOME */
+}
+
+
+void 
+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));
+       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 
+modest_header_view_select_prev (ModestHeaderView *self)
+{
+       GtkTreeSelection *sel;
+       GtkTreeIter iter;
+       GtkTreeModel *model;
+       GtkTreePath *path;
+
+       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))) {
+               /* Unselect previous path */
+               gtk_tree_selection_unselect_path (sel, path);
+
+               /* Move path up */
+               if (gtk_tree_path_prev (path)) {
+                       gtk_tree_model_get_iter (model, &iter, path);
+                       
+                       /* Select the new one */
+                       gtk_tree_selection_select_iter (sel, &iter);
+                       scroll_to_selected (self, &iter, TRUE); 
+
+               }
+               gtk_tree_path_free (path);
+       }
+}
+
 GList*
 modest_header_view_get_columns (ModestHeaderView *self)
 {
@@ -580,82 +633,356 @@ modest_header_view_get_columns (ModestHeaderView *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,
                              ModestHeaderViewStyle style)
 {
-       g_return_val_if_fail (self, FALSE);
-       g_return_val_if_fail (style < MODEST_HEADER_VIEW_STYLE_NUM, FALSE);
+       ModestHeaderViewPrivate *priv;
+       gboolean show_col_headers = FALSE;
+       ModestHeaderViewStyle old_style;
        
-       MODEST_HEADER_VIEW_GET_PRIVATE(self)->style = style;
+       g_return_val_if_fail (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 */
        
+       switch (style) {
+       case MODEST_HEADER_VIEW_STYLE_DETAILS:
+               show_col_headers = TRUE;
+               break;
+       case MODEST_HEADER_VIEW_STYLE_TWOLINES:
+               break;
+       default:
+               g_return_val_if_reached (FALSE);
+       }
+       gtk_tree_view_set_headers_visible   (GTK_TREE_VIEW(self), show_col_headers);
+       gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(self), show_col_headers);    
+
+       old_style   = priv->style;
+       priv->style = style;
+
        return TRUE;
 }
 
+
 ModestHeaderViewStyle
 modest_header_view_get_style (ModestHeaderView *self)
 {
        g_return_val_if_fail (self, FALSE);
-
        return MODEST_HEADER_VIEW_GET_PRIVATE(self)->style;
 }
 
+/* 
+ * This function sets a sortable model in the header view. It's just
+ * used for developing purposes, because it only does a
+ * gtk_tree_view_set_model
+ */
+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);
 
-/* get the length of any prefix that should be ignored for sorting */
-static inline int 
-get_prefix_len (const gchar *sub)
+       return;
+}
+
+TnyFolder*
+modest_header_view_get_folder (ModestHeaderView *self)
 {
-       gint i;
-       static const gchar* prefix[] = {
-               "Re:", "RE:", "Fwd:", "FWD:", "FW:", NULL
-       };
-               
-       if (!sub || (sub[0] != 'R' && sub[0] != 'F')) /* optimization */
-               return 0;
+       ModestHeaderViewPrivate *priv;
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
 
-       i = 0;
-       
-       while (prefix[i]) {
-               if (g_str_has_prefix(sub, prefix[i])) {
-                       int prefix_len = strlen(prefix[i]); 
-                       if (sub[prefix_len] == ' ')
-                               ++prefix_len; /* ignore space after prefix as well */
-                       return prefix_len; 
-               }
-               ++i;
+       if (priv->folder)
+               g_object_ref (priv->folder);
+
+       return priv->folder;
+}
+
+static void
+modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder)
+{
+       TnyFolderType type;
+       TnyList *headers;
+       ModestHeaderViewPrivate *priv;
+       GList *cols, *cursor;
+       GtkTreeModel *sortable; 
+       guint sort_colid;
+       GtkSortType sort_type;
+
+       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),
+                                             folder, FALSE);
+
+       /* Add a folder observer */
+       g_mutex_lock (priv->monitor_lock);
+       if (priv->monitor) {
+               tny_folder_monitor_stop (priv->monitor);
+               g_object_unref (G_OBJECT (priv->monitor));
        }
-       return 0;
+       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);
+
+
+       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);
+       }
+
+       /* 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);
+       }
+
+       /* Set new 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_sort_by_column_id (ModestHeaderView *self, 
+                                     guint sort_colid,
+                                     GtkSortType sort_type)
+{
+       ModestHeaderViewPrivate *priv = NULL;
+       GtkTreeModel *sortable = NULL; 
+       TnyFolderType type;
 
+       /* Get model and private data */
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);            
+       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"); */
+       
+}
 
-/* a strcmp that is case insensitive and NULL-safe */
-static gint
-cmp_insensitive_str (const gchar* s1, const gchar *s2)
+void
+modest_header_view_set_sort_params (ModestHeaderView *self, 
+                                   guint sort_colid, 
+                                   GtkSortType sort_type,
+                                   TnyFolderType type)
 {
-       gint result = 0;
-       gchar *n1, *n2;
+       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)
+{
+       ModestHeaderViewPrivate *priv;
+
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+
+       if (priv->folder) {
+               g_object_unref (priv->folder);
+               priv->folder = NULL;
+       }
+
+       if (folder) {
+               ModestMailOperation *mail_op;
+
+               /* 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 */
+               g_signal_emit (G_OBJECT(self), signals[HEADER_SELECTED_SIGNAL], 0, NULL);
 
-       /* work even when s1 and/or s2 == NULL */
-       if (s1 == s2)
-               return 0;
-       if (!s1)
-               return -1;
-       if (!s2)
-               return 1;
+               /* Create the mail operation */
+               mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_RECEIVE, 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);
+
+               /* Free */
+               g_object_unref (mail_op);
+
+       } else {
+               g_mutex_lock (priv->monitor_lock);
+               modest_header_view_set_model (GTK_TREE_VIEW (self), NULL); 
+
+               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);
+       }
+}
 
-       n1 = g_utf8_collate_key (s1, -1);
-       n2 = g_utf8_collate_key (s2, -1);
+static gboolean
+on_header_clicked (GtkWidget *widget, GdkEventButton *event, gpointer user_data)
+{
+       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;
+
+       self = MODEST_HEADER_VIEW (widget);
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
        
-       result = strcmp (n1, n2);
+       path = get_selected_row (GTK_TREE_VIEW(self), &model);
+       if ((path == NULL) || (!gtk_tree_model_get_iter(model, &iter, path))) 
+               return FALSE;
+                       
+       /* get the first selected item */
+       gtk_tree_model_get (model, &iter,
+                           TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
+                           &header, -1);
+       /* 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);
+
+       return TRUE;
+}
+
 
-       g_free (n1);
-       g_free (n2);
+static void
+on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
+{
+       GtkTreeModel *model;
+       TnyHeader *header;
+       GtkTreePath *path = NULL;       
+       GtkTreeIter iter;
+       ModestHeaderView *self;
+       ModestHeaderViewPrivate *priv;
        
-       return result;
+       g_return_if_fail (sel);
+       g_return_if_fail (user_data);
+       
+       self = MODEST_HEADER_VIEW (user_data);
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);    
+
+       path = get_selected_row (GTK_TREE_VIEW(self), &model);
+       if ((path == NULL) || (!gtk_tree_model_get_iter(model, &iter, path)))
+               return; /* msg was _un_selected */
+
+       gtk_tree_model_get (model, &iter,
+                           TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
+                           &header, -1);
+
+       /* Emit signal */
+       g_signal_emit (G_OBJECT(self), 
+                      signals[HEADER_SELECTED_SIGNAL], 
+                      0, header);
+
+       g_object_unref (G_OBJECT (header));
+       gtk_tree_path_free(path);
+}
+
+
+/* PROTECTED method. It's useful when we want to force a given
+   selection to reload a msg. For example if we have selected a header
+   in offline mode, when Modest become online, we want to reload the
+   message automatically without an user click over the header */
+void 
+_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));
+
+       on_selection_changed (selection, user_data);
 }
 
 
@@ -667,9 +994,11 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
        gint t1, t2;
        gint val1, val2;
        gchar *s1, *s2;
-       gint cmp;
-       
+       gint cmp;       
+       gint sort_colid;
        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));
        
        if (!(++counter % 100)) {
@@ -678,13 +1007,30 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
                g_signal_emit (header_view,
                               signals[STATUS_UPDATE_SIGNAL],
                               0, _("Sorting..."), 0, 0);
-       }
-       
-       switch (col_id) {
+       }       
+       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;
 
-               /* first one, we decide based on the time */
-       case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER:
+       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);
@@ -692,7 +1038,8 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *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,
@@ -704,6 +1051,7 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
 
                
                /* 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,
@@ -716,8 +1064,9 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
                                    -1);
 
                /* the prefix ('Re:', 'Fwd:' etc.) we ignore */ 
-               cmp = cmp_insensitive_str (s1 + get_prefix_len(s1), s2 + get_prefix_len(s2));
-
+               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);
                
@@ -734,7 +1083,7 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
                                    TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN, &s2,
                                    TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2,
                                    -1);
-               cmp = cmp_insensitive_str (s1, s2);
+               cmp = modest_text_utils_utf8_strcmp (s1, s2, TRUE);
                g_free (s1);
                g_free (s2);
                
@@ -750,7 +1099,7 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
                                    TNY_GTK_HEADER_LIST_MODEL_TO_COLUMN, &s2,
                                    TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2,
                                    -1);
-               cmp = cmp_insensitive_str (s1, s2);
+               cmp = modest_text_utils_utf8_strcmp (s1, s2, TRUE);
                g_free (s1);
                g_free (s2);
                
@@ -777,183 +1126,173 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
 
                return cmp ? cmp : t1 - t2;
 
+       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);
+
+               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;
        default:
                return &iter1 - &iter2; /* oughhhh  */
        }
 }
 
-
+/* Drag and drop stuff */
 static void
-on_refresh_folder (TnyFolder *folder, gboolean cancelled, GError **err,
-                  gpointer user_data)
+drag_data_get_cb (GtkWidget *widget, GdkDragContext *context, 
+                 GtkSelectionData *selection_data, 
+                 guint info,  guint time, gpointer data)
 {
-       GtkTreeModel *sortable; 
-       ModestHeaderView *self;
-       ModestHeaderViewPrivate *priv;
-
-       if (cancelled)
-               return;
-       
-       self = MODEST_HEADER_VIEW(user_data);
-       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
-
-
-       g_assert (folder == priv->folder);
+       GtkTreeModel *model;
+       GtkTreeIter iter;
+       GtkTreePath *source_row;
        
-       if (!folder)  /* when there is no folder */
-               gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(self), FALSE);
-       else { /* it's a new one or a refresh */
-               GList *cols, *cursor;
-
-               if (priv->headers)
-                       g_object_unref (priv->headers);
-
-               priv->headers = TNY_LIST(tny_gtk_header_list_model_new ());
-               tny_folder_get_headers (folder, priv->headers, FALSE, NULL); /* FIXME */
-               
-               tny_gtk_header_list_model_set_folder
-                       (TNY_GTK_HEADER_LIST_MODEL(priv->headers),folder, TRUE); /*async*/
-                       
-               sortable = gtk_tree_model_sort_new_with_model
-                       (GTK_TREE_MODEL(priv->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);
+       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:
+               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));
                }
-               g_list_free (cols);
-               
-               gtk_tree_view_set_model (GTK_TREE_VIEW (self), sortable);
-               gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(self),TRUE);
-               gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(self), TRUE);
-               /* no need to unref sortable */ 
+               break;
+       }
+       default:
+               g_message ("default");
        }
-}
-
-
-static void
-on_refresh_folder_status_update (TnyFolder *folder, const gchar *msg,
-                                gint num, gint total,  gpointer user_data)
-{
-       ModestHeaderView *self;
-       ModestHeaderViewPrivate *priv;
-
-       self = MODEST_HEADER_VIEW(user_data);
-       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
 
-       g_signal_emit (G_OBJECT(self), signals[STATUS_UPDATE_SIGNAL],
-                      0, msg, num, total);
+       gtk_tree_path_free (source_row);
 }
 
+/* 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 },
+};
 
-TnyFolder*
-modest_header_view_get_folder (ModestHeaderView *self)
+static void
+setup_drag_and_drop (GtkTreeView *self)
 {
-       ModestHeaderViewPrivate *priv;
-       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
-
-       return priv->folder;
+       gtk_drag_source_set (GTK_WIDGET (self),
+                            GDK_BUTTON1_MASK,
+                            header_view_drag_types,
+                            G_N_ELEMENTS (header_view_drag_types),
+                            GDK_ACTION_MOVE | GDK_ACTION_COPY);
+
+       g_signal_connect(G_OBJECT (self), "drag_data_get",
+                        G_CALLBACK(drag_data_get_cb), NULL);
 }
 
-
-gboolean
-modest_header_view_set_folder (ModestHeaderView *self, TnyFolder *folder)
+static GtkTreePath *
+get_selected_row (GtkTreeView *self, GtkTreeModel **model) 
 {
-       ModestHeaderViewPrivate *priv;
-       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+       GtkTreePath *path = NULL;
+       GtkTreeSelection *sel = NULL;   
+       GList *rows = NULL;
 
-       priv->folder = folder;
+       sel   = gtk_tree_view_get_selection(self);
+       rows = gtk_tree_selection_get_selected_rows (sel, model);
        
-       if (!folder)  {/* when there is no folder */
-               gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(self), FALSE);
-               gtk_tree_view_set_model (GTK_TREE_VIEW (self), NULL);
-       } else { /* it's a new one or a refresh */
-               tny_folder_refresh_async (folder,
-                                         on_refresh_folder,
-                                         on_refresh_folder_status_update,
-                                         self);
-       }
-       
-       /* no message selected */
-       g_signal_emit (G_OBJECT(self), signals[MESSAGE_SELECTED_SIGNAL], 0,
-                      NULL);
-       return TRUE;
-}
+       if ((rows == NULL) || (g_list_length(rows) != 1))
+               goto frees;
 
-static void
-get_msg_cb (TnyFolder *folder, TnyMsg *msg, GError **err, gpointer user_data)
-{
-       GetMsgAsyncHelper *helper;
-       TnyHeaderFlags header_flags;
+       path = gtk_tree_path_copy(g_list_nth_data (rows, 0));
+       
 
-       helper = (GetMsgAsyncHelper *) user_data;
+       /* Free */
+ frees:
+       g_list_foreach(rows,(GFunc) gtk_tree_path_free, NULL);
+       g_list_free(rows);
 
-       if (!msg) {
-               g_signal_emit (G_OBJECT(helper->view), signals[ITEM_NOT_FOUND_SIGNAL], 0,
-                              MODEST_ITEM_TYPE_MESSAGE);
-               return;
-       }
-                                       
-       g_signal_emit (G_OBJECT(helper->view), signals[MESSAGE_SELECTED_SIGNAL], 0,
-                      msg);
-       
-       /* mark message as seen; _set_flags crashes, bug in tinymail? */
-       header_flags = tny_header_get_flags (helper->header);
-       tny_header_set_flags (helper->header, header_flags | TNY_HEADER_FLAG_SEEN);
+       return path;
 }
 
-static void
-on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
+/*
+ * 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;
-       TnyHeader *header;
-       GtkTreeIter iter;
-       ModestHeaderView *self;
-       ModestHeaderViewPrivate *priv;
-       TnyFolder *folder;
-       GetMsgAsyncHelper *helper;
-       
-       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))
-               return; /* msg was _un_selected */
-       
-       gtk_tree_model_get (model, &iter,
-                           TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
-                           &header, -1);
-       
-       if (!header) {
-               g_printerr ("modest: cannot find header\n");
-               return;
+       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);
        }
 
-       folder = tny_header_get_folder (TNY_HEADER(header));
-       if (!folder) {
-               g_signal_emit (G_OBJECT(self), signals[ITEM_NOT_FOUND_SIGNAL], 0,
-                              MODEST_ITEM_TYPE_FOLDER);
-               return;
+       /* Need to get the all the rows because is selection multiple */
+       selected = gtk_tree_selection_get_selected_rows (selection, &model);
+       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 */
 
-       helper = g_slice_new0 (GetMsgAsyncHelper);
-       helper->view = self;
-       helper->header = header;
-
-       /* Get message asynchronously. The callback will issue a
-          signal if the message was retrieved correctly and then will
-          set the header flags as read. Tinymail will free the helper */       
-       tny_folder_get_msg_async (TNY_FOLDER(folder), header, get_msg_cb, helper);
+       /* Frees */     
+       g_list_foreach (selected, (GFunc) gtk_tree_path_free, NULL);
+       g_list_free (selected);
 
-       /* Free */
-       g_object_unref (G_OBJECT (folder));
+       return FALSE;
 }