2004-09-14 [colin] 0.9.12cvs99.3
[claws.git] / src / folder.c
index ca2d7a157f1e031bae7d881c6df08385624a64e2..8d023be4662047b48b1cf30ca2753a31da994516 100644 (file)
 #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"
 
 static GList *folder_list = NULL;
+static GSList *class_list = NULL;
+static GSList *folder_unloaded_list = NULL;
 
 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);
 
 
@@ -72,8 +73,8 @@ 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);
 gint folder_item_scan_full             (FolderItem *item, gboolean filtering);
-
-static GSList *classlist;
+static void folder_item_update_with_msg (FolderItem *item, FolderItemUpdateFlags update_flags,
+                                         MsgInfo *msg);
 
 void folder_system_init(void)
 {
@@ -84,13 +85,61 @@ void folder_system_init(void)
 
 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)
@@ -120,6 +169,7 @@ 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;
@@ -132,7 +182,7 @@ 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);
 
@@ -145,6 +195,10 @@ void folder_destroy(Folder *folder)
 void folder_set_xml(Folder *folder, XMLTag *tag)
 {
        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;
@@ -154,6 +208,11 @@ void folder_set_xml(Folder *folder, XMLTag *tag)
                        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;
 
@@ -164,6 +223,11 @@ void folder_set_xml(Folder *folder, XMLTag *tag)
                                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);
                }
        }
 }
@@ -172,13 +236,18 @@ XMLTag *folder_get_xml(Folder *folder)
 {
        XMLTag *tag;
 
-       tag = g_new0(XMLTag, 1);
-       tag->tag = g_strdup("folder");
+       tag = xml_tag_new("folder");
 
        if (folder->name)
-               xml_tag_add_attr(tag, "name", g_strdup(folder->name));
+               xml_tag_add_attr(tag, xml_attr_new("name", folder->name));
        if (folder->account)
-               xml_tag_add_attr(tag, "account_id", g_strdup_printf("%d", folder->account->account_id));
+               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;
 }
@@ -212,8 +281,7 @@ FolderItem *folder_item_new(Folder *folder, const gchar *name, const gchar *path
        item->threaded  = TRUE;
        item->ret_rcpt  = FALSE;
        item->opened    = FALSE;
-       item->node = NULL;
-       item->parent = NULL;
+       item->node = g_node_new(item);
        item->folder = NULL;
        item->account = NULL;
        item->apply_sub = FALSE;
@@ -232,9 +300,8 @@ void folder_item_append(FolderItem *parent, FolderItem *item)
        g_return_if_fail(parent->node != NULL);
        g_return_if_fail(item != NULL);
 
-       item->parent = parent;
        item->folder = parent->folder;
-       item->node = g_node_append_data(parent->node, item);
+       g_node_append(parent->node, item->node);
 }
 
 static gboolean folder_item_remove_func(GNode *node, gpointer data)
@@ -327,6 +394,16 @@ 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;
@@ -434,41 +511,43 @@ XMLTag *folder_item_get_xml(Folder *folder, FolderItem *item)
                                        "mark", "unread", "mime", "to", 
                                        "locked"};
        XMLTag *tag;
+       gchar *value;
 
-       tag = g_new0(XMLTag, 1);
-       tag->tag = g_strdup("folderitem");
+       tag = xml_tag_new("folderitem");
 
-       xml_tag_add_attr(tag, "type", g_strdup(folder_item_stype_str[item->stype]));
+       xml_tag_add_attr(tag, xml_attr_new("type", folder_item_stype_str[item->stype]));
        if (item->name)
-               xml_tag_add_attr(tag, "name", g_strdup(item->name));
+               xml_tag_add_attr(tag, xml_attr_new("name", item->name));
        if (item->path)
-               xml_tag_add_attr(tag, "path", g_strdup(item->path));
+               xml_tag_add_attr(tag, xml_attr_new("path", item->path));
        if (item->no_sub)
-               xml_tag_add_attr(tag, "no_sub", g_strdup("1"));
+               xml_tag_add_attr(tag, xml_attr_new("no_sub", "1"));
        if (item->no_select)
