0.9.7claws10
[claws.git] / src / folder.c
index 7e5a0966aa304d9da14a1f3122ae1fe167e1e466..0872e7adc1cdf9cbf3227e5ec43de90333ab9949 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
@@ -37,7 +37,6 @@
 #include "imap.h"
 #include "news.h"
 #include "mh.h"
-#include "mbox_folder.h"
 #include "utils.h"
 #include "xml.h"
 #include "codeconv.h"
@@ -49,6 +48,7 @@
 #include "hooks.h"
 #include "log.h"
 #include "folder_item_prefs.h"
+#include "remotefolder.h"
 
 /* Dependecies to be removed ?! */
 #include "prefs_common.h"
@@ -56,7 +56,7 @@
 
 static GList *folder_list = NULL;
 
-static void folder_init                (Folder         *folder,
+void folder_init               (Folder         *folder,
                                 const gchar    *name);
 
 static gboolean folder_read_folder_func        (GNode          *node,
@@ -81,7 +81,6 @@ 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)
@@ -108,13 +107,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);
 
@@ -129,20 +128,6 @@ 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);
@@ -158,21 +143,6 @@ void folder_destroy(Folder *folder)
        g_free(folder);
 }
 
-void folder_local_folder_destroy(LocalFolder *lfolder)
-{
-       g_return_if_fail(lfolder != NULL);
-
-       g_free(lfolder->rootpath);
-}
-
-void folder_remote_folder_destroy(RemoteFolder *rfolder)
-{
-       g_return_if_fail(rfolder != NULL);
-
-       if (rfolder->session)
-               session_destroy(rfolder->session);
-}
-
 FolderItem *folder_item_new(Folder *folder, const gchar *name, const gchar *path)
 {
        FolderItem *item = NULL;
@@ -202,6 +172,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->folder = NULL;
        item->account = NULL;
@@ -216,19 +187,34 @@ FolderItem *folder_item_new(Folder *folder, const gchar *name, const gchar *path
 
 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);
+       item->node = g_node_append_data(parent->node, item);
+}
+
+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 +223,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 +287,163 @@ void folder_item_destroy(FolderItem *item)
        }
 }
 
+static void add_xml_attr(XMLTag *tag, const gchar *name, gchar *value)
+{
+       XMLAttr *attr;
+
+       attr = g_new0(XMLAttr, 1);
+       attr->name = g_strdup(name);
+       attr->value = value;
+
+       tag->attr = g_list_append(tag->attr, attr);
+}
+
+void folder_item_set_attrs(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_attrs(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;
+
+       tag = g_new0(XMLTag, 1);
+       tag->tag = g_strdup("folderitem");
+
+       add_xml_attr(tag, "type", g_strdup(folder_item_stype_str[item->stype]));
+       if (item->name)
+               add_xml_attr(tag, "name", g_strdup(item->name));
+       if (item->path)
+               add_xml_attr(tag, "path", g_strdup(item->path));
+       if (item->no_sub)
+               add_xml_attr(tag, "no_sub", g_strdup("1"));
+       if (item->no_select)
+               add_xml_attr(tag, "no_select", g_strdup("1"));
+       add_xml_attr(tag, "collapsed", g_strdup(item->collapsed && item->node->children ? "1" : "0"));
+       add_xml_attr(tag, "thread_collapsed", g_strdup(item->thread_collapsed ? "1" : "0"));
+       add_xml_attr(tag, "threaded", g_strdup(item->threaded ? "1" : "0"));
+       add_xml_attr(tag, "hidereadmsgs", g_strdup(item->hide_read_msgs ? "1" : "0"));
+       if (item->ret_rcpt)
+               add_xml_attr(tag, "reqretrcpt", g_strdup("1"));
+
+       if (item->sort_key != SORT_BY_NONE) {
+               add_xml_attr(tag, "sort_key", g_strdup(sort_key_str[item->sort_key]));
+               add_xml_attr(tag, "sort_type", g_strdup(item->sort_type == SORT_ASCENDING ? "ascending" : "descending"));
+       }
+
+       add_xml_attr(tag, "mtime", g_strdup_printf("%ld", (unsigned long int) item->mtime));
+       add_xml_attr(tag, "new", g_strdup_printf("%d", item->new_msgs));
+       add_xml_attr(tag, "unread", g_strdup_printf("%d", item->unread_msgs));
+       add_xml_attr(tag, "unreadmarked", g_strdup_printf("%d", item->unreadmarked_msgs));
+       add_xml_attr(tag, "total", g_strdup_printf("%d", item->total_msgs));
+
+       if (item->account)
+               add_xml_attr(tag, "account_id", g_strdup_printf("%d", item->account->account_id));
+       if (item->apply_sub)
+               add_xml_attr(tag, "apply_sub", g_strdup("1"));
+
+       return tag;
+}
+
 void folder_set_ui_func(Folder *folder, FolderUIFunc func, gpointer data)
 {
        g_return_if_fail(folder != NULL);
@@ -299,22 +475,21 @@ 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);
+
+       node = folder->node;
        
        prefs_scoring_clear_folder(folder);
        prefs_filtering_clear_folder(folder);
 
-       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);
-
-       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)
@@ -435,6 +610,7 @@ void folder_scan_tree(Folder *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);
@@ -448,11 +624,18 @@ 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)
+       if (new_item) {
                new_item->cache = msgcache_new();
 
+               hookdata.folder = new_item->folder;
+               hookdata.update_flags = FOLDER_TREE_CHANGED | FOLDER_NEW_FOLDERITEM;
+               hookdata.item = new_item;
+               hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
+       }
+
        return new_item;
 }
 
