enable IMAP folder dnd
[claws.git] / src / folderview.c
index ef34007ea3e018374d173fa44f673de3e7ac24d7..ede1f1a3eb6ecee4dd916935263b1c40f497525e 100644 (file)
 #include "gtkutils.h"
 #include "prefs_common.h"
 #include "prefs_account.h"
+#include "prefs_filtering.h"
+#include "prefs_scoring.h"
+#include "prefs_folder_item.h"
 #include "account.h"
 #include "folder.h"
 #include "inc.h"
+#include "statusbar.h"
 
 typedef enum
 {
@@ -70,19 +74,6 @@ typedef enum
 #define COL_FOLDER_WIDTH       150
 #define COL_NUM_WIDTH          32
 
-#define STATUSBAR_PUSH(mainwin, str) \
-{ \
-       gtk_statusbar_push(GTK_STATUSBAR(mainwin->statusbar), \
-                          mainwin->folderview_cid, str); \
-       gtkut_widget_wait_for_draw(mainwin->hbox_stat); \
-}
-
-#define STATUSBAR_POP(mainwin) \
-{ \
-       gtk_statusbar_pop(GTK_STATUSBAR(mainwin->statusbar), \
-                         mainwin->folderview_cid); \
-}
-
 static GList *folderview_list = NULL;
 
 static GdkFont *normalfont;
@@ -94,24 +85,46 @@ static GtkStyle *bold_style;
 static GtkStyle *bold_color_style;
 static GtkStyle *bold_tgtfold_style;
 
-static GdkPixmap *inboxxpm;
+static GdkBitmap *inboxxpm;
 static GdkBitmap *inboxxpmmask;
 static GdkPixmap *inboxhrmxpm;
 static GdkBitmap *inboxhrmxpmmask;
+static GdkPixmap *inboxopenxpm;
+static GdkBitmap *inboxopenxpmmask;
+static GdkPixmap *inboxopenhrmxpm;
+static GdkBitmap *inboxopenhrmxpmmask;
 static GdkPixmap *outboxxpm;
 static GdkBitmap *outboxxpmmask;
 static GdkPixmap *outboxhrmxpm;
 static GdkBitmap *outboxhrmxpmmask;
+static GdkPixmap *outboxopenxpm;
+static GdkBitmap *outboxopenxpmmask;
+static GdkPixmap *outboxopenhrmxpm;
+static GdkBitmap *outboxopenhrmxpmmask;
 static GdkPixmap *folderxpm;
 static GdkBitmap *folderxpmmask;
+static GdkPixmap *folderhrmxpm;
+static GdkBitmap *folderhrmxpmmask;
 static GdkPixmap *folderopenxpm;
 static GdkBitmap *folderopenxpmmask;
 static GdkPixmap *folderopenhrmxpm;
 static GdkBitmap *folderopenhrmxpmmask;
+static GdkPixmap *trashopenxpm;
+static GdkBitmap *trashopenxpmmask;
+static GdkPixmap *trashopenhrmxpm;
+static GdkBitmap *trashopenhrmxpmmask;
 static GdkPixmap *trashxpm;
 static GdkBitmap *trashxpmmask;
 static GdkPixmap *trashhrmxpm;
 static GdkBitmap *trashhrmxpmmask;
+static GdkPixmap *queuexpm;
+static GdkBitmap *queuexpmmask;
+static GdkPixmap *queuehrmxpm;
+static GdkBitmap *queuehrmxpmmask;
+static GdkPixmap *queueopenxpm;
+static GdkBitmap *queueopenxpmmask;
+static GdkPixmap *queueopenhrmxpm;
+static GdkBitmap *queueopenhrmxpmmask;
 static GdkPixmap *newxpm;
 static GdkBitmap *newxpmmask;
 static GdkPixmap *unreadxpm;
@@ -132,6 +145,9 @@ static GtkCTreeNode *folderview_find_by_name        (GtkCTree       *ctree,
                                                 GtkCTreeNode   *node,
                                                 const gchar    *name);
 
+static gint folderview_clist_compare   (GtkCList       *clist,
+                                        gconstpointer   ptr1,
+                                        gconstpointer   ptr2);
 static gint folderview_compare_name    (gconstpointer   a,
                                         gconstpointer   b);
 
@@ -166,6 +182,9 @@ static void folderview_update_tree_cb       (FolderView     *folderview,
                                         guint           action,
                                         GtkWidget      *widget);
 
+static void mark_all_read_cb            (FolderView    *folderview,
+                                         guint           action,
+                                         GtkWidget      *widget);
 static void folderview_new_folder_cb   (FolderView     *folderview,
                                         guint           action,
                                         GtkWidget      *widget);
@@ -188,9 +207,6 @@ static void folderview_remove_mailbox_cb(FolderView *folderview,
 static void folderview_new_imap_folder_cb(FolderView   *folderview,
                                          guint          action,
                                          GtkWidget     *widget);
-static void folderview_rm_imap_folder_cb (FolderView   *folderview,
-                                         guint          action,
-                                         GtkWidget     *widget);
 static void folderview_rm_imap_server_cb (FolderView   *folderview,
                                          guint          action,
                                          GtkWidget     *widget);
@@ -209,6 +225,10 @@ static void folderview_search_cb   (FolderView     *folderview,
                                         guint           action,
                                         GtkWidget      *widget);
 
+static void folderview_property_cb     (FolderView     *folderview,
+                                        guint           action,
+                                        GtkWidget      *widget);
+
 static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
                                          GdkDragContext *context,
                                          gint            x,
@@ -227,12 +247,25 @@ static void folderview_drag_received_cb  (GtkWidget        *widget,
                                          guint             info,
                                          guint             time,
                                          FolderView       *folderview);
+static void folderview_start_drag       (GtkWidget *widget, gint button, GdkEvent *event,
+                                         FolderView       *folderview);
+static void folderview_drag_data_get     (GtkWidget        *widget,
+                                         GdkDragContext   *drag_context,
+                                         GtkSelectionData *selection_data,
+                                         guint             info,
+                                         guint             time,
+                                         FolderView       *folderview);
+
+void folderview_create_folder_node       (FolderView       *folderview, 
+                                         FolderItem       *item);
+void folderview_update_item             (FolderItem       *item,
+                                          gboolean         update_summary,
+                                         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_property_cb(FolderView *folderview, guint action, GtkWidget *widget);
-
 static GtkItemFactoryEntry folderview_mbox_popup_entries[] =
 {
        {N_("/Create _new folder..."),  NULL, folderview_new_mbox_folder_cb,    0, NULL},
@@ -241,49 +274,55 @@ static GtkItemFactoryEntry folderview_mbox_popup_entries[] =
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/Remove _mailbox"),        NULL, folderview_remove_mailbox_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
-       {N_("/_Property..."),           NULL, NULL, 0, NULL},
+       {N_("/_Properties..."),         NULL, NULL, 0, NULL},
        {N_("/_Processing..."),         NULL, folderview_processing_cb, 0, NULL},
        {N_("/_Scoring..."),            NULL, folderview_scoring_cb, 0, NULL}
 };
 
 static GtkItemFactoryEntry folderview_mail_popup_entries[] =
 {
+       {N_("/Mark all _read"),         NULL, mark_all_read_cb, 0, NULL},
+       {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_("/_Delete folder"),         NULL, folderview_delete_folder_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/_Check for new messages"),
                                        NULL, folderview_update_tree_cb, 0, NULL},
-       {N_("/R_escan folder tree"),    NULL, folderview_update_tree_cb, 1, NULL},
+       {N_("/R_ebuild folder tree"),   NULL, folderview_update_tree_cb, 1, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/Remove _mailbox"),        NULL, folderview_remove_mailbox_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/_Search folder..."),      NULL, folderview_search_cb, 0, NULL},
-       {N_("/_Property..."),           NULL, folderview_property_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}
 };
 
 static GtkItemFactoryEntry folderview_imap_popup_entries[] =
 {
+       {N_("/Mark all _read"),         NULL, mark_all_read_cb, 0, NULL},
+       {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/Create _new folder..."),  NULL, folderview_new_imap_folder_cb, 0, NULL},
-       {N_("/_Rename folder..."),      NULL, NULL, 0, NULL},
-       {N_("/_Delete folder"),         NULL, folderview_rm_imap_folder_cb, 0, NULL},
+       {N_("/_Rename folder..."),      NULL, folderview_rename_folder_cb,   0, NULL},
+       {N_("/_Delete folder"),         NULL, folderview_delete_folder_cb,   0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/_Check for new messages"),
                                        NULL, folderview_update_tree_cb, 0, NULL},
-       {N_("/R_escan folder tree"),    NULL, folderview_update_tree_cb, 1, NULL},
+       {N_("/R_ebuild folder tree"),   NULL, folderview_update_tree_cb, 1, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/Remove _IMAP4 account"),  NULL, folderview_rm_imap_server_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/_Search folder..."),      NULL, folderview_search_cb, 0, NULL},
-       {N_("/_Property..."),           NULL, NULL, 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}
 };
 
 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},
@@ -291,7 +330,7 @@ static GtkItemFactoryEntry folderview_news_popup_entries[] =
        {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_("/_Property..."),            NULL, NULL, 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}
 };
