2005-10-25 [wwp] 1.9.15cvs102
[claws.git] / src / folderview.c
index 2bb1c38ca8b9d0fa9ab16b8e106773f733df37b4..0fb729e689c68aeaeee354863c7f356f9e854b4b 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 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
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkscrolledwindow.h>
 #include <string.h>
 #include <stdlib.h>
 
-#include "intl.h"
 #include "main.h"
 #include "mainwindow.h"
 #include "folderview.h"
 #include "summaryview.h"
 #include "summary_search.h"
 #include "inputdialog.h"
-#include "grouplistdialog.h"
 #include "manage_window.h"
 #include "alertpanel.h"
 #include "menu.h"
@@ -55,7 +54,6 @@
 #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"
 #include "hooks.h"
+#include "folderutils.h"
+#include "partial_download.h"
+#include "prefs_folder_column.h"
+#include "filtering.h"
 
-typedef enum
-{
-       COL_FOLDER      = 0,
-       COL_NEW         = 1,
-       COL_UNREAD      = 2,
-       COL_TOTAL       = 3
-} FolderColumnPos;
-
-#define N_FOLDER_COLS          4
 #define COL_FOLDER_WIDTH       150
 #define COL_NUM_WIDTH          32
 
 static GList *folderview_list = NULL;
 
-static GdkFont *normalfont;
-static GdkFont *boldfont;
-
 static GtkStyle *normal_style;
 static GtkStyle *normal_color_style;
 static GtkStyle *bold_style;
 static GtkStyle *bold_color_style;
 static GtkStyle *bold_tgtfold_style;
 
-static GdkBitmap *inboxxpm;
+static GdkPixmap *inboxxpm;
 static GdkBitmap *inboxxpmmask;
 static GdkPixmap *inboxhrmxpm;
 static GdkBitmap *inboxhrmxpmmask;
@@ -127,14 +117,65 @@ static GdkPixmap *queueopenxpm;
 static GdkBitmap *queueopenxpmmask;
 static GdkPixmap *queueopenhrmxpm;
 static GdkBitmap *queueopenhrmxpmmask;
-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 GdkPixmap *noselectxpm;
+static GdkBitmap *noselectxpmmask;
+
+static GdkPixmap *m_inboxxpm;
+static GdkBitmap *m_inboxxpmmask;
+static GdkPixmap *m_inboxhrmxpm;
+static GdkBitmap *m_inboxhrmxpmmask;
+static GdkPixmap *m_inboxopenxpm;
+static GdkBitmap *m_inboxopenxpmmask;
+static GdkPixmap *m_inboxopenhrmxpm;
+static GdkBitmap *m_inboxopenhrmxpmmask;
+static GdkPixmap *m_outboxxpm;
+static GdkBitmap *m_outboxxpmmask;
+static GdkPixmap *m_outboxhrmxpm;
+static GdkBitmap *m_outboxhrmxpmmask;
+static GdkPixmap *m_outboxopenxpm;
+static GdkBitmap *m_outboxopenxpmmask;
+static GdkPixmap *m_outboxopenhrmxpm;
+static GdkBitmap *m_outboxopenhrmxpmmask;
+static GdkPixmap *m_folderxpm;
+static GdkBitmap *m_folderxpmmask;
+static GdkPixmap *m_folderhrmxpm;
+static GdkBitmap *m_folderhrmxpmmask;
+static GdkPixmap *m_folderopenxpm;
+static GdkBitmap *m_folderopenxpmmask;
+static GdkPixmap *m_folderopenhrmxpm;
+static GdkBitmap *m_folderopenhrmxpmmask;
+static GdkPixmap *m_trashopenxpm;
+static GdkBitmap *m_trashopenxpmmask;
+static GdkPixmap *m_trashopenhrmxpm;
+static GdkBitmap *m_trashopenhrmxpmmask;
+static GdkPixmap *m_trashxpm;
+static GdkBitmap *m_trashxpmmask;
+static GdkPixmap *m_trashhrmxpm;
+static GdkBitmap *m_trashhrmxpmmask;
+static GdkPixmap *m_queuexpm;
+static GdkBitmap *m_queuexpmmask;
+static GdkPixmap *m_queuehrmxpm;
+static GdkBitmap *m_queuehrmxpmmask;
+static GdkPixmap *m_queueopenxpm;
+static GdkBitmap *m_queueopenxpmmask;
+static GdkPixmap *m_queueopenhrmxpm;
+static GdkBitmap *m_queueopenhrmxpmmask;
+static GdkPixmap *m_draftsxpm;
+static GdkBitmap *m_draftsxpmmask;
+static GdkPixmap *m_draftsopenxpm;
+static GdkBitmap *m_draftsopenxpmmask;
+
+static GdkPixmap *newxpm;
+static GdkBitmap *newxpmmask;
+static GdkPixmap *unreadxpm;
+static GdkBitmap *unreadxpmmask;
+static GdkPixmap *readxpm;
+static GdkBitmap *readxpmmask;
+
 
 static void folderview_select_node      (FolderView    *folderview,
                                          GtkCTreeNode  *node);
@@ -147,24 +188,18 @@ static void folderview_append_folder       (FolderView    *folderview,
 static void folderview_update_node      (FolderView    *folderview,
                                          GtkCTreeNode  *node);
 
-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);
 
 /* callback functions */
