2007-09-16 [colin] 3.0.0cvs17
[claws.git] / src / folderview.c
index 69a49240d8009d68da3551e6a986db59f31ced03..1b6fe080ab117341a98379ed7e380d1b1eda1982 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #include "defs.h"
@@ -180,7 +180,6 @@ static GdkBitmap *unreadxpmmask;
 static GdkPixmap *readxpm;
 static GdkBitmap *readxpmmask;
 
-
 static void folderview_select_node      (FolderView    *folderview,
                                          GtkCTreeNode  *node);
 static void folderview_set_folders      (FolderView    *folderview);
@@ -238,6 +237,9 @@ static void folderview_send_queue_cb        (FolderView     *folderview,
 static void folderview_search_cb       (FolderView     *folderview,
                                         guint           action,
                                         GtkWidget      *widget);
+static void folderview_run_processing_cb(FolderView    *folderview,
+                                        guint           action,
+                                        GtkWidget      *widget);
 
 static void folderview_property_cb     (FolderView     *folderview,
                                         guint           action,
@@ -273,11 +275,11 @@ static void folderview_drag_end_cb         (GtkWidget        *widget,
                                          GdkDragContext   *drag_context,
                                          FolderView       *folderview);
 
-void folderview_create_folder_node       (FolderView       *folderview, 
+static void folderview_create_folder_node       (FolderView       *folderview, 
                                          FolderItem       *item);
-gboolean folderview_update_folder       (gpointer          source,
+static gboolean folderview_update_folder        (gpointer          source,
                                          gpointer          userdata);
-gboolean folderview_update_item_claws   (gpointer          source,
+static gboolean folderview_update_item_claws    (gpointer          source,
                                          gpointer          data);
 static void folderview_processing_cb(FolderView *folderview, guint action,
                                     GtkWidget *widget);
@@ -290,6 +292,7 @@ static GtkItemFactoryEntry folderview_common_popup_entries[] =
 {
        {N_("/Mark all re_ad"),         NULL, mark_all_read_cb, 0, NULL},
        {"/---",                        NULL, NULL, 0, "<Separator>"},
+       {N_("/R_un processing rules"),  NULL, folderview_run_processing_cb, 0, NULL},
        {N_("/_Search folder..."),      NULL, folderview_search_cb, 0, NULL},
        {N_("/_Properties..."),         NULL, folderview_property_cb, 0, NULL},
        {N_("/Process_ing..."),         NULL, folderview_processing_cb, 0, NULL},
@@ -374,9 +377,11 @@ static void create_ifactories(gpointer key, gpointer value, gpointer data)
 static void folderview_column_set_titles(FolderView *folderview)
 {
        GtkWidget *ctree = folderview->ctree;
+       GtkWidget *label_folder;
        GtkWidget *label_new;
        GtkWidget *label_unread;
        GtkWidget *label_total;
+       GtkWidget *hbox_folder;
        GtkWidget *hbox_new;
        GtkWidget *hbox_unread;
        GtkWidget *hbox_total;
@@ -394,18 +399,22 @@ static void folderview_column_set_titles(FolderView *folderview)
                         &unreadxpm, &unreadxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_READ,
                         &readxpm, &readxpmmask);
-               
+       
+       label_folder = gtk_label_new(_("Folder"));
        label_new = gtk_image_new_from_pixmap(newxpm, newxpmmask);
        label_unread = gtk_image_new_from_pixmap(unreadxpm, unreadxpmmask);
        label_total = gtk_image_new_from_pixmap(readxpm, readxpmmask);
        
        gtk_clist_column_titles_active(GTK_CLIST(ctree));
         
+       hbox_folder = gtk_hbox_new(FALSE, 4);
        hbox_new = gtk_hbox_new(FALSE, 4);
        hbox_unread = gtk_hbox_new(FALSE, 4);
        hbox_total = gtk_hbox_new(FALSE, 4);
 
        /* left justified */
+       gtk_box_pack_start(GTK_BOX(hbox_folder), label_folder, TRUE, TRUE, 0);
+       gtk_misc_set_alignment (GTK_MISC (label_folder), 0, 0.5);
        gtk_box_pack_start(GTK_BOX(hbox_new), label_new, TRUE, TRUE, 0);
        gtk_misc_set_alignment (GTK_MISC (label_new), 1, 0.5);
        gtk_box_pack_start(GTK_BOX(hbox_unread), label_unread, TRUE, TRUE, 0);
@@ -413,14 +422,26 @@ static void folderview_column_set_titles(FolderView *folderview)
        gtk_box_pack_start(GTK_BOX(hbox_total), label_total, TRUE, TRUE, 0);
        gtk_misc_set_alignment (GTK_MISC (label_total), 1, 0.5);
 
+       gtk_widget_show_all(hbox_folder);
        gtk_widget_show_all(hbox_new);
        gtk_widget_show_all(hbox_unread);
        gtk_widget_show_all(hbox_total);
 
+#ifdef MAEMO
+       gtk_widget_set_size_request(hbox_new, -1, 20);
+       gtk_widget_set_size_request(hbox_unread, -1, 20);
+       gtk_widget_set_size_request(hbox_total, -1, 20);
+#endif
+
+       gtk_clist_set_column_widget(GTK_CLIST(ctree),col_pos[F_COL_FOLDER],hbox_folder);
        gtk_clist_set_column_widget(GTK_CLIST(ctree),col_pos[F_COL_NEW],hbox_new);
        gtk_clist_set_column_widget(GTK_CLIST(ctree),col_pos[F_COL_UNREAD],hbox_unread);
        gtk_clist_set_column_widget(GTK_CLIST(ctree),col_pos[F_COL_TOTAL],hbox_total);
 
+#ifdef MAEMO
+       GTK_EVENTS_FLUSH();
+#endif
+
        gtk_sctree_set_column_tooltip(GTK_SCTREE(ctree), col_pos[F_COL_NEW], _("New"));
        gtk_sctree_set_column_tooltip(GTK_SCTREE(ctree), col_pos[F_COL_UNREAD], _("Unread"));
        gtk_sctree_set_column_tooltip(GTK_SCTREE(ctree), col_pos[F_COL_TOTAL], _("Total"));
@@ -443,7 +464,7 @@ static gboolean folderview_popup_menu(GtkWidget *widget, gpointer data)
 }
 
 
-GtkWidget *folderview_ctree_create(FolderView *folderview)
+static GtkWidget *folderview_ctree_create(FolderView *folderview)
 {
        GtkWidget *ctree;
        gint *col_pos;
@@ -476,6 +497,10 @@ GtkWidget *folderview_ctree_create(FolderView *folderview)
        ctree = gtk_sctree_new_with_titles(N_FOLDER_COLS, col_pos[F_COL_FOLDER],
                                           titles);
 
+       if (prefs_common.show_col_headers == FALSE)
+               gtk_clist_column_titles_hide(GTK_CLIST(ctree));
+
+
        gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_BROWSE);
        gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[F_COL_NEW],
                                           GTK_JUSTIFY_RIGHT);
@@ -517,15 +542,26 @@ GtkWidget *folderview_ctree_create(FolderView *folderview)
        g_signal_connect(G_OBJECT(ctree), "button_press_event",
                         G_CALLBACK(folderview_button_pressed),
                         folderview);
+#ifndef MAEMO
        g_signal_connect(G_OBJECT(ctree), "popup-menu",
                         G_CALLBACK(folderview_popup_menu), folderview);
+#else
+       gtk_widget_tap_and_hold_setup(GTK_WIDGET(ctree), NULL, NULL,
+                       GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS);
+       g_signal_connect(G_OBJECT(ctree), "tap-and-hold",
+                        G_CALLBACK(folderview_popup_menu), folderview);
+#endif
        g_signal_connect(G_OBJECT(ctree), "button_release_event",
                         G_CALLBACK(folderview_button_released),
                         folderview);
        g_signal_connect(G_OBJECT(ctree), "tree_select_row",
                         G_CALLBACK(folderview_selected), folderview);
+#ifndef MAEMO
+       /* drag-n-dropping folders on maemo is impractical as this 
+        * opens the folder almost everytime */
        g_signal_connect(G_OBJECT(ctree), "start_drag",
                         G_CALLBACK(folderview_start_drag), folderview);
+#endif
        g_signal_connect(G_OBJECT(ctree), "drag_data_get",
                         G_CALLBACK(folderview_drag_data_get),
                         folderview);
@@ -621,6 +657,7 @@ FolderView *folderview_create(void)
        
        folderview->target_list = gtk_target_list_new(folderview_drag_types, 2);
        folderview_list = g_list_append(folderview_list, folderview);
+       folderview->deferred_refresh_id = -1;
 
        return folderview;
 }
@@ -707,32 +744,68 @@ void folderview_init(FolderView *folderview)
        }
 }
 
+static gboolean folderview_defer_set(gpointer data)
+{
+       FolderView *folderview = (FolderView *)data;
+       MainWindow *mainwin = folderview->mainwin;
+       
+       if (!mainwin)
+               return FALSE;
+       if (mainwin->lock_count)
+               return TRUE;
+               
+       debug_print("doing deferred folderview_set now\n");
+       folderview_set(folderview);
+
+       folderview->deferred_refresh_id = -1;
+       return FALSE;
+}
+
 void folderview_set(FolderView *folderview)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        MainWindow *mainwin = folderview->mainwin;
+       FolderItem *sel_item = NULL, *op_item = NULL;
 
        if (!mainwin)
                return;
 
+       if (mainwin->lock_count) {
+               if (folderview->deferred_refresh_id == -1)
+                       folderview->deferred_refresh_id = 
+                               g_timeout_add(500, folderview_defer_set, folderview);
+               debug_print("deferred folderview_set\n");
+               return;
+       }
+
+       inc_lock();
        debug_print("Setting folder info...\n");
        STATUSBAR_PUSH(mainwin, _("Setting folder info..."));
 
        main_window_cursor_wait(mainwin);
 
+       if (folderview->selected)
+               sel_item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+       if (folderview->opened)
+               op_item = gtk_ctree_node_get_row_data(ctree, folderview->opened);
+
        folderview->selected = NULL;
        folderview->opened = NULL;
 
        gtk_clist_freeze(GTK_CLIST(ctree));
        gtk_clist_clear(GTK_CLIST(ctree));
-       gtk_clist_thaw(GTK_CLIST(ctree));
-       gtk_clist_freeze(GTK_CLIST(ctree));
 
        folderview_set_folders(folderview);
 
+       if (sel_item)
+               folderview->selected = gtk_ctree_find_by_row_data(ctree, NULL, sel_item);
+       if (op_item)
+               folderview->opened = gtk_ctree_find_by_row_data(ctree, NULL, op_item);
+
        gtk_clist_thaw(GTK_CLIST(ctree));
        main_window_cursor_normal(mainwin);
        STATUSBAR_POP(mainwin);
+       inc_unlock();
 }
 
 void folderview_set_all(void)