@@ -644,7 +827,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;
        }
@@ -659,7 +843,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;
        }
 
@@ -791,6 +976,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") :
@@ -1014,7 +1201,7 @@ 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)) {
+       if((item->folder->klass->scan_required != NULL) && (item->folder->klass->scan_required(item->folder, item))) {
                folder_item_scan_full(item, TRUE);
        }
 
@@ -1034,11 +1221,12 @@ gint folder_item_open(FolderItem *item)
        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();
@@ -1058,6 +1246,14 @@ 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_full(FolderItem *item, gboolean filtering)
@@ -1069,7 +1265,7 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
        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;
@@ -1082,13 +1278,12 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
        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);
@@ -1507,6 +1702,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)
@@ -1637,6 +1833,8 @@ static void add_msginfo_to_cache(FolderItem *item, MsgInfo *newmsginfo, MsgInfo
 
 static void remove_msginfo_from_cache(FolderItem *item, MsgInfo *msginfo)
 {
+       MsgInfoUpdate msginfo_update;
+
        if (!item->cache)
                folder_item_read_cache(item);
 
@@ -1648,50 +1846,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);
 }
 
 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_full(dest, FALSE);
-               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 = folder->klass->get_msginfo(folder, 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;
 }
 
 /*
@@ -1713,7 +1975,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;
@@ -1737,7 +1999,7 @@ 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);
+       folder_item_move_msgs(new_item, mlist);
        
        /*copy prefs*/
        folder_item_prefs_copy_prefs(src, new_item);
@@ -1783,7 +2045,6 @@ gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_ite
        FolderItem *tmp = dest->parent;
        gchar * src_identifier, * dst_identifier;
        gchar * phys_srcpath, * phys_dstpath;
-       GNode *src_node;
        
        while (tmp) {
                if (tmp == src) {
@@ -1825,14 +2086,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);
@@ -1843,51 +2096,17 @@ 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)
-{
-       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;
-
-       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;
-}
-*/
-
 /**
- * Copy a list of messages to a new folder.
- *
- * \param dest Destination folder
- * \param msglist List of messages
+ * Copy a list of message to a new folder and remove
+ * source messages if wanted
  */
-gint folder_item_move_msgs_with_dest(FolderItem *dest, GSList *msglist)
+static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_source)
 {
        Folder *folder;
-       GSList *newmsgnums = NULL;
-       GSList *l, *l2;
+       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);
@@ -1896,15 +2115,26 @@ gint folder_item_move_msgs_with_dest(FolderItem *dest, GSList *msglist)
 
        g_return_val_if_fail(folder->klass->copy_msg != 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);