-static void folderview_button_pressed  (GtkWidget      *ctree,
-                                        GdkEventButton *event,
-                                        FolderView     *folderview);
-static void folderview_button_released (GtkWidget      *ctree,
-                                        GdkEventButton *event,
-                                        FolderView     *folderview);
-static void folderview_key_pressed     (GtkWidget      *widget,
+static gboolean folderview_button_pressed      (GtkWidget      *ctree,
+                                                GdkEventButton *event,
+                                                FolderView     *folderview);
+static gboolean folderview_button_released     (GtkWidget      *ctree,
+                                                GdkEventButton *event,
+                                                FolderView     *folderview);
+static gboolean folderview_key_pressed (GtkWidget      *widget,
                                         GdkEventKey    *event,
                                         FolderView     *folderview);
 static void folderview_selected                (GtkCTree       *ctree,
@@ -184,46 +219,11 @@ static void folderview_col_resized        (GtkCList       *clist,
                                         gint            width,
                                         FolderView     *folderview);
 
-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);
-static void folderview_new_mbox_folder_cb(FolderView *folderview,
-                                         guint action,
-                                         GtkWidget *widget);
-static void folderview_rename_folder_cb        (FolderView     *folderview,
-                                        guint           action,
-                                        GtkWidget      *widget);
-static void folderview_rename_mbox_folder_cb(FolderView *folderview,
-                                            guint action,
-                                            GtkWidget *widget);
-static void folderview_delete_folder_cb        (FolderView     *folderview,
-                                        guint           action,
-                                        GtkWidget      *widget);
-static void folderview_remove_mailbox_cb(FolderView    *folderview,
-                                        guint           action,
-                                        GtkWidget      *widget);
-
-static void folderview_new_imap_folder_cb(FolderView   *folderview,
-                                         guint          action,
-                                         GtkWidget     *widget);
-static void folderview_rm_imap_server_cb (FolderView   *folderview,
-                                         guint          action,
-                                         GtkWidget     *widget);
 
-static void folderview_new_news_group_cb(FolderView    *folderview,
-                                        guint           action,
-                                        GtkWidget      *widget);
-static void folderview_rm_news_group_cb        (FolderView     *folderview,
-                                        guint           action,
-                                        GtkWidget      *widget);
-static void folderview_rm_news_server_cb(FolderView    *folderview,
+static void folderview_empty_trash_cb  (FolderView     *folderview,
                                         guint           action,
                                         GtkWidget      *widget);
 
@@ -269,151 +269,181 @@ void folderview_create_folder_node       (FolderView       *folderview,
                                          FolderItem       *item);
 gboolean folderview_update_folder       (gpointer          source,
                                          gpointer          userdata);
-gboolean folderview_update_item                 (gpointer          source,
+gboolean folderview_update_item_claws   (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},
-       {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
-       {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_("/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"),
-                                       NULL, folderview_update_tree_cb, 0, 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_("/_Properties..."),         NULL, folderview_property_cb, 0, NULL},
-       {N_("/_Processing..."),         NULL, folderview_processing_cb, 0, NULL},
-       {N_("/S_coring..."),            NULL, folderview_scoring_cb, 0, NULL}
-};
+GHashTable *folderview_popups;
 
-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, 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"),
-                                       NULL, folderview_update_tree_cb, 0, 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>"},
+static GtkItemFactoryEntry folderview_common_popup_entries[] =
+{
+       {N_("/Mark all re_ad"),         NULL, mark_all_read_cb, 0, NULL},
        {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}
+       {N_("/Process_ing..."),         NULL, folderview_processing_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},
-       {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}
+static GtkItemFactoryEntry folder_view_trash_popup_entries[] = {
+       {N_("/------"),                 NULL, NULL, 0, "<Separator>"},
+       {N_("/Empty _trash..."),        NULL, folderview_empty_trash_cb, 0, NULL},
 };
 
+
 GtkTargetEntry folderview_drag_types[] =
 {
        {"text/plain", GTK_TARGET_SAME_APP, TARGET_DUMMY}
 };
 
-FolderView *folderview_create(void)
+void folderview_initialize(void)
+{
+       FolderViewPopup *fpopup;
+       guint i, n_entries;
+       GSList *entries = NULL;
+
+       fpopup = g_new0(FolderViewPopup, 1);
+
+       n_entries = sizeof(folderview_common_popup_entries) /
+               sizeof(folderview_common_popup_entries[0]);
+       for (i = 0; i < n_entries; i++)
+               entries = g_slist_append(entries, &folderview_common_popup_entries[i]);
+
+       fpopup->klass = "common";
+       fpopup->path = "<CommonFolder>";
+       fpopup->entries = entries;
+       fpopup->set_sensitivity = NULL;
+
+       folderview_popups = g_hash_table_new(g_str_hash, g_str_equal);
+       g_hash_table_insert(folderview_popups, "common", fpopup);
+}
+
+static GtkItemFactory *create_ifactory(FolderView *folderview, FolderViewPopup *fpopup)
+{
+       GSList *entries;
+       GtkItemFactory *factory;
+       FolderViewPopup *fpopup_common;
+       GtkWidget *popup;
+
+       factory = gtk_item_factory_new(GTK_TYPE_MENU, fpopup->path, NULL);
+       gtk_item_factory_set_translate_func(factory, menu_translate,
+                                           NULL, NULL);
+
+       for (entries = fpopup->entries; entries != NULL; entries = g_slist_next(entries))
+               gtk_item_factory_create_item(factory, entries->data, folderview, 1);
+
+       fpopup_common = g_hash_table_lookup(folderview_popups, "common");
+       if (fpopup_common != fpopup)
+               for (entries = fpopup_common->entries; entries != NULL; entries = g_slist_next(entries))
+                       gtk_item_factory_create_item(factory, entries->data, folderview, 1);
+
+       popup = gtk_item_factory_get_widget(factory, fpopup->path);
+        g_signal_connect(G_OBJECT(popup), "selection_done",
+                         G_CALLBACK(folderview_popup_close),
+                         folderview);
+
+       return factory;
+}
+
+static void create_ifactories(gpointer key, gpointer value, gpointer data)
+{
+       FolderView *folderview = data;
+       FolderViewPopup *fpopup = value;
+       GtkItemFactory *factory;
+
+       factory = create_ifactory(folderview, fpopup);
+       g_hash_table_insert(folderview->popups, fpopup->klass, factory);
+}
+
+static void folderview_column_set_titles(FolderView *folderview)
+{
+       GtkWidget *ctree = folderview->ctree;
+       GtkWidget *label_new;
+       GtkWidget *label_unread;
+       GtkWidget *label_total;
+       GtkWidget *hbox_new;
+       GtkWidget *hbox_unread;
+       GtkWidget *hbox_total;
+       gint *col_pos = folderview->col_pos;
+       
+       debug_print("setting titles...\n");
+       gtk_widget_realize(folderview->ctree);
+       gtk_widget_show_all(folderview->scrolledwin);
+       
+       /* CLAWS: titles for "New" and "Unread" show new & unread pixmaps
+        * instead text (text overflows making them unreadable and ugly) */
+        stock_pixmap_gdk(ctree, STOCK_PIXMAP_NEW,
+                        &newxpm, &newxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_UNREAD,
+                        &unreadxpm, &unreadxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_READ,
+                        &readxpm, &readxpmmask);
+               
+       label_new = gtk_pixmap_new(newxpm, newxpmmask);
+       label_unread = gtk_pixmap_new(unreadxpm, unreadxpmmask);
+       label_total = gtk_pixmap_new(readxpm, readxpmmask);
+
+       hbox_new = gtk_hbox_new(FALSE, 4);
+       hbox_unread = gtk_hbox_new(FALSE, 4);
+       hbox_total = gtk_hbox_new(FALSE, 4);
+
+       /* left justified */
+       gtk_box_pack_start(GTK_BOX(hbox_new), label_new, TRUE, TRUE, 0);
+       gtk_misc_set_alignment (GTK_MISC (label_new), 1, 0.5);
+       gtk_box_pack_start(GTK_BOX(hbox_unread), label_unread, TRUE, TRUE, 0);
+       gtk_misc_set_alignment (GTK_MISC (label_unread), 1, 0.5);
+       gtk_box_pack_start(GTK_BOX(hbox_total), label_total, TRUE, TRUE, 0);
+       gtk_misc_set_alignment (GTK_MISC (label_total), 1, 0.5);
+
+       gtk_widget_show_all(hbox_new);
+       gtk_widget_show_all(hbox_unread);
+       gtk_widget_show_all(hbox_total);
+
+       gtk_clist_set_column_widget(GTK_CLIST(ctree),col_pos[F_COL_NEW],hbox_new);
+       gtk_clist_set_column_widget(GTK_CLIST(ctree),col_pos[F_COL_UNREAD],hbox_unread);
+       gtk_clist_set_column_widget(GTK_CLIST(ctree),col_pos[F_COL_TOTAL],hbox_total);
+}
+
+GtkWidget *folderview_ctree_create(FolderView *folderview)
 {
-       FolderView *folderview;
-       GtkWidget *scrolledwin;
        GtkWidget *ctree;
+       gint *col_pos;
+       FolderColumnState *col_state;
+       FolderColumnType type;
        gchar *titles[N_FOLDER_COLS];
-       GtkWidget *mail_popup;
-       GtkWidget *news_popup;
-       GtkWidget *imap_popup;
-       GtkWidget *mbox_popup;
-       GtkItemFactory *mail_factory;
-       GtkItemFactory *news_factory;
-       GtkItemFactory *imap_factory;
-       GtkItemFactory *mbox_factory;
-       gint n_entries;
        gint i;
+       GtkWidget *scrolledwin = folderview->scrolledwin;
 
-       debug_print("Creating folder view...\n");
-       folderview = g_new0(FolderView, 1);
+       debug_print("creating tree...\n");
+       memset(titles, 0, sizeof(titles));
 
-       titles[COL_FOLDER] = _("Folder");
-       titles[COL_NEW]    = _("New");
-       titles[COL_UNREAD] = _("Unread");
-       titles[COL_TOTAL]  = _("#");
+       col_state = prefs_folder_column_get_config();
+       memset(titles, 0, sizeof(titles));
 
-       scrolledwin = gtk_scrolled_window_new(NULL, NULL);
-       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);
+       col_pos = folderview->col_pos;
+
+       for (i = 0; i < N_FOLDER_COLS; i++) {
+               folderview->col_state[i] = col_state[i];
+               type = col_state[i].type;
+               col_pos[type] = i;
+       }
+
+       titles[col_pos[F_COL_FOLDER]] = _("Folder");
+       titles[col_pos[F_COL_NEW]]    = _("New");
+       titles[col_pos[F_COL_UNREAD]] = _("Unread");
+       titles[col_pos[F_COL_TOTAL]]  = _("#");
 
-       ctree = gtk_sctree_new_with_titles(N_FOLDER_COLS, COL_FOLDER, titles);
+       ctree = gtk_sctree_new_with_titles(N_FOLDER_COLS, col_pos[F_COL_FOLDER],
+                                          titles);
        
-       gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
        gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_BROWSE);
-#ifndef CLAWS /* text instead of pixmaps */
-       gtk_clist_set_column_justification(GTK_CLIST(ctree), COL_NEW,
+       gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[F_COL_NEW],
                                           GTK_JUSTIFY_RIGHT);
-       gtk_clist_set_column_justification(GTK_CLIST(ctree), COL_UNREAD,
+       gtk_clist_set_column_justification(GTK_CLIST(ctree),
+                                          col_pos[F_COL_UNREAD],
                                           GTK_JUSTIFY_RIGHT);
-#endif                                    
-       gtk_clist_set_column_justification(GTK_CLIST(ctree), COL_TOTAL,
+       gtk_clist_set_column_justification(GTK_CLIST(ctree), 
+                                          col_pos[F_COL_TOTAL],
                                           GTK_JUSTIFY_RIGHT);
-       gtk_clist_set_column_width(GTK_CLIST(ctree), COL_FOLDER,
-                                  prefs_common.folder_col_folder);
-       gtk_clist_set_column_width(GTK_CLIST(ctree), COL_NEW,
-                                  prefs_common.folder_col_new);
-       gtk_clist_set_column_width(GTK_CLIST(ctree), COL_UNREAD,        
-                                  prefs_common.folder_col_unread);
-       gtk_clist_set_column_width(GTK_CLIST(ctree), COL_TOTAL,
-                                  prefs_common.folder_col_total);
        gtk_ctree_set_line_style(GTK_CTREE(ctree), GTK_CTREE_LINES_DOTTED);
        gtk_ctree_set_expander_style(GTK_CTREE(ctree),
                                     GTK_CTREE_EXPANDER_SQUARE);
@@ -421,112 +451,121 @@ FolderView *folderview_create(void)
        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++)
+       for (i = 0; i < N_FOLDER_COLS; i++) {
                GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(ctree)->column[i].button,
                                       GTK_CAN_FOCUS);
-
-       /* popup menu */
-       n_entries = sizeof(folderview_mail_popup_entries) /
-               sizeof(folderview_mail_popup_entries[0]);
-       mail_popup = menu_create_items(folderview_mail_popup_entries,
-                                      n_entries,
-                                      "<MailFolder>", &mail_factory,
-                                      folderview);
-       n_entries = sizeof(folderview_imap_popup_entries) /
-               sizeof(folderview_imap_popup_entries[0]);
-       imap_popup = menu_create_items(folderview_imap_popup_entries,
-                                      n_entries,
-                                      "<IMAPFolder>", &imap_factory,
-                                      folderview);
-       n_entries = sizeof(folderview_news_popup_entries) /
-               sizeof(folderview_news_popup_entries[0]);
-       news_popup = menu_create_items(folderview_news_popup_entries,
-                                      n_entries,
-                                      "<NewsFolder>", &news_factory,
-                                      folderview);
-       n_entries = sizeof(folderview_mbox_popup_entries) /
-               sizeof(folderview_mbox_popup_entries[0]);
-       mbox_popup = menu_create_items(folderview_mbox_popup_entries,
-                                      n_entries,
-                                      "<MboxFolder>", &mbox_factory,
-                                      folderview);
-
-       gtk_signal_connect(GTK_OBJECT(ctree), "key_press_event",
-                          GTK_SIGNAL_FUNC(folderview_key_pressed),
-                          folderview);
-       gtk_signal_connect(GTK_OBJECT(ctree), "button_press_event",
-                          GTK_SIGNAL_FUNC(folderview_button_pressed),
-                          folderview);
-       gtk_signal_connect(GTK_OBJECT(ctree), "button_release_event",
-                          GTK_SIGNAL_FUNC(folderview_button_released),
-                          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),
-                                folderview);
-       gtk_signal_connect_after(GTK_OBJECT(ctree), "tree_collapse",
-                                GTK_SIGNAL_FUNC(folderview_tree_collapsed),
-                                folderview);
-
-       gtk_signal_connect(GTK_OBJECT(ctree), "resize_column",
-                          GTK_SIGNAL_FUNC(folderview_col_resized),
-                          folderview);
-
-       gtk_signal_connect(GTK_OBJECT(mail_popup), "selection_done",
-                          GTK_SIGNAL_FUNC(folderview_popup_close),
-                          folderview);
-       gtk_signal_connect(GTK_OBJECT(imap_popup), "selection_done",
-                          GTK_SIGNAL_FUNC(folderview_popup_close),
-                          folderview);
-       gtk_signal_connect(GTK_OBJECT(news_popup), "selection_done",
-                          GTK_SIGNAL_FUNC(folderview_popup_close),
-                          folderview);
-       gtk_signal_connect(GTK_OBJECT(mbox_popup), "selection_done",
-                          GTK_SIGNAL_FUNC(folderview_popup_close),
-                          folderview);
+               gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[i],
+                                  prefs_common.folder_col_size[i]);
+               gtk_clist_set_column_visibility
+                       (GTK_CLIST(ctree), i, col_state[i].visible);
+       }
+
+       g_signal_connect(G_OBJECT(ctree), "key_press_event",
+                        G_CALLBACK(folderview_key_pressed),
+                        folderview);
+       g_signal_connect(G_OBJECT(ctree), "button_press_event",
+                        G_CALLBACK(folderview_button_pressed),
+                        folderview);
+       g_signal_connect(G_OBJECT(ctree), "button_release_event",
+                        G_CALLBACK(folderview_button_released),
+                        folderview);
+       g_signal_connect(G_OBJECT(ctree), "tree_select_row",
+                        G_CALLBACK(folderview_selected), folderview);
+       g_signal_connect(G_OBJECT(ctree), "start_drag",
+                        G_CALLBACK(folderview_start_drag), folderview);
+       g_signal_connect(G_OBJECT(ctree), "drag_data_get",
+                        G_CALLBACK(folderview_drag_data_get),
+                        folderview);
+
+       g_signal_connect_after(G_OBJECT(ctree), "tree_expand",
+                              G_CALLBACK(folderview_tree_expanded),
+                              folderview);
+       g_signal_connect_after(G_OBJECT(ctree), "tree_collapse",
+                              G_CALLBACK(folderview_tree_collapsed),
+                              folderview);
+
+       g_signal_connect(G_OBJECT(ctree), "resize_column",
+                        G_CALLBACK(folderview_col_resized),
+                        folderview);
 
         /* drop callback */
        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);
-       gtk_signal_connect(GTK_OBJECT(ctree), "drag_motion",
-                          GTK_SIGNAL_FUNC(folderview_drag_motion_cb),
-                          folderview);
-       gtk_signal_connect(GTK_OBJECT(ctree), "drag_leave",
-                          GTK_SIGNAL_FUNC(folderview_drag_leave_cb),
-                          folderview);
-       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);
+       g_signal_connect(G_OBJECT(ctree), "drag_motion",
+                        G_CALLBACK(folderview_drag_motion_cb),
+                        folderview);
+       g_signal_connect(G_OBJECT(ctree), "drag_leave",
+                        G_CALLBACK(folderview_drag_leave_cb),
+                        folderview);
+       g_signal_connect(G_OBJECT(ctree), "drag_data_received",
+                        G_CALLBACK(folderview_drag_received_cb),
+                        folderview);
+       g_signal_connect(G_OBJECT(ctree), "drag_end",
+                        G_CALLBACK(folderview_drag_end_cb),
+                        folderview);
+
+       gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
+
+       return ctree;
+}
+
+void folderview_set_column_order(FolderView *folderview)
+{
+       GtkWidget *ctree;
+       FolderItem *item = folderview_get_selected_item(folderview);
+       GtkWidget *scrolledwin = folderview->scrolledwin;
+
+       debug_print("recreating tree...\n");
+       gtk_widget_destroy(folderview->ctree);
+
+       folderview->ctree = ctree = folderview_ctree_create(folderview);
+       gtk_scrolled_window_set_hadjustment(GTK_SCROLLED_WINDOW(scrolledwin),
+                                           GTK_CLIST(ctree)->hadjustment);
+       gtk_scrolled_window_set_vadjustment(GTK_SCROLLED_WINDOW(scrolledwin),
+                                           GTK_CLIST(ctree)->vadjustment);
+       gtk_widget_show(ctree);
+       
+       folderview_set(folderview);
+       folderview_column_set_titles(folderview);
+
+       folderview_select(folderview,item);
+}
+
+FolderView *folderview_create(void)
+{
+       FolderView *folderview;
+       GtkWidget *scrolledwin;
+       GtkWidget *ctree;
+
+       debug_print("Creating folder view...\n");
+       folderview = g_new0(FolderView, 1);
+
+       scrolledwin = gtk_scrolled_window_new(NULL, NULL);
+       gtk_scrolled_window_set_policy
+               (GTK_SCROLLED_WINDOW(scrolledwin),
+                GTK_POLICY_AUTOMATIC,
+                prefs_common.folderview_vscrollbar_policy);
+       gtk_widget_set_size_request(scrolledwin,
+                            prefs_common.folderview_width,
+                            prefs_common.folderview_height);
 
        folderview->scrolledwin  = scrolledwin;
+       ctree = folderview_ctree_create(folderview);
+       
+       /* create popup factories */
+       folderview->popups = g_hash_table_new(g_str_hash, g_str_equal);
+       g_hash_table_foreach(folderview_popups, create_ifactories, folderview);
+
        folderview->ctree        = ctree;
-       folderview->mail_popup   = mail_popup;
-       folderview->mail_factory = mail_factory;
-       folderview->imap_popup   = imap_popup;
-       folderview->imap_factory = imap_factory;
-       folderview->news_popup   = news_popup;
-       folderview->news_factory = news_factory;
-       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 =
-               hooks_register_hook(FOLDER_ITEM_UPDATE_HOOKLIST, folderview_update_item, (gpointer) folderview);
+               hooks_register_hook(FOLDER_ITEM_UPDATE_HOOKLIST, folderview_update_item_claws, (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);
 
@@ -536,12 +575,7 @@ FolderView *folderview_create(void)
 void folderview_init(FolderView *folderview)
 {
        GtkWidget *ctree = folderview->ctree;
-       GtkWidget *label_new;
-       GtkWidget *label_unread;
-       GtkWidget *hbox_new;
-       GtkWidget *hbox_unread;
-       
-       gtk_widget_realize(ctree);
+
        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);
@@ -564,67 +598,57 @@ void folderview_init(FolderView *folderview)
        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) */
-        stock_pixmap_gdk(ctree, STOCK_PIXMAP_NEW,
-                        &newxpm, &newxpmmask);
-       stock_pixmap_gdk(ctree, STOCK_PIXMAP_UNREAD,
-                        &unreadxpm, &unreadxpmmask);
-               
-       label_new = gtk_pixmap_new(newxpm, newxpmmask);
-       label_unread = gtk_pixmap_new(unreadxpm, unreadxpmmask);
-
-       hbox_new = gtk_hbox_new(FALSE, 4);
-       hbox_unread = gtk_hbox_new(FALSE, 4);
-
-       /* left justified */
-       gtk_box_pack_start(GTK_BOX(hbox_new),label_new,FALSE,FALSE,0);
-       gtk_box_pack_start(GTK_BOX(hbox_unread),label_unread,FALSE,FALSE,0);
-
-       gtk_widget_show_all(hbox_new);
-       gtk_widget_show_all(hbox_unread);
-
-       gtk_clist_set_column_widget(GTK_CLIST(ctree),COL_NEW,hbox_new);
-       gtk_clist_set_column_widget(GTK_CLIST(ctree),COL_UNREAD,hbox_unread);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DIR_NOSELECT, &noselectxpm, &noselectxpmmask);
+
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_INBOX_CLOSE_MARK, &m_inboxxpm, &m_inboxxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_INBOX_CLOSE_HRM_MARK, &m_inboxhrmxpm, &m_inboxhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_INBOX_OPEN_MARK, &m_inboxopenxpm, &m_inboxopenxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_INBOX_OPEN_HRM_MARK, &m_inboxopenhrmxpm, &m_inboxopenhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_OUTBOX_CLOSE_MARK, &m_outboxxpm, &m_outboxxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_OUTBOX_CLOSE_HRM_MARK, &m_outboxhrmxpm, &m_outboxhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_OUTBOX_OPEN_MARK, &m_outboxopenxpm, &m_outboxopenxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_OUTBOX_OPEN_HRM_MARK, &m_outboxopenhrmxpm, &m_outboxopenhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DIR_CLOSE_MARK, &m_folderxpm, &m_folderxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DIR_CLOSE_HRM_MARK, &m_folderhrmxpm, &m_folderhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DIR_OPEN_MARK, &m_folderopenxpm, &m_folderopenxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DIR_OPEN_HRM_MARK, &m_folderopenhrmxpm, &m_folderopenhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_TRASH_OPEN_MARK, &m_trashopenxpm, &m_trashopenxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_TRASH_OPEN_HRM_MARK, &m_trashopenhrmxpm, &m_trashopenhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_TRASH_CLOSE_MARK, &m_trashxpm, &m_trashxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_TRASH_CLOSE_HRM_MARK, &m_trashhrmxpm, &m_trashhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_QUEUE_CLOSE_MARK, &m_queuexpm, &m_queuexpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_QUEUE_CLOSE_HRM_MARK, &m_queuehrmxpm, &m_queuehrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_QUEUE_OPEN_MARK, &m_queueopenxpm, &m_queueopenxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_QUEUE_OPEN_HRM_MARK, &m_queueopenhrmxpm, &m_queueopenhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DRAFTS_CLOSE_MARK, &m_draftsxpm, &m_draftsxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DRAFTS_OPEN_MARK, &m_draftsopenxpm, &m_draftsopenxpmmask);
                        