@@ -302,8 +341,7 @@ FolderView *folderview_create(void)
        FolderView *folderview;
        GtkWidget *scrolledwin;
        GtkWidget *ctree;
-       gchar *titles[N_FOLDER_COLS] = {_("Folder"), _("New"),
-                                       _("Unread"), _("#")};
+       gchar *titles[N_FOLDER_COLS];
        GtkWidget *mail_popup;
        GtkWidget *news_popup;
        GtkWidget *imap_popup;
@@ -315,18 +353,24 @@ FolderView *folderview_create(void)
        gint n_entries;
        gint i;
 
-       debug_print(_("Creating folder view...\n"));
+       debug_print("Creating folder view...\n");
        folderview = g_new0(FolderView, 1);
 
+       titles[COL_FOLDER] = _("Folder");
+       titles[COL_NEW]    = _("New");
+       titles[COL_UNREAD] = _("Unread");
+       titles[COL_TOTAL]  = _("#");
+
        scrolledwin = gtk_scrolled_window_new(NULL, NULL);
-       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
-                                      GTK_POLICY_AUTOMATIC,
-                                      GTK_POLICY_ALWAYS);
+       gtk_scrolled_window_set_policy
+               (GTK_SCROLLED_WINDOW(scrolledwin),
+                GTK_POLICY_AUTOMATIC,
+                prefs_common.folderview_vscrollbar_policy);
        gtk_widget_set_usize(scrolledwin,
                             prefs_common.folderview_width,
                             prefs_common.folderview_height);
 
-       ctree = gtk_ctree_new_with_titles(N_FOLDER_COLS, COL_FOLDER, titles);
+       ctree = gtk_sctree_new_with_titles(N_FOLDER_COLS, COL_FOLDER, titles);
        
        gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
        gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_BROWSE);
@@ -350,6 +394,7 @@ FolderView *folderview_create(void)
        gtk_ctree_set_expander_style(GTK_CTREE(ctree),
                                     GTK_CTREE_EXPANDER_SQUARE);
        gtk_ctree_set_indent(GTK_CTREE(ctree), CTREE_INDENT);
+       gtk_clist_set_compare_func(GTK_CLIST(ctree), folderview_clist_compare);
 
        /* don't let title buttons take key focus */
        for (i = 0; i < N_FOLDER_COLS; i++)
@@ -393,6 +438,11 @@ FolderView *folderview_create(void)
                           folderview);
        gtk_signal_connect(GTK_OBJECT(ctree), "tree_select_row",
                           GTK_SIGNAL_FUNC(folderview_selected), folderview);
+       gtk_signal_connect(GTK_OBJECT(ctree), "start_drag",
+                          GTK_SIGNAL_FUNC(folderview_start_drag), folderview);
+       gtk_signal_connect(GTK_OBJECT(ctree), "drag_data_get",
+                          GTK_SIGNAL_FUNC(folderview_drag_data_get),
+                          folderview);
 
        gtk_signal_connect_after(GTK_OBJECT(ctree), "tree_expand",
                                 GTK_SIGNAL_FUNC(folderview_tree_expanded),
@@ -444,6 +494,9 @@ FolderView *folderview_create(void)
        folderview->mbox_popup   = mbox_popup;
        folderview->mbox_factory = mbox_factory;
 
+       folderview->folder_item_update_callback_id =
+               folder_item_update_callback_register(folderview_update_item, (gpointer) folderview);
+
        gtk_widget_show_all(scrolledwin);
 
        folderview_list = g_list_append(folderview_list, folderview);
@@ -459,22 +512,26 @@ void folderview_init(FolderView *folderview)
        GtkWidget *hbox_new;
        GtkWidget *hbox_unread;
 
-       stock_pixmap_gdk(ctree, STOCK_PIXMAP_INBOX, &inboxxpm, &inboxxpmmask);
-       stock_pixmap_gdk(ctree, STOCK_PIXMAP_OUTBOX,
-                        &outboxxpm, &outboxxpmmask);
-       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DIR_CLOSE,
-                        &folderxpm, &folderxpmmask);
-       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DIR_OPEN,
-                        &folderopenxpm, &folderopenxpmmask);
-       stock_pixmap_gdk(ctree, STOCK_PIXMAP_TRASH, &trashxpm, &trashxpmmask);
-       stock_pixmap_gdk(ctree, STOCK_PIXMAP_INBOX_HRM, 
-                        &inboxhrmxpm, &inboxhrmxpmmask);
-       stock_pixmap_gdk(ctree, STOCK_PIXMAP_OUTBOX_HRM, 
-                        &outboxhrmxpm, &outboxhrmxpmmask);
-       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DIR_OPEN_HRM, 
-                        &folderopenhrmxpm, &folderopenhrmxpmmask);
-       stock_pixmap_gdk(ctree, STOCK_PIXMAP_TRASH_HRM, 
-                        &trashhrmxpm, &trashhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_INBOX_CLOSE, &inboxxpm, &inboxxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_INBOX_CLOSE_HRM, &inboxhrmxpm, &inboxhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_INBOX_OPEN, &inboxopenxpm, &inboxopenxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_INBOX_OPEN_HRM, &inboxopenhrmxpm, &inboxopenhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_OUTBOX_CLOSE, &outboxxpm, &outboxxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_OUTBOX_CLOSE_HRM, &outboxhrmxpm, &outboxhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_OUTBOX_OPEN, &outboxopenxpm, &outboxopenxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_OUTBOX_OPEN_HRM, &outboxopenhrmxpm, &outboxopenhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DIR_CLOSE, &folderxpm, &folderxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DIR_CLOSE_HRM, &folderhrmxpm, &folderhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DIR_OPEN, &folderopenxpm, &folderopenxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DIR_OPEN_HRM, &folderopenhrmxpm, &folderopenhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_TRASH_OPEN, &trashopenxpm, &trashopenxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_TRASH_OPEN_HRM, &trashopenhrmxpm, &trashopenhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_TRASH_CLOSE, &trashxpm, &trashxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_TRASH_CLOSE_HRM, &trashhrmxpm, &trashhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_QUEUE_CLOSE, &queuexpm, &queuexpmmask);
+       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);
 
        /* CLAWS: titles for "New" and "Unread" show new & unread pixmaps
         * instead text (text overflows making them unreadable and ugly) */
@@ -502,9 +559,9 @@ void folderview_init(FolderView *folderview)
 
 
        if (!normalfont)
-               normalfont = gdk_fontset_load(NORMAL_FONT);
+               normalfont = gtkut_font_load(NORMAL_FONT);
        if (!boldfont)
-               boldfont = gdk_fontset_load(BOLD_FONT);
+               boldfont = gtkut_font_load(BOLD_FONT);
 
        if (!bold_style) {
                bold_style = gtk_style_copy(gtk_widget_get_style(ctree));
@@ -528,7 +585,7 @@ void folderview_set(FolderView *folderview)
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        MainWindow *mainwin = folderview->mainwin;
 
-       debug_print(_("Setting folder info...\n"));
+       debug_print("Setting folder info...\n");
        STATUSBAR_PUSH(mainwin, _("Setting folder info..."));
 
        main_window_cursor_wait(mainwin);
@@ -571,6 +628,13 @@ void folderview_select(FolderView *folderview, FolderItem *item)
                folder_update_op_count();
 }
 
+static void mark_all_read_cb(FolderView *folderview, guint action,
+                             GtkWidget *widget)
+{
+       if (folderview->selected)
+               summary_mark_all_read(folderview->summaryview);
+}
+
 static void folderview_select_node(FolderView *folderview, GtkCTreeNode *node)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
@@ -635,18 +699,26 @@ void folderview_select_next_unread(FolderView *folderview)
                folderview_select_node(folderview, node);
 }
 
