sync with 0.7.5cvs19
[claws.git] / src / folderview.c
index 70cc6cae43b96fedb1073a88e58659d06bce6130..124d317bb0dbaa81e36024334f2cd0fbed25ce0b 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2002 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
 #include "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"
+#include "stock_pixmap.h"
 #include "procmsg.h"
 #include "utils.h"
 #include "gtkutils.h"
 #include "prefs_common.h"
 #include "prefs_account.h"
+#include "prefs_filter.h"
+#include "prefs_folder_item.h"
 #include "account.h"
 #include "folder.h"
-#include "grouplist_dialog.h"
-
-#include "pixmaps/inbox.xpm"
-#include "pixmaps/outbox.xpm"
-#include "pixmaps/dir-close.xpm"
-#include "pixmaps/dir-open.xpm"
-#include "pixmaps/trash.xpm"
+#include "inc.h"
 
 typedef enum
 {
@@ -91,16 +90,56 @@ static GList *folderview_list = NULL;
 static GdkFont *normalfont;
 static GdkFont *boldfont;
 
-static GdkPixmap *inboxxpm;
+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 GdkBitmap *inboxxpmmask;
+static GdkPixmap *inboxhrmxpm;
+static GdkBitmap *inboxhrmxpmmask;
+static GdkPixmap *inboxopenxpm;
+static GdkBitmap *inboxopenxpmmask;
+static GdkPixmap *inboxopenhrmxpm;
+static GdkBitmap *inboxopenhrmxpmmask;
 static GdkPixmap *outboxxpm;
 static GdkBitmap *outboxxpmmask;
+static GdkPixmap *outboxhrmxpm;
+static GdkBitmap *outboxhrmxpmmask;
+static GdkPixmap *outboxopenxpm;
+static GdkBitmap *outboxopenxpmmask;
+static GdkPixmap *outboxopenhrmxpm;
+static GdkBitmap *outboxopenhrmxpmmask;
 static GdkPixmap *folderxpm;
 static GdkBitmap *folderxpmmask;
+static GdkPixmap *folderhrmxpm;
+static GdkBitmap *folderhrmxpmmask;
 static GdkPixmap *folderopenxpm;
 static GdkBitmap *folderopenxpmmask;
+static GdkPixmap *folderopenhrmxpm;
+static GdkBitmap *folderopenhrmxpmmask;
+static GdkPixmap *trashopenxpm;
+static GdkBitmap *trashopenxpmmask;
+static GdkPixmap *trashopenhrmxpm;
+static GdkBitmap *trashopenhrmxpmmask;
 static GdkPixmap *trashxpm;
 static GdkBitmap *trashxpmmask;
+static GdkPixmap *trashhrmxpm;
+static GdkBitmap *trashhrmxpmmask;
+static GdkPixmap *queuexpm;
+static GdkBitmap *queuexpmmask;
+static GdkPixmap *queuehrmxpm;
+static GdkBitmap *queuehrmxpmmask;
+static GdkPixmap *queueopenxpm;
+static GdkBitmap *queueopenxpmmask;
+static GdkPixmap *queueopenhrmxpm;
+static GdkBitmap *queueopenhrmxpmmask;
+static GdkPixmap *newxpm;
+static GdkBitmap *newxpmmask;
+static GdkPixmap *unreadxpm;
+static GdkBitmap *unreadxpmmask;
 
 static void folderview_select_node      (FolderView    *folderview,
                                          GtkCTreeNode  *node);
@@ -117,6 +156,9 @@ static GtkCTreeNode *folderview_find_by_name        (GtkCTree       *ctree,
                                                 GtkCTreeNode   *node,
                                                 const gchar    *name);
 
+static gint folderview_clist_compare   (GtkCList       *clist,
+                                        gconstpointer   ptr1,
+                                        gconstpointer   ptr2);
 static gint folderview_compare_name    (gconstpointer   a,
                                         gconstpointer   b);
 
@@ -151,6 +193,9 @@ static void folderview_update_tree_cb       (FolderView     *folderview,
                                         guint           action,
                                         GtkWidget      *widget);
 
+static void mark_all_read_cb            (FolderView    *folderview,
+                                         guint           action,
+                                         GtkWidget      *widget);
 static void folderview_new_folder_cb   (FolderView     *folderview,
                                         guint           action,
                                         GtkWidget      *widget);
@@ -173,9 +218,6 @@ static void folderview_remove_mailbox_cb(FolderView *folderview,
 static void folderview_new_imap_folder_cb(FolderView   *folderview,
                                          guint          action,
                                          GtkWidget     *widget);
-static void folderview_rm_imap_folder_cb (FolderView   *folderview,
-                                         guint          action,
-                                         GtkWidget     *widget);
 static void folderview_rm_imap_server_cb (FolderView   *folderview,
                                          guint          action,
                                          GtkWidget     *widget);
@@ -190,6 +232,14 @@ static void folderview_rm_news_server_cb(FolderView        *folderview,
                                         guint           action,
                                         GtkWidget      *widget);
 
+static void folderview_search_cb       (FolderView     *folderview,
+                                        guint           action,
+                                        GtkWidget      *widget);
+
+static void folderview_property_cb     (FolderView     *folderview,
+                                        guint           action,
+                                        GtkWidget      *widget);
+
 static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
                                          GdkDragContext *context,
                                          gint            x,
@@ -210,6 +260,8 @@ static void folderview_drag_received_cb  (GtkWidget        *widget,
                                          FolderView       *folderview);
 static void folderview_scoring_cb(FolderView *folderview, guint action,
                                  GtkWidget *widget);
+static void folderview_processing_cb(FolderView *folderview, guint action,
+                                    GtkWidget *widget);
 
 static GtkItemFactoryEntry folderview_mbox_popup_entries[] =
 {
@@ -220,45 +272,64 @@ static GtkItemFactoryEntry folderview_mbox_popup_entries[] =
        {N_("/Remove _mailbox"),        NULL, folderview_remove_mailbox_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/_Property..."),           NULL, NULL, 0, NULL},
+       {N_("/_Processing..."),         NULL, folderview_processing_cb, 0, NULL},
        {N_("/_Scoring..."),            NULL, folderview_scoring_cb, 0, NULL}
 };
 
 static GtkItemFactoryEntry folderview_mail_popup_entries[] =
 {
+       {N_("/Mark all _read"),         NULL, mark_all_read_cb, 0, NULL},
+       {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/Create _new folder..."),  NULL, folderview_new_folder_cb,    0, NULL},
        {N_("/_Rename folder..."),      NULL, folderview_rename_folder_cb, 0, NULL},
        {N_("/_Delete folder"),         NULL, folderview_delete_folder_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
-       {N_("/_Update folder tree"),    NULL, folderview_update_tree_cb, 0, NULL},
+       {N_("/_Check for new messages"),
+                                       NULL, folderview_update_tree_cb, 0, NULL},
+       {N_("/R_escan folder tree"),    NULL, folderview_update_tree_cb, 1, NULL},
+       {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/Remove _mailbox"),        NULL, folderview_remove_mailbox_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
-       {N_("/_Property..."),           NULL, NULL, 0, NULL},
-       {N_("/_Scoring..."),            NULL, folderview_scoring_cb, 0, NULL}
+       {N_("/_Search folder..."),      NULL, folderview_search_cb, 0, NULL},
+       {N_("/_Property..."),           NULL, folderview_property_cb, 0, NULL},
+       {N_("/_Processing..."),         NULL, folderview_processing_cb, 0, NULL},
+       {N_("/S_coring..."),            NULL, folderview_scoring_cb, 0, NULL}
 };
 
 static GtkItemFactoryEntry folderview_imap_popup_entries[] =
 {
+       {N_("/Mark all _read"),         NULL, mark_all_read_cb, 0, NULL},
+       {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/Create _new folder..."),  NULL, folderview_new_imap_folder_cb, 0, NULL},
-       {N_("/_Rename folder..."),      NULL, NULL, 0, NULL},
-       {N_("/_Delete folder"),         NULL, folderview_rm_imap_folder_cb, 0, NULL},
+       {N_("/_Rename folder..."),      NULL, folderview_rename_folder_cb,   0, NULL},
+       {N_("/_Delete folder"),         NULL, folderview_delete_folder_cb,   0, NULL},
+       {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
+       {N_("/_Check for new messages"),
+                                       NULL, folderview_update_tree_cb, 0, NULL},
+       {N_("/R_escan folder tree"),    NULL, folderview_update_tree_cb, 1, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
-       {N_("/_Update folder tree"),    NULL, folderview_update_tree_cb, 0, NULL},
        {N_("/Remove _IMAP4 account"),  NULL, folderview_rm_imap_server_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
-       {N_("/_Property..."),           NULL, NULL, 0, NULL},
-       {N_("/_Scoring..."),            NULL, folderview_scoring_cb, 0, NULL}
+       {N_("/_Search folder..."),      NULL, folderview_search_cb, 0, NULL},
+       {N_("/_Property..."),           NULL, folderview_property_cb, 0, NULL},
+       {N_("/_Processing..."),         NULL, folderview_processing_cb, 0, NULL},
+       {N_("/S_coring..."),            NULL, folderview_scoring_cb, 0, NULL}
 };
 
 static GtkItemFactoryEntry folderview_news_popup_entries[] =
 {
+       {N_("/Mark all _read"),         NULL, mark_all_read_cb, 0, NULL},
+       {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/_Subscribe to newsgroup..."),
                                         NULL, folderview_new_news_group_cb, 0, NULL},
        {N_("/_Remove newsgroup"),       NULL, folderview_rm_news_group_cb, 0, NULL},
        {N_("/---"),                     NULL, NULL, 0, "<Separator>"},
        {N_("/Remove _news account"),    NULL, folderview_rm_news_server_cb, 0, NULL},
        {N_("/---"),                     NULL, NULL, 0, "<Separator>"},
-       {N_("/_Property..."),            NULL, NULL, 0, NULL},
-       {N_("/_Scoring..."),            NULL, folderview_scoring_cb, 0, NULL}
+       {N_("/_Search folder..."),       NULL, folderview_search_cb, 0, NULL},
+       {N_("/_Property..."),            NULL, folderview_property_cb, 0, NULL},
+       {N_("/_Processing..."),          NULL, folderview_processing_cb, 0, NULL},
+       {N_("/S_coring..."),            NULL, folderview_scoring_cb, 0, NULL}
 };
 
 
@@ -267,8 +338,7 @@ FolderView *folderview_create(void)
        FolderView *folderview;
        GtkWidget *scrolledwin;
        GtkWidget *ctree;
-       gchar *titles[N_FOLDER_COLS] = {_("Folder"), _("New"),
-                                       _("Unread"), _("#")};
+       gchar *titles[N_FOLDER_COLS];
        GtkWidget *mail_popup;
        GtkWidget *news_popup;
        GtkWidget *imap_popup;
@@ -283,6 +353,11 @@ FolderView *folderview_create(void)
        debug_print(_("Creating folder view...\n"));
        folderview = g_new0(FolderView, 1);
 
+       titles[COL_FOLDER] = _("Folder");
+       titles[COL_NEW]    = _("New");
+       titles[COL_UNREAD] = _("Unread");
+       titles[COL_TOTAL]  = _("#");
+
        scrolledwin = gtk_scrolled_window_new(NULL, NULL);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
                                       GTK_POLICY_AUTOMATIC,
@@ -292,12 +367,15 @@ FolderView *folderview_create(void)
                             prefs_common.folderview_height);
 
        ctree = gtk_ctree_new_with_titles(N_FOLDER_COLS, COL_FOLDER, titles);
+       
        gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
        gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_BROWSE);
+#ifndef CLAWS /* text instead of pixmaps */
        gtk_clist_set_column_justification(GTK_CLIST(ctree), COL_NEW,
                                           GTK_JUSTIFY_RIGHT);
        gtk_clist_set_column_justification(GTK_CLIST(ctree), COL_UNREAD,
                                           GTK_JUSTIFY_RIGHT);
+#endif                                    
        gtk_clist_set_column_justification(GTK_CLIST(ctree), COL_TOTAL,
                                           GTK_JUSTIFY_RIGHT);
        gtk_clist_set_column_width(GTK_CLIST(ctree), COL_FOLDER,
@@ -312,7 +390,8 @@ FolderView *folderview_create(void)
        gtk_ctree_set_expander_style(GTK_CTREE(ctree),
                                     GTK_CTREE_EXPANDER_SQUARE);
        gtk_ctree_set_indent(GTK_CTREE(ctree), CTREE_INDENT);
-       
+       gtk_clist_set_compare_func(GTK_CLIST(ctree), folderview_clist_compare);
+
        /* don't let title buttons take key focus */
        for (i = 0; i < N_FOLDER_COLS; i++)
                GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(ctree)->column[i].button,
@@ -356,7 +435,6 @@ FolderView *folderview_create(void)
        gtk_signal_connect(GTK_OBJECT(ctree), "tree_select_row",
                           GTK_SIGNAL_FUNC(folderview_selected), folderview);
 
-
        gtk_signal_connect_after(GTK_OBJECT(ctree), "tree_expand",
                                 GTK_SIGNAL_FUNC(folderview_tree_expanded),
                                 folderview);
@@ -385,7 +463,7 @@ FolderView *folderview_create(void)
        gtk_drag_dest_set(ctree, GTK_DEST_DEFAULT_ALL &
                          ~GTK_DEST_DEFAULT_HIGHLIGHT,
                          summary_drag_types, 1,
-                         GDK_ACTION_MOVE);
+                         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);
@@ -417,18 +495,77 @@ 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;
+
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_INBOX_CLOSE, &inboxxpm, &inboxxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_INBOX_CLOSE_HRM, &inboxhrmxpm, &inboxhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_INBOX_OPEN, &inboxopenxpm, &inboxopenxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_INBOX_OPEN_HRM, &inboxopenhrmxpm, &inboxopenhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_OUTBOX_CLOSE, &outboxxpm, &outboxxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_OUTBOX_CLOSE_HRM, &outboxhrmxpm, &outboxhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_OUTBOX_OPEN, &outboxopenxpm, &outboxopenxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_OUTBOX_OPEN_HRM, &outboxopenhrmxpm, &outboxopenhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DIR_CLOSE, &folderxpm, &folderxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DIR_CLOSE_HRM, &folderhrmxpm, &folderhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DIR_OPEN, &folderopenxpm, &folderopenxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DIR_OPEN_HRM, &folderopenhrmxpm, &folderopenhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_TRASH_OPEN, &trashopenxpm, &trashopenxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_TRASH_OPEN_HRM, &trashopenhrmxpm, &trashopenhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_TRASH_CLOSE, &trashxpm, &trashxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_TRASH_CLOSE_HRM, &trashhrmxpm, &trashhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_QUEUE_CLOSE, &queuexpm, &queuexpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_QUEUE_CLOSE_HRM, &queuehrmxpm, &queuehrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_QUEUE_OPEN, &queueopenxpm, &queueopenxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_QUEUE_OPEN_HRM, &queueopenhrmxpm, &queueopenhrmxpmmask);
+
+       /* CLAWS: titles for "New" and "Unread" show new & unread pixmaps
+        * instead text (text overflows making them unreadable and ugly) */
+        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);
+                       
 
-       PIXMAP_CREATE(ctree, inboxxpm, inboxxpmmask, inbox_xpm);
-       PIXMAP_CREATE(ctree, outboxxpm, outboxxpmmask, outbox_xpm);
-       PIXMAP_CREATE(ctree, folderxpm, folderxpmmask, DIRECTORY_CLOSE_XPM);
-       PIXMAP_CREATE(ctree, folderopenxpm, folderopenxpmmask,
-                     DIRECTORY_OPEN_XPM);
-       PIXMAP_CREATE(ctree, trashxpm, trashxpmmask, trash_xpm);
 
        if (!normalfont)
                normalfont = gdk_fontset_load(NORMAL_FONT);
        if (!boldfont)
                boldfont = gdk_fontset_load(BOLD_FONT);
+
+       if (!bold_style) {
+               bold_style = gtk_style_copy(gtk_widget_get_style(ctree));
+               bold_style->font = boldfont;
+               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)
@@ -456,15 +593,34 @@ void folderview_set(FolderView *folderview)
        STATUSBAR_POP(mainwin);
 }
 
+void folderview_set_all(void)
+{
+       GList *list;
+
+       for (list = folderview_list; list != NULL; list = list->next)
+               folderview_set((FolderView *)list->data);
+}
+
 void folderview_select(FolderView *folderview, FolderItem *item)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        GtkCTreeNode *node;
+       GtkCTreeNode *old_selected = folderview->selected;
 
        if (!item) return;
 
        node = gtk_ctree_find_by_row_data(ctree, NULL, item);
        if (node) folderview_select_node(folderview, node);
+
+       if (old_selected != node)
+               folder_update_op_count();
+}
+
+static void mark_all_read_cb(FolderView *folderview, guint action,
+                             GtkWidget *widget)
+{
+       if (folderview->selected)
+               summary_mark_all_read(folderview->summaryview);
 }
 
 static void folderview_select_node(FolderView *folderview, GtkCTreeNode *node)
@@ -474,16 +630,14 @@ static void folderview_select_node(FolderView *folderview, GtkCTreeNode *node)
        g_return_if_fail(node != NULL);
 
        folderview->open_folder = TRUE;
-       gtk_ctree_select(ctree, node);
        gtkut_ctree_set_focus_row(ctree, node);
+       gtk_ctree_select(ctree, node);
        if (folderview->summaryview->messages > 0)
                gtk_widget_grab_focus(folderview->summaryview->ctree);
        else
                gtk_widget_grab_focus(folderview->ctree);
 
-       while ((node = gtkut_ctree_find_collapsed_parent(ctree, node))
-              != NULL)
-               gtk_ctree_expand(ctree, node);
+       gtkut_ctree_expand_parent_all(ctree, node);
 }
 
 void folderview_unselect(FolderView *folderview)
@@ -533,29 +687,41 @@ void folderview_select_next_unread(FolderView *folderview)
                folderview_select_node(folderview, node);
 }
 
-void folderview_update_msg_num(FolderView *folderview, GtkCTreeNode *row,
-                              gint new, gint unread, gint total)
+void folderview_update_msg_num(FolderView *folderview, GtkCTreeNode *row)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        static GtkCTreeNode *prev_row = NULL;
        FolderItem *item;
+       gint new, unread, total;
+       gchar *new_str, *unread_str, *total_str;
 
        if (!row) return;
 
        item = gtk_ctree_node_get_row_data(ctree, row);
        if (!item) return;
+
+       gtk_ctree_node_get_text(ctree, row, COL_NEW, &new_str);
+       gtk_ctree_node_get_text(ctree, row, COL_UNREAD, &unread_str);
+       gtk_ctree_node_get_text(ctree, row, COL_TOTAL, &total_str);
+       new = atoi(new_str);
+       unread = atoi(unread_str);
+       total = atoi(total_str);
+
+       /* CLAWS: don't know why but this always seems to be true
+        * when deleting messages. Somewhere claws does a folder
+        * scan which sets all new, unread & total to the correct
+        * values. It then enters this function, but leaves it
+        * because new, unread and total are the same... */
+#ifndef CLAWS   
        if (prev_row     == row    &&
            item->new    == new    &&
            item->unread == unread &&
            item->total  == total)
                return;
+#endif         
 
        prev_row = row;
 
-       item->new    = new;
-       item->unread = unread;
-       item->total  = total;
-
        folderview_update_node(folderview, row);
 }
 
@@ -575,8 +741,7 @@ static void folderview_scan_tree_func(Folder *folder, FolderItem *item,
        GList *list;
        gchar *rootpath;
 
-       if (folder->type == F_MH || folder->type == F_MBOX ||
-           folder->type == F_MAILDIR)
+       if (FOLDER_IS_LOCAL(folder))
                rootpath = LOCAL_FOLDER(folder)->rootpath;
        else if (folder->type == F_IMAP && folder->account &&
                 folder->account->recv_server)
@@ -626,38 +791,35 @@ static GtkWidget *label_window_create(const gchar *str)
        return window;
 }
 
-void folderview_update_tree(Folder *folder)
+void folderview_rescan_tree(Folder *folder)
 {
-       GList *list;
        GtkWidget *window;
 
        g_return_if_fail(folder != NULL);
 
        if (!folder->scan_tree) return;
 
-       window = label_window_create(_("Updating folder tree..."));
+       inc_lock();
+       window = label_window_create(_("Rescanning folder tree..."));
 
        folder_set_ui_func(folder, folderview_scan_tree_func, NULL);
        folder->scan_tree(folder);
        folder_set_ui_func(folder, NULL, NULL);
 
        folder_write_list();
-
-       for (list = folderview_list; list != NULL; list = list->next) {
-               FolderView *folderview = (FolderView *)list->data;
-
-               folderview_set(folderview);
-       }
+       folderview_set_all();
 
        gtk_widget_destroy(window);
+       inc_unlock();
 }
 
-void folderview_update_all(void)
+void folderview_rescan_all(void)
 {
        GList *list;
        GtkWidget *window;
 
-       window = label_window_create(_("Updating all folders..."));
+       inc_lock();
+       window = label_window_create(_("Rescanning all folder trees..."));
 
        list = folder_get_list();
        for (; list != NULL; list = list->next) {
@@ -670,14 +832,49 @@ void folderview_update_all(void)
        }
 
        folder_write_list();
+       folderview_set_all();
+       gtk_widget_destroy(window);
+       inc_unlock();
+}
+
+void folderview_check_new(Folder *folder)
+{
+       GList *list;
+       FolderItem *item;
+       FolderView *folderview;
+       GtkCTree *ctree;
+       GtkCTreeNode *node;
 
        for (list = folderview_list; list != NULL; list = list->next) {
-               FolderView *folderview = (FolderView *)list->data;
+               folderview = (FolderView *)list->data;
+               ctree = GTK_CTREE(folderview->ctree);
+
+               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)) {
+                       item = gtk_ctree_node_get_row_data(ctree, node);
+                       if (!item || !item->path || !item->folder) continue;
+                       if (item->no_select) continue;
+                       if (folder && folder != item->folder) continue;
+                       if (!folder && !FOLDER_IS_LOCAL(item->folder)) continue;
+
+                       folderview_scan_tree_func(item->folder, item, NULL);
+                       if (folder_item_scan(item) < 0) {
+                               if (folder && !FOLDER_IS_LOCAL(folder))
+                                       break;
+                       }
+                       folderview_update_node(folderview, node);
+               }
 
-               folderview_set(folderview);
+               gtk_widget_set_sensitive(folderview->ctree, TRUE);
+               main_window_unlock(folderview->mainwin);
+               inc_unlock();
        }
 
