0.9.3claws64
[claws.git] / src / folder.c
index e245f7265040dc9fbcc929ac02d8d0da278468a1..8b5eb74c3d6258cba243ade3fd2f21cb7c25f2eb 100644 (file)
 #include "account.h"
 #include "filtering.h"
 #include "scoring.h"
-#include "prefs_folder_item.h"
 #include "procheader.h"
 #include "hooks.h"
 #include "log.h"
+#include "folder_item_prefs.h"
 
 /* Dependecies to be removed ?! */
 #include "prefs_common.h"
 #include "prefs_account.h"
-#include "prefs_folder_item.h"
 
 static GList *folder_list = NULL;
 
@@ -73,10 +72,11 @@ static void folder_get_persist_prefs_recursive
 static gboolean persist_prefs_free     (gpointer key, gpointer val, gpointer data);
 void folder_item_read_cache            (FolderItem *item);
 void folder_item_free_cache            (FolderItem *item);
+gint folder_item_scan_full             (FolderItem *item, gboolean filtering);
 
 static GSList *classlist;
 
-void folder_system_init()
+void folder_system_init(void)
 {
        folder_register_class(mh_get_class());
        folder_register_class(imap_get_class());
@@ -84,39 +84,26 @@ void folder_system_init()
        folder_register_class(mbox_get_class());
 }
 
-GSList *folder_get_class_list()
+GSList *folder_get_class_list(void)
 {
        return classlist;
 }
 
-void folder_register_class(FolderClass *class)
+void folder_register_class(FolderClass *klass)
 {
-       debug_print("registering folder class %s\n", class->idstr);
-       classlist = g_slist_append(classlist, class);
+       debug_print("registering folder class %s\n", klass->idstr);
+       classlist = g_slist_append(classlist, klass);
 }
 