@@ -846,10 +919,10 @@ void folderview_select_next_marked(FolderView *folderview)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        GtkCTreeNode *node = NULL;
-       SelectOnEntry last_sel = prefs_common.select_on_entry;
+       EntryAction last_summary_select_prio = prefs_common.summary_select_prio[0];
        gboolean last_open = prefs_common.always_show_msg;
        
-       prefs_common.select_on_entry = SELECTONENTRY_MNU;
+       prefs_common.summary_select_prio[0] = ACTION_MARKED;
        prefs_common.always_show_msg = TRUE;
 
        if ((node = folderview_find_next_marked(ctree, folderview->opened))
@@ -867,7 +940,7 @@ void folderview_select_next_marked(FolderView *folderview)
                folderview_select_node(folderview, node);
 
 out:
-       prefs_common.select_on_entry = last_sel;
+       prefs_common.summary_select_prio[0] = last_summary_select_prio;
        prefs_common.always_show_msg = last_open;
 }
 
@@ -894,10 +967,10 @@ void folderview_select_next_unread(FolderView *folderview, gboolean force_open)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        GtkCTreeNode *node = NULL;
-       SelectOnEntry last_sel = prefs_common.select_on_entry;
+       EntryAction last_summary_select_prio = prefs_common.summary_select_prio[0];
        gboolean last_open = prefs_common.always_show_msg;
        
