* src/folderview.c
[claws.git] / src / folderview.c
index a1571e900be7f32ffab4d672a2a289a4f27b054d..5982381b22e3cdea6abdf07c401ff96997ff620e 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -55,7 +55,6 @@
 #include "prefs_common.h"
 #include "prefs_account.h"
 #include "prefs_filtering.h"
-#include "prefs_scoring.h"
 #include "prefs_folder_item.h"
 #include "account.h"
 #include "folder.h"
@@ -78,9 +77,6 @@ typedef enum
 
 static GList *folderview_list = NULL;
 
-static GdkFont *normalfont;
-static GdkFont *boldfont;
-
 static GtkStyle *normal_style;
 static GtkStyle *normal_color_style;
 static GtkStyle *bold_style;
@@ -147,15 +143,9 @@ static void folderview_append_folder        (FolderView    *folderview,
 static void folderview_update_node      (FolderView    *folderview,
                                          GtkCTreeNode  *node);
 
-static GtkCTreeNode *folderview_find_by_name   (GtkCTree       *ctree,
-                                                GtkCTreeNode   *node,
-                                                const gchar    *name);
-
 static gint folderview_clist_compare   (GtkCList       *clist,
                                         gconstpointer   ptr1,
                                         gconstpointer   ptr2);
-static gint folderview_compare_name    (gconstpointer   a,
-                                        gconstpointer   b);
 
 /* callback functions */
 static void folderview_button_pressed  (GtkWidget      *ctree,
@@ -184,6 +174,10 @@ static void folderview_col_resized (GtkCList       *clist,
                                         gint            width,
                                         FolderView     *folderview);
 
+static void folderview_download_cb     (FolderView     *folderview,
+                                        guint           action,
+                                        GtkWidget      *widget);
+
 static void folderview_update_tree_cb  (FolderView     *folderview,
                                         guint           action,
                                         GtkWidget      *widget);
@@ -194,15 +188,19 @@ static void mark_all_read_cb            (FolderView    *folderview,
 static void folderview_new_folder_cb   (FolderView     *folderview,
                                         guint           action,
                                         GtkWidget      *widget);
+#if 0
 static void folderview_new_mbox_folder_cb(FolderView *folderview,
                                          guint action,
                                          GtkWidget *widget);
+#endif
 static void folderview_rename_folder_cb        (FolderView     *folderview,
                                         guint           action,
                                         GtkWidget      *widget);
+#if 0
 static void folderview_rename_mbox_folder_cb(FolderView *folderview,
                                             guint action,
                                             GtkWidget *widget);
+#endif
 static void folderview_delete_folder_cb        (FolderView     *folderview,
                                         guint           action,
                                         GtkWidget      *widget);
@@ -210,9 +208,6 @@ static void folderview_remove_mailbox_cb(FolderView *folderview,
                                         guint           action,
                                         GtkWidget      *widget);
 
-static void folderview_new_imap_folder_cb(FolderView   *folderview,
-                                         guint          action,
-                                         GtkWidget     *widget);
 static void folderview_rm_imap_server_cb (FolderView   *folderview,
                                          guint          action,
                                          GtkWidget     *widget);
@@ -269,17 +264,15 @@ void folderview_create_folder_node       (FolderView       *folderview,
                                          FolderItem       *item);
 gboolean folderview_update_folder       (gpointer          source,
                                          gpointer          userdata);
-gboolean folderview_update_item                 (gpointer          source,
+gboolean folderview_update_item_claws   (gpointer          source,
                                          gpointer          data);
-
-static void folderview_scoring_cb(FolderView *folderview, guint action,
-                                 GtkWidget *widget);
 static void folderview_processing_cb(FolderView *folderview, guint action,
                                     GtkWidget *widget);
 static void folderview_move_to(FolderView *folderview, FolderItem *from_folder,
                               FolderItem *to_folder);
 static void folderview_move_to_cb(FolderView *folderview);
 
+#if 0
 static GtkItemFactoryEntry folderview_mbox_popup_entries[] =
 {
        {N_("/Create _new folder..."),  NULL, folderview_new_mbox_folder_cb,    0, NULL},
@@ -291,8 +284,8 @@ static GtkItemFactoryEntry folderview_mbox_popup_entries[] =
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/_Properties..."),         NULL, NULL, 0, NULL},
        {N_("/_Processing..."),         NULL, folderview_processing_cb, 0, NULL},
-       {N_("/_Scoring..."),            NULL, folderview_scoring_cb, 0, NULL}
 };
+#endif
 
 static GtkItemFactoryEntry folderview_mail_popup_entries[] =
 {
@@ -312,17 +305,18 @@ static GtkItemFactoryEntry folderview_mail_popup_entries[] =
        {N_("/_Search folder..."),      NULL, folderview_search_cb, 0, NULL},
        {N_("/_Properties..."),         NULL, folderview_property_cb, 0, NULL},
        {N_("/_Processing..."),         NULL, folderview_processing_cb, 0, NULL},
-       {N_("/S_coring..."),            NULL, folderview_scoring_cb, 0, NULL}
 };
 
 static GtkItemFactoryEntry folderview_imap_popup_entries[] =
 {
        {N_("/Mark all _read"),         NULL, mark_all_read_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
-       {N_("/Create _new folder..."),  NULL, folderview_new_imap_folder_cb, 0, NULL},
-       {N_("/_Rename folder..."),      NULL, folderview_rename_folder_cb,   0, NULL},
+       {N_("/Create _new folder..."),  NULL, folderview_new_folder_cb,    0, NULL},
+       {N_("/_Rename folder..."),      NULL, folderview_rename_folder_cb, 0, NULL},
        {N_("/M_ove folder..."),        NULL, folderview_move_to_cb, 0, NULL},
-       {N_("/_Delete folder"),         NULL, folderview_delete_folder_cb,   0, NULL},
+       {N_("/_Delete folder"),         NULL, folderview_delete_folder_cb, 0, NULL},
+       {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
+       {N_("/Down_load"),              NULL, folderview_download_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/_Check for new messages"),
                                        NULL, folderview_update_tree_cb, 0, NULL},
@@ -333,7 +327,6 @@ static GtkItemFactoryEntry folderview_imap_popup_entries[] =
        {N_("/_Search folder..."),      NULL, folderview_search_cb, 0, NULL},
        {N_("/_Properties..."),         NULL, folderview_property_cb, 0, NULL},
        {N_("/_Processing..."),         NULL, folderview_processing_cb, 0, NULL},
-       {N_("/S_coring..."),            NULL, folderview_scoring_cb, 0, NULL}
 };
 
 static GtkItemFactoryEntry folderview_news_popup_entries[] =
@@ -344,6 +337,8 @@ 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_("/Down_load"),              NULL, folderview_download_cb, 0, NULL},
+       {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/_Check for new messages"),
                                        NULL, folderview_update_tree_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
@@ -352,7 +347,6 @@ static GtkItemFactoryEntry folderview_news_popup_entries[] =
        {N_("/_Search folder..."),      NULL, folderview_search_cb, 0, NULL},
        {N_("/_Properties..."),         NULL, folderview_property_cb, 0, NULL},
        {N_("/_Processing..."),         NULL, folderview_processing_cb, 0, NULL},
-       {N_("/S_coring..."),            NULL, folderview_scoring_cb, 0, NULL}
 };
 
 GtkTargetEntry folderview_drag_types[] =
@@ -369,11 +363,15 @@ FolderView *folderview_create(void)
        GtkWidget *mail_popup;
        GtkWidget *news_popup;
        GtkWidget *imap_popup;
+#if 0
        GtkWidget *mbox_popup;
+#endif
        GtkItemFactory *mail_factory;
        GtkItemFactory *news_factory;
        GtkItemFactory *imap_factory;
+#if 0
        GtkItemFactory *mbox_factory;
+#endif
        gint n_entries;
        gint i;
 
@@ -444,12 +442,14 @@ FolderView *folderview_create(void)
                                       n_entries,
                                       "<NewsFolder>", &news_factory,
                                       folderview);
+#if 0
        n_entries = sizeof(folderview_mbox_popup_entries) /
                sizeof(folderview_mbox_popup_entries[0]);
        mbox_popup = menu_create_items(folderview_mbox_popup_entries,
                                       n_entries,
                                       "<MboxFolder>", &mbox_factory,
                                       folderview);
+#endif
 
        gtk_signal_connect(GTK_OBJECT(ctree), "key_press_event",
                           GTK_SIGNAL_FUNC(folderview_key_pressed),
@@ -488,9 +488,11 @@ FolderView *folderview_create(void)
        gtk_signal_connect(GTK_OBJECT(news_popup), "selection_done",
                           GTK_SIGNAL_FUNC(folderview_popup_close),
                           folderview);
+#if 0
        gtk_signal_connect(GTK_OBJECT(mbox_popup), "selection_done",
                           GTK_SIGNAL_FUNC(folderview_popup_close),
                           folderview);
+#endif
 
         /* drop callback */
        gtk_drag_dest_set(ctree, GTK_DEST_DEFAULT_ALL & ~GTK_DEST_DEFAULT_HIGHLIGHT,
@@ -517,13 +519,15 @@ FolderView *folderview_create(void)
        folderview->imap_factory = imap_factory;
        folderview->news_popup   = news_popup;
        folderview->news_factory = news_factory;
+#if 0
        folderview->mbox_popup   = mbox_popup;
        folderview->mbox_factory = mbox_factory;
+#endif
 
        folderview->folder_update_callback_id =
                hooks_register_hook(FOLDER_UPDATE_HOOKLIST, folderview_update_folder, (gpointer) folderview);
        folderview->folder_item_update_callback_id =
-               hooks_register_hook(FOLDER_ITEM_UPDATE_HOOKLIST, folderview_update_item, (gpointer) folderview);
+               hooks_register_hook(FOLDER_ITEM_UPDATE_HOOKLIST, folderview_update_item_claws, (gpointer) folderview);
 
        gtk_widget_show_all(scrolledwin);
 
@@ -535,12 +539,15 @@ FolderView *folderview_create(void)
 
 void folderview_init(FolderView *folderview)
 {
+       static GdkFont *boldfont = NULL;
+       static GdkFont *normalfont = NULL;
        GtkWidget *ctree = folderview->ctree;
        GtkWidget *label_new;
        GtkWidget *label_unread;
        GtkWidget *hbox_new;
        GtkWidget *hbox_unread;
-
+       
+       gtk_widget_realize(ctree);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_INBOX_CLOSE, &inboxxpm, &inboxxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_INBOX_CLOSE_HRM, &inboxhrmxpm, &inboxhrmxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_INBOX_OPEN, &inboxopenxpm, &inboxopenxpmmask);
@@ -587,43 +594,30 @@ void folderview_init(FolderView *folderview)
        gtk_clist_set_column_widget(GTK_CLIST(ctree),COL_NEW,hbox_new);
        gtk_clist_set_column_widget(GTK_CLIST(ctree),COL_UNREAD,hbox_unread);
                        
-       if (!normalfont) {
-               if (gtkut_font_load(NORMAL_FONT) == NULL) {
-                       GtkStyle *style = gtk_style_new();
-                       normalfont = style->font;
-                       gdk_font_ref(normalfont);
-                       gtk_style_unref(style);
-               } 
-               else 
-                       normalfont = gtkut_font_load(NORMAL_FONT);
-       }
-       
-       if (!boldfont) {
-               if (gtkut_font_load(BOLD_FONT) == NULL) {
-                       GtkStyle *style = gtk_style_new();
-                       boldfont = style->font;
-                       gdk_font_ref(boldfont);
-                       gtk_style_unref(style);
-               }
-               else
-                       boldfont = gtkut_font_load(BOLD_FONT);
+       if (!normal_style) {
+               normal_style = gtk_style_copy(gtk_widget_get_style(ctree));
+               if (!normalfont)
+                       normalfont = gtkut_font_load(prefs_common.normalfont);
+               if (normalfont)
+                       normal_style->font = normalfont;
+               normal_color_style = gtk_style_copy(normal_style);
+               normal_color_style->fg[GTK_STATE_NORMAL] = folderview->color_new;
+
+               gtk_widget_set_style(ctree, normal_style);
        }
-       
+
        if (!bold_style) {
                bold_style = gtk_style_copy(gtk_widget_get_style(ctree));
-               bold_style->font = boldfont;
+               if (!boldfont)
+                       boldfont = gtkut_font_load(prefs_common.boldfont);
+               if (boldfont)
+                       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)
@@ -690,7 +684,8 @@ static void folderview_select_node(FolderView *folderview, GtkCTreeNode *node)
        folderview->open_folder = TRUE;
        gtkut_ctree_set_focus_row(ctree, node);
        gtk_ctree_select(ctree, node);
-       if (folderview->summaryview->messages > 0)
+       if (folderview->summaryview->folder_item &&
+           folderview->summaryview->folder_item->total_msgs > 0)
                gtk_widget_grab_focus(folderview->summaryview->ctree);
        else
                gtk_widget_grab_focus(folderview->ctree);
@@ -770,6 +765,48 @@ void folderview_update_msg_num(FolderView *folderview, GtkCTreeNode *row)
        folderview_update_node(folderview, row);
 }
 
+void folderview_append_item(FolderItem *item)
+{
+       GList *list;
+
+       g_return_if_fail(item != NULL);
+       g_return_if_fail(item->folder != NULL);
+       if (folder_item_parent(item)) return;
+
+       for (list = folderview_list; list != NULL; list = list->next) {
+               FolderView *folderview = (FolderView *)list->data;
+               GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+               GtkCTreeNode *node, *child;
+
+               node = gtk_ctree_find_by_row_data(ctree, NULL, 
+                                                 folder_item_parent(item));
+               if (node) {
+                       child = gtk_ctree_find_by_row_data(ctree, node, item);
+                       if (!child) {
+                               gchar *text[N_FOLDER_COLS] =
+                                       {NULL, "0", "0", "0"};
+
+                               gtk_clist_freeze(GTK_CLIST(ctree));
+
+                               text[COL_FOLDER] = item->name;
+                               child = gtk_ctree_insert_node
+                                       (ctree, node, NULL, text,
+                                        FOLDER_SPACING,
+                                        folderxpm, folderxpmmask,
+                                        folderopenxpm, folderopenxpmmask,
+                                        FALSE, FALSE);
+                               gtk_ctree_node_set_row_data(ctree, child, item);
+                               gtk_ctree_expand(ctree, node);
+                               folderview_update_node(folderview, child);
+                               folderview_sort_folders(folderview, node,
+                                                       item->folder);
+
+                               gtk_clist_thaw(GTK_CLIST(ctree));
+                       }
+               }
+       }
+}
+
 static void folderview_set_folders(FolderView *folderview)
 {
        GList *list;
@@ -880,6 +917,7 @@ gint folderview_check_new(Folder *folder)
                        if (item->no_select) continue;
                        if (folder && folder != item->folder) continue;
                        if (!folder && !FOLDER_IS_LOCAL(item->folder)) continue;
+                       if (!item->prefs->newmailcheck) continue;
 
                        folderview_scan_tree_func(item->folder, item, NULL);
                        former_new = item->new_msgs;
@@ -1155,7 +1193,7 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
        }
        g_free(name);
 
-       if (!item->parent) {
+       if (!folder_item_parent(item)) {
                gtk_ctree_node_set_text(ctree, node, COL_NEW,    "-");
                gtk_ctree_node_set_text(ctree, node, COL_UNREAD, "-");
                gtk_ctree_node_set_text(ctree, node, COL_TOTAL,  "-");
@@ -1183,10 +1221,18 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
 
        gtk_ctree_node_set_foreground(ctree, node, NULL);
 
-       if (use_bold && use_color) {
-               style = bold_color_style;
-       } else if (use_bold) {
-               style = bold_style;
+       if (use_bold) {
+               if (item->prefs->color > 0 && !use_color) {
+                       GdkColor gdk_color;
+
+                       gtkut_convert_int_to_gdk_color(item->prefs->color, &gdk_color);
+                       color_style = gtk_style_copy(bold_style);
+                       color_style->fg[GTK_STATE_NORMAL] = gdk_color;
+                       style = color_style;
+               } else if (use_color)
+                       style = bold_color_style;
+               else
+                       style = bold_style;
                if (item->op_count > 0) {
                        style = bold_tgtfold_style;
                }
@@ -1213,7 +1259,32 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                folderview_update_node(folderview, node);
 }
 
-gboolean folderview_update_item(gpointer source, gpointer data)
+#if !CLAWS
+void folderview_update_item(FolderItem *item, gboolean update_summary)
+{
+       GList *list;
+       FolderView *folderview;
+       GtkCTree *ctree;
+       GtkCTreeNode *node;
+
+       g_return_if_fail(item != NULL);
+
+       for (list = folderview_list; list != NULL; list = list->next) {
+               folderview = (FolderView *)list->data;
+               ctree = GTK_CTREE(folderview->ctree);
+
+               node = gtk_ctree_find_by_row_data(ctree, NULL, item);
+               if (node) {
+                       folderview_update_node(folderview, node);
+                       if (update_summary && folderview->opened == node)
+                               summary_show(folderview->summaryview,
+                                            item, FALSE);
+               }
+       }
+}
+#endif
+
+gboolean folderview_update_item_claws(gpointer source, gpointer data)
 {
        FolderItemUpdateData *update_info = (FolderItemUpdateData *)source;
        FolderView *folderview = (FolderView *)data;
@@ -1237,6 +1308,36 @@ gboolean folderview_update_item(gpointer source, gpointer data)
        return FALSE;
 }
 
+typedef struct FolderItemUpdateParams {
+       FolderView          *folderview;
+       FolderItemUpdateData data;
+} FolderItemUpdateParams;
+
+static void folderview_update_item_foreach_func(gpointer key, gpointer val,
+                                               gpointer data)
+{
+       FolderItemUpdateParams *fum = (FolderItemUpdateParams *)data;
+       fum->data.item = (FolderItem *)key; 
+       folderview_update_item_claws(&fum->data, fum->folderview);
+}
+
+void folderview_update_item_foreach(GHashTable *table, gboolean update_summary)
+{
+       GList *list;
+
+       for (list = folderview_list; list != NULL; list = list->next) {
+               FolderItemUpdateParams data;
+               
+               data.folderview = (FolderView *)list->data;
+               /* FIXME: update_summary means update everything here? */
+               data.data.item = NULL;
+               data.data.update_flags = (update_summary 
+                       ? F_ITEM_UPDATE_CONTENT | F_ITEM_UPDATE_MSGCNT 
+                       : 0);
+               g_hash_table_foreach(table, folderview_update_item_foreach_func, &data);
+       }
+}
+
 static gboolean folderview_gnode_func(GtkCTree *ctree, guint depth,
                                      GNode *gnode, GtkCTreeNode *cnode,
                                      gpointer data)
@@ -1283,6 +1384,16 @@ static void folderview_expand_func(GtkCTree *ctree, GtkCTreeNode *node,
                                sibling = GTK_CTREE_ROW(prev)->sibling; \
                        else \
                                sibling = GTK_CTREE_ROW(parent)->children; \
+                       while (sibling) { \
+                               FolderItem *tmp; \
+ \
+                               tmp = gtk_ctree_node_get_row_data \
+                                       (ctree, sibling); \
+                               if (tmp->stype != F_NORMAL) \
+                                       sibling = GTK_CTREE_ROW(sibling)->sibling; \
+                               else \
+                                       break; \
+                       } \
                        if (node != sibling) \
                                gtk_ctree_move(ctree, node, parent, sibling); \
                } \
@@ -1299,7 +1410,7 @@ static void folderview_sort_folders(FolderView *folderview, GtkCTreeNode *root,
 
        gtk_sctree_sort_recursive(ctree, root);
 
-       if (GTK_CTREE_ROW(root)->parent) return;
+       if (root && GTK_CTREE_ROW(root)->parent) return;
 
        SET_SPECIAL_FOLDER(ctree, folder->inbox);
        SET_SPECIAL_FOLDER(ctree, folder->outbox);
@@ -1334,15 +1445,10 @@ void folderview_new_folder(FolderView *folderview)
        g_return_if_fail(item->folder != NULL);
 
        switch (FOLDER_TYPE(item->folder)) {
-       case F_MBOX:
-               folderview_new_mbox_folder_cb(folderview, 0, NULL);
-               break;
        case F_MH:
        case F_MAILDIR:
-               folderview_new_folder_cb(folderview, 0, NULL);
-               break;
        case F_IMAP:
-               folderview_new_imap_folder_cb(folderview, 0, NULL);
+               folderview_new_folder_cb(folderview, 0, NULL);
                break;
        case F_NEWS:
        default:
@@ -1364,9 +1470,11 @@ void folderview_rename_folder(FolderView *folderview)
        if (item->stype != F_NORMAL) return;
 
        switch (FOLDER_TYPE(item->folder)) {
+#if 0
        case F_MBOX:
                folderview_rename_mbox_folder_cb(folderview, 0, NULL);
                break;
+#endif
        case F_MH:
        case F_MAILDIR:
        case F_IMAP:
@@ -1393,7 +1501,9 @@ void folderview_delete_folder(FolderView *folderview)
 
        switch (FOLDER_TYPE(item->folder)) {
        case F_MH:
+#if 0
        case F_MBOX:
+#endif
        case F_MAILDIR:
        case F_IMAP:
                folderview_delete_folder_cb(folderview, 0, NULL);
@@ -1420,6 +1530,7 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
        gboolean rename_folder   = FALSE;
        gboolean move_folder     = FALSE;
        gboolean delete_folder   = FALSE;
+       gboolean download_msg    = FALSE;
        gboolean update_tree     = FALSE;
        gboolean rescan_tree     = FALSE;
        gboolean remove_tree     = FALSE;
@@ -1470,15 +1581,15 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
 
        if (folderview->mainwin->lock_count == 0) {
                new_folder = TRUE;
-               if (item->parent == NULL) {
+               if (folder_item_parent(item) == NULL) {
                        update_tree = remove_tree = TRUE;
                        if (folder->account)
                                folder_property = TRUE;
                } else
                        mark_all_read = search_folder = folder_property = TRUE;
                        
-               if (FOLDER_IS_LOCAL(folder) || FOLDER_TYPE(folder) == F_IMAP || FOLDER_TYPE(folder) == F_MBOX) {
-                       if (item->parent == NULL)
+               if (FOLDER_IS_LOCAL(folder) || FOLDER_TYPE(folder) == F_IMAP /* || FOLDER_TYPE(folder) == F_MBOX */) {
+                       if (folder_item_parent(item) == NULL)
                                update_tree = rescan_tree = TRUE;
                        else if (item->stype == F_NORMAL)
                                move_folder = rename_folder = delete_folder = folder_scoring = folder_processing = TRUE;
@@ -1488,10 +1599,19 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
                                folder_processing = TRUE;
                        else if (item->stype == F_OUTBOX)
                                folder_processing = TRUE;
+                       if (0 == item->total_msgs)
+                               search_folder = FALSE;
                } else if (FOLDER_TYPE(folder) == F_NEWS) {
-                       if (item->parent != NULL)
+                       if (folder_item_parent(item) != NULL)
                                delete_folder = folder_scoring = folder_processing = TRUE;
                }
+               if (FOLDER_TYPE(folder) == F_IMAP ||
+                   FOLDER_TYPE(folder) == F_NEWS) {
+                       if (folder_item_parent(item) != NULL && 
+                           item->no_select == FALSE &&
+                           !prefs_common.work_offline)
+                               download_msg = TRUE;
+               }
                if (item->unread_msgs < 1) 
                        mark_all_read = FALSE;
        }
@@ -1516,7 +1636,6 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
                SET_SENS(mail_factory, "/Search folder...", search_folder);
                SET_SENS(mail_factory, "/Properties...", folder_property);
                SET_SENS(mail_factory, "/Processing...", folder_processing);
-               SET_SENS(mail_factory, "/Scoring...", folder_scoring);
        } else if (FOLDER_TYPE(folder) == F_IMAP) {
                popup = folderview->imap_popup;
                menu_set_insensitive_all(GTK_MENU_SHELL(popup));
@@ -1525,25 +1644,26 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
                SET_SENS(imap_factory, "/Rename folder...", rename_folder);
                SET_SENS(imap_factory, "/Move folder...", move_folder);
                SET_SENS(imap_factory, "/Delete folder", delete_folder);
+               SET_SENS(imap_factory, "/Download", download_msg);
                SET_SENS(imap_factory, "/Check for new messages", update_tree);
                SET_SENS(imap_factory, "/Rebuild folder tree", rescan_tree);
                SET_SENS(imap_factory, "/Remove IMAP4 account", remove_tree);
                SET_SENS(imap_factory, "/Search folder...", search_folder);
                SET_SENS(imap_factory, "/Properties...", folder_property);
                SET_SENS(imap_factory, "/Processing...", folder_processing);
-               SET_SENS(imap_factory, "/Scoring...", folder_scoring);
        } else if (FOLDER_TYPE(folder) == F_NEWS) {
                popup = folderview->news_popup;
                menu_set_insensitive_all(GTK_MENU_SHELL(popup));
                SET_SENS(news_factory, "/Mark all read", mark_all_read);
                SET_SENS(news_factory, "/Subscribe to newsgroup...", new_folder);
                SET_SENS(news_factory, "/Remove newsgroup", delete_folder);
+               SET_SENS(news_factory, "/Download", download_msg);
                SET_SENS(news_factory, "/Check for new messages", update_tree);
                SET_SENS(news_factory, "/Remove news account", remove_tree);
                SET_SENS(news_factory, "/Search folder...", search_folder);
                SET_SENS(news_factory, "/Properties...", folder_property);
                SET_SENS(news_factory, "/Processing...", folder_processing);
-               SET_SENS(news_factory, "/Scoring...", folder_scoring);
+#if 0
        } else if (FOLDER_TYPE(folder) == F_MBOX) {
                popup = folderview->mbox_popup;
                menu_set_insensitive_all(GTK_MENU_SHELL(popup));
@@ -1553,7 +1673,7 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
                SET_SENS(mbox_factory, "/Delete folder", delete_folder);
                SET_SENS(news_factory, "/Properties...", folder_property);
                SET_SENS(mbox_factory, "/Processing...", folder_processing);
-               SET_SENS(mbox_factory, "/Scoring...", folder_scoring);
+#endif
        } else
                return;
 
@@ -1591,7 +1711,8 @@ static void folderview_key_pressed(GtkWidget *widget, GdkEventKey *event,
        case GDK_space:
                if (folderview->selected) {
                        if (folderview->opened == folderview->selected &&
-                           folderview->summaryview->messages == 0)
+                           (!folderview->summaryview->folder_item ||
+                            folderview->summaryview->folder_item->total_msgs == 0))
                                folderview_select_next_unread(folderview);
                        else
                                folderview_select_node(folderview,
@@ -1763,27 +1884,68 @@ static void folderview_col_resized(GtkCList *clist, gint column, gint width,
        }
 }
 
-static GtkCTreeNode *folderview_find_by_name(GtkCTree *ctree,
-                                            GtkCTreeNode *node,
-                                            const gchar *name)
+static void folderview_download_func(Folder *folder, FolderItem *item,
+                                    gpointer data)
 {
-       FolderItem *item;
-
-       if (!node)
-               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
-       if (!node)
-               return NULL;
+       GList *list;
 
-       node = GTK_CTREE_ROW(node)->children;
+       for (list = folderview_list; list != NULL; list = list->next) {
+               FolderView *folderview = (FolderView *)list->data;
+               MainWindow *mainwin = folderview->mainwin;
+               gchar *str;
 
-       while (node) {
-               item = gtk_ctree_node_get_row_data(ctree, node);
-               if (!folderview_compare_name(item, name))
-                       return node;
-               node = GTK_CTREE_ROW(node)->sibling;
+               str = g_strdup_printf
+                       (_("Downloading messages in %s ..."), item->path);
+               main_window_progress_set(mainwin,
+                                        GPOINTER_TO_INT(data), item->total_msgs);
+               STATUSBAR_PUSH(mainwin, str);
+               STATUSBAR_POP(mainwin);
+               g_free(str);
        }
+}
 
-       return NULL;
+static void folderview_download_cb(FolderView *folderview, guint action,
+                                  GtkWidget *widget)
+{
+       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       MainWindow *mainwin = folderview->mainwin;
+       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 0
+       if (!prefs_common.online_mode) {
+               if (alertpanel(_("Offline"),
+                              _("You are offline. Go online?"),
+                              _("Yes"), _("No"), NULL) == G_ALERTDEFAULT)
+                       main_window_toggle_online(folderview->mainwin, TRUE);
+               else
+                       return;
+       }
+#endif
+       main_window_cursor_wait(mainwin);
+       inc_lock();
+       main_window_lock(mainwin);
+       gtk_widget_set_sensitive(folderview->ctree, FALSE);
+       main_window_progress_on(mainwin);
+       GTK_EVENTS_FLUSH();
+       folder_set_ui_func(item->folder, folderview_download_func, NULL);
+       if (folder_item_fetch_all_msg(item) < 0) {
+               gchar *name;
+
+               name = trim_string(item->name, 32);
+               alertpanel_error(_("Error occurred while downloading messages in `%s'."), name);
+               g_free(name);
+       }
+       folder_set_ui_func(item->folder, NULL, NULL);
+       main_window_progress_off(mainwin);
+       gtk_widget_set_sensitive(folderview->ctree, TRUE);
+       main_window_unlock(mainwin);
+       inc_unlock();
+       main_window_cursor_normal(mainwin);
 }
 
 static void folderview_update_tree_cb(FolderView *folderview, guint action,
@@ -1830,7 +1992,9 @@ void folderview_create_folder_node(FolderView *folderview, FolderItem *item)
        gchar *text[N_FOLDER_COLS] = {NULL, "0", "0", "0"};
        GtkCTreeNode *node, *parent_node;
        
-       parent_node = gtk_ctree_find_by_row_data(ctree, NULL, item->parent);
+       parent_node = gtk_ctree_find_by_row_data(ctree, NULL, folder_item_parent(item));
+       if (parent_node == NULL)
+               return;
 
        gtk_clist_freeze(GTK_CLIST(ctree));
 
@@ -1856,85 +2020,57 @@ static void folderview_new_folder_cb(FolderView *folderview, guint action,
        FolderItem *item;
        FolderItem *new_item;
        gchar *new_folder;
-       gchar *name, *name_;
+       gchar *name;
+       gchar *p;
 
        if (!folderview->selected) return;
 
        item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
-
-       new_folder = input_dialog(_("New folder"),
-                                 _("Input the name of new folder:"),
-                                 _("NewFolder"));
+       if (FOLDER_TYPE(item->folder) == F_IMAP)
+               g_return_if_fail(item->folder->account != NULL);
+
+       if (FOLDER_TYPE(item->folder) == F_IMAP) {
+               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"));
+       } else {
+               new_folder = input_dialog(_("New folder"),
+                                         _("Input the name of new folder:"),
+                                         _("NewFolder"));
+       }
        if (!new_folder) return;
+       AUTORELEASE_STR(new_folder, {g_free(new_folder); return;});
 
-       if (FOLDER_TYPE(item->folder) != F_MBOX) {
-               if (strchr(new_folder, G_DIR_SEPARATOR) != NULL) {
-                       alertpanel_error(_("`%c' can't be included in folder name."),
-                                        G_DIR_SEPARATOR);
-                       g_free(new_folder);
-                       return;
-               }
+       p = strchr(new_folder, G_DIR_SEPARATOR);
+       if ((p && FOLDER_TYPE(item->folder) != F_MBOX) ||
+           (p && FOLDER_TYPE(item->folder) != F_IMAP) ||
+           (p && FOLDER_TYPE(item->folder) == F_IMAP && *(p + 1) != '\0')) {
+               alertpanel_error(_("`%c' can't be included in folder name."),
+                                G_DIR_SEPARATOR);
+               return;
        }
 
-       name_ = trim_string(new_folder, 32);
-       Xstrdup_a(name, name_, {g_free(new_folder); return;});
-       g_free(name_);
+       name = trim_string(new_folder, 32);
+       AUTORELEASE_STR(name, {g_free(name); return;});
 
        /* find whether the directory already exists */
-       if (folderview_find_by_name(ctree, folderview->selected, new_folder)) {
+       if (folder_find_child_item_by_name(item, new_folder)) {
                alertpanel_error(_("The folder `%s' already exists."), name);
-               g_free(new_folder);
                return;
        }
 
        new_item = folder_create_folder(item, new_folder);
        if (!new_item) {
                alertpanel_error(_("Can't create the folder `%s'."), name);
-               g_free(new_folder);
-               return;
-       } 
-       g_free(new_folder);
-
-       folderview_create_folder_node(folderview, new_item);
-
-       folder_write_list();
-}
-
-static void folderview_new_mbox_folder_cb(FolderView *folderview, guint action,
-                                         GtkWidget *widget)
-{
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       FolderItem *item;
-       FolderItem *new_item;
-       gchar *new_folder;
-
-       if (!folderview->selected) return;
-
-       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
-       g_return_if_fail(item != NULL);
-       g_return_if_fail(item->folder != NULL);
-
-       new_folder = input_dialog(_("New folder"),
-                                 _("Input the name of new folder:"),
-                                 _("NewFolder"));
-       if (!new_folder) return;
-
-       /* find whether the directory already exists */
-       if (folderview_find_by_name(ctree, folderview->selected, new_folder)) {
-               alertpanel_error(_("The folder `%s' already exists."),
-                                new_folder);
-               g_free(new_folder);
                return;
        }
 
-       new_item = folder_create_folder(item, new_folder);
-       g_free(new_folder);
-       if (!new_item) return;
-
-       folderview_create_folder_node(folderview, new_item);
-
+       folderview_append_item(new_item);
        folder_write_list();
 }
 
@@ -1944,7 +2080,7 @@ 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 *name;
        gchar *message;
        gchar *old_path;
        gchar *old_id;
@@ -1957,29 +2093,25 @@ static void folderview_rename_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_);
+       name = trim_string(item->name, 32);
        message = g_strdup_printf(_("Input new name for `%s':"), name);
        new_folder = input_dialog(_("Rename folder"), message,
                                  g_basename(item->path));
        g_free(message);
+       g_free(name);
        if (!new_folder) return;
+       AUTORELEASE_STR(new_folder, {g_free(new_folder); return;});
 
        if (strchr(new_folder, G_DIR_SEPARATOR) != NULL) {
                alertpanel_error(_("`%c' can't be included in folder name."),
                                 G_DIR_SEPARATOR);
-               g_free(new_folder);
                return;
        }
 
-       if (folderview_find_by_name
-               (ctree, GTK_CTREE_ROW(folderview->selected)->parent,
-                new_folder)) {
+       if (folder_find_child_item_by_name(folder_item_parent(item), new_folder)) {
                name = trim_string(new_folder, 32);
                alertpanel_error(_("The folder `%s' already exists."), name);
                g_free(name);
-               g_free(new_folder);
                return;
        }
 
@@ -1988,10 +2120,8 @@ static void folderview_rename_folder_cb(FolderView *folderview, guint action,
 
        if (item->folder->klass->rename_folder(item->folder, item, new_folder) < 0) {
                g_free(old_id);
-               g_free(new_folder);
                return;
        }
-       g_free(new_folder);
 
        /* if (FOLDER_TYPE(item->folder) == F_MH)
                prefs_filtering_rename_path(old_path, item->path); */
@@ -2021,67 +2151,12 @@ 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->klass->rename_folder(item->folder, item, new_folder) < 0) {
-               g_free(new_folder);
-               return;
-       }
-       g_free(new_folder);
-
-       gtk_clist_freeze(GTK_CLIST(ctree));
-
-       folderview_update_node(folderview, folderview->selected);
-       folderview_sort_folders(folderview,
-                               GTK_CTREE_ROW(folderview->selected)->parent,
-                               item->folder);
-       if (folderview->opened == folderview->selected) {
-               if (!GTK_CTREE_ROW(folderview->opened)->children)
-                       gtk_ctree_expand(ctree, folderview->opened);
-               summary_show(folderview->summaryview, item);
-       }
-
-       gtk_clist_thaw(GTK_CLIST(ctree));
-
-       folder_write_list();
-}
-
 static void folderview_delete_folder_cb(FolderView *folderview, guint action,
                                        GtkWidget *widget)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        FolderItem *item;
-       gchar *message, *name, *name_;
+       gchar *message, *name;
        AlertValue avalue;
        gchar *old_path;
        gchar *old_id;
@@ -2093,9 +2168,8 @@ 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_);
+       name = trim_string(item->name, 32);
+       AUTORELEASE_STR(name, {g_free(name); return;});
        message = g_strdup_printf
                (_("All folder(s) and message(s) under `%s' will be deleted.\n"
                   "Do you really want to delete?"), name);
@@ -2107,6 +2181,14 @@ static void folderview_delete_folder_cb(FolderView *folderview, guint action,
        Xstrdup_a(old_path, item->path, return);
        old_id = folder_item_get_identifier(item);
 
+       if (folderview->opened == folderview->selected ||
+           gtk_ctree_is_ancestor(ctree,
+                                 folderview->selected,
+                                 folderview->opened)) {
+               summary_clear_all(folderview->summaryview);
+               folderview->opened = NULL;
+       }
+
        if (item->folder->klass->remove_folder(item->folder, item) < 0) {
                alertpanel_error(_("Can't remove the folder `%s'."), name);
                if (folderview->opened == folderview->selected)
@@ -2116,18 +2198,6 @@ static void folderview_delete_folder_cb(FolderView *folderview, guint action,
                return;
        }
 
-       /* if (FOLDER_TYPE(item->folder) == F_MH)
-               prefs_filtering_delete_path(old_path); */
-
-       if (folderview->opened == folderview->selected ||
-           gtk_ctree_is_ancestor(ctree,
-                                 folderview->selected,
-                                 folderview->opened)) {
-               summary_clear_all(folderview->summaryview);
-               folderview->opened = NULL;
-       }
-
-       gtk_ctree_remove_node(ctree, folderview->selected);
        folder_write_list();
 
        prefs_filtering_delete_path(old_id);
@@ -2141,7 +2211,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 *name;
        gchar *message;
        AlertValue avalue;
 
@@ -2150,82 +2220,22 @@ static void folderview_remove_mailbox_cb(FolderView *folderview, guint action,
        item = gtk_ctree_node_get_row_data(ctree, node);
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
-       if (item->parent) return;
+       if (folder_item_parent(item)) return;
 
-       name_ = trim_string(item->folder->name, 32);
-       Xstrdup_a(name, name_, return);
-       g_free(name_);
+       name = trim_string(item->folder->name, 32);
        message = g_strdup_printf
                (_("Really remove the mailbox `%s' ?\n"
                   "(The messages are NOT deleted from the disk)"), name);
        avalue = alertpanel(_("Remove mailbox"), message,
                            _("Yes"), _("+No"), NULL);
        g_free(message);
+       g_free(name);
        if (avalue != G_ALERTDEFAULT) return;
 
-       folder_destroy(item->folder);
-       summary_clear_all(folderview->summaryview);
        folderview_unselect(folderview);
-       gtk_ctree_remove_node(ctree, node);
-       folder_write_list();
-}
-
-static void folderview_new_imap_folder_cb(FolderView *folderview, guint action,
-                                         GtkWidget *widget)
-{
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       FolderItem *item;
-       FolderItem *new_item;
-       gchar *new_folder;
-       gchar *name, *name_;
-       gchar *p;
-
-       if (!folderview->selected) return;
-
-       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
-       g_return_if_fail(item != NULL);
-       g_return_if_fail(item->folder != NULL);
-       g_return_if_fail(FOLDER_TYPE(item->folder) == F_IMAP);
-       g_return_if_fail(item->folder->account != NULL);
-
-       new_folder = input_dialog
-               (_("New folder"),
-                _("Input the name of new folder:\n"
-                  "(if you want to create a folder to store subfolders,\n"
-                  " append `/' at the end of the name)"),
-                _("NewFolder"));
-       if (!new_folder) return;
-
-       if ((p = strchr(new_folder, G_DIR_SEPARATOR)) != NULL &&
-           *(p + 1) != '\0') {
-               alertpanel_error(_("`%c' can't be included in folder name."),
-                                G_DIR_SEPARATOR);
-               g_free(new_folder);
-               return;
-       }
-
-       name_ = trim_string(new_folder, 32);
-       Xstrdup_a(name, name_, return);
-       g_free(name_);
-
-       /* find whether the directory already exists */
-       if (folderview_find_by_name(ctree, folderview->selected, new_folder)) {
-               alertpanel_error(_("The folder `%s' already exists."), name);
-               g_free(new_folder);
-               return;
-       }
-
-       new_item = folder_create_folder(item, new_folder);
-       if (!new_item) {
-               alertpanel_error(_("Can't create the folder `%s'."), name);
-               g_free(new_folder);
-               return;
-       }
-       g_free(new_folder);
-
-       folderview_create_folder_node(folderview, new_item);
+       summary_clear_all(folderview->summaryview);
 
-       folder_write_list();
+       folder_destroy(item->folder);
 }
 
 static void folderview_rm_imap_server_cb(FolderView *folderview, guint action,
@@ -2234,7 +2244,7 @@ static void folderview_rm_imap_server_cb(FolderView *folderview, guint action,
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        FolderItem *item;
        PrefsAccount *account;
-       gchar *name, *name_;
+       gchar *name;
        gchar *message;
        AlertValue avalue;
 
@@ -2246,13 +2256,12 @@ static void folderview_rm_imap_server_cb(FolderView *folderview, guint action,
        g_return_if_fail(FOLDER_TYPE(item->folder) == F_IMAP);
        g_return_if_fail(item->folder->account != NULL);
 
-       name_ = trim_string(item->folder->name, 32);
-       Xstrdup_a(name, name_, return);
-       g_free(name_);
+       name = trim_string(item->folder->name, 32);
        message = g_strdup_printf(_("Really delete IMAP4 account `%s'?"), name);
        avalue = alertpanel(_("Delete IMAP4 account"), message,
                            _("Yes"), _("+No"), NULL);
        g_free(message);
+       g_free(name);
 
        if (avalue != G_ALERTDEFAULT) return;
 
@@ -2277,7 +2286,6 @@ static void folderview_new_news_group_cb(FolderView *folderview, guint action,
                                         GtkWidget *widget)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       gchar *text[N_FOLDER_COLS] = {NULL, "0", "0", "0"};
        GtkCTreeNode *servernode, *node;
        Folder *folder;
        FolderItem *item;
@@ -2327,8 +2335,8 @@ static void folderview_new_news_group_cb(FolderView *folderview, guint action,
                        folderview->opened = NULL;
                }
 
-               folder_item_remove(item);
                gtk_ctree_remove_node(ctree, node);
+               folder_item_remove(item);
 
                gnode = next;
        }
@@ -2339,23 +2347,14 @@ static void folderview_new_news_group_cb(FolderView *folderview, guint action,
        for (cur = new_subscr; cur != NULL; cur = cur->next) {
                gchar *name = (gchar *)cur->data;
 
-               if (folderview_find_by_name(ctree, servernode, name) != NULL)
+               if (folder_find_child_item_by_name(rootitem, name) != NULL)
                        continue;
 
-               text[COL_FOLDER] = name;
-               node = gtk_ctree_insert_node(ctree, servernode, NULL, text,
-                                            FOLDER_SPACING,
-                                            folderxpm, folderxpmmask,
-                                            folderopenxpm, folderopenxpmmask,
-                                            FALSE, FALSE);
-               gtk_ctree_expand(ctree, servernode);
-
                newitem = folder_item_new(folder, name, name);
                folder_item_append(rootitem, newitem);
-               gtk_ctree_node_set_row_data(ctree, node, newitem);
+               folderview_append_item(newitem);
        }
 
-       folderview_sort_folders(folderview, servernode, folder);
        gtk_clist_thaw(GTK_CLIST(ctree));
 
        slist_free_strings(new_subscr);
@@ -2369,7 +2368,7 @@ static void folderview_rm_news_group_cb(FolderView *folderview, guint action,
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        FolderItem *item;
-       gchar *name, *name_;
+       gchar *name;
        gchar *message;
        AlertValue avalue;
 
@@ -2381,13 +2380,12 @@ static void folderview_rm_news_group_cb(FolderView *folderview, guint action,
        g_return_if_fail(FOLDER_TYPE(item->folder) == F_NEWS);
        g_return_if_fail(item->folder->account != NULL);
 
-       name_ = trim_string(item->path, 32);
-       Xstrdup_a(name, name_, return);
-       g_free(name_);
+       name = trim_string(item->path, 32);
        message = g_strdup_printf(_("Really delete newsgroup `%s'?"), name);
        avalue = alertpanel(_("Delete newsgroup"), message,
                            _("Yes"), _("+No"), NULL);
        g_free(message);
+       g_free(name);
        if (avalue != G_ALERTDEFAULT) return;
 
        if (folderview->opened == folderview->selected) {
@@ -2396,7 +2394,6 @@ static void folderview_rm_news_group_cb(FolderView *folderview, guint action,
        }
 
        folder_item_remove(item);
-       gtk_ctree_remove_node(ctree, folderview->selected);
        folder_write_list();
        
        prefs_filtering_delete_path(name);
@@ -2408,7 +2405,7 @@ static void folderview_rm_news_server_cb(FolderView *folderview, guint action,
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        FolderItem *item;
        PrefsAccount *account;
-       gchar *name, *name_;
+       gchar *name;
        gchar *message;
        AlertValue avalue;
 
@@ -2420,13 +2417,12 @@ static void folderview_rm_news_server_cb(FolderView *folderview, guint action,
        g_return_if_fail(FOLDER_TYPE(item->folder) == F_NEWS);
        g_return_if_fail(item->folder->account != NULL);
 
-       name_ = trim_string(item->folder->name, 32);
-       Xstrdup_a(name, name_, return);
-       g_free(name_);
+       name = trim_string(item->folder->name, 32);
        message = g_strdup_printf(_("Really delete news account `%s'?"), name);
        avalue = alertpanel(_("Delete news account"), message,
                            _("Yes"), _("+No"), NULL);
        g_free(message);
+       g_free(name);
 
        if (avalue != G_ALERTDEFAULT) return;
 
@@ -2465,11 +2461,10 @@ static void folderview_property_cb(FolderView *folderview, guint action,
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
 
-       if (item->parent == NULL && item->folder->account)
+       if (folder_item_parent(item) == NULL && item->folder->account)
                account_open(item->folder->account);
        else {
-               summary_save_prefs_to_folderitem(folderview->summaryview, item);
-               prefs_folder_item_create(folderview, item);
+               prefs_folder_item_open(item);
        }
 }
 
@@ -2493,18 +2488,6 @@ static void folderview_recollapse_nodes(FolderView *folderview, GtkCTreeNode *no
        g_slist_free(done);
 }
 
-static void folderview_recollapse_all_nodes(FolderView *folderview)
-{
-       GSList *list = folderview->nodes_to_recollapse;
-       if (!list) return;
-       for (; list != NULL; list = g_slist_next(list))
-               if (list->data) 
-                       gtk_ctree_collapse(GTK_CTREE(folderview->ctree), 
-                                          GTK_CTREE_NODE(list->data));
-       g_slist_free(folderview->nodes_to_recollapse);  
-       folderview->nodes_to_recollapse = NULL;
-}
-
 static void folderview_move_to_cb(FolderView *folderview) 
 {
        FolderItem *from_folder = NULL, *to_folder = NULL;
@@ -2532,7 +2515,7 @@ static void folderview_move_to(FolderView *folderview, FolderItem *from_folder,
        gint status;
 
        src_node = gtk_ctree_find_by_row_data(GTK_CTREE(folderview->ctree), NULL, from_folder);
-       from_parent = from_folder->parent;
+       from_parent = folder_item_parent(from_folder);
        buf = g_strdup_printf(_("Moving %s to %s..."), from_folder->name, to_folder->name);
        STATUSBAR_PUSH(folderview->mainwin, buf);
        g_free(buf);
@@ -2549,18 +2532,11 @@ static void folderview_move_to(FolderView *folderview, FolderItem *from_folder,
                main_window_cursor_normal(folderview->mainwin);
                STATUSBAR_POP(folderview->mainwin);
                folder_item_update_thaw();
-               if (src_node)
-                       gtk_ctree_remove_node(GTK_CTREE(folderview->ctree), src_node);
-               else 
-                       debug_print("can't remove src node: is null\n");
-
-               folderview_create_folder_node_recursive(folderview, new_folder);
-
                folder_item_update_recursive(new_folder, F_ITEM_UPDATE_MSGCNT);
 
                folderview_sort_folders(folderview, 
                        gtk_ctree_find_by_row_data(GTK_CTREE(folderview->ctree), 
-                               NULL, new_folder->parent), new_folder->folder);
+                               NULL, folder_item_parent(new_folder)), new_folder->folder);
                folderview_select(folderview, new_folder);
        } else {
                statusbar_verbosity_set(FALSE);         
@@ -2600,30 +2576,6 @@ static gint folderview_clist_compare(GtkCList *clist,
        return g_strcasecmp(item1->name, item2->name);
 }
 
-static gint folderview_compare_name(gconstpointer a, gconstpointer b)
-{
-       const FolderItem *item = a;
-       const gchar *name = b;
-
-       if (!item->path) return -1;
-       return strcmp2(g_basename(item->path), name);
-}
-
-static void folderview_scoring_cb(FolderView *folderview, guint action,
-                                  GtkWidget *widget)
-{
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       FolderItem *item;
-
-       if (!folderview->selected) return;
-
-       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
-       g_return_if_fail(item != NULL);
-       g_return_if_fail(item->folder != NULL);
-
-       prefs_scoring_open(item);
-}
-
 static void folderview_processing_cb(FolderView *folderview, guint action,
                                     GtkWidget *widget)
 {
@@ -2636,7 +2588,8 @@ static void folderview_processing_cb(FolderView *folderview, guint action,
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
 
-       prefs_filtering_open(item, NULL, NULL);
+       prefs_filtering_open(&item->prefs->processing,
+                            _("Processing configuration"), NULL, NULL);
 }
 
 void folderview_set_target_folder_color(gint color_op) 
@@ -2757,9 +2710,16 @@ gboolean folderview_update_folder(gpointer source, gpointer userdata)
        ctree = folderview->ctree;
        g_return_val_if_fail(ctree != NULL, FALSE);
 
-       if (hookdata->update_flags & FOLDER_TREE_CHANGED) {
+       if (hookdata->update_flags & FOLDER_NEW_FOLDERITEM)
+               folderview_create_folder_node(folderview, hookdata->item);
+       else if (hookdata->update_flags & FOLDER_REMOVE_FOLDERITEM) {
+               GtkCTreeNode *node;
+
+               node = gtk_ctree_find_by_row_data(GTK_CTREE(ctree), NULL, hookdata->item);
+               if (node != NULL)
+                       gtk_ctree_remove_node(GTK_CTREE(ctree), node);
+       } else if (hookdata->update_flags & (FOLDER_TREE_CHANGED | FOLDER_NEW_FOLDER | FOLDER_DESTROY_FOLDER))
                folderview_set(folderview);
-       }
 
        return FALSE;
 }
@@ -2797,7 +2757,9 @@ static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
                    src_item && src_item != item) {
                        switch (FOLDER_TYPE(item->folder)) {
                        case F_MH:
+#if 0
                        case F_MBOX:
+#endif
                        case F_IMAP:
                                acceptable = TRUE;
                                break;
@@ -2928,3 +2890,7 @@ static void folderview_drag_end_cb(GtkWidget          *widget,
        folderview->nodes_to_recollapse = NULL;
 }
 
+FolderItem *folderview_get_selected(FolderView *folderview)
+{
+       return (FolderItem *) gtk_ctree_node_get_row_data(folderview->ctree, folderview->opened);
+}