2006-06-15 [colin] 2.3.0cvs16
[claws.git] / src / folderview.c
index 36d436b409f41d99861f83a160e6c8310be1433b..5f5fbedea8d6989f4a982cab9505fc346426a9b8 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2004 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws 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
@@ -14,7 +14,7 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include "defs.h"
@@ -64,6 +64,7 @@
 #include "folderutils.h"
 #include "partial_download.h"
 #include "prefs_folder_column.h"
+#include "filtering.h"
 
 #define COL_FOLDER_WIDTH       150
 #define COL_NUM_WIDTH          32
@@ -226,6 +227,10 @@ static void folderview_empty_trash_cb      (FolderView     *folderview,
                                         guint           action,
                                         GtkWidget      *widget);
 
+static void folderview_send_queue_cb   (FolderView     *folderview,
+                                        guint           action,
+                                        GtkWidget      *widget);
+
 static void folderview_search_cb       (FolderView     *folderview,
                                         guint           action,
                                         GtkWidget      *widget);
@@ -284,14 +289,20 @@ static GtkItemFactoryEntry folderview_common_popup_entries[] =
 };
 
 static GtkItemFactoryEntry folder_view_trash_popup_entries[] = {
-       {N_("/------"),                 NULL, NULL, 0, "<Separator>"},
+       {N_("/------trashsep"),                 NULL, NULL, 0, "<Separator>"},
        {N_("/Empty _trash..."),        NULL, folderview_empty_trash_cb, 0, NULL},
 };
 
+static GtkItemFactoryEntry folder_view_queue_popup_entries[] = {
+       {N_("/------queuesep"),                 NULL, NULL, 0, "<Separator>"},
+       {N_("/Send _queue..."), NULL, folderview_send_queue_cb, 0, NULL},
+};
+
 
 GtkTargetEntry folderview_drag_types[] =
 {
-       {"text/plain", GTK_TARGET_SAME_APP, TARGET_DUMMY}
+       {"sylpheed-claws/internal", GTK_TARGET_SAME_APP, TARGET_DUMMY},
+       {"text/uri-list", 0, TARGET_MAIL_URI_LIST}
 };
 
 void folderview_initialize(void)
@@ -429,6 +440,7 @@ GtkWidget *folderview_ctree_create(FolderView *folderview)
        titles[col_pos[F_COL_FOLDER]] = _("Folder");
        titles[col_pos[F_COL_NEW]]    = _("New");
        titles[col_pos[F_COL_UNREAD]] = _("Unread");
+       /* TRANSLATORS: This in Number sign in American style */
        titles[col_pos[F_COL_TOTAL]]  = _("#");
 
        ctree = gtk_sctree_new_with_titles(N_FOLDER_COLS, col_pos[F_COL_FOLDER],
@@ -489,7 +501,7 @@ GtkWidget *folderview_ctree_create(FolderView *folderview)
 
         /* drop callback */
        gtk_drag_dest_set(ctree, GTK_DEST_DEFAULT_ALL & ~GTK_DEST_DEFAULT_HIGHLIGHT,
-                         summary_drag_types, 1,
+                         folderview_drag_types, 2,
                          GDK_ACTION_MOVE | GDK_ACTION_COPY | GDK_ACTION_DEFAULT);
        g_signal_connect(G_OBJECT(ctree), "drag_motion",
                         G_CALLBACK(folderview_drag_motion_cb),
@@ -565,7 +577,7 @@ FolderView *folderview_create(void)
 
        gtk_widget_show_all(scrolledwin);
        
-       folderview->target_list = gtk_target_list_new(folderview_drag_types, 1);
+       folderview->target_list = gtk_target_list_new(folderview_drag_types, 2);
        folderview_list = g_list_append(folderview_list, folderview);
 
        return folderview;
@@ -574,6 +586,7 @@ FolderView *folderview_create(void)
 void folderview_init(FolderView *folderview)
 {
        GtkWidget *ctree = folderview->ctree;
+       GdkColor gdk_color;
 
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_INBOX_CLOSE, &inboxxpm, &inboxxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_INBOX_CLOSE_HRM, &inboxhrmxpm, &inboxhrmxpmmask);
@@ -632,19 +645,20 @@ void folderview_init(FolderView *folderview)
                                        (normal_style->font_desc);
                        normal_style->font_desc = font_desc;
                }
+               gtkut_convert_int_to_gdk_color(prefs_common.color_new, &gdk_color);
                normal_color_style = gtk_style_copy(normal_style);
-               normal_color_style->fg[GTK_STATE_NORMAL] = folderview->color_new;
+               normal_color_style->fg[GTK_STATE_NORMAL] = gdk_color;
 
                gtk_widget_set_style(ctree, normal_style);
        }
 
        if (!bold_style) {
-               PangoFontDescription *font_desc;
+               gtkut_convert_int_to_gdk_color(prefs_common.color_new, &gdk_color);
                bold_style = gtk_style_copy(gtk_widget_get_style(ctree));
                pango_font_description_set_weight
                        (bold_style->font_desc, PANGO_WEIGHT_BOLD);
                bold_color_style = gtk_style_copy(bold_style);
-               bold_color_style->fg[GTK_STATE_NORMAL] = folderview->color_new;
+               bold_color_style->fg[GTK_STATE_NORMAL] = gdk_color;
 
                bold_tgtfold_style = gtk_style_copy(bold_style);
                bold_tgtfold_style->fg[GTK_STATE_NORMAL] = folderview->color_op;
@@ -656,6 +670,9 @@ void folderview_set(FolderView *folderview)
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        MainWindow *mainwin = folderview->mainwin;
 
+       if (!mainwin)
+               return;
+
        debug_print("Setting folder info...\n");
        STATUSBAR_PUSH(mainwin, _("Setting folder info..."));
 
@@ -703,11 +720,25 @@ static void mark_all_read_cb(FolderView *folderview, guint action,
                              GtkWidget *widget)
 {
        FolderItem *item;
-
+       AlertValue val;
+       
        item = folderview_get_selected_item(folderview);
        if (item == NULL)
                return;
 
+       if (folderview->summaryview->folder_item != item
+       &&  prefs_common.ask_mark_all_read) {
+               val = alertpanel_full(_("Mark all as read"),
+                       _("Do you really want to mark all mails in this "
+                         "folder as read ?"), GTK_STOCK_NO, GTK_STOCK_YES, NULL,
+                         TRUE, NULL, ALERT_QUESTION, G_ALERTDEFAULT);
+
+               if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE)
+                       return;
+               else if (val & G_ALERTDISABLE)
+                       prefs_common.ask_mark_all_read = FALSE;
+       }
+
        summary_lock(folderview->summaryview);
        folder_item_update_freeze();
        if (folderview->summaryview->folder_item == item)
@@ -784,6 +815,44 @@ void folderview_select_next_unread(FolderView *folderview)
                folderview_select_node(folderview, node);
 }
 
