move 'Mark all read' to folder view menu
[claws.git] / src / folderview.c
index 5fa74bbe91a035a7a52fcea8a9d7988f85a99275..367505d6e375805e52b90cd65114474db55887af 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_account.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 +88,34 @@ 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 GdkPixmap *inboxxpm;
 static GdkBitmap *inboxxpmmask;
+static GdkPixmap *inboxhrmxpm;
+static GdkBitmap *inboxhrmxpmmask;
 static GdkPixmap *outboxxpm;
 static GdkBitmap *outboxxpmmask;
+static GdkPixmap *outboxhrmxpm;
+static GdkBitmap *outboxhrmxpmmask;
 static GdkPixmap *folderxpm;
 static GdkBitmap *folderxpmmask;
 static GdkPixmap *folderopenxpm;
 static GdkBitmap *folderopenxpmmask;
+static GdkPixmap *folderopenhrmxpm;
+static GdkBitmap *folderopenhrmxpmmask;
 static GdkPixmap *trashxpm;
 static GdkBitmap *trashxpmmask;
+static GdkPixmap *trashhrmxpm;
+static GdkBitmap *trashhrmxpmmask;
+static GdkPixmap *newxpm;
+static GdkBitmap *newxpmmask;
+static GdkPixmap *unreadxpm;
+static GdkBitmap *unreadxpmmask;
 
 static void folderview_select_node      (FolderView    *folderview,
                                          GtkCTreeNode  *node);
