2004-09-14 [colin] 0.9.12cvs99.3
[claws.git] / src / folder.c
index f1432926f3349a9619992319ee66e95f16095981..8d023be4662047b48b1cf30ca2753a31da994516 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 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 "imap.h"
 #include "news.h"
 #include "mh.h"
-#include "mbox_folder.h"
 #include "utils.h"
 #include "xml.h"
 #include "codeconv.h"
 #include "prefs_gtk.h"
 #include "account.h"
 #include "filtering.h"
-#include "scoring.h"
-#include "prefs_folder_item.h"
 #include "procheader.h"
 #include "hooks.h"
 #include "log.h"
+#include "folder_item_prefs.h"
+#include "remotefolder.h"
+#include "partial_download.h"
 
 /* Dependecies to be removed ?! */
 #include "prefs_common.h"
 #include "prefs_account.h"
-#include "prefs_folder_item.h"
 
 static GList *folder_list = NULL;
+static GSList *class_list = NULL;
+static GSList *folder_unloaded_list = NULL;
 
-static void folder_init                (Folder         *folder,
+void folder_init               (Folder         *folder,
                                 const gchar    *name);
 
-static gboolean folder_read_folder_func        (GNode          *node,
-                                        gpointer        data);
 static gchar *folder_get_list_path     (void);
-static void folder_write_list_recursive        (GNode          *node,
-                                        gpointer        data);
+static GNode *folder_get_xml_node      (Folder         *folder);
+static Folder *folder_get_from_xml     (GNode          *node);
 static void folder_update_op_count_rec (GNode          *node);
 
 
@@ -73,26 +72,74 @@ static void folder_get_persist_prefs_recursive
 static gboolean persist_prefs_free     (gpointer key, gpointer val, gpointer data);
 void folder_item_read_cache            (FolderItem *item);
 void folder_item_free_cache            (FolderItem *item);
-
-static GSList *classlist;
+gint folder_item_scan_full             (FolderItem *item, gboolean filtering);
+static void folder_item_update_with_msg (FolderItem *item, FolderItemUpdateFlags update_flags,
+                                         MsgInfo *msg);
 
 void folder_system_init(void)
 {
        folder_register_class(mh_get_class());
        folder_register_class(imap_get_class());
        folder_register_class(news_get_class());
-       folder_register_class(mbox_get_class());
 }
 
 GSList *folder_get_class_list(void)
 {
-       return classlist;
+       return class_list;
 }
 
 void folder_register_class(FolderClass *klass)
 {
+       GSList *xmllist, *cur;
+
        debug_print("registering folder class %s\n", klass->idstr);
-       classlist = g_slist_append(classlist, klass);
+
+       class_list = g_slist_append(class_list, klass);
+
+       xmllist = g_slist_copy(folder_unloaded_list);
+       for (cur = xmllist; cur != NULL; cur = g_slist_next(cur)) {
+               GNode *node = (GNode *) cur->data;
+               XMLNode *xmlnode = (XMLNode *) node->data;
+               GList *cur = xmlnode->tag->attr;
+
+               for (; cur != NULL; cur = g_list_next(cur)) {
+                       XMLAttr *attr = (XMLAttr *) cur->data;
+
+                       if (!attr || !attr->name || !attr->value) continue;
+                       if (!strcmp(attr->name, "type") && !strcmp(attr->value, klass->idstr)) {
+                               Folder *folder;
+
+                               folder = folder_get_from_xml(node);
+                               folder_add(folder);
+                               folder_unloaded_list = g_slist_remove(folder_unloaded_list, node);
+
+                               cur = NULL;
+                               continue;
+                       }
+               }
+       }
+       g_slist_free(xmllist);
+}
+
+void folder_unregister_class(FolderClass *klass)
+{
+       GList *folderlist, *cur;
+
+       debug_print("unregistering folder class %s\n", klass->idstr);
+
+       class_list = g_slist_remove(class_list, klass);
+
+       folderlist = g_list_copy(folder_get_list());
+       for (cur = folderlist; cur != NULL; cur = g_list_next(cur)) {
+               Folder *folder = (Folder *) cur->data;
+
+               if (folder->klass == klass) {
+                       GNode *xmlnode = folder_get_xml_node(folder);
+                       folder_unloaded_list = g_slist_append(folder_unloaded_list, xmlnode);
+                       folder_destroy(folder);
+               }
+       }
+       g_list_free(folderlist);
 }
 
 Folder *folder_new(FolderClass *klass, const gchar *name, const gchar *path)
@@ -108,13 +155,13 @@ Folder *folder_new(FolderClass *klass, const gchar *name, const gchar *path)
        /* Create root folder item */
        item = folder_item_new(folder, name, NULL);
        item->folder = folder;
-       folder->node = g_node_new(item);
+       folder->node = item->node = g_node_new(item);
        folder->data = NULL;
 
        return folder;
 }
 
-static void folder_init(Folder *folder, const gchar *name)
+void folder_init(Folder *folder, const gchar *name)
 {
        g_return_if_fail(folder != NULL);
 
@@ -122,6 +169,7 @@ static void folder_init(Folder *folder, const gchar *name)
 
        /* Init folder data */
        folder->account = NULL;
+       folder->sort = 0;
        folder->inbox = NULL;
        folder->outbox = NULL;
        folder->draft = NULL;
@@ -129,26 +177,12 @@ static void folder_init(Folder *folder, const gchar *name)
        folder->trash = NULL;
 }
 
-void folder_local_folder_init(Folder *folder, const gchar *name,
-                             const gchar *path)
-{
-       folder_init(folder, name);
-       LOCAL_FOLDER(folder)->rootpath = g_strdup(path);
-}
-
-void folder_remote_folder_init(Folder *folder, const gchar *name,
-                              const gchar *path)
-{
-       folder_init(folder, name);
-       REMOTE_FOLDER(folder)->session = NULL;
-}
-
 void folder_destroy(Folder *folder)
 {
        g_return_if_fail(folder != NULL);
        g_return_if_fail(folder->klass->destroy_folder != NULL);
 
-       folder_list = g_list_remove(folder_list, folder);
+       folder_remove(folder);
 
        folder_tree_destroy(folder);
 
@@ -158,19 +192,64 @@ void folder_destroy(Folder *folder)
        g_free(folder);
 }
 
-void folder_local_folder_destroy(LocalFolder *lfolder)
+void folder_set_xml(Folder *folder, XMLTag *tag)
 {
-       g_return_if_fail(lfolder != NULL);
+       GList *cur;
+       FolderItem *rootitem = NULL;
+
+       if ((folder->node != NULL) && (folder->node->data != NULL))
+               rootitem = (FolderItem *) folder->node->data;
+
+       for (cur = tag->attr; cur != NULL; cur = g_list_next(cur)) {
+               XMLAttr *attr = (XMLAttr *) cur->data;
+
+               if (!attr || !attr->name || !attr->value) continue;
+               if (!strcmp(attr->name, "name")) {
+                       if (folder->name != NULL)
+                               g_free(folder->name);
+                       folder->name = g_strdup(attr->value);
+                       if (rootitem != NULL) {
+                               if (rootitem->name != NULL)
+                                       g_free(rootitem->name);
+                               rootitem->name = g_strdup(attr->value);
+                       }
+               } else if (!strcmp(attr->name, "account_id")) {
+                       PrefsAccount *account;
 
-       g_free(lfolder->rootpath);
+                       account = account_find_from_id(atoi(attr->value));
+                       if (!account)
+                               g_warning("account_id: %s not found\n", attr->value);
+                       else {
+                               folder->account = account;
+                               account->folder = folder;
+                       }
+               } else if (!strcmp(attr->name, "collapsed")) {
+                       if (rootitem != NULL)
+                               rootitem->collapsed = *attr->value == '1' ? TRUE : FALSE;
+               } else if (!strcmp(attr->name, "sort")) {
+                       folder->sort = atoi(attr->value);
+               }
+       }
 }
 
-void folder_remote_folder_destroy(RemoteFolder *rfolder)
+XMLTag *folder_get_xml(Folder *folder)
 {
-       g_return_if_fail(rfolder != NULL);
+       XMLTag *tag;
+
+       tag = xml_tag_new("folder");
 
-       if (rfolder->session)
-               session_destroy(rfolder->session);
+       if (folder->name)
+               xml_tag_add_attr(tag, xml_attr_new("name", folder->name));
+       if (folder->account)
+               xml_tag_add_attr(tag, xml_attr_new_int("account_id", folder->account->account_id));
+       if (folder->node && folder->node->data) {
+               FolderItem *rootitem = (FolderItem *) folder->node->data;
+
+               xml_tag_add_attr(tag, xml_attr_new("collapsed", rootitem->collapsed ? "1" : "0"));
+       }
+       xml_tag_add_attr(tag, xml_attr_new_int("sort", folder->sort));
+
+       return tag;
 }
 
 FolderItem *folder_item_new(Folder *folder, const gchar *name, const gchar *path)
@@ -202,33 +281,47 @@ FolderItem *folder_item_new(Folder *folder, const gchar *name, const gchar *path
        item->threaded  = TRUE;
        item->ret_rcpt  = FALSE;
        item->opened    = FALSE;
-       item->parent = NULL;
+       item->node = g_node_new(item);
        item->folder = NULL;
        item->account = NULL;
        item->apply_sub = FALSE;
        item->mark_queue = NULL;
        item->data = NULL;
 
-       item->prefs = prefs_folder_item_new();
+       item->prefs = folder_item_prefs_new();
 
        return item;
 }
 
 void folder_item_append(FolderItem *parent, FolderItem *item)
 {
-       GNode *node;
-
        g_return_if_fail(parent != NULL);
        g_return_if_fail(parent->folder != NULL);
+       g_return_if_fail(parent->node != NULL);
        g_return_if_fail(item != NULL);
 
-       node = parent->folder->node;
-       node = g_node_find(node, G_PRE_ORDER, G_TRAVERSE_ALL, parent);
-       g_return_if_fail(node != NULL);
-
-       item->parent = parent;
        item->folder = parent->folder;
-       g_node_append_data(node, item);
+       g_node_append(parent->node, item->node);
+}
+
+static gboolean folder_item_remove_func(GNode *node, gpointer data)
+{
+       FolderItem *item = FOLDER_ITEM(node->data);
+       FolderUpdateData hookdata;
+
+       if (item->cache != NULL) {
+               msgcache_destroy(item->cache);
+               item->cache = NULL;
+       }
+
+       hookdata.folder = item->folder;
+       hookdata.update_flags = FOLDER_TREE_CHANGED | FOLDER_REMOVE_FOLDERITEM;
+       hookdata.item = item;
+       hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
+
+       folder_item_destroy(item);
+
+       return FALSE;
 }
 
 void folder_item_remove(FolderItem *item)
@@ -237,25 +330,58 @@ void folder_item_remove(FolderItem *item)
 
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
+       g_return_if_fail(item->node != NULL);
 
-       node = item->folder->node;
-       node = g_node_find(node, G_PRE_ORDER, G_TRAVERSE_ALL, item);
-       g_return_if_fail(node != NULL);
+       node = item->node;
 
-       /* TODO: free all FolderItem's first */
        if (item->folder->node == node)
                item->folder->node = NULL;
+
+       g_node_traverse(node, G_POST_ORDER, G_TRAVERSE_ALL, -1,
+                       folder_item_remove_func, NULL);
        g_node_destroy(node);
 }
 
+void folder_item_remove_children(FolderItem *item)
+{
+       GNode *node, *next;
+
+       g_return_if_fail(item != NULL);
+       g_return_if_fail(item->folder != NULL);
+       g_return_if_fail(item->node != NULL);
+
+       node = item->node->children;
+       while (node != NULL) {
+               next = node->next;
+               folder_item_remove(FOLDER_ITEM(node->data));
+               node = next;
+       }
+}
+
 void folder_item_destroy(FolderItem *item)
 {
+       Folder *folder;
+
        g_return_if_fail(item != NULL);
 
-       debug_print("Destroying folder item %s\n", item->path);
+       folder = item->folder;
+       if (folder) {
+               if (folder->inbox == item)
+                       folder->inbox = NULL;
+               else if (folder->outbox == item)
+                       folder->outbox = NULL;
+               else if (folder->draft == item)
+                       folder->draft = NULL;
+               else if (folder->queue == item)
+                       folder->queue = NULL;
+               else if (folder->trash == item)
+                       folder->trash = NULL;
+       }
 
        if (item->cache)
                folder_item_free_cache(item);
+       if (item->prefs)
+               folder_item_prefs_free(item->prefs);
        g_free(item->name);
        g_free(item->path);
 
@@ -268,6 +394,164 @@ void folder_item_destroy(FolderItem *item)
        }
 }
 