-       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);
+       if (!normal_style) {
+               PangoFontDescription *font_desc;
+               normal_style = gtk_style_copy(gtk_widget_get_style(ctree));
+               font_desc = pango_font_description_from_string(NORMAL_FONT);
+               if (font_desc) {
+                       if (normal_style->font_desc)
+                               pango_font_description_free
+                                       (normal_style->font_desc);
+                       normal_style->font_desc = font_desc;
                }
-               else
-                       boldfont = gtkut_font_load(BOLD_FONT);
+               normal_color_style = gtk_style_copy(normal_style);
+               normal_color_style->fg[GTK_STATE_NORMAL] = folderview->color_new;
+
+               gtk_widget_set_style(ctree, normal_style);
        }
-       
+
        if (!bold_style) {
                bold_style = gtk_style_copy(gtk_widget_get_style(ctree));
-               bold_style->font = boldfont;
+               pango_font_description_set_weight
+                       (bold_style->font_desc, PANGO_WEIGHT_BOLD);
                bold_color_style = gtk_style_copy(bold_style);
                bold_color_style->fg[GTK_STATE_NORMAL] = folderview->color_new;
 
                bold_tgtfold_style = gtk_style_copy(bold_style);
                bold_tgtfold_style->fg[GTK_STATE_NORMAL] = folderview->color_op;
        }
-       if (!normal_style) {
-               normal_style = gtk_style_copy(gtk_widget_get_style(ctree));
-               normal_style->font = normalfont;
-               normal_color_style = gtk_style_copy(normal_style);
-               normal_color_style->fg[GTK_STATE_NORMAL] = folderview->color_new;
-       }
 }
 
 void folderview_set(FolderView *folderview)
@@ -678,8 +702,35 @@ void folderview_select(FolderView *folderview, FolderItem *item)
 static void mark_all_read_cb(FolderView *folderview, guint action,
                              GtkWidget *widget)
 {
-       if (folderview->selected)
-               summary_mark_all_read(folderview->summaryview);
+       FolderItem *item;
+       AlertValue val;
+       
+       item = folderview_get_selected_item(folderview);
+       if (item == NULL)
+               return;
+
+       if (prefs_common.ask_mark_all_read) {
+               val = alertpanel_full(_("Mark all as read"),
+                       _("Do you really want to mark all mails in this "
+                         "folder as read ?"), GTK_STOCK_YES, GTK_STOCK_NO, NULL,
+                         TRUE, NULL, ALERT_QUESTION, G_ALERTDEFAULT);
+
+               if (val == G_ALERTALTERNATE ||
+                   val == (G_ALERTALTERNATE|G_ALERTDISABLE))
+                       return;
+               else if (val == (G_ALERTDEFAULT|G_ALERTDISABLE)) 
+                       prefs_common.ask_mark_all_read = FALSE;
+       }
+       
+       summary_lock(folderview->summaryview);
+       folder_item_update_freeze();
+       if (folderview->summaryview->folder_item == item)
+               gtk_clist_freeze(GTK_CLIST(folderview->summaryview->ctree));
+       folderutils_mark_all_read(item);
+       if (folderview->summaryview->folder_item == item)
+               gtk_clist_thaw(GTK_CLIST(folderview->summaryview->ctree));
+       folder_item_update_thaw();
+       summary_unlock(folderview->summaryview);
 }
 
 static void folderview_select_node(FolderView *folderview, GtkCTreeNode *node)
@@ -747,6 +798,52 @@ void folderview_select_next_unread(FolderView *folderview)
                folderview_select_node(folderview, node);
 }
 
+static GtkCTreeNode *folderview_find_next_new(GtkCTree *ctree,
+                                                GtkCTreeNode *node)
+{
+       FolderItem *item;
+
+       if (node)
+               node = gtkut_ctree_node_next(ctree, node);
+       else
+               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+
+       for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
+               item = gtk_ctree_node_get_row_data(ctree, node);
+               if (item && item->new_msgs > 0 && item->stype != F_TRASH)
+                       return node;
+       }
+
+       return NULL;
+}
+
+void folderview_select_next_new(FolderView *folderview)
+{
+       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       GtkCTreeNode *node = NULL;
+
+       if ((node = folderview_find_next_new(ctree, folderview->opened))
+           != NULL) {
+               folderview_select_node(folderview, node);
+               return;
+       }
+
+       if (!folderview->opened ||
+           folderview->opened == GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list))
+               return;
+       /* search again from the first node */
+       if ((node = folderview_find_next_new(ctree, NULL)) != NULL)
+               folderview_select_node(folderview, node);
+}
+
+FolderItem *folderview_get_selected_item(FolderView *folderview)
+{
+       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+
+       if (!folderview->selected) return NULL;
+       return gtk_ctree_node_get_row_data(ctree, folderview->selected);
+}
+
 void folderview_update_msg_num(FolderView *folderview, GtkCTreeNode *row)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
@@ -754,15 +851,16 @@ void folderview_update_msg_num(FolderView *folderview, GtkCTreeNode *row)
        FolderItem *item;
        gint new, unread, total;
        gchar *new_str, *unread_str, *total_str;
+       gint *col_pos = folderview->col_pos;
 
        if (!row) return;
 
        item = gtk_ctree_node_get_row_data(ctree, row);
        if (!item) return;
 
-       gtk_ctree_node_get_text(ctree, row, COL_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);
+       gtk_ctree_node_get_text(ctree, row, col_pos[F_COL_NEW], &new_str);
+       gtk_ctree_node_get_text(ctree, row, col_pos[F_COL_UNREAD], &unread_str);
+       gtk_ctree_node_get_text(ctree, row, col_pos[F_COL_TOTAL], &total_str);
        new = atoi(new_str);
        unread = atoi(unread_str);
        total = atoi(total_str);
@@ -772,6 +870,49 @@ void folderview_update_msg_num(FolderView *folderview, GtkCTreeNode *row)
        folderview_update_node(folderview, row);
 }
 
+void folderview_append_item(FolderItem *item)
+{
+       GList *list;
+       
+       g_return_if_fail(item != NULL);
+       g_return_if_fail(item->folder != NULL);
+       if (folder_item_parent(item)) return;
+
+       for (list = folderview_list; list != NULL; list = list->next) {
+               FolderView *folderview = (FolderView *)list->data;
+               GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+               GtkCTreeNode *node, *child;
+               gint *col_pos = folderview->col_pos;
+
+               node = gtk_ctree_find_by_row_data(ctree, NULL, 
+                                                 folder_item_parent(item));
+               if (node) {
+                       child = gtk_ctree_find_by_row_data(ctree, node, item);
+                       if (!child) {
+                               gchar *text[N_FOLDER_COLS] =
+                                       {NULL, "0", "0", "0"};
+
+                               gtk_clist_freeze(GTK_CLIST(ctree));
+
+                               text[col_pos[F_COL_FOLDER]] = item->name;
+                               child = gtk_sctree_insert_node
+                                       (ctree, node, NULL, text,
+                                        FOLDER_SPACING,
+                                        folderxpm, folderxpmmask,
+                                        folderopenxpm, folderopenxpmmask,
+                                        FALSE, FALSE);
+                               gtk_ctree_node_set_row_data(ctree, child, item);
+                               gtk_ctree_expand(ctree, node);
+                               folderview_update_node(folderview, child);
+                               folderview_sort_folders(folderview, node,
+                                                       item->folder);
+
+                               gtk_clist_thaw(GTK_CLIST(ctree));
+                       }
+               }
+       }
+}
+
 static void folderview_set_folders(FolderView *folderview)
 {
        GList *list;
@@ -806,30 +947,7 @@ static void folderview_scan_tree_func(Folder *folder, FolderItem *item,
        }
 }
 
-static GtkWidget *label_window_create(const gchar *str)
-{
-       GtkWidget *window;
-       GtkWidget *label;
-
-       window = gtk_window_new(GTK_WINDOW_DIALOG);
-       gtk_widget_set_usize(window, 380, 60);
-       gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-       gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
-       gtk_window_set_title(GTK_WINDOW(window), str);
-       gtk_window_set_modal(GTK_WINDOW(window), TRUE);
-       gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE);
-       manage_window_set_transient(GTK_WINDOW(window));
-
-       label = gtk_label_new(str);
-       gtk_container_add(GTK_CONTAINER(window), label);
-       gtk_widget_show(label);
-
-       gtk_widget_show_now(window);
-
-       return window;
-}
-
-void folderview_rescan_tree(Folder *folder)
+void folderview_rescan_tree(Folder *folder, gboolean rebuild)
 {
        GtkWidget *window;
 
@@ -837,11 +955,24 @@ void folderview_rescan_tree(Folder *folder)
 
        if (!folder->klass->scan_tree) return;
 
+       if (rebuild && 
+           alertpanel_full(_("Rebuild folder tree"), 
+                        _("Rebuilding the folder tree will remove "
+                          "local caches. Do you want to continue?"),
+                        GTK_STOCK_YES, GTK_STOCK_NO, NULL, FALSE,
+                        NULL, ALERT_WARNING, G_ALERTALTERNATE) 
+               != G_ALERTDEFAULT) {
+               return;
+       }
+
        inc_lock();
-       window = label_window_create(_("Rebuilding folder tree..."));
+       if (rebuild)
+               window = label_window_create(_("Rebuilding folder tree..."));
+       else 
+               window = label_window_create(_("Scanning folder tree..."));
 
        folder_set_ui_func(folder, folderview_scan_tree_func, NULL);
-       folder_scan_tree(folder);
+       folder_scan_tree(folder, rebuild);
        folder_set_ui_func(folder, NULL, NULL);
 
        folderview_set_all();
@@ -865,7 +996,7 @@ gint folderview_check_new(Folder *folder)
        GtkCTreeNode *node;
        gint new_msgs = 0;
        gint former_new_msgs = 0;
-       gint former_new = 0;
+       gint former_new = 0, former_unread = 0, former_total;
 
        for (list = folderview_list; list != NULL; list = list->next) {
                folderview = (FolderView *)list->data;
@@ -873,7 +1004,6 @@ gint folderview_check_new(Folder *folder)
 
                inc_lock();
                main_window_lock(folderview->mainwin);
-               gtk_widget_set_sensitive(folderview->ctree, FALSE);
 
                for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
                     node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
@@ -882,19 +1012,28 @@ gint folderview_check_new(Folder *folder)
                        if (item->no_select) continue;
                        if (folder && folder != item->folder) continue;
                        if (!folder && !FOLDER_IS_LOCAL(item->folder)) continue;
+                       if (!item->prefs->newmailcheck) continue;
 
                        folderview_scan_tree_func(item->folder, item, NULL);
-                       former_new = item->new_msgs;
+                       former_new    = item->new_msgs;
+                       former_unread = item->unread_msgs;
+                       former_total  = item->total_msgs;
+
                        if (folder_item_scan(item) < 0) {
+                               summaryview_unlock(folderview->summaryview, item);
                                if (folder && !FOLDER_IS_LOCAL(folder))
                                        break;
                        }
-                       folderview_update_node(folderview, node);
+
+                       if (former_new    != item->new_msgs ||
+                           former_unread != item->unread_msgs ||
+                           former_total  != item->total_msgs)
+                               folderview_update_node(folderview, node);
+
                        new_msgs += item->new_msgs;
                        former_new_msgs += former_new;
                }
 
-               gtk_widget_set_sensitive(folderview->ctree, TRUE);
                main_window_unlock(folderview->mainwin);
                inc_unlock();
        }