-       gtk_widget_destroy(window);
+       folder_write_list();
 }
 
 static gboolean folderview_search_new_recursive(GtkCTree *ctree,
@@ -775,8 +972,7 @@ static gboolean folderview_have_unread_children(FolderView *folderview,
 static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       GtkStyle *style, *prev_style, *ctree_style;
-       GtkCTreeNode *parent;
+       GtkStyle *style = NULL;
        FolderItem *item;
        GdkPixmap *xpm, *openxpm;
        GdkBitmap *mask, *openmask;
@@ -790,37 +986,95 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
 
        switch (item->stype) {
        case F_INBOX:
-               xpm = openxpm = inboxxpm;
-               mask = openmask = inboxxpmmask;
-               name = g_strdup(_("Inbox"));
+               if (item->hide_read_msgs) {
+                       xpm = inboxhrmxpm;
+                       mask = inboxhrmxpmmask;
+                       openxpm = inboxopenhrmxpm;
+                       openmask = inboxopenhrmxpmmask;
+               } else {
+                       xpm = inboxxpm;
+                       mask = inboxxpmmask;
+                       openxpm = inboxopenxpm;
+                       openmask = inboxopenxpmmask;
+               }
+               name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
+                               !strcmp2(item->name, INBOX_DIR) ? _("Inbox") :
+                               item->name);
                break;
        case F_OUTBOX:
-               xpm = openxpm = outboxxpm;
-               mask = openmask = outboxxpmmask;
-               name = g_strdup(_("Outbox"));
+               if (item->hide_read_msgs) {
+                       xpm = outboxhrmxpm;
+                       mask = outboxhrmxpmmask;
+                       openxpm = outboxopenhrmxpm;
+                       openmask = outboxopenhrmxpmmask;
+               } else {
+                       xpm = outboxxpm;
+                       mask = outboxxpmmask;
+                       openxpm = outboxopenxpm;
+                       openmask = outboxopenxpmmask;
+               }
+               name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
+                               !strcmp2(item->name, OUTBOX_DIR) ? _("Sent") :
+                               item->name);
                break;
        case F_QUEUE:
-               xpm = openxpm = outboxxpm;
-               mask = openmask = outboxxpmmask;
-               name = g_strdup(_("Queue"));
+               if (item->hide_read_msgs) {
+                       xpm = queuehrmxpm;
+                       mask = queuehrmxpmmask;
+                       openxpm = queueopenhrmxpm;
+                       openmask = queueopenhrmxpmmask;
+               } else {
+                       xpm = queuexpm;
+                       mask = queuexpmmask;
+                       openxpm = queueopenxpm;
+                       openmask = queueopenxpmmask;
+               }
+               name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
+                               !strcmp2(item->name, QUEUE_DIR) ? _("Queue") :
+                               item->name);
                break;
        case F_TRASH:
-               xpm = openxpm = trashxpm;
-               mask = openmask = trashxpmmask;
-               name = g_strdup(_("Trash"));
+               if (item->hide_read_msgs) {
+                       xpm = trashhrmxpm;
+                       mask = trashhrmxpmmask;
+                       openxpm = trashopenhrmxpm;
+                       openmask = trashopenhrmxpmmask;
+               } else {
+                       xpm = trashxpm;
+                       mask = trashxpmmask;
+                       openxpm = trashopenxpm;
+                       openmask = trashopenxpmmask;
+               }
+               name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
+                               !strcmp2(item->name, TRASH_DIR) ? _("Trash") :
+                               item->name);
                break;
        case F_DRAFT:
                xpm = folderxpm;
                mask = folderxpmmask;
-               openxpm = folderopenxpm;
-               openmask = folderopenxpmmask;
-               name = g_strdup(_("Draft"));
+               if (item->hide_read_msgs) {
+                       openxpm = folderopenhrmxpm;
+                       openmask = folderopenhrmxpmmask;
+               } else {
+                       openxpm = folderopenxpm;
+                       openmask = folderopenxpmmask;
+               }
+               name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
+                               !strcmp2(item->name, DRAFT_DIR) ? _("Drafts") :
+                               item->name);
                break;
        default:
-               xpm = folderxpm;
-               mask = folderxpmmask;
-               openxpm = folderopenxpm;
-               openmask = folderopenxpmmask;
+               if (item->hide_read_msgs) {
+                       xpm = folderhrmxpm;
+                       mask = folderhrmxpmmask;
+                       openxpm = folderopenhrmxpm;
+                       openmask = folderopenhrmxpmmask;
+               } else {
+                       xpm = folderxpm;
+                       mask = folderxpmmask;
+                       openxpm = folderopenxpm;
+                       openmask = folderopenxpmmask;
+               }
                if (!item->parent) {
                        switch (item->folder->type) {
                        case F_MH:
@@ -833,12 +1087,17 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                                name = " (News)"; break;
                        default:
                                name = "";
-                               break;
                        }
                        name = g_strconcat(item->name, name, NULL);
-               } else
-                       name = g_strdup(item->name);
-               break;                  
+               } else {
+                       if (item->folder->type == F_NEWS &&
+                           item->path &&
+                           !strcmp2(item->name, item->path) &&
+                           prefs_common.ng_abbrev_len < strlen(item->path))
+                               name = get_abbrev_newsgroup_name(item->path);
+                       else
+                               name = g_strdup(item->name);
+               }
        }
 
        if (!GTK_CTREE_ROW(node)->expanded &&
@@ -883,16 +1142,10 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                gtk_ctree_node_set_text(ctree, node, COL_TOTAL,  itos(item->total));
        }
 
-       if (item->stype == F_TRASH) return;
-
-       ctree_style = gtk_widget_get_style(GTK_WIDGET(ctree));
-       prev_style = gtk_ctree_node_get_row_style(ctree, node);
-       if (!prev_style)
-               prev_style = ctree_style;
-       style = gtk_style_copy(prev_style);
-       if (!style) return;
-
-       if (item->stype == F_QUEUE) {
+       if (item->stype == F_OUTBOX || item->stype == F_DRAFT ||
+           item->stype == F_TRASH) {
+               use_bold = use_color = FALSE;
+       } else if (item->stype == F_QUEUE) {
                /* highlight queue folder if there are any messages */
                use_bold = use_color = (item->total > 0);
        } else {
@@ -905,27 +1158,31 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                         folderview_have_new_children(folderview, node));
        }
 
-       if (use_bold && boldfont)
-               style->font = boldfont;
-       else
-               style->font = normalfont;
+       gtk_ctree_node_set_foreground(ctree, node, NULL);
 
-       if (use_color) {
-               style->fg[GTK_STATE_NORMAL]   = folderview->color_new;
-               style->fg[GTK_STATE_SELECTED] = folderview->color_new;
+       if (use_bold && use_color)
+               style = bold_color_style;
+       else if (use_bold) {
+               style = bold_style;
+               if (item->op_count > 0) {
+                       style = bold_tgtfold_style;
+               }
+       }
+       else if (use_color) {
+               style = normal_color_style;
+               gtk_ctree_node_set_foreground(ctree, node,
+                                             &folderview->color_new);
+       }
+       else if (item->op_count > 0) {
+               style = bold_tgtfold_style;
        } else {
-               style->fg[GTK_STATE_NORMAL] =
-                       ctree_style->fg[GTK_STATE_NORMAL];
-               style->fg[GTK_STATE_SELECTED] =
-                       ctree_style->fg[GTK_STATE_SELECTED];
+               style = normal_style;
        }
 
        gtk_ctree_node_set_row_style(ctree, node, style);
 
-       parent = node;
-       while ((parent = gtkut_ctree_find_collapsed_parent(ctree, parent))
-              != NULL)
-               folderview_update_node(folderview, parent);
+       if ((node = gtkut_ctree_find_collapsed_parent(ctree, node)) != NULL)
+               folderview_update_node(folderview, node);
 }
 
 void folderview_update_item(FolderItem *item, gboolean update_summary)