-               xml_tag_add_attr(tag, "no_select", g_strdup("1"));
-       xml_tag_add_attr(tag, "collapsed", g_strdup(item->collapsed && item->node->children ? "1" : "0"));
-       xml_tag_add_attr(tag, "thread_collapsed", g_strdup(item->thread_collapsed ? "1" : "0"));
-       xml_tag_add_attr(tag, "threaded", g_strdup(item->threaded ? "1" : "0"));
-       xml_tag_add_attr(tag, "hidereadmsgs", g_strdup(item->hide_read_msgs ? "1" : "0"));
+               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, "reqretrcpt", g_strdup("1"));
+               xml_tag_add_attr(tag, xml_attr_new("reqretrcpt", "1"));
 
        if (item->sort_key != SORT_BY_NONE) {
-               xml_tag_add_attr(tag, "sort_key", g_strdup(sort_key_str[item->sort_key]));
-               xml_tag_add_attr(tag, "sort_type", g_strdup(item->sort_type == SORT_ASCENDING ? "ascending" : "descending"));
+               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"));
        }
 
-       xml_tag_add_attr(tag, "mtime", g_strdup_printf("%ld", (unsigned long int) item->mtime));
-       xml_tag_add_attr(tag, "new", g_strdup_printf("%d", item->new_msgs));
-       xml_tag_add_attr(tag, "unread", g_strdup_printf("%d", item->unread_msgs));
-       xml_tag_add_attr(tag, "unreadmarked", g_strdup_printf("%d", item->unreadmarked_msgs));
-       xml_tag_add_attr(tag, "total", g_strdup_printf("%d", item->total_msgs));
+       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, "account_id", g_strdup_printf("%d", item->account->account_id));
+               xml_tag_add_attr(tag, xml_attr_new_int("account_id", item->account->account_id));
        if (item->apply_sub)
-               xml_tag_add_attr(tag, "apply_sub", g_strdup("1"));
+               xml_tag_add_attr(tag, xml_attr_new("apply_sub", "1"));
 
        return tag;
 }
@@ -495,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;
 
@@ -525,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)
@@ -557,7 +654,7 @@ GList *folder_get_list(void)
 
 gint folder_read_list(void)
 {
-       GNode *node;
+       GNode *node, *cur;
        XMLNode *xmlnode;
        gchar *path;
 
@@ -573,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)
@@ -586,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)
@@ -652,14 +778,15 @@ void folder_scan_tree(Folder *folder)
 FolderItem *folder_create_folder(FolderItem *parent, const gchar *name)
 {
        FolderItem *new_item;
-       FolderUpdateData hookdata;
 
        new_item = parent->folder->klass->create_folder(parent->folder, parent, name);
        if (new_item) {
+               FolderUpdateData hookdata;
+
                new_item->cache = msgcache_new();
 
                hookdata.folder = new_item->folder;
-               hookdata.update_flags = FOLDER_TREE_CHANGED | FOLDER_NEW_FOLDERITEM;
+               hookdata.update_flags = FOLDER_TREE_CHANGED | FOLDER_ADD_FOLDERITEM;
                hookdata.item = new_item;
                hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
        }
@@ -667,6 +794,27 @@ FolderItem *folder_create_folder(FolderItem *parent, const gchar *name)
        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;
@@ -908,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;
@@ -934,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);
@@ -1036,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() &&
@@ -1062,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)          \
@@ -1201,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);
@@ -1229,22 +1430,23 @@ static gint folder_sort_folder_list(gconstpointer a, gconstpointer b)
 
 gint folder_item_open(FolderItem *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;
 }
@@ -1284,6 +1486,46 @@ gint folder_item_close(FolderItem *item)
        return folder->klass->close(folder, 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;
@@ -1458,23 +1700,7 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
        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);
        }
 
@@ -1541,6 +1767,60 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
        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);
@@ -1656,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_full(item, TRUE);
        }
-       msgcache_read_mark(item->cache, mark_file);
-       g_free(cache_file);
-       g_free(mark_file);
 
        folder_clean_cache_memory();
 }
@@ -1704,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);
        
@@ -1715,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;
        }
@@ -1754,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);
 