@@ -937,98 +1076,160 @@ void folderview_check_new_all(void)
        inc_unlock();
 }
 
-static gboolean folderview_search_new_recursive(GtkCTree *ctree,
-                                               GtkCTreeNode *node)
+static gboolean folderview_have_new_children_sub(FolderView *folderview,
+                                                FolderItem *item,
+                                                gboolean in_sub)
 {
-       FolderItem *item;
-
-       if (node) {
-               item = gtk_ctree_node_get_row_data(ctree, node);
-               if (item) {
-                       if (item->new_msgs > 0 ||
-                           (item->stype == F_QUEUE && item->total_msgs > 0))
+       GNode *node = NULL;
+       
+       if (!item || !item->folder || !item->folder->node)
+               return FALSE;
+               
+       node = item->folder->node;
+       
+       node = g_node_find(node, G_PRE_ORDER, G_TRAVERSE_ALL, item);
+       node = node->children;
+
+       if (in_sub &&
+           (item->new_msgs > 0 ||
+           (folder_has_parent_of_type(item, F_QUEUE) && item->total_msgs > 0))) {
+               return TRUE;
+       }
+
+       while (node != NULL) {
+               if (node && node->data) {
+                       FolderItem *next_item = (FolderItem*) node->data;
+                       node = node->next;
+                       if (folderview_have_new_children_sub(folderview, 
+                                                            next_item, TRUE))
                                return TRUE;
                }
-               node = GTK_CTREE_ROW(node)->children;
-       } else
-               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
-
-       while (node) {
-               if (folderview_search_new_recursive(ctree, node) == TRUE)
-                       return TRUE;
-               node = GTK_CTREE_ROW(node)->sibling;
        }
 
        return FALSE;
 }
 
 static gboolean folderview_have_new_children(FolderView *folderview,
-                                            GtkCTreeNode *node)
+                                            FolderItem *item)
 {
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       return folderview_have_new_children_sub(folderview, item, FALSE);
+}
 
-       if (!node)
-               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
-       if (!node)
+static gboolean folderview_have_unread_children_sub(FolderView *folderview,
+                                                   FolderItem *item, 
+                                                   gboolean in_sub)
+{
+       GNode *node = NULL;
+       
+       if (!item || !item->folder || !item->folder->node)
                return FALSE;
-
-       node = GTK_CTREE_ROW(node)->children;
-
-       while (node) {
-               if (folderview_search_new_recursive(ctree, node) == TRUE)
-                       return TRUE;
-               node = GTK_CTREE_ROW(node)->sibling;
+       
+       node = item->folder->node;
+       
+       node = g_node_find(node, G_PRE_ORDER, G_TRAVERSE_ALL, item);
+       node = node->children;
+
+       if (in_sub &&
+           (item->unread_msgs > 0 ||
+           (folder_has_parent_of_type(item, F_QUEUE) && item->total_msgs > 0))) {
+               return TRUE;
+       }
+
+       while (node != NULL) {
+               if (node && node->data) {
+                       FolderItem *next_item = (FolderItem*) node->data;
+                       node = node->next;
+                       if (folderview_have_unread_children_sub(folderview, 
+                                                               next_item, 
+                                                               TRUE))
+                               return TRUE;
+               }
        }
 
        return FALSE;
 }
 
-static gboolean folderview_search_unread_recursive(GtkCTree *ctree,
-                                                  GtkCTreeNode *node)
+static gboolean folderview_have_unread_children(FolderView *folderview,
+                                               FolderItem *item)
 {
-       FolderItem *item;
+       return folderview_have_unread_children_sub(folderview, item, FALSE);
+}
 
-       if (node) {
-               item = gtk_ctree_node_get_row_data(ctree, node);
-               if (item) {
-                       if (item->unread_msgs > 0 ||
-                           (item->stype == F_QUEUE && item->total_msgs > 0))
+static gboolean folderview_have_matching_children_sub(FolderView *folderview,
+                                                     FolderItem *item,
+                                                     gboolean in_sub)
+{
+       GNode *node = NULL;
+
+       if (!item || !item->folder || !item->folder->node)
+               return FALSE;
+
+       node = item->folder->node;
+       
+       node = g_node_find(node, G_PRE_ORDER, G_TRAVERSE_ALL, item);
+       node = node->children;
+
+       if (in_sub && item->search_match){
+               return TRUE;
+       }
+
+       while (node != NULL) {
+               if (node && node->data) {
+                       FolderItem *next_item = (FolderItem*) node->data;
+                       node = node->next;
+                       if (folderview_have_matching_children_sub(folderview, 
+                                                                 next_item, 
+                                                                 TRUE))
                                return TRUE;
                }
-               node = GTK_CTREE_ROW(node)->children;
-       } else
-               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
-
-       while (node) {
-               if (folderview_search_unread_recursive(ctree, node) == TRUE)
-                       return TRUE;
-               node = GTK_CTREE_ROW(node)->sibling;
        }
 
        return FALSE;
 }
 
-static gboolean folderview_have_unread_children(FolderView *folderview,
-                                               GtkCTreeNode *node)
+static gboolean folderview_have_matching_children(FolderView *folderview,
+                                                 FolderItem *item)
 {
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       return folderview_have_matching_children_sub(folderview, item, FALSE);
+}
 
-       if (!node)
-               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
-       if (!node)
+static gboolean folderview_have_marked_children_sub(FolderView *folderview,
+                                                   FolderItem *item,
+                                                   gboolean in_sub)
+{
+       GNode *node = NULL;
+       
+       if (!item || !item->folder || !item->folder->node)
                return FALSE;
+               
+       node = item->folder->node;
+       
+       node = g_node_find(node, G_PRE_ORDER, G_TRAVERSE_ALL, item);
+       node = node->children;
 
-       node = GTK_CTREE_ROW(node)->children;
+       if (item->marked_msgs != 0) {
+               return TRUE;
+       }
 
-       while (node) {
-               if (folderview_search_unread_recursive(ctree, node) == TRUE)
-                       return TRUE;
-               node = GTK_CTREE_ROW(node)->sibling;
+       while (node != NULL) {
+               if (node && node->data) {
+                       FolderItem *next_item = (FolderItem*) node->data;
+                       node = node->next;
+                       if (folderview_have_marked_children_sub(folderview,
+                                                               next_item, TRUE))
+                               return TRUE;
+               }
        }
 
        return FALSE;
 }
 
+static gboolean folderview_have_marked_children(FolderView *folderview,
+                                            FolderItem *item)
+{
+       return folderview_have_marked_children_sub(folderview, item, FALSE);
+}
+
 static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
@@ -1037,112 +1238,154 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
        FolderItem *item;
        GdkPixmap *xpm, *openxpm;
        GdkBitmap *mask, *openmask;
+       static GdkPixmap *searchicon;
+       static GdkBitmap *searchmask;
+       gboolean mark = FALSE;
        gchar *name;
        gchar *str;
        gboolean add_unread_mark;
+       gboolean add_sub_match_mark;
        gboolean use_bold, use_color;
-
+       gint *col_pos = folderview->col_pos;
+       SpecialFolderItemType stype;
+       
        item = gtk_ctree_node_get_row_data(ctree, node);
        g_return_if_fail(item != NULL);
 
-       switch (item->stype) {
+       if (!GTK_CTREE_ROW(node)->expanded)
+               mark = folderview_have_marked_children(folderview, item);
+       else
+               mark = (item->marked_msgs != 0);
+
+       stype = item->stype;
+       if (stype == F_NORMAL) {
+               if (folder_has_parent_of_type(item, F_TRASH))
+                       stype = F_TRASH;
+               else if (folder_has_parent_of_type(item, F_DRAFT))
+                       stype = F_DRAFT;
+               else if (folder_has_parent_of_type(item, F_OUTBOX))
+                       stype = F_OUTBOX;
+               else if (folder_has_parent_of_type(item, F_QUEUE))
+                       stype = F_QUEUE;
+       }
+       switch (stype) {
        case F_INBOX:
                if (item->hide_read_msgs) {
-                       xpm = inboxhrmxpm;
-                       mask = inboxhrmxpmmask;
-                       openxpm = inboxopenhrmxpm;
-                       openmask = inboxopenhrmxpmmask;
+                       xpm = mark?m_inboxhrmxpm:inboxhrmxpm;
+                       mask = mark?m_inboxhrmxpmmask:inboxhrmxpmmask;
+                       openxpm = mark?m_inboxopenhrmxpm:inboxopenhrmxpm;
+                       openmask = mark?m_inboxopenhrmxpmmask:inboxopenhrmxpmmask;
                } else {
-                       xpm = inboxxpm;
-                       mask = inboxxpmmask;
-                       openxpm = inboxopenxpm;
-                       openmask = inboxopenxpmmask;
+                       xpm = mark?m_inboxxpm:inboxxpm;
+                       mask = mark?m_inboxxpmmask:inboxxpmmask;
+                       openxpm = mark?m_inboxopenxpm:inboxopenxpm;
+                       openmask = mark?m_inboxopenxpmmask:inboxopenxpmmask;
                }
                break;
        case F_OUTBOX:
                if (item->hide_read_msgs) {
-                       xpm = outboxhrmxpm;
-                       mask = outboxhrmxpmmask;
-                       openxpm = outboxopenhrmxpm;
-                       openmask = outboxopenhrmxpmmask;
+                       xpm = mark?m_outboxhrmxpm:outboxhrmxpm;
+                       mask = mark?m_outboxhrmxpmmask:outboxhrmxpmmask;
+                       openxpm = mark?m_outboxopenhrmxpm:outboxopenhrmxpm;
+                       openmask = mark?m_outboxopenhrmxpmmask:outboxopenhrmxpmmask;
                } else {
-                       xpm = outboxxpm;
-                       mask = outboxxpmmask;
-                       openxpm = outboxopenxpm;
-                       openmask = outboxopenxpmmask;
+                       xpm = mark?m_outboxxpm:outboxxpm;
+                       mask = mark?m_outboxxpmmask:outboxxpmmask;
+                       openxpm = mark?m_outboxopenxpm:outboxopenxpm;
+                       openmask = mark?m_outboxopenxpmmask:outboxopenxpmmask;
                }
                break;
        case F_QUEUE:
                if (item->hide_read_msgs) {
-                       xpm = queuehrmxpm;
-                       mask = queuehrmxpmmask;
-                       openxpm = queueopenhrmxpm;
-                       openmask = queueopenhrmxpmmask;
+                       xpm = mark?m_queuehrmxpm:queuehrmxpm;
+                       mask = mark?m_queuehrmxpmmask:queuehrmxpmmask;
+                       openxpm = mark?m_queueopenhrmxpm:queueopenhrmxpm;
+                       openmask = mark?m_queueopenhrmxpmmask:queueopenhrmxpmmask;
                } else {
-                       xpm = queuexpm;
-                       mask = queuexpmmask;
-                       openxpm = queueopenxpm;
-                       openmask = queueopenxpmmask;
+                       xpm = mark?m_queuexpm:queuexpm;
+                       mask = mark?m_queuexpmmask:queuexpmmask;
+                       openxpm = mark?m_queueopenxpm:queueopenxpm;
+                       openmask = mark?m_queueopenxpmmask:queueopenxpmmask;
                }
                break;
        case F_TRASH:
                if (item->hide_read_msgs) {
-                       xpm = trashhrmxpm;
-                       mask = trashhrmxpmmask;
-                       openxpm = trashopenhrmxpm;
-                       openmask = trashopenhrmxpmmask;
+                       xpm = mark?m_trashhrmxpm:trashhrmxpm;
+                       mask = mark?m_trashhrmxpmmask:trashhrmxpmmask;
+                       openxpm = mark?m_trashopenhrmxpm:trashopenhrmxpm;
+                       openmask = mark?m_trashopenhrmxpmmask:trashopenhrmxpmmask;
                } else {
-                       xpm = trashxpm;
-                       mask = trashxpmmask;
-                       openxpm = trashopenxpm;
-                       openmask = trashopenxpmmask;
+                       xpm = mark?m_trashxpm:trashxpm;
+                       mask = mark?m_trashxpmmask:trashxpmmask;
+                       openxpm = mark?m_trashopenxpm:trashopenxpm;
+                       openmask = mark?m_trashopenxpmmask:trashopenxpmmask;
                }
                break;
        case F_DRAFT:
-               xpm = draftsxpm;
-               mask = draftsxpmmask;
-               openxpm = draftsopenxpm;
-               openmask = draftsopenxpmmask;
+               xpm = mark?m_draftsxpm:draftsxpm;
+               mask = mark?m_draftsxpmmask:draftsxpmmask;
+               openxpm = mark?m_draftsopenxpm:draftsopenxpm;
+               openmask = mark?m_draftsopenxpmmask:draftsopenxpmmask;
                break;
        default:
                if (item->hide_read_msgs) {
-                       xpm = folderhrmxpm;
-                       mask = folderhrmxpmmask;
-                       openxpm = folderopenhrmxpm;
-                       openmask = folderopenhrmxpmmask;
+                       xpm = mark?m_folderhrmxpm:folderhrmxpm;
+                       mask = mark?m_folderhrmxpmmask:folderhrmxpmmask;
+                       openxpm = mark?m_folderopenhrmxpm:folderopenhrmxpm;
+                       openmask = mark?m_folderopenhrmxpmmask:folderopenhrmxpmmask;
                } else {
-                       xpm = folderxpm;
-                       mask = folderxpmmask;
-                       openxpm = folderopenxpm;
-                       openmask = folderopenxpmmask;
+                       xpm = mark?m_folderxpm:folderxpm;
+                       mask = mark?m_folderxpmmask:folderxpmmask;
+                       openxpm = mark?m_folderopenxpm:folderopenxpm;
+                       openmask = mark?m_folderopenxpmmask:folderopenxpmmask;
                }
        }
+       
+       if (item->no_select) {
+               xpm = openxpm = noselectxpm;
+               mask = openmask = noselectxpmmask;
+       }
+
        name = folder_item_get_name(item);
 
-       if (!GTK_CTREE_ROW(node)->expanded &&
-           folderview_have_unread_children(folderview, node))
-               add_unread_mark = TRUE;
-       else
+       if (!GTK_CTREE_ROW(node)->expanded) {
+               add_unread_mark = folderview_have_unread_children(
+                                       folderview, item);
+               add_sub_match_mark = folderview_have_matching_children(
+                                       folderview, item);
+       } else {
                add_unread_mark = FALSE;
+               add_sub_match_mark = FALSE;
+       }
 
-       if (item->stype == F_QUEUE && item->total_msgs > 0 &&
+       if (item->search_match) {
+               if (!searchicon) {
+                       stock_pixmap_gdk(folderview->ctree, STOCK_PIXMAP_QUICKSEARCH,
+                        &searchicon, &searchmask);
+               }
+               xpm = openxpm = searchicon;
+               mask = openmask = searchmask;
+       }
+
+       if (folder_has_parent_of_type(item, F_QUEUE) && item->total_msgs > 0 &&
            prefs_common.display_folder_unread) {
                str = g_strdup_printf("%s (%d%s)", name, item->total_msgs,
                                      add_unread_mark ? "+" : "");
-               gtk_ctree_set_node_info(ctree, node, str, FOLDER_SPACING,
+               gtk_sctree_set_node_info(ctree, node, str, FOLDER_SPACING,
                                        xpm, mask, openxpm, openmask,
                                        FALSE, GTK_CTREE_ROW(node)->expanded);
                g_free(str);
-       } else if ((item->unread_msgs > 0 || add_unread_mark) &&
-                prefs_common.display_folder_unread) {
+       } else if (((item->unread_msgs > 0 || add_unread_mark) &&
+                   prefs_common.display_folder_unread) 
+                  || add_sub_match_mark) {
 
                if (item->unread_msgs > 0)
                        str = g_strdup_printf("%s (%d%s%s)", name, item->unread_msgs,
-                                             add_unread_mark ? "+" : "", 
+                                             add_unread_mark || add_sub_match_mark ? "+" : "", 
                                              item->unreadmarked_msgs > 0 ? "!":"");
                else
                        str = g_strdup_printf("%s (+)", name);
-               gtk_ctree_set_node_info(ctree, node, str, FOLDER_SPACING,
+               gtk_sctree_set_node_info(ctree, node, str, FOLDER_SPACING,
                                        xpm, mask, openxpm, openmask,
                                        FALSE, GTK_CTREE_ROW(node)->expanded);
                g_free(str);
@@ -1150,37 +1393,39 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                str = g_strdup_printf("%s%s", name, 
                                      item->unreadmarked_msgs > 0 ? " (!)":"");
        
-               gtk_ctree_set_node_info(ctree, node, str, FOLDER_SPACING,
+               gtk_sctree_set_node_info(ctree, node, str, FOLDER_SPACING,
                                        xpm, mask, openxpm, openmask,
                                        FALSE, GTK_CTREE_ROW(node)->expanded);
                g_free(str);
        }
        g_free(name);
 
-       if (!item->parent) {
-               gtk_ctree_node_set_text(ctree, node, COL_NEW,    "-");
-               gtk_ctree_node_set_text(ctree, node, COL_UNREAD, "-");
-               gtk_ctree_node_set_text(ctree, node, COL_TOTAL,  "-");
+       if (!folder_item_parent(item)) {
+               gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_NEW],    "-");
+               gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_UNREAD], "-");
+               gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_TOTAL],  "-");
        } else {
-               gtk_ctree_node_set_text(ctree, node, COL_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));
+               gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_NEW],    itos(item->new_msgs));
+               gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_UNREAD], itos(item->unread_msgs));
+               gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_TOTAL],  itos(item->total_msgs));
        }
 