-void folderview_update_msg_num(FolderView *folderview, GtkCTreeNode *row,
-                              gint new, gint unread, gint total)
+void folderview_update_msg_num(FolderView *folderview, GtkCTreeNode *row)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        static GtkCTreeNode *prev_row = NULL;
        FolderItem *item;
+       gint new, unread, total;
+       gchar *new_str, *unread_str, *total_str;
 
        if (!row) return;
 
        item = gtk_ctree_node_get_row_data(ctree, row);
        if (!item) return;
 
+       gtk_ctree_node_get_text(ctree, row, COL_NEW, &new_str);
+       gtk_ctree_node_get_text(ctree, row, COL_UNREAD, &unread_str);
+       gtk_ctree_node_get_text(ctree, row, COL_TOTAL, &total_str);
+       new = atoi(new_str);
+       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
@@ -656,16 +728,12 @@ void folderview_update_msg_num(FolderView *folderview, GtkCTreeNode *row,
        if (prev_row     == row    &&
            item->new    == new    &&
            item->unread == unread &&
-           item->total  == total) 
+           item->total  == total)
                return;
 #endif         
 
        prev_row = row;
 
-       item->new    = new;
-       item->unread = unread;
-       item->total  = total;
-
        folderview_update_node(folderview, row);
 }
 
@@ -735,7 +803,7 @@ static GtkWidget *label_window_create(const gchar *str)
        return window;
 }
 
-void folderview_update_tree(Folder *folder)
+void folderview_rescan_tree(Folder *folder)
 {
        GtkWidget *window;
 
@@ -744,20 +812,22 @@ void folderview_update_tree(Folder *folder)
        if (!folder->scan_tree) return;
 
        inc_lock();
-       window = label_window_create(_("Rescanning folder tree..."));
+       window = label_window_create(_("Rebuilding folder tree..."));
 
        folder_set_ui_func(folder, folderview_scan_tree_func, NULL);
-       folder->scan_tree(folder);
+       folder_scan_tree(folder);
        folder_set_ui_func(folder, NULL, NULL);
 
-       folder_write_list();
        folderview_set_all();
 
+       folderview_check_new(folder);
+       
        gtk_widget_destroy(window);
        inc_unlock();
 }
 
-void folderview_update_all(void)
+#if 0
+void folderview_rescan_all(void)
 {
        GList *list;
        GtkWidget *window;
@@ -771,17 +841,26 @@ void folderview_update_all(void)
 
                if (!folder->scan_tree) continue;
                folder_set_ui_func(folder, folderview_scan_tree_func, NULL);
-               folder->scan_tree(folder);
+               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_update_all_node(void)
+void folderview_check_new(Folder *folder)
 {
        GList *list;
        FolderItem *item;
@@ -800,11 +879,16 @@ void folderview_update_all_node(void)
                for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
                     node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
                        item = gtk_ctree_node_get_row_data(ctree, node);
-                       if (!item || !FOLDER_IS_LOCAL(item->folder) ||
-                           !item->path)
-                               continue;
+                       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;
+
                        folderview_scan_tree_func(item->folder, item, NULL);
-                       folder_item_scan(item);
+                       if (folder_item_scan(item) < 0) {
+                               if (folder && !FOLDER_IS_LOCAL(folder))
+                                       break;
+                       }
                        folderview_update_node(folderview, node);
                }
 
@@ -816,6 +900,34 @@ void folderview_update_all_node(void)
        folder_write_list();
 }
 
+void folderview_check_new_all(void)
+{
+       GList *list;
+       GtkWidget *window;
+       FolderView *folderview;
+
+       folderview = (FolderView *)folderview_list->data;
+
+       inc_lock();
+       main_window_lock(folderview->mainwin);
+       window = label_window_create
+               (_("Checking for new messages in all folders..."));
+
+       list = folder_get_list();
+       for (; list != NULL; list = list->next) {
+               Folder *folder = list->data;
+
+               folderview_check_new(folder);
+       }
+
+       folder_write_list();
+       folderview_set_all();
+
+       gtk_widget_destroy(window);
+       main_window_unlock(folderview->mainwin);
+       inc_unlock();
+}
+
 static gboolean folderview_search_new_recursive(GtkCTree *ctree,
                                                GtkCTreeNode *node)
 {
@@ -912,6 +1024,7 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        GtkStyle *style = NULL;
+       GtkStyle *color_style = NULL;
        FolderItem *item;
        GdkPixmap *xpm, *openxpm;
        GdkBitmap *mask, *openmask;
@@ -925,52 +1038,68 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
 
        switch (item->stype) {
        case F_INBOX:
-               xpm = inboxxpm;
-               mask = inboxxpmmask;
                if (item->hide_read_msgs) {
-                       openxpm = inboxhrmxpm;
-                       openmask = inboxhrmxpmmask;
+                       xpm = inboxhrmxpm;
+                       mask = inboxhrmxpmmask;
+                       openxpm = inboxopenhrmxpm;
+                       openmask = inboxopenhrmxpmmask;
                } else {
-                       openxpm = inboxxpm;
-                       openmask = inboxxpmmask;
+                       xpm = inboxxpm;
+                       mask = inboxxpmmask;
+                       openxpm = inboxopenxpm;
+                       openmask = inboxopenxpmmask;
                }
-               name = g_strdup(_("Inbox"));
+               name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
+                               !strcmp2(item->name, INBOX_DIR) ? _("Inbox") :
+                               item->name);
                break;
        case F_OUTBOX:
-               xpm = outboxxpm;
-               mask =outboxxpmmask;
                if (item->hide_read_msgs) {
-                       openxpm = outboxhrmxpm;
-                       openmask = outboxhrmxpmmask;
+                       xpm = outboxhrmxpm;
+                       mask = outboxhrmxpmmask;
+                       openxpm = outboxopenhrmxpm;
+                       openmask = outboxopenhrmxpmmask;
                } else {
-                       openxpm = outboxxpm;
-                       openmask = outboxxpmmask;
+                       xpm = outboxxpm;
+                       mask = outboxxpmmask;
+                       openxpm = outboxopenxpm;
+                       openmask = outboxopenxpmmask;
                }
-               name = g_strdup(_("Outbox"));
+               name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
+                               !strcmp2(item->name, OUTBOX_DIR) ? _("Sent") :
+                               item->name);
                break;
        case F_QUEUE:
-               xpm = outboxxpm;
-               mask =outboxxpmmask;
                if (item->hide_read_msgs) {
-                       openxpm = outboxhrmxpm;
-                       openmask = outboxhrmxpmmask;
+                       xpm = queuehrmxpm;
+                       mask = queuehrmxpmmask;
+                       openxpm = queueopenhrmxpm;
+                       openmask = queueopenhrmxpmmask;
                } else {
-                       openxpm = outboxxpm;
-                       openmask = outboxxpmmask;
+                       xpm = queuexpm;
+                       mask = queuexpmmask;
+                       openxpm = queueopenxpm;
+                       openmask = queueopenxpmmask;
                }
-               name = g_strdup(_("Queue"));
+               name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
+                               !strcmp2(item->name, QUEUE_DIR) ? _("Queue") :
+                               item->name);
                break;
        case F_TRASH:
-               xpm = trashxpm;
-               mask = trashxpmmask;
                if (item->hide_read_msgs) {
-                       openxpm = trashhrmxpm;
-                       openmask = trashhrmxpmmask;
+                       xpm = trashhrmxpm;
+                       mask = trashhrmxpmmask;
+                       openxpm = trashopenhrmxpm;
+                       openmask = trashopenhrmxpmmask;
                } else {
-                       openxpm = trashxpm;
-                       openmask = trashxpmmask;
+                       xpm = trashxpm;
+                       mask = trashxpmmask;
+                       openxpm = trashopenxpm;
+                       openmask = trashopenxpmmask;
                }
-               name = g_strdup(_("Trash"));
+               name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
+                               !strcmp2(item->name, TRASH_DIR) ? _("Trash") :
+                               item->name);
                break;
        case F_DRAFT:
                xpm = folderxpm;
@@ -982,15 +1111,19 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                        openxpm = folderopenxpm;
                        openmask = folderopenxpmmask;
                }
-               name = g_strdup(_("Draft"));
+               name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
+                               !strcmp2(item->name, DRAFT_DIR) ? _("Drafts") :
+                               item->name);
                break;
        default:
-               xpm = folderxpm;
-               mask = folderxpmmask;
                if (item->hide_read_msgs) {
+                       xpm = folderhrmxpm;
+                       mask = folderhrmxpmmask;
                        openxpm = folderopenhrmxpm;
                        openmask = folderopenhrmxpmmask;
                } else {
+                       xpm = folderxpm;
+                       mask = folderxpmmask;
                        openxpm = folderopenxpm;
                        openmask = folderopenxpmmask;
                }
@@ -1008,8 +1141,15 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                                name = "";
                        }
                        name = g_strconcat(item->name, name, NULL);
-               } else
-                       name = g_strdup(item->name);
+               } 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);
+               }
        }
 
        if (!GTK_CTREE_ROW(node)->expanded &&
@@ -1030,18 +1170,24 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                 prefs_common.display_folder_unread) {
 
                if (item->unread > 0)
-                       str = g_strdup_printf("%s (%d%s)", name, item->unread,
-                                             add_unread_mark ? "+" : "");
+                       str = g_strdup_printf("%s (%d%s%s)", name, item->unread,
+                                             add_unread_mark ? "+" : "", 
+                                             item->unreadmarked > 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 > 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) {
@@ -1054,9 +1200,10 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                gtk_ctree_node_set_text(ctree, node, COL_TOTAL,  itos(item->total));
        }
 
-       if (item->stype == F_TRASH)
+       if (item->stype == F_OUTBOX || item->stype == F_DRAFT ||
+           item->stype == F_TRASH) {
                use_bold = use_color = FALSE;
-       if (item->stype == F_QUEUE) {
+       } else if (item->stype == F_QUEUE) {
                /* highlight queue folder if there are any messages */
                use_bold = use_color = (item->total > 0);
        } else {
@@ -1066,70 +1213,62 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                use_color =
                        (item->new > 0) ||
                        (add_unread_mark &&
-                        folderview_have_new_children(folderview, node));
+                        folderview_have_new_children(folderview, node));       
        }
 
        gtk_ctree_node_set_foreground(ctree, node, NULL);
 
-       if (use_bold && use_color)
+       if (use_bold && use_color) {
                style = bold_color_style;
-       else if (use_bold) {
+       else if (use_bold) {
                style = bold_style;
                if (item->op_count > 0) {
                        style = bold_tgtfold_style;
                }
-       }
-       else if (use_color) {
+       } else if (use_color) {
                style = normal_color_style;
                gtk_ctree_node_set_foreground(ctree, node,
                                              &folderview->color_new);
-       }
-       else if (item->op_count > 0) {
+       } else if (item->op_count > 0) {
                style = bold_tgtfold_style;
+       } else if (item->prefs->color > 0) {
+               GdkColor gdk_color;
+
+               gtkut_convert_int_to_gdk_color(item->prefs->color, &gdk_color);
+               color_style = gtk_style_copy(normal_style);
+               color_style->fg[GTK_STATE_NORMAL] = gdk_color;
+               style = color_style;
        } else {
                style = normal_style;
        }
 
        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)
+void folderview_update_item(FolderItem *item, gboolean update_summary, gpointer data)
 {
-       GList *list;
-       FolderView *folderview;
+       FolderView *folderview = (FolderView *)data;
        GtkCTree *ctree;
        GtkCTreeNode *node;
 
+       g_return_if_fail(folderview != NULL);
        g_return_if_fail(item != NULL);
 
-       for (list = folderview_list; list != NULL; list = list->next) {
-               folderview = (FolderView *)list->data;
-               ctree = GTK_CTREE(folderview->ctree);
+       ctree = GTK_CTREE(folderview->ctree);
 
-               node = gtk_ctree_find_by_row_data(ctree, NULL, item);
-               if (node) {
-                       folderview_update_node(folderview, node);
-                       if (update_summary && folderview->opened == node)
-                               summary_show(folderview->summaryview,
-                                            item, FALSE);
-               }
+       node = gtk_ctree_find_by_row_data(ctree, NULL, item);
+       if (node) {
+               folderview_update_node(folderview, node);
+               if (update_summary && folderview->opened == node)
+                       summary_show(folderview->summaryview, item);
        }
 }
 
-static void folderview_update_item_foreach_func(gpointer key, gpointer val,
-                                               gpointer data)
-{
-       folderview_update_item((FolderItem *)key, FALSE);
-}
-
-void folderview_update_item_foreach(GHashTable *table)
-{
-       g_hash_table_foreach(table, folderview_update_item_foreach_func, NULL);
-}
-
 static gboolean folderview_gnode_func(GtkCTree *ctree, guint depth,
                                      GNode *gnode, GtkCTreeNode *cnode,
                                      gpointer data)
@@ -1165,18 +1304,19 @@ static void folderview_expand_func(GtkCTree *ctree, GtkCTreeNode *node,
 #define SET_SPECIAL_FOLDER(ctree, item) \
 { \
        if (item) { \
-               GtkCTreeNode *node, *sibling; \
+               GtkCTreeNode *node, *parent, *sibling; \
  \
                node = gtk_ctree_find_by_row_data(ctree, root, item); \
                if (!node) \
                        g_warning("%s not found.\n", item->path); \
                else { \
-                       if (!prev) \
-                               sibling = GTK_CTREE_ROW(root)->children; \
-                       else \
+                       parent = GTK_CTREE_ROW(node)->parent; \
+                       if (prev && parent == GTK_CTREE_ROW(prev)->parent) \
                                sibling = GTK_CTREE_ROW(prev)->sibling; \
+                       else \
+                               sibling = GTK_CTREE_ROW(parent)->children; \
                        if (node != sibling) \
-                               gtk_ctree_move(ctree, node, root, sibling); \
+                               gtk_ctree_move(ctree, node, parent, sibling); \
                } \
  \
                prev = node; \
@@ -1189,7 +1329,7 @@ static void folderview_sort_folders(FolderView *folderview, GtkCTreeNode *root,
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        GtkCTreeNode *prev = NULL;
 
-       gtk_ctree_sort_recursive(ctree, root);
+       gtk_sctree_sort_recursive(ctree, root);
 
        if (GTK_CTREE_ROW(root)->parent) return;
 
@@ -1260,9 +1400,9 @@ void folderview_rename_folder(FolderView *folderview)
                folderview_rename_mbox_folder_cb(folderview, 0, NULL);
        case F_MH:
        case F_MAILDIR:
+       case F_IMAP:
                folderview_rename_folder_cb(folderview, 0, NULL);
                break;
-       case F_IMAP:
        case F_NEWS:
        default:
                break;
@@ -1286,10 +1426,9 @@ void folderview_delete_folder(FolderView *folderview)
        case F_MH:
        case F_MBOX:
        case F_MAILDIR:
+       case F_IMAP:
                folderview_delete_folder_cb(folderview, 0, NULL);
                break;
-       case F_IMAP:
-               folderview_rm_imap_folder_cb(folderview, 0, NULL);
        case F_NEWS:
        default:
                break;
@@ -1307,16 +1446,17 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
        FolderItem *item;
        Folder *folder;
        GtkWidget *popup;
+       gboolean mark_all_read   = FALSE;
        gboolean new_folder      = FALSE;
        gboolean rename_folder   = FALSE;
        gboolean delete_folder   = FALSE;
        gboolean update_tree     = FALSE;
        gboolean rescan_tree     = FALSE;
        gboolean remove_tree     = FALSE;
+       gboolean search_folder   = FALSE;
        gboolean folder_property = FALSE;
        gboolean folder_processing  = FALSE;
        gboolean folder_scoring  = FALSE;
-       gboolean search_folder = FALSE;
 
        if (!event) return;
 
@@ -1360,17 +1500,20 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
 
        if (folderview->mainwin->lock_count == 0) {
                new_folder = TRUE;
-               if (item->parent == NULL)
+               if (item->parent == NULL) {
                        update_tree = remove_tree = TRUE;
-               else
-                       search_folder = TRUE;
+                       if (folder->account)
+                               folder_property = TRUE;
+               } else
+                       mark_all_read = search_folder = folder_property = TRUE;
+                       
                if (FOLDER_IS_LOCAL(folder) || FOLDER_TYPE(folder) == F_IMAP || FOLDER_TYPE(folder) == F_MBOX) {
                        if (item->parent == NULL)
                                update_tree = rescan_tree = TRUE;
                        else if (item->stype == F_NORMAL)
-                               rename_folder = delete_folder = folder_property = folder_scoring = folder_processing = TRUE;
+                               rename_folder = delete_folder = folder_scoring = folder_processing = TRUE;
                        else if (item->stype == F_INBOX)
-                               folder_property = folder_scoring = folder_processing = TRUE;
+                               folder_scoring = folder_processing = TRUE;
                        else if (item->stype == F_TRASH)
                                folder_processing = TRUE;
                        else if (item->stype == F_OUTBOX)
@@ -1379,39 +1522,48 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
                        if (item->parent != NULL)
                                delete_folder = folder_scoring = folder_processing = TRUE;
                }
+               if (item->unread < 1) 
+                       mark_all_read = FALSE;
        }
 
 #define SET_SENS(factory, name, sens) \
        menu_set_sensitive(folderview->factory, name, sens)
+       
+       mark_all_read = mark_all_read && 
+                       (item == folderview->summaryview->folder_item);
 
        if (FOLDER_IS_LOCAL(folder)) {
                popup = folderview->mail_popup;
                menu_set_insensitive_all(GTK_MENU_SHELL(popup));
+               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, "/Delete folder", delete_folder);
                SET_SENS(mail_factory, "/Check for new messages", update_tree);
-               SET_SENS(mail_factory, "/Rescan folder tree", rescan_tree);
+               SET_SENS(mail_factory, "/Rebuild folder tree", rescan_tree);
                SET_SENS(mail_factory, "/Remove mailbox", remove_tree);
-               SET_SENS(mail_factory, "/Property...", folder_property);
+               SET_SENS(mail_factory, "/Search folder...", search_folder);
+               SET_SENS(mail_factory, "/Properties...", folder_property);
                SET_SENS(mail_factory, "/Processing...", folder_processing);
                SET_SENS(mail_factory, "/Scoring...", folder_scoring);
-               SET_SENS(mail_factory, "/Search folder...", search_folder);
        } else if (FOLDER_TYPE(folder) == F_IMAP) {
                popup = folderview->imap_popup;
                menu_set_insensitive_all(GTK_MENU_SHELL(popup));
+               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, "/Delete folder", delete_folder);
                SET_SENS(imap_factory, "/Check for new messages", update_tree);
-               SET_SENS(imap_factory, "/Rescan folder tree", rescan_tree);
+               SET_SENS(imap_factory, "/Rebuild folder tree", rescan_tree);
                SET_SENS(imap_factory, "/Remove IMAP4 account", remove_tree);
+               SET_SENS(imap_factory, "/Search folder...", search_folder);
+               SET_SENS(imap_factory, "/Properties...", folder_property);
                SET_SENS(imap_factory, "/Processing...", folder_processing);
                SET_SENS(imap_factory, "/Scoring...", folder_scoring);
-               SET_SENS(imap_factory, "/Search folder...", search_folder);
        } else if (FOLDER_TYPE(folder) == F_NEWS) {
                popup = folderview->news_popup;
                menu_set_insensitive_all(GTK_MENU_SHELL(popup));
+               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
@@ -1419,6 +1571,7 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
 #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);
                SET_SENS(news_factory, "/Processing...", folder_processing);
                SET_SENS(news_factory, "/Scoring...", folder_scoring);
        } else if (FOLDER_TYPE(folder) == F_MBOX) {
@@ -1427,6 +1580,7 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
                SET_SENS(mbox_factory, "/Create new folder...", new_folder);
                SET_SENS(mbox_factory, "/Rename folder...", rename_folder);
                SET_SENS(mbox_factory, "/Delete folder", delete_folder);
+               SET_SENS(news_factory, "/Properties...", folder_property);
                SET_SENS(mbox_factory, "/Processing...", folder_processing);
                SET_SENS(mbox_factory, "/Scoring...", folder_scoring);
        } else
@@ -1451,9 +1605,6 @@ static void folderview_button_released(GtkWidget *ctree, GdkEventButton *event,
        }
 }
 
-#define BREAK_ON_MODIFIER_KEY() \
-       if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0) break
-
 static void folderview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                   FolderView *folderview)
 {
@@ -1476,18 +1627,8 @@ static void folderview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                                       folderview->selected);
                }
                break;
-       case GDK_v:
-       case GDK_V:
-       case GDK_g:
-       case GDK_G:
-       case GDK_x:
-       case GDK_X:
-       case GDK_w:
-       case GDK_D:
-       case GDK_Q:
-               BREAK_ON_MODIFIER_KEY();
-               summary_pass_key_press_event(folderview->summaryview, event);
        default:
+               break;
        }
 }
 