-Folder *folder_new(FolderType type, const gchar *name, const gchar *path)
+Folder *folder_new(FolderClass *klass, const gchar *name, const gchar *path)
 {
        Folder *folder = NULL;
        FolderItem *item;
 
+       g_return_val_if_fail(klass != NULL, NULL);
+
        name = name ? name : path;
-       switch (type) {
-       case F_MBOX:
-               folder = mbox_folder_new(name, path);
-               break;
-       case F_MH:
-               folder = mh_folder_new(name, path);
-               break;
-       case F_IMAP:
-               folder = imap_folder_new(name, path);
-               break;
-       case F_NEWS:
-               folder = news_folder_new(name, path);
-               break;
-       default:
-               return NULL;
-       }
+       folder = klass->new_folder(name, path);
 
        /* Create root folder item */
        item = folder_item_new(folder, name, NULL);
@@ -159,15 +146,16 @@ void folder_remote_folder_init(Folder *folder, const gchar *name,
 void folder_destroy(Folder *folder)
 {
        g_return_if_fail(folder != NULL);
-       g_return_if_fail(folder->class->destroy != NULL);
+       g_return_if_fail(folder->klass->destroy_folder != NULL);
 
        folder_list = g_list_remove(folder_list, folder);
 
        folder_tree_destroy(folder);
+
+       folder->klass->destroy_folder(folder);
+
        g_free(folder->name);
        g_free(folder);
-
-       folder->class->destroy(folder);
 }
 
 void folder_local_folder_destroy(LocalFolder *lfolder)
@@ -185,26 +173,12 @@ void folder_remote_folder_destroy(RemoteFolder *rfolder)
                session_destroy(rfolder->session);
 }
 
-#if 0
-Folder *mbox_folder_new(const gchar *name, const gchar *path)
-{
-       /* not yet implemented */
-       return NULL;
-}
-
-Folder *maildir_folder_new(const gchar *name, const gchar *path)
-{
-       /* not yet implemented */
-       return NULL;
-}
-#endif
-
 FolderItem *folder_item_new(Folder *folder, const gchar *name, const gchar *path)
 {
        FolderItem *item = NULL;
 
-       if (folder->class->item_new) {
-               item = folder->class->item_new(folder);
+       if (folder->klass->item_new) {
+               item = folder->klass->item_new(folder);
        } else {
                item = g_new0(FolderItem, 1);
        }
@@ -215,10 +189,10 @@ FolderItem *folder_item_new(Folder *folder, const gchar *name, const gchar *path
        item->name = g_strdup(name);
        item->path = g_strdup(path);
        item->mtime = 0;
-       item->new = 0;
-       item->unread = 0;
-       item->unreadmarked = 0;
-       item->total = 0;
+       item->new_msgs = 0;
+       item->unread_msgs = 0;
+       item->unreadmarked_msgs = 0;
+       item->total_msgs = 0;
        item->last_num = -1;
        item->cache = NULL;
        item->no_sub = FALSE;
@@ -235,7 +209,7 @@ FolderItem *folder_item_new(Folder *folder, const gchar *name, const gchar *path
        item->mark_queue = NULL;
        item->data = NULL;
 
-       item->prefs = prefs_folder_item_new();
+       item->prefs = folder_item_prefs_new();
 
        return item;
 }
@@ -286,8 +260,8 @@ void folder_item_destroy(FolderItem *item)
        g_free(item->path);
 
        if (item->folder != NULL) {
-               if(item->folder->class->item_destroy) {
-                       item->folder->class->item_destroy(item->folder, item);
+               if(item->folder->klass->item_destroy) {
+                       item->folder->klass->item_destroy(item->folder, item);
                } else {
                        g_free(item);
                }
@@ -328,8 +302,8 @@ void folder_tree_destroy(Folder *folder)
        g_return_if_fail(folder != NULL);
        g_return_if_fail(folder->node != NULL);
        
-       prefs_scoring_clear();
-       prefs_filtering_clear();
+       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)
@@ -437,6 +411,7 @@ gboolean folder_scan_tree_func(GNode *node, gpointer data)
        FolderItem *item = (FolderItem *)node->data;
        
        folder_item_restore_persist_prefs(item, pptable);
+       folder_item_scan_full(item, FALSE);
 
        return FALSE;
 }
@@ -444,14 +419,23 @@ gboolean folder_scan_tree_func(GNode *node, gpointer data)
 void folder_scan_tree(Folder *folder)
 {
        GHashTable *pptable;
+       FolderUpdateData hookdata;
        
-       if (!folder->class->scan_tree)
+       if (!folder->klass->scan_tree)
                return;
        
        pptable = folder_persist_prefs_new(folder);
+
+       /*
+        * should be changed and tree update should be done without 
+        * destroying the tree first
+        */
        folder_tree_destroy(folder);
+       folder->klass->scan_tree(folder);
 
-       folder->class->scan_tree(folder);
+       hookdata.folder = folder;
+       hookdata.update_flags = FOLDER_TREE_CHANGED;
+       hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
 
        g_node_traverse(folder->node, G_POST_ORDER, G_TRAVERSE_ALL, -1, folder_scan_tree_func, pptable);
        folder_persist_prefs_free(pptable);
@@ -465,7 +449,7 @@ FolderItem *folder_create_folder(FolderItem *parent, const gchar *name)
 {
        FolderItem *new_item;
 
-       new_item = parent->folder->class->create_folder(parent->folder, parent, name);
+       new_item = parent->folder->klass->create_folder(parent->folder, parent, name);
        if (new_item)
                new_item->cache = msgcache_new();
 
@@ -474,10 +458,10 @@ FolderItem *folder_create_folder(FolderItem *parent, const gchar *name)
 
 struct TotalMsgCount
 {
-       guint new;
-       guint unread;
-       guint unreadmarked;
-       guint total;
+       guint new_msgs;
+       guint unread_msgs;
+       guint unreadmarked_msgs;
+       guint total_msgs;
 };
 
 struct FuncToAllFoldersData
@@ -524,26 +508,133 @@ static void folder_count_total_msgs_func(FolderItem *item, gpointer data)
 {
        struct TotalMsgCount *count = (struct TotalMsgCount *)data;
 
-       count->new += item->new;
-       count->unread += item->unread;
-       count->unreadmarked += item->unreadmarked;
-       count->total += item->total;
+       count->new_msgs += item->new_msgs;
+       count->unread_msgs += item->unread_msgs;
+       count->unreadmarked_msgs += item->unreadmarked_msgs;
+       count->total_msgs += item->total_msgs;
+}
+
+struct TotalMsgStatus
+{
+        guint new;
+        guint unread;
+       guint total;
+       GString *str;
+};
+
+static gboolean folder_get_status_full_all_func(GNode *node, gpointer data)
+{
+       FolderItem *item;
+       struct TotalMsgStatus *status = (struct TotalMsgStatus *)data;
+       gchar *id;
+       g_return_val_if_fail(node->data != NULL, FALSE);
+       item = FOLDER_ITEM(node->data);
+
+       if (!item->path) return FALSE;
+
+       status->new += item->new_msgs;
+       status->unread += item->unread_msgs;
+       status->total += item->total_msgs;
+
+       if (status->str) {
+               id = folder_item_get_identifier(item);
+               g_string_sprintfa(status->str, "%5d %5d %5d %s\n",
+                                 item->new_msgs, item->unread_msgs,
+                                 item->total_msgs, id);
+               g_free(id);
+       }
+       return FALSE;
+ }
+static void folder_get_status_full_all(GString *str, guint *new, guint *unread,
+                                      guint *total)
+{
+       GList *list;
+       Folder *folder;
+       struct TotalMsgStatus status;
+       status.new = status.unread = status.total = 0;
+       status.str = str;
+       debug_print("Counting total number of messages...\n");
+       for (list = folder_list; list != NULL; list = list->next) {
+               folder = FOLDER(list->data);
+               if (folder->node)
+                       g_node_traverse(folder->node, G_PRE_ORDER,
+                                       G_TRAVERSE_ALL, -1,
+                                       folder_get_status_full_all_func,
+                                       &status);
+       }
+       *new = status.new;
+       *unread = status.unread;
+       *total = status.total;
+}
+
+gchar *folder_get_status(GPtrArray *folders, gboolean full)
+{
+       guint new, unread, total;
+       GString *str;
+       gint i;
+       gchar *ret;
+
+       new = unread = total = 0;
+
+       str = g_string_new(NULL);
+
+       if (folders) {
+               for (i = 0; i < folders->len; i++) {
+                       FolderItem *item;
+
+                       item = g_ptr_array_index(folders, i);
+                       new += item->new_msgs;
+                       unread += item->unread_msgs;
+                       total += item->total_msgs;
+
+                       if (full) {
+                               gchar *id;
+
+                               id = folder_item_get_identifier(item);
+                               g_string_sprintfa(str, "%5d %5d %5d %s\n",
+                                                 item->new_msgs, item->unread_msgs,
+                                                 item->total_msgs, id);
+                               g_free(id);
+                       }
+               }
+       } else {
+               folder_get_status_full_all(full ? str : NULL,
+                                          &new, &unread, &total);
+       }
+
+       if (full)
+               g_string_sprintfa(str, "%5d %5d %5d\n", new, unread, total);
+       else
+               g_string_sprintfa(str, "%d %d %d\n", new, unread, total);
+
+       ret = str->str;
+       g_string_free(str, FALSE);
+       return ret;
 }
 
-void folder_count_total_msgs(guint *new, guint *unread, guint *unreadmarked, guint *total)
+void folder_count_total_msgs(guint *new_msgs, guint *unread_msgs, guint *unreadmarked_msgs, guint *total_msgs)
 {
        struct TotalMsgCount count;
 
-       count.new = count.unread = count.unreadmarked = count.total = 0;
+       count.new_msgs = count.unread_msgs = count.unreadmarked_msgs = count.total_msgs = 0;
 
        debug_print("Counting total number of messages...\n");
 
        folder_func_to_all_folders(folder_count_total_msgs_func, &count);
 
-       *new = count.new;
-       *unread = count.unread;
-       *unreadmarked = count.unreadmarked;
-       *total = count.total;
+       *new_msgs = count.new_msgs;
+       *unread_msgs = count.unread_msgs;
+       *unreadmarked_msgs = count.unreadmarked_msgs;
+       *total_msgs = count.total_msgs;
 }
 
 Folder *folder_find_from_path(const gchar *path)
@@ -561,14 +652,14 @@ Folder *folder_find_from_path(const gchar *path)
        return NULL;
 }
 
-Folder *folder_find_from_name(const gchar *name, FolderClass *class)
+Folder *folder_find_from_name(const gchar *name, FolderClass *klass)
 {
        GList *list;
        Folder *folder;
 
        for (list = folder_list; list != NULL; list = list->next) {
                folder = list->data;
-               if (folder->class == class && strcmp2(name, folder->name) == 0)
+               if (folder->klass == klass && strcmp2(name, folder->name) == 0)
                        return folder;
        }
 
@@ -604,14 +695,14 @@ FolderItem *folder_find_item_from_path(const gchar *path)
        return d[1];
 }
 
-static FolderClass *folder_get_class_from_string(const gchar *str)
+FolderClass *folder_get_class_from_string(const gchar *str)
 {
        GSList *classlist;
 
        classlist = folder_get_class_list();
        for (; classlist != NULL; classlist = g_slist_next(classlist)) {
                FolderClass *class = (FolderClass *) classlist->data;
-               if (g_strcasecmp(class->idstr, &str[1]) == 0)
+               if (g_strcasecmp(class->idstr, str) == 0)
                        return class;
        }
 
@@ -624,7 +715,7 @@ gchar *folder_get_identifier(Folder *folder)
 
        g_return_val_if_fail(folder != NULL, NULL);
 
-       type_str = folder->class->idstr;
+       type_str = folder->klass->idstr;
        return g_strconcat("#", type_str, "/", folder->name, NULL);
 }
 
@@ -665,7 +756,7 @@ FolderItem *folder_find_item_from_identifier(const gchar *identifier)
                return folder_find_item_from_path(identifier);
        *p = '\0';
        p++;
-       class = folder_get_class_from_string(str);
+       class = folder_get_class_from_string(&str[1]);
        if (class == NULL)
                return folder_find_item_from_path(identifier);
 
@@ -689,6 +780,66 @@ FolderItem *folder_find_item_from_identifier(const gchar *identifier)
        return d[1];
 }
 
+/**
+ * Get a displayable name for a FolderItem
+ *
+ * \param item FolderItem for that a name should be created
+ * \return Displayable name for item, returned string has to
+ *         be freed
+ */
+gchar *folder_item_get_name(FolderItem *item)
+{
+       gchar *name = NULL;
+
+       switch (item->stype) {
+       case F_INBOX:
+               name = g_strdup(!strcmp2(item->name, INBOX_DIR) ? _("Inbox") :
+                               item->name);
+               break;
+       case F_OUTBOX:
+               name = g_strdup(!strcmp2(item->name, OUTBOX_DIR) ? _("Sent") :
+                               item->name);
+               break;
+       case F_QUEUE:
+               name = g_strdup(!strcmp2(item->name, QUEUE_DIR) ? _("Queue") :
+                               item->name);
+               break;
+       case F_TRASH:
+               name = g_strdup(!strcmp2(item->name, TRASH_DIR) ? _("Trash") :
+                               item->name);
+               break;
+       case F_DRAFT:
+               name = g_strdup(!strcmp2(item->name, DRAFT_DIR) ? _("Drafts") :
+                               item->name);
+               break;
+       default:
+               break;
+       }
+
+       if (name == NULL) {
+               /*
+                * should probably be done by a virtual function,
+                * the folder knows the ui string and how to abbrev
+               */
+               if (!item->parent) {
+                       name = g_strconcat(item->name, " (", item->folder->klass->uistr, ")", NULL);
+               } else {
+                       if (FOLDER_CLASS(item->folder) == news_get_class() &&
+                           item->path && !strcmp2(item->name, item->path))
+                               name = get_abbrev_newsgroup_name
+                                       (item->path,
+                                        prefs_common.ng_abbrev_len);
+                       else
+                               name = g_strdup(item->name);
+               }
+       }
+
+       if (name == NULL)
+               name = g_strdup("");
+
+       return name;
+}
+
 Folder *folder_get_default_folder(void)
 {
        return folder_list ? FOLDER(folder_list->data) : NULL;
@@ -771,7 +922,7 @@ void folder_set_missing_folders(void)
                    folder->queue && folder->trash)
                        continue;
 
-               if (folder->class->create_tree(folder) < 0) {
+               if (folder->klass->create_tree(folder) < 0) {
                        g_warning("%s: can't create the folder tree.\n",
                                  LOCAL_FOLDER(folder)->rootpath);
                        continue;
@@ -814,83 +965,15 @@ void folder_unref_account_all(PrefsAccount *account)
 
 #undef CREATE_FOLDER_IF_NOT_EXIST
 
-gchar *folder_get_path(Folder *folder)
-{
-       gchar *path;
-
-       g_return_val_if_fail(folder != NULL, NULL);
-
-       switch(FOLDER_TYPE(folder)) {
-
-               case F_MH:
-                       path = g_strdup(LOCAL_FOLDER(folder)->rootpath);
-                       break;
-
-               case F_IMAP:
-                       g_return_val_if_fail(folder->account != NULL, NULL);
-                       path = g_strconcat(get_imap_cache_dir(),
-                                          G_DIR_SEPARATOR_S,
-                                          folder->account->recv_server,
-                                          G_DIR_SEPARATOR_S,
-                                          folder->account->userid,
-                                          NULL);
-                       break;
-
-               case F_NEWS:
-                       g_return_val_if_fail(folder->account != NULL, NULL);
-                       path = g_strconcat(get_news_cache_dir(),
-                                          G_DIR_SEPARATOR_S,
-                                          folder->account->nntp_server,
-                                          NULL);
-                       break;
-
-               default:
-                       path = NULL;
-                       break;
-       }
-       
-       return path;
-}
-
 gchar *folder_item_get_path(FolderItem *item)
 {
-       gchar *folder_path;
-       gchar *path;
+       Folder *folder;
 
        g_return_val_if_fail(item != NULL, NULL);
+       folder = item->folder;
+       g_return_val_if_fail(folder != NULL, NULL);
 
-       if(FOLDER_TYPE(item->folder) != F_MBOX) {
-               folder_path = folder_get_path(item->folder);
-               g_return_val_if_fail(folder_path != NULL, NULL);
-
-               if (folder_path[0] == G_DIR_SEPARATOR) {
-                       if (item->path)
-                               path = g_strconcat(folder_path, G_DIR_SEPARATOR_S,
-                                                  item->path, NULL);
-                       else
-                               path = g_strdup(folder_path);
-               } else {
-                       if (item->path)
-                               path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
-                                                  folder_path, G_DIR_SEPARATOR_S,
-                                                  item->path, NULL);
-                       else
-                               path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
-                                                  folder_path, NULL);
-               }
-
-               g_free(folder_path);
-       } else {
-               gchar *itempath;
-
-               itempath = mbox_get_virtual_path(item);
-               if (itempath == NULL)
-                       return NULL;
-               path = g_strconcat(get_mbox_cache_dir(),
-                                         G_DIR_SEPARATOR_S, itempath, NULL);
-               g_free(itempath);
-       }
-       return path;
+       return folder->klass->item_get_path(folder, item);
 }
 
 void folder_item_set_default_flags(FolderItem *dest, MsgFlags *flags)
@@ -932,7 +1015,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)) {
-               folder_item_scan(item);
+               folder_item_scan_full(item, TRUE);
        }
 
        /* Processing */
@@ -951,13 +1034,15 @@ 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) {
+       if (item->new_msgs) {
+               folder_item_update_freeze();
                mlist = folder_item_get_msg_list(item);
                for (cur = mlist ; cur != NULL ; cur = cur->next) {
                        MsgInfo * msginfo;
@@ -968,14 +1053,23 @@ void folder_item_close(FolderItem *item)
                        procmsg_msginfo_free(msginfo);
                }
                g_slist_free(mlist);
+               folder_item_update_thaw();
        }               
 
        folder_item_write_cache(item);
        
        folder_item_update(item, F_ITEM_UPDATE_MSGCNT);
+
+       item->opened = FALSE;
+       folder = item->folder;
+
+       if (folder->klass->close == NULL)
+               return 0;
+
+       return folder->klass->close(folder, item);
 }
 
-gint folder_item_scan(FolderItem *item)
+gint folder_item_scan_full(FolderItem *item, gboolean filtering)
 {
        Folder *folder;
        GSList *folder_list = NULL, *cache_list = NULL;
@@ -992,18 +1086,18 @@ gint folder_item_scan(FolderItem *item)
        folder = item->folder;
 
        g_return_val_if_fail(folder != NULL, -1);
-       g_return_val_if_fail(folder->class->get_num_list != NULL, -1);
+       g_return_val_if_fail(folder->klass->get_num_list != NULL, -1);
 
        debug_print("Scanning folder %s for cache changes.\n", item->path);
 
        /* Get list of messages for folder and cache */
-       if (folder->class->get_num_list(item->folder, item, &folder_list) < 0) {
+       if (folder->klass->get_num_list(item->folder, item, &folder_list) < 0) {
                debug_print("Error fetching list of message numbers\n");
                return(-1);
        }
 
-       if (!folder->class->check_msgnum_validity || 
-           folder->class->check_msgnum_validity(folder, item)) {
+       if (!folder->klass->check_msgnum_validity || 
+           folder->klass->check_msgnum_validity(folder, item)) {
                if (!item->cache)
                        folder_item_read_cache(item);
                cache_list = msgcache_get_msg_list(item->cache);
@@ -1116,7 +1210,7 @@ gint folder_item_scan(FolderItem *item)
                        MsgInfo *msginfo;
 
                        msginfo = msgcache_get_msg(item->cache, folder_cur_num);
-                       if (folder->class->is_msg_changed && folder->class->is_msg_changed(folder, item, msginfo)) {
+                       if (folder->klass->is_msg_changed && folder->klass->is_msg_changed(folder, item, msginfo)) {
                                msgcache_remove_msg(item->cache, msginfo->msgnum);
                                new_list = g_slist_prepend(new_list, GINT_TO_POINTER(msginfo->msgnum));
                                procmsg_msginfo_free(msginfo);
@@ -1150,9 +1244,9 @@ gint folder_item_scan(FolderItem *item)
        g_slist_free(folder_list);
 
        if (new_list != NULL) {
-               if (folder->class->get_msginfos) {
-                       newmsg_list = folder->class->get_msginfos(folder, item, new_list);
-               } else if (folder->class->get_msginfo) {
+               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)) {
@@ -1160,7 +1254,7 @@ gint folder_item_scan(FolderItem *item)
                                guint num;
 
                                num = GPOINTER_TO_INT(elem->data);
-                               msginfo = folder->class->get_msginfo(folder, item, num);
+                               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);
@@ -1170,47 +1264,89 @@ gint folder_item_scan(FolderItem *item)
                g_slist_free(new_list);
        }
 
+       folder_item_update_freeze();
        if (newmsg_list != NULL) {
                GSList *elem;
 
-               for (elem = newmsg_list; elem != NULL; elem = g_slist_next(elem))
-                       msgcache_add_msg(item->cache, elem->data);
+               for (elem = newmsg_list; elem != NULL; elem = g_slist_next(elem)) {
+                       MsgInfo *msginfo = (MsgInfo *) elem->data;
+
+                       msgcache_add_msg(item->cache, msginfo);
+                       if ((filtering == TRUE) &&
+                           (item->stype == F_INBOX) &&
+                           (item->folder->account != NULL) && 
+                           (item->folder->account->filter_on_recv) &&
+                           procmsg_msginfo_filter(msginfo))
+                               procmsg_msginfo_free(msginfo);
+                       else
+                               exists_list = g_slist_prepend(exists_list, msginfo);
+               }
+               g_slist_free(newmsg_list);
 
                update_flags |= F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT;
-               
-               exists_list = g_slist_concat(exists_list, newmsg_list);
        }
 
        for (elem = exists_list; elem != NULL; elem = g_slist_next(elem)) {
                MsgInfo *msginfo;
 
                msginfo = elem->data;
-               if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
+               if (MSG_IS_IGNORE_THREAD(msginfo->flags) && (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)))
+                       procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
+               if (!MSG_IS_IGNORE_THREAD(msginfo->flags) && procmsg_msg_has_flagged_parent(msginfo, MSG_IGNORE_THREAD)) {
+                       procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
+                       procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
+               }
+               if ((item->stype == F_OUTBOX ||
+                    item->stype == F_QUEUE  ||
+                    item->stype == F_DRAFT  ||
+                    item->stype == F_TRASH) &&
+                   (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)))
+                       procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
+               if (MSG_IS_NEW(msginfo->flags))
                        newcnt++;
-               if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
+               if (MSG_IS_UNREAD(msginfo->flags))
                        unreadcnt++;
                if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
                        unreadmarkedcnt++;
-               if (!MSG_IS_IGNORE_THREAD(msginfo->flags) && procmsg_msg_has_flagged_parent(msginfo, MSG_IGNORE_THREAD))
-                       procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
                totalcnt++;
 
                procmsg_msginfo_free(msginfo);
        }
        g_slist_free(exists_list);
 
-       item->new = newcnt;
-       item->unread = unreadcnt;
-       item->total = totalcnt;
-       item->unreadmarked = unreadmarkedcnt;
+       item->new_msgs = newcnt;
+       item->unread_msgs = unreadcnt;
+       item->total_msgs = totalcnt;
+       item->unreadmarked_msgs = unreadmarkedcnt;
 
        update_flags |= F_ITEM_UPDATE_MSGCNT;
 
        folder_item_update(item, update_flags);
+       folder_item_update_thaw();
 
        return 0;
 }
 
+gint folder_item_scan(FolderItem *item)
+{
+       return folder_item_scan_full(item, TRUE);
+}
+
+static gboolean folder_scan_all_items_func(GNode *node, gpointer data)
+{
+       FolderItem *item = node->data;
+
+       folder_item_scan(item);
+
+       return FALSE;
+}
+
+void folder_scan_all_items(Folder * folder)
+{
+       g_node_traverse(folder->node, G_PRE_ORDER,
+                       G_TRAVERSE_ALL, -1, folder_scan_all_items_func, NULL);
+}
+
 static void folder_item_scan_foreach_func(gpointer key, gpointer val,
                                          gpointer data)
 {
@@ -1274,7 +1410,7 @@ void folder_item_free_cache(FolderItem *item)
        item->cache = NULL;
 }
 
-void folder_clean_cache_memory()
+void folder_clean_cache_memory(void)
 {
        gint memusage = 0;
 
@@ -1311,7 +1447,7 @@ void folder_item_read_cache(FolderItem *item)
        item->cache = msgcache_read_cache(item, cache_file);
        if (!item->cache) {
                item->cache = msgcache_new();
-               folder_item_scan(item);
+               folder_item_scan_full(item, TRUE);
        }
        msgcache_read_mark(item->cache, mark_file);
        g_free(cache_file);
@@ -1323,7 +1459,7 @@ void folder_item_read_cache(FolderItem *item)
 void folder_item_write_cache(FolderItem *item)
 {
        gchar *cache_file, *mark_file;
-       PrefsFolderItem *prefs;
+       FolderItemPrefs *prefs;
        gint filemode = 0;
        gchar *id;
        
@@ -1365,8 +1501,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->class->get_msginfo, NULL);
-       if ((msginfo = folder->class->get_msginfo(folder, item, num)) != NULL) {
+       g_return_val_if_fail(folder->klass->get_msginfo, NULL);
+       if ((msginfo = folder->klass->get_msginfo(folder, item, num)) != NULL) {
                msgcache_add_msg(item->cache, msginfo);
                return msginfo;
        }
@@ -1411,9 +1547,9 @@ gchar *folder_item_fetch_msg(FolderItem *item, gint num)
 
        folder = item->folder;
 
-       g_return_val_if_fail(folder->class->fetch_msg != NULL, NULL);
+       g_return_val_if_fail(folder->klass->fetch_msg != NULL, NULL);
 
-       return folder->class->fetch_msg(folder, item, num);
+       return folder->klass->fetch_msg(folder, item, num);
 }
 
 static gint folder_item_get_msg_num_by_file(FolderItem *dest, const gchar *file)
@@ -1451,57 +1587,179 @@ static gint folder_item_get_msg_num_by_file(FolderItem *dest, const gchar *file)
        return msgnum;
 }
 
+static void copy_msginfo_flags(MsgInfo *source, MsgInfo *dest)
+{
+       MsgPermFlags perm_flags = 0;
+       MsgTmpFlags tmp_flags = 0;
+
+       /* create new flags */
+       if (source != NULL) {
+               /* copy original flags */
+               perm_flags = source->flags.perm_flags;
+               tmp_flags = source->flags.tmp_flags;
+       } else {
+               perm_flags = dest->flags.perm_flags;
+               tmp_flags = dest->flags.tmp_flags;
+       }
+
+       /* remove new, unread and deleted in special folders */
+       if (dest->folder->stype == F_OUTBOX ||
+           dest->folder->stype == F_QUEUE  ||
+           dest->folder->stype == F_DRAFT  ||
+           dest->folder->stype == F_TRASH)
+               perm_flags &= ~(MSG_NEW | MSG_UNREAD | MSG_DELETED);
+
+       /* set ignore flag of ignored parent exists */
+       if (procmsg_msg_has_flagged_parent(dest, MSG_IGNORE_THREAD))
+               perm_flags |= MSG_IGNORE_THREAD;
+
+       /* Unset tmp flags that should not be copied */
+       tmp_flags &= ~(MSG_MOVE | MSG_COPY);
+
+       /* unset flags that are set but should not */
+       procmsg_msginfo_unset_flags(dest,
+                                   dest->flags.perm_flags & ~perm_flags,
+                                   dest->flags.tmp_flags  & ~tmp_flags);
+       /* set new flags */
+       procmsg_msginfo_set_flags(dest,
+                                 ~dest->flags.perm_flags & perm_flags,
+                                 ~dest->flags.tmp_flags  & tmp_flags);
+
+       folder_item_update(dest->folder, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
+}
+
+static void add_msginfo_to_cache(FolderItem *item, MsgInfo *newmsginfo, MsgInfo *flagsource)
+{
+       /* update folder stats */
+       if (MSG_IS_NEW(newmsginfo->flags))
+               item->new_msgs++;
+       if (MSG_IS_UNREAD(newmsginfo->flags))
+               item->unread_msgs++;
+       if (MSG_IS_UNREAD(newmsginfo->flags) && procmsg_msg_has_marked_parent(newmsginfo))
+               item->unreadmarked_msgs++;
+       item->total_msgs++;
+
+       copy_msginfo_flags(flagsource, newmsginfo);
+
+       msgcache_add_msg(item->cache, newmsginfo);
+}
+
+static void remove_msginfo_from_cache(FolderItem *item, MsgInfo *msginfo)
+{
+       if (!item->cache)
+               folder_item_read_cache(item);
+
+       if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
+               msginfo->folder->new_msgs--;
+       if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
+               msginfo->folder->unread_msgs--;
+       if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
+               msginfo->folder->unreadmarked_msgs--;
+       msginfo->folder->total_msgs--;
+
+       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.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->class->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->class->add_msg(folder, dest, file, FALSE);
+        folder = dest->folder;
 
-        if (num > 0) {
-               msginfo = folder->class->get_msginfo(folder, dest, num);
+       relation = g_relation_new(2);
+       g_relation_index(relation, 0, g_direct_hash, g_direct_equal);
 
-               if (msginfo != NULL) {
-                       if (MSG_IS_NEW(msginfo->flags))
-                               dest->new++;
-                       if (MSG_IS_UNREAD(msginfo->flags))
-                               dest->unread++;
-                       if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
-                               dest->unreadmarked++;
-                       if (procmsg_msg_has_flagged_parent(msginfo, MSG_IGNORE_THREAD))
-                               procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
-                       dest->total++;
-
-                       msgcache_add_msg(dest->cache, msginfo);
-                       procmsg_msginfo_free(msginfo);
-
-                       folder_item_update(dest, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
+       if (folder->klass->add_msgs != NULL) {
+               ret = folder->klass->add_msgs(folder, dest, file_list, relation);
+               if (ret < 0) {
+                       g_relation_destroy(relation);
+                       return ret;
                }
+       } else {
+               for (file_cur = file_list; file_cur != NULL; file_cur = g_slist_next(file_cur)) {
+                       fileinfo = (MsgFileInfo *) file_cur->data;
 
-                dest->last_num = num;
-        } else if (num == 0) {
-               folder_item_scan(dest);
-               num = folder_item_get_msg_num_by_file(dest, file);
+                       ret = folder->klass->add_msg(folder, dest, fileinfo->file, fileinfo->flags);
+                       if (ret < 0) {
+                               g_relation_destroy(relation);
+                               return ret;
+                       }
+                       g_relation_insert(relation, fileinfo, GINT_TO_POINTER(ret));
+               }
        }
 
-       if (num >= 0 && remove_source) {
-               if (unlink(file) < 0)
-                       FILE_OP_ERROR(file, "unlink");
+       for (file_cur = file_list; file_cur != NULL; file_cur = g_slist_next(file_cur)) {
+               GTuples *tuples;
+
+               fileinfo = (MsgFileInfo *) file_cur->data;
+               tuples = g_relation_select(relation, fileinfo, 0);
+               num = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
+               g_tuples_destroy(tuples);
+
+               if (num >= 0) {
+                       MsgInfo *newmsginfo;
+
+                       if (num == 0) {
+                               if (!folderscan) {
+                                       folder_item_scan_full(dest, FALSE);
+                                       folderscan = TRUE;
+                               }
+                               num = folder_item_get_msg_num_by_file(dest, fileinfo->file);
+                       }
+
+                       if (num > lastnum)
+                               lastnum = num;
+
+                       if (num >= 0 && remove_source) {
+                               if (unlink(fileinfo->file) < 0)
+                                       FILE_OP_ERROR(fileinfo->file, "unlink");
+                       }
+
+                       if (num == 0)
+                               continue;
+
+                       if (!folderscan && 
+                           ((newmsginfo = 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;
 }
 
 /*
@@ -1526,11 +1784,9 @@ gint folder_item_move_msg(FolderItem *dest, MsgInfo *msginfo)
 FolderItem *folder_item_move_recursive (FolderItem *src, FolderItem *dest) 
 {
        GSList *mlist;
-       GSList *cur;
        FolderItem *new_item;
        FolderItem *next_item;
        GNode *srcnode;
-       int cnt = 0;
        gchar *old_id, *new_id;
 
        mlist = folder_item_get_msg_list(src);
@@ -1547,21 +1803,12 @@ FolderItem *folder_item_move_recursive (FolderItem *src, FolderItem *dest)
                new_item->folder = dest->folder;
 
        /* move messages */
-       for (cur = mlist ; cur != NULL ; cur = cur->next) {
-               MsgInfo * msginfo;
-               cnt++;
-               if (cnt%500)
-                       log_message(_("Moving %s to %s (%d%%)...\n"), src->name, 
-                                       new_item->path,
-                                       100*cnt/g_slist_length(mlist));
-               msginfo = (MsgInfo *) cur->data;
-               folder_item_move_msg(new_item, msginfo);
-
-               procmsg_msginfo_free(msginfo);
-       }
+       log_message(_("Moving %s to %s...\n"), 
+                       src->name, new_item->path);
+       folder_item_move_msgs_with_dest(new_item, mlist);
        
        /*copy prefs*/
-       prefs_folder_item_copy_prefs(src, new_item);
+       folder_item_prefs_copy_prefs(src, new_item);
        new_item->collapsed = src->collapsed;
        new_item->thread_collapsed = src->thread_collapsed;
        new_item->threaded  = src->threaded;
@@ -1588,7 +1835,7 @@ FolderItem *folder_item_move_recursive (FolderItem *src, FolderItem *dest)
        new_id = folder_item_get_identifier(new_item);
        debug_print("updating rules : %s => %s\n", old_id, new_id);
        
-       src->folder->class->remove_folder(src->folder, src);
+       src->folder->klass->remove_folder(src->folder, src);
        folder_write_list();
 
        if (old_id != NULL && new_id != NULL)
@@ -1623,7 +1870,7 @@ gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_ite
                dst_identifier = folder_get_identifier(dest->folder);
        }
        if (src_identifier == NULL || dst_identifier == NULL) {
-               printf("Can't get identifiers\n");
+               debug_print("Can't get identifiers\n");
                return F_MOVE_FAILED;
        }
 
@@ -1696,36 +1943,46 @@ gint folder_item_move_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_move_msgs_with_dest(FolderItem *dest, GSList *msglist)
 {
        Folder *folder;
-       FolderItem *item;
-       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);
 
        folder = dest->folder;
 
-       g_return_val_if_fail(folder->class->copy_msg != NULL, -1);
-       g_return_val_if_fail(folder->class->remove_msg != NULL, -1);
+       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);
 
        /* 
         * Copy messages to destination folder and 
         * store new message numbers in newmsgnums
         */
-       item = NULL;
-       for (l = msglist ; l != NULL ; l = g_slist_next(l)) {
-               MsgInfo * msginfo = (MsgInfo *) l->data;
-
-               if (!item && msginfo->folder != NULL)
-                       item = msginfo->folder;
+       if (folder->klass->copy_msgs != NULL) {
+               if (folder->klass->copy_msgs(folder, dest, msglist, relation) < 0) {
+                       g_relation_destroy(relation);
+                       return -1;
+               }
+       } else {
+               for (l = msglist ; l != NULL ; l = g_slist_next(l)) {
+                       MsgInfo * msginfo = (MsgInfo *) l->data;
 
-               num = folder->class->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 */
@@ -1735,12 +1992,13 @@ 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;
        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;
@@ -1749,7 +2007,7 @@ gint folder_item_move_msgs_with_dest(FolderItem *dest, GSList *msglist)
                                gchar *file;
 
                                if (!folderscan) {
-                                       folder_item_scan(dest);
+                                       folder_item_scan_full(dest, FALSE);
                                        folderscan = TRUE;
                                }
                                file = folder_item_fetch_msg(msginfo->folder, msginfo->msgnum);
@@ -1763,35 +2021,13 @@ gint folder_item_move_msgs_with_dest(FolderItem *dest, GSList *msglist)
                        if (num == 0)
                                continue;
 
-                       if (!folderscan) {
-                               newmsginfo = folder->class->get_msginfo(folder, dest, num);
-                               if (newmsginfo) {
-                                       newmsginfo->flags.perm_flags = msginfo->flags.perm_flags;
-                                       if (dest->stype == F_OUTBOX ||
-                                           dest->stype == F_QUEUE  ||
-                                           dest->stype == F_DRAFT  ||
-                                           dest->stype == F_TRASH)
-                                               MSG_UNSET_PERM_FLAGS(newmsginfo->flags,
-                                                                    MSG_NEW|MSG_UNREAD|MSG_DELETED);
-                                       msgcache_add_msg(dest->cache, newmsginfo);
-
-                                       if (MSG_IS_NEW(newmsginfo->flags))
-                                               dest->new++;
-                                       if (MSG_IS_UNREAD(newmsginfo->flags))
-                                               dest->unread++;
-                                       if (MSG_IS_UNREAD(newmsginfo->flags) && procmsg_msg_has_marked_parent(newmsginfo))
-                                               dest->unreadmarked++;
-                                       if (procmsg_msg_has_flagged_parent(newmsginfo, MSG_IGNORE_THREAD))
-                                               procmsg_msginfo_set_flags(newmsginfo, MSG_IGNORE_THREAD, 0);
-                                       dest->total++;
-                                       folder_item_update(dest, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
-
-                                       procmsg_msginfo_free(newmsginfo);
-                               }
-                       } else {
-                               newmsginfo = msgcache_get_msg(dest->cache, num);
-                               procmsg_msginfo_unset_flags(newmsginfo, ~0, ~0);
-                               procmsg_msginfo_set_flags(newmsginfo, msginfo->flags.perm_flags, 0);
+                       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);
                        }
                }
        }
@@ -1801,37 +2037,27 @@ gint folder_item_move_msgs_with_dest(FolderItem *dest, GSList *msglist)
         * 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;
+                GTuples *tuples;
 
-               num = GPOINTER_TO_INT(l2->data);
-               l2 = g_slist_next(l2);
-               
-               if (num >= 0) {
-                       item->folder->class->remove_msg(item->folder,
+                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);
-                       if (!item->cache)
-                               folder_item_read_cache(item);
-                       msgcache_remove_msg(item->cache, msginfo->msgnum);
-
-                       if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
-                               msginfo->folder->new--;
-                       if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
-                               msginfo->folder->unread--;
-                       if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
-                               msginfo->folder->unreadmarked--;
-                       msginfo->folder->total--;                       
-                       folder_item_update(msginfo->folder, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
+                       remove_msginfo_from_cache(item, msginfo);
                }
        }
 
+       if (folder->klass->finished_copy)
+               folder->klass->finished_copy(folder, dest);
 
-       if (folder->class->finished_copy)
-               folder->class->finished_copy(folder, dest);
-
-       g_slist_free(newmsgnums);
+       g_relation_destroy(relation);
        return lastnum;
 }
 
@@ -1856,14 +2082,15 @@ gint folder_item_copy_msg(FolderItem *dest, MsgInfo *msginfo)
 
 gint folder_item_copy_msg(FolderItem *dest, MsgInfo *msginfo)
 {
-       GSList *list = NULL;
-       gint ret;
+       GSList msglist;
 
-       list = g_slist_append(list, msginfo);
-       ret = folder_item_copy_msgs_with_dest(dest, list);
-       g_slist_free(list);
+       g_return_val_if_fail(dest != NULL, -1);
+       g_return_val_if_fail(msginfo != NULL, -1);
+    
+       msglist.data = msginfo;
+       msglist.next = NULL;
        
-       return ret;
+       return folder_item_copy_msgs_with_dest(dest, &msglist);
 }
 
 /*
@@ -1890,26 +2117,36 @@ gint folder_item_copy_msgs_with_dest(FolderItem *dest, GSList *msglist)
 {
        Folder *folder;
        gint num, lastnum = -1;
-       GSList *newmsgnums = NULL;
-       GSList *l, *l2;
+       GSList *l;
        gboolean folderscan = FALSE;
+       GRelation *relation;
 
        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->class->copy_msg != NULL, -1);
+       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);
+
+       /*
         * 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->class->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 */
@@ -1919,12 +2156,13 @@ gint folder_item_copy_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;
        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;
@@ -1933,7 +2171,7 @@ gint folder_item_copy_msgs_with_dest(FolderItem *dest, GSList *msglist)
                                gchar *file;
 
                                if (!folderscan) {
-                                       folder_item_scan(dest);
+                                       folder_item_scan_full(dest, FALSE);
                                        folderscan = TRUE;
                                }
                                file = folder_item_fetch_msg(msginfo->folder, msginfo->msgnum);
@@ -1947,43 +2185,23 @@ gint folder_item_copy_msgs_with_dest(FolderItem *dest, GSList *msglist)
                        if (num == 0)
                                continue;
 
-                       if (!folderscan) {
-                               newmsginfo = folder->class->get_msginfo(folder, dest, num);
-                               if (newmsginfo) {
-                                       newmsginfo->flags.perm_flags = msginfo->flags.perm_flags;
-                                       if (dest->stype == F_OUTBOX ||
-                                           dest->stype == F_QUEUE  ||
-                                           dest->stype == F_DRAFT  ||
-                                           dest->stype == F_TRASH)
-                                               MSG_UNSET_PERM_FLAGS(newmsginfo->flags,
-                                                                    MSG_NEW|MSG_UNREAD|MSG_DELETED);
-                                       msgcache_add_msg(dest->cache, newmsginfo);
-
-                                       if (MSG_IS_NEW(newmsginfo->flags))
-                                               dest->new++;
-                                       if (MSG_IS_UNREAD(newmsginfo->flags))
-                                               dest->unread++;
-                                       if (MSG_IS_UNREAD(newmsginfo->flags) && procmsg_msg_has_marked_parent(newmsginfo))
-                                               dest->unreadmarked++;
-                                       if (procmsg_msg_has_flagged_parent(newmsginfo, MSG_IGNORE_THREAD))
-                                               procmsg_msginfo_set_flags(newmsginfo, MSG_IGNORE_THREAD, 0);
-                                       dest->total++;
-                                       folder_item_update(dest, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
-
-                                       procmsg_msginfo_free(newmsginfo);
-                               }
-                       } else {
-                               newmsginfo = msgcache_get_msg(dest->cache, num);
-                               procmsg_msginfo_unset_flags(newmsginfo, ~0, ~0);
-                               procmsg_msginfo_set_flags(newmsginfo, msginfo->flags.perm_flags, 0);
+                       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->class->finished_copy)
-               folder->class->finished_copy(folder, dest);
+       if (folder->klass->finished_copy)
+               folder->klass->finished_copy(folder, dest);
+
+       g_relation_destroy(relation);
 
-       g_slist_free(newmsgnums);
        return lastnum;
 }
 
@@ -1994,24 +2212,18 @@ gint folder_item_remove_msg(FolderItem *item, gint num)
        MsgInfo *msginfo;
 
        g_return_val_if_fail(item != NULL, -1);
-
        folder = item->folder;
+       g_return_val_if_fail(folder->klass->remove_msg != NULL, -1);
+
        if (!item->cache) folder_item_read_cache(item);
 
-       ret = folder->class->remove_msg(folder, item, num);
+       ret = folder->klass->remove_msg(folder, item, num);
 
        msginfo = msgcache_get_msg(item->cache, num);
        if (msginfo != NULL) {
-               if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
-                       item->new--;
-               if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
-                       item->unread--;
-               if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
-                       item->unreadmarked--;
+               remove_msginfo_from_cache(item, msginfo);
                procmsg_msginfo_free(msginfo);
-               msgcache_remove_msg(item->cache, num);
        }
-       item->total--;
        folder_item_update(item, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
 
        return ret;
@@ -2028,13 +2240,6 @@ gint folder_item_remove_msgs(FolderItem *item, GSList *msglist)
 
        if (!item->cache) folder_item_read_cache(item);
 
-       if (folder->class->remove_msgs) {
-               ret = folder->class->remove_msgs(folder, item, msglist);
-               if (ret == 0)
-                       folder_item_scan(item);
-               return ret;
-       }
-
        while (msglist != NULL) {
                MsgInfo *msginfo = (MsgInfo *)msglist->data;
 
@@ -2056,27 +2261,39 @@ gint folder_item_remove_all_msg(FolderItem *item)
 
        folder = item->folder;
 
-       g_return_val_if_fail(folder->class->remove_all_msg != NULL, -1);
+       g_return_val_if_fail(folder->klass->remove_all_msg != NULL, -1);
 
-       result = folder->class->remove_all_msg(folder, item);
+       result = folder->klass->remove_all_msg(folder, item);
 
        if (result == 0) {
-               if (folder->class->finished_remove)
-                       folder->class->finished_remove(folder, item);
+               if (folder->klass->finished_remove)
+                       folder->klass->finished_remove(folder, item);
 
                folder_item_free_cache(item);
                item->cache = msgcache_new();
 
-               item->new = 0;
-               item->unread = 0;
-               item->unreadmarked = 0;
-               item->total = 0;
+               item->new_msgs = 0;
+               item->unread_msgs = 0;
+               item->unreadmarked_msgs = 0;
+               item->total_msgs = 0;
                folder_item_update(item, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
        }
 
        return result;
 }
 
+void folder_item_change_msg_flags(FolderItem *item, MsgInfo *msginfo, MsgPermFlags newflags)
+{
+       g_return_if_fail(item != NULL);
+       g_return_if_fail(msginfo != NULL);
+       
+       if (item->folder->klass->change_flags != NULL) {
+               item->folder->klass->change_flags(item->folder, item, msginfo, newflags);
+       } else {
+               msginfo->flags.perm_flags = newflags;
+       }
+}
+
 gboolean folder_item_is_msg_changed(FolderItem *item, MsgInfo *msginfo)
 {
        Folder *folder;
@@ -2085,9 +2302,9 @@ gboolean folder_item_is_msg_changed(FolderItem *item, MsgInfo *msginfo)
 
        folder = item->folder;
 
-       g_return_val_if_fail(folder->class->is_msg_changed != NULL, -1);
+       g_return_val_if_fail(folder->klass->is_msg_changed != NULL, -1);
 
-       return folder->class->is_msg_changed(folder, item, msginfo);
+       return folder->klass->is_msg_changed(folder, item, msginfo);
 }
 
 gchar *folder_item_get_cache_file(FolderItem *item)
@@ -2243,10 +2460,10 @@ static gboolean folder_build_tree(GNode *node, gpointer data)
        item = folder_item_new(folder, name, path);
        item->stype = stype;
        item->mtime = mtime;
-       item->new = new;
-       item->unread = unread;
-       item->unreadmarked = unreadmarked;
-       item->total = total;
+       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;
@@ -2268,7 +2485,7 @@ static gboolean folder_build_tree(GNode *node, gpointer data)
        }
        item->account = account;
        item->apply_sub = apply_sub;
-       prefs_folder_item_read_config(item);
+       folder_item_prefs_read_config(item);
 
        node->data = item;
        xml_free_node(xmlnode);
@@ -2281,7 +2498,7 @@ static gboolean folder_read_folder_func(GNode *node, gpointer data)
        Folder *folder;
        XMLNode *xmlnode;
        GList *list;
-       FolderType type = F_UNKNOWN;
+       FolderClass *class = NULL;
        const gchar *name = NULL;
        const gchar *path = NULL;
        PrefsAccount *account = NULL;
@@ -2302,18 +2519,9 @@ static gboolean folder_read_folder_func(GNode *node, gpointer data)
                XMLAttr *attr = list->data;
 
                if (!attr || !attr->name || !attr->value) continue;
-               if (!strcmp(attr->name, "type")) {
-                       if (!strcasecmp(attr->value, "mh"))
-                               type = F_MH;
-                       else if (!strcasecmp(attr->value, "mbox"))
-                               type = F_MBOX;
-                       else if (!strcasecmp(attr->value, "maildir"))
-                               type = F_MAILDIR;
-                       else if (!strcasecmp(attr->value, "imap"))
-                               type = F_IMAP;
-                       else if (!strcasecmp(attr->value, "news"))
-                               type = F_NEWS;
-               } else if (!strcmp(attr->name, "name"))
+               if (!strcmp(attr->name, "type"))
+                       class = folder_get_class_from_string(attr->value);
+               else if (!strcmp(attr->name, "name"))
                        name = attr->value;
                else if (!strcmp(attr->name, "path"))
                        path = attr->value;
@@ -2333,10 +2541,10 @@ static gboolean folder_read_folder_func(GNode *node, gpointer data)
                        ret_rcpt = *attr->value == '1' ? TRUE : FALSE;
        }
 
-       folder = folder_new(type, name, path);
+       folder = folder_new(class, name, path);
        g_return_val_if_fail(folder != NULL, FALSE);
        folder->account = account;
-       if (account && (type == F_IMAP || type == F_NEWS))
+       if (account != NULL)
                account->folder = REMOTE_FOLDER(folder);
        node->data = folder->node->data;
        g_node_destroy(folder->node);
@@ -2396,10 +2604,10 @@ static void folder_write_list_recursive(GNode *node, gpointer data)
        if (depth == 1) {
                Folder *folder = item->folder;
 
-               fprintf(fp, "<folder type=\"%s\"", folder->class->idstr);
+               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)
+               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)
@@ -2453,7 +2661,7 @@ static void folder_write_list_recursive(GNode *node, gpointer data)
 
                fprintf(fp,
                        " mtime=\"%lu\" new=\"%d\" unread=\"%d\" unreadmarked=\"%d\" total=\"%d\"",
-                       item->mtime, item->new, item->unread, item->unreadmarked, item->total);
+                       item->mtime, item->new_msgs, item->unread_msgs, item->unreadmarked_msgs, item->total_msgs);
 
                if (item->account)
                        fprintf(fp, " account_id=\"%d\"",
@@ -2506,7 +2714,8 @@ static void folder_update_op_count_rec(GNode *node)
        }
 }
 
-void folder_update_op_count() {
+void folder_update_op_count(void) 
+{
        GList *cur;
        Folder *folder;
 
@@ -2545,44 +2754,51 @@ static gchar * folder_item_get_tree_identifier(FolderItem * item)
 */
 
 /* CLAWS: temporary local folder for filtering */
-static Folder *processing_folder;
+#define TEMP_FOLDER "TEMP_FOLDER"
+#define PROCESSING_FOLDER_ITEM "processing"    
+
 static FolderItem *processing_folder_item;
 
 static void folder_create_processing_folder(void)
 {
-#define PROCESSING_FOLDER ".processing"        
-       Folder     *tmpparent;
+       Folder *processing_folder;
        gchar      *tmpname;
 
-       tmpparent = folder_get_default_folder();
-       g_assert(tmpparent);
-       debug_print("tmpparentroot %s\n", LOCAL_FOLDER(tmpparent)->rootpath);
-       if (LOCAL_FOLDER(tmpparent)->rootpath[0] == '/')
-               tmpname = g_strconcat(LOCAL_FOLDER(tmpparent)->rootpath,
-                                     G_DIR_SEPARATOR_S, PROCESSING_FOLDER,
+       if ((processing_folder = folder_find_from_name(TEMP_FOLDER, mh_get_class())) == NULL) {
+               gchar *tmppath;
+
+               tmppath =
+                   g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
+                               "tempfolder", NULL);
+               processing_folder =
+                   folder_new(mh_get_class(), TEMP_FOLDER, tmppath);
+               g_free(tmppath);
+       }
+       g_assert(processing_folder != NULL);
+
+       debug_print("tmpparentroot %s\n", LOCAL_FOLDER(processing_folder)->rootpath);
+       if (LOCAL_FOLDER(processing_folder)->rootpath[0] == '/')
+               tmpname = g_strconcat(LOCAL_FOLDER(processing_folder)->rootpath,
+                                     G_DIR_SEPARATOR_S, PROCESSING_FOLDER_ITEM,
                                      NULL);
        else
                tmpname = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
-                                     LOCAL_FOLDER(tmpparent)->rootpath,
-                                     G_DIR_SEPARATOR_S, PROCESSING_FOLDER,
+                                     LOCAL_FOLDER(processing_folder)->rootpath,
+                                     G_DIR_SEPARATOR_S, PROCESSING_FOLDER_ITEM,
                                      NULL);
 
-       processing_folder = folder_new(F_MH, "PROCESSING", LOCAL_FOLDER(tmpparent)->rootpath);
-       g_assert(processing_folder);
-
        if (!is_dir_exist(tmpname)) {
                debug_print("*TMP* creating %s\n", tmpname);
-               processing_folder_item = processing_folder->class->create_folder(processing_folder,
+               processing_folder_item = processing_folder->klass->create_folder(processing_folder,
                                                                                 processing_folder->node->data,
-                                                                                PROCESSING_FOLDER);
-               g_assert(processing_folder_item);                                                                         
-       }
-       else {
+                                                                                PROCESSING_FOLDER_ITEM);
+       } else {
                debug_print("*TMP* already created\n");
-               processing_folder_item = folder_item_new(processing_folder, ".processing", ".processing");
+               processing_folder_item = folder_item_new(processing_folder, PROCESSING_FOLDER_ITEM, PROCESSING_FOLDER_ITEM);
                g_assert(processing_folder_item);
                folder_item_append(processing_folder->node->data, processing_folder_item);
        }
+       g_assert(processing_folder_item != NULL);
        g_free(tmpname);
 }
 
@@ -2596,7 +2812,7 @@ FolderItem *folder_get_default_processing(void)
 
 /* folder_persist_prefs_new() - return hash table with persistent
  * settings (and folder name as key). 
- * (note that in claws other options are in the PREFS_FOLDER_ITEM_RC
+ * (note that in claws other options are in the folder_item_prefs_RC
  * file, so those don't need to be included in PersistPref yet) 
  */
 GHashTable *folder_persist_prefs_new(Folder *folder)
@@ -2635,7 +2851,7 @@ void folder_item_restore_persist_prefs(FolderItem *item, GHashTable *pptable)
        /* CLAWS: since not all folder properties have been migrated to 
         * folderlist.xml, we need to call the old stuff first before
         * setting things that apply both to Main and Claws. */
-       prefs_folder_item_read_config(item); 
+       folder_item_prefs_read_config(item); 
         
        item->collapsed = pp->collapsed;
        item->thread_collapsed = pp->thread_collapsed;
@@ -2762,7 +2978,7 @@ void folder_item_update_recursive(FolderItem *item, FolderItemUpdateFlags update
        }
 }
 
-void folder_item_update_freeze()
+void folder_item_update_freeze(void)
 {
        folder_item_update_freeze_cnt++;
 }
@@ -2779,7 +2995,7 @@ static void folder_item_update_func(FolderItem *item, gpointer data)
        }
 }
 
-void folder_item_update_thaw()
+void folder_item_update_thaw(void)
 {
        if (folder_item_update_freeze_cnt > 0)
                folder_item_update_freeze_cnt--;