-       if (item->stype == F_OUTBOX || item->stype == F_DRAFT ||
-           item->stype == F_TRASH) {
+       if (folder_has_parent_of_type(item, F_OUTBOX) ||
+           folder_has_parent_of_type(item, F_DRAFT) ||
+           folder_has_parent_of_type(item, F_TRASH)) {
                use_bold = use_color = FALSE;
-       } else if (item->stype == F_QUEUE) {
+       } else if (folder_has_parent_of_type(item, F_QUEUE)) {
                /* highlight queue folder if there are any messages */
                use_bold = use_color = (item->total_msgs > 0);
        } else {
                /* if unread messages exist, print with bold font */
-               use_bold = (item->unread_msgs > 0) || add_unread_mark;
+               use_bold = (item->unread_msgs > 0|| item->new_msgs > 0) 
+                               || add_unread_mark;
                /* if new messages exist, print with colored letter */
                use_color =
                        (item->new_msgs > 0) ||
                        (add_unread_mark &&
-                        folderview_have_new_children(folderview, node));       
+                        folderview_have_new_children(folderview, item));       
        }
 
        gtk_ctree_node_set_foreground(ctree, node, NULL);
@@ -1208,7 +1453,6 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                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;
@@ -1223,13 +1467,58 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                folderview_update_node(folderview, node);
 }
 
-gboolean folderview_update_item(gpointer source, gpointer data)
+#if !CLAWS /* keep it here for syncs */
+void folderview_update_item(FolderItem *item, gboolean update_summary)
+{
+       GList *list;
+       FolderView *folderview;
+       GtkCTree *ctree;
+       GtkCTreeNode *node;
+
+       g_return_if_fail(item != NULL);
+
+       for (list = folderview_list; list != NULL; list = list->next) {
+               folderview = (FolderView *)list->data;
+               ctree = GTK_CTREE(folderview->ctree);
+
+               node = gtk_ctree_find_by_row_data(ctree, NULL, item);
+               if (node) {
+                       folderview_update_node(folderview, node);
+                       if (update_summary && folderview->opened == node)
+                               summary_show(folderview->summaryview,
+                                            item, FALSE);
+               }
+       }
+}
+#endif
+
+void folderview_update_search_icon(FolderItem *item, gboolean matches)
+{
+       GList *list;
+       FolderView *folderview;
+       GtkCTree *ctree;
+       GtkCTreeNode *node;
+
+       g_return_if_fail(item != NULL);
+
+       for (list = folderview_list; list != NULL; list = list->next) {
+               folderview = (FolderView *)list->data;
+               ctree = GTK_CTREE(folderview->ctree);
+
+               node = gtk_ctree_find_by_row_data(ctree, NULL, item);
+               if (node) {
+                       item->search_match = matches;
+                       folderview_update_node(folderview, node);
+               }
+       }
+}
+
+gboolean folderview_update_item_claws(gpointer source, gpointer data)
 {
        FolderItemUpdateData *update_info = (FolderItemUpdateData *)source;
        FolderView *folderview = (FolderView *)data;
        GtkCTree *ctree;
        GtkCTreeNode *node;
-
        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);
@@ -1238,7 +1527,7 @@ gboolean folderview_update_item(gpointer source, gpointer data)
 
        node = gtk_ctree_find_by_row_data(ctree, NULL, update_info->item);
        if (node) {
-               if (update_info->update_flags & F_ITEM_UPDATE_MSGCNT)
+               if (update_info->update_flags & (F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_NAME))
                        folderview_update_node(folderview, node);
                if ((update_info->update_flags & F_ITEM_UPDATE_CONTENT) && (folderview->opened == node))
                        summary_show(folderview->summaryview, update_info->item);
@@ -1247,6 +1536,26 @@ gboolean folderview_update_item(gpointer source, gpointer data)
        return FALSE;
 }
 
+static void folderview_update_item_foreach_func(gpointer key, gpointer val,
+                                               gpointer data)
+{
+       /* CLAWS: share this joy with other hook functions ... */
+       folder_item_update((FolderItem *)key, 
+                          (FolderItemUpdateFlags)GPOINTER_TO_INT(data));
+}
+
+void folderview_update_item_foreach(GHashTable *table, gboolean update_summary)
+{
+       GList *list;
+       FolderItemUpdateFlags flags;
+       
+       flags = update_summary ?  F_ITEM_UPDATE_CONTENT | F_ITEM_UPDATE_MSGCNT
+               : 0;
+       for (list = folderview_list; list != NULL; list = list->next)
+               g_hash_table_foreach(table, folderview_update_item_foreach_func, 
+                                    GINT_TO_POINTER(flags));
+}
+
 static gboolean folderview_gnode_func(GtkCTree *ctree, guint depth,
                                      GNode *gnode, GtkCTreeNode *cnode,
                                      gpointer data)
@@ -1279,26 +1588,37 @@ static void folderview_expand_func(GtkCTree *ctree, GtkCTreeNode *node,
        }
 }
 
-#define SET_SPECIAL_FOLDER(ctree, item) \
-{ \
-       if (item) { \
-               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 { \
-                       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, parent, sibling); \
-               } \
- \
-               prev = node; \
-       } \
+static void set_special_folder(GtkCTree *ctree, FolderItem *item,
+                              GtkCTreeNode *root, GtkCTreeNode **prev)
+{
+       if (item) {
+               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 {
+                       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;
+                       while (sibling) {
+                               FolderItem *tmp;
+
+                               tmp = gtk_ctree_node_get_row_data
+                                       (ctree, sibling);
+                               if (tmp->stype != F_NORMAL)
+                                       sibling = GTK_CTREE_ROW(sibling)->sibling;
+                               else
+                                       break;
+                       }
+                       if (node != sibling)
+                               gtk_ctree_move(ctree, node, parent, sibling);
+               }
+
+               *prev = node;
+       }
 }
 
 static void folderview_sort_folders(FolderView *folderview, GtkCTreeNode *root,
@@ -1309,13 +1629,13 @@ static void folderview_sort_folders(FolderView *folderview, GtkCTreeNode *root,
 
        gtk_sctree_sort_recursive(ctree, root);
 
-       if (GTK_CTREE_ROW(root)->parent) return;
+       if (root && GTK_CTREE_ROW(root)->parent) return;
 
-       SET_SPECIAL_FOLDER(ctree, folder->inbox);
-       SET_SPECIAL_FOLDER(ctree, folder->outbox);
-       SET_SPECIAL_FOLDER(ctree, folder->draft);
-       SET_SPECIAL_FOLDER(ctree, folder->queue);
-       SET_SPECIAL_FOLDER(ctree, folder->trash);
+       set_special_folder(ctree, folder->inbox, root, &prev);
+       set_special_folder(ctree, folder->outbox, root, &prev);
+       set_special_folder(ctree, folder->draft, root, &prev);
+       set_special_folder(ctree, folder->queue, root, &prev);
+       set_special_folder(ctree, folder->trash, root, &prev);
 }
 
 static void folderview_append_folder(FolderView *folderview, Folder *folder)
@@ -1332,117 +1652,38 @@ static void folderview_append_folder(FolderView *folderview, Folder *folder)
        folderview_sort_folders(folderview, root, folder);
 }
 