@@ -1497,6 +1638,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
        static gboolean can_select = TRUE;      /* exclusive lock */
        gboolean opened;
        FolderItem *item;
+       gchar *buf;
 
        folderview->selected = row;
 
@@ -1505,7 +1647,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                return;
        }
 
-       if (!can_select) {
+       if (!can_select || summary_is_locked(folderview->summaryview)) {
                gtkut_ctree_set_focus_row(ctree, folderview->opened);
                gtk_ctree_select(ctree, folderview->opened);
                return;
@@ -1518,16 +1660,29 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
 
        can_select = FALSE;
 
+       /* Save cache for old folder */
+       /* We don't want to lose all caches if sylpheed crashed */
+       if (folderview->opened) {
+               FolderItem *olditem;
+               
+               olditem = gtk_ctree_node_get_row_data(ctree, folderview->opened);
+               if (olditem) {
+                       /* will be null if we just moved the previously opened folder */
+                       summary_save_prefs_to_folderitem(folderview->summaryview, olditem);
+                       folder_item_close(olditem);
+               }
+       }
+
        /* CLAWS: set compose button type: news folder items 
         * always have a news folder as parent */
        if (item->folder) 
-               main_window_toolbar_set_compose_button
-                       (folderview->mainwin,
+               toolbar_set_compose_button
+                       (folderview->mainwin->toolbar,
                         item->folder->type == F_NEWS ? 
                         COMPOSEBUTTON_NEWS : COMPOSEBUTTON_MAIL);
-        
+
        if (item->path)
-               debug_print(_("Folder %s is selected\n"), item->path);
+               debug_print("Folder %s is selected\n", item->path);
 
        if (!GTK_CTREE_ROW(row)->children)
                gtk_ctree_expand(ctree, row);
@@ -1542,13 +1697,42 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                        gdk_pointer_ungrab(GDK_CURRENT_TIME);
        }
 
-       opened = summary_show(folderview->summaryview, item, FALSE);
+       /* Open Folder */
+       buf = g_strdup_printf(_("Opening Folder %s..."), item->path);
+       debug_print("%s\n", buf);
+       STATUSBAR_PUSH(folderview->mainwin, buf);
+       g_free(buf);
+
+       main_window_cursor_wait(folderview->mainwin);
+
+       if (folder_item_open(item) != 0) {
+               main_window_cursor_normal(folderview->mainwin);
+               STATUSBAR_POP(folderview->mainwin);
+
+               alertpanel_error(_("Folder could not be opened."));
+
+               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();
 
        if (!opened) {
                gtkut_ctree_set_focus_row(ctree, folderview->opened);
                gtk_ctree_select(ctree, folderview->opened);
-       } else
+       } else {
                folderview->opened = row;
+               if (gtk_ctree_node_is_visible(ctree, row)
+                   != GTK_VISIBILITY_FULL)
+                       gtk_ctree_node_moveto(ctree, row, -1, 0.5, 0);
+       }
+
+       STATUSBAR_POP(folderview->mainwin);
 
        folderview->open_folder = FALSE;
        can_select = TRUE;
@@ -1603,6 +1787,7 @@ static void folderview_col_resized(GtkCList *clist, gint column, gint width,
                prefs_common.folder_col_total = width;
                break;
        default:
+               break;
        }
 }
 
@@ -1637,27 +1822,75 @@ static void folderview_update_tree_cb(FolderView *folderview, guint action,
 
        if (!folderview->selected) return;
 
-       summary_show(folderview->summaryview, NULL, FALSE);
+       summary_show(folderview->summaryview, NULL);
 
        item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
 
        if (action == 0)
-               folderview_update_all_node();
+               folderview_check_new(item->folder);
        else
-               folderview_update_tree(item->folder);
+               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)
+{
+       GNode *srcnode;
+
+       folderview_create_folder_node(folderview, item);
+       
+       srcnode = item->folder->node;   
+       srcnode = g_node_find(srcnode, G_PRE_ORDER, G_TRAVERSE_ALL, item);
+       srcnode = srcnode->children;
+       while (srcnode != NULL) {
+               if (srcnode && srcnode->data) {
+                       FolderItem *next_item = (FolderItem*) srcnode->data;
+                       folderview_create_folder_node_recursive(folderview, next_item);
+               }
+               srcnode = srcnode->next;
+       }
+}
+
+void folderview_create_folder_node(FolderView *folderview, FolderItem *item)
+{
+       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       gchar *text[N_FOLDER_COLS] = {NULL, "0", "0", "0"};
+       GtkCTreeNode *node, *parent_node;
+       
+       parent_node = gtk_ctree_find_by_row_data(ctree, NULL, item->parent);
+
+       gtk_clist_freeze(GTK_CLIST(ctree));
+
+       text[COL_FOLDER] = item->name;
+       node = gtk_ctree_insert_node(ctree, parent_node, NULL, text,
+                                    FOLDER_SPACING,
+                                    folderxpm, folderxpmmask,
+                                    folderopenxpm, folderopenxpmmask,
+                                    FALSE, FALSE);
+       gtk_ctree_expand(ctree, parent_node);
+       gtk_ctree_node_set_row_data(ctree, node, item);
+       if (normal_style)
+               gtk_ctree_node_set_row_style(ctree, node, normal_style);
+       folderview_sort_folders(folderview, folderview->selected, item->folder);
+
+       gtk_clist_thaw(GTK_CLIST(ctree));
 }
 
 static void folderview_new_folder_cb(FolderView *folderview, guint action,
                                     GtkWidget *widget)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       gchar *text[N_FOLDER_COLS] = {NULL, "0", "0", "0"};
        FolderItem *item;
        FolderItem *new_item;
        gchar *new_folder;
-       GtkCTreeNode *node;
+       gchar *name, *name_;
 
        if (!folderview->selected) return;
 
@@ -1679,36 +1912,26 @@ static void folderview_new_folder_cb(FolderView *folderview, guint action,
                }
        }
 