-       prefs_common.select_on_entry = SELECTONENTRY_UNM;
+       prefs_common.summary_select_prio[0] = ACTION_UNREAD;
        prefs_common.always_show_msg = force_open ? TRUE : last_open;
 
        if ((node = folderview_find_next_unread(ctree, folderview->opened))
@@ -915,7 +988,7 @@ void folderview_select_next_unread(FolderView *folderview, gboolean force_open)
                folderview_select_node(folderview, node);
 
 out:
-       prefs_common.select_on_entry = last_sel;
+       prefs_common.summary_select_prio[0] = last_summary_select_prio;
        prefs_common.always_show_msg = last_open;
 }
 
@@ -942,10 +1015,10 @@ void folderview_select_next_new(FolderView *folderview)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        GtkCTreeNode *node = NULL;
-       SelectOnEntry last_sel = prefs_common.select_on_entry;
+       EntryAction last_summary_select_prio = prefs_common.summary_select_prio[0];
        gboolean last_open = prefs_common.always_show_msg;
        
-       prefs_common.select_on_entry = SELECTONENTRY_NUM;
+       prefs_common.summary_select_prio[0] = ACTION_NEW;
        prefs_common.always_show_msg = TRUE;
 
        if ((node = folderview_find_next_new(ctree, folderview->opened))
@@ -963,7 +1036,7 @@ void folderview_select_next_new(FolderView *folderview)
                folderview_select_node(folderview, node);
 
 out:
-       prefs_common.select_on_entry = last_sel;
+       prefs_common.summary_select_prio[0] = last_summary_select_prio;
        prefs_common.always_show_msg = last_open;
 }
 
@@ -975,75 +1048,6 @@ FolderItem *folderview_get_selected_item(FolderView *folderview)
        return gtk_ctree_node_get_row_data(ctree, folderview->selected);
 }
 