-void folderview_new_folder(FolderView *folderview)
-{
-       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);
-
-       switch (FOLDER_TYPE(item->folder)) {
-       case F_MBOX:
-               folderview_new_mbox_folder_cb(folderview, 0, NULL);
-               break;
-       case F_MH:
-       case F_MAILDIR:
-               folderview_new_folder_cb(folderview, 0, NULL);
-               break;
-       case F_IMAP:
-               folderview_new_imap_folder_cb(folderview, 0, NULL);
-               break;
-       case F_NEWS:
-       default:
-               break;
-       }
-}
-
-void folderview_rename_folder(FolderView *folderview)
-{
-       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 (!item->path) return;
-       if (item->stype != F_NORMAL) return;
-
-       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:
-               folderview_rename_folder_cb(folderview, 0, NULL);
-               break;
-       case F_NEWS:
-       default:
-               break;
-       }
-}
-
-void folderview_delete_folder(FolderView *folderview)
-{
-       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 (!item->path) return;
-       if (item->stype != F_NORMAL) return;
-
-       switch (FOLDER_TYPE(item->folder)) {
-       case F_MH:
-       case F_MBOX:
-       case F_MAILDIR:
-       case F_IMAP:
-               folderview_delete_folder_cb(folderview, 0, NULL);
-               break;
-       case F_NEWS:
-       default:
-               break;
-       }
-}
-
-
 /* callback functions */
 
-static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
-                                     FolderView *folderview)
+static gboolean folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
+                                         FolderView *folderview)
 {
        GtkCList *clist = GTK_CLIST(ctree);
        gint prev_row = -1, row = -1, column = -1;
        FolderItem *item;
        Folder *folder;
+       FolderViewPopup *fpopup;
+       GtkItemFactory *fpopup_factory;
        GtkWidget *popup;
-       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;
-       gboolean remove_tree     = FALSE;
-       gboolean search_folder   = FALSE;
-       gboolean folder_property = FALSE;
-       gboolean folder_processing  = FALSE;
-       gboolean folder_scoring  = FALSE;
-
-       if (!event) return;
+       FolderItem *special_trash = NULL;
+       PrefsAccount *ac;
+
+       if (!event) return FALSE;
 
        if (event->button == 1) {
                folderview->open_folder = TRUE;
-               return;
+
+               if (event->type == GDK_2BUTTON_PRESS) {
+                       if (clist->selection) {
+                               GtkCTreeNode *node;
+
+                               node = GTK_CTREE_NODE(clist->selection->data);
+                               if (node)
+                                       gtk_ctree_toggle_expansion(
+                                               GTK_CTREE(ctree),
+                                               node);
+                       }
+               }
+               return FALSE;
        }
 
        if (event->button == 2 || event->button == 3) {
@@ -1458,7 +1699,7 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
 
                if (!gtk_clist_get_selection_info(clist, event->x, event->y,
                                                  &row, &column))
-                       return;
+                       return FALSE;
                if (prev_row != row) {
                        gtk_clist_unselect_all(clist);
                        if (event->button == 2)
@@ -1471,112 +1712,65 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
                }
        }
 
-       if (event->button != 3) return;
+       if (event->button != 3) return FALSE;
 
        item = gtk_clist_get_row_data(clist, row);
-       g_return_if_fail(item != NULL);
-       g_return_if_fail(item->folder != NULL);
+       g_return_val_if_fail(item != NULL, FALSE);
+       g_return_val_if_fail(item->folder != NULL, FALSE);
        folder = item->folder;
 
-       if (folderview->mainwin->lock_count == 0) {
-               new_folder = TRUE;
-               if (item->parent == NULL) {
-                       update_tree = remove_tree = 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)
-                               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)
-                               folder_processing = TRUE;
-                       else if (item->stype == F_OUTBOX)
-                               folder_processing = TRUE;
-               } else if (FOLDER_TYPE(folder) == F_NEWS) {
-                       if (item->parent != NULL)
-                               delete_folder = folder_scoring = folder_processing = TRUE;
-               }
-               if (item->unread_msgs < 1) 
-                       mark_all_read = FALSE;
+       fpopup = g_hash_table_lookup(folderview_popups, folder->klass->idstr);
+       if (fpopup != NULL)
+               fpopup_factory = g_hash_table_lookup(folderview->popups, folder->klass->idstr);
+       else {
+               fpopup = g_hash_table_lookup(folderview_popups, "common");
+               fpopup_factory = g_hash_table_lookup(folderview->popups, "common");
        }
 
-#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, "/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);
-               SET_SENS(mail_factory, "/Remove mailbox", remove_tree);
-               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);
-       } 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, "/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);
-               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);
-       } 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);
-               SET_SENS(news_factory, "/Check for new messages", update_tree);
-               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) {
-               popup = folderview->mbox_popup;
-               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);
-               SET_SENS(mbox_factory, "/Scoring...", folder_scoring);
-       } else
-               return;
+       if (fpopup->set_sensitivity != NULL)
+               fpopup->set_sensitivity(fpopup_factory, item);
+
+       if (NULL != (ac = account_find_from_item(item)))
+               special_trash = account_get_special_folder(ac, F_TRASH);
 
+       if ((item == folder->trash || item == special_trash
+            || folder_has_parent_of_type(item, F_TRASH)) &&
+           gtk_item_factory_get_item(fpopup_factory, "/Empty trash...") == NULL) {
+               gtk_item_factory_create_item(fpopup_factory, &folder_view_trash_popup_entries[0], folderview, 1);
+               gtk_item_factory_create_item(fpopup_factory, &folder_view_trash_popup_entries[1], folderview, 1);
+       } else if (item != folder->trash && (special_trash == NULL || item != special_trash)
+               && !folder_has_parent_of_type(item, F_TRASH)) {
+               gtk_item_factory_delete_entry(fpopup_factory, &folder_view_trash_popup_entries[0]);
+               gtk_item_factory_delete_entry(fpopup_factory, &folder_view_trash_popup_entries[1]);
+       }
+       
+#define SET_SENS(name, sens) \
+       menu_set_sensitive(fpopup_factory, name, sens)
+
+       SET_SENS("/Mark all read", item->unread_msgs >= 1);
+       SET_SENS("/Search folder...", item->total_msgs >= 1 && 
+                folderview->selected == folderview->opened);
+       SET_SENS("/Properties...", item->node->parent != NULL);
+       SET_SENS("/Processing...", item->node->parent != NULL);
+       if (item == folder->trash || item == special_trash
+           || folder_has_parent_of_type(item, F_TRASH)) {
+               GSList *msglist = folder_item_get_msg_list(item);
+               SET_SENS("/Empty trash...", msglist != NULL);
+               procmsg_msg_list_free(msglist);
+       }
 #undef SET_SENS
 
+       popup = gtk_item_factory_get_widget(fpopup_factory, fpopup->path);
        gtk_menu_popup(GTK_MENU(popup), NULL, NULL, NULL, NULL,
                       event->button, event->time);
+
+       return FALSE;
 }
 
-static void folderview_button_released(GtkWidget *ctree, GdkEventButton *event,
-                                      FolderView *folderview)
+static gboolean folderview_button_released(GtkWidget *ctree, GdkEventButton *event,
+                                          FolderView *folderview)
 {
-       if (!event) return;
+       if (!event) return FALSE;
 
        if (event->button == 1 && folderview->open_folder == FALSE &&
            folderview->opened != NULL) {
@@ -1584,12 +1778,17 @@ static void folderview_button_released(GtkWidget *ctree, GdkEventButton *event,
                                          folderview->opened);
                gtk_ctree_select(GTK_CTREE(ctree), folderview->opened);
        }
+
+       return FALSE;
 }
 
-static void folderview_key_pressed(GtkWidget *widget, GdkEventKey *event,
-                                  FolderView *folderview)
+static gboolean folderview_key_pressed(GtkWidget *widget, GdkEventKey *event,
+                                      FolderView *folderview)
 {
-       if (!event) return;
+       if (!event) return FALSE;
+
+       if (quicksearch_has_focus(folderview->summaryview->quicksearch))
+               return FALSE;
 
        switch (event->keyval) {
        case GDK_Return:
@@ -1612,6 +1811,8 @@ static void folderview_key_pressed(GtkWidget *widget, GdkEventKey *event,
        default:
                break;
        }
+
+       return FALSE;
 }
 
 static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
@@ -1628,7 +1829,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                folderview->open_folder = FALSE;
                return;
        }
-
+       
        if (!can_select || summary_is_locked(folderview->summaryview)) {
                gtkut_ctree_set_focus_row(ctree, folderview->opened);
                gtk_ctree_select(ctree, folderview->opened);
@@ -1638,7 +1839,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
        if (!folderview->open_folder) return;
 
        item = gtk_ctree_node_get_row_data(ctree, row);
-       if (!item) return;
+       if (!item || item->no_select) return;
 
        can_select = FALSE;
 
@@ -1651,6 +1852,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                if (olditem) {
                        /* will be null if we just moved the previously opened folder */
                        summary_save_prefs_to_folderitem(folderview->summaryview, olditem);
+                       summary_show(folderview->summaryview, NULL);
                        folder_item_close(olditem);
                }
        }
@@ -1694,9 +1896,12 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
 
                alertpanel_error(_("Folder could not be opened."));
 
+               folderview->open_folder = FALSE;
+               can_select = TRUE;
+
                return;
         }
-
+       
        main_window_cursor_normal(folderview->mainwin);
 
        /* Show messages */
@@ -1739,7 +1944,7 @@ static void folderview_tree_collapsed(GtkCTree *ctree, GtkCTreeNode *node,
 
        item = gtk_ctree_node_get_row_data(ctree, node);
        g_return_if_fail(item != NULL);
-       item->collapsed= TRUE;
+       item->collapsed = TRUE;
        folderview_update_node(folderview, node);
 }
 
@@ -1748,73 +1953,15 @@ static void folderview_popup_close(GtkMenuShell *menu_shell,
 {
        if (!folderview->opened) return;
 
-       gtkut_ctree_set_focus_row(GTK_CTREE(folderview->ctree),
-                                 folderview->opened);
        gtk_ctree_select(GTK_CTREE(folderview->ctree), folderview->opened);
 }
 
 static void folderview_col_resized(GtkCList *clist, gint column, gint width,
                                   FolderView *folderview)
 {
-       switch (column) {
-       case COL_FOLDER:
-               prefs_common.folder_col_folder = width;
-               break;
-       case COL_NEW:
-               prefs_common.folder_col_new = width;
-               break;
-       case COL_UNREAD:
-               prefs_common.folder_col_unread = width;
-               break;
-       case COL_TOTAL:
-               prefs_common.folder_col_total = width;
-               break;
-       default:
-               break;
-       }
-}
-
-static GtkCTreeNode *folderview_find_by_name(GtkCTree *ctree,
-                                            GtkCTreeNode *node,
-                                            const gchar *name)
-{
-       FolderItem *item;
-
-       if (!node)
-               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
-       if (!node)
-               return NULL;
-
-       node = GTK_CTREE_ROW(node)->children;
-
-       while (node) {
-               item = gtk_ctree_node_get_row_data(ctree, node);
-               if (!folderview_compare_name(item, name))
-                       return node;
-               node = GTK_CTREE_ROW(node)->sibling;
-       }
-
-       return NULL;
-}
-
-static void folderview_update_tree_cb(FolderView *folderview, guint action,
-                                     GtkWidget *widget)
-{
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       FolderItem *item;
-
-       if (!folderview->selected) return;
-
-       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);
+       FolderColumnType type = folderview->col_state[column].type;
 
-       if (action == 0)
-               folderview_check_new(item->folder);
-       else
-               folderview_rescan_tree(item->folder);
+       prefs_common.folder_col_size[type] = width;
 }
 
 void folderview_create_folder_node_recursive(FolderView *folderview, FolderItem *item)
@@ -1822,7 +1969,10 @@ void folderview_create_folder_node_recursive(FolderView *folderview, FolderItem
        GNode *srcnode;
 
        folderview_create_folder_node(folderview, item);
-       
+
+       if (!item || !item->folder || !item->folder->node)
+               return;
+
        srcnode = item->folder->node;   
        srcnode = g_node_find(srcnode, G_PRE_ORDER, G_TRAVERSE_ALL, item);
        srcnode = srcnode->children;
@@ -1840,13 +1990,17 @@ 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);
+       gint *col_pos = folderview->col_pos;
+       FolderItemUpdateData hookdata;
+
+       parent_node = gtk_ctree_find_by_row_data(ctree, NULL, folder_item_parent(item));
+       if (parent_node == NULL)
+               return;
 
        gtk_clist_freeze(GTK_CLIST(ctree));
 
-       text[COL_FOLDER] = item->name;
-       node = gtk_ctree_insert_node(ctree, parent_node, NULL, text,
+       text[col_pos[F_COL_FOLDER]] = item->name;
+       node = gtk_sctree_insert_node(ctree, parent_node, NULL, text,
                                     FOLDER_SPACING,
                                     folderxpm, folderxpmmask,
                                     folderopenxpm, folderopenxpmmask,
@@ -1855,607 +2009,58 @@ void folderview_create_folder_node(FolderView *folderview, FolderItem *item)
        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);
+       folderview_sort_folders(folderview, parent_node, item->folder);
+
+       hookdata.item = item;
+       hookdata.update_flags = F_ITEM_UPDATE_NAME;
+       hookdata.msg = NULL;
+       hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &hookdata);
 
        gtk_clist_thaw(GTK_CLIST(ctree));
 }
 
-static void folderview_new_folder_cb(FolderView *folderview, guint action,
-                                    GtkWidget *widget)
+static void folderview_empty_trash_cb(FolderView *folderview, guint action,
+                                     GtkWidget *widget)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        FolderItem *item;
-       FolderItem *new_item;
-       gchar *new_folder;
-       gchar *name, *name_;
+       GSList *mlist = NULL;
+       GSList *cur = NULL;
+       FolderItem *special_trash = NULL;
+       PrefsAccount *ac;
 
        if (!folderview->selected) return;