+FolderItem *folder_item_parent(FolderItem *item)
+{
+       g_return_val_if_fail(item != NULL, NULL);
+       g_return_val_if_fail(item->node != NULL, NULL);
+
+       if (item->node->parent == NULL)
+               return NULL;
+       return (FolderItem *) item->node->parent->data;
+}
+
+void folder_item_set_xml(Folder *folder, FolderItem *item, XMLTag *tag)
+{
+       GList *cur;
+
+       for (cur = tag->attr; cur != NULL; cur = g_list_next(cur)) {
+               XMLAttr *attr = (XMLAttr *) cur->data;
+
+               if (!attr || !attr->name || !attr->value) continue;
+               if (!strcmp(attr->name, "type")) {
+                       if (!strcasecmp(attr->value, "normal"))
+                               item->stype = F_NORMAL;
+                       else if (!strcasecmp(attr->value, "inbox"))
+                               item->stype = F_INBOX;
+                       else if (!strcasecmp(attr->value, "outbox"))
+                               item->stype = F_OUTBOX;
+                       else if (!strcasecmp(attr->value, "draft"))
+                               item->stype = F_DRAFT;
+                       else if (!strcasecmp(attr->value, "queue"))
+                               item->stype = F_QUEUE;
+                       else if (!strcasecmp(attr->value, "trash"))
+                               item->stype = F_TRASH;
+               } else if (!strcmp(attr->name, "name")) {
+                       if (item->name != NULL)
+                               g_free(item->name);
+                       item->name = g_strdup(attr->value);
+               } else if (!strcmp(attr->name, "path")) {
+                       if (item->path != NULL)
+                               g_free(item->path);
+                       item->path = g_strdup(attr->value);
+               } else if (!strcmp(attr->name, "mtime"))
+                       item->mtime = strtoul(attr->value, NULL, 10);
+               else if (!strcmp(attr->name, "new"))
+                       item->new_msgs = atoi(attr->value);
+               else if (!strcmp(attr->name, "unread"))
+                       item->unread_msgs = atoi(attr->value);
+               else if (!strcmp(attr->name, "unreadmarked"))
+                       item->unreadmarked_msgs = atoi(attr->value);
+               else if (!strcmp(attr->name, "total"))
+                       item->total_msgs = atoi(attr->value);
+               else if (!strcmp(attr->name, "no_sub"))
+                       item->no_sub = *attr->value == '1' ? TRUE : FALSE;
+               else if (!strcmp(attr->name, "no_select"))
+                       item->no_select = *attr->value == '1' ? TRUE : FALSE;
+               else if (!strcmp(attr->name, "collapsed"))
+                       item->collapsed = *attr->value == '1' ? TRUE : FALSE;
+               else if (!strcmp(attr->name, "thread_collapsed"))
+                       item->thread_collapsed =  *attr->value == '1' ? TRUE : FALSE;
+               else if (!strcmp(attr->name, "threaded"))
+                       item->threaded =  *attr->value == '1' ? TRUE : FALSE;
+               else if (!strcmp(attr->name, "hidereadmsgs"))
+                       item->hide_read_msgs =  *attr->value == '1' ? TRUE : FALSE;
+               else if (!strcmp(attr->name, "reqretrcpt"))
+                       item->ret_rcpt =  *attr->value == '1' ? TRUE : FALSE;
+               else if (!strcmp(attr->name, "sort_key")) {
+                       if (!strcmp(attr->value, "none"))
+                               item->sort_key = SORT_BY_NONE;
+                       else if (!strcmp(attr->value, "number"))
+                               item->sort_key = SORT_BY_NUMBER;
+                       else if (!strcmp(attr->value, "size"))
+                               item->sort_key = SORT_BY_SIZE;
+                       else if (!strcmp(attr->value, "date"))
+                               item->sort_key = SORT_BY_DATE;
+                       else if (!strcmp(attr->value, "from"))
+                               item->sort_key = SORT_BY_FROM;
+                       else if (!strcmp(attr->value, "subject"))
+                               item->sort_key = SORT_BY_SUBJECT;
+                       else if (!strcmp(attr->value, "score"))
+                               item->sort_key = SORT_BY_SCORE;
+                       else if (!strcmp(attr->value, "label"))
+                               item->sort_key = SORT_BY_LABEL;
+                       else if (!strcmp(attr->value, "mark"))
+                               item->sort_key = SORT_BY_MARK;
+                       else if (!strcmp(attr->value, "unread"))
+                               item->sort_key = SORT_BY_STATUS;
+                       else if (!strcmp(attr->value, "mime"))
+                               item->sort_key = SORT_BY_MIME;
+                       else if (!strcmp(attr->value, "to"))
+                               item->sort_key = SORT_BY_TO;
+                       else if (!strcmp(attr->value, "locked"))
+                               item->sort_key = SORT_BY_LOCKED;
+               } else if (!strcmp(attr->name, "sort_type")) {
+                       if (!strcmp(attr->value, "ascending"))
+                               item->sort_type = SORT_ASCENDING;
+                       else
+                               item->sort_type = SORT_DESCENDING;
+               } else if (!strcmp(attr->name, "account_id")) {
+                       PrefsAccount *account;
+
+                       account = account_find_from_id(atoi(attr->value));
+                       if (!account)
+                               g_warning("account_id: %s not found\n", attr->value);
+                       else
+                               item->account = account;
+               } else if (!strcmp(attr->name, "apply_sub"))
+                       item->apply_sub = *attr->value == '1' ? TRUE : FALSE;
+       }
+}
+
+XMLTag *folder_item_get_xml(Folder *folder, FolderItem *item)
+{
+       static gchar *folder_item_stype_str[] = {"normal", "inbox", "outbox",
+                                                "draft", "queue", "trash"};
+       static gchar *sort_key_str[] = {"none", "number", "size", "date",
+                                       "from", "subject", "score", "label",
+                                       "mark", "unread", "mime", "to", 
+                                       "locked"};
+       XMLTag *tag;
+       gchar *value;
+
+       tag = xml_tag_new("folderitem");
+
+       xml_tag_add_attr(tag, xml_attr_new("type", folder_item_stype_str[item->stype]));
+       if (item->name)
+               xml_tag_add_attr(tag, xml_attr_new("name", item->name));
+       if (item->path)
+               xml_tag_add_attr(tag, xml_attr_new("path", item->path));
+       if (item->no_sub)
+               xml_tag_add_attr(tag, xml_attr_new("no_sub", "1"));
+       if (item->no_select)
+               xml_tag_add_attr(tag, xml_attr_new("no_select", "1"));
+       xml_tag_add_attr(tag, xml_attr_new("collapsed", item->collapsed && item->node->children ? "1" : "0"));
+       xml_tag_add_attr(tag, xml_attr_new("thread_collapsed", item->thread_collapsed ? "1" : "0"));
+       xml_tag_add_attr(tag, xml_attr_new("threaded", item->threaded ? "1" : "0"));
+       xml_tag_add_attr(tag, xml_attr_new("hidereadmsgs", item->hide_read_msgs ? "1" : "0"));
+       if (item->ret_rcpt)
+               xml_tag_add_attr(tag, xml_attr_new("reqretrcpt", "1"));
+
+       if (item->sort_key != SORT_BY_NONE) {
+               xml_tag_add_attr(tag, xml_attr_new("sort_key", sort_key_str[item->sort_key]));
+               xml_tag_add_attr(tag, xml_attr_new("sort_type", item->sort_type == SORT_ASCENDING ? "ascending" : "descending"));
+       }
+
+       value = g_strdup_printf("%ld", (unsigned long int) item->mtime);
+       xml_tag_add_attr(tag, xml_attr_new("mtime", value));
+       g_free(value);
+       xml_tag_add_attr(tag, xml_attr_new_int("new", item->new_msgs));
+       xml_tag_add_attr(tag, xml_attr_new_int("unread", item->unread_msgs));
+       xml_tag_add_attr(tag, xml_attr_new_int("unreadmarked", item->unreadmarked_msgs));
+       xml_tag_add_attr(tag, xml_attr_new_int("total", item->total_msgs));
+
+       if (item->account)
+               xml_tag_add_attr(tag, xml_attr_new_int("account_id", item->account->account_id));
+       if (item->apply_sub)
+               xml_tag_add_attr(tag, xml_attr_new("apply_sub", "1"));
+
+       return tag;
+}
+
 void folder_set_ui_func(Folder *folder, FolderUIFunc func, gpointer data)
 {
        g_return_if_fail(folder != NULL);
@@ -290,6 +574,17 @@ void folder_set_name(Folder *folder, const gchar *name)
        }
 }
 
+void folder_set_sort(Folder *folder, guint sort)
+{
+       g_return_if_fail(folder != NULL);
+
+       if (folder->sort != sort) {
+               folder_remove(folder);
+               folder->sort = sort;
+               folder_add(folder);
+       }
+}
+
 gboolean folder_tree_destroy_func(GNode *node, gpointer data) {
        FolderItem *item = (FolderItem *) node->data;
 
@@ -299,22 +594,20 @@ gboolean folder_tree_destroy_func(GNode *node, gpointer data) {
 
 void folder_tree_destroy(Folder *folder)
 {
+       GNode *node;
+
        g_return_if_fail(folder != NULL);
-       g_return_if_fail(folder->node != NULL);
-       
-       prefs_scoring_clear();
-       prefs_filtering_clear();
 
-       g_node_traverse(folder->node, G_POST_ORDER, G_TRAVERSE_ALL, -1, folder_tree_destroy_func, NULL);
-       if (folder->node)
-               g_node_destroy(folder->node);
+       node = folder->node;
+       
+       prefs_filtering_clear_folder(folder);
 
-       folder->inbox = NULL;
-       folder->outbox = NULL;
-       folder->draft = NULL;
-       folder->queue = NULL;
-       folder->trash = NULL;
-       folder->node = NULL;
+       if (node != NULL) {
+               g_node_traverse(node, G_POST_ORDER, G_TRAVERSE_ALL, -1,
+                               folder_tree_destroy_func, NULL);
+               g_node_destroy(node);
+               folder->node = NULL;
+       }
 }
 
 void folder_add(Folder *folder)
@@ -322,29 +615,36 @@ void folder_add(Folder *folder)
        Folder *cur_folder;
        GList *cur;
        gint i;
+       FolderUpdateData hookdata;
 
        g_return_if_fail(folder != NULL);
 
        for (i = 0, cur = folder_list; cur != NULL; cur = cur->next, i++) {
                cur_folder = FOLDER(cur->data);
-               if (FOLDER_TYPE(folder) == F_MH) {
-                       if (FOLDER_TYPE(cur_folder) != F_MH) break;
-               } else if (FOLDER_TYPE(folder) == F_MBOX) {
-                       if (FOLDER_TYPE(cur_folder) != F_MH &&
-                           FOLDER_TYPE(cur_folder) != F_MBOX) break;
-               } else if (FOLDER_TYPE(folder) == F_IMAP) {
-                       if (FOLDER_TYPE(cur_folder) != F_MH &&
-                           FOLDER_TYPE(cur_folder) != F_MBOX &&
-                           FOLDER_TYPE(cur_folder) != F_IMAP) break;
-               } else if (FOLDER_TYPE(folder) == F_NEWS) {
-                       if (FOLDER_TYPE(cur_folder) != F_MH &&
-                           FOLDER_TYPE(cur_folder) != F_MBOX &&
-                           FOLDER_TYPE(cur_folder) != F_IMAP &&
-                           FOLDER_TYPE(cur_folder) != F_NEWS) break;
-               }
+               if (cur_folder->sort < folder->sort)
+                       break;
        }
 
        folder_list = g_list_insert(folder_list, folder, i);
+
+       hookdata.folder = folder;
+       hookdata.update_flags = FOLDER_ADD_FOLDER;
+       hookdata.item = NULL;
+       hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
+}
+
+void folder_remove(Folder *folder)
+{
+       FolderUpdateData hookdata;
+
+       g_return_if_fail(folder != NULL);
+
+       folder_list = g_list_remove(folder_list, folder);
+
+       hookdata.folder = folder;
+       hookdata.update_flags = FOLDER_REMOVE_FOLDER;
+       hookdata.item = NULL;
+       hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
 }
 
 GList *folder_get_list(void)
@@ -354,7 +654,7 @@ GList *folder_get_list(void)
 
 gint folder_read_list(void)
 {
-       GNode *node;
+       GNode *node, *cur;
        XMLNode *xmlnode;
        gchar *path;
 
@@ -370,8 +670,18 @@ gint folder_read_list(void)
                return -1;
        }
 
-       g_node_traverse(node, G_PRE_ORDER, G_TRAVERSE_ALL, 2,
-                       folder_read_folder_func, NULL);
+       cur = node->children;
+       while (cur != NULL) {
+               Folder *folder;
+
+               folder = folder_get_from_xml(cur);
+               if (folder != NULL)
+                       folder_add(folder);
+               else
+                       folder_unloaded_list = g_slist_append(folder_unloaded_list,
+                               (gpointer) xml_copy_tree(cur));
+               cur = cur->next;
+       }
 
        xml_free_tree(node);
        if (folder_list)
@@ -383,26 +693,45 @@ gint folder_read_list(void)
 void folder_write_list(void)
 {
        GList *list;
+       GSList *slist;
        Folder *folder;
        gchar *path;
        PrefFile *pfile;
+       GNode *rootnode;
+       XMLNode *xmlnode;
+       XMLTag *tag;
 
        path = folder_get_list_path();
        if ((pfile = prefs_write_open(path)) == NULL) return;
 
-       fprintf(pfile->fp, "<?xml version=\"1.0\" encoding=\"%s\"?>\n",
-               conv_get_current_charset_str());
-       fputs("\n<folderlist>\n", pfile->fp);
+       xml_file_put_xml_decl(pfile->fp);
+       tag = xml_tag_new("folderlist");
+
+       xmlnode = xml_node_new(tag, NULL);
+
+       rootnode = g_node_new(xmlnode);
 
        for (list = folder_list; list != NULL; list = list->next) {
+               GNode *node;
+
                folder = list->data;
-               folder_write_list_recursive(folder->node, pfile->fp);
+               node = folder_get_xml_node(folder);
+               if (node != NULL)
+                       g_node_append(rootnode, node);
+       }
+
+       for (slist = folder_unloaded_list; slist != NULL; slist = g_slist_next(slist)) {
+               GNode *node = (GNode *) slist->data;
+
+               g_node_append(rootnode, (gpointer) xml_copy_tree(node));
        }
 
-       fputs("</folderlist>\n", pfile->fp);
+       xml_write_tree(rootnode, pfile->fp);
 
        if (prefs_file_close(pfile) < 0)
                g_warning("failed to write folder list.\n");
+
+       xml_free_tree(rootnode);
 }
 
 gboolean folder_scan_tree_func(GNode *node, gpointer data)
@@ -411,7 +740,7 @@ gboolean folder_scan_tree_func(GNode *node, gpointer data)
        FolderItem *item = (FolderItem *)node->data;
        
        folder_item_restore_persist_prefs(item, pptable);
-       folder_item_scan(item);
+       folder_item_scan_full(item, FALSE);
 
        return FALSE;
 }