@@ -1764,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)
@@ -1855,7 +2261,7 @@ static void add_msginfo_to_cache(FolderItem *item, MsgInfo *newmsginfo, MsgInfo
        folder_item_update_freeze();
        msgcache_add_msg(item->cache, newmsginfo);
        copy_msginfo_flags(flagsource, newmsginfo);
-       folder_item_update(item,  F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
+       folder_item_update_with_msg(item,  F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT | F_ITEM_UPDATE_ADDMSG, newmsginfo);
        folder_item_update_thaw();
 }
 
@@ -1879,7 +2285,7 @@ static void remove_msginfo_from_cache(FolderItem *item, MsgInfo *msginfo)
        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,
@@ -1969,7 +2375,7 @@ gint folder_item_add_msgs(FolderItem *dest, GSList *file_list,
                                continue;
 
                        if (!folderscan && 
-                           ((newmsginfo = folder->klass->get_msginfo(folder, dest, num)) != NULL)) {
+                           ((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) {
@@ -2015,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;
@@ -2027,7 +2433,8 @@ 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(new_item, mlist);
+       if (mlist != NULL)
+               folder_item_move_msgs(new_item, mlist);
        
        /*copy prefs*/
        folder_item_prefs_copy_prefs(src, new_item);
@@ -2056,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)
@@ -2070,7 +2479,7 @@ 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;
        
@@ -2078,15 +2487,15 @@ gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_ite
                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);
        }
@@ -2102,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);
@@ -2147,6 +2556,17 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
        g_relation_index(relation, 0, g_direct_hash, g_direct_equal);
        g_relation_index(relation, 1, g_direct_hash, g_direct_equal);
 
+       for (l = msglist ; l != NULL ; l = g_slist_next(l)) {
+               MsgInfo * msginfo = (MsgInfo *) l->data;
+
+               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
@@ -2186,7 +2606,7 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                 g_tuples_destroy(tuples);
 
                if (num >= 0) {
-                       MsgInfo *newmsginfo;
+                       MsgInfo *newmsginfo = NULL;
 
                        if (folderscan) {
                                if (msginfo->msgid != NULL) {
@@ -2194,17 +2614,26 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                                        if (newmsginfo != NULL) {
                                                copy_msginfo_flags(msginfo, newmsginfo);
                                                num = newmsginfo->msgnum;
-                                               procmsg_msginfo_free(newmsginfo);
                                        }
                                }
                        } else {
-                               newmsginfo = folder->klass->get_msginfo(folder, dest, num);
+                               newmsginfo = get_msginfo(dest, num);
                                if (newmsginfo != NULL) {
                                        add_msginfo_to_cache(dest, newmsginfo, msginfo);
-                                       procmsg_msginfo_free(newmsginfo);
                                }
                        }
 
+                       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 > lastnum)
                                lastnum = num;
                }
@@ -2234,9 +2663,6 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                }
        }
 
-       if (folder->klass->finished_copy)
-               folder->klass->finished_copy(folder, dest);
-
        g_relation_destroy(relation);
        return lastnum;
 }
@@ -2326,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;
 }
@@ -2342,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;
 
@@ -2350,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;
 }
@@ -2368,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();
 
@@ -2445,19 +2869,18 @@ 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;
 
-       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;
        }
 
        item = folder_item_new(folder, "", "");
@@ -2465,9 +2888,9 @@ static gboolean folder_build_tree(GNode *node, gpointer data)
                folder->klass->item_set_xml(folder, item, xmlnode->tag);
        else
                folder_item_set_xml(folder, item, xmlnode->tag);
-       item->node = node;
-       item->parent = FOLDER_ITEM(node->parent->data);
+
        item->folder = folder;
+
        switch (item->stype) {
        case F_INBOX:  folder->inbox  = item; break;
        case F_OUTBOX: folder->outbox = item; break;
@@ -2478,29 +2901,32 @@ static gboolean folder_build_tree(GNode *node, gpointer data)
        }
        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;
-       FolderItem *item;
        XMLNode *xmlnode;
        GList *list;
        FolderClass *klass = NULL;
+       GNode *cur;
 
-       if (g_node_depth(node) != 2) return FALSE;
-       g_return_val_if_fail(node->data != NULL, FALSE);
+       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;
@@ -2509,31 +2935,28 @@ static gboolean folder_read_folder_func(GNode *node, gpointer data)
                if (!strcmp(attr->name, "type"))
                        klass = folder_get_class_from_string(attr->value);
        }
+       if (klass == NULL)
+               return NULL;
 
        folder = folder_new(klass, "", "");
-       g_return_val_if_fail(folder != NULL, FALSE);
+       g_return_val_if_fail(folder != NULL, NULL);
 
-       item = FOLDER_ITEM(folder->node->data);
-       
-       node->data = item;
-       item->node = node;
-       g_node_destroy(folder->node);
-       folder->node = node;
        if (klass->set_xml)
                klass->set_xml(folder, xmlnode->tag);
        else
                folder_set_xml(folder, xmlnode->tag);
 
-       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);
+       cur = node->children;
+       while (cur != NULL) {
+               GNode *itemnode;
 
-       folder_add(folder);
-       g_node_traverse(node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
-                       folder_build_tree, folder);
-
-       return FALSE;
+               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)
@@ -2554,91 +2977,53 @@ static gchar *folder_get_list_path(void)
        fputs("\"", fp);                                \
 }
 