-
        item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
 
-       new_folder = input_dialog(_("New folder"),
-                                 _("Input the name of new folder:"),
-                                 _("NewFolder"));
-       if (!new_folder) return;
+       if (NULL != (ac = account_find_from_item(item)))
+               special_trash = account_get_special_folder(ac, F_TRASH);
 
-       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);
-                       g_free(new_folder);
+       if (item != item->folder->trash && item != special_trash
+       &&  !folder_has_parent_of_type(item, F_TRASH)) return;
+       
+       if (prefs_common.ask_on_clean) {
+               if (alertpanel(_("Empty trash"),
+                              _("Delete all messages in trash?"),
+                              GTK_STOCK_YES, GTK_STOCK_NO, NULL) != G_ALERTDEFAULT)
                        return;
-               }
        }
-
-       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."), name);
-               g_free(new_folder);
-               return;
-       }
-
-       new_item = folder_create_folder(item, new_folder);
-       if (!new_item) {
-               alertpanel_error(_("Can't create the folder `%s'."), name);
-               g_free(new_folder);
-               return;
-       } 
-       g_free(new_folder);
-
-       folderview_create_folder_node(folderview, new_item);
-
-       folder_write_list();
-}
-
-static void folderview_new_mbox_folder_cb(FolderView *folderview, guint action,
-                                         GtkWidget *widget)
-{
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       FolderItem *item;
-       FolderItem *new_item;
-       gchar *new_folder;
-
-       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);
-
-       new_folder = input_dialog(_("New folder"),
-                                 _("Input the name of new folder:"),
-                                 _("NewFolder"));
-       if (!new_folder) return;
-
-       /* 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);
-               g_free(new_folder);
-               return;
-       }
-
-       new_item = folder_create_folder(item, new_folder);
-       g_free(new_folder);
-       if (!new_item) return;
-
-       folderview_create_folder_node(folderview, new_item);
-
-       folder_write_list();
-}
-
-static void folderview_rename_folder_cb(FolderView *folderview, guint action,
-                                       GtkWidget *widget)
-{
-       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;
-
-       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
-       g_return_if_fail(item != NULL);
-       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(_("Input new name for `%s':"), name);
-       new_folder = input_dialog(_("Rename folder"), message,
-                                 g_basename(item->path));
-       g_free(message);
-       if (!new_folder) return;
-
-       if (strchr(new_folder, G_DIR_SEPARATOR) != NULL) {
-               alertpanel_error(_("`%c' can't be included in folder name."),
-                                G_DIR_SEPARATOR);
-               g_free(new_folder);
-               return;
-       }
-
-       if (folderview_find_by_name
-               (ctree, GTK_CTREE_ROW(folderview->selected)->parent,
-                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->klass->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 ||
-           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));
-
-       folder_write_list();
-}
-
-static void folderview_rename_mbox_folder_cb(FolderView *folderview,
-                                            guint action,
-                                            GtkWidget *widget)
-{
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       FolderItem *item;
-       gchar *new_folder;
-       gchar *message;
-
-       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->path != NULL);
-       g_return_if_fail(item->folder != NULL);
-
-       message = g_strdup_printf(_("Input new name for `%s':"),
-                                 g_basename(item->path));
-       new_folder = input_dialog(_("Rename folder"), message,
-                                 g_basename(item->path));
-       g_free(message);
-       if (!new_folder) return;
-
-       if (folderview_find_by_name
-               (ctree, GTK_CTREE_ROW(folderview->selected)->parent,
-                new_folder)) {
-               alertpanel_error(_("The folder `%s' already exists."),
-                                new_folder);
-               g_free(new_folder);
-               return;
-       }
-
-       if (item->folder->klass->rename_folder(item->folder, item, new_folder) < 0) {
-               g_free(new_folder);
-               return;
-       }
-       g_free(new_folder);
-
-       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);
-       }
-
-       gtk_clist_thaw(GTK_CLIST(ctree));
-
-       folder_write_list();
-}
-
-static void folderview_delete_folder_cb(FolderView *folderview, guint action,
-                                       GtkWidget *widget)
-{
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       FolderItem *item;
-       gchar *message, *name, *name_;
-       AlertValue avalue;
-       gchar *old_path;
-       gchar *old_id;
-
-       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->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?"), 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->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,
-                                    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,
-                                 folderview->opened)) {
-               summary_clear_all(folderview->summaryview);
-               folderview->opened = NULL;
-       }
-
-       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,
-                                        GtkWidget *widget)
-{
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       GtkCTreeNode *node;
-       FolderItem *item;
-       gchar *name, *name_;
-       gchar *message;
-       AlertValue avalue;
-
-       if (!folderview->selected) return;
-       node = folderview->selected;
-       item = gtk_ctree_node_get_row_data(ctree, node);
-       g_return_if_fail(item != NULL);
-       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 the disk)"), name);
-       avalue = alertpanel(_("Remove mailbox"), message,
-                           _("Yes"), _("+No"), NULL);
-       g_free(message);
-       if (avalue != G_ALERTDEFAULT) return;
-
-       folder_destroy(item->folder);
-       summary_clear_all(folderview->summaryview);
-       folderview_unselect(folderview);
-       gtk_ctree_remove_node(ctree, node);
-       folder_write_list();
-}
-
-static void folderview_new_imap_folder_cb(FolderView *folderview, guint action,
-                                         GtkWidget *widget)
-{
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       FolderItem *item;
-       FolderItem *new_item;
-       gchar *new_folder;
-       gchar *name, *name_;
-       gchar *p;
-
-       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(FOLDER_TYPE(item->folder) == F_IMAP);
-       g_return_if_fail(item->folder->account != NULL);
-
-       new_folder = input_dialog
-               (_("New folder"),
-                _("Input the name of new folder:\n"
-                  "(if you want to create a folder to store subfolders,\n"
-                  " append `/' at the end of the name)"),
-                _("NewFolder"));
-       if (!new_folder) return;
-
-       if ((p = strchr(new_folder, G_DIR_SEPARATOR)) != NULL &&
-           *(p + 1) != '\0') {
-               alertpanel_error(_("`%c' can't be included in folder name."),
-                                G_DIR_SEPARATOR);
-               g_free(new_folder);
-               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."), name);
-               g_free(new_folder);
-               return;
-       }
-
-       new_item = folder_create_folder(item, new_folder);
-       if (!new_item) {
-               alertpanel_error(_("Can't create the folder `%s'."), name);
-               g_free(new_folder);
-               return;
-       }
-       g_free(new_folder);
-
-       folderview_create_folder_node(folderview, new_item);
-
-       folder_write_list();
-}
-
-static void folderview_rm_imap_server_cb(FolderView *folderview, guint action,
-                                        GtkWidget *widget)
-{
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       FolderItem *item;
-       PrefsAccount *account;
-       gchar *name, *name_;
-       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(FOLDER_TYPE(item->folder) == F_IMAP);
-       g_return_if_fail(item->folder->account != NULL);
-
-       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);
-
-       if (avalue != G_ALERTDEFAULT) return;
-
-       if (folderview->opened == folderview->selected ||
-           gtk_ctree_is_ancestor(ctree,
-                                 folderview->selected,
-                                 folderview->opened)) {
-               summary_clear_all(folderview->summaryview);
-               folderview->opened = NULL;
-       }
-
-       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();
-       folder_write_list();
-}
-
-static void folderview_new_news_group_cb(FolderView *folderview, guint action,
-                                        GtkWidget *widget)
-{
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       gchar *text[N_FOLDER_COLS] = {NULL, "0", "0", "0"};
-       GtkCTreeNode *servernode, *node;
-       Folder *folder;
-       FolderItem *item;
-       FolderItem *rootitem;
-       FolderItem *newitem;
-       GSList *new_subscr;
-       GSList *cur;
-       GNode *gnode;
-
-       if (!folderview->selected) return;
-
-       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
-       g_return_if_fail(item != NULL);
-       folder = item->folder;
-       g_return_if_fail(folder != NULL);
-       g_return_if_fail(FOLDER_TYPE(folder) == F_NEWS);
-       g_return_if_fail(folder->account != NULL);
-
-       if (GTK_CTREE_ROW(folderview->selected)->parent != NULL)
-               servernode = GTK_CTREE_ROW(folderview->selected)->parent;
-       else
-               servernode = folderview->selected;
-
-       rootitem = gtk_ctree_node_get_row_data(ctree, servernode);
-
-       new_subscr = grouplist_dialog(folder);
-
-       /* remove unsubscribed newsgroups */
-       for (gnode = folder->node->children; gnode != NULL; ) {
-               GNode *next = gnode->next;
-
-               item = FOLDER_ITEM(gnode->data);
-               if (g_slist_find_custom(new_subscr, item->path,
-                                       (GCompareFunc)g_strcasecmp) != NULL) {
-                       gnode = next;
-                       continue;
-               }
-
-               node = gtk_ctree_find_by_row_data(ctree, servernode, item);
-               if (!node) {
-                       gnode = next;
-                       continue;
-               }
-
-               if (folderview->opened == node) {
-                       summary_clear_all(folderview->summaryview);
-                       folderview->opened = NULL;
-               }
-
-               folder_item_remove(item);
-               gtk_ctree_remove_node(ctree, node);
-
-               gnode = next;
-       }
-
-       gtk_clist_freeze(GTK_CLIST(ctree));
-
-       /* add subscribed newsgroups */
-       for (cur = new_subscr; cur != NULL; cur = cur->next) {
-               gchar *name = (gchar *)cur->data;
-
-               if (folderview_find_by_name(ctree, servernode, name) != NULL)
-                       continue;
-
-               text[COL_FOLDER] = name;
-               node = gtk_ctree_insert_node(ctree, servernode, NULL, text,
-                                            FOLDER_SPACING,
-                                            folderxpm, folderxpmmask,
-                                            folderopenxpm, folderopenxpmmask,
-                                            FALSE, FALSE);
-               gtk_ctree_expand(ctree, servernode);
-
-               newitem = folder_item_new(folder, name, name);
-               folder_item_append(rootitem, newitem);
-               gtk_ctree_node_set_row_data(ctree, node, newitem);
-       }
-
-       folderview_sort_folders(folderview, servernode, folder);
-       gtk_clist_thaw(GTK_CLIST(ctree));
-
-       slist_free_strings(new_subscr);
-       g_slist_free(new_subscr);
-
-       folder_write_list();
-}
-
-static void folderview_rm_news_group_cb(FolderView *folderview, guint action,
-                                       GtkWidget *widget)
-{
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       FolderItem *item;
-       gchar *name, *name_;
-       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(FOLDER_TYPE(item->folder) == F_NEWS);
-       g_return_if_fail(item->folder->account != NULL);
-
-       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);
-       if (avalue != G_ALERTDEFAULT) return;
-
-       if (folderview->opened == folderview->selected) {
-               summary_clear_all(folderview->summaryview);
-               folderview->opened = NULL;
-       }
-
-       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,
-                                        GtkWidget *widget)
-{
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       FolderItem *item;
-       PrefsAccount *account;
-       gchar *name, *name_;
-       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(FOLDER_TYPE(item->folder) == F_NEWS);
-       g_return_if_fail(item->folder->account != NULL);
-
-       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);
-
-       if (avalue != G_ALERTDEFAULT) return;
-
-       if (folderview->opened == folderview->selected ||
-           gtk_ctree_is_ancestor(ctree,
-                                 folderview->selected,
-                                 folderview->opened)) {
-               summary_clear_all(folderview->summaryview);
-               folderview->opened = NULL;
+       mlist = folder_item_get_msg_list(item);
+       
+       for (cur = mlist ; cur != NULL ; cur = cur->next) {
+               MsgInfo * msginfo = (MsgInfo *) cur->data;
+               if (MSG_IS_LOCKED(msginfo->flags))
+                       continue;
+               /* is it partially received? (partial_recv isn't cached) */
+               if (msginfo->total_size != 0 && 
+                   msginfo->size != (off_t)msginfo->total_size)
+                       partial_mark_for_delete(msginfo);
        }
+       procmsg_msg_list_free(mlist);
 
-       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();
-       folder_write_list();
+       folder_item_remove_all_msg(item);
 }
 
 static void folderview_search_cb(FolderView *folderview, guint action,
@@ -2476,12 +2081,10 @@ static void folderview_property_cb(FolderView *folderview, guint action,
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
 
-       if (item->parent == NULL && item->folder->account)
-               account_open(item->folder->account);
-       else {
-               summary_save_prefs_to_folderitem(folderview->summaryview, item);
-               prefs_folder_item_open(item);
-       }
+       if (folder_item_parent(item) == NULL)
+               return;
+
+       prefs_folder_item_open(item);
 }
 
 static void folderview_recollapse_nodes(FolderView *folderview, GtkCTreeNode *node)
@@ -2504,37 +2107,8 @@ static void folderview_recollapse_nodes(FolderView *folderview, GtkCTreeNode *no
        g_slist_free(done);
 }
 
-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_move_to_cb(FolderView *folderview) 
-{
-       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_move_to(FolderView *folderview, FolderItem *from_folder,
-                              FolderItem *to_folder)
+void folderview_move_folder(FolderView *folderview, FolderItem *from_folder,
+                           FolderItem *to_folder)
 {
        FolderItem *from_parent = NULL;
        FolderItem *new_folder = NULL;
@@ -2542,8 +2116,29 @@ static void folderview_move_to(FolderView *folderview, FolderItem *from_folder,
        gchar *buf;
        gint status;
 
+       g_return_if_fail(folderview != NULL);
+       g_return_if_fail(from_folder != NULL);
+       g_return_if_fail(to_folder != NULL);
+
        src_node = gtk_ctree_find_by_row_data(GTK_CTREE(folderview->ctree), NULL, from_folder);
-       from_parent = from_folder->parent;
+       from_parent = folder_item_parent(from_folder);
+       
+       if (prefs_common.warn_dnd) {
+               buf = g_strdup_printf(_("Do you really want to make folder '%s' a "
+                                       "sub-folder of '%s' ?"), from_folder->name,
+                                       to_folder->name);
+               status = alertpanel_full(_("Move folder"), buf,
+                                        GTK_STOCK_YES, GTK_STOCK_NO, NULL, TRUE,
+                                        NULL, ALERT_QUESTION, G_ALERTALTERNATE);
+               g_free(buf);
+
+               if (status != G_ALERTDEFAULT
+                && status != (G_ALERTDEFAULT | G_ALERTDISABLE))
+                       return;
+               if (status & G_ALERTDISABLE)
+                       prefs_common.warn_dnd = FALSE;
+       }
+
        buf = g_strdup_printf(_("Moving %s to %s..."), from_folder->name, to_folder->name);
        STATUSBAR_PUSH(folderview->mainwin, buf);
        g_free(buf);
@@ -2560,18 +2155,11 @@ static void folderview_move_to(FolderView *folderview, FolderItem *from_folder,
                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");
-
-               folderview_create_folder_node_recursive(folderview, new_folder);
-
                folder_item_update_recursive(new_folder, F_ITEM_UPDATE_MSGCNT);
 
                folderview_sort_folders(folderview, 
                        gtk_ctree_find_by_row_data(GTK_CTREE(folderview->ctree), 
-                               NULL, new_folder->parent), new_folder->folder);
+                               NULL, to_folder), new_folder->folder);
                folderview_select(folderview, new_folder);
        } else {
                statusbar_verbosity_set(FALSE);         
@@ -2608,31 +2196,7 @@ static gint folderview_clist_compare(GtkCList *clist,
        if (!item2->name)
                return -1;
 
-       return g_strcasecmp(item1->name, item2->name);
-}
-
-static gint folderview_compare_name(gconstpointer a, gconstpointer b)
-{
-       const FolderItem *item = a;
-       const gchar *name = b;
-
-       if (!item->path) return -1;
-       return strcmp2(g_basename(item->path), name);
-}
-
-static void folderview_scoring_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_scoring_open(item);
+       return g_utf8_collate(item1->name, item2->name);
 }
 
 static void folderview_processing_cb(FolderView *folderview, guint action,
@@ -2640,6 +2204,7 @@ static void folderview_processing_cb(FolderView *folderview, guint action,
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        FolderItem *item;
+       gchar *id, *title;
 
        if (!folderview->selected) return;
 
@@ -2647,7 +2212,12 @@ 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, NULL, NULL);
+       id = folder_item_get_identifier(item);
+       title = g_strdup_printf (_("Processing configuration for folder %s"), id);
+       g_free (id);
+
+       prefs_filtering_open(&item->prefs->processing, title, NULL, NULL);
+       g_free (title);
 }
 
 void folderview_set_target_folder_color(gint color_op) 
@@ -2667,10 +2237,63 @@ void folderview_set_target_folder_color(gint color_op)
        }
 }
 