+       name_ = trim_string(new_folder, 32);
+       Xstrdup_a(name, name_, {g_free(new_folder); return;});
+       g_free(name_);
+
        /* find whether the directory already exists */
        if (folderview_find_by_name(ctree, folderview->selected, new_folder)) {
-               alertpanel_error(_("The folder `%s' already exists."),
-                                new_folder);
+               alertpanel_error(_("The folder `%s' already exists."), name);
                g_free(new_folder);
                return;
        }
 
-       new_item = item->folder->create_folder(item->folder, item, new_folder);
+       new_item = folder_create_folder(item, new_folder);
        if (!new_item) {
-               alertpanel_error(_("The folder `%s' could not be created."), 
-                                new_folder);
+               alertpanel_error(_("Can't create the folder `%s'."), name);
                g_free(new_folder);
                return;
        } 
        g_free(new_folder);
 
-       gtk_clist_freeze(GTK_CLIST(ctree));
-
-       text[COL_FOLDER] = new_item->name;
-       node = gtk_ctree_insert_node(ctree, folderview->selected, NULL, text,
-                                    FOLDER_SPACING,
-                                    folderxpm, folderxpmmask,
-                                    folderopenxpm, folderopenxpmmask,
-                                    FALSE, FALSE);
-       gtk_ctree_expand(ctree, folderview->selected);
-       gtk_ctree_node_set_row_data(ctree, node, new_item);
-       folderview_sort_folders(folderview, folderview->selected, item->folder);
-
-       gtk_clist_thaw(GTK_CLIST(ctree));
+       folderview_create_folder_node(folderview, new_item);
 
        folder_write_list();
 }
@@ -1717,11 +1940,9 @@ static void folderview_new_mbox_folder_cb(FolderView *folderview, guint action,
                                          GtkWidget *widget)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       gchar *text[N_FOLDER_COLS] = {NULL, "0", "0", "0"};
        FolderItem *item;
        FolderItem *new_item;
        gchar *new_folder;
-       GtkCTreeNode *node;
 
        if (!folderview->selected) return;
 
@@ -1742,23 +1963,11 @@ static void folderview_new_mbox_folder_cb(FolderView *folderview, guint action,
                return;
        }
 
-       new_item = item->folder->create_folder(item->folder, item, new_folder);
+       new_item = folder_create_folder(item, new_folder);
        g_free(new_folder);
        if (!new_item) return;
 
-       gtk_clist_freeze(GTK_CLIST(ctree));
-
-       text[COL_FOLDER] = new_item->name;
-       node = gtk_ctree_insert_node(ctree, folderview->selected, NULL, text,
-                                    FOLDER_SPACING,
-                                    folderxpm, folderxpmmask,
-                                    folderopenxpm, folderopenxpmmask,
-                                    FALSE, FALSE);
-       gtk_ctree_expand(ctree, folderview->selected);
-       gtk_ctree_node_set_row_data(ctree, node, new_item);
-       folderview_sort_folders(folderview, folderview->selected, item->folder);
-
-       gtk_clist_thaw(GTK_CLIST(ctree));
+       folderview_create_folder_node(folderview, new_item);
 
        folder_write_list();
 }