@@ -419,6 +748,7 @@ gboolean folder_scan_tree_func(GNode *node, gpointer data)
 void folder_scan_tree(Folder *folder)
 {
        GHashTable *pptable;
+       FolderUpdateData hookdata;
        
        if (!folder->klass->scan_tree)
                return;
@@ -432,6 +762,11 @@ void folder_scan_tree(Folder *folder)
        folder_tree_destroy(folder);
        folder->klass->scan_tree(folder);
 
+       hookdata.folder = folder;
+       hookdata.update_flags = FOLDER_TREE_CHANGED;
+       hookdata.item = NULL;
+       hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
+
        g_node_traverse(folder->node, G_POST_ORDER, G_TRAVERSE_ALL, -1, folder_scan_tree_func, pptable);
        folder_persist_prefs_free(pptable);
 
@@ -445,12 +780,41 @@ FolderItem *folder_create_folder(FolderItem *parent, const gchar *name)
        FolderItem *new_item;
 
        new_item = parent->folder->klass->create_folder(parent->folder, parent, name);
-       if (new_item)
+       if (new_item) {
+               FolderUpdateData hookdata;
+
                new_item->cache = msgcache_new();
 
+               hookdata.folder = new_item->folder;
+               hookdata.update_flags = FOLDER_TREE_CHANGED | FOLDER_ADD_FOLDERITEM;
+               hookdata.item = new_item;
+               hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
+       }
+
        return new_item;
 }
 
+gint folder_item_rename(FolderItem *item, gchar *newname)
+{
+       gint retval;
+
+       g_return_val_if_fail(item != NULL, -1);
+       g_return_val_if_fail(newname != NULL, -1);
+
+       retval = item->folder->klass->rename_folder(item->folder, item, newname);
+
+       if (retval >= 0) {
+               FolderItemUpdateData hookdata;
+
+               hookdata.item = item;
+               hookdata.update_flags = F_ITEM_UPDATE_NAME;
+               hookdata.msg = NULL;
+               hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &hookdata);
+       }
+
+       return retval;
+}
+
 struct TotalMsgCount
 {
        guint new_msgs;
@@ -509,6 +873,113 @@ static void folder_count_total_msgs_func(FolderItem *item, gpointer data)
        count->total_msgs += item->total_msgs;
 }
 