+static gchar *last_font = NULL;
 void folderview_reflect_prefs_pixmap_theme(FolderView *folderview)
 {
-       folderview_init(folderview);
+       /* force reinit */
+       if (last_font) 
+               g_free(last_font);
+       last_font = NULL;
+       
+}
+
+void folderview_reflect_prefs(void)
+{
+       gboolean update_font = TRUE;
+       FolderView *folderview = mainwindow_get_mainwindow()->folderview;
+       FolderItem *item = folderview_get_selected_item(folderview);
+       GtkAdjustment *pos = gtk_scrolled_window_get_vadjustment(
+                               GTK_SCROLLED_WINDOW(folderview->scrolledwin));
+       gint height = pos->value;
+
+       if (last_font && !strcmp(last_font, NORMAL_FONT))
+               update_font = FALSE;
+
+       if (last_font)
+               g_free(last_font);
+       
+       last_font = g_strdup(NORMAL_FONT);
+
+       if (update_font) {              
+               normal_style = normal_color_style = bold_style = 
+                       bold_color_style = bold_tgtfold_style = NULL;
+
+               folderview_init(folderview);
+       }
+       gtk_clist_freeze(GTK_CLIST(folderview->ctree));
+       folderview_column_set_titles(folderview);
        folderview_set_all();
+
+       g_signal_handlers_block_by_func
+               (G_OBJECT(folderview->ctree),
+                G_CALLBACK(folderview_selected), folderview);
+
+       if (item) {
+               GtkCTreeNode *node = gtk_ctree_find_by_row_data(
+                       GTK_CTREE(folderview->ctree), NULL, item);
+
+               folderview_select(folderview, item);
+               folderview->selected = node;
+       }
+
+       g_signal_handlers_unblock_by_func
+               (G_OBJECT(folderview->ctree),
+                G_CALLBACK(folderview_selected), folderview);
+
+       pos = gtk_scrolled_window_get_vadjustment(
+                               GTK_SCROLLED_WINDOW(folderview->scrolledwin));
+       gtk_adjustment_set_value(pos, height);
+       gtk_clist_thaw(GTK_CLIST(folderview->ctree));
 }
 
 static void drag_state_stop(FolderView *folderview)
@@ -2736,8 +2359,8 @@ static void folderview_drag_data_get(GtkWidget        *widget,
 {
        FolderItem *item;
        GList *cur;
-       gchar *source=NULL;
-       
+       gchar *source = NULL;
+
        for (cur = GTK_CLIST(folderview->ctree)->selection;
             cur != NULL; cur = cur->next) {
                item = gtk_ctree_node_get_row_data
@@ -2768,9 +2391,16 @@ gboolean folderview_update_folder(gpointer source, gpointer userdata)
        ctree = folderview->ctree;
        g_return_val_if_fail(ctree != NULL, FALSE);
 
-       if (hookdata->update_flags & FOLDER_TREE_CHANGED) {
+       if (hookdata->update_flags & FOLDER_ADD_FOLDERITEM)
+               folderview_create_folder_node(folderview, hookdata->item);
+       else if (hookdata->update_flags & FOLDER_REMOVE_FOLDERITEM) {
+               GtkCTreeNode *node;
+
+               node = gtk_ctree_find_by_row_data(GTK_CTREE(ctree), NULL, hookdata->item);
+               if (node != NULL)
+                       gtk_ctree_remove_node(GTK_CTREE(ctree), node);
+       } else if (hookdata->update_flags & (FOLDER_TREE_CHANGED | FOLDER_ADD_FOLDER | FOLDER_REMOVE_FOLDER))
                folderview_set(folderview);
-       }
 
        return FALSE;
 }
@@ -2783,58 +2413,59 @@ static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
                                          FolderView     *folderview)
 {
        gint row, column;
-       FolderItem *item, *src_item = NULL;
+       FolderItem *item = NULL, *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;
+       int height = (int)pos->page_size;
+       int total_height = (int)pos->upper;
+       int vpos = (int) pos->value;
 
        if (gtk_clist_get_selection_info
                (GTK_CLIST(widget), x - 24, y - 24, &row, &column)) {
+               GtkWidget *srcwidget;
+
                if (y > height - 24 && height + vpos < total_height)
                        gtk_adjustment_set_value(pos, (vpos+5 > height ? height : vpos+5));
 
-               if (y < 24 && y > 0)
+               if (y < 48 && 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:
+               srcwidget = gtk_drag_get_source_widget(context);
+               if (srcwidget == folderview->summaryview->ctree) {
+                       /* comes from summaryview */
+                       /* we are copying messages, so only accept folder items that are not
+                          the source item, are no root items and can copy messages */
+                       if (item && item->folder && folder_item_parent(item) != NULL && src_item &&
+                           src_item != item && FOLDER_CLASS(item->folder)->copy_msg != NULL)
                                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)
+               } else if (srcwidget == folderview->ctree) {
+                       /* comes from folderview */
+                       /* we are moving folder items, only accept folders that are not
+                           the source items and can copy messages and create folder items */
+                       if (item && item->folder && src_item && src_item != item &&
+                           FOLDER_CLASS(item->folder)->copy_msg != NULL &&
+                           FOLDER_CLASS(item->folder)->create_folder != NULL)
                                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);
+               g_signal_handlers_block_by_func
+                       (G_OBJECT(widget),
+                        G_CALLBACK(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);
+               g_signal_handlers_unblock_by_func
+                       (G_OBJECT(widget),
+                        G_CALLBACK(folderview_selected), folderview);
                gdk_drag_status(context, 
                                        (context->actions == GDK_ACTION_COPY ?
                                        GDK_ACTION_COPY : GDK_ACTION_MOVE) , time);
@@ -2880,33 +2511,31 @@ static void folderview_drag_received_cb(GtkWidget        *widget,
                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))) {
+               if (!(item && item->folder && item->path && !item->no_select && 
+                     src_item && src_item != item && FOLDER_CLASS(item->folder)->copy_msg != NULL)) {
                        return;
                }
                if (item && src_item) {
                        switch (drag_context->action) {
-                               case GDK_ACTION_COPY:
-                                       summary_copy_selected_to(folderview->summaryview, item);
-                                       gtk_drag_finish(drag_context, TRUE, FALSE, time);
-                                       break;
-                               case GDK_ACTION_MOVE:
-                               case GDK_ACTION_DEFAULT:
-                               default:
-                       if (FOLDER_TYPE(src_item->folder) != FOLDER_TYPE(item->folder) ||
-                           (FOLDER_TYPE(item->folder) == F_IMAP &&
-                            src_item->folder != item->folder))
+                       case GDK_ACTION_COPY:
                                summary_copy_selected_to(folderview->summaryview, item);
-                       else
-                               summary_move_selected_to(folderview->summaryview, item);
-                       gtk_drag_finish(drag_context, TRUE, TRUE, time);
+                               gtk_drag_finish(drag_context, TRUE, FALSE, time);
+                               break;
+                       case GDK_ACTION_MOVE:
+                       case GDK_ACTION_DEFAULT:
+                       default:
+                               if (FOLDER_CLASS(src_item->folder)->remove_msg == NULL)
+                                       summary_copy_selected_to(folderview->summaryview, item);
+                               else
+                                       summary_move_selected_to(folderview->summaryview, item);
+                               gtk_drag_finish(drag_context, TRUE, TRUE, time);
                        }
                } else
                        gtk_drag_finish(drag_context, FALSE, FALSE, time);
        } else {
                /* comes from folderview */
                char *source;
+               gboolean folder_is_normal = TRUE;
                
                source = data->data + 17;
                if (gtk_clist_get_selection_info
@@ -2919,12 +2548,20 @@ static void folderview_drag_received_cb(GtkWidget        *widget,
                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) {
+               folder_is_normal = 
+                       src_item != NULL &&
+                       src_item->stype == F_NORMAL &&
+                       !folder_has_parent_of_type(src_item, F_OUTBOX) &&
+                       !folder_has_parent_of_type(src_item, F_DRAFT) &&
+                       !folder_has_parent_of_type(src_item, F_QUEUE) &&
+                       !folder_has_parent_of_type(src_item, F_TRASH);
+               if (!item || item->no_select || !src_item 
+               ||  !folder_is_normal) {
                        gtk_drag_finish(drag_context, FALSE, FALSE, time);                      
                        return;
                }
 
-               folderview_move_to(folderview, src_item, item);
+               folderview_move_folder(folderview, src_item, item);
                gtk_drag_finish(drag_context, TRUE, TRUE, time);
        }
        folderview->nodes_to_recollapse = NULL;
@@ -2939,3 +2576,28 @@ static void folderview_drag_end_cb(GtkWidget         *widget,
        folderview->nodes_to_recollapse = NULL;
 }
 
+void folderview_register_popup(FolderViewPopup *fpopup)
+{
+       GList *folderviews;
+
+       for (folderviews = folderview_list; folderviews != NULL; folderviews = g_list_next(folderviews)) {
+               FolderView *folderview = folderviews->data;
+               GtkItemFactory *factory;
+
+               factory = create_ifactory(folderview, fpopup);
+               g_hash_table_insert(folderview->popups, fpopup->klass, factory);
+       }       
+       g_hash_table_insert(folderview_popups, fpopup->klass, fpopup);
+}
+
+void folderview_unregister_popup(FolderViewPopup *fpopup)
+{
+       GList *folderviews;
+
+       for (folderviews = folderview_list; folderviews != NULL; folderviews = g_list_next(folderviews)) {
+               FolderView *folderview = folderviews->data;
+
+               g_hash_table_remove(folderview->popups, fpopup->klass);
+       }       
+       g_hash_table_remove(folderview_popups, fpopup->klass);
+}