+static GtkCTreeNode *folderview_find_next_new(GtkCTree *ctree,
+                                                GtkCTreeNode *node)
+{
+       FolderItem *item;
+
+       if (node)
+               node = gtkut_ctree_node_next(ctree, node);
+       else
+               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+
+       for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
+               item = gtk_ctree_node_get_row_data(ctree, node);
+               if (item && item->new_msgs > 0 && item->stype != F_TRASH)
+                       return node;
+       }
+
+       return NULL;
+}
+
+void folderview_select_next_new(FolderView *folderview)
+{
+       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       GtkCTreeNode *node = NULL;
+
+       if ((node = folderview_find_next_new(ctree, folderview->opened))
+           != NULL) {
+               folderview_select_node(folderview, node);
+               return;
+       }
+
+       if (!folderview->opened ||
+           folderview->opened == GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list))
+               return;
+       /* search again from the first node */
+       if ((node = folderview_find_next_new(ctree, NULL)) != NULL)
+               folderview_select_node(folderview, node);
+}
+
 FolderItem *folderview_get_selected_item(FolderView *folderview)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
@@ -843,7 +912,7 @@ void folderview_append_item(FolderItem *item)
                                gtk_clist_freeze(GTK_CLIST(ctree));
 
                                text[col_pos[F_COL_FOLDER]] = item->name;