@@ -980,25 +1237,36 @@ static gboolean folderview_gnode_func(GtkCTree *ctree, guint depth,
 static void folderview_expand_func(GtkCTree *ctree, GtkCTreeNode *node,
                                   gpointer data)
 {
-       if (GTK_CTREE_ROW(node)->children)
-               gtk_ctree_expand(ctree, node);
+       FolderView *folderview = (FolderView *)data;
+       FolderItem *item;
+
+       if (GTK_CTREE_ROW(node)->children) {
+               item = gtk_ctree_node_get_row_data(ctree, node);
+               g_return_if_fail(item != NULL);
+
+               if (!item->collapsed)
+                       gtk_ctree_expand(ctree, node);
+               else
+                       folderview_update_node(folderview, node);
+       }
 }
 
 #define SET_SPECIAL_FOLDER(ctree, item) \
 { \
        if (item) { \
-               GtkCTreeNode *node, *sibling; \
+               GtkCTreeNode *node, *parent, *sibling; \
  \
                node = gtk_ctree_find_by_row_data(ctree, root, item); \
                if (!node) \
                        g_warning("%s not found.\n", item->path); \
                else { \
-                       if (!prev) \
-                               sibling = GTK_CTREE_ROW(root)->children; \
-                       else \
+                       parent = GTK_CTREE_ROW(node)->parent; \
+                       if (prev && parent == GTK_CTREE_ROW(prev)->parent) \
                                sibling = GTK_CTREE_ROW(prev)->sibling; \
+                       else \
+                               sibling = GTK_CTREE_ROW(parent)->children; \
                        if (node != sibling) \
-                               gtk_ctree_move(ctree, node, root, sibling); \
+                               gtk_ctree_move(ctree, node, parent, sibling); \
                } \
  \
                prev = node; \
@@ -1082,9 +1350,9 @@ void folderview_rename_folder(FolderView *folderview)
                folderview_rename_mbox_folder_cb(folderview, 0, NULL);
        case F_MH:
        case F_MAILDIR:
+       case F_IMAP:
                folderview_rename_folder_cb(folderview, 0, NULL);
                break;
-       case F_IMAP:
        case F_NEWS:
        default:
                break;
@@ -1108,10 +1376,9 @@ void folderview_delete_folder(FolderView *folderview)
        case F_MH:
        case F_MBOX:
        case F_MAILDIR:
+       case F_IMAP:
                folderview_delete_folder_cb(folderview, 0, NULL);
                break;
-       case F_IMAP:
-               folderview_rm_imap_folder_cb(folderview, 0, NULL);
        case F_NEWS:
        default:
                break;
@@ -1128,6 +1395,18 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
        gint prev_row = -1, row = -1, column = -1;
        FolderItem *item;
        Folder *folder;
+       GtkWidget *popup;
+       gboolean mark_all_read   = FALSE;
+       gboolean new_folder      = FALSE;
+       gboolean rename_folder   = FALSE;
+       gboolean delete_folder   = FALSE;
+       gboolean update_tree     = FALSE;
+       gboolean rescan_tree     = FALSE;
+       gboolean remove_tree     = FALSE;
+       gboolean search_folder   = FALSE;
+       gboolean folder_property = FALSE;
+       gboolean folder_processing  = FALSE;
+       gboolean folder_scoring  = FALSE;
 
        if (!event) return;
 
@@ -1169,95 +1448,95 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
        g_return_if_fail(item->folder != NULL);
        folder = item->folder;
 
-       menu_set_insensitive_all(GTK_MENU_SHELL(folderview->mail_popup));
-       menu_set_insensitive_all(GTK_MENU_SHELL(folderview->imap_popup));
-       menu_set_insensitive_all(GTK_MENU_SHELL(folderview->news_popup));
-       menu_set_insensitive_all(GTK_MENU_SHELL(folderview->mbox_popup));
-
-       if (folder->type == F_MH && item->parent == NULL) {
-               menu_set_sensitive(folderview->mail_factory,
-                                  "/Create new folder...", TRUE);
-               menu_set_sensitive(folderview->mail_factory,
-                                  "/Update folder tree", TRUE);
-               menu_set_sensitive(folderview->mail_factory,
-                                  "/Remove mailbox", TRUE);
-       } else if (folder->type == F_MH && item->stype != F_NORMAL) {
-               menu_set_sensitive(folderview->mail_factory,
-                                  "/Create new folder...", TRUE);
-               menu_set_sensitive(folderview->mail_factory,
-                                  "/Scoring...", TRUE);
-       } else if (folder->type == F_MH) {
-               menu_set_sensitive(folderview->mail_factory,
-                                  "/Create new folder...", TRUE);
-               menu_set_sensitive(folderview->mail_factory,
-                                  "/Rename folder...", TRUE);
-               menu_set_sensitive(folderview->mail_factory,
-                                  "/Delete folder", TRUE);
-               menu_set_sensitive(folderview->mail_factory,
-                                  "/Scoring...", TRUE);
-       } else if (folder->type == F_IMAP && item->parent == NULL) {
-               menu_set_sensitive(folderview->imap_factory,
-                                  "/Create new folder...", TRUE);
-               menu_set_sensitive(folderview->imap_factory,
-                                  "/Update folder tree", TRUE);
-               menu_set_sensitive(folderview->imap_factory,
-                                  "/Remove IMAP4 account", TRUE);
-       } else if (folder->type == F_IMAP && item->stype != F_NORMAL) {
-               menu_set_sensitive(folderview->imap_factory,
-                                  "/Create new folder...", TRUE);
-       } else if (folder->type == F_IMAP) {
-               menu_set_sensitive(folderview->imap_factory,
-                                  "/Create new folder...", TRUE);
-               menu_set_sensitive(folderview->imap_factory,
-                                  "/Delete folder", TRUE);
-               menu_set_sensitive(folderview->imap_factory,
-                                  "/Scoring...", TRUE);
-       } else if (folder->type == F_NEWS && item->parent == NULL) {
-               menu_set_sensitive(folderview->news_factory,
-                                  "/Subscribe to newsgroup...", TRUE);
-               menu_set_sensitive(folderview->news_factory,
-                                  "/Remove news account", TRUE);
-       } else if (folder->type == F_NEWS) {
-               menu_set_sensitive(folderview->news_factory,
-                                  "/Subscribe to newsgroup...", TRUE);
-               menu_set_sensitive(folderview->news_factory,
-                                  "/Remove newsgroup", TRUE);
-               menu_set_sensitive(folderview->news_factory,
-                                  "/Scoring...", TRUE);
-       }
-       if (folder->type == F_MBOX && item->parent == NULL) {
-               menu_set_sensitive(folderview->mbox_factory,
-                                  "/Create new folder...", TRUE);
-               menu_set_sensitive(folderview->mbox_factory,
-                                  "/Remove mailbox", TRUE);
-       } else if (folder->type == F_MBOX && item->stype != F_NORMAL) {
-               menu_set_sensitive(folderview->mbox_factory,
-                                  "/Create new folder...", TRUE);
-               menu_set_sensitive(folderview->mbox_factory,
-                                  "/Scoring...", TRUE);
-       } else if (folder->type == F_MBOX) {
-               menu_set_sensitive(folderview->mbox_factory,
-                                  "/Create new folder...", TRUE);
-               menu_set_sensitive(folderview->mbox_factory,
-                                  "/Rename folder...", TRUE);
-               menu_set_sensitive(folderview->mbox_factory,
-                                  "/Delete folder", TRUE);
-               menu_set_sensitive(folderview->mbox_factory,
-                                  "/Scoring...", TRUE);
+       if (folderview->mainwin->lock_count == 0) {
+               new_folder = TRUE;
+               if (item->parent == NULL)
+                       update_tree = remove_tree = TRUE;
+               else
+                       mark_all_read = search_folder = folder_property = TRUE;
+               if (FOLDER_IS_LOCAL(folder) || FOLDER_TYPE(folder) == F_IMAP || FOLDER_TYPE(folder) == F_MBOX) {
+                       if (item->parent == NULL)
+                               update_tree = rescan_tree = TRUE;
+                       else if (item->stype == F_NORMAL)
+                               rename_folder = delete_folder = folder_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 < 1) 
+                       mark_all_read = FALSE;
        }
 
-       if (folder->type == F_MH)
-               gtk_menu_popup(GTK_MENU(folderview->mail_popup), NULL, NULL,
-                              NULL, NULL, event->button, event->time);
-       else if (folder->type == F_IMAP)
-               gtk_menu_popup(GTK_MENU(folderview->imap_popup), NULL, NULL,
-                              NULL, NULL, event->button, event->time);
-       else if (folder->type == F_NEWS)
-               gtk_menu_popup(GTK_MENU(folderview->news_popup), NULL, NULL,
-                              NULL, NULL, event->button, event->time);
-       else if (folder->type == F_MBOX)
-               gtk_menu_popup(GTK_MENU(folderview->mbox_popup), NULL, NULL,
-                              NULL, NULL, event->button, event->time);
+#define SET_SENS(factory, name, sens) \
+       menu_set_sensitive(folderview->factory, name, sens)
+       
+       mark_all_read = mark_all_read && 
+                       (item == folderview->summaryview->folder_item);
+
+       if (FOLDER_IS_LOCAL(folder)) {
+               popup = folderview->mail_popup;
+               menu_set_insensitive_all(GTK_MENU_SHELL(popup));
+               SET_SENS(mail_factory, "/Mark all read", mark_all_read);
+               SET_SENS(mail_factory, "/Create new folder...", new_folder);
+               SET_SENS(mail_factory, "/Rename folder...", rename_folder);
+               SET_SENS(mail_factory, "/Delete folder", delete_folder);
+               SET_SENS(mail_factory, "/Check for new messages", update_tree);
+               SET_SENS(mail_factory, "/Rescan folder tree", rescan_tree);
+               SET_SENS(mail_factory, "/Remove mailbox", remove_tree);
+               SET_SENS(mail_factory, "/Search folder...", search_folder);
+               SET_SENS(mail_factory, "/Property...", 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, "/Delete folder", delete_folder);
+               SET_SENS(imap_factory, "/Check for new messages", update_tree);
+               SET_SENS(imap_factory, "/Rescan folder tree", rescan_tree);
+               SET_SENS(imap_factory, "/Remove IMAP4 account", remove_tree);
+               SET_SENS(imap_factory, "/Search folder...", search_folder);
+               SET_SENS(imap_factory, "/Property...", 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);
+#if 0
+               SET_SENS(news_factory, "/Check for new messages", update_tree);
+#endif
+               SET_SENS(news_factory, "/Remove news account", remove_tree);
+               SET_SENS(news_factory, "/Search folder...", search_folder);
+               SET_SENS(news_factory, "/Property...", 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, "/Delete folder", delete_folder);
+               SET_SENS(news_factory, "/Property...", folder_property);
+               SET_SENS(mbox_factory, "/Processing...", folder_processing);
+               SET_SENS(mbox_factory, "/Scoring...", folder_scoring);
+       } else
+               return;
+
+#undef SET_SENS
+
+       gtk_menu_popup(GTK_MENU(popup), NULL, NULL, NULL, NULL,
+                      event->button, event->time);
 }
 
 static void folderview_button_released(GtkWidget *ctree, GdkEventButton *event,
@@ -1267,15 +1546,12 @@ static void folderview_button_released(GtkWidget *ctree, GdkEventButton *event,
 
        if (event->button == 1 && folderview->open_folder == FALSE &&
            folderview->opened != NULL) {
-               gtk_ctree_select(GTK_CTREE(ctree), folderview->opened);
                gtkut_ctree_set_focus_row(GTK_CTREE(ctree),
                                          folderview->opened);
+               gtk_ctree_select(GTK_CTREE(ctree), folderview->opened);
        }
 }
 
-#define BREAK_ON_MODIFIER_KEY() \
-       if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0) break
-
 static void folderview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                   FolderView *folderview)
 {
@@ -1283,23 +1559,21 @@ static void folderview_key_pressed(GtkWidget *widget, GdkEventKey *event,
 
        switch (event->keyval) {
        case GDK_Return:
-       case GDK_space:
                if (folderview->selected) {
                        folderview_select_node(folderview,
                                               folderview->selected);
                }
                break;
-       case GDK_v:
-       case GDK_V:
-       case GDK_g:
-       case GDK_G:
-       case GDK_x:
-       case GDK_X:
-       case GDK_w:
-       case GDK_D:
-       case GDK_Q:
-               BREAK_ON_MODIFIER_KEY();
-               summary_pass_key_press_event(folderview->summaryview, event);
+       case GDK_space:
+               if (folderview->selected) {
+                       if (folderview->opened == folderview->selected &&
+                           folderview->summaryview->messages == 0)
+                               folderview_select_next_unread(folderview);
+                       else
+                               folderview_select_node(folderview,
+                                                      folderview->selected);
+               }
+               break;
        default:
                break;
        }
@@ -1319,9 +1593,9 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                return;
        }
 
-       if (!can_select) {
-               gtk_ctree_select(ctree, folderview->opened);
+       if (!can_select || summary_is_locked(folderview->summaryview)) {
                gtkut_ctree_set_focus_row(ctree, folderview->opened);
+               gtk_ctree_select(ctree, folderview->opened);
                return;
        }
 
@@ -1332,6 +1606,14 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
 
        can_select = FALSE;
 
+       /* CLAWS: set compose button type: news folder items 
+        * always have a news folder as parent */
+       if (item->folder) 
+               main_window_toolbar_set_compose_button
+                       (folderview->mainwin,
+                        item->folder->type == F_NEWS ? 
+                        COMPOSEBUTTON_NEWS : COMPOSEBUTTON_MAIL);
+        
        if (item->path)
                debug_print(_("Folder %s is selected\n"), item->path);
 
@@ -1351,10 +1633,14 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
        opened = summary_show(folderview->summaryview, item, FALSE);
 
        if (!opened) {
-               gtk_ctree_select(ctree, folderview->opened);
                gtkut_ctree_set_focus_row(ctree, folderview->opened);
-       } else
+               gtk_ctree_select(ctree, folderview->opened);
+       } else {
                folderview->opened = row;
+               if (gtk_ctree_node_is_visible(ctree, row)
+                   != GTK_VISIBILITY_FULL)
+                       gtk_ctree_node_moveto(ctree, row, -1, 0.5, 0);
+       }
 
        folderview->open_folder = FALSE;
        can_select = TRUE;
@@ -1363,12 +1649,22 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
 static void folderview_tree_expanded(GtkCTree *ctree, GtkCTreeNode *node,
                                     FolderView *folderview)
 {
+       FolderItem *item;
+
+       item = gtk_ctree_node_get_row_data(ctree, node);
+       g_return_if_fail(item != NULL);
+       item->collapsed = FALSE;
        folderview_update_node(folderview, node);
 }
 
 static void folderview_tree_collapsed(GtkCTree *ctree, GtkCTreeNode *node,
                                      FolderView *folderview)
 {
+       FolderItem *item;
+
+       item = gtk_ctree_node_get_row_data(ctree, node);
+       g_return_if_fail(item != NULL);
+       item->collapsed= TRUE;
        folderview_update_node(folderview, node);
 }
 
@@ -1377,9 +1673,9 @@ static void folderview_popup_close(GtkMenuShell *menu_shell,
 {
        if (!folderview->opened) return;
 
-       gtk_ctree_select(GTK_CTREE(folderview->ctree), folderview->opened);
        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,
@@ -1440,7 +1736,10 @@ static void folderview_update_tree_cb(FolderView *folderview, guint action,
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
 
-       folderview_update_tree(item->folder);
+       if (action == 0)
+               folderview_check_new(item->folder);
+       else
+               folderview_rescan_tree(item->folder);
 }
 
 static void folderview_new_folder_cb(FolderView *folderview, guint action,
@@ -1451,6 +1750,7 @@ static void folderview_new_folder_cb(FolderView *folderview, guint action,
        FolderItem *item;
        FolderItem *new_item;
        gchar *new_folder;
+       gchar *name, *name_;
        GtkCTreeNode *node;
 
        if (!folderview->selected) return;
@@ -1464,24 +1764,33 @@ static void folderview_new_folder_cb(FolderView *folderview, guint action,
                                  _("NewFolder"));
        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 (item->folder->type != 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);
+                       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."),
-                                new_folder);
+               alertpanel_error(_("The folder `%s' already exists."), name);
                g_free(new_folder);
                return;
        }
 
        new_item = item->folder->create_folder(item->folder, item, new_folder);
+       if (!new_item) {
+               alertpanel_error(_("Can't create the folder `%s'."), name);
+               g_free(new_folder);
+               return;
+       } 
        g_free(new_folder);
-       if (!new_item) return;
 
        gtk_clist_freeze(GTK_CLIST(ctree));
 
@@ -1556,7 +1865,11 @@ static void folderview_rename_folder_cb(FolderView *folderview, guint action,
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        FolderItem *item;
        gchar *new_folder;
+       gchar *name, *name_;
        gchar *message;
+       gchar *old_path;
+       gchar *old_id;
+       gchar *new_id;
 
        if (!folderview->selected) return;
 
@@ -1565,8 +1878,10 @@ static void folderview_rename_folder_cb(FolderView *folderview, guint action,
        g_return_if_fail(item->path != NULL);
        g_return_if_fail(item->folder != NULL);
 
-       message = g_strdup_printf(_("Input new name for `%s':"),
-                                 g_basename(item->path));
+       name_ = trim_string(item->name, 32);
+       Xstrdup_a(name, name_, return);
+       g_free(name_);
+       message = g_strdup_printf(_("Input new name for `%s':"), name);
        new_folder = input_dialog(_("Rename folder"), message,
                                  g_basename(item->path));
        g_free(message);
@@ -1582,28 +1897,50 @@ static void folderview_rename_folder_cb(FolderView *folderview, guint action,
        if (folderview_find_by_name
                (ctree, GTK_CTREE_ROW(folderview->selected)->parent,
                 new_folder)) {
-               alertpanel_error(_("The folder `%s' already exists."),
-                                new_folder);
+               name = trim_string(new_folder, 32);
+               alertpanel_error(_("The folder `%s' already exists."), name);
+               g_free(name);
                g_free(new_folder);
                return;
        }
 
+       Xstrdup_a(old_path, item->path, {g_free(new_folder); return;});
+       old_id = folder_item_get_identifier(item);
+
        if (item->folder->rename_folder(item->folder, item, new_folder) < 0) {
+               g_free(old_id);
                g_free(new_folder);
                return;
        }
        g_free(new_folder);
 
+       if (prefs_common.fltlist) {
+               if (folder_get_default_folder() == item->folder)
+                       prefs_filter_rename_path(old_path, item->path);
+               new_id = folder_item_get_identifier(item);
+               prefs_filter_rename_path(old_id, new_id);
+       } else {
+               if (FOLDER_TYPE(item->folder) == F_MH)
+                       prefs_filtering_rename_path(old_path, item->path);
+               new_id = folder_item_get_identifier(item);
+               prefs_filtering_rename_path(old_id, new_id);
+       }
+       g_free(old_id);
+       g_free(new_id);
+
        gtk_clist_freeze(GTK_CLIST(ctree));
 
        folderview_update_node(folderview, folderview->selected);
        folderview_sort_folders(folderview,
                                GTK_CTREE_ROW(folderview->selected)->parent,
                                item->folder);
-       if (folderview->opened == folderview->selected) {
-               if (!GTK_CTREE_ROW(folderview->opened)->children)
-                       gtk_ctree_expand(ctree, folderview->opened);
-               summary_show(folderview->summaryview, item, FALSE);
+       if (folderview->opened == folderview->selected ||
+           gtk_ctree_is_ancestor(ctree,
+                                 folderview->selected,
+                                 folderview->opened)) {
+               GtkCTreeNode *node = folderview->opened;
+               folderview_unselect(folderview);
+               folderview_select_node(folderview, node);
        }
 
        gtk_clist_thaw(GTK_CLIST(ctree));
@@ -1671,8 +2008,10 @@ static void folderview_delete_folder_cb(FolderView *folderview, guint action,
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        FolderItem *item;
-       gchar *message;
+       gchar *message, *name, *name_;
        AlertValue avalue;
+       gchar *old_path;
+       gchar *old_id;
 
        if (!folderview->selected) return;
 
@@ -1681,21 +2020,41 @@ static void folderview_delete_folder_cb(FolderView *folderview, guint action,
        g_return_if_fail(item->path != NULL);
        g_return_if_fail(item->folder != NULL);
 
+       name_ = trim_string(item->name, 32);
+       Xstrdup_a(name, name_, return);
+       g_free(name_);
        message = g_strdup_printf
                (_("All folder(s) and message(s) under `%s' will be deleted.\n"
-                  "Do you really want to delete?"),
-                g_basename(item->path));
+                  "Do you really want to delete?"), name);
        avalue = alertpanel(_("Delete folder"), message,
                            _("Yes"), _("+No"), NULL);
        g_free(message);
        if (avalue != G_ALERTDEFAULT) return;
 
+       Xstrdup_a(old_path, item->path, return);
+       old_id = folder_item_get_identifier(item);
+
        if (item->folder->remove_folder(item->folder, item) < 0) {
-               alertpanel_error(_("Can't remove the folder `%s'."),
-                                item->path);
+               alertpanel_error(_("Can't remove the folder `%s'."), name);
+               if (folderview->opened == folderview->selected)
+                       summary_show(folderview->summaryview,
+                                    folderview->summaryview->folder_item,
+                                    FALSE);
+               g_free(old_id);
                return;
        }
 
+       if (prefs_common.fltlist) {
+               if (folder_get_default_folder() == item->folder)
+                       prefs_filter_delete_path(old_path);
+               prefs_filter_delete_path(old_id);
+               g_free(old_id);
+       } else {
+               if (FOLDER_TYPE(item->folder) == F_MH)
+                       prefs_filtering_delete_path(old_path);
+               prefs_filtering_delete_path(old_id);
+               g_free(old_id);
+       }
        if (folderview->opened == folderview->selected ||
            gtk_ctree_is_ancestor(ctree,
                                  folderview->selected,
@@ -1714,6 +2073,7 @@ static void folderview_remove_mailbox_cb(FolderView *folderview, guint action,
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        GtkCTreeNode *node;
        FolderItem *item;
+       gchar *name, *name_;
        gchar *message;
        AlertValue avalue;
 
@@ -1724,10 +2084,12 @@ static void folderview_remove_mailbox_cb(FolderView *folderview, guint action,
        g_return_if_fail(item->folder != NULL);
        if (item->parent) return;
 
+       name_ = trim_string(item->folder->name, 32);
+       Xstrdup_a(name, name_, return);
+       g_free(name_);
        message = g_strdup_printf
                (_("Really remove the mailbox `%s' ?\n"
-                  "(The messages are NOT deleted from disk)"),
-                item->folder->name);
+                  "(The messages are NOT deleted from the disk)"), name);
        avalue = alertpanel(_("Remove folder"), message,
                            _("Yes"), _("+No"), NULL);
        g_free(message);
@@ -1749,6 +2111,7 @@ static void folderview_new_imap_folder_cb(FolderView *folderview, guint action,
        FolderItem *item;
        FolderItem *new_item;
        gchar *new_folder;
+       gchar *name, *name_;
        gchar *p;
 
        if (!folderview->selected) return;
@@ -1775,18 +2138,20 @@ static void folderview_new_imap_folder_cb(FolderView *folderview, guint action,
                return;
        }
 
+       name_ = trim_string(new_folder, 32);
+       Xstrdup_a(name, name_, return);
+       g_free(name_);
+
        /* find whether the directory already exists */
        if (folderview_find_by_name(ctree, folderview->selected, new_folder)) {
-               alertpanel_error(_("The folder `%s' already exists."),
-                                new_folder);
+               alertpanel_error(_("The folder `%s' already exists."), name);
                g_free(new_folder);
                return;
        }
 
        new_item = item->folder->create_folder(item->folder, item, new_folder);
        if (!new_item) {
-               alertpanel_error(_("Can't create the folder `%s'."),
-                                new_folder);
+               alertpanel_error(_("Can't create the folder `%s'."), name);
                g_free(new_folder);
                return;
        }
@@ -1809,52 +2174,12 @@ static void folderview_new_imap_folder_cb(FolderView *folderview, guint action,
        folder_write_list();
 }
 
-static void folderview_rm_imap_folder_cb(FolderView *folderview, guint action,
-                                        GtkWidget *widget)
-{
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       FolderItem *item;
-       gchar *message;
-       AlertValue avalue;
-
-       if (!folderview->selected) return;
-
-       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
-       g_return_if_fail(item != NULL);
-       g_return_if_fail(item->folder != NULL);
-       g_return_if_fail(item->folder->type == F_IMAP);
-       g_return_if_fail(item->folder->account != NULL);
-
-       message = g_strdup_printf(_("Really delete folder `%s'?"),
-                                 g_basename(item->path));
-       avalue = alertpanel(_("Delete folder"), message,
-                           _("Yes"), _("+No"), NULL);
-       g_free(message);
-       if (avalue != G_ALERTDEFAULT) return;
-
-       if (item->folder->remove_folder(item->folder, item) < 0) {
-               alertpanel_error(_("Can't remove the folder `%s'."),
-                                item->path);
-               return;
-       }
-
-       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();
-}
-
 static void folderview_rm_imap_server_cb(FolderView *folderview, guint action,
                                         GtkWidget *widget)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        FolderItem *item;
+       gchar *name, *name_;
        gchar *message;
        AlertValue avalue;
 
@@ -1866,8 +2191,10 @@ static void folderview_rm_imap_server_cb(FolderView *folderview, guint action,
        g_return_if_fail(item->folder->type == F_IMAP);
        g_return_if_fail(item->folder->account != NULL);
 
-       message = g_strdup_printf(_("Really delete IMAP4 account `%s'?"),
-                                 item->folder->name);
+       name_ = trim_string(item->folder->name, 32);
+       Xstrdup_a(name, name_, return);
+       g_free(name_);
+       message = g_strdup_printf(_("Really delete IMAP4 account `%s'?"), name);
        avalue = alertpanel(_("Delete IMAP4 account"), message,
                            _("Yes"), _("+No"), NULL);
        g_free(message);
@@ -1896,55 +2223,88 @@ static void folderview_new_news_group_cb(FolderView *folderview, guint action,
        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;
-       gchar *new_group;
-       const gchar *server;
+       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);
-       g_return_if_fail(item->folder != NULL);
-       g_return_if_fail(item->folder->type == F_NEWS);
-       g_return_if_fail(item->folder->account != NULL);
-
-       new_group = grouplist_dialog(item);
-       if (!new_group) return;
+       folder = item->folder;
+       g_return_if_fail(folder != NULL);
+       g_return_if_fail(folder->type == 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;
 
-       if (folderview_find_by_name(ctree, servernode, new_group)) {
-               alertpanel_error(_("The newsgroup `%s' already exists."),
-                                new_group);
-               g_free(new_group);
-               return;
+       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));
 
-       text[COL_FOLDER] = new_group;
-       node = gtk_ctree_insert_node(ctree, servernode, NULL, text,
-                                    FOLDER_SPACING,
-                                    folderxpm, folderxpmmask,
-                                    folderopenxpm, folderopenxpmmask,
-                                    FALSE, FALSE);
-       gtk_ctree_expand(ctree, servernode);
+       /* add subscribed newsgroups */
+       for (cur = new_subscr; cur != NULL; cur = cur->next) {
+               gchar *name = (gchar *)cur->data;
 
-       item = gtk_ctree_node_get_row_data(ctree, servernode);
-       server = item->folder->account->nntp_server;
+               if (folderview_find_by_name(ctree, servernode, name) != NULL)
+                       continue;
 
-       newitem = folder_item_new(new_group, new_group);
-       g_free(new_group);
-       folder_item_append(item, newitem);
-       gtk_ctree_node_set_row_data(ctree, node, newitem);
-       gtk_ctree_sort_node(ctree, servernode);
+               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(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();
 }
 
@@ -1953,6 +2313,7 @@ static void folderview_rm_news_group_cb(FolderView *folderview, guint action,
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        FolderItem *item;
+       gchar *name, *name_;
        gchar *message;
        AlertValue avalue;
 
@@ -1964,8 +2325,10 @@ static void folderview_rm_news_group_cb(FolderView *folderview, guint action,
        g_return_if_fail(item->folder->type == F_NEWS);
        g_return_if_fail(item->folder->account != NULL);
 
-       message = g_strdup_printf(_("Really delete newsgroup `%s'?"),
-                                 g_basename(item->path));
+       name_ = trim_string(item->path, 32);
+       Xstrdup_a(name, name_, return);
+       g_free(name_);
+       message = g_strdup_printf(_("Really delete newsgroup `%s'?"), name);
        avalue = alertpanel(_("Delete newsgroup"), message,
                            _("Yes"), _("+No"), NULL);
        g_free(message);
@@ -1986,6 +2349,7 @@ static void folderview_rm_news_server_cb(FolderView *folderview, guint action,
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        FolderItem *item;
+       gchar *name, *name_;
        gchar *message;
        AlertValue avalue;
 
@@ -1997,8 +2361,10 @@ static void folderview_rm_news_server_cb(FolderView *folderview, guint action,
        g_return_if_fail(item->folder->type == F_NEWS);
        g_return_if_fail(item->folder->account != NULL);
 
-       message = g_strdup_printf(_("Really delete news account `%s'?"),
-                                 item->folder->name);
+       name_ = trim_string(item->folder->name, 32);
+       Xstrdup_a(name, name_, return);
+       g_free(name_);
+       message = g_strdup_printf(_("Really delete news account `%s'?"), name);
        avalue = alertpanel(_("Delete news account"), message,
                            _("Yes"), _("+No"), NULL);
        g_free(message);
@@ -2021,6 +2387,34 @@ static void folderview_rm_news_server_cb(FolderView *folderview, guint action,
        folder_write_list();
 }
 
+static void folderview_search_cb(FolderView *folderview, guint action,
+                                GtkWidget *widget)
+{
+       summary_search(folderview->summaryview);
+}
+
+static void folderview_property_cb(FolderView *folderview, guint action,
+                                  GtkWidget *widget)
+{
+       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       FolderItem *item;
+
+       if (!folderview->selected) return;
+
+       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+       g_return_if_fail(item != NULL);
+       g_return_if_fail(item->folder != NULL);
+
+#if CLAWS
+       prefs_folder_item_create(folderview, item);
+#else
+       /*
+        * CLAWS: wait till Hiro has completed his stuff
+        */
+       prefs_folder_item_open(item);
+#endif 
+}
+
 static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
                                          GdkDragContext *context,
                                          gint            x,
@@ -2029,27 +2423,21 @@ static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
                                          FolderView     *folderview)
 {
        gint row, column;
-       FolderItem *item, *current_item;
+       FolderItem *item, *src_item;
        GtkCTreeNode *node = NULL;
        gboolean acceptable = FALSE;
 
-       if (gtk_clist_get_selection_info(GTK_CLIST(widget),
-                                        x - 24, y - 24, &row, &column)) {
+       if (gtk_clist_get_selection_info
+               (GTK_CLIST(widget), x - 24, y - 24, &row, &column)) {
                node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
                item = gtk_ctree_node_get_row_data(GTK_CTREE(widget), node);
-               current_item = folderview->summaryview->folder_item;
-               if (item != NULL &&
-                   item->path != NULL &&
-                   current_item != NULL &&
-                   current_item != item) {
-                       switch (item->folder->type){
+               src_item = folderview->summaryview->folder_item;
+               if (item && item->folder && item->path &&
+                   src_item && src_item != item) {
+                       switch (item->folder->type) {
                        case F_MH:
-                               if (current_item->folder->type == F_MH)
-                                   acceptable = TRUE;
-                               break;
                        case F_IMAP:
-                               if (current_item->folder->account == item->folder->account)
-                                   acceptable = TRUE;
+                               acceptable = TRUE;
                                break;
                        default:
                                break;
@@ -2058,8 +2446,16 @@ static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
        }
 
        if (acceptable) {
+               gtk_signal_handler_block_by_func
+                       (GTK_OBJECT(widget),
+                        GTK_SIGNAL_FUNC(folderview_selected), folderview);
                gtk_ctree_select(GTK_CTREE(widget), node);
-               gdk_drag_status(context, context->suggested_action, time);
+               gtk_signal_handler_unblock_by_func
+                       (GTK_OBJECT(widget),
+                        GTK_SIGNAL_FUNC(folderview_selected), folderview);
+               gdk_drag_status(context, 
+                                       (context->actions == GDK_ACTION_COPY ?
+                                       GDK_ACTION_COPY : GDK_ACTION_MOVE) , time);
        } else {
                gtk_ctree_select(GTK_CTREE(widget), folderview->opened);
                gdk_drag_status(context, 0, time);
@@ -2086,22 +2482,51 @@ static void folderview_drag_received_cb(GtkWidget        *widget,
                                        FolderView       *folderview)
 {
        gint row, column;
-       FolderItem *item;
+       FolderItem *item, *src_item;
        GtkCTreeNode *node;
 
-       if (gtk_clist_get_selection_info(GTK_CLIST(widget),
-                                        x - 24, y - 24, &row, &column) == 0)
+       if (gtk_clist_get_selection_info
+               (GTK_CLIST(widget), x - 24, y - 24, &row, &column) == 0)
                return;
 
        node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
        item = gtk_ctree_node_get_row_data(GTK_CTREE(widget), node);
-       if (item != NULL) {
-               summary_move_selected_to(folderview->summaryview, item);
+       src_item = folderview->summaryview->folder_item;
+       if (item && src_item) {
+               switch (drag_context->action) {
+                       case GDK_ACTION_COPY:
+                               summary_copy_selected_to(folderview->summaryview, item);
+                               gtk_drag_finish(drag_context, TRUE, FALSE, time);
+                               break;
+                       case GDK_ACTION_MOVE:
+                       case GDK_ACTION_DEFAULT:
+                       default:
+               if (src_item->folder->type != item->folder->type ||
+                   (item->folder->type == F_IMAP &&
+                    src_item->folder != item->folder))
+                       summary_copy_selected_to(folderview->summaryview, item);
+               else
+                       summary_move_selected_to(folderview->summaryview, item);
                gtk_drag_finish(drag_context, TRUE, TRUE, time);
+               }
        } else
                gtk_drag_finish(drag_context, FALSE, FALSE, time);
 }
 
+static gint folderview_clist_compare(GtkCList *clist,
+                                    gconstpointer ptr1, gconstpointer ptr2)
+{
+       FolderItem *item1 = ((GtkCListRow *)ptr1)->data;
+       FolderItem *item2 = ((GtkCListRow *)ptr2)->data;
+
+       if (!item1->name)
+               return (item2->name != NULL);
+       if (!item2->name)
+               return -1;
+
+       return g_strcasecmp(item1->name, item2->name);
+}
+
 static gint folderview_compare_name(gconstpointer a, gconstpointer b)
 {
        const FolderItem *item = a;
@@ -2125,3 +2550,41 @@ static void folderview_scoring_cb(FolderView *folderview, guint action,
 
        prefs_scoring_open(item);
 }
+
+static void folderview_processing_cb(FolderView *folderview, guint action,
+                                    GtkWidget *widget)
+{
+       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       FolderItem *item;
+
+       if (!folderview->selected) return;
+
+       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+       g_return_if_fail(item != NULL);
+       g_return_if_fail(item->folder != NULL);
+
+       prefs_filtering_open(item);
+}
+
+void folderview_set_target_folder_color(gint color_op) 
+{
+       gint firstone = 1;
+       GList *list;
+       FolderView *folderview;
+
+       for (list = folderview_list; list != NULL; list = list->next) {
+               folderview = (FolderView *)list->data;
+               gtkut_convert_int_to_gdk_color(color_op, &folderview->color_op);
+               if (firstone) {
+                       bold_tgtfold_style->fg[GTK_STATE_NORMAL] =
+                               folderview->color_op;
+                       firstone = 0;
+               }
+       }
+}
+
+void folderview_reflect_prefs_pixmap_theme(FolderView *folderview)
+{
+       folderview_init(folderview);
+       folderview_set_all();
+}