@@ -147,12 +162,25 @@ 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);
@@ -180,6 +208,10 @@ 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 gboolean folderview_drag_motion_cb(GtkWidget      *widget,
                                          GdkDragContext *context,
                                          gint            x,
@@ -198,16 +230,43 @@ static void folderview_drag_received_cb  (GtkWidget        *widget,
                                          guint             info,
                                          guint             time,
                                          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 void folderview_property_cb(FolderView *folderview, guint action, GtkWidget *widget);
+
+static GtkItemFactoryEntry folderview_mbox_popup_entries[] =
+{
+       {N_("/Create _new folder..."),  NULL, folderview_new_mbox_folder_cb,    0, NULL},
+       {N_("/_Rename folder..."),      NULL, folderview_rename_mbox_folder_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_("/_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_("/_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_("/_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[] =
@@ -216,9 +275,16 @@ static GtkItemFactoryEntry folderview_imap_popup_entries[] =
        {N_("/_Rename folder..."),      NULL, NULL, 0, NULL},
        {N_("/_Delete folder"),         NULL, folderview_rm_imap_folder_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
-       {N_("/Remove _IMAP4 server"),   NULL, folderview_rm_imap_server_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 _IMAP4 account"),  NULL, folderview_rm_imap_server_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
-       {N_("/_Property..."),           NULL, NULL, 0, NULL}
+       {N_("/_Search folder..."),      NULL, folderview_search_cb, 0, NULL},
+       {N_("/_Property..."),           NULL, NULL, 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[] =
@@ -227,9 +293,12 @@ static GtkItemFactoryEntry folderview_news_popup_entries[] =
                                         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 server"),     NULL, folderview_rm_news_server_cb, 0, NULL},
+       {N_("/Remove _news account"),    NULL, folderview_rm_news_server_cb, 0, NULL},
        {N_("/---"),                     NULL, NULL, 0, "<Separator>"},
-       {N_("/_Property..."),            NULL, NULL, 0, NULL}
+       {N_("/_Search folder..."),       NULL, folderview_search_cb, 0, NULL},
+       {N_("/_Property..."),            NULL, NULL, 0, NULL},
+       {N_("/_Processing..."),          NULL, folderview_processing_cb, 0, NULL},
+       {N_("/S_coring..."),            NULL, folderview_scoring_cb, 0, NULL}
 };
 
 
@@ -243,9 +312,11 @@ FolderView *folderview_create(void)
        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;
 
@@ -261,12 +332,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,
@@ -281,7 +355,7 @@ FolderView *folderview_create(void)
        gtk_ctree_set_expander_style(GTK_CTREE(ctree),
                                     GTK_CTREE_EXPANDER_SQUARE);
        gtk_ctree_set_indent(GTK_CTREE(ctree), CTREE_INDENT);
-       
+
        /* 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,
@@ -306,6 +380,12 @@ FolderView *folderview_create(void)
                                       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,
+                                      "<MailFolder>", &mbox_factory,
+                                      folderview);
 
        gtk_signal_connect(GTK_OBJECT(ctree), "key_press_event",
                           GTK_SIGNAL_FUNC(folderview_key_pressed),
@@ -319,7 +399,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);
@@ -327,7 +406,7 @@ FolderView *folderview_create(void)
                                 GTK_SIGNAL_FUNC(folderview_tree_collapsed),
                                 folderview);
 
-        gtk_signal_connect(GTK_OBJECT(ctree), "resize_column",
+       gtk_signal_connect(GTK_OBJECT(ctree), "resize_column",
                           GTK_SIGNAL_FUNC(folderview_col_resized),
                           folderview);
 
@@ -340,12 +419,15 @@ FolderView *folderview_create(void)
        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);
 
         /* drop callback */
        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);
@@ -364,6 +446,8 @@ FolderView *folderview_create(void)
        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;
 
        gtk_widget_show_all(scrolledwin);
 
@@ -375,18 +459,73 @@ 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, &inboxxpm, &inboxxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_OUTBOX,
+                        &outboxxpm, &outboxxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DIR_CLOSE,
+                        &folderxpm, &folderxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DIR_OPEN,
+                        &folderopenxpm, &folderopenxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_TRASH, &trashxpm, &trashxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_INBOX_HRM, 
+                        &inboxhrmxpm, &inboxhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_OUTBOX_HRM, 
+                        &outboxhrmxpm, &outboxhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DIR_OPEN_HRM, 
+                        &folderopenhrmxpm, &folderopenhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_TRASH_HRM, 
+                        &trashhrmxpm, &trashhrmxpmmask);
+
+       /* 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)
@@ -414,15 +553,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) return;
+               summary_mark_all_read(folderview->summaryview);
 }
 
 static void folderview_select_node(FolderView *folderview, GtkCTreeNode *node)
@@ -432,16 +590,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)
@@ -502,11 +658,19 @@ void folderview_update_msg_num(FolderView *folderview, GtkCTreeNode *row,
 
        item = gtk_ctree_node_get_row_data(ctree, row);
        if (!item) return;
+
+       /* 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)
+           item->total  == total) 
                return;
+#endif         
 
        prev_row = row;
 
@@ -531,6 +695,15 @@ static void folderview_scan_tree_func(Folder *folder, FolderItem *item,
                                      gpointer data)
 {
        GList *list;
+       gchar *rootpath;
+
+       if (FOLDER_IS_LOCAL(folder))
+               rootpath = LOCAL_FOLDER(folder)->rootpath;
+       else if (folder->type == F_IMAP && folder->account &&
+                folder->account->recv_server)
+               rootpath = folder->account->recv_server;
+       else
+               return;
 
        for (list = folderview_list; list != NULL; list = list->next) {
                FolderView *folderview = (FolderView *)list->data;
@@ -539,12 +712,11 @@ static void folderview_scan_tree_func(Folder *folder, FolderItem *item,
 
                if (item->path)
                        str = g_strdup_printf(_("Scanning folder %s%c%s ..."),
-                                             LOCAL_FOLDER(folder)->rootpath,
-                                             G_DIR_SEPARATOR,
+                                             rootpath, G_DIR_SEPARATOR,
                                              item->path);
                else
                        str = g_strdup_printf(_("Scanning folder %s ..."),
-                                             LOCAL_FOLDER(folder)->rootpath);
+                                             rootpath);
 
                STATUSBAR_PUSH(mainwin, str);
                STATUSBAR_POP(mainwin);
@@ -575,12 +747,35 @@ static GtkWidget *label_window_create(const gchar *str)
        return window;
 }
 
+void folderview_update_tree(Folder *folder)
+{
+       GtkWidget *window;
+
+       g_return_if_fail(folder != NULL);
+
+       if (!folder->scan_tree) return;
+
+       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();
+       folderview_set_all();
+
+       gtk_widget_destroy(window);
+       inc_unlock();
+}
+
 void folderview_update_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) {
@@ -593,14 +788,44 @@ void folderview_update_all(void)
        }
 
        folder_write_list();
+       folderview_set_all();
+       gtk_widget_destroy(window);
+       inc_unlock();
+}
+
+void folderview_update_all_node(void)
+{
+       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);
 
-               folderview_set(folderview);
+               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 || !FOLDER_IS_LOCAL(item->folder) ||
+                           !item->path)
+                               continue;
+                       folderview_scan_tree_func(item->folder, item, NULL);
+                       folder_item_scan(item);
+                       folderview_update_node(folderview, node);
+               }
+
+               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,
@@ -695,11 +920,10 @@ static gboolean folderview_have_unread_children(FolderView *folderview,
        return FALSE;
 }
 
-
 static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       GtkStyle *style, *prev_style, *ctree_style;
+       GtkStyle *style = NULL;
        FolderItem *item;
        GdkPixmap *xpm, *openxpm;
        GdkBitmap *mask, *openmask;
@@ -713,41 +937,81 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
 
        switch (item->stype) {
        case F_INBOX:
-               xpm = openxpm = inboxxpm;
-               mask = openmask = inboxxpmmask;
+               xpm = inboxxpm;
+               mask = inboxxpmmask;
+               if (item->hide_read_msgs) {
+                       openxpm = inboxhrmxpm;
+                       openmask = inboxhrmxpmmask;
+               } else {
+                       openxpm = inboxxpm;
+                       openmask = inboxxpmmask;
+               }
                name = g_strdup(_("Inbox"));
                break;
        case F_OUTBOX:
-               xpm = openxpm = outboxxpm;
-               mask = openmask = outboxxpmmask;
+               xpm = outboxxpm;
+               mask =outboxxpmmask;
+               if (item->hide_read_msgs) {
+                       openxpm = outboxhrmxpm;
+                       openmask = outboxhrmxpmmask;
+               } else {
+                       openxpm = outboxxpm;
+                       openmask = outboxxpmmask;
+               }
                name = g_strdup(_("Outbox"));
                break;
        case F_QUEUE:
-               xpm = openxpm = outboxxpm;
-               mask = openmask = outboxxpmmask;
+               xpm = outboxxpm;
+               mask =outboxxpmmask;
+               if (item->hide_read_msgs) {
+                       openxpm = outboxhrmxpm;
+                       openmask = outboxhrmxpmmask;
+               } else {
+                       openxpm = outboxxpm;
+                       openmask = outboxxpmmask;
+               }
                name = g_strdup(_("Queue"));
                break;
        case F_TRASH:
-               xpm = openxpm = trashxpm;
-               mask = openmask = trashxpmmask;
+               xpm = trashxpm;
+               mask = trashxpmmask;
+               if (item->hide_read_msgs) {
+                       openxpm = trashhrmxpm;
+                       openmask = trashhrmxpmmask;
+               } else {
+                       openxpm = trashxpm;
+                       openmask = trashxpmmask;
+               }
                name = g_strdup(_("Trash"));
                break;
        case F_DRAFT:
                xpm = folderxpm;
                mask = folderxpmmask;
-               openxpm = folderopenxpm;
-               openmask = folderopenxpmmask;
+               if (item->hide_read_msgs) {
+                       openxpm = folderopenhrmxpm;
+                       openmask = folderopenhrmxpmmask;
+               } else {
+                       openxpm = folderopenxpm;
+                       openmask = folderopenxpmmask;
+               }
                name = g_strdup(_("Draft"));
                break;
        default:
                xpm = folderxpm;
                mask = folderxpmmask;
-               openxpm = folderopenxpm;
-               openmask = folderopenxpmmask;
+               if (item->hide_read_msgs) {
+                       openxpm = folderopenhrmxpm;
+                       openmask = folderopenhrmxpmmask;
+               } else {
+                       openxpm = folderopenxpm;
+                       openmask = folderopenxpmmask;
+               }
                if (!item->parent) {
                        switch (item->folder->type) {
                        case F_MH:
                                name = " (MH)"; break;
+                       case F_MBOX:
+                               name = " (mbox)"; break;
                        case F_IMAP:
                                name = " (IMAP4)"; break;
                        case F_NEWS:
@@ -802,15 +1066,8 @@ 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_TRASH)
+               use_bold = use_color = FALSE;
        if (item->stype == F_QUEUE) {
                /* highlight queue folder if there are any messages */
                use_bold = use_color = (item->total > 0);
@@ -824,30 +1081,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 = ctree_style->font;
+       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);
 
-       if (use_bold) {
-               GtkCTreeNode *parent;
-
-               parent = gtkut_ctree_find_collapsed_parent(ctree, node);
-               if (parent)
-                       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)
@@ -902,8 +1160,18 @@ 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) \
@@ -970,8 +1238,10 @@ void folderview_new_folder(FolderView *folderview)
        g_return_if_fail(item->folder != NULL);
 
        switch (item->folder->type) {
-       case F_MH:
        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;
@@ -998,8 +1268,9 @@ void folderview_rename_folder(FolderView *folderview)
        if (item->stype != F_NORMAL) return;
 
        switch (item->folder->type) {
-       case F_MH:
        case F_MBOX:
+               folderview_rename_mbox_folder_cb(folderview, 0, NULL);
+       case F_MH:
        case F_MAILDIR:
                folderview_rename_folder_cb(folderview, 0, NULL);
                break;
@@ -1047,6 +1318,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 folder_property = FALSE;
+       gboolean folder_processing  = FALSE;
+       gboolean folder_scoring  = FALSE;
+       gboolean search_folder = FALSE;
 
        if (!event) return;
 
@@ -1088,56 +1371,87 @@ 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));
-
-       if (folder->type == F_MH && item->parent == NULL) {
-               menu_set_sensitive(folderview->mail_factory,
-                                  "/Create new folder...", 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);
-       } 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);
-       } 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,
-                                  "/Remove IMAP4 server", 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,
-                                  "/Delete folder", 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 server", 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 newsgroup", 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 = TRUE;
+               if (FOLDER_IS_LOCAL(folder) || FOLDER_TYPE(folder) == F_IMAP || FOLDER_TYPE(folder) == F_MBOX) {
+                       if (item->parent == NULL)
+                               update_tree = rescan_tree = TRUE;
+                       else if (item->stype == F_NORMAL)
+                               rename_folder = delete_folder = folder_property = folder_scoring = folder_processing = TRUE;
+                       else if (item->stype == F_INBOX)
+                               folder_property = 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);
+#define SET_SENS(factory, name, sens) \
+       menu_set_sensitive(folderview->factory, name, sens)
+
+       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, "/Property...", folder_property);
+               SET_SENS(mail_factory, "/Processing...", folder_processing);
+               SET_SENS(mail_factory, "/Scoring...", folder_scoring);
+               SET_SENS(mail_factory, "/Search folder...", search_folder);
+       } else if (FOLDER_TYPE(folder) == F_IMAP) {
+               popup = folderview->imap_popup;
+               menu_set_insensitive_all(GTK_MENU_SHELL(popup));
+               SET_SENS(imap_factory, "/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, "/Processing...", folder_processing);
+               SET_SENS(imap_factory, "/Scoring...", folder_scoring);
+               SET_SENS(imap_factory, "/Search folder...", search_folder);
+       } else if (FOLDER_TYPE(folder) == F_NEWS) {
+               popup = folderview->news_popup;
+               menu_set_insensitive_all(GTK_MENU_SHELL(popup));
+               SET_SENS(news_factory, "/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, "/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(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,
@@ -1145,10 +1459,11 @@ static void folderview_button_released(GtkWidget *ctree, GdkEventButton *event,
 {
        if (!event) return;
 
-       if (event->button == 1 && folderview->opened != NULL) {
-               gtk_ctree_select(GTK_CTREE(ctree), folderview->opened);
+       if (event->button == 1 && folderview->open_folder == FALSE &&
+           folderview->opened != NULL) {
                gtkut_ctree_set_focus_row(GTK_CTREE(ctree),
                                          folderview->opened);
+               gtk_ctree_select(GTK_CTREE(ctree), folderview->opened);
        }
 }
 
@@ -1162,12 +1477,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_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;
        case GDK_v:
        case GDK_V:
        case GDK_g:
@@ -1187,6 +1511,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                                gint column, FolderView *folderview)
 {
        static gboolean can_select = TRUE;      /* exclusive lock */
+       gboolean opened;
        FolderItem *item;
 
        folderview->selected = row;
@@ -1197,19 +1522,26 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
        }
 
        if (!can_select) {
-               gtk_ctree_select(ctree, folderview->opened);
                gtkut_ctree_set_focus_row(ctree, folderview->opened);
+               gtk_ctree_select(ctree, folderview->opened);
                return;
        }
 
        if (!folderview->open_folder) return;
-       folderview->open_folder = FALSE;
 
        item = gtk_ctree_node_get_row_data(ctree, row);
        if (!item) return;
 
        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);
 
@@ -1219,22 +1551,44 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
            !GTK_CTREE_ROW(folderview->opened)->children)
                gtk_ctree_collapse(ctree, folderview->opened);
 
-       folderview->opened = row;
+       /* ungrab the mouse event */
+       if (GTK_WIDGET_HAS_GRAB(ctree)) {
+               gtk_grab_remove(GTK_WIDGET(ctree));
+               if (gdk_pointer_is_grabbed())
+                       gdk_pointer_ungrab(GDK_CURRENT_TIME);
+       }
+
+       opened = summary_show(folderview->summaryview, item, FALSE);
 
-       summary_show(folderview->summaryview, item, FALSE);
+       if (!opened) {
+               gtkut_ctree_set_focus_row(ctree, folderview->opened);
+               gtk_ctree_select(ctree, folderview->opened);
+       } else
+               folderview->opened = row;
 
+       folderview->open_folder = FALSE;
        can_select = TRUE;
 }
 
 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);
 }
 