@@ -1769,7 +1978,11 @@ static void folderview_rename_folder_cb(FolderView *folderview, guint action,
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        FolderItem *item;
        gchar *new_folder;
+       gchar *name, *name_;
        gchar *message;
+       gchar *old_path;
+       gchar *old_id;
+       gchar *new_id;
 
        if (!folderview->selected) return;
 
@@ -1778,8 +1991,10 @@ static void folderview_rename_folder_cb(FolderView *folderview, guint action,
        g_return_if_fail(item->path != NULL);
        g_return_if_fail(item->folder != NULL);
 
-       message = g_strdup_printf(_("Input new name for `%s':"),
-                                 g_basename(item->path));
+       name_ = trim_string(item->name, 32);
+       Xstrdup_a(name, name_, return);
+       g_free(name_);
+       message = g_strdup_printf(_("Input new name for `%s':"), name);
        new_folder = input_dialog(_("Rename folder"), message,
                                  g_basename(item->path));
        g_free(message);
@@ -1795,28 +2010,44 @@ static void folderview_rename_folder_cb(FolderView *folderview, guint action,
        if (folderview_find_by_name
                (ctree, GTK_CTREE_ROW(folderview->selected)->parent,
                 new_folder)) {
-               alertpanel_error(_("The folder `%s' already exists."),
-                                new_folder);
+               name = trim_string(new_folder, 32);
+               alertpanel_error(_("The folder `%s' already exists."), name);
+               g_free(name);
                g_free(new_folder);
                return;
        }
 
+       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) {
+               g_free(old_id);
                g_free(new_folder);
                return;
        }
        g_free(new_folder);
 
+       /* if (FOLDER_TYPE(item->folder) == F_MH)
+               prefs_filtering_rename_path(old_path, item->path); */
+       new_id = folder_item_get_identifier(item);
+       prefs_filtering_rename_path(old_id, new_id);
+
+       g_free(old_id);
+       g_free(new_id);
+
        gtk_clist_freeze(GTK_CLIST(ctree));
 
        folderview_update_node(folderview, folderview->selected);
        folderview_sort_folders(folderview,
                                GTK_CTREE_ROW(folderview->selected)->parent,
                                item->folder);
-       if (folderview->opened == folderview->selected) {
-               if (!GTK_CTREE_ROW(folderview->opened)->children)
-                       gtk_ctree_expand(ctree, folderview->opened);
-               summary_show(folderview->summaryview, item, FALSE);
+       if (folderview->opened == folderview->selected ||
+           gtk_ctree_is_ancestor(ctree,
+                                 folderview->selected,
+                                 folderview->opened)) {
+               GtkCTreeNode *node = folderview->opened;
+               folderview_unselect(folderview);
+               folderview_select_node(folderview, node);
        }
 
        gtk_clist_thaw(GTK_CLIST(ctree));
@@ -1871,7 +2102,7 @@ static void folderview_rename_mbox_folder_cb(FolderView *folderview,
        if (folderview->opened == folderview->selected) {
                if (!GTK_CTREE_ROW(folderview->opened)->children)
                        gtk_ctree_expand(ctree, folderview->opened);
-               summary_show(folderview->summaryview, item, FALSE);
+               summary_show(folderview->summaryview, item);
        }
 
        gtk_clist_thaw(GTK_CLIST(ctree));
@@ -1884,8 +2115,10 @@ static void folderview_delete_folder_cb(FolderView *folderview, guint action,
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        FolderItem *item;
-       gchar *message;
+       gchar *message, *name, *name_;
        AlertValue avalue;
+       gchar *old_path;
+       gchar *old_id;
 
        if (!folderview->selected) return;
 
@@ -1894,21 +2127,32 @@ static void folderview_delete_folder_cb(FolderView *folderview, guint action,
        g_return_if_fail(item->path != NULL);
        g_return_if_fail(item->folder != NULL);
 
+       name_ = trim_string(item->name, 32);
+       Xstrdup_a(name, name_, return);
+       g_free(name_);
        message = g_strdup_printf
                (_("All folder(s) and message(s) under `%s' will be deleted.\n"
-                  "Do you really want to delete?"),
-                g_basename(item->path));
+                  "Do you really want to delete?"), name);
        avalue = alertpanel(_("Delete folder"), message,
                            _("Yes"), _("+No"), NULL);
        g_free(message);
        if (avalue != G_ALERTDEFAULT) return;
 
+       Xstrdup_a(old_path, item->path, return);
+       old_id = folder_item_get_identifier(item);
+
        if (item->folder->remove_folder(item->folder, item) < 0) {
-               alertpanel_error(_("Can't remove the folder `%s'."),
-                                item->path);
+               alertpanel_error(_("Can't remove the folder `%s'."), name);
+               if (folderview->opened == folderview->selected)
+                       summary_show(folderview->summaryview,
+                                    folderview->summaryview->folder_item);
+               g_free(old_id);
                return;
        }
 
+       /* if (FOLDER_TYPE(item->folder) == F_MH)
+               prefs_filtering_delete_path(old_path); */
+
        if (folderview->opened == folderview->selected ||
            gtk_ctree_is_ancestor(ctree,
                                  folderview->selected,
@@ -1919,6 +2163,10 @@ static void folderview_delete_folder_cb(FolderView *folderview, guint action,
 
        gtk_ctree_remove_node(ctree, folderview->selected);
        folder_write_list();
+
+       prefs_filtering_delete_path(old_id);
+       g_free(old_id);
+
 }
 
 static void folderview_remove_mailbox_cb(FolderView *folderview, guint action,
@@ -1927,6 +2175,7 @@ static void folderview_remove_mailbox_cb(FolderView *folderview, guint action,
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        GtkCTreeNode *node;
        FolderItem *item;
+       gchar *name, *name_;
        gchar *message;
        AlertValue avalue;
 
@@ -1937,11 +2186,13 @@ static void folderview_remove_mailbox_cb(FolderView *folderview, guint action,
        g_return_if_fail(item->folder != NULL);
        if (item->parent) return;
 
+       name_ = trim_string(item->folder->name, 32);
+       Xstrdup_a(name, name_, return);
+       g_free(name_);
        message = g_strdup_printf
                (_("Really remove the mailbox `%s' ?\n"
-                  "(The messages are NOT deleted from disk)"),
-                item->folder->name);
-       avalue = alertpanel(_("Remove folder"), message,
+                  "(The messages are NOT deleted from the disk)"), name);
+       avalue = alertpanel(_("Remove mailbox"), message,
                            _("Yes"), _("+No"), NULL);
        g_free(message);
        if (avalue != G_ALERTDEFAULT) return;
@@ -1957,11 +2208,10 @@ static void folderview_new_imap_folder_cb(FolderView *folderview, guint action,
                                          GtkWidget *widget)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       gchar *text[N_FOLDER_COLS] = {NULL, "0", "0", "0"};
-       GtkCTreeNode *node;
        FolderItem *item;
        FolderItem *new_item;
        gchar *new_folder;
+       gchar *name, *name_;
        gchar *p;
 
        if (!folderview->selected) return;
@@ -1988,82 +2238,27 @@ static void folderview_new_imap_folder_cb(FolderView *folderview, guint action,
                return;
        }
 
+       name_ = trim_string(new_folder, 32);
+       Xstrdup_a(name, name_, return);
+       g_free(name_);
+
        /* find whether the directory already exists */
        if (folderview_find_by_name(ctree, folderview->selected, new_folder)) {
-               alertpanel_error(_("The folder `%s' already exists."),
-                                new_folder);
+               alertpanel_error(_("The folder `%s' already exists."), name);
                g_free(new_folder);
                return;
        }
 
-       new_item = item->folder->create_folder(item->folder, item, new_folder);
+       new_item = folder_create_folder(item, new_folder);
        if (!new_item) {
-               alertpanel_error(_("Can't create the folder `%s'."),
-                                new_folder);
+               alertpanel_error(_("Can't create the folder `%s'."), name);
                g_free(new_folder);
                return;
        }
        g_free(new_folder);
 
-       gtk_clist_freeze(GTK_CLIST(ctree));
-
-       text[COL_FOLDER] = new_item->name;
-       node = gtk_ctree_insert_node(ctree, folderview->selected, NULL, text,
-                                    FOLDER_SPACING,
-                                    folderxpm, folderxpmmask,
-                                    folderopenxpm, folderopenxpmmask,
-                                    FALSE, FALSE);
-       gtk_ctree_expand(ctree, folderview->selected);
-       gtk_ctree_node_set_row_data(ctree, node, new_item);
-       folderview_sort_folders(folderview, folderview->selected, item->folder);
-
-       gtk_clist_thaw(GTK_CLIST(ctree));
-
-       folder_write_list();
-}
-
-static void folderview_rm_imap_folder_cb(FolderView *folderview, guint action,
-                                        GtkWidget *widget)
-{
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       FolderItem *item;
-       gchar *message;
-       AlertValue avalue;
-
-       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);
-       g_return_if_fail(item->folder->type == F_IMAP);
-       g_return_if_fail(item->folder->account != NULL);
-
-       message = g_strdup_printf(_("Really delete folder `%s'?"),
-                                 g_basename(item->path));
-       avalue = alertpanel(_("Delete folder"), message,
-                           _("Yes"), _("+No"), NULL);
-       g_free(message);
-       if (avalue != G_ALERTDEFAULT) return;
-
-       if (item->folder->remove_folder(item->folder, item) < 0) {
-               alertpanel_error(_("Can't remove the folder `%s'."),
-                                item->path);
-               if (folderview->opened == folderview->selected)
-                       summary_show(folderview->summaryview,
-                                    folderview->summaryview->folder_item,
-                                    FALSE);
-               return;
-       }
-
-       if (folderview->opened == folderview->selected ||
-           gtk_ctree_is_ancestor(ctree,
-                                 folderview->selected,
-                                 folderview->opened)) {
-               summary_clear_all(folderview->summaryview);
-               folderview->opened = NULL;
-       }
+       folderview_create_folder_node(folderview, new_item);
 
-       gtk_ctree_remove_node(ctree, folderview->selected);
        folder_write_list();
 }
 
@@ -2072,6 +2267,8 @@ static void folderview_rm_imap_server_cb(FolderView *folderview, guint action,
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        FolderItem *item;
+       PrefsAccount *account;
+       gchar *name, *name_;
        gchar *message;
        AlertValue avalue;
 
@@ -2083,8 +2280,10 @@ static void folderview_rm_imap_server_cb(FolderView *folderview, guint action,
        g_return_if_fail(item->folder->type == F_IMAP);
        g_return_if_fail(item->folder->account != NULL);
 
-       message = g_strdup_printf(_("Really delete IMAP4 account `%s'?"),
-                                 item->folder->name);
+       name_ = trim_string(item->folder->name, 32);
+       Xstrdup_a(name, name_, return);
+       g_free(name_);
+       message = g_strdup_printf(_("Really delete IMAP4 account `%s'?"), name);
        avalue = alertpanel(_("Delete IMAP4 account"), message,
                            _("Yes"), _("+No"), NULL);
        g_free(message);
@@ -2099,8 +2298,9 @@ static void folderview_rm_imap_server_cb(FolderView *folderview, guint action,
                folderview->opened = NULL;
        }
 
-       account_destroy(item->folder->account);
+       account = item->folder->account;
        folder_destroy(item->folder);
+       account_destroy(account);
        gtk_ctree_remove_node(ctree, folderview->selected);
        account_set_menu();
        main_window_reflect_prefs_all();
@@ -2184,12 +2384,12 @@ static void folderview_new_news_group_cb(FolderView *folderview, guint action,
                                             FALSE, FALSE);
                gtk_ctree_expand(ctree, servernode);
 
-               newitem = folder_item_new(name, name);
+               newitem = folder_item_new(folder, name, name);
                folder_item_append(rootitem, newitem);
                gtk_ctree_node_set_row_data(ctree, node, newitem);
        }
 
-       gtk_ctree_sort_node(ctree, servernode);
+       folderview_sort_folders(folderview, servernode, folder);
        gtk_clist_thaw(GTK_CLIST(ctree));
 
        slist_free_strings(new_subscr);
@@ -2203,6 +2403,7 @@ static void folderview_rm_news_group_cb(FolderView *folderview, guint action,
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        FolderItem *item;
+       gchar *name, *name_;
        gchar *message;
        AlertValue avalue;
 
@@ -2214,8 +2415,10 @@ static void folderview_rm_news_group_cb(FolderView *folderview, guint action,
        g_return_if_fail(item->folder->type == F_NEWS);
        g_return_if_fail(item->folder->account != NULL);
 
-       message = g_strdup_printf(_("Really delete newsgroup `%s'?"),
-                                 g_basename(item->path));
+       name_ = trim_string(item->path, 32);
+       Xstrdup_a(name, name_, return);
+       g_free(name_);
+       message = g_strdup_printf(_("Really delete newsgroup `%s'?"), name);
        avalue = alertpanel(_("Delete newsgroup"), message,
                            _("Yes"), _("+No"), NULL);
        g_free(message);
@@ -2236,6 +2439,8 @@ static void folderview_rm_news_server_cb(FolderView *folderview, guint action,
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        FolderItem *item;
+       PrefsAccount *account;
+       gchar *name, *name_;
        gchar *message;
        AlertValue avalue;
 
@@ -2247,8 +2452,10 @@ static void folderview_rm_news_server_cb(FolderView *folderview, guint action,
        g_return_if_fail(item->folder->type == F_NEWS);
        g_return_if_fail(item->folder->account != NULL);
 
-       message = g_strdup_printf(_("Really delete news account `%s'?"),
-                                 item->folder->name);
+       name_ = trim_string(item->folder->name, 32);
+       Xstrdup_a(name, name_, return);
+       g_free(name_);
+       message = g_strdup_printf(_("Really delete news account `%s'?"), name);
        avalue = alertpanel(_("Delete news account"), message,
                            _("Yes"), _("+No"), NULL);
        g_free(message);
@@ -2263,8 +2470,9 @@ static void folderview_rm_news_server_cb(FolderView *folderview, guint action,
                folderview->opened = NULL;
        }
 
-       account_destroy(item->folder->account);
-       folder_destroy(item->folder);
+       account = item->folder->account;
+       folder_destroy(item->folder);
+       account_destroy(account);
        gtk_ctree_remove_node(ctree, folderview->selected);
        account_set_menu();
        main_window_reflect_prefs_all();
@@ -2277,6 +2485,51 @@ static void folderview_search_cb(FolderView *folderview, guint action,
        summary_search(folderview->summaryview);
 }
 
+static void folderview_property_cb(FolderView *folderview, guint action,
+                                  GtkWidget *widget)
+{
+       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       FolderItem *item;
+
+       if (!folderview->selected) return;
+
+       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+       g_return_if_fail(item != NULL);
+       g_return_if_fail(item->folder != NULL);
+
+#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
+               prefs_folder_item_open(item);
+#endif 
+}
+
+static void folderview_recollapse_nodes(FolderView *folderview, GtkCTreeNode *node)
+{
+       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));
+               }
+       }
+       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);
+}
+
 static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
                                          GdkDragContext *context,
                                          gint            x,
@@ -2285,37 +2538,53 @@ static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
                                          FolderView     *folderview)
 {
        gint row, column;
-       FolderItem *item, *current_item;
+       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)) {
+       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);
-               current_item = folderview->summaryview->folder_item;
-               if (item != NULL &&
-                   item->path != NULL &&
-                   current_item != NULL &&
-                   current_item != item) {
-                       switch (item->folder->type){
+               src_item = folderview->summaryview->folder_item;
+
+               if (item && item->folder && item->path &&
+                   src_item && src_item != item) {
+                       switch (item->folder->type) {
                        case F_MH:
-                               if (current_item->folder->type == F_MH)
-                                   acceptable = TRUE;
-                               break;
                        case F_IMAP:
-                               if (current_item->folder->account == item->folder->account)
-                                   acceptable = TRUE;
+                               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;
                }
+                       
        }
 
+       if (acceptable || (src_item && src_item == item)) {
+               folderview_recollapse_nodes(folderview, node);
+               if (item->collapsed) {
+                       gtk_ctree_expand(GTK_CTREE(widget), node);
+                       folderview->nodes_to_recollapse = g_slist_append(
+                                                               folderview->nodes_to_recollapse,
+                                                               node);
+               }
+       }
+               
        if (acceptable) {
-               gtk_signal_handler_block_by_func(GTK_OBJECT(widget),GTK_SIGNAL_FUNC(folderview_selected), folderview);
+               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);
+               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);
@@ -2345,30 +2614,130 @@ static void folderview_drag_received_cb(GtkWidget        *widget,
                                        FolderView       *folderview)
 {
        gint row, column;
-       FolderItem *item;
+       FolderItem *item, *src_item;
        GtkCTreeNode *node;
 
-       if (gtk_clist_get_selection_info(GTK_CLIST(widget),
-                                        x - 24, y - 24, &row, &column) == 0)
-               return;
+       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);
-       if (item != NULL) {
-               switch (drag_context->action) {
-                       case GDK_ACTION_COPY:
+               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);
-                               gtk_drag_finish(drag_context, TRUE, FALSE, time);
+                       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;
+               gint status;
+               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_identifier(source);
+
+               if (!item || !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);
+
+               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 ((status = folder_item_move_to(src_item, item, &new_item)) == F_MOVE_OK) {
+                       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);
+                       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 GDK_ACTION_MOVE:
-                       case GDK_ACTION_DEFAULT:
                        default:
-                               summary_move_selected_to(folderview->summaryview, item);
-                               gtk_drag_finish(drag_context, TRUE, TRUE, time);
+                               alertpanel_error(_("Move failed!"));
                                break;
-               }
-       } else
-               gtk_drag_finish(drag_context, FALSE, FALSE, time);
+                       }
+               }       
+               inc_unlock();           
+               gtk_widget_set_sensitive(folderview->ctree, TRUE);
+       }
+       folderview->nodes_to_recollapse = NULL;
+}
+
+static gint folderview_clist_compare(GtkCList *clist,
+                                    gconstpointer ptr1, gconstpointer ptr2)
+{
+       FolderItem *item1 = ((GtkCListRow *)ptr1)->data;
+       FolderItem *item2 = ((GtkCListRow *)ptr2)->data;
+
+       if (!item1->name)
+               return (item2->name != NULL);
+       if (!item2->name)
+               return -1;
+
+       return g_strcasecmp(item1->name, item2->name);
 }
 
 static gint folderview_compare_name(gconstpointer a, gconstpointer b)