-void folderview_update_msg_num(FolderView *folderview, GtkCTreeNode *row)
-{
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       static GtkCTreeNode *prev_row = NULL;
-       FolderItem *item;
-       gint new, unread, total;
-       gchar *new_str, *unread_str, *total_str;
-       gint *col_pos = folderview->col_pos;
-
-       if (!row) return;
-
-       item = gtk_ctree_node_get_row_data(ctree, row);
-       if (!item) return;
-
-       gtk_ctree_node_get_text(ctree, row, col_pos[F_COL_NEW], &new_str);
-       gtk_ctree_node_get_text(ctree, row, col_pos[F_COL_UNREAD], &unread_str);
-       gtk_ctree_node_get_text(ctree, row, col_pos[F_COL_TOTAL], &total_str);
-       new = atoi(new_str);
-       unread = atoi(unread_str);
-       total = atoi(total_str);
-
-       prev_row = row;
-
-       folderview_update_node(folderview, row);
-}
-
-void folderview_append_item(FolderItem *item)
-{
-       GList *list;
-       
-       g_return_if_fail(item != NULL);
-       g_return_if_fail(item->folder != NULL);
-       if (folder_item_parent(item)) return;
-
-       for (list = folderview_list; list != NULL; list = list->next) {
-               FolderView *folderview = (FolderView *)list->data;
-               GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-               GtkCTreeNode *node, *child;
-               gint *col_pos = folderview->col_pos;
-
-               node = gtk_ctree_find_by_row_data(ctree, NULL, 
-                                                 folder_item_parent(item));
-               if (node) {
-                       child = gtk_ctree_find_by_row_data(ctree, node, item);
-                       if (!child) {
-                               gchar *text[N_FOLDER_COLS] =
-                                       {NULL, "0", "0", "0"};
-
-                               gtk_clist_freeze(GTK_CLIST(ctree));
-
-                               text[col_pos[F_COL_FOLDER]] = item->name;
-                               child = gtk_sctree_insert_node
-                                       (ctree, node, NULL, text,
-                                        FOLDER_SPACING,
-                                        folderxpm, folderxpmmask,
-                                        folderopenxpm, folderopenxpmmask,
-                                        FALSE, FALSE);
-                               gtk_ctree_node_set_row_data(ctree, child, item);
-                               gtk_ctree_expand(ctree, node);
-                               folderview_update_node(folderview, child);
-                               folderview_sort_folders(folderview, node,
-                                                       item->folder);
-
-                               gtk_clist_thaw(GTK_CLIST(ctree));
-                       }
-               }
-       }
-}
-
 static void folderview_set_folders(FolderView *folderview)
 {
        GList *list;
@@ -1082,6 +1086,10 @@ static void folderview_scan_tree_func(Folder *folder, FolderItem *item,
 void folderview_rescan_tree(Folder *folder, gboolean rebuild)
 {
        GtkWidget *window;
+       MainWindow *mainwin = mainwindow_get_mainwindow();
+       FolderView *folderview = NULL;
+       GtkAdjustment *pos = NULL;
+       gint height = 0;
 
        g_return_if_fail(folder != NULL);
 
@@ -1103,13 +1111,69 @@ void folderview_rescan_tree(Folder *folder, gboolean rebuild)
        else 
                window = label_window_create(_("Scanning folder tree..."));
 
+       if (mainwin)
+               folderview = mainwin->folderview;
+       
+       if (folderview) {
+               pos = gtk_scrolled_window_get_vadjustment(
+                                       GTK_SCROLLED_WINDOW(folderview->scrolledwin));
+               height = pos->value;
+       }
+
        folder_set_ui_func(folder, folderview_scan_tree_func, NULL);
        folder_scan_tree(folder, rebuild);
        folder_set_ui_func(folder, NULL, NULL);
 
        folderview_set_all();
 
-       gtk_widget_destroy(window);
+       if (folderview) {
+               pos = gtk_scrolled_window_get_vadjustment(
+                                       GTK_SCROLLED_WINDOW(folderview->scrolledwin));
+               gtk_adjustment_set_value(pos, height);
+               gtk_adjustment_changed(pos);
+       }
+       label_window_destroy(window);
+       inc_unlock();
+}
+
+void folderview_fast_rescan_tree(Folder *folder)
+{
+       GtkWidget *window;
+       MainWindow *mainwin = mainwindow_get_mainwindow();
+       FolderView *folderview = NULL;
+       GtkAdjustment *pos = NULL;
+       gint height = 0;
+
+       g_return_if_fail(folder != NULL);
+
+       if (!folder->klass->scan_tree) return;
+
+       inc_lock();
+
+       window = label_window_create(_("Scanning folder tree..."));
+
+       if (mainwin)
+               folderview = mainwin->folderview;
+       
+       if (folderview) {
+               pos = gtk_scrolled_window_get_vadjustment(
+                                       GTK_SCROLLED_WINDOW(folderview->scrolledwin));
+               height = pos->value;
+       }
+
+       folder_set_ui_func(folder, folderview_scan_tree_func, NULL);
+       folder_fast_scan_tree(folder);
+       folder_set_ui_func(folder, NULL, NULL);
+
+       folderview_set_all();
+
+       if (folderview) {
+               pos = gtk_scrolled_window_get_vadjustment(
+                                       GTK_SCROLLED_WINDOW(folderview->scrolledwin));
+               gtk_adjustment_set_value(pos, height);
+               gtk_adjustment_changed(pos);
+       }
+       label_window_destroy(window);
        inc_unlock();
 }
 
@@ -1172,8 +1236,9 @@ gint folderview_check_new(Folder *folder)
                                        if (folder) {
                                                summaryview_unlock(folderview->summaryview, item);
                                                if (FOLDER_TYPE(item->folder) == F_NEWS || FOLDER_IS_LOCAL(folder)) {
-                                                       log_error(_("Couldn't scan folder %s\n"),
+                                                       log_error(LOG_PROTOCOL, _("Couldn't scan folder %s\n"),
                                                                item->path ? item->path:item->name);
+                                                       STATUSBAR_POP(folderview->mainwin);
                                                        continue;
                                                } else if (!FOLDER_IS_LOCAL(folder)) {
                                                        STATUSBAR_POP(folderview->mainwin);
@@ -1237,7 +1302,7 @@ void folderview_check_new_all(void)
        folder_write_list();
        folderview_set_all();
 
-       gtk_widget_destroy(window);
+       label_window_destroy(window);
        main_window_unlock(folderview->mainwin);
        inc_unlock();
 }
@@ -1533,37 +1598,55 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                mask = openmask = searchmask;
        }
 
-       if (folder_has_parent_of_type(item, F_QUEUE) && item->total_msgs > 0 &&
-           prefs_common.display_folder_unread) {
-               str = g_strdup_printf("%s (%d%s)", name, item->total_msgs,
-                                     add_unread_mark ? "+" : "");
-               gtk_sctree_set_node_info(ctree, node, str, FOLDER_SPACING,
-                                       xpm, mask, openxpm, openmask,
-                                       FALSE, GTK_CTREE_ROW(node)->expanded);
-               g_free(str);
-       } else if (((item->unread_msgs > 0 || add_unread_mark) &&
-                   prefs_common.display_folder_unread) 
-                  || add_sub_match_mark) {
-
-               if (item->unread_msgs > 0)
-                       str = g_strdup_printf("%s (%d%s%s)", name, item->unread_msgs,
-                                             add_unread_mark || add_sub_match_mark ? "+" : "", 
-                                             item->unreadmarked_msgs > 0 ? "!":"");
-               else
-                       str = g_strdup_printf("%s (+)", name);
-               gtk_sctree_set_node_info(ctree, node, str, FOLDER_SPACING,
-                                       xpm, mask, openxpm, openmask,
-                                       FALSE, GTK_CTREE_ROW(node)->expanded);
-               g_free(str);
+       str = NULL;
+       if (prefs_common.display_folder_unread) {
+               if (folder_has_parent_of_type(item, F_QUEUE)) {
+                       /* only total_msgs matters here */
+                       if (item->total_msgs > 0) {
+                               /* show total number (should be equal to the unread number)
+                                  and signs if any */
+                               str = g_strdup_printf("%s (%d%s%s)",
+                                                       name, item->total_msgs,
+                                                       (add_unread_mark || add_sub_match_mark) ? "+" : "", 
+                                                       (item->unreadmarked_msgs > 0) ? "!" : "");
+                       }
        } else {
-               str = g_strdup_printf("%s%s", name, 
-                                     item->unreadmarked_msgs > 0 ? " (!)":"");
-       
+                       if (prefs_common.display_folder_unread == 1) {
+                               if (item->unread_msgs > 0) {
+                                       /* show unread number and signs */
+                                       str = g_strdup_printf("%s (%d%s%s)",
+                                                               name, item->unread_msgs,
+                                                               (add_unread_mark || add_sub_match_mark) ? "+" : "", 
+                                                               (item->unreadmarked_msgs > 0) ? "!" : "");
+                               }
+                       } else {
+                               if (item->total_msgs > 0) {
+                                       /* show unread number, total number and signs if any */
+                                       str = g_strdup_printf("%s (%d/%d%s%s)",
+                                                               name, item->unread_msgs, item->total_msgs,
+                                                               (add_unread_mark || add_sub_match_mark) ? "+" : "", 
+                                                               (item->unreadmarked_msgs > 0) ? "!" : "");
+                               }
+                       }
+               }
+               if ((str == NULL) &&
+                       (add_unread_mark || add_sub_match_mark || (item->unreadmarked_msgs > 0))) {
+                       /* no unread/total numbers, but at least one sign */
+                       str = g_strdup_printf("%s (%s%s)",
+                                               name,
+                                               (add_unread_mark || add_sub_match_mark) ? "+" : "", 
+                                               (item->unreadmarked_msgs > 0) ? "!" : "");
+               }
+       }
+       if (str == NULL) {
+               /* last fallback, folder name only or with ! sign */
+               str = g_strdup_printf("%s%s",
+                                       name, (item->unreadmarked_msgs > 0) ? " (!)" : "");
+       }
                gtk_sctree_set_node_info(ctree, node, str, FOLDER_SPACING,
                                        xpm, mask, openxpm, openmask,
                                        FALSE, GTK_CTREE_ROW(node)->expanded);
                g_free(str);
-       }
        g_free(name);
 
        if (!folder_item_parent(item)) {
@@ -1571,9 +1654,9 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_UNREAD], "-");
                gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_TOTAL],  "-");
        } else {
-               gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_NEW],    itos(item->new_msgs));
-               gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_UNREAD], itos(item->unread_msgs));
-               gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_TOTAL],  itos(item->total_msgs));
+               gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_NEW],    item->new_msgs    > 0 ? itos(item->new_msgs)    : prefs_common.zero_replacement);
+               gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_UNREAD], item->unread_msgs > 0 ? itos(item->unread_msgs) : prefs_common.zero_replacement);
+               gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_TOTAL],  item->total_msgs  > 0 ? itos(item->total_msgs)  : prefs_common.zero_replacement);
        }
 
        if (folder_has_parent_of_type(item, F_OUTBOX) ||
@@ -1633,31 +1716,6 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                folderview_update_node(folderview, node);
 }
 