@@ -1243,9 +1597,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,
@@ -1291,6 +1645,26 @@ static GtkCTreeNode *folderview_find_by_name(GtkCTree *ctree,
        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, FALSE);
+
+       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+       g_return_if_fail(item != NULL);
+       g_return_if_fail(item->folder != NULL);
+
+       if (action == 0)
+               folderview_update_all_node();
+       else
+               folderview_update_tree(item->folder);
+}
+
 static void folderview_new_folder_cb(FolderView *folderview, guint action,
                                     GtkWidget *widget)
 {
@@ -1312,13 +1686,70 @@ 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);
+       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;
+               }
+       }
+
+       /* 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 = item->folder->create_folder(item->folder, item, new_folder);
+       if (!new_item) {
+               alertpanel_error(_("The folder `%s' could not be created."), 
+                                new_folder);
+               g_free(new_folder);
+               return;
+       } 
+       g_free(new_folder);
+
+       gtk_clist_freeze(GTK_CLIST(ctree));
+
+       text[COL_FOLDER] = new_item->name;
+       node = gtk_ctree_insert_node(ctree, folderview->selected, NULL, text,
+                                    FOLDER_SPACING,
+                                    folderxpm, folderxpmmask,
+                                    folderopenxpm, folderopenxpmmask,
+                                    FALSE, FALSE);
+       gtk_ctree_expand(ctree, folderview->selected);
+       gtk_ctree_node_set_row_data(ctree, node, new_item);
+       folderview_sort_folders(folderview, folderview->selected, item->folder);
+
+       gtk_clist_thaw(GTK_CLIST(ctree));
+
+       folder_write_list();
+}
+
+static void folderview_new_mbox_folder_cb(FolderView *folderview, guint action,
+                                         GtkWidget *widget)
+{
+       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       gchar *text[N_FOLDER_COLS] = {NULL, "0", "0", "0"};
+       FolderItem *item;
+       FolderItem *new_item;
+       gchar *new_folder;
+       GtkCTreeNode *node;
+
+       if (!folderview->selected) return;
+
+       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."),
@@ -1409,6 +1840,61 @@ static void folderview_rename_folder_cb(FolderView *folderview, guint action,
        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->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, FALSE);
+       }
+
+       gtk_clist_thaw(GTK_CLIST(ctree));
+
+       folder_write_list();
+}
+
 static void folderview_delete_folder_cb(FolderView *folderview, guint action,
                                        GtkWidget *widget)
 {
@@ -1434,7 +1920,8 @@ static void folderview_delete_folder_cb(FolderView *folderview, guint action,
        if (avalue != G_ALERTDEFAULT) return;
 
        if (item->folder->remove_folder(item->folder, item) < 0) {
-               g_warning(_("can't remove folder `%s'\n"), item->path);
+               alertpanel_error(_("Can't remove the folder `%s'."),
+                                item->path);
                return;
        }
 
@@ -1491,6 +1978,7 @@ static void folderview_new_imap_folder_cb(FolderView *folderview, guint action,
        FolderItem *item;
        FolderItem *new_item;
        gchar *new_folder;
+       gchar *p;
 
        if (!folderview->selected) return;
 
@@ -1500,12 +1988,16 @@ static void folderview_new_imap_folder_cb(FolderView *folderview, guint action,
        g_return_if_fail(item->folder->type == F_IMAP);
        g_return_if_fail(item->folder->account != NULL);
 
-       new_folder = input_dialog(_("New folder"),
-                                 _("Input the name of new folder:"),
-                                 _("NewFolder"));
+       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 (strchr(new_folder, G_DIR_SEPARATOR) != NULL) {
+       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);
@@ -1521,8 +2013,13 @@ static void folderview_new_imap_folder_cb(FolderView *folderview, guint action,
        }
 
        new_item = item->folder->create_folder(item->folder, item, new_folder);
+       if (!new_item) {
+               alertpanel_error(_("Can't create the folder `%s'."),
+                                new_folder);
+               g_free(new_folder);
+               return;
+       }
        g_free(new_folder);
-       if (!new_item) return;
 
        gtk_clist_freeze(GTK_CLIST(ctree));
 
@@ -1565,7 +2062,12 @@ static void folderview_rm_imap_folder_cb(FolderView *folderview, guint action,
        if (avalue != G_ALERTDEFAULT) return;
 
        if (item->folder->remove_folder(item->folder, item) < 0) {
-               g_warning(_("can't remove folder `%s'\n"), item->path);
+               alertpanel_error(_("Can't remove the folder `%s'."),
+                                item->path);
+               if (folderview->opened == folderview->selected)
+                       summary_show(folderview->summaryview,
+                                    folderview->summaryview->folder_item,
+                                    FALSE);
                return;
        }
 
@@ -1597,9 +2099,9 @@ 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 server `%s'?"),
+       message = g_strdup_printf(_("Really delete IMAP4 account `%s'?"),
                                  item->folder->name);
-       avalue = alertpanel(_("Delete IMAP4 server"), message,
+       avalue = alertpanel(_("Delete IMAP4 account"), message,
                            _("Yes"), _("+No"), NULL);
        g_free(message);
 
@@ -1627,55 +2129,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);
+       }
+
+       gtk_ctree_sort_node(ctree, servernode);
        gtk_clist_thaw(GTK_CLIST(ctree));
 
+       slist_free_strings(new_subscr);
+       g_slist_free(new_subscr);
+
        folder_write_list();
 }
 
@@ -1728,9 +2263,9 @@ 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 server `%s'?"),
+       message = g_strdup_printf(_("Really delete news account `%s'?"),
                                  item->folder->name);
-       avalue = alertpanel(_("Delete news server"), message,
+       avalue = alertpanel(_("Delete news account"), message,
                            _("Yes"), _("+No"), NULL);
        g_free(message);
 
@@ -1752,6 +2287,12 @@ 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 gboolean folderview_drag_motion_cb(GtkWidget      *widget,
                                          GdkDragContext *context,
                                          gint            x,
@@ -1760,30 +2301,46 @@ static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
                                          FolderView     *folderview)
 {
        gint row, column;
-       FolderItem *item;
-       GtkCTreeNode *node;
+       FolderItem *item, *current_item;
+       GtkCTreeNode *node = NULL;
+       gboolean acceptable = FALSE;
 
        if (gtk_clist_get_selection_info(GTK_CLIST(widget),
                                         x - 24, y - 24, &row, &column)) {
                node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
                item = gtk_ctree_node_get_row_data(GTK_CTREE(widget), node);
+               current_item = folderview->summaryview->folder_item;
                if (item != NULL &&
                    item->path != NULL &&
-                   folderview->summaryview->folder_item != item) {
-                       if (item->folder->type != F_NEWS) {
-                               gtk_ctree_select(GTK_CTREE(widget), node);
-                               gdk_drag_status(context,
-                                               context->suggested_action,
-                                               time);
-                               return TRUE;
+                   current_item != NULL &&
+                   current_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;
+                               break;
+                       default:
                        }
                }
        }
 
-       gtk_ctree_select(GTK_CTREE(widget), folderview->opened);
-       gdk_drag_status(context, 0, time);
+       if (acceptable) {
+               gtk_signal_handler_block_by_func(GTK_OBJECT(widget),GTK_SIGNAL_FUNC(folderview_selected), folderview);
+               gtk_ctree_select(GTK_CTREE(widget), node);
+               gtk_signal_handler_unblock_by_func(GTK_OBJECT(widget),GTK_SIGNAL_FUNC(folderview_selected), folderview);
+               gdk_drag_status(context, 
+                                       (context->actions == GDK_ACTION_COPY ?
+                                       GDK_ACTION_COPY : GDK_ACTION_MOVE) , time);
+       } else {
+               gtk_ctree_select(GTK_CTREE(widget), folderview->opened);
+               gdk_drag_status(context, 0, time);
+       }
 
-       return FALSE;
+       return acceptable;
 }
 
 static void folderview_drag_leave_cb(GtkWidget      *widget,
@@ -1814,8 +2371,18 @@ static void folderview_drag_received_cb(GtkWidget        *widget,
        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);
-               gtk_drag_finish(drag_context, TRUE, TRUE, time);
+               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:
+                               summary_move_selected_to(folderview->summaryview, item);
+                               gtk_drag_finish(drag_context, TRUE, TRUE, time);
+                               break;
+               }
        } else
                gtk_drag_finish(drag_context, FALSE, FALSE, time);
 }
@@ -1828,3 +2395,65 @@ static gint folderview_compare_name(gconstpointer a, gconstpointer 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);
+}
+
+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);
+}
+
+static void folderview_property_cb(FolderView *folderview, guint action, 
+                                  GtkWidget *widget) 
+{
+       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       FolderItem *item;
+
+       if (!folderview->selected) return;
+
+       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+       g_return_if_fail(item != NULL);
+       g_return_if_fail(item->folder != NULL);
+
+       prefs_folder_item_create(folderview, item);
+}
+
+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;
+               }
+       }
+}