@@ -2407,22 +2776,7 @@ static void folderview_processing_cb(FolderView *folderview, guint action,
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
 
-       prefs_filtering_open(item);
-}
-
-static void folderview_property_cb(FolderView *folderview, guint action, 
-                                  GtkWidget *widget) 
-{
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       FolderItem *item;
-
-       if (!folderview->selected) return;
-
-       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
-       g_return_if_fail(item != NULL);
-       g_return_if_fail(item->folder != NULL);
-
-       prefs_folder_item_create(folderview, item);
+       prefs_filtering_open(item, NULL, NULL);
 }
 
 void folderview_set_target_folder_color(gint color_op) 
@@ -2441,3 +2795,61 @@ void folderview_set_target_folder_color(gint color_op)
                }
        }
 }
+
+void folderview_reflect_prefs_pixmap_theme(FolderView *folderview)
+{
+       folderview_init(folderview);
+       folderview_set_all();
+}
+
+GtkTargetEntry folderview_drag_types[1] =
+{
+       {"text/plain", GTK_TARGET_SAME_APP, TARGET_DUMMY}
+};
+
+
+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);
+
+       folderview->nodes_to_recollapse = NULL; /* in case the last drag has been cancelled */
+       
+       context = gtk_drag_begin(widget, list,
+                                GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_DEFAULT, button, event);
+       gtk_drag_set_icon_default(context);
+}
+
+static void folderview_drag_data_get(GtkWidget        *widget,
+                                    GdkDragContext   *drag_context,
+                                    GtkSelectionData *selection_data,
+                                    guint             info,
+                                    guint             time,
+                                    FolderView       *folderview)
+{
+       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;
+       }
+}
+