-gint xml_attr_cmp_name(gconstpointer _a, gconstpointer _b)
+static gpointer folder_item_to_xml(gpointer nodedata, gpointer data)
 {
-       XMLAttr *a = (XMLAttr *) _a;
-       XMLAttr *b = (XMLAttr *) _b;
+       FolderItem *item = (FolderItem *) nodedata;
+       XMLTag *tag;
+
+       g_return_val_if_fail(item != NULL, NULL);
 
-       return g_str_equal(a->name, b->name) ? 0 : 1;
+       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);
+
+       return xml_node_new(tag, NULL);;
 }
 
-static void folder_write_list_recursive(GNode *node, gpointer data)
+static GNode *folder_get_xml_node(Folder *folder)
 {
-       FILE *fp = (FILE *)data;
-       FolderItem *item;
-       gint i, depth;
+       GNode *node;
+       XMLNode *xmlnode;
        XMLTag *tag;
-       GList *cur;
 
-       g_return_if_fail(node != NULL);
-       g_return_if_fail(fp != NULL);
+       g_return_val_if_fail(folder != NULL, NULL);
 
-       item = FOLDER_ITEM(node->data);
-       g_return_if_fail(item != NULL);
+       if (folder->klass->get_xml != NULL)
+               tag = folder->klass->get_xml(folder);
+       else
+               tag = folder_get_xml(folder);
 
-       depth = g_node_depth(node);
-       for (i = 0; i < depth; i++)
-               fputs("    ", fp);
-       if (depth == 1) {
-               XMLTag *folderitem_tag;
-               GList *cur;
+       xml_tag_add_attr(tag, xml_attr_new("type", folder->klass->idstr));
 
-               if (item->folder->klass->get_xml != NULL)
-                       tag = item->folder->klass->get_xml(item->folder);
-               else
-                       tag = folder_get_xml(item->folder);
+       xmlnode = xml_node_new(tag, NULL);
 
-               if (item->folder->klass->item_get_xml != NULL)
-                       folderitem_tag = item->folder->klass->item_get_xml(item->folder, item);
-               else
-                       folderitem_tag = folder_item_get_xml(item->folder, item);
-               xml_tag_add_attr(tag, "type", g_strdup(item->folder->klass->idstr));
+       node = g_node_new(xmlnode);
+       if (folder->node->children) {
+               GNode *cur;
 
-               for (cur = folderitem_tag->attr; cur != NULL; cur = g_list_next(cur)) {
-                       XMLAttr *attr = (XMLAttr *) cur->data;
+               cur = folder->node->children;
+               while (cur) {
+                       GNode *xmlnode;
 
-                       if (g_list_find_custom(tag->attr, attr, xml_attr_cmp_name) == NULL)
-                               tag->attr = g_list_append(tag->attr, xml_copy_attr(attr));
+                       xmlnode = g_node_map(cur, folder_item_to_xml, (gpointer) folder);
+                       g_node_append(node, xmlnode);
+                       cur = cur->next;
                }
-               xml_free_tag(folderitem_tag);
-
-       } else {
-
-               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, "<%s", tag->tag);
-       for (cur = tag->attr; cur != NULL; cur = g_list_next(cur)) {
-               XMLAttr *attr = (XMLAttr *) cur->data;
-
-               fprintf(fp, " %s=\"", attr->name);
-               xml_file_put_escape_str(fp, attr->value);
-               fputs("\"", fp);
        }
 
-       if (node->children) {
-               GNode *child;
-               fputs(">\n", fp);
-
-               child = node->children;
-               while (child) {
-                       GNode *cur;
-
-                       cur = child;
-                       child = cur->next;
-                       folder_write_list_recursive(cur, data);
-               }
-
-               for (i = 0; i < depth; i++)
-                       fputs("    ", fp);
-               fprintf(fp, "</%s>\n", tag->tag);
-       } else
-               fputs(" />\n", fp);
-       xml_free_tag(tag);
+       return node;
 }
 
 static void folder_update_op_count_rec(GNode *node)
@@ -2803,7 +3188,7 @@ void folder_item_restore_persist_prefs(FolderItem *item, GHashTable *pptable)
         * folderlist.xml, we need to call the old stuff first before
         * setting things that apply both to Main and Claws. */
        folder_item_prefs_read_config(item); 
-        
+
        item->collapsed = pp->collapsed;
        item->thread_collapsed = pp->thread_collapsed;
        item->threaded  = pp->threaded;
@@ -2866,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();
 
@@ -2902,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
@@ -2913,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)