+struct TotalMsgStatus
+{
+        guint new;
+        guint unread;
+       guint total;
+       GString *str;
+};
+
+static gboolean folder_get_status_full_all_func(GNode *node, gpointer data)
+{
+       FolderItem *item;
+       struct TotalMsgStatus *status = (struct TotalMsgStatus *)data;
+       gchar *id;
+       g_return_val_if_fail(node->data != NULL, FALSE);
+       item = FOLDER_ITEM(node->data);
+
+       if (!item->path) return FALSE;
+
+       status->new += item->new_msgs;
+       status->unread += item->unread_msgs;
+       status->total += item->total_msgs;
+
+       if (status->str) {
+               id = folder_item_get_identifier(item);
+               g_string_sprintfa(status->str, "%5d %5d %5d %s\n",
+                                 item->new_msgs, item->unread_msgs,
+                                 item->total_msgs, id);
+               g_free(id);
+       }
+       return FALSE;
+ }
+static void folder_get_status_full_all(GString *str, guint *new, guint *unread,
+                                      guint *total)
+{
+       GList *list;
+       Folder *folder;
+       struct TotalMsgStatus status;
+       status.new = status.unread = status.total = 0;
+       status.str = str;
+       debug_print("Counting total number of messages...\n");
+       for (list = folder_list; list != NULL; list = list->next) {
+               folder = FOLDER(list->data);
+               if (folder->node)
+                       g_node_traverse(folder->node, G_PRE_ORDER,
+                                       G_TRAVERSE_ALL, -1,
+                                       folder_get_status_full_all_func,
+                                       &status);
+       }
+       *new = status.new;
+       *unread = status.unread;
+       *total = status.total;
+}
+
+gchar *folder_get_status(GPtrArray *folders, gboolean full)
+{
+       guint new, unread, total;
+       GString *str;
+       gint i;
+       gchar *ret;
+
+       new = unread = total = 0;
+
+       str = g_string_new(NULL);
+
+       if (folders) {
+               for (i = 0; i < folders->len; i++) {
+                       FolderItem *item;
+
+                       item = g_ptr_array_index(folders, i);
+                       new += item->new_msgs;
+                       unread += item->unread_msgs;
+                       total += item->total_msgs;
+
+                       if (full) {
+                               gchar *id;
+
+                               id = folder_item_get_identifier(item);
+                               g_string_sprintfa(str, "%5d %5d %5d %s\n",
+                                                 item->new_msgs, item->unread_msgs,
+                                                 item->total_msgs, id);
+                               g_free(id);
+                       }
+               }
+       } else {
+               folder_get_status_full_all(full ? str : NULL,
+                                          &new, &unread, &total);
+       }
+
+       if (full)
+               g_string_sprintfa(str, "%5d %5d %5d\n", new, unread, total);
+       else
+               g_string_sprintfa(str, "%d %d %d\n", new, unread, total);
+
+       ret = str->str;
+       g_string_free(str, FALSE);
+       return ret;
+}
+
 void folder_count_total_msgs(guint *new_msgs, guint *unread_msgs, guint *unreadmarked_msgs, guint *total_msgs)
 {
        struct TotalMsgCount count;
@@ -532,7 +1003,8 @@ Folder *folder_find_from_path(const gchar *path)
 
        for (list = folder_list; list != NULL; list = list->next) {
                folder = list->data;
-               if ((FOLDER_TYPE(folder) == F_MH || FOLDER_TYPE(folder) == F_MBOX) &&
+               if ((FOLDER_TYPE(folder) == F_MH || 
+                    FOLDER_TYPE(folder) == F_MBOX) &&
                    !path_cmp(LOCAL_FOLDER(folder)->rootpath, path))
                        return folder;
        }
@@ -547,7 +1019,8 @@ Folder *folder_find_from_name(const gchar *name, FolderClass *klass)
 
        for (list = folder_list; list != NULL; list = list->next) {
                folder = list->data;
-               if (folder->klass == klass && strcmp2(name, folder->name) == 0)
+               if (folder->klass == klass && 
+                   strcmp2(name, folder->name) == 0)
                        return folder;
        }
 
@@ -583,6 +1056,20 @@ FolderItem *folder_find_item_from_path(const gchar *path)
        return d[1];
 }
 
+FolderItem *folder_find_child_item_by_name(FolderItem *item, const gchar *name)
+{
+       GNode *node;
+       FolderItem *child;
+
+       for (node = item->node->children; node != NULL; node = node->next) {
+               child = FOLDER_ITEM(node->data);
+               if (strcmp2(g_basename(child->path), name) == 0)
+                       return child;
+       }
+
+       return NULL;
+}
+
 FolderClass *folder_get_class_from_string(const gchar *str)
 {
        GSList *classlist;
@@ -609,8 +1096,8 @@ gchar *folder_get_identifier(Folder *folder)
 
 gchar *folder_item_get_identifier(FolderItem *item)
 {
-       gchar *id;
-       gchar *folder_id;
+       gchar *id = NULL;
+       gchar *folder_id = NULL;
 
        g_return_val_if_fail(item != NULL, NULL);
        g_return_val_if_fail(item->path != NULL, NULL);
@@ -679,6 +1166,8 @@ gchar *folder_item_get_name(FolderItem *item)
 {
        gchar *name = NULL;
 
+       g_return_val_if_fail(item != NULL, g_strdup(""));
+
        switch (item->stype) {
        case F_INBOX:
                name = g_strdup(!strcmp2(item->name, INBOX_DIR) ? _("Inbox") :
@@ -709,7 +1198,7 @@ gchar *folder_item_get_name(FolderItem *item)
                 * should probably be done by a virtual function,
                 * the folder knows the ui string and how to abbrev
                */
-               if (!item->parent) {
+               if (folder_item_parent(item) == NULL) {
                        name = g_strconcat(item->name, " (", item->folder->klass->uistr, ")", NULL);
                } else {
                        if (FOLDER_CLASS(item->folder) == news_get_class() &&
@@ -735,52 +1224,92 @@ Folder *folder_get_default_folder(void)
 
 FolderItem *folder_get_default_inbox(void)
 {
-       Folder *folder;
+       GList *flist;
 
-       if (!folder_list) return NULL;
-       folder = FOLDER(folder_list->data);
-       g_return_val_if_fail(folder != NULL, NULL);
-       return folder->inbox;
+       for (flist = folder_list; flist != NULL; flist = g_list_next(flist)) {
+               Folder * folder = FOLDER(flist->data);
+
+               if (folder == NULL)
+                       continue;
+               if (folder->inbox == NULL)
+                       continue;
+
+               return folder->inbox;
+       }
+
+       return NULL;
 }
 
 FolderItem *folder_get_default_outbox(void)
 {
-       Folder *folder;
+       GList *flist;
 
-       if (!folder_list) return NULL;
-       folder = FOLDER(folder_list->data);
-       g_return_val_if_fail(folder != NULL, NULL);
-       return folder->outbox;
-}
+       for (flist = folder_list; flist != NULL; flist = g_list_next(flist)) {
+               Folder * folder = FOLDER(flist->data);
+
+               if (folder == NULL)
+                       continue;
+               if (folder->outbox == NULL)
+                       continue;
+
+               return folder->outbox;
+       }
+
+       return NULL;
+}
 
 FolderItem *folder_get_default_draft(void)
 {
-       Folder *folder;
+       GList *flist;
 
-       if (!folder_list) return NULL;
-       folder = FOLDER(folder_list->data);
-       g_return_val_if_fail(folder != NULL, NULL);
-       return folder->draft;
+       for (flist = folder_list; flist != NULL; flist = g_list_next(flist)) {
+               Folder * folder = FOLDER(flist->data);
+
+               if (folder == NULL)
+                       continue;
+               if (folder->draft == NULL)
+                       continue;
+
+               return folder->draft;
+       }
+
+       return NULL;
 }
 
 FolderItem *folder_get_default_queue(void)
 {
-       Folder *folder;
+       GList *flist;
 
-       if (!folder_list) return NULL;
-       folder = FOLDER(folder_list->data);
-       g_return_val_if_fail(folder != NULL, NULL);
-       return folder->queue;
+       for (flist = folder_list; flist != NULL; flist = g_list_next(flist)) {
+               Folder * folder = FOLDER(flist->data);
+
+               if (folder == NULL)
+                       continue;
+               if (folder->queue == NULL)
+                       continue;
+
+               return folder->queue;
+       }
+
+       return NULL;
 }
 
 FolderItem *folder_get_default_trash(void)
 {
-       Folder *folder;
+       GList *flist;
 
-       if (!folder_list) return NULL;
-       folder = FOLDER(folder_list->data);
-       g_return_val_if_fail(folder != NULL, NULL);
-       return folder->trash;
+       for (flist = folder_list; flist != NULL; flist = g_list_next(flist)) {
+               Folder * folder = FOLDER(flist->data);
+
+               if (folder == NULL)
+                       continue;
+               if (folder->trash == NULL)
+                       continue;
+
+               return folder->trash;
+       }
+
+       return NULL;
 }
 
 #define CREATE_FOLDER_IF_NOT_EXIST(member, dir, type)          \
@@ -853,83 +1382,15 @@ void folder_unref_account_all(PrefsAccount *account)
 
 #undef CREATE_FOLDER_IF_NOT_EXIST
 
-gchar *folder_get_path(Folder *folder)
-{
-       gchar *path;
-
-       g_return_val_if_fail(folder != NULL, NULL);
-
-       switch(FOLDER_TYPE(folder)) {
-
-               case F_MH:
-                       path = g_strdup(LOCAL_FOLDER(folder)->rootpath);
-                       break;
-
-               case F_IMAP:
-                       g_return_val_if_fail(folder->account != NULL, NULL);
-                       path = g_strconcat(get_imap_cache_dir(),
-                                          G_DIR_SEPARATOR_S,
-                                          folder->account->recv_server,
-                                          G_DIR_SEPARATOR_S,
-                                          folder->account->userid,
-                                          NULL);
-                       break;
-
-               case F_NEWS:
-                       g_return_val_if_fail(folder->account != NULL, NULL);
-                       path = g_strconcat(get_news_cache_dir(),
-                                          G_DIR_SEPARATOR_S,
-                                          folder->account->nntp_server,
-                                          NULL);
-                       break;
-
-               default:
-                       path = NULL;
-                       break;
-       }
-       
-       return path;
-}
-
 gchar *folder_item_get_path(FolderItem *item)
 {
-       gchar *folder_path;
-       gchar *path;
+       Folder *folder;
 
        g_return_val_if_fail(item != NULL, NULL);
+       folder = item->folder;
+       g_return_val_if_fail(folder != NULL, NULL);
 
-       if(FOLDER_TYPE(item->folder) != F_MBOX) {
-               folder_path = folder_get_path(item->folder);
-               g_return_val_if_fail(folder_path != NULL, NULL);
-
-               if (folder_path[0] == G_DIR_SEPARATOR) {
-                       if (item->path)
-                               path = g_strconcat(folder_path, G_DIR_SEPARATOR_S,
-                                                  item->path, NULL);
-                       else
-                               path = g_strdup(folder_path);
-               } else {
-                       if (item->path)
-                               path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
-                                                  folder_path, G_DIR_SEPARATOR_S,
-                                                  item->path, NULL);
-                       else
-                               path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
-                                                  folder_path, NULL);
-               }
-
-               g_free(folder_path);
-       } else {
-               gchar *itempath;
-
-               itempath = mbox_get_virtual_path(item);
-               if (itempath == NULL)
-                       return NULL;
-               path = g_strconcat(get_mbox_cache_dir(),
-                                         G_DIR_SEPARATOR_S, itempath, NULL);
-               g_free(itempath);
-       }
-       return path;
+       return folder->klass->item_get_path(folder, item);
 }
 
 void folder_item_set_default_flags(FolderItem *dest, MsgFlags *flags)
@@ -942,7 +1403,6 @@ void folder_item_set_default_flags(FolderItem *dest, MsgFlags *flags)
        } else {
                flags->perm_flags = 0;
        }
-       flags->tmp_flags = MSG_CACHED;
        if (FOLDER_TYPE(dest->folder) == F_MH) {
                if (dest->stype == F_QUEUE) {
                        MSG_SET_TMP_FLAGS(*flags, MSG_QUEUED);
@@ -970,31 +1430,33 @@ static gint folder_sort_folder_list(gconstpointer a, gconstpointer b)
 
 gint folder_item_open(FolderItem *item)
 {
-       if(((FOLDER_TYPE(item->folder) == F_IMAP) && !item->no_select) || (FOLDER_TYPE(item->folder) == F_NEWS)) {
-               folder_item_scan(item);
+       gchar *buf;
+       if((item->folder->klass->scan_required != NULL) && (item->folder->klass->scan_required(item->folder, item))) {
+               folder_item_scan_full(item, TRUE);
        }
-
+       folder_item_syncronize_flags(item);
+       
        /* Processing */
-       if(item->prefs->processing != NULL) {
-               gchar *buf;
-               
-               buf = g_strdup_printf(_("Processing (%s)...\n"), item->path);
-               debug_print("%s\n", buf);
-               g_free(buf);
+       buf = g_strdup_printf(_("Processing (%s)...\n"), 
+                             item->path ? item->path : item->name);
+       debug_print("%s\n", buf);
+       g_free(buf);
        
-               folder_item_apply_processing(item);
+       folder_item_apply_processing(item);
 
-               debug_print("done.\n");
-       }
+       item->opened = TRUE;
+
+       debug_print("done.\n");
 
        return 0;
 }
 
-void folder_item_close(FolderItem *item)
+gint folder_item_close(FolderItem *item)
 {
        GSList *mlist, *cur;
+       Folder *folder;
        
-       g_return_if_fail(item != NULL);
+       g_return_val_if_fail(item != NULL, -1);
 
        if (item->new_msgs) {
                folder_item_update_freeze();
@@ -1014,9 +1476,57 @@ void folder_item_close(FolderItem *item)
        folder_item_write_cache(item);
        
        folder_item_update(item, F_ITEM_UPDATE_MSGCNT);
+
+       item->opened = FALSE;
+       folder = item->folder;
+
+       if (folder->klass->close == NULL)
+               return 0;
+
+       return folder->klass->close(folder, item);
 }
 
-gint folder_item_scan(FolderItem *item)
+static MsgInfoList *get_msginfos(FolderItem *item, MsgNumberList *numlist)
+{
+       MsgInfoList *msglist = NULL;
+       Folder *folder = item->folder;
+
+       if (folder->klass->get_msginfos != NULL)
+               msglist = folder->klass->get_msginfos(folder, item, numlist);
+       else {
+               MsgNumberList *elem;
+
+               for (elem = numlist; elem != NULL; elem = g_slist_next(elem)) {
+                       MsgInfo *msginfo;
+                       guint num;
+
+                       num = GPOINTER_TO_INT(elem->data);
+                       msginfo = folder->klass->get_msginfo(folder, item, num);
+                       if (msginfo != NULL)
+                               msglist = g_slist_prepend(msglist, msginfo);
+               }               
+       }
+
+       return msglist;
+}
+
+static MsgInfo *get_msginfo(FolderItem *item, guint num)
+{
+       MsgNumberList numlist;
+       MsgInfoList *msglist;
+       MsgInfo *msginfo = NULL;
+
+       numlist.data = GINT_TO_POINTER(num);
+       numlist.next = NULL;
+       msglist = get_msginfos(item, &numlist);
+       if (msglist != NULL)
+               msginfo = procmsg_msginfo_new_ref(msglist->data);
+       procmsg_msg_list_free(msglist);
+
+       return msginfo;
+}
+
+gint folder_item_scan_full(FolderItem *item, gboolean filtering)
 {
        Folder *folder;
        GSList *folder_list = NULL, *cache_list = NULL;
@@ -1025,7 +1535,7 @@ gint folder_item_scan(FolderItem *item)
        GSList *newmsg_list = NULL;
        guint newcnt = 0, unreadcnt = 0, totalcnt = 0, unreadmarkedcnt = 0;
        guint cache_max_num, folder_max_num, cache_cur_num, folder_cur_num;
-       gboolean update_flags = 0;
+       gboolean update_flags = 0, old_uids_valid = FALSE;
     
        g_return_val_if_fail(item != NULL, -1);
        if (item->path == NULL) return -1;
@@ -1038,13 +1548,12 @@ gint folder_item_scan(FolderItem *item)
        debug_print("Scanning folder %s for cache changes.\n", item->path);
 
        /* Get list of messages for folder and cache */
-       if (folder->klass->get_num_list(item->folder, item, &folder_list) < 0) {
+       if (folder->klass->get_num_list(item->folder, item, &folder_list, &old_uids_valid) < 0) {
                debug_print("Error fetching list of message numbers\n");
                return(-1);
        }
 
-       if (!folder->klass->check_msgnum_validity || 
-           folder->klass->check_msgnum_validity(folder, item)) {
+       if (old_uids_valid) {
                if (!item->cache)
                        folder_item_read_cache(item);
                cache_list = msgcache_get_msg_list(item->cache);
@@ -1191,26 +1700,11 @@ gint folder_item_scan(FolderItem *item)
        g_slist_free(folder_list);
 
        if (new_list != NULL) {
-               if (folder->klass->get_msginfos) {
-                       newmsg_list = folder->klass->get_msginfos(folder, item, new_list);
-               } else if (folder->klass->get_msginfo) {
-                       GSList *elem;
-       
-                       for (elem = new_list; elem != NULL; elem = g_slist_next(elem)) {
-                               MsgInfo *msginfo;
-                               guint num;
-
-                               num = GPOINTER_TO_INT(elem->data);
-                               msginfo = folder->klass->get_msginfo(folder, item, num);
-                               if (msginfo != NULL) {
-                                       newmsg_list = g_slist_prepend(newmsg_list, msginfo);
-                                       debug_print("Added newly found message %d to cache.\n", num);
-                               }
-                       }
-               }
+               newmsg_list = get_msginfos(item, new_list);
                g_slist_free(new_list);
        }
 
+       folder_item_update_freeze();
        if (newmsg_list != NULL) {
                GSList *elem;
 
@@ -1218,7 +1712,8 @@ gint folder_item_scan(FolderItem *item)
                        MsgInfo *msginfo = (MsgInfo *) elem->data;
 
                        msgcache_add_msg(item->cache, msginfo);
-                       if ((item->stype == F_INBOX) &&
+                       if ((filtering == TRUE) &&
+                           (item->stype == F_INBOX) &&
                            (item->folder->account != NULL) && 
                            (item->folder->account->filter_on_recv) &&
                            procmsg_msginfo_filter(msginfo))
@@ -1267,10 +1762,85 @@ gint folder_item_scan(FolderItem *item)
        update_flags |= F_ITEM_UPDATE_MSGCNT;
 
        folder_item_update(item, update_flags);
+       folder_item_update_thaw();
 
        return 0;
 }
 
+gint folder_item_syncronize_flags(FolderItem *item)
+{
+       MsgInfoList *msglist = NULL;
+       GSList *cur;
+       GRelation *relation;
+       gint ret = 0;
+       
+       g_return_val_if_fail(item != NULL, -1);
+       g_return_val_if_fail(item->folder != NULL, -1);
+       g_return_val_if_fail(item->folder->klass != NULL, -1);
+       if(item->folder->klass->get_flags == NULL)
+               return 0;
+       
+       if (item->cache == NULL)
+               folder_item_read_cache(item);
+       
+       msglist = msgcache_get_msg_list(item->cache);
+       
+       relation = g_relation_new(2);
+       g_relation_index(relation, 0, g_direct_hash, g_direct_equal);
+       if ((ret = item->folder->klass->get_flags(
+           item->folder, item, msglist, relation)) == 0) {
+               GTuples *tuples;
+               MsgInfo *msginfo;
+               MsgPermFlags permflags;
+               gboolean skip;
+
+               for (cur = msglist; cur != NULL; cur = g_slist_next(cur)) {
+                       msginfo = (MsgInfo *) cur->data;
+               
+                       tuples = g_relation_select(relation, msginfo, 0);
+                       skip = tuples->len < 1;
+                       if (!skip)
+                               permflags = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
+                       g_tuples_destroy(tuples);
+                       if (skip)
+                               continue;
+                       
+                       if (msginfo->flags.perm_flags != permflags) {
+                               procmsg_msginfo_set_flags(msginfo,
+                                       permflags & ~msginfo->flags.perm_flags, 0);
+                               procmsg_msginfo_unset_flags(msginfo,
+                                       ~permflags & msginfo->flags.perm_flags, 0);
+                       }
+               }
+       }
+       g_relation_destroy(relation);
+       
+       for (cur = msglist; cur != NULL; cur = g_slist_next(cur))
+               procmsg_msginfo_free((MsgInfo *) cur->data);
+       
+       return ret;
+}
+
+gint folder_item_scan(FolderItem *item)
+{
+       return folder_item_scan_full(item, TRUE);
+}
+
+static gboolean folder_scan_all_items_func(GNode *node, gpointer data)
+{
+       FolderItem *item = node->data;
+
+       folder_item_scan(item);
+
+       return FALSE;
+}
+
+void folder_scan_all_items(Folder * folder)
+{
+       g_node_traverse(folder->node, G_PRE_ORDER,
+                       G_TRAVERSE_ALL, -1, folder_scan_all_items_func, NULL);
+}
+
 static void folder_item_scan_foreach_func(gpointer key, gpointer val,
                                          gpointer data)
 {
@@ -1366,16 +1936,43 @@ void folder_item_read_cache(FolderItem *item)
        
        g_return_if_fail(item != NULL);
 
-       cache_file = folder_item_get_cache_file(item);
-       mark_file = folder_item_get_mark_file(item);
-       item->cache = msgcache_read_cache(item, cache_file);
-       if (!item->cache) {
+       if (item->path != NULL) {
+               cache_file = folder_item_get_cache_file(item);
+               mark_file = folder_item_get_mark_file(item);
+               item->cache = msgcache_read_cache(item, cache_file);
+               if (!item->cache) {
+                       MsgInfoList *list, *cur;
+                       guint newcnt = 0, unreadcnt = 0, unreadmarkedcnt = 0;
+                       MsgInfo *msginfo;
+
+                       item->cache = msgcache_new();
+                       folder_item_scan_full(item, TRUE);
+
+                       msgcache_read_mark(item->cache, mark_file);
+
+                       list = msgcache_get_msg_list(item->cache);
+                       for (cur = list; cur != NULL; cur = g_slist_next(cur)) {
+                               msginfo = cur->data;
+
+                               if (MSG_IS_NEW(msginfo->flags))
+                                       newcnt++;
+                               if (MSG_IS_UNREAD(msginfo->flags))
+                                       unreadcnt++;
+                               if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
+                                       unreadmarkedcnt++;
+                       }
+                       item->new_msgs = newcnt;
+                       item->unread_msgs = unreadcnt;
+                       item->unreadmarked_msgs = unreadmarkedcnt;
+                       procmsg_msg_list_free(list);
+               } else
+                       msgcache_read_mark(item->cache, mark_file);
+
+               g_free(cache_file);
+               g_free(mark_file);
+       } else {
                item->cache = msgcache_new();
-               folder_item_scan(item);
        }
-       msgcache_read_mark(item->cache, mark_file);
-       g_free(cache_file);
-       g_free(mark_file);
 
        folder_clean_cache_memory();
 }
@@ -1383,7 +1980,7 @@ void folder_item_read_cache(FolderItem *item)
 void folder_item_write_cache(FolderItem *item)
 {
        gchar *cache_file, *mark_file;
-       PrefsFolderItem *prefs;
+       FolderItemPrefs *prefs;
        gint filemode = 0;
        gchar *id;
        
@@ -1414,7 +2011,7 @@ void folder_item_write_cache(FolderItem *item)
 MsgInfo *folder_item_get_msginfo(FolderItem *item, gint num)
 {
        Folder *folder;
-       MsgInfo *msginfo;
+       MsgInfo *msginfo = NULL;
        
        g_return_val_if_fail(item != NULL, NULL);
        
@@ -1425,8 +2022,8 @@ MsgInfo *folder_item_get_msginfo(FolderItem *item, gint num)
        if ((msginfo = msgcache_get_msg(item->cache, num)) != NULL)
                return msginfo;
        
-       g_return_val_if_fail(folder->klass->get_msginfo, NULL);
-       if ((msginfo = folder->klass->get_msginfo(folder, item, num)) != NULL) {
+       msginfo = get_msginfo(item, num);
+       if (msginfo != NULL) {
                msgcache_add_msg(item->cache, msginfo);
                return msginfo;
        }
@@ -1440,6 +2037,7 @@ MsgInfo *folder_item_get_msginfo_by_msgid(FolderItem *item, const gchar *msgid)
        MsgInfo *msginfo;
        
        g_return_val_if_fail(item != NULL, NULL);
+       g_return_val_if_fail(msgid != NULL, NULL);
        
        folder = item->folder;
        if (!item->cache)
@@ -1463,9 +2061,40 @@ GSList *folder_item_get_msg_list(FolderItem *item)
        return msgcache_get_msg_list(item->cache);
 }
 
+static void msginfo_set_mime_flags(GNode *node, gpointer data)
+{
+       MsgInfo *msginfo = data;
+       MimeInfo *mimeinfo = node->data;
+
+       if (mimeinfo->disposition == DISPOSITIONTYPE_ATTACHMENT) {
+               procmsg_msginfo_set_flags(msginfo, 0, MSG_HAS_ATTACHMENT);
+       } else if (mimeinfo->disposition == DISPOSITIONTYPE_UNKNOWN && 
+                mimeinfo->type != MIMETYPE_TEXT &&
+                mimeinfo->type != MIMETYPE_MULTIPART) {
+               procmsg_msginfo_set_flags(msginfo, 0, MSG_HAS_ATTACHMENT);
+       }
+
+       /* don't descend below top level message for signed and encrypted info */
+       if (mimeinfo->type == MIMETYPE_MESSAGE)
+               return;
+
+       if (privacy_mimeinfo_is_signed(mimeinfo)) {
+               procmsg_msginfo_set_flags(msginfo, 0, MSG_SIGNED);
+       }
+
+       if (privacy_mimeinfo_is_encrypted(mimeinfo)) {
+               procmsg_msginfo_set_flags(msginfo, 0, MSG_ENCRYPTED);
+       } else {
+               /* searching inside encrypted parts doesn't really make sense */
+               g_node_children_foreach(mimeinfo->node, G_TRAVERSE_ALL, msginfo_set_mime_flags, msginfo);
+       }
+}
+
 gchar *folder_item_fetch_msg(FolderItem *item, gint num)
 {
        Folder *folder;
+       gchar *msgfile;
+       MsgInfo *msginfo;
 
        g_return_val_if_fail(item != NULL, NULL);
 
@@ -1473,7 +2102,75 @@ gchar *folder_item_fetch_msg(FolderItem *item, gint num)
 
        g_return_val_if_fail(folder->klass->fetch_msg != NULL, NULL);
 
-       return folder->klass->fetch_msg(folder, item, num);
+       msgfile = folder->klass->fetch_msg(folder, item, num);
+
+       if (msgfile != NULL) {
+               msginfo = folder_item_get_msginfo(item, num);
+               if ((msginfo != NULL) && !MSG_IS_SCANNED(msginfo->flags)) {
+                       MimeInfo *mimeinfo;
+
+                       if (msginfo->folder->stype != F_QUEUE && 
+                           msginfo->folder->stype != F_DRAFT)
+                               mimeinfo = procmime_scan_file(msgfile);
+                       else
+                               mimeinfo = procmime_scan_queue_file(msgfile);
+                       /* check for attachments */
+                       if (mimeinfo != NULL) { 
+                               g_node_children_foreach(mimeinfo->node, G_TRAVERSE_ALL, msginfo_set_mime_flags, msginfo);
+                               procmime_mimeinfo_free_all(mimeinfo);
+
+                               procmsg_msginfo_set_flags(msginfo, 0, MSG_SCANNED);
+                       }
+               }
+       }
+
+       return msgfile;
+}
+
+gint folder_item_fetch_all_msg(FolderItem *item)
+{
+       Folder *folder;
+       GSList *mlist;
+       GSList *cur;
+       gint num = 0;
+       gint ret = 0;
+
+       g_return_val_if_fail(item != NULL, -1);
+
+       debug_print("fetching all messages in %s ...\n", item->path);
+
+       folder = item->folder;
+
+       if (folder->ui_func)
+               folder->ui_func(folder, item, folder->ui_func_data ?
+                               folder->ui_func_data : GINT_TO_POINTER(num));
+
+       mlist = folder_item_get_msg_list(item);
+
+       for (cur = mlist; cur != NULL; cur = cur->next) {
+               MsgInfo *msginfo = (MsgInfo *)cur->data;
+               gchar *msg;
+
+               num++;
+               if (folder->ui_func)
+                       folder->ui_func(folder, item,
+                                       folder->ui_func_data ?
+                                       folder->ui_func_data :
+                                       GINT_TO_POINTER(num));
+
+               msg = folder_item_fetch_msg(item, msginfo->msgnum);
+               if (!msg) {
+                       g_warning("Can't fetch message %d. Aborting.\n",
+                                 msginfo->msgnum);
+                       ret = -1;
+                       break;
+               }
+               g_free(msg);
+       }
+
+       procmsg_msg_list_free(mlist);
+
+       return ret;
 }
 
 static gint folder_item_get_msg_num_by_file(FolderItem *dest, const gchar *file)
@@ -1548,8 +2245,6 @@ static void copy_msginfo_flags(MsgInfo *source, MsgInfo *dest)
        procmsg_msginfo_set_flags(dest,
                                  ~dest->flags.perm_flags & perm_flags,
                                  ~dest->flags.tmp_flags  & tmp_flags);
-
-       folder_item_update(dest->folder, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
 }
 
 static void add_msginfo_to_cache(FolderItem *item, MsgInfo *newmsginfo, MsgInfo *flagsource)
@@ -1563,15 +2258,19 @@ static void add_msginfo_to_cache(FolderItem *item, MsgInfo *newmsginfo, MsgInfo
                item->unreadmarked_msgs++;
        item->total_msgs++;
 
-       copy_msginfo_flags(flagsource, newmsginfo);
-
+       folder_item_update_freeze();
        msgcache_add_msg(item->cache, newmsginfo);
+       copy_msginfo_flags(flagsource, newmsginfo);
+       folder_item_update_with_msg(item,  F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT | F_ITEM_UPDATE_ADDMSG, newmsginfo);
+       folder_item_update_thaw();
 }
 
 static void remove_msginfo_from_cache(FolderItem *item, MsgInfo *msginfo)
 {
+       MsgInfoUpdate msginfo_update;
+
        if (!item->cache)
-           folder_item_read_cache(item);
+               folder_item_read_cache(item);
 
        if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
                msginfo->folder->new_msgs--;
@@ -1581,50 +2280,114 @@ static void remove_msginfo_from_cache(FolderItem *item, MsgInfo *msginfo)
                msginfo->folder->unreadmarked_msgs--;
        msginfo->folder->total_msgs--;
 
+       msginfo_update.msginfo = msginfo;
+       msginfo_update.flags = MSGINFO_UPDATE_DELETED;
+       hooks_invoke(MSGINFO_UPDATE_HOOKLIST, &msginfo_update);
+
        msgcache_remove_msg(item->cache, msginfo->msgnum);
-       folder_item_update(msginfo->folder, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
+       folder_item_update_with_msg(msginfo->folder, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT | F_ITEM_UPDATE_REMOVEMSG, msginfo);
 }
 
 gint folder_item_add_msg(FolderItem *dest, const gchar *file,
-                        gboolean remove_source)
+                        MsgFlags *flags, gboolean remove_source)
 {
-       Folder *folder;
-       gint num;
-       MsgInfo *msginfo;
+        GSList file_list;
+        MsgFileInfo fileinfo;
 
        g_return_val_if_fail(dest != NULL, -1);
        g_return_val_if_fail(file != NULL, -1);
+       fileinfo.msginfo = NULL;
+        fileinfo.file = (gchar *)file;
+        fileinfo.flags = flags;
+        file_list.data = &fileinfo;
+        file_list.next = NULL;
 
-       folder = dest->folder;
+       return folder_item_add_msgs(dest, &file_list, remove_source);
+}
 
-       g_return_val_if_fail(folder->klass->add_msg != NULL, -1);
+gint folder_item_add_msgs(FolderItem *dest, GSList *file_list,
+                          gboolean remove_source)
+{
+        Folder *folder;
+        gint ret, num, lastnum = -1;
+       GSList *file_cur;
+       GRelation *relation;
+       MsgFileInfo *fileinfo = NULL;
+       gboolean folderscan = FALSE;
 
-       if (!dest->cache)
-               folder_item_read_cache(dest);
+        g_return_val_if_fail(dest != NULL, -1);
+        g_return_val_if_fail(file_list != NULL, -1);
+        g_return_val_if_fail(dest->folder != NULL, -1);
 
-       num = folder->klass->add_msg(folder, dest, file, FALSE);
+        folder = dest->folder;
 
-        if (num > 0) {
-               msginfo = folder->klass->get_msginfo(folder, dest, num);
+       relation = g_relation_new(2);
+       g_relation_index(relation, 0, g_direct_hash, g_direct_equal);
 
-               if (msginfo != NULL) {
-                       add_msginfo_to_cache(dest, msginfo, NULL);
-                       procmsg_msginfo_free(msginfo);
-                       folder_item_update(dest, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
+       if (folder->klass->add_msgs != NULL) {
+               ret = folder->klass->add_msgs(folder, dest, file_list, relation);
+               if (ret < 0) {
+                       g_relation_destroy(relation);
+                       return ret;
                }
+       } else {
+               for (file_cur = file_list; file_cur != NULL; file_cur = g_slist_next(file_cur)) {
+                       fileinfo = (MsgFileInfo *) file_cur->data;
 
-                dest->last_num = num;
-        } else if (num == 0) {
-               folder_item_scan(dest);
-               num = folder_item_get_msg_num_by_file(dest, file);
+                       ret = folder->klass->add_msg(folder, dest, fileinfo->file, fileinfo->flags);
+                       if (ret < 0) {
+                               g_relation_destroy(relation);
+                               return ret;
+                       }
+                       g_relation_insert(relation, fileinfo, GINT_TO_POINTER(ret));
+               }
        }
 
-       if (num >= 0 && remove_source) {
-               if (unlink(file) < 0)
-                       FILE_OP_ERROR(file, "unlink");
+       for (file_cur = file_list; file_cur != NULL; file_cur = g_slist_next(file_cur)) {
+               GTuples *tuples;
+
+               fileinfo = (MsgFileInfo *) file_cur->data;
+               tuples = g_relation_select(relation, fileinfo, 0);
+               num = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
+               g_tuples_destroy(tuples);
+
+               if (num >= 0) {
+                       MsgInfo *newmsginfo;
+
+                       if (num == 0) {
+                               if (!folderscan) {
+                                       folder_item_scan_full(dest, FALSE);
+                                       folderscan = TRUE;
+                               }
+                               num = folder_item_get_msg_num_by_file(dest, fileinfo->file);
+                       }
+
+                       if (num > lastnum)
+                               lastnum = num;
+
+                       if (num >= 0 && remove_source) {
+                               if (unlink(fileinfo->file) < 0)
+                                       FILE_OP_ERROR(fileinfo->file, "unlink");
+                       }
+
+                       if (num == 0)
+                               continue;
+
+                       if (!folderscan && 
+                           ((newmsginfo = get_msginfo(dest, num)) != NULL)) {
+                               add_msginfo_to_cache(dest, newmsginfo, NULL);
+                               procmsg_msginfo_free(newmsginfo);
+                       } else if ((newmsginfo = msgcache_get_msg(dest->cache, num)) != NULL) {
+                               /* TODO: set default flags */
+                               procmsg_msginfo_free(newmsginfo);
+                       }
+               }
        }
 
-       return num;
+       g_relation_destroy(relation);
+
+        return lastnum;
 }
 
 /*
@@ -1646,7 +2409,7 @@ gint folder_item_move_msg(FolderItem *dest, MsgInfo *msginfo)
 }
 */
                
-FolderItem *folder_item_move_recursive (FolderItem *src, FolderItem *dest) 
+FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest) 
 {
        GSList *mlist;
        FolderItem *new_item;
@@ -1658,7 +2421,7 @@ FolderItem *folder_item_move_recursive (FolderItem *src, FolderItem *dest)
 
        /* move messages */
        debug_print("Moving %s to %s\n", src->path, dest->path);
-       new_item = folder_create_folder(dest, g_basename(src->path));
+       new_item = folder_create_folder(dest, src->name);
        if (new_item == NULL) {
                printf("Can't create folder\n");
                return NULL;
@@ -1670,10 +2433,11 @@ FolderItem *folder_item_move_recursive (FolderItem *src, FolderItem *dest)
        /* move messages */
        log_message(_("Moving %s to %s...\n"), 
                        src->name, new_item->path);
-       folder_item_move_msgs_with_dest(new_item, mlist);
+       if (mlist != NULL)
+               folder_item_move_msgs(new_item, mlist);
        
        /*copy prefs*/
-       prefs_folder_item_copy_prefs(src, new_item);
+       folder_item_prefs_copy_prefs(src, new_item);
        new_item->collapsed = src->collapsed;
        new_item->thread_collapsed = src->thread_collapsed;
        new_item->threaded  = src->threaded;
@@ -1699,8 +2463,10 @@ FolderItem *folder_item_move_recursive (FolderItem *src, FolderItem *dest)
        old_id = folder_item_get_identifier(src);
        new_id = folder_item_get_identifier(new_item);
        debug_print("updating rules : %s => %s\n", old_id, new_id);
-       
-       src->folder->klass->remove_folder(src->folder, src);
+
+       /* if src supports removing, otherwise only copy folder */
+       if (src->folder->klass->remove_folder != NULL)  
+               src->folder->klass->remove_folder(src->folder, src);
        folder_write_list();
 
        if (old_id != NULL && new_id != NULL)
@@ -1713,24 +2479,23 @@ FolderItem *folder_item_move_recursive (FolderItem *src, FolderItem *dest)
 
 gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_item)
 {
-       FolderItem *tmp = dest->parent;
+       FolderItem *tmp = folder_item_parent(dest);
        gchar * src_identifier, * dst_identifier;
        gchar * phys_srcpath, * phys_dstpath;
-       GNode *src_node;
        
        while (tmp) {
                if (tmp == src) {
                        return F_MOVE_FAILED_DEST_IS_CHILD;
                }
-               tmp = tmp->parent;
+               tmp = folder_item_parent(tmp);;
        }
        
-       tmp = src->parent;
+       tmp = folder_item_parent(src);
        
        src_identifier = folder_item_get_identifier(src);
        dst_identifier = folder_item_get_identifier(dest);
        
-       if(dst_identifier == NULL && dest->folder && dest->parent == NULL) {
+       if(dst_identifier == NULL && dest->folder && folder_item_parent(dest) == NULL) {
                /* dest can be a root folder */
                dst_identifier = folder_get_identifier(dest->folder);
        }
@@ -1746,7 +2511,7 @@ gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_ite
        phys_srcpath = folder_item_get_path(src);
        phys_dstpath = g_strconcat(folder_item_get_path(dest),G_DIR_SEPARATOR_S,g_basename(phys_srcpath),NULL);
 
-       if (src->parent == dest || src == dest) {
+       if (folder_item_parent(src) == dest || src == dest) {
                g_free(src_identifier);
                g_free(dst_identifier);
                g_free(phys_srcpath);
@@ -1758,14 +2523,6 @@ gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_ite
                return F_MOVE_FAILED;
        }
        
-       /* update rules */
-       src_node = g_node_find(src->folder->node, G_PRE_ORDER, G_TRAVERSE_ALL, src);
-       if (src_node) 
-               g_node_destroy(src_node);
-       else
-               debug_print("can't remove node: it's null!\n");
-       /* not to much worry if remove fails, move has been done */
-       
        g_free(src_identifier);
        g_free(dst_identifier);
        g_free(phys_srcpath);
@@ -1776,70 +2533,56 @@ gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_ite
        return F_MOVE_OK;
 }
 
-gint folder_item_move_msg(FolderItem *dest, MsgInfo *msginfo)
+/**
+ * Copy a list of message to a new folder and remove
+ * source messages if wanted
+ */
+static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_source)
 {
-       GSList *list = NULL;
-       gint ret;
-
-       list = g_slist_append(list, msginfo);
-       ret = folder_item_move_msgs_with_dest(dest, list);
-       g_slist_free(list);
-       
-       return ret;
-}
-
-/*
-gint folder_item_move_msgs_with_dest(FolderItem *dest, GSList *msglist)
-{
-       Folder *folder;
-       gint num;
+       Folder *folder;
+       GSList *l;
+       gint num, lastnum = -1;
+       gboolean folderscan = FALSE;
+       GRelation *relation;
 
        g_return_val_if_fail(dest != NULL, -1);
        g_return_val_if_fail(msglist != NULL, -1);
 
        folder = dest->folder;
-       if (dest->last_num < 0) folder->scan(folder, dest);
-
-       num = folder->move_msgs_with_dest(folder, dest, msglist);
-       if (num > 0) dest->last_num = num;
-       else dest->op_count = 0;
-
-       return num;
-}
-*/
-
-
 
-gint folder_item_move_msgs_with_dest(FolderItem *dest, GSList *msglist)
-{
-       Folder *folder;
-       FolderItem *item;
-       GSList *newmsgnums = NULL;
-       GSList *l, *l2;
-       gint num, lastnum = -1;
-       gboolean folderscan = FALSE;
+       g_return_val_if_fail(folder->klass->copy_msg != NULL, -1);
 
-       g_return_val_if_fail(dest != NULL, -1);
-       g_return_val_if_fail(msglist != NULL, -1);
+       relation = g_relation_new(2);
+       g_relation_index(relation, 0, g_direct_hash, g_direct_equal);
+       g_relation_index(relation, 1, g_direct_hash, g_direct_equal);
 
-       folder = dest->folder;
+       for (l = msglist ; l != NULL ; l = g_slist_next(l)) {
+               MsgInfo * msginfo = (MsgInfo *) l->data;
 
-       g_return_val_if_fail(folder->klass->copy_msg != NULL, -1);
-       g_return_val_if_fail(folder->klass->remove_msg != NULL, -1);
+               if (msginfo->planned_download != 0) {
+                       int old_planned = msginfo->planned_download;
+                       partial_unmark(msginfo);
+                       /* little hack to reenable after */
+                       msginfo->planned_download = old_planned;
+               }
+       }
 
        /* 
         * Copy messages to destination folder and 
         * store new message numbers in newmsgnums
         */
-       item = NULL;
-       for (l = msglist ; l != NULL ; l = g_slist_next(l)) {
-               MsgInfo * msginfo = (MsgInfo *) l->data;
-
-               if (!item && msginfo->folder != NULL)
-                       item = msginfo->folder;
+       if (folder->klass->copy_msgs != NULL) {
+               if (folder->klass->copy_msgs(folder, dest, msglist, relation) < 0) {
+                       g_relation_destroy(relation);
+                       return -1;
+               }
+       } else {
+               for (l = msglist ; l != NULL ; l = g_slist_next(l)) {
+                       MsgInfo * msginfo = (MsgInfo *) l->data;
 
-               num = folder->klass->copy_msg(folder, dest, msginfo);
-               newmsgnums = g_slist_append(newmsgnums, GINT_TO_POINTER(num));
+                       num = folder->klass->copy_msg(folder, dest, msginfo);
+                       g_relation_insert(relation, msginfo, GINT_TO_POINTER(num));
+               }
        }
 
        /* Read cache for dest folder */
@@ -1849,202 +2592,145 @@ gint folder_item_move_msgs_with_dest(FolderItem *dest, GSList *msglist)
         * Fetch new MsgInfos for new messages in dest folder,
         * add them to the msgcache and update folder message counts
         */
-       l2 = newmsgnums;
+       if (g_relation_count(relation, GINT_TO_POINTER(0), 1) > 0) {
+               folder_item_scan_full(dest, FALSE);
+               folderscan = TRUE;
+       }
+
        for (l = msglist; l != NULL; l = g_slist_next(l)) {
                MsgInfo *msginfo = (MsgInfo *) l->data;
+                GTuples *tuples;
 
-               num = GPOINTER_TO_INT(l2->data);
-               l2 = g_slist_next(l2);
+                tuples = g_relation_select(relation, msginfo, 0);
+                num = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
+                g_tuples_destroy(tuples);
 
                if (num >= 0) {
-                       MsgInfo *newmsginfo;
-
-                       if (num == 0) {
-                               gchar *file;
-
-                               if (!folderscan) {
-                                       folder_item_scan(dest);
-                                       folderscan = TRUE;
+                       MsgInfo *newmsginfo = NULL;
+
+                       if (folderscan) {
+                               if (msginfo->msgid != NULL) {
+                                       newmsginfo = folder_item_get_msginfo_by_msgid(dest, msginfo->msgid);
+                                       if (newmsginfo != NULL) {
+                                               copy_msginfo_flags(msginfo, newmsginfo);
+                                               num = newmsginfo->msgnum;
+                                       }
+                               }
+                       } else {
+                               newmsginfo = get_msginfo(dest, num);
+                               if (newmsginfo != NULL) {
+                                       add_msginfo_to_cache(dest, newmsginfo, msginfo);
                                }
-                               file = folder_item_fetch_msg(msginfo->folder, msginfo->msgnum);
-                               num = folder_item_get_msg_num_by_file(dest, file);
-                               g_free(file);
                        }
 
-                       if (num > lastnum)
-                               lastnum = num;
+                       if (msginfo->planned_download 
+                           == POP3_PARTIAL_DLOAD_DELE) {
+                               partial_mark_for_delete(newmsginfo);
+                       }
+                       if (msginfo->planned_download 
+                           == POP3_PARTIAL_DLOAD_DLOAD) {
+                               partial_mark_for_download(newmsginfo);
+                       }
+                       procmsg_msginfo_free(newmsginfo);
 
-                       if (num == 0)
-                               continue;
 
-                       if (!folderscan && 
-                           ((newmsginfo = folder->klass->get_msginfo(folder, dest, num)) != NULL)) {
-                               add_msginfo_to_cache(dest, newmsginfo, msginfo);
-                               procmsg_msginfo_free(newmsginfo);
-                       } else if ((newmsginfo = msgcache_get_msg(dest->cache, num)) != NULL) {
-                               copy_msginfo_flags(msginfo, newmsginfo);
-                               procmsg_msginfo_free(newmsginfo);
-                       }
+                       if (num > lastnum)
+                               lastnum = num;
                }
        }
 
-       /*
-        * Remove source messages from their folders if
-        * copying was successfull and update folder
-        * message counts
-        */
-       l2 = newmsgnums;
-       for (l = msglist; l != NULL; l = g_slist_next(l)) {
-               MsgInfo *msginfo = (MsgInfo *) l->data;
-
-               num = GPOINTER_TO_INT(l2->data);
-               l2 = g_slist_next(l2);
-               
-               if (num >= 0) {
-                       item->folder->klass->remove_msg(item->folder,
-                                                       msginfo->folder,
-                                                       msginfo->msgnum);
-                       remove_msginfo_from_cache(item, msginfo);
+       if (remove_source) {
+               /*
+                * Remove source messages from their folders if
+                * copying was successfull and update folder
+                * message counts
+                */
+               for (l = msglist; l != NULL; l = g_slist_next(l)) {
+                       MsgInfo *msginfo = (MsgInfo *) l->data;
+                       FolderItem *item = msginfo->folder;
+                       GTuples *tuples;
+
+                       tuples = g_relation_select(relation, msginfo, 0);
+                       num = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
+                       g_tuples_destroy(tuples);
+
+                       if ((num >= 0) && (item->folder->klass->remove_msg != NULL)) {
+                               item->folder->klass->remove_msg(item->folder,
+                                                               msginfo->folder,
+                                                               msginfo->msgnum);
+                               remove_msginfo_from_cache(item, msginfo);
+                       }
                }
        }
 
-
-       if (folder->klass->finished_copy)
-               folder->klass->finished_copy(folder, dest);
-
-       g_slist_free(newmsgnums);
+       g_relation_destroy(relation);
        return lastnum;
 }
 
-/*
-gint folder_item_copy_msg(FolderItem *dest, MsgInfo *msginfo)
+/**
+ * Move a message to a new folder.
+ *
+ * \param dest Destination folder
+ * \param msginfo The message
+ */
+gint folder_item_move_msg(FolderItem *dest, MsgInfo *msginfo)
 {
-       Folder *folder;
-       gint num;
+       GSList list;
 
        g_return_val_if_fail(dest != NULL, -1);
        g_return_val_if_fail(msginfo != NULL, -1);
 
-       folder = dest->folder;
-       if (dest->last_num < 0) folder->scan(folder, dest);
-
-       num = folder->copy_msg(folder, dest, msginfo);
-       if (num > 0) dest->last_num = num;
+       list.data = msginfo;
+       list.next = NULL;
 
-       return num;
+       return do_copy_msgs(dest, &list, TRUE);
 }
-*/
 
-gint folder_item_copy_msg(FolderItem *dest, MsgInfo *msginfo)
+/**
+ * Move a list of messages to a new folder.
+ *
+ * \param dest Destination folder
+ * \param msglist List of messages
+ */
+gint folder_item_move_msgs(FolderItem *dest, GSList *msglist)
 {
-       GSList *list = NULL;
-       gint ret;
+       g_return_val_if_fail(dest != NULL, -1);
+       g_return_val_if_fail(msglist != NULL, -1);
 
-       list = g_slist_append(list, msginfo);
-       ret = folder_item_copy_msgs_with_dest(dest, list);
-       g_slist_free(list);
-       
-       return ret;
+       return do_copy_msgs(dest, msglist, TRUE);
 }
 
-/*
-gint folder_item_copy_msgs_with_dest(FolderItem *dest, GSList *msglist)
+/**
+ * Copy a message to a new folder.
+ *
+ * \param dest Destination folder
+ * \param msginfo The message
+ */
+gint folder_item_copy_msg(FolderItem *dest, MsgInfo *msginfo)
 {
-       Folder *folder;
-       gint num;
+       GSList list;
 
        g_return_val_if_fail(dest != NULL, -1);
-       g_return_val_if_fail(msglist != NULL, -1);
-
-       folder = dest->folder;
-       if (dest->last_num < 0) folder->scan(folder, dest);
-
-       num = folder->copy_msgs_with_dest(folder, dest, msglist);
-       if (num > 0) dest->last_num = num;
-       else dest->op_count = 0;
-
-       return num;
+       g_return_val_if_fail(msginfo != NULL, -1);
+    
+       list.data = msginfo;
+       list.next = NULL;
+       
+       return do_copy_msgs(dest, &list, FALSE);
 }
-*/
 
-gint folder_item_copy_msgs_with_dest(FolderItem *dest, GSList *msglist)
+/**
+ * Copy a list of messages to a new folder.
+ *
+ * \param dest Destination folder
+ * \param msglist List of messages
+ */
+gint folder_item_copy_msgs(FolderItem *dest, GSList *msglist)
 {
-       Folder *folder;
-       gint num, lastnum = -1;
-       GSList *newmsgnums = NULL;
-       GSList *l, *l2;
-       gboolean folderscan = FALSE;
-
        g_return_val_if_fail(dest != NULL, -1);
        g_return_val_if_fail(msglist != NULL, -1);
 
-       folder = dest->folder;
-       g_return_val_if_fail(folder->klass->copy_msg != NULL, -1);
-
-       /* 
-        * Copy messages to destination folder and 
-        * store new message numbers in newmsgnums
-        */
-       for (l = msglist ; l != NULL ; l = g_slist_next(l)) {
-               MsgInfo * msginfo = (MsgInfo *) l->data;
-
-               num = folder->klass->copy_msg(folder, dest, msginfo);
-               newmsgnums = g_slist_append(newmsgnums, GINT_TO_POINTER(num));
-       }
-
-       /* Read cache for dest folder */
-       if (!dest->cache) folder_item_read_cache(dest);
-
-       /* 
-        * Fetch new MsgInfos for new messages in dest folder,
-        * add them to the msgcache and update folder message counts
-        */
-       l2 = newmsgnums;
-       for (l = msglist; l != NULL; l = g_slist_next(l)) {
-               MsgInfo *msginfo = (MsgInfo *) l->data;
-
-               num = GPOINTER_TO_INT(l2->data);
-               l2 = g_slist_next(l2);
-
-               if (num >= 0) {
-                       MsgInfo *newmsginfo;
-
-                       if (num == 0) {
-                               gchar *file;
-
-                               if (!folderscan) {
-                                       folder_item_scan(dest);
-                                       folderscan = TRUE;
-                               }
-                               file = folder_item_fetch_msg(msginfo->folder, msginfo->msgnum);
-                               num = folder_item_get_msg_num_by_file(dest, file);
-                               g_free(file);
-                       }
-       
-                       if (num > lastnum)
-                               lastnum = num;
-
-                       if (num == 0)
-                               continue;
-
-                       if (!folderscan && 
-                           ((newmsginfo = folder->klass->get_msginfo(folder, dest, num)) != NULL)) {
-                               newmsginfo = folder->klass->get_msginfo(folder, dest, num);
-                               add_msginfo_to_cache(dest, newmsginfo, msginfo);
-                               procmsg_msginfo_free(newmsginfo);
-                       } else if ((newmsginfo = msgcache_get_msg(dest->cache, num)) != NULL) {
-                               copy_msginfo_flags(msginfo, newmsginfo);
-                               procmsg_msginfo_free(newmsginfo);
-                       }
-               }
-       }
-       
-       if (folder->klass->finished_copy)
-               folder->klass->finished_copy(folder, dest);
-
-       g_slist_free(newmsgnums);
-       return lastnum;
+       return do_copy_msgs(dest, msglist, FALSE);
 }
 
 gint folder_item_remove_msg(FolderItem *item, gint num)
@@ -2066,7 +2752,6 @@ gint folder_item_remove_msg(FolderItem *item, gint num)
                remove_msginfo_from_cache(item, msginfo);
                procmsg_msginfo_free(msginfo);
        }
-       folder_item_update(item, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
 
        return ret;
 }
@@ -2082,6 +2767,7 @@ gint folder_item_remove_msgs(FolderItem *item, GSList *msglist)
 
        if (!item->cache) folder_item_read_cache(item);
 
+       folder_item_update_freeze();
        while (msglist != NULL) {
                MsgInfo *msginfo = (MsgInfo *)msglist->data;
 
@@ -2090,6 +2776,7 @@ gint folder_item_remove_msgs(FolderItem *item, GSList *msglist)
                msgcache_remove_msg(item->cache, msginfo->msgnum);
                msglist = msglist->next;
        }
+       folder_item_update_thaw();
 
        return ret;
 }
@@ -2108,9 +2795,6 @@ gint folder_item_remove_all_msg(FolderItem *item)
        result = folder->klass->remove_all_msg(folder, item);
 
        if (result == 0) {
-               if (folder->klass->finished_remove)
-                       folder->klass->finished_remove(folder, item);
-
                folder_item_free_cache(item);
                item->cache = msgcache_new();
 
@@ -2185,139 +2869,29 @@ gchar *folder_item_get_mark_file(FolderItem *item)
        return file;
 }
 
-static gboolean folder_build_tree(GNode *node, gpointer data)
+static gpointer xml_to_folder_item(gpointer nodedata, gpointer data)
 {
-       Folder *folder = FOLDER(data);
+       XMLNode *xmlnode = (XMLNode *) nodedata;
+       Folder *folder = (Folder *) data;
        FolderItem *item;
-       XMLNode *xmlnode;
-       GList *list;
-       SpecialFolderItemType stype = F_NORMAL;
-       const gchar *name = NULL;
-       const gchar *path = NULL;
-       PrefsAccount *account = NULL;
-       gboolean no_sub = FALSE, no_select = FALSE, collapsed = FALSE, 
-                threaded = TRUE, apply_sub = FALSE;
-       gboolean ret_rcpt = FALSE, hidereadmsgs = FALSE,
-                thread_collapsed = FALSE; /* CLAWS */
-       FolderSortKey sort_key = SORT_BY_NONE;
-       FolderSortType sort_type = SORT_ASCENDING;
-       gint new = 0, unread = 0, total = 0, unreadmarked = 0;
-       time_t mtime = 0;
 
-       g_return_val_if_fail(node->data != NULL, FALSE);
-       if (!node->parent) return FALSE;
+       g_return_val_if_fail(xmlnode != NULL, NULL);
+       g_return_val_if_fail(folder != NULL, NULL);
 
-       xmlnode = node->data;
        if (strcmp2(xmlnode->tag->tag, "folderitem") != 0) {
                g_warning("tag name != \"folderitem\"\n");
-               return FALSE;
+               return NULL;
        }
 
-       list = xmlnode->tag->attr;
-       for (; list != NULL; list = list->next) {
-               XMLAttr *attr = list->data;
+       item = folder_item_new(folder, "", "");
+       if (folder->klass->item_set_xml != NULL)
+               folder->klass->item_set_xml(folder, item, xmlnode->tag);
+       else
+               folder_item_set_xml(folder, item, xmlnode->tag);
 
-               if (!attr || !attr->name || !attr->value) continue;
-               if (!strcmp(attr->name, "type")) {
-                       if (!strcasecmp(attr->value, "normal"))
-                               stype = F_NORMAL;
-                       else if (!strcasecmp(attr->value, "inbox"))
-                               stype = F_INBOX;
-                       else if (!strcasecmp(attr->value, "outbox"))
-                               stype = F_OUTBOX;
-                       else if (!strcasecmp(attr->value, "draft"))
-                               stype = F_DRAFT;
-                       else if (!strcasecmp(attr->value, "queue"))
-                               stype = F_QUEUE;
-                       else if (!strcasecmp(attr->value, "trash"))
-                               stype = F_TRASH;
-               } else if (!strcmp(attr->name, "name"))
-                       name = attr->value;
-               else if (!strcmp(attr->name, "path"))
-                       path = attr->value;
-               else if (!strcmp(attr->name, "mtime"))
-                       mtime = strtoul(attr->value, NULL, 10);
-               else if (!strcmp(attr->name, "new"))
-                       new = atoi(attr->value);
-               else if (!strcmp(attr->name, "unread"))
-                       unread = atoi(attr->value);
-               else if (!strcmp(attr->name, "unreadmarked"))
-                       unreadmarked = atoi(attr->value);
-               else if (!strcmp(attr->name, "total"))
-                       total = atoi(attr->value);
-               else if (!strcmp(attr->name, "no_sub"))
-                       no_sub = *attr->value == '1' ? TRUE : FALSE;
-               else if (!strcmp(attr->name, "no_select"))
-                       no_select = *attr->value == '1' ? TRUE : FALSE;
-               else if (!strcmp(attr->name, "collapsed"))
-                       collapsed = *attr->value == '1' ? TRUE : FALSE;
-               else if (!strcmp(attr->name, "thread_collapsed"))
-                       thread_collapsed =  *attr->value == '1' ? TRUE : FALSE;
-               else if (!strcmp(attr->name, "threaded"))
-                       threaded =  *attr->value == '1' ? TRUE : FALSE;
-               else if (!strcmp(attr->name, "hidereadmsgs"))
-                       hidereadmsgs =  *attr->value == '1' ? TRUE : FALSE;
-               else if (!strcmp(attr->name, "reqretrcpt"))
-                       ret_rcpt =  *attr->value == '1' ? TRUE : FALSE;
-               else if (!strcmp(attr->name, "sort_key")) {
-                       if (!strcmp(attr->value, "none"))
-                               sort_key = SORT_BY_NONE;
-                       else if (!strcmp(attr->value, "number"))
-                               sort_key = SORT_BY_NUMBER;
-                       else if (!strcmp(attr->value, "size"))
-                               sort_key = SORT_BY_SIZE;
-                       else if (!strcmp(attr->value, "date"))
-                               sort_key = SORT_BY_DATE;
-                       else if (!strcmp(attr->value, "from"))
-                               sort_key = SORT_BY_FROM;
-                       else if (!strcmp(attr->value, "subject"))
-                               sort_key = SORT_BY_SUBJECT;
-                       else if (!strcmp(attr->value, "score"))
-                               sort_key = SORT_BY_SCORE;
-                       else if (!strcmp(attr->value, "label"))
-                               sort_key = SORT_BY_LABEL;
-                       else if (!strcmp(attr->value, "mark"))
-                               sort_key = SORT_BY_MARK;
-                       else if (!strcmp(attr->value, "unread"))
-                               sort_key = SORT_BY_STATUS;
-                       else if (!strcmp(attr->value, "mime"))
-                               sort_key = SORT_BY_MIME;
-                       else if (!strcmp(attr->value, "to"))
-                               sort_key = SORT_BY_TO;
-                       else if (!strcmp(attr->value, "locked"))
-                               sort_key = SORT_BY_LOCKED;
-               } else if (!strcmp(attr->name, "sort_type")) {
-                       if (!strcmp(attr->value, "ascending"))
-                               sort_type = SORT_ASCENDING;
-                       else
-                               sort_type = SORT_DESCENDING;
-               } else if (!strcmp(attr->name, "account_id")) {
-                       account = account_find_from_id(atoi(attr->value));
-                       if (!account) g_warning("account_id: %s not found\n",
-                                               attr->value);
-               } else if (!strcmp(attr->name, "apply_sub"))
-                       apply_sub = *attr->value == '1' ? TRUE : FALSE;
-       }
-
-       item = folder_item_new(folder, name, path);
-       item->stype = stype;
-       item->mtime = mtime;
-       item->new_msgs = new;
-       item->unread_msgs = unread;
-       item->unreadmarked_msgs = unreadmarked;
-       item->total_msgs = total;
-       item->no_sub = no_sub;
-       item->no_select = no_select;
-       item->collapsed = collapsed;
-       item->thread_collapsed = thread_collapsed;
-       item->threaded  = threaded;
-       item->hide_read_msgs  = hidereadmsgs;
-       item->ret_rcpt  = ret_rcpt;
-       item->sort_key  = sort_key;
-       item->sort_type = sort_type;
-       item->parent = FOLDER_ITEM(node->parent->data);
        item->folder = folder;
-       switch (stype) {
+
+       switch (item->stype) {
        case F_INBOX:  folder->inbox  = item; break;
        case F_OUTBOX: folder->outbox = item; break;
        case F_DRAFT:  folder->draft  = item; break;
@@ -2325,84 +2899,64 @@ static gboolean folder_build_tree(GNode *node, gpointer data)
        case F_TRASH:  folder->trash  = item; break;
        default:       break;
        }
-       item->account = account;
-       item->apply_sub = apply_sub;
-       prefs_folder_item_read_config(item);
+       folder_item_prefs_read_config(item);
 
-       node->data = item;
-       xml_free_node(xmlnode);
+       return item;
+}
+
+static gboolean folder_item_set_node(GNode *node, gpointer data)
+{
+       FolderItem *item = (FolderItem *) node->data;
+       item->node = node;
 
        return FALSE;
 }
 
-static gboolean folder_read_folder_func(GNode *node, gpointer data)
+static Folder *folder_get_from_xml(GNode *node)
 {
        Folder *folder;
        XMLNode *xmlnode;
        GList *list;
-       FolderClass *class = NULL;
-       const gchar *name = NULL;
-       const gchar *path = NULL;
-       PrefsAccount *account = NULL;
-       gboolean collapsed = FALSE, threaded = TRUE, apply_sub = FALSE;
-       gboolean ret_rcpt = FALSE, thread_collapsed = FALSE; /* CLAWS */
-
-       if (g_node_depth(node) != 2) return FALSE;
-       g_return_val_if_fail(node->data != NULL, FALSE);
+       FolderClass *klass = NULL;
+       GNode *cur;
+
+       g_return_val_if_fail(node->data != NULL, NULL);
 
        xmlnode = node->data;
        if (strcmp2(xmlnode->tag->tag, "folder") != 0) {
                g_warning("tag name != \"folder\"\n");
-               return TRUE;
+               return NULL;
        }
-       g_node_unlink(node);
        list = xmlnode->tag->attr;
        for (; list != NULL; list = list->next) {
                XMLAttr *attr = list->data;
 
                if (!attr || !attr->name || !attr->value) continue;
                if (!strcmp(attr->name, "type"))
-                       class = folder_get_class_from_string(attr->value);
-               else if (!strcmp(attr->name, "name"))
-                       name = attr->value;
-               else if (!strcmp(attr->name, "path"))
-                       path = attr->value;
-               else if (!strcmp(attr->name, "collapsed"))
-                       collapsed = *attr->value == '1' ? TRUE : FALSE;
-               else if (!strcmp(attr->name, "thread_collapsed"))
-                       thread_collapsed = *attr->value == '1' ? TRUE : FALSE;
-               else if (!strcmp(attr->name, "threaded"))
-                       threaded = *attr->value == '1' ? TRUE : FALSE;
-               else if (!strcmp(attr->name, "account_id")) {
-                       account = account_find_from_id(atoi(attr->value));
-                       if (!account) g_warning("account_id: %s not found\n",
-                                               attr->value);
-               } else if (!strcmp(attr->name, "apply_sub"))
-                       apply_sub = *attr->value == '1' ? TRUE : FALSE;
-               else if (!strcmp(attr->name, "reqretrcpt"))
-                       ret_rcpt = *attr->value == '1' ? TRUE : FALSE;
-       }
-
-       folder = folder_new(class, name, path);
-       g_return_val_if_fail(folder != NULL, FALSE);
-       folder->account = account;
-       if (account != NULL)
-               account->folder = REMOTE_FOLDER(folder);
-       node->data = folder->node->data;
-       g_node_destroy(folder->node);
-       folder->node = node;
-       folder_add(folder);
-       FOLDER_ITEM(node->data)->collapsed = collapsed;
-       FOLDER_ITEM(node->data)->thread_collapsed = thread_collapsed;
-       FOLDER_ITEM(node->data)->threaded  = threaded;
-       FOLDER_ITEM(node->data)->account   = account;
-       FOLDER_ITEM(node->data)->apply_sub = apply_sub;
-       FOLDER_ITEM(node->data)->ret_rcpt  = ret_rcpt;
-
-       g_node_traverse(node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
-                       folder_build_tree, folder);
+                       klass = folder_get_class_from_string(attr->value);
+       }
+       if (klass == NULL)
+               return NULL;
 
-       return FALSE;
+       folder = folder_new(klass, "", "");
+       g_return_val_if_fail(folder != NULL, NULL);
+
+       if (klass->set_xml)
+               klass->set_xml(folder, xmlnode->tag);
+       else
+               folder_set_xml(folder, xmlnode->tag);
+
+       cur = node->children;
+       while (cur != NULL) {
+               GNode *itemnode;
+
+               itemnode = g_node_map(cur, xml_to_folder_item, (gpointer) folder);
+               g_node_append(folder->node, itemnode);
+               cur = cur->next;
+       }
+       g_node_traverse(folder->node, G_IN_ORDER, G_TRAVERSE_ALL, -1, folder_item_set_node, NULL);
+       
+       return folder;
 }
 
 static gchar *folder_get_list_path(void)
@@ -2423,113 +2977,53 @@ static gchar *folder_get_list_path(void)
        fputs("\"", fp);                                \
 }
 
-static void folder_write_list_recursive(GNode *node, gpointer data)
+static gpointer folder_item_to_xml(gpointer nodedata, gpointer data)
 {
-       FILE *fp = (FILE *)data;
-       FolderItem *item;
-       gint i, depth;
-       static gchar *folder_item_stype_str[] = {"normal", "inbox", "outbox",
-                                                "draft", "queue", "trash"};
-       static gchar *sort_key_str[] = {"none", "number", "size", "date",
-                                       "from", "subject", "score", "label",
-                                       "mark", "unread", "mime", "to", 
-                                       "locked"};
-       g_return_if_fail(node != NULL);
-       g_return_if_fail(fp != NULL);
+       FolderItem *item = (FolderItem *) nodedata;
+       XMLTag *tag;
 
-       item = FOLDER_ITEM(node->data);
-       g_return_if_fail(item != NULL);
+       g_return_val_if_fail(item != NULL, NULL);
 
-       depth = g_node_depth(node);
-       for (i = 0; i < depth; i++)
-               fputs("    ", fp);
-       if (depth == 1) {
-               Folder *folder = item->folder;
-
-               fprintf(fp, "<folder type=\"%s\"", folder->klass->idstr);
-               if (folder->name)
-                       PUT_ESCAPE_STR(fp, "name", folder->name);
-               if (FOLDER_TYPE(folder) == F_MH || FOLDER_TYPE(folder) == F_MBOX)
-                       PUT_ESCAPE_STR(fp, "path",
-                                      LOCAL_FOLDER(folder)->rootpath);
-               if (item->collapsed && node->children)
-                       fputs(" collapsed=\"1\"", fp);
-               if (folder->account)
-                       fprintf(fp, " account_id=\"%d\"",
-                               folder->account->account_id);
-               if (item->apply_sub)
-                       fputs(" apply_sub=\"1\"", fp);
-               if (item->ret_rcpt) 
-                       fputs(" reqretrcpt=\"1\"", fp);
-       } else {
-               fprintf(fp, "<folderitem type=\"%s\"",
-                       folder_item_stype_str[item->stype]);
-               if (item->name)
-                       PUT_ESCAPE_STR(fp, "name", item->name);
-               if (item->path)
-                       PUT_ESCAPE_STR(fp, "path", item->path);
-
-               if (item->no_sub)
-                       fputs(" no_sub=\"1\"", fp);
-               if (item->no_select)
-                       fputs(" no_select=\"1\"", fp);
-               if (item->collapsed && node->children)
-                       fputs(" collapsed=\"1\"", fp);
-               else
-                       fputs(" collapsed=\"0\"", fp);
-               if (item->thread_collapsed)
-                       fputs(" thread_collapsed=\"1\"", fp);
-               else
-                       fputs(" thread_collapsed=\"0\"", fp);
-               if (item->threaded)
-                       fputs(" threaded=\"1\"", fp);
-               else
-                       fputs(" threaded=\"0\"", fp);
-               if (item->hide_read_msgs)
-                       fputs(" hidereadmsgs=\"1\"", fp);
-               else
-                       fputs(" hidereadmsgs=\"0\"", fp);
-               if (item->ret_rcpt)
-                       fputs(" reqretrcpt=\"1\"", fp);
-
-               if (item->sort_key != SORT_BY_NONE) {
-                       fprintf(fp, " sort_key=\"%s\"",
-                               sort_key_str[item->sort_key]);
-                       if (item->sort_type == SORT_ASCENDING)
-                               fprintf(fp, " sort_type=\"ascending\"");
-                       else
-                               fprintf(fp, " sort_type=\"descending\"");
-               }
+       if (item->folder->klass->item_get_xml != NULL)
+               tag = item->folder->klass->item_get_xml(item->folder, item);
+       else
+               tag = folder_item_get_xml(item->folder, item);
 
-               fprintf(fp,
-                       " mtime=\"%lu\" new=\"%d\" unread=\"%d\" unreadmarked=\"%d\" total=\"%d\"",
-                       item->mtime, item->new_msgs, item->unread_msgs, item->unreadmarked_msgs, item->total_msgs);
+       return xml_node_new(tag, NULL);;
+}
 
-               if (item->account)
-                       fprintf(fp, " account_id=\"%d\"",
-                               item->account->account_id);
-               if (item->apply_sub)
-                       fputs(" apply_sub=\"1\"", fp);
-       }
+static GNode *folder_get_xml_node(Folder *folder)
+{
+       GNode *node;
+       XMLNode *xmlnode;
+       XMLTag *tag;
 
-       if (node->children) {
-               GNode *child;
-               fputs(">\n", fp);
+       g_return_val_if_fail(folder != NULL, NULL);
 
-               child = node->children;
-               while (child) {
-                       GNode *cur;
+       if (folder->klass->get_xml != NULL)
+               tag = folder->klass->get_xml(folder);
+       else
+               tag = folder_get_xml(folder);
 
-                       cur = child;
-                       child = cur->next;
-                       folder_write_list_recursive(cur, data);
+       xml_tag_add_attr(tag, xml_attr_new("type", folder->klass->idstr));
+
+       xmlnode = xml_node_new(tag, NULL);
+
+       node = g_node_new(xmlnode);
+       if (folder->node->children) {
+               GNode *cur;
+
+               cur = folder->node->children;
+               while (cur) {
+                       GNode *xmlnode;
+
+                       xmlnode = g_node_map(cur, folder_item_to_xml, (gpointer) folder);
+                       g_node_append(node, xmlnode);
+                       cur = cur->next;
                }
+       }
 
-               for (i = 0; i < depth; i++)
-                       fputs("    ", fp);
-               fprintf(fp, "</%s>\n", depth == 1 ? "folder" : "folderitem");
-       } else
-               fputs(" />\n", fp);
+       return node;
 }
 
 static void folder_update_op_count_rec(GNode *node)
@@ -2654,7 +3148,7 @@ FolderItem *folder_get_default_processing(void)
 
 /* folder_persist_prefs_new() - return hash table with persistent
  * settings (and folder name as key). 
- * (note that in claws other options are in the PREFS_FOLDER_ITEM_RC
+ * (note that in claws other options are in the folder_item_prefs_RC
  * file, so those don't need to be included in PersistPref yet) 
  */
 GHashTable *folder_persist_prefs_new(Folder *folder)
@@ -2693,8 +3187,8 @@ void folder_item_restore_persist_prefs(FolderItem *item, GHashTable *pptable)
        /* CLAWS: since not all folder properties have been migrated to 
         * folderlist.xml, we need to call the old stuff first before
         * setting things that apply both to Main and Claws. */
-       prefs_folder_item_read_config(item); 
-        
+       folder_item_prefs_read_config(item); 
+
        item->collapsed = pp->collapsed;
        item->thread_collapsed = pp->thread_collapsed;
        item->threaded  = pp->threaded;
@@ -2757,8 +3251,6 @@ void folder_item_apply_processing(FolderItem *item)
        g_return_if_fail(item != NULL);
        
        processing_list = item->prefs->processing;
-       if (processing_list == NULL)
-               return;
 
        folder_item_update_freeze();
 
@@ -2767,7 +3259,20 @@ void folder_item_apply_processing(FolderItem *item)
                MsgInfo * msginfo;
 
                msginfo = (MsgInfo *) cur->data;
+                
+                /* reset parameters that can be modified by processing */
+                msginfo->hidden = 0;
+                msginfo->score = 0;
+                
+                /* apply pre global rules */
+               filter_message_by_msginfo(pre_global_processing, msginfo);
+                
+                /* apply rules of the folder */
                filter_message_by_msginfo(processing_list, msginfo);
+
+                /* apply post global rules */
+               filter_message_by_msginfo(post_global_processing, msginfo);
+                
                procmsg_msginfo_free(msginfo);
        }
        g_slist_free(mlist);
@@ -2780,6 +3285,20 @@ void folder_item_apply_processing(FolderItem *item)
  */
 static gint folder_item_update_freeze_cnt = 0;
 
+static void folder_item_update_with_msg(FolderItem *item, FolderItemUpdateFlags update_flags, MsgInfo *msg)
+{
+       if (folder_item_update_freeze_cnt == 0 /* || (msg != NULL && item->opened) */) {
+               FolderItemUpdateData source;
+       
+               source.item = item;
+               source.update_flags = update_flags;
+               source.msg = msg;
+               hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &source);
+       } else {
+               item->update_flags |= update_flags & ~(F_ITEM_UPDATE_ADDMSG | F_ITEM_UPDATE_REMOVEMSG);
+       }
+}
+
 /**
  * Notify the folder system about changes to a folder. If the
  * update system is not frozen the FOLDER_ITEM_UPDATE_HOOKLIST will
@@ -2791,15 +3310,7 @@ static gint folder_item_update_freeze_cnt = 0;
  */
 void folder_item_update(FolderItem *item, FolderItemUpdateFlags update_flags)
 {
-       if (folder_item_update_freeze_cnt == 0) {
-               FolderItemUpdateData source;
-       
-               source.item = item;
-               source.update_flags = update_flags;
-               hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &source);
-       } else {
-               item->update_flags |= update_flags;
-       }
+       folder_item_update_with_msg(item, update_flags, NULL);
 }
 
 void folder_item_update_recursive(FolderItem *item, FolderItemUpdateFlags update_flags)