0.9.3claws34
[claws.git] / src / folderview.c
index 2a1a6f391c0903de030d5b344ee36a096b388586..401be57017cd85ca2f4a502f4df0020b386705df 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 Hiroyuki Yamamoto
  *
  * 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
 #include "prefs_folder_item.h"
 #include "account.h"
 #include "folder.h"
+#include "foldersel.h"
 #include "inc.h"
 #include "statusbar.h"
+#include "hooks.h"
 
 typedef enum
 {
@@ -129,6 +131,10 @@ static GdkPixmap *newxpm;
 static GdkBitmap *newxpmmask;
 static GdkPixmap *unreadxpm;
 static GdkBitmap *unreadxpmmask;
+static GdkPixmap *draftsxpm;
+static GdkBitmap *draftsxpmmask;
+static GdkPixmap *draftsopenxpm;
+static GdkBitmap *draftsopenxpmmask;
 
 static void folderview_select_node      (FolderView    *folderview,
                                          GtkCTreeNode  *node);
@@ -255,21 +261,30 @@ static void folderview_drag_data_get     (GtkWidget        *widget,
                                          guint             info,
                                          guint             time,
                                          FolderView       *folderview);
+static void folderview_drag_end_cb      (GtkWidget        *widget,
+                                         GdkDragContext   *drag_context,
+                                         FolderView       *folderview);
 
 void folderview_create_folder_node       (FolderView       *folderview, 
                                          FolderItem       *item);
-void folderview_update_item             (FolderItem       *item,
-                                          gboolean         update_summary,
-                                         gpointer          data);
+gboolean folderview_update_folder       (gpointer          source,
+                                         gpointer          userdata);
+gboolean folderview_update_item                 (gpointer          source,
+                                         gpointer          data);
 
 static void folderview_scoring_cb(FolderView *folderview, guint action,
                                  GtkWidget *widget);
 static void folderview_processing_cb(FolderView *folderview, guint action,
                                     GtkWidget *widget);
+static void folderview_move_to(FolderView *folderview, FolderItem *from_folder,
+                              FolderItem *to_folder);
+static void folderview_move_to_cb(FolderView *folderview);
+
 static GtkItemFactoryEntry folderview_mbox_popup_entries[] =
 {
        {N_("/Create _new folder..."),  NULL, folderview_new_mbox_folder_cb,    0, NULL},
        {N_("/_Rename folder..."),      NULL, folderview_rename_mbox_folder_cb, 0, NULL},
+       {N_("/M_ove folder..."),        NULL, folderview_move_to_cb, 0, NULL},
        {N_("/_Delete folder"),         NULL, folderview_delete_folder_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/Remove _mailbox"),        NULL, folderview_remove_mailbox_cb, 0, NULL},
@@ -285,6 +300,7 @@ static GtkItemFactoryEntry folderview_mail_popup_entries[] =
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/Create _new folder..."),  NULL, folderview_new_folder_cb,    0, NULL},
        {N_("/_Rename folder..."),      NULL, folderview_rename_folder_cb, 0, NULL},
+       {N_("/M_ove folder..."),        NULL, folderview_move_to_cb, 0, NULL},
        {N_("/_Delete folder"),         NULL, folderview_delete_folder_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/_Check for new messages"),
@@ -305,6 +321,7 @@ static GtkItemFactoryEntry folderview_imap_popup_entries[] =
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/Create _new folder..."),  NULL, folderview_new_imap_folder_cb, 0, NULL},
        {N_("/_Rename folder..."),      NULL, folderview_rename_folder_cb,   0, NULL},
+       {N_("/M_ove folder..."),        NULL, folderview_move_to_cb, 0, NULL},
        {N_("/_Delete folder"),         NULL, folderview_delete_folder_cb,   0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/_Check for new messages"),
@@ -324,17 +341,24 @@ static GtkItemFactoryEntry folderview_news_popup_entries[] =
        {N_("/Mark all _read"),         NULL, mark_all_read_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/_Subscribe to newsgroup..."),
-                                        NULL, folderview_new_news_group_cb, 0, NULL},
-       {N_("/_Remove newsgroup"),       NULL, folderview_rm_news_group_cb, 0, NULL},
-       {N_("/---"),                     NULL, NULL, 0, "<Separator>"},
-       {N_("/Remove _news account"),    NULL, folderview_rm_news_server_cb, 0, NULL},
-       {N_("/---"),                     NULL, NULL, 0, "<Separator>"},
-       {N_("/_Search folder..."),       NULL, folderview_search_cb, 0, NULL},
-       {N_("/_Properties..."),          NULL, folderview_property_cb, 0, NULL},
-       {N_("/_Processing..."),          NULL, folderview_processing_cb, 0, NULL},
+                                       NULL, folderview_new_news_group_cb, 0, NULL},
+       {N_("/_Remove newsgroup"),      NULL, folderview_rm_news_group_cb, 0, NULL},
+       {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
+       {N_("/_Check for new messages"),
+                                       NULL, folderview_update_tree_cb, 0, NULL},
+       {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
+       {N_("/Remove _news account"),   NULL, folderview_rm_news_server_cb, 0, NULL},
+       {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
+       {N_("/_Search folder..."),      NULL, folderview_search_cb, 0, NULL},
+       {N_("/_Properties..."),         NULL, folderview_property_cb, 0, NULL},
+       {N_("/_Processing..."),         NULL, folderview_processing_cb, 0, NULL},
        {N_("/S_coring..."),            NULL, folderview_scoring_cb, 0, NULL}
 };
 
+GtkTargetEntry folderview_drag_types[] =
+{
+       {"text/plain", GTK_TARGET_SAME_APP, TARGET_DUMMY}
+};
 
 FolderView *folderview_create(void)
 {
@@ -424,7 +448,7 @@ FolderView *folderview_create(void)
                sizeof(folderview_mbox_popup_entries[0]);
        mbox_popup = menu_create_items(folderview_mbox_popup_entries,
                                       n_entries,
-                                      "<MailFolder>", &mbox_factory,
+                                      "<MboxFolder>", &mbox_factory,
                                       folderview);
 
        gtk_signal_connect(GTK_OBJECT(ctree), "key_press_event",
@@ -469,10 +493,9 @@ FolderView *folderview_create(void)
                           folderview);
 
         /* drop callback */
-       gtk_drag_dest_set(ctree, GTK_DEST_DEFAULT_ALL &
-                         ~GTK_DEST_DEFAULT_HIGHLIGHT,
+       gtk_drag_dest_set(ctree, GTK_DEST_DEFAULT_ALL & ~GTK_DEST_DEFAULT_HIGHLIGHT,
                          summary_drag_types, 1,
-                         GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_DEFAULT);
+                         GDK_ACTION_MOVE | GDK_ACTION_COPY | GDK_ACTION_DEFAULT);
        gtk_signal_connect(GTK_OBJECT(ctree), "drag_motion",
                           GTK_SIGNAL_FUNC(folderview_drag_motion_cb),
                           folderview);
@@ -482,6 +505,9 @@ FolderView *folderview_create(void)
        gtk_signal_connect(GTK_OBJECT(ctree), "drag_data_received",
                           GTK_SIGNAL_FUNC(folderview_drag_received_cb),
                           folderview);
+       gtk_signal_connect(GTK_OBJECT(ctree), "drag_end",
+                          GTK_SIGNAL_FUNC(folderview_drag_end_cb),
+                          folderview);
 
        folderview->scrolledwin  = scrolledwin;
        folderview->ctree        = ctree;
@@ -494,11 +520,14 @@ FolderView *folderview_create(void)
        folderview->mbox_popup   = mbox_popup;
        folderview->mbox_factory = mbox_factory;
 
+       folderview->folder_update_callback_id =
+               hooks_register_hook(FOLDER_UPDATE_HOOKLIST, folderview_update_folder, (gpointer) folderview);
        folderview->folder_item_update_callback_id =
-               folder_item_update_callback_register(folderview_update_item, (gpointer) folderview);
+               hooks_register_hook(FOLDER_ITEM_UPDATE_HOOKLIST, folderview_update_item, (gpointer) folderview);
 
        gtk_widget_show_all(scrolledwin);
 
+       folderview->target_list = gtk_target_list_new(folderview_drag_types, 1);
        folderview_list = g_list_append(folderview_list, folderview);
 
        return folderview;
@@ -532,6 +561,8 @@ void folderview_init(FolderView *folderview)
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_QUEUE_CLOSE_HRM, &queuehrmxpm, &queuehrmxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_QUEUE_OPEN, &queueopenxpm, &queueopenxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_QUEUE_OPEN_HRM, &queueopenhrmxpm, &queueopenhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DRAFTS_CLOSE, &draftsxpm, &draftsxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DRAFTS_OPEN, &draftsopenxpm, &draftsopenxpmmask);
 
        /* CLAWS: titles for "New" and "Unread" show new & unread pixmaps
         * instead text (text overflows making them unreadable and ugly) */
@@ -556,13 +587,28 @@ void folderview_init(FolderView *folderview)
        gtk_clist_set_column_widget(GTK_CLIST(ctree),COL_NEW,hbox_new);
        gtk_clist_set_column_widget(GTK_CLIST(ctree),COL_UNREAD,hbox_unread);
                        
-
-
-       if (!normalfont)
-               normalfont = gtkut_font_load(NORMAL_FONT);
-       if (!boldfont)
-               boldfont = gtkut_font_load(BOLD_FONT);
-
+       if (!normalfont) {
+               if (gtkut_font_load(NORMAL_FONT) == NULL) {
+                       GtkStyle *style = gtk_style_new();
+                       normalfont = style->font;
+                       gdk_font_ref(normalfont);
+                       gtk_style_unref(style);
+               } 
+               else 
+                       normalfont = gtkut_font_load(NORMAL_FONT);
+       }
+       
+       if (!boldfont) {
+               if (gtkut_font_load(BOLD_FONT) == NULL) {
+                       GtkStyle *style = gtk_style_new();
+                       boldfont = style->font;
+                       gdk_font_ref(boldfont);
+                       gtk_style_unref(style);
+               }
+               else
+                       boldfont = gtkut_font_load(BOLD_FONT);
+       }
+       
        if (!bold_style) {
                bold_style = gtk_style_copy(gtk_widget_get_style(ctree));
                bold_style->font = boldfont;
@@ -673,7 +719,7 @@ static GtkCTreeNode *folderview_find_next_unread(GtkCTree *ctree,
 
        for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
                item = gtk_ctree_node_get_row_data(ctree, node);
-               if (item && item->unread > 0 && item->stype != F_TRASH)
+               if (item && item->unread_msgs > 0 && item->stype != F_TRASH)
                        return node;
        }
 
@@ -719,19 +765,6 @@ void folderview_update_msg_num(FolderView *folderview, GtkCTreeNode *row)
        unread = atoi(unread_str);
        total = atoi(total_str);
 
-       /* CLAWS: don't know why but this always seems to be true
-        * when deleting messages. Somewhere claws does a folder
-        * scan which sets all new, unread & total to the correct
-        * values. It then enters this function, but leaves it
-        * because new, unread and total are the same... */
-#ifndef CLAWS   
-       if (prev_row     == row    &&
-           item->new    == new    &&
-           item->unread == unread &&
-           item->total  == total)
-               return;
-#endif         
-
        prev_row = row;
 
        folderview_update_node(folderview, row);
@@ -751,15 +784,6 @@ static void folderview_scan_tree_func(Folder *folder, FolderItem *item,
                                      gpointer data)
 {
        GList *list;
-       gchar *rootpath;
-
-       if (FOLDER_IS_LOCAL(folder))
-               rootpath = LOCAL_FOLDER(folder)->rootpath;
-       else if (folder->type == F_IMAP && folder->account &&
-                folder->account->recv_server)
-               rootpath = folder->account->recv_server;
-       else
-               return;
 
        for (list = folderview_list; list != NULL; list = list->next) {
                FolderView *folderview = (FolderView *)list->data;
@@ -768,11 +792,11 @@ static void folderview_scan_tree_func(Folder *folder, FolderItem *item,
 
                if (item->path)
                        str = g_strdup_printf(_("Scanning folder %s%c%s ..."),
-                                             rootpath, G_DIR_SEPARATOR,
+                                             item->folder->name, G_DIR_SEPARATOR,
                                              item->path);
                else
                        str = g_strdup_printf(_("Scanning folder %s ..."),
-                                             rootpath);
+                                             item->folder->name);
 
                STATUSBAR_PUSH(mainwin, str);
                STATUSBAR_POP(mainwin);
@@ -809,7 +833,7 @@ void folderview_rescan_tree(Folder *folder)
 
        g_return_if_fail(folder != NULL);
 
-       if (!folder->scan_tree) return;
+       if (!folder->klass->scan_tree) return;
 
        inc_lock();
        window = label_window_create(_("Rebuilding folder tree..."));
@@ -820,53 +844,26 @@ void folderview_rescan_tree(Folder *folder)
 
        folderview_set_all();
 
-       folderview_check_new(folder);
-       
        gtk_widget_destroy(window);
        inc_unlock();
 }
 
-#if 0
-void folderview_rescan_all(void)
-{
-       GList *list;
-       GtkWidget *window;
-
-       inc_lock();
-       window = label_window_create(_("Rescanning all folder trees..."));
-
-       list = folder_get_list();
-       for (; list != NULL; list = list->next) {
-               Folder *folder = list->data;
-
-               if (!folder->scan_tree) continue;
-               folder_set_ui_func(folder, folderview_scan_tree_func, NULL);
-               folder_scan_tree(folder);
-               folder_set_ui_func(folder, NULL, NULL);
-       }
-
-       folder_write_list();
-       folderview_set_all();
-
-       list = folder_get_list();
-       for (; list != NULL; list = list->next) {
-               Folder *folder = list->data;
-
-               folderview_check_new(folder);
-       }
-
-       gtk_widget_destroy(window);
-       inc_unlock();
-}
-#endif
-
-void folderview_check_new(Folder *folder)
+/** folderview_check_new()
+ *  Scan and update the folder and return the 
+ *  count the number of new messages since last check. 
+ *  \param folder the folder to check for new messages
+ *  \return the number of new messages since last check
+ */
+gint folderview_check_new(Folder *folder)
 {
        GList *list;
        FolderItem *item;
        FolderView *folderview;
        GtkCTree *ctree;
        GtkCTreeNode *node;
+       gint new_msgs = 0;
+       gint former_new_msgs = 0;
+       gint former_new = 0;
 
        for (list = folderview_list; list != NULL; list = list->next) {
                folderview = (FolderView *)list->data;
@@ -885,11 +882,14 @@ void folderview_check_new(Folder *folder)
                        if (!folder && !FOLDER_IS_LOCAL(item->folder)) continue;
 
                        folderview_scan_tree_func(item->folder, item, NULL);
+                       former_new = item->new_msgs;
                        if (folder_item_scan(item) < 0) {
                                if (folder && !FOLDER_IS_LOCAL(folder))
                                        break;
                        }
                        folderview_update_node(folderview, node);
+                       new_msgs += item->new_msgs;
+                       former_new_msgs += former_new;
                }
 
                gtk_widget_set_sensitive(folderview->ctree, TRUE);
@@ -898,6 +898,13 @@ void folderview_check_new(Folder *folder)
        }
 
        folder_write_list();
+       /* Number of new messages since last check is the just the difference 
+        * between former_new_msgs and new_msgs. If new_msgs is less than
+        * former_new_msgs, that would mean another session accessed the folder
+        * and the result is not well defined.
+        */
+       new_msgs = (former_new_msgs < new_msgs ? new_msgs - former_new_msgs : 0);
+       return new_msgs;
 }
 
 void folderview_check_new_all(void)
@@ -936,8 +943,8 @@ static gboolean folderview_search_new_recursive(GtkCTree *ctree,
        if (node) {
                item = gtk_ctree_node_get_row_data(ctree, node);
                if (item) {
-                       if (item->new > 0 ||
-                           (item->stype == F_QUEUE && item->total > 0))
+                       if (item->new_msgs > 0 ||
+                           (item->stype == F_QUEUE && item->total_msgs > 0))
                                return TRUE;
                }
                node = GTK_CTREE_ROW(node)->children;
@@ -982,8 +989,8 @@ static gboolean folderview_search_unread_recursive(GtkCTree *ctree,
        if (node) {
                item = gtk_ctree_node_get_row_data(ctree, node);
                if (item) {
-                       if (item->unread > 0 ||
-                           (item->stype == F_QUEUE && item->total > 0))
+                       if (item->unread_msgs > 0 ||
+                           (item->stype == F_QUEUE && item->total_msgs > 0))
                                return TRUE;
                }
                node = GTK_CTREE_ROW(node)->children;
@@ -1049,9 +1056,6 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                        openxpm = inboxopenxpm;
                        openmask = inboxopenxpmmask;
                }
-               name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
-                               !strcmp2(item->name, INBOX_DIR) ? _("Inbox") :
-                               item->name);
                break;
        case F_OUTBOX:
                if (item->hide_read_msgs) {
@@ -1065,9 +1069,6 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                        openxpm = outboxopenxpm;
                        openmask = outboxopenxpmmask;
                }
-               name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
-                               !strcmp2(item->name, OUTBOX_DIR) ? _("Sent") :
-                               item->name);
                break;
        case F_QUEUE:
                if (item->hide_read_msgs) {
@@ -1081,9 +1082,6 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                        openxpm = queueopenxpm;
                        openmask = queueopenxpmmask;
                }
-               name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
-                               !strcmp2(item->name, QUEUE_DIR) ? _("Queue") :
-                               item->name);
                break;
        case F_TRASH:
                if (item->hide_read_msgs) {
@@ -1097,23 +1095,12 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                        openxpm = trashopenxpm;
                        openmask = trashopenxpmmask;
                }
-               name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
-                               !strcmp2(item->name, TRASH_DIR) ? _("Trash") :
-                               item->name);
                break;
        case F_DRAFT:
-               xpm = folderxpm;
-               mask = folderxpmmask;
-               if (item->hide_read_msgs) {
-                       openxpm = folderopenhrmxpm;
-                       openmask = folderopenhrmxpmmask;
-               } else {
-                       openxpm = folderopenxpm;
-                       openmask = folderopenxpmmask;
-               }
-               name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
-                               !strcmp2(item->name, DRAFT_DIR) ? _("Drafts") :
-                               item->name);
+               xpm = draftsxpm;
+               mask = draftsxpmmask;
+               openxpm = draftsopenxpm;
+               openmask = draftsopenxpmmask;
                break;
        default:
                if (item->hide_read_msgs) {
@@ -1127,30 +1114,8 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                        openxpm = folderopenxpm;
                        openmask = folderopenxpmmask;
                }
-               if (!item->parent) {
-                       switch (item->folder->type) {
-                       case F_MH:
-                               name = " (MH)"; break;
-                       case F_MBOX:
-                               name = " (mbox)"; break;
-                       case F_IMAP:
-                               name = " (IMAP4)"; break;
-                       case F_NEWS:
-                               name = " (News)"; break;
-                       default:
-                               name = "";
-                       }
-                       name = g_strconcat(item->name, name, NULL);
-               } else {
-                       if (item->folder->type == F_NEWS &&
-                           item->path &&
-                           !strcmp2(item->name, item->path) &&
-                           prefs_common.ng_abbrev_len < strlen(item->path))
-                               name = get_abbrev_newsgroup_name(item->path, prefs_common.ng_abbrev_len);
-                       else
-                               name = g_strdup(item->name);
-               }
        }
+       name = folder_item_get_name(item);
 
        if (!GTK_CTREE_ROW(node)->expanded &&
            folderview_have_unread_children(folderview, node))
@@ -1158,30 +1123,36 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
        else
                add_unread_mark = FALSE;
 
-       if (item->stype == F_QUEUE && item->total > 0 &&
+       if (item->stype == F_QUEUE && item->total_msgs > 0 &&
            prefs_common.display_folder_unread) {
-               str = g_strdup_printf("%s (%d%s)", name, item->total,
+               str = g_strdup_printf("%s (%d%s)", name, item->total_msgs,
                                      add_unread_mark ? "+" : "");
                gtk_ctree_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 > 0 || add_unread_mark) &&
+       } else if ((item->unread_msgs > 0 || add_unread_mark) &&
                 prefs_common.display_folder_unread) {
 
-               if (item->unread > 0)
-                       str = g_strdup_printf("%s (%d%s)", name, item->unread,
-                                             add_unread_mark ? "+" : "");
+               if (item->unread_msgs > 0)
+                       str = g_strdup_printf("%s (%d%s%s)", name, item->unread_msgs,
+                                             add_unread_mark ? "+" : "", 
+                                             item->unreadmarked_msgs > 0 ? "!":"");
                else
                        str = g_strdup_printf("%s (+)", name);
                gtk_ctree_set_node_info(ctree, node, str, FOLDER_SPACING,
                                        xpm, mask, openxpm, openmask,
                                        FALSE, GTK_CTREE_ROW(node)->expanded);
                g_free(str);
-       } else
-               gtk_ctree_set_node_info(ctree, node, name, FOLDER_SPACING,
+       } else {
+               str = g_strdup_printf("%s%s", name, 
+                                     item->unreadmarked_msgs > 0 ? " (!)":"");
+       
+               gtk_ctree_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 (!item->parent) {
@@ -1189,9 +1160,9 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                gtk_ctree_node_set_text(ctree, node, COL_UNREAD, "-");
                gtk_ctree_node_set_text(ctree, node, COL_TOTAL,  "-");
        } else {
-               gtk_ctree_node_set_text(ctree, node, COL_NEW,    itos(item->new));
-               gtk_ctree_node_set_text(ctree, node, COL_UNREAD, itos(item->unread));
-               gtk_ctree_node_set_text(ctree, node, COL_TOTAL,  itos(item->total));
+               gtk_ctree_node_set_text(ctree, node, COL_NEW,    itos(item->new_msgs));
+               gtk_ctree_node_set_text(ctree, node, COL_UNREAD, itos(item->unread_msgs));
+               gtk_ctree_node_set_text(ctree, node, COL_TOTAL,  itos(item->total_msgs));
        }
 
        if (item->stype == F_OUTBOX || item->stype == F_DRAFT ||
@@ -1199,15 +1170,15 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                use_bold = use_color = FALSE;
        } else if (item->stype == F_QUEUE) {
                /* highlight queue folder if there are any messages */
-               use_bold = use_color = (item->total > 0);
+               use_bold = use_color = (item->total_msgs > 0);
        } else {
                /* if unread messages exist, print with bold font */
-               use_bold = (item->unread > 0) || add_unread_mark;
+               use_bold = (item->unread_msgs > 0) || add_unread_mark;
                /* if new messages exist, print with colored letter */
                use_color =
-                       (item->new > 0) ||
+                       (item->new_msgs > 0) ||
                        (add_unread_mark &&
-                        folderview_have_new_children(folderview, node));
+                        folderview_have_new_children(folderview, node));       
        }
 
        gtk_ctree_node_set_foreground(ctree, node, NULL);
@@ -1238,29 +1209,32 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
 
        gtk_ctree_node_set_row_style(ctree, node, style);
 
-       item->need_update = FALSE;
-
        if ((node = gtkut_ctree_find_collapsed_parent(ctree, node)) != NULL)
                folderview_update_node(folderview, node);
 }
 
-void folderview_update_item(FolderItem *item, gboolean update_summary, gpointer data)
+gboolean folderview_update_item(gpointer source, gpointer data)
 {
+       FolderItemUpdateData *update_info = (FolderItemUpdateData *)source;
        FolderView *folderview = (FolderView *)data;
        GtkCTree *ctree;
        GtkCTreeNode *node;
 
-       g_return_if_fail(folderview != NULL);
-       g_return_if_fail(item != NULL);
+       g_return_val_if_fail(update_info != NULL, TRUE);
+       g_return_val_if_fail(update_info->item != NULL, TRUE);
+       g_return_val_if_fail(folderview != NULL, FALSE);
 
        ctree = GTK_CTREE(folderview->ctree);
 
-       node = gtk_ctree_find_by_row_data(ctree, NULL, item);
+       node = gtk_ctree_find_by_row_data(ctree, NULL, update_info->item);
        if (node) {
-               folderview_update_node(folderview, node);
-               if (update_summary && folderview->opened == node)
-                       summary_show(folderview->summaryview, item);
+               if (update_info->update_flags & F_ITEM_UPDATE_MSGCNT)
+                       folderview_update_node(folderview, node);
+               if ((update_info->update_flags & F_ITEM_UPDATE_CONTENT) && (folderview->opened == node))
+                       summary_show(folderview->summaryview, update_info->item);
        }
+       
+       return FALSE;
 }
 
 static gboolean folderview_gnode_func(GtkCTree *ctree, guint depth,
@@ -1359,7 +1333,7 @@ void folderview_new_folder(FolderView *folderview)
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
 
-       switch (item->folder->type) {
+       switch (FOLDER_TYPE(item->folder)) {
        case F_MBOX:
                folderview_new_mbox_folder_cb(folderview, 0, NULL);
                break;
@@ -1389,9 +1363,10 @@ void folderview_rename_folder(FolderView *folderview)
        if (!item->path) return;
        if (item->stype != F_NORMAL) return;
 
-       switch (item->folder->type) {
+       switch (FOLDER_TYPE(item->folder)) {
        case F_MBOX:
                folderview_rename_mbox_folder_cb(folderview, 0, NULL);
+               break;
        case F_MH:
        case F_MAILDIR:
        case F_IMAP:
@@ -1416,7 +1391,7 @@ void folderview_delete_folder(FolderView *folderview)
        if (!item->path) return;
        if (item->stype != F_NORMAL) return;
 
-       switch (item->folder->type) {
+       switch (FOLDER_TYPE(item->folder)) {
        case F_MH:
        case F_MBOX:
        case F_MAILDIR:
@@ -1443,6 +1418,7 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
        gboolean mark_all_read   = FALSE;
        gboolean new_folder      = FALSE;
        gboolean rename_folder   = FALSE;
+       gboolean move_folder     = FALSE;
        gboolean delete_folder   = FALSE;
        gboolean update_tree     = FALSE;
        gboolean rescan_tree     = FALSE;
@@ -1505,7 +1481,7 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
                        if (item->parent == NULL)
                                update_tree = rescan_tree = TRUE;
                        else if (item->stype == F_NORMAL)
-                               rename_folder = delete_folder = folder_scoring = folder_processing = TRUE;
+                               move_folder = rename_folder = delete_folder = folder_scoring = folder_processing = TRUE;
                        else if (item->stype == F_INBOX)
                                folder_scoring = folder_processing = TRUE;
                        else if (item->stype == F_TRASH)
@@ -1516,7 +1492,7 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
                        if (item->parent != NULL)
                                delete_folder = folder_scoring = folder_processing = TRUE;
                }
-               if (item->unread < 1) 
+               if (item->unread_msgs < 1) 
                        mark_all_read = FALSE;
        }
 
@@ -1532,6 +1508,7 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
                SET_SENS(mail_factory, "/Mark all read", mark_all_read);
                SET_SENS(mail_factory, "/Create new folder...", new_folder);
                SET_SENS(mail_factory, "/Rename folder...", rename_folder);
+               SET_SENS(mail_factory, "/Move folder...", move_folder);
                SET_SENS(mail_factory, "/Delete folder", delete_folder);
                SET_SENS(mail_factory, "/Check for new messages", update_tree);
                SET_SENS(mail_factory, "/Rebuild folder tree", rescan_tree);
@@ -1546,6 +1523,7 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
                SET_SENS(imap_factory, "/Mark all read", mark_all_read);
                SET_SENS(imap_factory, "/Create new folder...", new_folder);
                SET_SENS(imap_factory, "/Rename folder...", rename_folder);
+               SET_SENS(imap_factory, "/Move folder...", move_folder);
                SET_SENS(imap_factory, "/Delete folder", delete_folder);
                SET_SENS(imap_factory, "/Check for new messages", update_tree);
                SET_SENS(imap_factory, "/Rebuild folder tree", rescan_tree);
@@ -1560,9 +1538,7 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
                SET_SENS(news_factory, "/Mark all read", mark_all_read);
                SET_SENS(news_factory, "/Subscribe to newsgroup...", new_folder);
                SET_SENS(news_factory, "/Remove newsgroup", delete_folder);
-#if 0
                SET_SENS(news_factory, "/Check for new messages", update_tree);
-#endif
                SET_SENS(news_factory, "/Remove news account", remove_tree);
                SET_SENS(news_factory, "/Search folder...", search_folder);
                SET_SENS(news_factory, "/Properties...", folder_property);
@@ -1573,6 +1549,7 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
                menu_set_insensitive_all(GTK_MENU_SHELL(popup));
                SET_SENS(mbox_factory, "/Create new folder...", new_folder);
                SET_SENS(mbox_factory, "/Rename folder...", rename_folder);
+               SET_SENS(mbox_factory, "/Move folder...", move_folder);
                SET_SENS(mbox_factory, "/Delete folder", delete_folder);
                SET_SENS(news_factory, "/Properties...", folder_property);
                SET_SENS(mbox_factory, "/Processing...", folder_processing);
@@ -1672,7 +1649,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
        if (item->folder) 
                toolbar_set_compose_button
                        (folderview->mainwin->toolbar,
-                        item->folder->type == F_NEWS ? 
+                        FOLDER_TYPE(item->folder) == F_NEWS ? 
                         COMPOSEBUTTON_NEWS : COMPOSEBUTTON_MAIL);
 
        if (item->path)
@@ -1692,7 +1669,8 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
        }
 
        /* Open Folder */
-       buf = g_strdup_printf(_("Opening Folder %s..."), item->path);
+       buf = g_strdup_printf(_("Opening Folder %s..."), item->path ? 
+                                       item->path : "(null)");
        debug_print("%s\n", buf);
        STATUSBAR_PUSH(folderview->mainwin, buf);
        g_free(buf);
@@ -1713,7 +1691,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
        /* Show messages */
        summary_set_prefs_from_folderitem(folderview->summaryview, item);
        opened = summary_show(folderview->summaryview, item);
-
+       
        folder_clean_cache_memory();
 
        if (!opened) {
@@ -1826,12 +1804,6 @@ static void folderview_update_tree_cb(FolderView *folderview, guint action,
                folderview_check_new(item->folder);
        else
                folderview_rescan_tree(item->folder);
-       
-       if (folderview->opened) {
-               item = gtk_ctree_node_get_row_data(ctree, folderview->opened);
-               if (item)
-                       folder_update_item(item, TRUE);
-       }
 }
 
 void folderview_create_folder_node_recursive(FolderView *folderview, FolderItem *item)
@@ -1897,7 +1869,7 @@ static void folderview_new_folder_cb(FolderView *folderview, guint action,
                                  _("NewFolder"));
        if (!new_folder) return;
 
-       if (item->folder->type != F_MBOX) {
+       if (FOLDER_TYPE(item->folder) != F_MBOX) {
                if (strchr(new_folder, G_DIR_SEPARATOR) != NULL) {
                        alertpanel_error(_("`%c' can't be included in folder name."),
                                         G_DIR_SEPARATOR);
@@ -2014,7 +1986,7 @@ static void folderview_rename_folder_cb(FolderView *folderview, guint action,
        Xstrdup_a(old_path, item->path, {g_free(new_folder); return;});
        old_id = folder_item_get_identifier(item);
 
-       if (item->folder->rename_folder(item->folder, item, new_folder) < 0) {
+       if (item->folder->klass->rename_folder(item->folder, item, new_folder) < 0) {
                g_free(old_id);
                g_free(new_folder);
                return;
@@ -2081,7 +2053,7 @@ static void folderview_rename_mbox_folder_cb(FolderView *folderview,
                return;
        }
 
-       if (item->folder->rename_folder(item->folder, item, new_folder) < 0) {
+       if (item->folder->klass->rename_folder(item->folder, item, new_folder) < 0) {
                g_free(new_folder);
                return;
        }
@@ -2135,7 +2107,7 @@ static void folderview_delete_folder_cb(FolderView *folderview, guint action,
        Xstrdup_a(old_path, item->path, return);
        old_id = folder_item_get_identifier(item);
 
-       if (item->folder->remove_folder(item->folder, item) < 0) {
+       if (item->folder->klass->remove_folder(item->folder, item) < 0) {
                alertpanel_error(_("Can't remove the folder `%s'."), name);
                if (folderview->opened == folderview->selected)
                        summary_show(folderview->summaryview,
@@ -2213,7 +2185,7 @@ static void folderview_new_imap_folder_cb(FolderView *folderview, guint action,
        item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
-       g_return_if_fail(item->folder->type == F_IMAP);
+       g_return_if_fail(FOLDER_TYPE(item->folder) == F_IMAP);
        g_return_if_fail(item->folder->account != NULL);
 
        new_folder = input_dialog
@@ -2271,7 +2243,7 @@ static void folderview_rm_imap_server_cb(FolderView *folderview, guint action,
        item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
-       g_return_if_fail(item->folder->type == F_IMAP);
+       g_return_if_fail(FOLDER_TYPE(item->folder) == F_IMAP);
        g_return_if_fail(item->folder->account != NULL);
 
        name_ = trim_string(item->folder->name, 32);
@@ -2321,7 +2293,7 @@ static void folderview_new_news_group_cb(FolderView *folderview, guint action,
        g_return_if_fail(item != NULL);
        folder = item->folder;
        g_return_if_fail(folder != NULL);
-       g_return_if_fail(folder->type == F_NEWS);
+       g_return_if_fail(FOLDER_TYPE(folder) == F_NEWS);
        g_return_if_fail(folder->account != NULL);
 
        if (GTK_CTREE_ROW(folderview->selected)->parent != NULL)
@@ -2406,7 +2378,7 @@ static void folderview_rm_news_group_cb(FolderView *folderview, guint action,
        item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
-       g_return_if_fail(item->folder->type == F_NEWS);
+       g_return_if_fail(FOLDER_TYPE(item->folder) == F_NEWS);
        g_return_if_fail(item->folder->account != NULL);
 
        name_ = trim_string(item->path, 32);
@@ -2426,6 +2398,8 @@ static void folderview_rm_news_group_cb(FolderView *folderview, guint action,
        folder_item_remove(item);
        gtk_ctree_remove_node(ctree, folderview->selected);
        folder_write_list();
+       
+       prefs_filtering_delete_path(name);
 }
 
 static void folderview_rm_news_server_cb(FolderView *folderview, guint action,
@@ -2443,7 +2417,7 @@ static void folderview_rm_news_server_cb(FolderView *folderview, guint action,
        item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
-       g_return_if_fail(item->folder->type == F_NEWS);
+       g_return_if_fail(FOLDER_TYPE(item->folder) == F_NEWS);
        g_return_if_fail(item->folder->account != NULL);
 
        name_ = trim_string(item->folder->name, 32);
@@ -2491,190 +2465,125 @@ static void folderview_property_cb(FolderView *folderview, guint action,
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
 
-#if CLAWS
-       prefs_folder_item_create(folderview, item);
-#else
-       /*
-        * CLAWS: wait till Hiro has completed his stuff
-        */
        if (item->parent == NULL && item->folder->account)
                account_open(item->folder->account);
-       else
+       else {
+               summary_save_prefs_to_folderitem(folderview->summaryview, item);
                prefs_folder_item_open(item);
-#endif 
+       }
 }
 
-static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
-                                         GdkDragContext *context,
-                                         gint            x,
-                                         gint            y,
-                                         guint           time,
-                                         FolderView     *folderview)
+static void folderview_recollapse_nodes(FolderView *folderview, GtkCTreeNode *node)
 {
-       gint row, column;
-       FolderItem *item, *src_item;
-       GtkCTreeNode *node = NULL;
-       gboolean acceptable = FALSE;
-
-       if (gtk_clist_get_selection_info
-               (GTK_CLIST(widget), x - 24, y - 24, &row, &column)) {
-               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 && item->folder && item->path &&
-                   src_item && src_item != item) {
-                       switch (item->folder->type) {
-                       case F_MH:
-                       case F_IMAP:
-                               acceptable = TRUE;
-                               break;
-                       default:
-                               break;
-                       }
-               } else if (item && item->folder && folder_item_get_path(item) &&
-                          src_item && src_item != item) {
-                       /* a root folder - acceptable only from folderview */
-                       if (item->folder->type == F_MH || item->folder->type == F_IMAP)
-                               acceptable = TRUE;
+       GSList *list = NULL;
+       GSList *done = NULL;
+       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       
+       for (list = folderview->nodes_to_recollapse; list != NULL; list = g_slist_next(list)) {
+               if (!gtkut_ctree_node_is_parent(GTK_CTREE_NODE(list->data), node)
+               &&  list->data != node) {
+                       gtk_ctree_collapse(ctree, GTK_CTREE_NODE(list->data));
+                       done = g_slist_append(done, GTK_CTREE_NODE(list->data));
                }
-                       
        }
-
-       if (acceptable) {
-               gtk_signal_handler_block_by_func
-                       (GTK_OBJECT(widget),
-                        GTK_SIGNAL_FUNC(folderview_selected), folderview);
-               gtk_ctree_select(GTK_CTREE(widget), node);
-               gtk_signal_handler_unblock_by_func
-                       (GTK_OBJECT(widget),
-                        GTK_SIGNAL_FUNC(folderview_selected), folderview);
-               gdk_drag_status(context, 
-                                       (context->actions == GDK_ACTION_COPY ?
-                                       GDK_ACTION_COPY : GDK_ACTION_MOVE) , time);
-       } else {
-               gtk_ctree_select(GTK_CTREE(widget), folderview->opened);
-               gdk_drag_status(context, 0, time);
+       for (list = done; list != NULL; list = g_slist_next(list)) {
+               folderview->nodes_to_recollapse = g_slist_remove(folderview->nodes_to_recollapse, 
+                                                                list->data);
        }
+       g_slist_free(done);
+}
 
-       return acceptable;
+static void folderview_recollapse_all_nodes(FolderView *folderview)
+{
+       GSList *list = folderview->nodes_to_recollapse;
+       if (!list) return;
+       for (; list != NULL; list = g_slist_next(list))
+               if (list->data) 
+                       gtk_ctree_collapse(GTK_CTREE(folderview->ctree), 
+                                          GTK_CTREE_NODE(list->data));
+       g_slist_free(folderview->nodes_to_recollapse);  
+       folderview->nodes_to_recollapse = NULL;
 }
 
-static void folderview_drag_leave_cb(GtkWidget      *widget,
-                                    GdkDragContext *context,
-                                    guint           time,
-                                    FolderView     *folderview)
+static void folderview_move_to_cb(FolderView *folderview) 
 {
-       gtk_ctree_select(GTK_CTREE(widget), folderview->opened);
+       FolderItem *from_folder = NULL, *to_folder = NULL;
+
+       if (folderview->selected)
+               from_folder = gtk_ctree_node_get_row_data(GTK_CTREE(folderview->ctree), folderview->selected);
+       if (!from_folder || FOLDER_TYPE(from_folder->folder) == F_NEWS)
+               return;
+
+       to_folder = foldersel_folder_sel(from_folder->folder, FOLDER_SEL_MOVE, NULL);
+       
+       if (!to_folder || FOLDER_TYPE(to_folder->folder) == F_NEWS)
+               return;
+
+       folderview_move_to(folderview, from_folder, to_folder);
 }
 
-static void folderview_drag_received_cb(GtkWidget        *widget,
-                                       GdkDragContext   *drag_context,
-                                       gint              x,
-                                       gint              y,
-                                       GtkSelectionData *data,
-                                       guint             info,
-                                       guint             time,
-                                       FolderView       *folderview)
+static void folderview_move_to(FolderView *folderview, FolderItem *from_folder,
+                              FolderItem *to_folder)
 {
-       gint row, column;
-       FolderItem *item, *src_item;
-       GtkCTreeNode *node;
+       FolderItem *from_parent = NULL;
+       FolderItem *new_folder = NULL;
+       GtkCTreeNode *src_node = NULL;
+       gchar *buf;
+       gint status;
 
-       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;
+       src_node = gtk_ctree_find_by_row_data(GTK_CTREE(folderview->ctree), NULL, from_folder);
+       from_parent = from_folder->parent;
+       buf = g_strdup_printf(_("Moving %s to %s..."), from_folder->name, to_folder->name);
+       STATUSBAR_PUSH(folderview->mainwin, buf);
+       g_free(buf);
+       summary_clear_all(folderview->summaryview);
+       folderview->opened = NULL;
+       folderview->selected = NULL;
+       gtk_widget_set_sensitive(GTK_WIDGET(folderview->ctree), FALSE);
+       inc_lock();
+       main_window_cursor_wait(folderview->mainwin);
+       statusbar_verbosity_set(TRUE);
+       folder_item_update_freeze();
+       if ((status = folder_item_move_to(from_folder, to_folder, &new_folder)) == F_MOVE_OK) {
+               statusbar_verbosity_set(FALSE);
+               main_window_cursor_normal(folderview->mainwin);
+               STATUSBAR_POP(folderview->mainwin);
+               folder_item_update_thaw();
+               if (src_node)
+                       gtk_ctree_remove_node(GTK_CTREE(folderview->ctree), src_node);
+               else 
+                       debug_print("can't remove src node: is null\n");
 
-               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 &&
-                     src_item && src_item != item && 
-                     (item->folder->type == F_MH || item->folder->type == F_IMAP))) {
-                       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 (src_item->folder->type != item->folder->type ||
-                           (item->folder->type == F_IMAP &&
-                            src_item->folder != item->folder))
-                               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;
-               char *buf;
-               GtkCTreeNode *src_node;
-               FolderItem *new_item, *src_parent;
-               
-               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_path(source);
+               folderview_create_folder_node_recursive(folderview, new_folder);
 
-               if (!src_item || src_item->stype != F_NORMAL) {
-                       gtk_drag_finish(drag_context, FALSE, FALSE, time);                      
-                       return;
-               }
-               src_parent = src_item->parent;
-               src_node = gtk_ctree_find_by_row_data(GTK_CTREE(widget), NULL, src_item);
+               folder_item_update_recursive(new_folder, F_ITEM_UPDATE_MSGCNT);
 
-               buf = g_strdup_printf(_("Moving %s to %s..."), src_item->name, item->name);
-               STATUSBAR_PUSH(folderview->mainwin, buf);
-               g_free(buf);
-               summary_clear_all(folderview->summaryview);
-               folderview->opened = NULL;
-               folderview->selected = NULL;
-               gtk_widget_set_sensitive(folderview->ctree, FALSE);
-               inc_lock();
-               main_window_cursor_wait(folderview->mainwin);
-               if ((new_item = folder_item_move_to(src_item, item)) != NULL) {
-                       main_window_cursor_normal(folderview->mainwin);
-                       gtk_drag_finish(drag_context, TRUE, TRUE, time);
-               
-                       if (src_node)
-                               gtk_ctree_remove_node(GTK_CTREE(widget), src_node);
-                       else 
-                               debug_print("can't remove src node: is null\n");
-
-                       STATUSBAR_POP(folderview->mainwin);
-                       folderview_create_folder_node_recursive(folderview, new_item);
-                       folder_update_item(src_parent, TRUE);
-                       folder_update_item_recursive(new_item, TRUE); 
-                       folderview_sort_folders(folderview, 
-                               gtk_ctree_find_by_row_data(GTK_CTREE(widget), 
-                                       NULL, new_item->parent), new_item->folder);
-                       folderview_select(folderview, new_item);
-               } else {
-                       main_window_cursor_normal(folderview->mainwin);
-                       gtk_drag_finish(drag_context, FALSE, FALSE, time);
-                       STATUSBAR_POP(folderview->mainwin);
-               }       
-               inc_unlock();           
-               gtk_widget_set_sensitive(folderview->ctree, TRUE);
-       }
+               folderview_sort_folders(folderview, 
+                       gtk_ctree_find_by_row_data(GTK_CTREE(folderview->ctree), 
+                               NULL, new_folder->parent), new_folder->folder);
+               folderview_select(folderview, new_folder);
+       } else {
+               statusbar_verbosity_set(FALSE);         
+               main_window_cursor_normal(folderview->mainwin);
+               STATUSBAR_POP(folderview->mainwin);
+               folder_item_update_thaw();
+               switch (status) {
+               case F_MOVE_FAILED_DEST_IS_PARENT:
+                       alertpanel_error(_("Source and destination are the same."));
+                       break;
+               case F_MOVE_FAILED_DEST_IS_CHILD:
+                       alertpanel_error(_("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."));
+                       break;
+               default:
+                       alertpanel_error(_("Move failed!"));
+                       break;
+               }
+       }       
+       inc_unlock();           
+       gtk_widget_set_sensitive(GTK_WIDGET(folderview->ctree), TRUE);
 }
 
 static gint folderview_clist_compare(GtkCList *clist,
@@ -2753,24 +2662,56 @@ void folderview_reflect_prefs_pixmap_theme(FolderView *folderview)
        folderview_set_all();
 }
 
-GtkTargetEntry folderview_drag_types[1] =
+static void drag_state_stop(FolderView *folderview)
 {
-       {"text/plain", GTK_TARGET_SAME_APP, TARGET_DUMMY}
-};
+       if (folderview->drag_timer)
+               gtk_timeout_remove(folderview->drag_timer);
+       folderview->drag_timer = 0;
+       folderview->drag_node = NULL;
+}
 
+static gint folderview_defer_expand(FolderView *folderview)
+{
+       if (folderview->drag_node) {
+               folderview_recollapse_nodes(folderview, folderview->drag_node);
+               if (folderview->drag_item->collapsed) {
+                       gtk_ctree_expand(GTK_CTREE(folderview->ctree), folderview->drag_node);
+                       folderview->nodes_to_recollapse = g_slist_append
+                               (folderview->nodes_to_recollapse, folderview->drag_node);
+               }
+       }
+       folderview->drag_item  = NULL;
+       folderview->drag_timer = 0;
+       return FALSE;
+}
+
+static void drag_state_start(FolderView *folderview, GtkCTreeNode *node, FolderItem *item)
+{
+       /* the idea is that we call drag_state_start() whenever we want expansion to
+        * start after 'prefs_common.hover_time' msecs. if we want to cancel expansion,
+        * we need to call drag_state_stop() */
+       drag_state_stop(folderview);
+       /* request expansion */
+       if (0 != (folderview->drag_timer = gtk_timeout_add
+                       (prefs_common.hover_timeout, 
+                        (GtkFunction)folderview_defer_expand,
+                        folderview))) {
+               folderview->drag_node = node;
+               folderview->drag_item = item;
+       }                        
+}
 
 static void folderview_start_drag(GtkWidget *widget, gint button, GdkEvent *event,
                                  FolderView       *folderview)
 {
-       GtkTargetList *list;
        GdkDragContext *context;
 
        g_return_if_fail(folderview != NULL);
        if (folderview->selected == NULL) return;
-
-       list = gtk_target_list_new(folderview_drag_types, 1);
-
-       context = gtk_drag_begin(widget, list,
+       if (folderview->nodes_to_recollapse) 
+               g_slist_free(folderview->nodes_to_recollapse);
+       folderview->nodes_to_recollapse = NULL;
+       context = gtk_drag_begin(widget, folderview->target_list,
                                 GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_DEFAULT, button, event);
        gtk_drag_set_icon_default(context);
 }
@@ -2792,7 +2733,7 @@ static void folderview_drag_data_get(GtkWidget        *widget,
                        (GTK_CTREE(folderview->ctree), 
                         GTK_CTREE_NODE(cur->data));
                if (item) {
-                       source = g_strdup_printf ("FROM_OTHER_FOLDER%s", item->path);
+                       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));
@@ -2802,3 +2743,188 @@ static void folderview_drag_data_get(GtkWidget        *widget,
        }
 }
 
+gboolean folderview_update_folder(gpointer source, gpointer userdata)
+{
+       FolderUpdateData *hookdata;
+       FolderView *folderview;
+       GtkWidget *ctree;
+
+       hookdata = source;
+       folderview = (FolderView *) userdata;   
+       g_return_val_if_fail(hookdata != NULL, FALSE);
+       g_return_val_if_fail(folderview != NULL, FALSE);
+
+       ctree = folderview->ctree;
+       g_return_val_if_fail(ctree != NULL, FALSE);
+
+       if (hookdata->update_flags & FOLDER_TREE_CHANGED) {
+               folderview_set(folderview);
+       }
+
+       return FALSE;
+}
+
+static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
+                                         GdkDragContext *context,
+                                         gint            x,
+                                         gint            y,
+                                         guint           time,
+                                         FolderView     *folderview)
+{
+       gint row, column;
+       FolderItem *item, *src_item = NULL;
+       GtkCTreeNode *node = NULL;
+       gboolean acceptable = FALSE;
+       gint height = folderview->ctree->allocation.height;
+       gint total_height = folderview->ctree->requisition.height;
+       GtkAdjustment *pos = gtk_scrolled_window_get_vadjustment(
+                               GTK_SCROLLED_WINDOW(folderview->scrolledwin));
+       gfloat vpos = pos->value;
+
+       if (gtk_clist_get_selection_info
+               (GTK_CLIST(widget), x - 24, y - 24, &row, &column)) {
+               if (y > height - 24 && height + vpos < total_height)
+                       gtk_adjustment_set_value(pos, (vpos+5 > height ? height : vpos+5));
+
+               if (y < 24 && y > 0)
+                       gtk_adjustment_set_value(pos, (vpos-5 < 0 ? 0 : vpos-5));
+
+               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 && item->folder && item->path &&
+                   src_item && src_item != item) {
+                       switch (FOLDER_TYPE(item->folder)) {
+                       case F_MH:
+                       case F_MBOX:
+                       case F_IMAP:
+                               acceptable = TRUE;
+                               break;
+                       default:
+                               break;
+                       }
+               } else if (item && item->folder && folder_item_get_path(item) &&
+                          src_item && src_item != item) {
+                       /* a root folder - acceptable only from folderview */
+                       if (FOLDER_TYPE(item->folder) == F_MH || FOLDER_TYPE(item->folder) == F_IMAP)
+                               acceptable = TRUE;
+               }
+                       
+       }
+
+       if (acceptable || (src_item && src_item == item))
+               drag_state_start(folderview, node, item);
+       
+       if (acceptable) {
+               gtk_signal_handler_block_by_func
+                       (GTK_OBJECT(widget),
+                        GTK_SIGNAL_FUNC(folderview_selected), folderview);
+               gtk_ctree_select(GTK_CTREE(widget), node);
+               gtk_signal_handler_unblock_by_func
+                       (GTK_OBJECT(widget),
+                        GTK_SIGNAL_FUNC(folderview_selected), folderview);
+               gdk_drag_status(context, 
+                                       (context->actions == GDK_ACTION_COPY ?
+                                       GDK_ACTION_COPY : GDK_ACTION_MOVE) , time);
+       } else {
+               gtk_ctree_select(GTK_CTREE(widget), folderview->opened);
+               gdk_drag_status(context, 0, time);
+       }
+
+       return acceptable;
+}
+
+static void folderview_drag_leave_cb(GtkWidget      *widget,
+                                    GdkDragContext *context,
+                                    guint           time,
+                                    FolderView     *folderview)
+{
+       drag_state_stop(folderview);
+       gtk_ctree_select(GTK_CTREE(widget), folderview->opened);
+}
+
+static void folderview_drag_received_cb(GtkWidget        *widget,
+                                       GdkDragContext   *drag_context,
+                                       gint              x,
+                                       gint              y,
+                                       GtkSelectionData *data,
+                                       guint             info,
+                                       guint             time,
+                                       FolderView       *folderview)
+{
+       gint row, column;
+       FolderItem *item, *src_item;
+       GtkCTreeNode *node;
+
+       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 &&
+                     src_item && src_item != item && 
+                     (FOLDER_TYPE(item->folder) == F_MH || FOLDER_TYPE(item->folder) == F_IMAP))) {
+                       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_TYPE(src_item->folder) != FOLDER_TYPE(item->folder) ||
+                           (FOLDER_TYPE(item->folder) == F_IMAP &&
+                            src_item->folder != item->folder))
+                               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;
+               
+               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);
+
+               if (!item || !src_item || src_item->stype != F_NORMAL) {
+                       gtk_drag_finish(drag_context, FALSE, FALSE, time);                      
+                       return;
+               }
+
+               folderview_move_to(folderview, src_item, item);
+               gtk_drag_finish(drag_context, TRUE, TRUE, time);
+       }
+       folderview->nodes_to_recollapse = NULL;
+}
+
+static void folderview_drag_end_cb(GtkWidget       *widget, 
+                                  GdkDragContext   *drag_context,
+                                   FolderView      *folderview)
+{
+       drag_state_stop(folderview);
+       g_slist_free(folderview->nodes_to_recollapse);
+       folderview->nodes_to_recollapse = NULL;
+}
+