-                               child = gtk_ctree_insert_node
+                               child = gtk_sctree_insert_node
                                        (ctree, node, NULL, text,
                                         FOLDER_SPACING,
                                         folderxpm, folderxpmmask,
@@ -864,30 +933,51 @@ void folderview_append_item(FolderItem *item)
 static void folderview_set_folders(FolderView *folderview)
 {
        GList *list;
-
+#ifndef HAVE_LIBETPAN
+       static gboolean missing_imap_warning = TRUE;
+#endif
        list = folder_get_list();
 
-       for (; list != NULL; list = list->next)
+       for (; list != NULL; list = list->next) {
+#ifndef HAVE_LIBETPAN
+               if ((FOLDER(list->data))
+               &&  (FOLDER(list->data))->klass
+               &&  (FOLDER(list->data))->klass->type == F_IMAP
+               &&  missing_imap_warning) {
+                       missing_imap_warning = FALSE;
+                       alertpanel_error(
+                               _("You have one or more IMAP accounts "
+                                 "defined. However this version of "
+                                 "Sylpheed-Claws has been built without "
+                                 "IMAP support; your IMAP account(s) are "
+                                 "disabled.\n\n"
+                                 "You probably need to "
+                                 "install libetpan and recompile "
+                                 "Sylpheed-Claws."));
+               }
+#endif
                folderview_append_folder(folderview, FOLDER(list->data));
+       }
 }
 
+static gchar *get_scan_str(FolderItem *item)
+{
+       if (item->path)
+               return g_strdup_printf(_("Scanning folder %s%c%s ..."),
+                                     item->folder->name, G_DIR_SEPARATOR,
+                                     item->path);
+       else
+               return g_strdup_printf(_("Scanning folder %s ..."),
+                                     item->folder->name);      
+}
 static void folderview_scan_tree_func(Folder *folder, FolderItem *item,
                                      gpointer data)
 {
        GList *list;
-
        for (list = folderview_list; list != NULL; list = list->next) {
                FolderView *folderview = (FolderView *)list->data;
                MainWindow *mainwin = folderview->mainwin;
-               gchar *str;
-
-               if (item->path)
-                       str = g_strdup_printf(_("Scanning folder %s%c%s ..."),
-                                             item->folder->name, G_DIR_SEPARATOR,
-                                             item->path);
-               else
-                       str = g_strdup_printf(_("Scanning folder %s ..."),
-                                             item->folder->name);
+               gchar *str = get_scan_str(item);
 
                STATUSBAR_PUSH(mainwin, str);
                STATUSBAR_POP(mainwin);
@@ -895,30 +985,7 @@ static void folderview_scan_tree_func(Folder *folder, FolderItem *item,
        }
 }
 
-static GtkWidget *label_window_create(const gchar *str)
-{
-       GtkWidget *window;
-       GtkWidget *label;
-
-       window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-       gtk_widget_set_size_request(window, 380, 60);
-       gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-       gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
-       gtk_window_set_title(GTK_WINDOW(window), str);
-       gtk_window_set_modal(GTK_WINDOW(window), TRUE);
-       gtk_window_set_resizable(GTK_WINDOW(window), FALSE);
-       manage_window_set_transient(GTK_WINDOW(window));
-
-       label = gtk_label_new(str);
-       gtk_container_add(GTK_CONTAINER(window), label);
-       gtk_widget_show(label);
-
-       gtk_widget_show_now(window);
-
-       return window;
-}
-
-void folderview_rescan_tree(Folder *folder)
+void folderview_rescan_tree(Folder *folder, gboolean rebuild)
 {
        GtkWidget *window;
 
@@ -926,11 +993,24 @@ void folderview_rescan_tree(Folder *folder)
 
        if (!folder->klass->scan_tree) return;
 
+       if (rebuild && 
+           alertpanel_full(_("Rebuild folder tree"), 
+                        _("Rebuilding the folder tree will remove "
+                          "local caches. Do you want to continue?"),
+                        GTK_STOCK_NO, GTK_STOCK_YES, NULL, FALSE,
+                        NULL, ALERT_WARNING, G_ALERTDEFAULT) 
+               != G_ALERTALTERNATE) {
+               return;
+       }
+
        inc_lock();
-       window = label_window_create(_("Rebuilding folder tree..."));
+       if (rebuild)
+               window = label_window_create(_("Rebuilding folder tree..."));
+       else 
+               window = label_window_create(_("Scanning folder tree..."));
 
        folder_set_ui_func(folder, folderview_scan_tree_func, NULL);
-       folder_scan_tree(folder);
+       folder_scan_tree(folder, rebuild);
        folder_set_ui_func(folder, NULL, NULL);
 
        folderview_set_all();
@@ -954,7 +1034,7 @@ gint folderview_check_new(Folder *folder)
        GtkCTreeNode *node;
        gint new_msgs = 0;
        gint former_new_msgs = 0;
-       gint former_new = 0;
+       gint former_new = 0, former_unread = 0, former_total;
 
        for (list = folderview_list; list != NULL; list = list->next) {
                folderview = (FolderView *)list->data;
@@ -962,32 +1042,64 @@ gint folderview_check_new(Folder *folder)
 
                inc_lock();
                main_window_lock(folderview->mainwin);
-               gtk_widget_set_sensitive(folderview->ctree, FALSE);
 
                for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
                     node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
+                       gchar *str = NULL;
                        item = gtk_ctree_node_get_row_data(ctree, node);
                        if (!item || !item->path || !item->folder) continue;
                        if (item->no_select) continue;
                        if (folder && folder != item->folder) continue;
                        if (!folder && !FOLDER_IS_LOCAL(item->folder)) continue;
                        if (!item->prefs->newmailcheck) continue;
+                       if (item->processing_pending == TRUE) {
+                               debug_print("skipping %s, processing pending\n",
+                                       item->path ? item->path : item->name);
+                               continue;
+                       }
 
-                       folderview_scan_tree_func(item->folder, item, NULL);
-                       former_new = item->new_msgs;
+                       str = get_scan_str(item);
 
-                       if (folder_item_scan(item) < 0) {
-                               summaryview_unlock(folderview->summaryview, item);
-                               if (folder && !FOLDER_IS_LOCAL(folder))
-                                       break;
+                       STATUSBAR_PUSH(folderview->mainwin, str);
+
+                       g_free(str);
+
+                       folderview_scan_tree_func(item->folder, item, NULL);
+                       former_new    = item->new_msgs;
+                       former_unread = item->unread_msgs;
+                       former_total  = item->total_msgs;
+
+                       if (item->folder->klass->scan_required &&
+                           (item->folder->klass->scan_required(item->folder, item) ||
+                            item->folder->inbox == item ||
+                            item->opened == TRUE ||
+                            item->processing_pending == TRUE)) {
+                               if (folder_item_scan(item) < 0) {
+                                       summaryview_unlock(folderview->summaryview, item);
+                                       if (folder && !FOLDER_IS_LOCAL(folder)) {
+                                               STATUSBAR_POP(folderview->mainwin);
+                                               break;
+                                       }
+                               }
+                       } else if (!item->folder->klass->scan_required) {
+                               if (folder_item_scan(item) < 0) {
+                                       summaryview_unlock(folderview->summaryview, item);
+                                       if (folder && !FOLDER_IS_LOCAL(folder)) {
+                                               STATUSBAR_POP(folderview->mainwin);
+                                               break;
+                                       }
+                               }
                        }
+                       if (former_new    != item->new_msgs ||
+                           former_unread != item->unread_msgs ||
+                           former_total  != item->total_msgs)
+                               folderview_update_node(folderview, node);
 
-                       folderview_update_node(folderview, node);
                        new_msgs += item->new_msgs;
                        former_new_msgs += former_new;
+                       STATUSBAR_POP(folderview->mainwin);
                }
 
-               gtk_widget_set_sensitive(folderview->ctree, TRUE);
                main_window_unlock(folderview->mainwin);
                inc_unlock();
        }
@@ -1147,6 +1259,43 @@ static gboolean folderview_have_matching_children(FolderView *folderview,
        return folderview_have_matching_children_sub(folderview, item, FALSE);
 }
 
+static gboolean folderview_have_marked_children_sub(FolderView *folderview,
+                                                   FolderItem *item,
+                                                   gboolean in_sub)
+{
+       GNode *node = NULL;
+       
+       if (!item || !item->folder || !item->folder->node)
+               return FALSE;
+               
+       node = item->folder->node;
+       
+       node = g_node_find(node, G_PRE_ORDER, G_TRAVERSE_ALL, item);
+       node = node->children;
+
+       if (item->marked_msgs != 0) {
+               return TRUE;
+       }
+
+       while (node != NULL) {
+               if (node && node->data) {
+                       FolderItem *next_item = (FolderItem*) node->data;
+                       node = node->next;
+                       if (folderview_have_marked_children_sub(folderview,
+                                                               next_item, TRUE))
+                               return TRUE;
+               }
+       }
+
+       return FALSE;
+}
+
+static gboolean folderview_have_marked_children(FolderView *folderview,
+                                            FolderItem *item)
+{
+       return folderview_have_marked_children_sub(folderview, item, FALSE);
+}
+
 static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
@@ -1164,13 +1313,28 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
        gboolean add_sub_match_mark;
        gboolean use_bold, use_color;
        gint *col_pos = folderview->col_pos;
-
+       SpecialFolderItemType stype;
+       
        item = gtk_ctree_node_get_row_data(ctree, node);
        g_return_if_fail(item != NULL);
 
-       mark = (item->marked_msgs != 0);
-
-       switch (item->stype) {
+       if (!GTK_CTREE_ROW(node)->expanded)
+               mark = folderview_have_marked_children(folderview, item);
+       else
+               mark = (item->marked_msgs != 0);
+
+       stype = item->stype;
+       if (stype == F_NORMAL) {
+               if (folder_has_parent_of_type(item, F_TRASH))
+                       stype = F_TRASH;
+               else if (folder_has_parent_of_type(item, F_DRAFT))
+                       stype = F_DRAFT;
+               else if (folder_has_parent_of_type(item, F_OUTBOX))
+                       stype = F_OUTBOX;
+               else if (folder_has_parent_of_type(item, F_QUEUE))
+                       stype = F_QUEUE;
+       }
+       switch (stype) {
        case F_INBOX:
                if (item->hide_read_msgs) {
                        xpm = mark?m_inboxhrmxpm:inboxhrmxpm;
@@ -1273,7 +1437,7 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
            prefs_common.display_folder_unread) {
                str = g_strdup_printf("%s (%d%s)", name, item->total_msgs,
                                      add_unread_mark ? "+" : "");
-               gtk_ctree_set_node_info(ctree, node, str, FOLDER_SPACING,
+               gtk_sctree_set_node_info(ctree, node, str, FOLDER_SPACING,
                                        xpm, mask, openxpm, openmask,
                                        FALSE, GTK_CTREE_ROW(node)->expanded);
                g_free(str);
@@ -1287,7 +1451,7 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                                              item->unreadmarked_msgs > 0 ? "!":"");
                else
                        str = g_strdup_printf("%s (+)", name);
-               gtk_ctree_set_node_info(ctree, node, str, FOLDER_SPACING,
+               gtk_sctree_set_node_info(ctree, node, str, FOLDER_SPACING,
                                        xpm, mask, openxpm, openmask,
                                        FALSE, GTK_CTREE_ROW(node)->expanded);
                g_free(str);
@@ -1295,7 +1459,7 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                str = g_strdup_printf("%s%s", name, 
                                      item->unreadmarked_msgs > 0 ? " (!)":"");
        
-               gtk_ctree_set_node_info(ctree, node, str, FOLDER_SPACING,
+               gtk_sctree_set_node_info(ctree, node, str, FOLDER_SPACING,
                                        xpm, mask, openxpm, openmask,
                                        FALSE, GTK_CTREE_ROW(node)->expanded);
                g_free(str);
@@ -1321,7 +1485,8 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                use_bold = use_color = (item->total_msgs > 0);
        } else {
                /* if unread messages exist, print with bold font */
-               use_bold = (item->unread_msgs > 0) || add_unread_mark;
+               use_bold = (item->unread_msgs > 0|| item->new_msgs > 0) 
+                               || add_unread_mark;
                /* if new messages exist, print with colored letter */
                use_color =
                        (item->new_msgs > 0) ||
@@ -1332,16 +1497,16 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
        gtk_ctree_node_set_foreground(ctree, node, NULL);
 
        if (use_bold) {
-               if (item->prefs->color > 0 && !use_color) {
-                       GdkColor gdk_color;
+               GdkColor gdk_color;
 
+               if (item->prefs->color > 0 && !use_color) {
                        gtkut_convert_int_to_gdk_color(item->prefs->color, &gdk_color);
                        color_style = gtk_style_copy(bold_style);
                        color_style->fg[GTK_STATE_NORMAL] = gdk_color;
                        style = color_style;
-               } else if (use_color)
+               } else if (use_color) {
                        style = bold_color_style;
-               else
+               else
                        style = bold_style;
                if (item->op_count > 0) {
                        style = bold_tgtfold_style;
@@ -1546,7 +1711,7 @@ static void folderview_append_folder(FolderView *folderview, Folder *folder)
 
        g_return_if_fail(folder != NULL);
 
-       root = gtk_ctree_insert_gnode(ctree, NULL, NULL, folder->node,
+       root = gtk_sctree_insert_gnode(ctree, NULL, NULL, folder->node,
                                      folderview_gnode_func, folderview);
        gtk_ctree_pre_recursive(ctree, root, folderview_expand_func,
                                folderview);
@@ -1565,12 +1730,12 @@ static gboolean folderview_button_pressed(GtkWidget *ctree, GdkEventButton *even
        FolderViewPopup *fpopup;
        GtkItemFactory *fpopup_factory;
        GtkWidget *popup;
-       FolderItem *special_trash = NULL;
+       FolderItem *special_trash = NULL, *special_queue = NULL;
        PrefsAccount *ac;
 
        if (!event) return FALSE;
 
-       if (event->button == 1) {
+       if (event->button == 1 || event->button == 2) {
                folderview->open_folder = TRUE;
 
                if (event->type == GDK_2BUTTON_PRESS) {
@@ -1631,31 +1796,53 @@ static gboolean folderview_button_pressed(GtkWidget *ctree, GdkEventButton *even
        if (fpopup->set_sensitivity != NULL)
                fpopup->set_sensitivity(fpopup_factory, item);
 
-       if (NULL != (ac = account_find_from_item(item)))
+       if (NULL != (ac = account_find_from_item(item))) {
                special_trash = account_get_special_folder(ac, F_TRASH);
-
-       if ((item == folder->trash || item == special_trash) &&
+               special_queue = account_get_special_folder(ac, F_QUEUE);
+       }
+       
+       if ((item == folder->trash || item == special_trash
+            || folder_has_parent_of_type(item, F_TRASH)) &&
            gtk_item_factory_get_item(fpopup_factory, "/Empty trash...") == NULL) {
                gtk_item_factory_create_item(fpopup_factory, &folder_view_trash_popup_entries[0], folderview, 1);
                gtk_item_factory_create_item(fpopup_factory, &folder_view_trash_popup_entries[1], folderview, 1);
-       } else if (item != folder->trash && (special_trash == NULL || item != special_trash)) {
+       } else if (item != folder->trash && (special_trash == NULL || item != special_trash)
+               && !folder_has_parent_of_type(item, F_TRASH)) {
                gtk_item_factory_delete_entry(fpopup_factory, &folder_view_trash_popup_entries[0]);
                gtk_item_factory_delete_entry(fpopup_factory, &folder_view_trash_popup_entries[1]);
        }
        
+       if ((item == folder->queue || item == special_queue
+            || folder_has_parent_of_type(item, F_QUEUE)) &&
+           gtk_item_factory_get_item(fpopup_factory, "/Send queue...") == NULL) {
+               gtk_item_factory_create_item(fpopup_factory, &folder_view_queue_popup_entries[0], folderview, 1);
+               gtk_item_factory_create_item(fpopup_factory, &folder_view_queue_popup_entries[1], folderview, 1);
+       } else if (item != folder->queue && (special_queue == NULL || item != special_queue)
+               && !folder_has_parent_of_type(item, F_QUEUE)) {
+               gtk_item_factory_delete_entry(fpopup_factory, &folder_view_queue_popup_entries[0]);
+               gtk_item_factory_delete_entry(fpopup_factory, &folder_view_queue_popup_entries[1]);
+       }
+       
 #define SET_SENS(name, sens) \
        menu_set_sensitive(fpopup_factory, name, sens)
 
        SET_SENS("/Mark all read", item->unread_msgs >= 1);
        SET_SENS("/Search folder...", item->total_msgs >= 1 && 
                 folderview->selected == folderview->opened);
-       SET_SENS("/Properties...", item->node->parent != NULL);
+       SET_SENS("/Properties...", TRUE);
        SET_SENS("/Processing...", item->node->parent != NULL);
-       if (item == folder->trash || item == special_trash) {
+       if (item == folder->trash || item == special_trash
+           || folder_has_parent_of_type(item, F_TRASH)) {
                GSList *msglist = folder_item_get_msg_list(item);
                SET_SENS("/Empty trash...", msglist != NULL);
                procmsg_msg_list_free(msglist);
        }
+       if (item == folder->queue || item == special_queue
+           || folder_has_parent_of_type(item, F_QUEUE)) {
+               GSList *msglist = folder_item_get_msg_list(item);
+               SET_SENS("/Send queue...", msglist != NULL);
+               procmsg_msg_list_free(msglist);
+       }
 #undef SET_SENS
 
        popup = gtk_item_factory_get_widget(fpopup_factory, fpopup->path);
@@ -1713,6 +1900,27 @@ static gboolean folderview_key_pressed(GtkWidget *widget, GdkEventKey *event,
        return FALSE;
 }
 
+typedef struct _PostponedSelectData
+{
+       GtkCTree *ctree;
+       GtkCTreeNode *row;
+       gint column;
+       FolderView *folderview;
+} PostponedSelectData;
+
+static gboolean postpone_select(void *data)
+{
+       PostponedSelectData *psdata = (PostponedSelectData *)data;
+       debug_print("trying again\n");
+       psdata->folderview->open_folder = TRUE;
+       main_window_cursor_normal(psdata->folderview->mainwin);
+       STATUSBAR_POP(psdata->folderview->mainwin);
+       folderview_selected(psdata->ctree, psdata->row,
+                           psdata->column, psdata->folderview);
+       g_free(psdata);
+       return FALSE;
+}
+
 static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                                gint column, FolderView *folderview)
 {
@@ -1720,6 +1928,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
        gboolean opened;
        FolderItem *item;
        gchar *buf;
+       int res = 0;
 
        folderview->selected = row;
 
@@ -1729,8 +1938,10 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
        }
        
        if (!can_select || summary_is_locked(folderview->summaryview)) {
-               gtkut_ctree_set_focus_row(ctree, folderview->opened);
-               gtk_ctree_select(ctree, folderview->opened);
+               if (folderview->opened) {
+                       gtkut_ctree_set_focus_row(ctree, folderview->opened);
+                       gtk_ctree_select(ctree, folderview->opened);
+               }
                return;
        }
 
@@ -1750,6 +1961,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                if (olditem) {
                        /* will be null if we just moved the previously opened folder */
                        summary_save_prefs_to_folderitem(folderview->summaryview, olditem);
+                       summary_show(folderview->summaryview, NULL);
                        folder_item_close(olditem);
                }
        }
@@ -1787,7 +1999,8 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
 
        main_window_cursor_wait(folderview->mainwin);
 
-       if (folder_item_open(item) != 0) {
+       res = folder_item_open(item);
+       if (res == -1) {
                main_window_cursor_normal(folderview->mainwin);
                STATUSBAR_POP(folderview->mainwin);
 
@@ -1797,15 +2010,27 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                can_select = TRUE;
 
                return;
-        }
-
+        } else if (res == -2) {
+               PostponedSelectData *data = g_new0(PostponedSelectData, 1);
+               data->ctree = ctree;
+               data->row = row;
+               data->column = column;
+               data->folderview = folderview;
+               debug_print("postponing open of %s till end of scan\n",
+                       item->path ? item->path:item->name);
+               folderview->open_folder = FALSE;
+               can_select = TRUE;
+               g_timeout_add(500, postpone_select, data);
+               return;
+       }
+       
        main_window_cursor_normal(folderview->mainwin);
 
        /* Show messages */
        summary_set_prefs_from_folderitem(folderview->summaryview, item);
        opened = summary_show(folderview->summaryview, item);
        
-       folder_clean_cache_memory();
+       folder_clean_cache_memory(item);
 
        if (!opened) {
                gtkut_ctree_set_focus_row(ctree, folderview->opened);
@@ -1888,6 +2113,7 @@ void folderview_create_folder_node(FolderView *folderview, FolderItem *item)
        gchar *text[N_FOLDER_COLS] = {NULL, "0", "0", "0"};
        GtkCTreeNode *node, *parent_node;
        gint *col_pos = folderview->col_pos;
+       FolderItemUpdateData hookdata;
 
        parent_node = gtk_ctree_find_by_row_data(ctree, NULL, folder_item_parent(item));
        if (parent_node == NULL)
@@ -1896,7 +2122,7 @@ void folderview_create_folder_node(FolderView *folderview, FolderItem *item)
        gtk_clist_freeze(GTK_CLIST(ctree));
 
        text[col_pos[F_COL_FOLDER]] = item->name;
-       node = gtk_ctree_insert_node(ctree, parent_node, NULL, text,
+       node = gtk_sctree_insert_node(ctree, parent_node, NULL, text,
                                     FOLDER_SPACING,
                                     folderxpm, folderxpmmask,
                                     folderopenxpm, folderopenxpmmask,
@@ -1907,6 +2133,11 @@ void folderview_create_folder_node(FolderView *folderview, FolderItem *item)
                gtk_ctree_node_set_row_style(ctree, node, normal_style);
        folderview_sort_folders(folderview, parent_node, item->folder);
 
+       hookdata.item = item;
+       hookdata.update_flags = F_ITEM_UPDATE_NAME;
+       hookdata.msg = NULL;
+       hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &hookdata);
+
        gtk_clist_thaw(GTK_CLIST(ctree));
 }
 
@@ -1917,10 +2148,10 @@ static void folderview_empty_trash_cb(FolderView *folderview, guint action,
        FolderItem *item;
        GSList *mlist = NULL;
        GSList *cur = NULL;
-       if (!folderview->selected) return;
        FolderItem *special_trash = NULL;
        PrefsAccount *ac;
 
+       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);
@@ -1928,12 +2159,13 @@ static void folderview_empty_trash_cb(FolderView *folderview, guint action,
        if (NULL != (ac = account_find_from_item(item)))
                special_trash = account_get_special_folder(ac, F_TRASH);
 
-       if (item != item->folder->trash && item != special_trash) return;
+       if (item != item->folder->trash && item != special_trash
+       &&  !folder_has_parent_of_type(item, F_TRASH)) return;
        
        if (prefs_common.ask_on_clean) {
                if (alertpanel(_("Empty trash"),
                               _("Delete all messages in trash?"),
-                              GTK_STOCK_YES, GTK_STOCK_NO, NULL) != G_ALERTDEFAULT)
+                              GTK_STOCK_CANCEL, _("+_Empty trash"), NULL) != G_ALERTALTERNATE)
                        return;
        }
        
@@ -1953,6 +2185,64 @@ static void folderview_empty_trash_cb(FolderView *folderview, guint action,
        folder_item_remove_all_msg(item);
 }
 
+static void folderview_send_queue_cb(FolderView *folderview, guint action,
+                                     GtkWidget *widget)
+{
+       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       FolderItem *item;
+       FolderItem *special_queue = NULL;
+       PrefsAccount *ac;
+       gchar *errstr = NULL;
+
+       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);
+
+       if (NULL != (ac = account_find_from_item(item)))
+               special_queue = account_get_special_folder(ac, F_QUEUE);
+
+       if (item != item->folder->queue && item != special_queue
+       &&  !folder_has_parent_of_type(item, F_QUEUE)) return;
+       
+       if (procmsg_queue_is_empty(item))
+               return;
+
+       if (prefs_common.work_offline)
+               if (alertpanel(_("Offline warning"), 
+                              _("You're working offline. Override?"),
+                              GTK_STOCK_NO, GTK_STOCK_YES,
+                              NULL) != G_ALERTALTERNATE)
+               return;
+
+       /* ask for confirmation before sending queued messages only
+          in online mode and if there is at least one message queued
+          in any of the folder queue
+       */
+       if (prefs_common.confirm_send_queued_messages) {
+               if (!prefs_common.work_offline) {
+                       if (alertpanel(_("Send queued messages"), 
+                                  _("Send all queued messages?"),
+                                  GTK_STOCK_CANCEL, _("_Send"),
+                                  NULL) != G_ALERTALTERNATE)
+                               return;
+               }
+       }
+
+       if (procmsg_send_queue(item, prefs_common.savemsg, &errstr) < 0) {
+               if (!errstr)
+                       alertpanel_error_log(_("Some errors occurred while "
+                                          "sending queued messages."));
+               else {
+                       gchar *tmp = g_strdup_printf(_("Some errors occurred "
+                                       "while sending queued messages:\n%s"), errstr);
+                       g_free(errstr);
+                       alertpanel_error_log(tmp);
+                       g_free(tmp);
+               }
+       }
+}
+
 static void folderview_search_cb(FolderView *folderview, guint action,
                                 GtkWidget *widget)
 {
@@ -1971,9 +2261,6 @@ static void folderview_property_cb(FolderView *folderview, guint action,
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
 
-       if (folder_item_parent(item) == NULL)
-               return;
-
        prefs_folder_item_open(item);
 }
 
@@ -2018,14 +2305,13 @@ void folderview_move_folder(FolderView *folderview, FolderItem *from_folder,
                                        "sub-folder of '%s' ?"), from_folder->name,
                                        to_folder->name);
                status = alertpanel_full(_("Move folder"), buf,
-                                        GTK_STOCK_YES, GTK_STOCK_NO, NULL, TRUE,
-                                        NULL, ALERT_QUESTION, G_ALERTALTERNATE);
+                                        GTK_STOCK_NO, GTK_STOCK_YES, NULL, TRUE,
+                                        NULL, ALERT_QUESTION, G_ALERTDEFAULT);
                g_free(buf);
 
-               if (status != G_ALERTDEFAULT
-                && status != (G_ALERTDEFAULT | G_ALERTDISABLE))
+               if ((status & ~G_ALERTDISABLE) != G_ALERTALTERNATE)
                        return;
-               if (status & G_ALERTDISABLE)
+               else if (status & G_ALERTDISABLE)
                        prefs_common.warn_dnd = FALSE;
        }
 
@@ -2127,21 +2413,60 @@ void folderview_set_target_folder_color(gint color_op)
        }
 }
 
+static gchar *last_font = NULL;
 void folderview_reflect_prefs_pixmap_theme(FolderView *folderview)
 {
+       /* force reinit */
+       g_free(last_font);
+       last_font = NULL;
+       
 }
 
 void folderview_reflect_prefs(void)
 {
+       gboolean update_font = TRUE;
        FolderView *folderview = mainwindow_get_mainwindow()->folderview;
-       normal_style = normal_color_style = bold_style = 
-               bold_color_style = bold_tgtfold_style = NULL;
        FolderItem *item = folderview_get_selected_item(folderview);
-       folderview_init(folderview);
+       GtkAdjustment *pos = gtk_scrolled_window_get_vadjustment(
+                               GTK_SCROLLED_WINDOW(folderview->scrolledwin));
+       gint height = pos->value;
+
+       if (last_font && !strcmp(last_font, NORMAL_FONT))
+               update_font = FALSE;
+
+       g_free(last_font);
+       last_font = g_strdup(NORMAL_FONT);
+
+       if (update_font) {              
+               normal_style = normal_color_style = bold_style = 
+                       bold_color_style = bold_tgtfold_style = NULL;
+
+               folderview_init(folderview);
+       }
+       gtk_clist_freeze(GTK_CLIST(folderview->ctree));
        folderview_column_set_titles(folderview);
        folderview_set_all();
-       if (item)
+
+       g_signal_handlers_block_by_func
+               (G_OBJECT(folderview->ctree),
+                G_CALLBACK(folderview_selected), folderview);
+
+       if (item) {
+               GtkCTreeNode *node = gtk_ctree_find_by_row_data(
+                       GTK_CTREE(folderview->ctree), NULL, item);
+
                folderview_select(folderview, item);
+               folderview->selected = node;
+       }
+
+       g_signal_handlers_unblock_by_func
+               (G_OBJECT(folderview->ctree),
+                G_CALLBACK(folderview_selected), folderview);
+
+       pos = gtk_scrolled_window_get_vadjustment(
+                               GTK_SCROLLED_WINDOW(folderview->scrolledwin));
+       gtk_adjustment_set_value(pos, height);
+       gtk_clist_thaw(GTK_CLIST(folderview->ctree));
 }
 
 static void drag_state_stop(FolderView *folderview)
@@ -2208,20 +2533,23 @@ static void folderview_drag_data_get(GtkWidget        *widget,
        FolderItem *item;
        GList *cur;
        gchar *source = NULL;
-
-       for (cur = GTK_CLIST(folderview->ctree)->selection;
-            cur != NULL; cur = cur->next) {
-               item = gtk_ctree_node_get_row_data
-                       (GTK_CTREE(folderview->ctree), 
-                        GTK_CTREE_NODE(cur->data));
-               if (item) {
-                       source = g_strdup_printf ("FROM_OTHER_FOLDER%s", folder_item_get_identifier(item));
-                       gtk_selection_data_set(selection_data,
-                                              selection_data->target, 8,
-                                              source, strlen(source));
-                       break;
-               } else
-                       return;
+       if (info == TARGET_DUMMY) {
+               for (cur = GTK_CLIST(folderview->ctree)->selection;
+                    cur != NULL; cur = cur->next) {
+                       item = gtk_ctree_node_get_row_data
+                               (GTK_CTREE(folderview->ctree), 
+                                GTK_CTREE_NODE(cur->data));
+                       if (item) {
+                               source = g_strdup_printf ("FROM_OTHER_FOLDER%s", folder_item_get_identifier(item));
+                               gtk_selection_data_set(selection_data,
+                                                      selection_data->target, 8,
+                                                      source, strlen(source));
+                               break;
+                       } else
+                               return;
+               }
+       } else {
+               g_warning("unknown info %d\n", info);
        }
 }
 
@@ -2241,7 +2569,11 @@ gboolean folderview_update_folder(gpointer source, gpointer userdata)
 
        if (hookdata->update_flags & FOLDER_ADD_FOLDERITEM)
                folderview_create_folder_node(folderview, hookdata->item);
-       else if (hookdata->update_flags & FOLDER_REMOVE_FOLDERITEM) {
+       else if (hookdata->update_flags & FOLDER_RENAME_FOLDERITEM) {
+               GtkCTreeNode *node = gtk_ctree_find_by_row_data(GTK_CTREE(ctree),
+                               NULL, folder_item_parent(hookdata->item));
+               folderview_sort_folders(folderview, node, hookdata->folder);
+       } else if (hookdata->update_flags & FOLDER_REMOVE_FOLDERITEM) {
                GtkCTreeNode *node;
 
                node = gtk_ctree_find_by_row_data(GTK_CTREE(ctree), NULL, hookdata->item);
@@ -2300,6 +2632,13 @@ static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
                            FOLDER_CLASS(item->folder)->copy_msg != NULL &&
                            FOLDER_CLASS(item->folder)->create_folder != NULL)
                                acceptable = TRUE;
+               } else {
+                       /* comes from another app */
+                       /* we are adding messages, so only accept folder items that are 
+                          no root items and can copy messages */
+                       if (item && item->folder && folder_item_parent(item) != NULL
+                           && FOLDER_CLASS(item->folder)->add_msg != NULL)
+                               acceptable = TRUE;
                }
        }
 
@@ -2318,7 +2657,8 @@ static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
                                        (context->actions == GDK_ACTION_COPY ?
                                        GDK_ACTION_COPY : GDK_ACTION_MOVE) , time);
        } else {
-               gtk_ctree_select(GTK_CTREE(widget), folderview->opened);
+               if (folderview->opened)
+                       gtk_ctree_select(GTK_CTREE(widget), folderview->opened);
                gdk_drag_status(context, 0, time);
        }
 
@@ -2334,6 +2674,50 @@ static void folderview_drag_leave_cb(GtkWidget      *widget,
        gtk_ctree_select(GTK_CTREE(widget), folderview->opened);
 }
 
+static void free_info (gpointer stuff, gpointer data)
+{
+       g_free(stuff);
+}
+
+void folderview_finish_dnd(const gchar *data, GdkDragContext *drag_context,
+                          guint time, FolderItem *item)
+{
+       GList *list, *tmp;
+       GSList *msglist = NULL;
+       list = uri_list_extract_filenames(data);
+       if (!(item && item->folder && folder_item_parent(item) != NULL
+                   && FOLDER_CLASS(item->folder)->add_msg != NULL))
+       {
+               gtk_drag_finish(drag_context, FALSE, FALSE, time);                      
+               return;
+       }       
+       if (!list) {
+               gtk_drag_finish(drag_context, FALSE, FALSE, time);                      
+               return;
+       }
+       for (tmp = list; tmp != NULL; tmp = tmp->next) {
+               MsgFileInfo *info = NULL;
+
+               if (file_is_email((gchar *)tmp->data)) {
+                       info = g_new0(MsgFileInfo, 1);
+                       info->msginfo = NULL;
+                       info->file = (gchar *)tmp->data;
+                       msglist = g_slist_prepend(msglist, info);
+               }
+       }
+       if (msglist) {
+               msglist = g_slist_reverse(msglist);
+               folder_item_add_msgs(item, msglist, FALSE);
+               g_slist_foreach(msglist, free_info, NULL);
+               g_slist_free(msglist);
+               gtk_drag_finish(drag_context, TRUE, FALSE, time);
+       } else {
+               gtk_drag_finish(drag_context, FALSE, FALSE, time);                      
+       }
+       list_free_strings(list);
+       g_list_free(list);
+}
+
 static void folderview_drag_received_cb(GtkWidget        *widget,
                                        GdkDragContext   *drag_context,
                                        gint              x,
@@ -2344,75 +2728,93 @@ static void folderview_drag_received_cb(GtkWidget        *widget,
                                        FolderView       *folderview)
 {
        gint row, column;
-       FolderItem *item, *src_item;
+       FolderItem *item = NULL, *src_item;
        GtkCTreeNode *node;
 
-       drag_state_stop(folderview);
-       if ((void *)strstr(data->data, "FROM_OTHER_FOLDER") != (void *)data->data) {
-               /* comes from summaryview */
+       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)
+                               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;
+
+                       /* 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)) {
+                               return;
+                       }
+                       if (item && src_item) {
+                               switch (drag_context->action) {
+                               case GDK_ACTION_COPY:
+                                       summary_copy_selected_to(folderview->summaryview, item);
+                                       gtk_drag_finish(drag_context, TRUE, FALSE, time);
+                                       break;
+                               case GDK_ACTION_MOVE:
+                               case GDK_ACTION_DEFAULT:
+                               default:
+                                       if (FOLDER_CLASS(src_item->folder)->remove_msg == NULL)
+                                               summary_copy_selected_to(folderview->summaryview, item);
+                                       else
+                                               summary_move_selected_to(folderview->summaryview, item);
+                                       gtk_drag_finish(drag_context, TRUE, TRUE, time);
+                               }
+                       } else
+                               gtk_drag_finish(drag_context, FALSE, FALSE, time);
+               } else {
+                       /* comes from folderview */
+                       char *source;
+                       gboolean folder_is_normal = TRUE;
+
+                       source = data->data + 17;
+                       if (gtk_clist_get_selection_info
+                           (GTK_CLIST(widget), x - 24, y - 24, &row, &column) == 0
+                           || *source == 0) {
+                               gtk_drag_finish(drag_context, FALSE, FALSE, time);                      
+                               return;
+                       }
+                       node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
+                       item = gtk_ctree_node_get_row_data(GTK_CTREE(widget), node);
+                       src_item = folder_find_item_from_identifier(source);
+
+                       folder_is_normal = 
+                               src_item != NULL &&
+                               src_item->stype == F_NORMAL &&
+                               !folder_has_parent_of_type(src_item, F_OUTBOX) &&
+                               !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) {
+                               gtk_drag_finish(drag_context, FALSE, FALSE, time);                      
+                               return;
+                       }
+
+                       folderview_move_folder(folderview, src_item, item);
+                       gtk_drag_finish(drag_context, TRUE, TRUE, time);
+               }
+               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)
                        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;
-               
-               /* 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)) {
-                       return;
-               }
-               if (item && src_item) {
-                       switch (drag_context->action) {
-                       case GDK_ACTION_COPY:
-                               summary_copy_selected_to(folderview->summaryview, item);
-                               gtk_drag_finish(drag_context, TRUE, FALSE, time);
-                               break;
-                       case GDK_ACTION_MOVE:
-                       case GDK_ACTION_DEFAULT:
-                       default:
-                               if (FOLDER_CLASS(src_item->folder)->remove_msg == NULL)
-                                       summary_copy_selected_to(folderview->summaryview, item);
-                               else
-                                       summary_move_selected_to(folderview->summaryview, item);
-                               gtk_drag_finish(drag_context, TRUE, TRUE, time);
-                       }
-               } else
-                       gtk_drag_finish(drag_context, FALSE, FALSE, time);
-       } else {
-               /* comes from folderview */
-               char *source;
-               gboolean folder_is_normal = TRUE;
-               
-               source = data->data + 17;
-               if (gtk_clist_get_selection_info
-                   (GTK_CLIST(widget), x - 24, y - 24, &row, &column) == 0
-                   || *source == 0) {
+               if (!node) {
                        gtk_drag_finish(drag_context, FALSE, FALSE, time);                      
                        return;
                }
-               node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
                item = gtk_ctree_node_get_row_data(GTK_CTREE(widget), node);
-               src_item = folder_find_item_from_identifier(source);
-
-               folder_is_normal = 
-                       src_item != NULL &&
-                       src_item->stype == F_NORMAL &&
-                       !folder_has_parent_of_type(src_item, F_OUTBOX) &&
-                       !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) {
                        gtk_drag_finish(drag_context, FALSE, FALSE, time);                      
                        return;
                }
-
-               folderview_move_folder(folderview, src_item, item);
-               gtk_drag_finish(drag_context, TRUE, TRUE, time);
+               folderview_finish_dnd(data->data, drag_context, time, item);
        }
-       folderview->nodes_to_recollapse = NULL;
 }
 
 static void folderview_drag_end_cb(GtkWidget       *widget,