+
        /* 
         * 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;
+       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 */
@@ -1914,203 +2144,139 @@ 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_full(dest, FALSE);
-                                       folderscan = TRUE;
+                       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;
+                                               procmsg_msginfo_free(newmsginfo);
+                                       }
+                               }
+                       } else {
+                               newmsginfo = folder->klass->get_msginfo(folder, dest, num);
+                               if (newmsginfo != NULL) {
+                                       add_msginfo_to_cache(dest, newmsginfo, msginfo);
+                                       procmsg_msginfo_free(newmsginfo);
                                }
-                               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)) {
-                               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);
-                       }
                }
        }
 
-       /*
-        * 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;
-               FolderItem *item = msginfo->folder;
-
-               num = GPOINTER_TO_INT(l2->data);
-               l2 = g_slist_next(l2);
-
-               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 (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);
+               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);
+       list.data = msginfo;
+       list.next = NULL;
 
-       num = folder->copy_msg(folder, dest, msginfo);
-       if (num > 0) dest->last_num = num;
-
-       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_full(dest, FALSE);
-                                       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)
@@ -2256,19 +2422,6 @@ static gboolean folder_build_tree(GNode *node, gpointer data)
        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;
@@ -2279,111 +2432,15 @@ static gboolean folder_build_tree(GNode *node, gpointer data)
                return FALSE;
        }
 
-       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")) {
-                       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 = folder_item_new(folder, "", "");
+       if (folder->klass->item_set_xml != NULL)
+               folder->klass->item_set_xml(folder, item, xmlnode->tag);
+       else
+               folder_item_set_attrs(folder, item, xmlnode->tag);
+       item->node = node;
        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;
@@ -2391,8 +2448,6 @@ 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;
        folder_item_prefs_read_config(item);
 
        node->data = item;
@@ -2404,6 +2459,7 @@ static gboolean folder_build_tree(GNode *node, gpointer data)
 static gboolean folder_read_folder_func(GNode *node, gpointer data)
 {
        Folder *folder;
+       FolderItem *item;
        XMLNode *xmlnode;
        GList *list;
        FolderClass *class = NULL;
@@ -2453,17 +2509,19 @@ static gboolean folder_read_folder_func(GNode *node, gpointer data)
        g_return_val_if_fail(folder != NULL, FALSE);
        folder->account = account;
        if (account != NULL)
-               account->folder = REMOTE_FOLDER(folder);
-       node->data = folder->node->data;
+               account->folder = folder;
+       item = FOLDER_ITEM(folder->node->data);
+       node->data = item;
+       item->node = node;
        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;
+       item->collapsed = collapsed;
+       item->thread_collapsed = thread_collapsed;
+       item->threaded  = threaded;
+       item->account   = account;
+       item->apply_sub = apply_sub;
+       item->ret_rcpt  = ret_rcpt;
 
        g_node_traverse(node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
                        folder_build_tree, folder);
@@ -2494,12 +2552,7 @@ static void folder_write_list_recursive(GNode *node, 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);
 
@@ -2515,7 +2568,9 @@ static void folder_write_list_recursive(GNode *node, gpointer data)
                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 || FOLDER_TYPE(folder) == F_MAILDIR)
+               if (FOLDER_TYPE(folder) == F_MH || 
+                   FOLDER_TYPE(folder) == F_MBOX || 
+                   FOLDER_TYPE(folder) == F_MAILDIR)
                        PUT_ESCAPE_STR(fp, "path",
                                       LOCAL_FOLDER(folder)->rootpath);
                if (item->collapsed && node->children)
@@ -2528,54 +2583,23 @@ static void folder_write_list_recursive(GNode *node, gpointer data)
                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);
+               XMLTag *tag;
+               GList *cur;
 
-               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_attrs(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);
+               fprintf(fp, "<%s", tag->tag);
+               for (cur = tag->attr; cur != NULL; cur = g_list_next(cur)) {
+                       XMLAttr *attr = (XMLAttr *) cur->data;
 
-               if (item->account)
-                       fprintf(fp, " account_id=\"%d\"",
-                               item->account->account_id);
-               if (item->apply_sub)
-                       fputs(" apply_sub=\"1\"", fp);
+                       fprintf(fp, " %s=\"", attr->name);
+                       xml_file_put_escape_str(fp, attr->value);
+                       fputs("\"", fp);
+               }
+               xml_free_tag(tag);
        }
 
        if (node->children) {