-#if !CLAWS /* keep it here for syncs */
-void folderview_update_item(FolderItem *item, gboolean update_summary)
-{
-       GList *list;
-       FolderView *folderview;
-       GtkCTree *ctree;
-       GtkCTreeNode *node;
-
-       g_return_if_fail(item != NULL);
-
-       for (list = folderview_list; list != NULL; list = list->next) {
-               folderview = (FolderView *)list->data;
-               ctree = GTK_CTREE(folderview->ctree);
-
-               node = gtk_ctree_find_by_row_data(ctree, NULL, item);
-               if (node) {
-                       folderview_update_node(folderview, node);
-                       if (update_summary && folderview->opened == node)
-                               summary_show(folderview->summaryview,
-                                            item, FALSE);
-               }
-       }
-}
-#endif
-
 void folderview_update_search_icon(FolderItem *item, gboolean matches)
 {
        GList *list;
@@ -1679,7 +1737,7 @@ void folderview_update_search_icon(FolderItem *item, gboolean matches)
        }
 }
 
-gboolean folderview_update_item_claws(gpointer source, gpointer data)
+static gboolean folderview_update_item_claws(gpointer source, gpointer data)
 {
        FolderItemUpdateData *update_info = (FolderItemUpdateData *)source;
        FolderView *folderview = (FolderView *)data;
@@ -1696,7 +1754,10 @@ gboolean folderview_update_item_claws(gpointer source, gpointer data)
        if (node) {
                if (update_info->update_flags & (F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_NAME))
                        folderview_update_node(folderview, node);
-               if ((update_info->update_flags & F_ITEM_UPDATE_CONTENT) && (folderview->opened == node))
+
+               if ((update_info->update_flags & F_ITEM_UPDATE_CONTENT) && 
+                    update_info->item == folderview->summaryview->folder_item &&
+                    update_info->item != NULL)
                        if (!quicksearch_is_active(folderview->summaryview->quicksearch))
                                summary_show(folderview->summaryview, update_info->item);
        }
@@ -1704,26 +1765,6 @@ gboolean folderview_update_item_claws(gpointer source, gpointer data)
        return FALSE;
 }
 
-static void folderview_update_item_foreach_func(gpointer key, gpointer val,
-                                               gpointer data)
-{
-       /* CLAWS: share this joy with other hook functions ... */
-       folder_item_update((FolderItem *)key, 
-                          (FolderItemUpdateFlags)GPOINTER_TO_INT(data));
-}
-
-void folderview_update_item_foreach(GHashTable *table, gboolean update_summary)
-{
-       GList *list;
-       FolderItemUpdateFlags flags;
-       
-       flags = update_summary ?  F_ITEM_UPDATE_CONTENT | F_ITEM_UPDATE_MSGCNT
-               : 0;
-       for (list = folderview_list; list != NULL; list = list->next)
-               g_hash_table_foreach(table, folderview_update_item_foreach_func, 
-                                    GINT_TO_POINTER(flags));
-}
-
 static gboolean folderview_gnode_func(GtkCTree *ctree, guint depth,
                                      GNode *gnode, GtkCTreeNode *cnode,
                                      gpointer data)
@@ -1886,11 +1927,15 @@ static void folderview_set_sens_and_popup_menu(FolderView *folderview, gint row,
 #define SET_SENS(name, sens) \
        menu_set_sensitive(fpopup_factory, name, sens)
 
+       if ( FOLDER_TYPE(item->folder) == F_NEWS || FOLDER_TYPE(item->folder) == F_IMAP )
+               SET_SENS("/Download messages", !item->no_select);
        SET_SENS("/Mark all read", item->unread_msgs >= 1);
        SET_SENS("/Search folder...", item->total_msgs >= 1 && 
                 folderview->selected == folderview->opened);
-       SET_SENS("/Properties...", TRUE);
-       SET_SENS("/Processing...", item->node->parent != NULL);
+       SET_SENS("/Run processing rules", item->prefs->processing &&
+                item->total_msgs >= 1);
+       SET_SENS("/Properties...", !item->no_select);
+       SET_SENS("/Processing...", item->node->parent != NULL && !item->no_select);
        if (item == folder->trash || item == special_trash
            || folder_has_parent_of_type(item, F_TRASH)) {
                GSList *msglist = folder_item_get_msg_list(item);
@@ -1908,8 +1953,6 @@ static void folderview_set_sens_and_popup_menu(FolderView *folderview, gint row,
        popup = gtk_item_factory_get_widget(fpopup_factory, fpopup->path);
        gtk_menu_popup(GTK_MENU(popup), NULL, NULL, NULL, NULL,
                       event->button, event->time);
-
-
 }
 
 static gboolean folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
@@ -1975,8 +2018,13 @@ static gboolean folderview_button_pressed(GtkWidget *ctree, GdkEventButton *even
 static gboolean folderview_button_released(GtkWidget *ctree, GdkEventButton *event,
                                           FolderView *folderview)
 {
+       int row = -1, column = -1;
+
        if (!event) return FALSE;
 
+       if (!gtk_clist_get_selection_info(GTK_CLIST(ctree), event->x, event->y,
+                                         &row, &column))
+               return FALSE;
        if (event->button == 1 && folderview->open_folder == FALSE &&
            folderview->opened != NULL) {
                gtkut_ctree_set_focus_row(GTK_CTREE(ctree),
@@ -1996,12 +2044,25 @@ static gboolean folderview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                return FALSE;
 
        switch (event->keyval) {
+       case GDK_Right:
+#ifndef MAEMO
        case GDK_Return:
+       case GDK_KP_Enter:
+#endif
                if (folderview->selected) {
                        folderview_select_node(folderview,
                                               folderview->selected);
                }
                break;
+#ifdef MAEMO
+       case GDK_Return:
+               if (folderview->selected && GTK_CTREE_ROW(folderview->selected)->children) {
+                       gtk_ctree_toggle_expansion(
+                               GTK_CTREE(folderview->ctree),
+                               folderview->selected);
+               }
+               break;  
+#endif
        case GDK_space:
                if (folderview->selected) {
                        if (folderview->opened == folderview->selected &&
@@ -2041,6 +2102,34 @@ static gboolean postpone_select(void *data)
        return FALSE;
 }
 
+void folderview_close_opened(FolderView *folderview)
+{
+       if (folderview->opened) {
+               FolderItem *olditem;
+               
+               olditem = gtk_ctree_node_get_row_data(GTK_CTREE(folderview->ctree), 
+                                                     folderview->opened);
+               if (olditem) {
+                       gchar *buf = g_strdup_printf(_("Closing Folder %s..."), 
+                               olditem->path ? olditem->path:olditem->name);
+                       /* will be null if we just moved the previously opened folder */
+                       STATUSBAR_PUSH(folderview->mainwin, buf);
+                       main_window_cursor_wait(folderview->mainwin);
+                       g_free(buf);
+                       summary_save_prefs_to_folderitem(folderview->summaryview, olditem);
+                       summary_show(folderview->summaryview, NULL);
+                       folder_item_close(olditem);
+                       main_window_cursor_normal(folderview->mainwin);
+                       STATUSBAR_POP(folderview->mainwin);
+               }
+       }
+
+       if (folderview->opened &&
+           !GTK_CTREE_ROW(folderview->opened)->children)
+               gtk_ctree_collapse(GTK_CTREE(folderview->ctree), folderview->opened);
+
+       folderview->opened = NULL;
+}
 static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                                gint column, FolderView *folderview)
 {
@@ -2049,9 +2138,12 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
        FolderItem *item;
        gchar *buf;
        int res = 0;
+       GtkCTreeNode *old_opened = folderview->opened;
        START_TIMING("");
        folderview->selected = row;
 
+       debug_print("newly selected %p, opened %p\n", folderview->selected, 
+                       folderview->opened);
        if (folderview->opened == row) {
                folderview->open_folder = FALSE;
                END_TIMING();
@@ -2063,6 +2155,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                        gtkut_ctree_set_focus_row(ctree, folderview->opened);
                        gtk_ctree_select(ctree, folderview->opened);
                }
+               folderview->open_folder = FALSE;
                END_TIMING();
                return;
        }
@@ -2072,7 +2165,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                return;
        }
        item = gtk_ctree_node_get_row_data(ctree, row);
-       if (!item || item->no_select) {
+       if (!item) {
                END_TIMING();
                folderview->open_folder = FALSE;
                return;
@@ -2082,25 +2175,9 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
 
        /* Save cache for old folder */
        /* We don't want to lose all caches if sylpheed crashed */
-       if (folderview->opened) {
-               FolderItem *olditem;
-               
-               olditem = gtk_ctree_node_get_row_data(ctree, folderview->opened);
-               if (olditem) {
-                       buf = g_strdup_printf(_("Closing Folder %s..."), 
-                               olditem->path ? olditem->path:olditem->name);
-                       /* will be null if we just moved the previously opened folder */
-                       STATUSBAR_PUSH(folderview->mainwin, buf);
-                       main_window_cursor_wait(folderview->mainwin);
-                       g_free(buf);
-                       summary_save_prefs_to_folderitem(folderview->summaryview, olditem);
-                       summary_show(folderview->summaryview, NULL);
-                       folder_item_close(olditem);
-                       main_window_cursor_normal(folderview->mainwin);
-                       STATUSBAR_POP(folderview->mainwin);
-               }
-       }
-
+       /* resets folderview->opened to NULL */
+       folderview_close_opened(folderview);
+       
        /* CLAWS: set compose button type: news folder items 
         * always have a news folder as parent */
        if (item->folder) 
@@ -2114,9 +2191,6 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
 
        if (!GTK_CTREE_ROW(row)->children)
                gtk_ctree_expand(ctree, row);
-       if (folderview->opened &&
-           !GTK_CTREE_ROW(folderview->opened)->children)
-               gtk_ctree_collapse(ctree, folderview->opened);
 
        /* ungrab the mouse event */
        if (GTK_WIDGET_HAS_GRAB(ctree)) {
@@ -2126,6 +2200,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
        }
 
        /* Open Folder */
+       /* TODO: wwp: avoid displaying (null) in the status bar */
        buf = g_strdup_printf(_("Opening Folder %s..."), item->path ? 
                                        item->path : "(null)");
        debug_print("%s\n", buf);
@@ -2135,7 +2210,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
        main_window_cursor_wait(folderview->mainwin);
 
        res = folder_item_open(item);
-       if (res == -1) {
+       if (res == -1 && item->no_select == FALSE) {
                main_window_cursor_normal(folderview->mainwin);
                STATUSBAR_POP(folderview->mainwin);
 
@@ -2145,7 +2220,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                can_select = TRUE;
                END_TIMING();
                return;
-        } else if (res == -2) {
+        } else if (res == -2 && item->no_select == FALSE) {
                PostponedSelectData *data = g_new0(PostponedSelectData, 1);
                data->ctree = ctree;
                data->row = row;
@@ -2169,8 +2244,9 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
        folder_clean_cache_memory(item);
 
        if (!opened) {
-               gtkut_ctree_set_focus_row(ctree, folderview->opened);
-               gtk_ctree_select(ctree, folderview->opened);
+               gtkut_ctree_set_focus_row(ctree, old_opened);
+               gtk_ctree_select(ctree, old_opened);
+               folderview->opened = old_opened;
        } else {
                folderview->opened = row;
                if (gtk_ctree_node_is_visible(ctree, row)
@@ -2223,7 +2299,7 @@ static void folderview_col_resized(GtkCList *clist, gint column, gint width,
        prefs_common.folder_col_size[type] = width;
 }
 
-void folderview_create_folder_node_recursive(FolderView *folderview, FolderItem *item)
+static void folderview_create_folder_node_recursive(FolderView *folderview, FolderItem *item)
 {
        GNode *srcnode;
 
@@ -2244,7 +2320,7 @@ void folderview_create_folder_node_recursive(FolderView *folderview, FolderItem
        }
 }
 
-void folderview_create_folder_node(FolderView *folderview, FolderItem *item)
+static void folderview_create_folder_node(FolderView *folderview, FolderItem *item)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        gchar *text[N_FOLDER_COLS] = {NULL, "0", "0", "0"};
@@ -2371,11 +2447,9 @@ static void folderview_send_queue_cb(FolderView *folderview, guint action,
                        alertpanel_error_log(_("Some errors occurred while "
                                           "sending queued messages."));
                else {
-                       gchar *tmp = g_strdup_printf(_("Some errors occurred "
+                       alertpanel_error_log(_("Some errors occurred "
                                        "while sending queued messages:\n%s"), errstr);
                        g_free(errstr);
-                       alertpanel_error_log(tmp);
-                       g_free(tmp);
                }
        }
 }
@@ -2386,6 +2460,21 @@ static void folderview_search_cb(FolderView *folderview, guint action,
        summary_search(folderview->summaryview);
 }
 
+static void folderview_run_processing_cb(FolderView *folderview, guint action,
+                                GtkWidget *widget)
+{
+       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       FolderItem *item;
+
+       if (!folderview->selected) return;
+
+       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+       g_return_if_fail(item != NULL);
+       g_return_if_fail(item->folder != NULL);
+
+       folder_item_apply_processing(item);
+}
+
 static void folderview_property_cb(FolderView *folderview, guint action,
                                   GtkWidget *widget)
 {
@@ -2439,7 +2528,7 @@ void folderview_move_folder(FolderView *folderview, FolderItem *from_folder,
        
        if (prefs_common.warn_dnd) {
                buf = g_strdup_printf(copy ? _("Do you really want to copy folder '%s' in '%s' ?"):
-                                            _("Do you really want to make folder '%s' a sub-folder of '%s' ?"), 
+                                            _("Do you really want to make folder '%s' a subfolder of '%s' ?"), 
                                        from_folder->name, to_folder->name);
                status = alertpanel_full(copy ? _("Copy folder"):_("Move folder"), buf,
                                         GTK_STOCK_NO, GTK_STOCK_YES, NULL, TRUE,
@@ -2490,7 +2579,7 @@ void folderview_move_folder(FolderView *folderview, FolderItem *from_folder,
                                                _("Can't move a folder to one of its children."));
                        break;
                case F_MOVE_FAILED_DEST_OUTSIDE_MAILBOX:
-                       alertpanel_error(_("Folder moving cannot be done between different mailboxes."));
+                       alertpanel_error(_("A folder cannot be moved between different mailboxes."));
                        break;
                default:
                        alertpanel_error(copy ? _("Copy failed!"):_("Move failed!"));
@@ -2507,6 +2596,21 @@ static gint folderview_clist_compare(GtkCList *clist,
        FolderItem *item1 = ((GtkCListRow *)ptr1)->data;
        FolderItem *item2 = ((GtkCListRow *)ptr2)->data;
 
+       if (item1->order > 0 && item2->order > 0)  // if we have an order item, use it
+       {
+               return item1->order - item2->order;
+       }
+
+       // if only one folder has an order it comes first
+       if (item1->order > 0)
+       {
+               return -1;
+       }
+       if (item2->order > 0)
+       {
+               return 1;
+       }
+
        if (!item1->name)
                return (item2->name != NULL);
        if (!item2->name)
@@ -2608,6 +2712,7 @@ void folderview_reflect_prefs(void)
        pos = gtk_scrolled_window_get_vadjustment(
                                GTK_SCROLLED_WINDOW(folderview->scrolledwin));
        gtk_adjustment_set_value(pos, height);
+       gtk_adjustment_changed(pos);
        gtk_clist_thaw(GTK_CLIST(folderview->ctree));
 }
 
@@ -2695,7 +2800,7 @@ static void folderview_drag_data_get(GtkWidget        *widget,
        }
 }
 
-gboolean folderview_update_folder(gpointer source, gpointer userdata)
+static gboolean folderview_update_folder(gpointer source, gpointer userdata)
 {
        FolderUpdateData *hookdata;
        FolderView *folderview;
@@ -2719,8 +2824,13 @@ gboolean folderview_update_folder(gpointer source, gpointer userdata)
                GtkCTreeNode *node;
 
                node = gtk_ctree_find_by_row_data(GTK_CTREE(ctree), NULL, hookdata->item);
-               if (node != NULL)
+               if (node != NULL) {
                        gtk_ctree_remove_node(GTK_CTREE(ctree), node);
+                       if (folderview->selected == node)
+                               folderview->selected = NULL;
+                       if (folderview->opened == node)
+                               folderview->opened = NULL;
+               }
        } else if (hookdata->update_flags & (FOLDER_TREE_CHANGED | FOLDER_ADD_FOLDER | FOLDER_REMOVE_FOLDER))
                folderview_set(folderview);
 
@@ -2743,16 +2853,20 @@ static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
        int height = (int)pos->page_size;
        int total_height = (int)pos->upper;
        int vpos = (int) pos->value;
-
+       int offset = prefs_common.show_col_headers ? 24:0;
+       
        if (gtk_clist_get_selection_info
-               (GTK_CLIST(widget), x - 24, y - 24, &row, &column)) {
+               (GTK_CLIST(widget), x - offset, y - offset, &row, &column)) {
                GtkWidget *srcwidget;
 
-               if (y > height - 24 && height + vpos < total_height)
+               if (y > height - 24 && height + vpos < total_height) {
                        gtk_adjustment_set_value(pos, (vpos+5 > height ? height : vpos+5));
-
-               if (y < 48 && y > 0)
+                       gtk_adjustment_changed(pos);
+               }
+               if (y < 48 && y > 0) {
                        gtk_adjustment_set_value(pos, (vpos-5 < 0 ? 0 : vpos-5));
+                       gtk_adjustment_changed(pos);
+               }
 
                node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
                item = gtk_ctree_node_get_row_data(GTK_CTREE(widget), node);
@@ -2834,11 +2948,13 @@ void folderview_finish_dnd(const gchar *data, GdkDragContext *drag_context,
        if (!(item && item->folder && folder_item_parent(item) != NULL
                    && FOLDER_CLASS(item->folder)->add_msg != NULL))
        {
-               gtk_drag_finish(drag_context, FALSE, FALSE, time);                      
+               gtk_drag_finish(drag_context, FALSE, FALSE, time);
+               debug_print("item doesn't fit\n");                      
                return;
        }       
        if (!list) {
-               gtk_drag_finish(drag_context, FALSE, FALSE, time);                      
+               gtk_drag_finish(drag_context, FALSE, FALSE, time);
+               debug_print("list is empty\n");                 
                return;
        }
        for (tmp = list; tmp != NULL; tmp = tmp->next) {
@@ -2849,6 +2965,9 @@ void folderview_finish_dnd(const gchar *data, GdkDragContext *drag_context,
                        info->msginfo = NULL;
                        info->file = (gchar *)tmp->data;
                        msglist = g_slist_prepend(msglist, info);
+                       debug_print("file is a mail\n");
+               } else {
+                       debug_print("file isn't a mail\n");
                }
        }
        if (msglist) {
@@ -2876,19 +2995,25 @@ static void folderview_drag_received_cb(GtkWidget        *widget,
        gint row, column;
        FolderItem *item = NULL, *src_item;
        GtkCTreeNode *node;
+       int offset = prefs_common.show_col_headers ? 24:0;
 
        if (info == TARGET_DUMMY) {
                drag_state_stop(folderview);
                if ((void *)strstr(data->data, "FROM_OTHER_FOLDER") != (void *)data->data) {
                        /* comes from summaryview */
                        if (gtk_clist_get_selection_info
-                               (GTK_CLIST(widget), x - 24, y - 24, &row, &column) == 0)
+                               (GTK_CLIST(widget), x - offset, y - offset, &row, &column) == 0)
                                return;
 
                        node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
                        item = gtk_ctree_node_get_row_data(GTK_CTREE(widget), node);
                        src_item = folderview->summaryview->folder_item;
 
+                       if (item->no_select) {
+                               alertpanel_error(_("The destination folder can only be used to "
+                                                  "store subfolders."));
+                               return;
+                       }
                        /* re-check (due to acceptable possibly set for folder moves */
                        if (!(item && item->folder && item->path && !item->no_select && 
                              src_item && src_item != item && FOLDER_CLASS(item->folder)->copy_msg != NULL)) {
@@ -2919,7 +3044,7 @@ static void folderview_drag_received_cb(GtkWidget        *widget,
 
                        source = data->data + 17;
                        if (gtk_clist_get_selection_info
-                           (GTK_CLIST(widget), x - 24, y - 24, &row, &column) == 0
+                           (GTK_CLIST(widget), x - offset, y - offset, &row, &column) == 0
                            || *source == 0) {
                                gtk_drag_finish(drag_context, FALSE, FALSE, time);                      
                                return;
@@ -2935,8 +3060,7 @@ static void folderview_drag_received_cb(GtkWidget        *widget,
                                !folder_has_parent_of_type(src_item, F_DRAFT) &&
                                !folder_has_parent_of_type(src_item, F_QUEUE) &&
                                !folder_has_parent_of_type(src_item, F_TRASH);
-                       if (!item || item->no_select || !src_item 
-                       ||  !folder_is_normal) {
+                       if (!item || !src_item || !folder_is_normal) {
                                gtk_drag_finish(drag_context, FALSE, FALSE, time);                      
                                return;
                        }
@@ -2947,17 +3071,19 @@ static void folderview_drag_received_cb(GtkWidget        *widget,
                folderview->nodes_to_recollapse = NULL;
        } else if (info == TARGET_MAIL_URI_LIST) {
                if (gtk_clist_get_selection_info
-                       (GTK_CLIST(widget), x - 24, y - 24, &row, &column) == 0)
+                       (GTK_CLIST(widget), x - offset, y - offset, &row, &column) == 0)
                        return;
 
                node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
                if (!node) {
-                       gtk_drag_finish(drag_context, FALSE, FALSE, time);                      
+                       gtk_drag_finish(drag_context, FALSE, FALSE, time);
+                       debug_print("no node\n");               
                        return;
                }
                item = gtk_ctree_node_get_row_data(GTK_CTREE(widget), node);
                if (!item) {
                        gtk_drag_finish(drag_context, FALSE, FALSE, time);                      
+                       debug_print("no item\n");
                        return;
                }
                folderview_finish_dnd(data->data, drag_context, time, item);