When copying a folder, copy its metadata before copying contents.
[claws.git] / src / folder.c
index 0ee5637538a6cb65173fdbf007c92cb257a9541e..4bd24479b8168c2def48f8722a75e466047a6eaa 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2009 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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
@@ -19,6 +19,7 @@
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
+#include "claws-features.h"
 #endif
 
 #include "defs.h"
@@ -58,6 +59,8 @@
 #include "timing.h"
 #include "compose.h"
 #include "main.h"
+#include "msgcache.h"
+#include "privacy.h"
 
 /* Dependecies to be removed ?! */
 #include "prefs_common.h"
@@ -85,7 +88,6 @@ void folder_init              (Folder         *folder,
 static gchar *folder_item_get_cache_file       (FolderItem     *item);
 static gchar *folder_item_get_mark_file        (FolderItem     *item);
 static gchar *folder_item_get_tags_file        (FolderItem     *item);
-static gchar *folder_get_list_path     (void);
 static GNode *folder_get_xml_node      (Folder         *folder);
 static Folder *folder_get_from_xml     (GNode          *node);
 static void folder_update_op_count_rec (GNode          *node);
@@ -167,6 +169,9 @@ void folder_unregister_class(FolderClass *klass)
                }
        }
        g_list_free(folderlist);
+
+       if (klass->prefs_pages)
+               g_slist_free(klass->prefs_pages);
 }
 
 Folder *folder_new(FolderClass *klass, const gchar *name, const gchar *path)
@@ -253,6 +258,7 @@ void folder_item_change_type(FolderItem *item, SpecialFolderItemType newtype)
        hookdata.folder = folder;
        hookdata.update_flags = FOLDER_TREE_CHANGED;
        hookdata.item = NULL;
+       hookdata.item2 = NULL;
        hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
 }
 
@@ -332,9 +338,9 @@ XMLTag *folder_get_xml(Folder *folder)
 FolderItem *folder_item_new(Folder *folder, const gchar *name, const gchar *path)
 {
        FolderItem *item = NULL;
-       
+
        cm_return_val_if_fail(folder != NULL, NULL);
-       
+
        if (folder->klass->item_new) {
                item = folder->klass->item_new(folder);
        } else {
@@ -344,7 +350,14 @@ FolderItem *folder_item_new(Folder *folder, const gchar *name, const gchar *path
        cm_return_val_if_fail(item != NULL, NULL);
 
        item->stype = F_NORMAL;
-       item->name = g_strdup(name);
+
+       if(!g_utf8_validate(name, -1, NULL)) {
+               item->name = g_malloc(strlen(name)*2+1);
+               conv_localetodisp(item->name, strlen(name)*2+1, name);
+       } else {
+               item->name = g_strdup(name);
+       }
+
        item->path = g_strdup(path);
        item->mtime = 0;
        item->new_msgs = 0;
@@ -398,13 +411,13 @@ void folder_item_remove(FolderItem *item)
 {
        GNode *node, *start_node;
        FolderUpdateData hookdata;
-       gchar *tags_file = NULL;
+       gchar *tags_file = NULL, *tags_dir = NULL;
 
        cm_return_if_fail(item != NULL);
        cm_return_if_fail(item->folder != NULL);
        cm_return_if_fail(item->folder->node != NULL);
 
-       start_node = node = item->node;
+       start_node = item->node;
        
        node = item->folder->node;
        
@@ -419,7 +432,7 @@ void folder_item_remove(FolderItem *item)
                        folder_item_remove(sub_item);
                }
        }
-       
+
        /* remove myself */
        if (item->cache != NULL) {
                msgcache_destroy(item->cache);
@@ -428,11 +441,17 @@ void folder_item_remove(FolderItem *item)
        tags_file = folder_item_get_tags_file(item);
        if (tags_file)
                claws_unlink(tags_file);
+       tags_dir = g_path_get_dirname(tags_file);
+       if (tags_dir)
+               rmdir(tags_dir);
+
        g_free(tags_file);
+       g_free(tags_dir);
 
        hookdata.folder = item->folder;
        hookdata.update_flags = FOLDER_TREE_CHANGED | FOLDER_REMOVE_FOLDERITEM;
        hookdata.item = item;
+       hookdata.item2 = NULL;
        hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
 
        node = start_node;
@@ -572,6 +591,8 @@ void folder_item_set_xml(Folder *folder, FolderItem *item, XMLTag *tag)
                        item->hide_read_msgs =  *attr->value == '1' ? TRUE : FALSE;
                else if (!strcmp(attr->name, "hidedelmsgs"))
                        item->hide_del_msgs =  *attr->value == '1' ? TRUE : FALSE;
+               else if (!strcmp(attr->name, "hidereadthreads"))
+                       item->hide_read_threads =  *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")) {
@@ -656,6 +677,7 @@ XMLTag *folder_item_get_xml(Folder *folder, FolderItem *item)
        xml_tag_add_attr(tag, xml_attr_new("threaded", item->threaded ? "1" : "0"));
        xml_tag_add_attr(tag, xml_attr_new("hidereadmsgs", item->hide_read_msgs ? "1" : "0"));
        xml_tag_add_attr(tag, xml_attr_new("hidedelmsgs", item->hide_del_msgs ? "1" : "0"));
+       xml_tag_add_attr(tag, xml_attr_new("hidereadthreads", item->hide_read_threads ? "1" : "0"));
        if (item->ret_rcpt)
                xml_tag_add_attr(tag, xml_attr_new("reqretrcpt", "1"));
 
@@ -773,6 +795,7 @@ void folder_add(Folder *folder)
        hookdata.folder = folder;
        hookdata.update_flags = FOLDER_ADD_FOLDER;
        hookdata.item = NULL;
+       hookdata.item2 = NULL;
        hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
 }
 
@@ -787,6 +810,7 @@ void folder_remove(Folder *folder)
        hookdata.folder = folder;
        hookdata.update_flags = FOLDER_REMOVE_FOLDER;
        hookdata.item = NULL;
+       hookdata.item2 = NULL;
        hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
 }
 
@@ -886,13 +910,23 @@ static gboolean folder_scan_tree_func(GNode *node, gpointer data)
 {
        GHashTable *pptable = (GHashTable *)data;
        FolderItem *item = (FolderItem *)node->data;
-       
+
        folder_item_restore_persist_prefs(item, pptable);
        folder_item_scan_full(item, FALSE);
 
        return FALSE;
 }
 
+static gboolean folder_restore_prefs_func(GNode *node, gpointer data)
+{
+       GHashTable *pptable = (GHashTable *)data;
+       FolderItem *item = (FolderItem *)node->data;
+
+       folder_item_restore_persist_prefs(item, pptable);
+
+       return FALSE;
+}
+
 void folder_scan_tree(Folder *folder, gboolean rebuild)
 {
        GHashTable *pptable;
@@ -917,46 +951,14 @@ void folder_scan_tree(Folder *folder, gboolean rebuild)
        hookdata.folder = folder;
        hookdata.update_flags = FOLDER_TREE_CHANGED;
        hookdata.item = NULL;
+       hookdata.item2 = NULL;
        hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
 
-       g_node_traverse(folder->node, G_POST_ORDER, G_TRAVERSE_ALL, -1, folder_scan_tree_func, pptable);
-       folder_persist_prefs_free(pptable);
-
-       prefs_matcher_read_config();
-
-       folder_write_list();
-}
-
-static gboolean folder_restore_prefs_func(GNode *node, gpointer data)
-{
-       GHashTable *pptable = (GHashTable *)data;
-       FolderItem *item = (FolderItem *)node->data;
-       
-       folder_item_restore_persist_prefs(item, pptable);
-
-       return FALSE;
-}
-
-void folder_fast_scan_tree(Folder *folder)
-{
-       GHashTable *pptable;
-       FolderUpdateData hookdata;
-
-       if (!folder->klass->scan_tree)
-               return;
-       
-       pptable = folder_persist_prefs_new(folder);
-
-       if (folder->klass->scan_tree(folder) < 0) {
-               return;
-       } 
-
-       hookdata.folder = folder;
-       hookdata.update_flags = FOLDER_TREE_CHANGED;
-       hookdata.item = NULL;
-       hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
+       if (rebuild)
+               g_node_traverse(folder->node, G_POST_ORDER, G_TRAVERSE_ALL, -1, folder_scan_tree_func, pptable);
+       else
+               g_node_traverse(folder->node, G_POST_ORDER, G_TRAVERSE_ALL, -1, folder_restore_prefs_func, pptable);
 
-       g_node_traverse(folder->node, G_POST_ORDER, G_TRAVERSE_ALL, -1, folder_restore_prefs_func, pptable);
        folder_persist_prefs_free(pptable);
 
        prefs_matcher_read_config();
@@ -982,6 +984,7 @@ FolderItem *folder_create_folder(FolderItem *parent, const gchar *name)
                hookdata.folder = new_item->folder;
                hookdata.update_flags = FOLDER_TREE_CHANGED | FOLDER_ADD_FOLDERITEM;
                hookdata.item = new_item;
+               hookdata.item2 = NULL;
                hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
        }
 
@@ -1008,6 +1011,7 @@ gint folder_item_rename(FolderItem *item, gchar *newname)
 
                hookdata2.folder = item->folder;
                hookdata2.item = item;
+               hookdata2.item2 = NULL;
                hookdata2.update_flags = FOLDER_RENAME_FOLDERITEM;
                hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata2);
        }
@@ -1380,6 +1384,37 @@ gchar *folder_item_get_identifier(FolderItem *item)
        return id;
 }
 
+Folder *folder_find_from_identifier(const gchar *identifier)
+{
+       gchar *str;
+       gchar *p;
+       gchar *name;
+       FolderClass *class;
+
+       cm_return_val_if_fail(identifier != NULL, NULL);
+
+       if (*identifier != '#')
+               return NULL;
+
+       Xstrdup_a(str, identifier, return NULL);
+
+       p = strchr(str, '/');
+       if (!p)
+               return NULL;
+       *p = '\0';
+       p++;
+       class = folder_get_class_from_string(&str[1]);
+       if (class == NULL)
+               return NULL;
+
+       name = p;
+       p = strchr(p, '/');
+       if (p)
+               return NULL;
+
+       return folder_find_from_name(name, class);
+}
+
 FolderItem *folder_find_item_from_identifier(const gchar *identifier)
 {
        Folder *folder;
@@ -1883,7 +1918,7 @@ static gint folder_sort_folder_list(gconstpointer a, gconstpointer b)
 
 static gint syncronize_flags(FolderItem *item, MsgInfoList *msglist)
 {
-       GRelation *relation;
+       GHashTable *relation;
        gint ret = 0;
        GSList *cur;
 
@@ -1894,38 +1929,32 @@ static gint syncronize_flags(FolderItem *item, MsgInfoList *msglist)
        if (item->no_select)
                return 0;
 
-       relation = g_relation_new(2);
-       g_relation_index(relation, 0, g_direct_hash, g_direct_equal);
+       relation = g_hash_table_new(g_direct_hash, g_direct_equal);
        if ((ret = item->folder->klass->get_flags(
            item->folder, item, msglist, relation)) == 0) {
-               GTuples *tuples;
+               gpointer data, old_key;
                MsgInfo *msginfo;
                MsgPermFlags permflags = 0;
-               gboolean skip;
 
                folder_item_update_freeze();
                folder_item_set_batch(item, TRUE);
                for (cur = msglist; cur != NULL; cur = g_slist_next(cur)) {
                        msginfo = (MsgInfo *) cur->data;
                
-                       tuples = g_relation_select(relation, msginfo, 0);
-                       skip = tuples->len < 1;
-                       if (!skip)
-                               permflags = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
-                       g_tuples_destroy(tuples);
-                       if (skip)
-                               continue;
-                       
-                       if (msginfo->flags.perm_flags != permflags) {
-                               procmsg_msginfo_change_flags(msginfo,
-                                       permflags & ~msginfo->flags.perm_flags, 0,
-                                       ~permflags & msginfo->flags.perm_flags, 0);
+                       if (g_hash_table_lookup_extended(relation, msginfo, &old_key, &data)) {
+                               permflags = GPOINTER_TO_INT(data);
+
+                               if (msginfo->flags.perm_flags != permflags) {
+                                       procmsg_msginfo_change_flags(msginfo,
+                                               permflags & ~msginfo->flags.perm_flags, 0,
+                                               ~permflags & msginfo->flags.perm_flags, 0);
+                               }
                        }
                }
                folder_item_set_batch(item, FALSE);
                folder_item_update_thaw();
        }
-       g_relation_destroy(relation);   
+       g_hash_table_destroy(relation); 
 
        return ret;
 }
@@ -2396,7 +2425,6 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
                }
                if ((folder_has_parent_of_type(item, F_OUTBOX) ||
                     folder_has_parent_of_type(item, F_QUEUE)  ||
-                    folder_has_parent_of_type(item, F_DRAFT)  ||
                     folder_has_parent_of_type(item, F_TRASH)) &&
                    (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)))
                        procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
@@ -2718,7 +2746,8 @@ void folder_item_write_cache(FolderItem *item)
                        filemode = prefs->folder_chmod;
                        if (filemode & S_IRGRP) filemode |= S_IWGRP;
                        if (filemode & S_IROTH) filemode |= S_IWOTH;
-                       chmod(cache_file, filemode);
+                       if (cache_file != NULL)
+                               chmod(cache_file, filemode);
                }
         } else {
                item->cache_dirty = FALSE;
@@ -2739,13 +2768,11 @@ void folder_item_write_cache(FolderItem *item)
 
 MsgInfo *folder_item_get_msginfo(FolderItem *item, gint num)
 {
-       Folder *folder;
        MsgInfo *msginfo = NULL;
        
        cm_return_val_if_fail(item != NULL, NULL);
        if (item->no_select)
                return NULL;
-       folder = item->folder;
        if (!item->cache)
                folder_item_read_cache(item);
        
@@ -2763,15 +2790,13 @@ MsgInfo *folder_item_get_msginfo(FolderItem *item, gint num)
 
 MsgInfo *folder_item_get_msginfo_by_msgid(FolderItem *item, const gchar *msgid)
 {
-       Folder *folder;
        MsgInfo *msginfo;
        
        cm_return_val_if_fail(item != NULL, NULL);
        cm_return_val_if_fail(msgid != NULL, NULL);
        if (item->no_select)
-               return FALSE;
+               return NULL;
        
-       folder = item->folder;
        if (!item->cache)
                folder_item_read_cache(item);
        
@@ -2785,7 +2810,7 @@ GSList *folder_item_get_msg_list(FolderItem *item)
 {
        cm_return_val_if_fail(item != NULL, NULL);
        if (item->no_select)
-               return FALSE;
+               return NULL;
        
        if (item->cache == 0)
                folder_item_read_cache(item);
@@ -2806,6 +2831,7 @@ static void msginfo_set_mime_flags(GNode *node, gpointer data)
             strcmp(mimeinfo->subtype, "pkcs7-signature")))) {
                procmsg_msginfo_set_flags(msginfo, 0, MSG_HAS_ATTACHMENT);
        } else if (mimeinfo->disposition == DISPOSITIONTYPE_UNKNOWN && 
+                mimeinfo->id == NULL &&
                 mimeinfo->type != MIMETYPE_TEXT &&
                 mimeinfo->type != MIMETYPE_MULTIPART) {
                if (!mimeinfo->subtype 
@@ -2814,6 +2840,7 @@ static void msginfo_set_mime_flags(GNode *node, gpointer data)
                    strcmp(mimeinfo->subtype, "pkcs7-signature")))
                        procmsg_msginfo_set_flags(msginfo, 0, MSG_HAS_ATTACHMENT);
        } else if (mimeinfo->disposition == DISPOSITIONTYPE_INLINE &&
+                mimeinfo->id == NULL &&
                (strcmp(mimeinfo->subtype, "pgp-signature") &&
                 strcmp(mimeinfo->subtype, "x-pkcs7-signature") &&
                 strcmp(mimeinfo->subtype, "pkcs7-signature")) && 
@@ -3123,7 +3150,7 @@ gint folder_item_add_msgs(FolderItem *dest, GSList *file_list,
         Folder *folder;
         gint ret, num, lastnum = -1;
        GSList *file_cur;
-       GRelation *relation;
+       GHashTable *relation;
        MsgFileInfo *fileinfo = NULL;
        gboolean folderscan = FALSE;
 
@@ -3135,13 +3162,12 @@ gint folder_item_add_msgs(FolderItem *dest, GSList *file_list,
 
         folder = dest->folder;
 
-       relation = g_relation_new(2);
-       g_relation_index(relation, 0, g_direct_hash, g_direct_equal);
+       relation = g_hash_table_new(g_direct_hash, g_direct_equal);
 
        if (folder->klass->add_msgs != NULL) {
                ret = folder->klass->add_msgs(folder, dest, file_list, relation);
                if (ret < 0) {
-                       g_relation_destroy(relation);
+                       g_hash_table_destroy(relation);
                        return ret;
                }
        } else {
@@ -3150,20 +3176,21 @@ gint folder_item_add_msgs(FolderItem *dest, GSList *file_list,
 
                        ret = folder->klass->add_msg(folder, dest, fileinfo->file, fileinfo->flags);
                        if (ret < 0) {
-                               g_relation_destroy(relation);
+                               g_hash_table_destroy(relation);
                                return ret;
                        }
-                       g_relation_insert(relation, fileinfo, GINT_TO_POINTER(ret));
+                       g_hash_table_insert(relation, fileinfo, GINT_TO_POINTER(ret));
                }
        }
 
        for (file_cur = file_list; file_cur != NULL; file_cur = g_slist_next(file_cur)) {
-               GTuples *tuples;
+               gpointer data, old_key;
 
                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 (g_hash_table_lookup_extended(relation, fileinfo, &old_key, &data))
+                       num = GPOINTER_TO_INT(data);
+               else
+                       num = -1;
 
                if (num >= 0) {
                        MsgInfo *newmsginfo;
@@ -3199,7 +3226,7 @@ gint folder_item_add_msgs(FolderItem *dest, GSList *file_list,
                }
        }
 
-       g_relation_destroy(relation);
+       g_hash_table_destroy(relation);
 
         return lastnum;
 }
@@ -3211,6 +3238,7 @@ static FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest,
        FolderItem *next_item;
        GNode *srcnode;
        gchar *old_id, *new_id;
+       FolderUpdateData hookdata;
 
        /* move messages */
        debug_print("%s %s to %s\n", copy?"Copying":"Moving", src->path, dest->path);
@@ -3227,16 +3255,6 @@ static FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest,
        log_message(LOG_PROTOCOL, copy ?_("Copying %s to %s...\n"):_("Moving %s to %s...\n"), 
                        src->name, new_item->path);
 
-       mlist = folder_item_get_msg_list(src);
-       
-       if (mlist != NULL) {
-               if (copy)
-                       folder_item_copy_msgs(new_item, mlist);
-               else
-                       folder_item_move_msgs(new_item, mlist);
-               procmsg_msg_list_free(mlist);
-       }
-       
        /*copy prefs*/
        folder_item_prefs_copy_prefs(src, new_item);
        
@@ -3251,9 +3269,20 @@ static FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest,
        new_item->ret_rcpt  = src->ret_rcpt;
        new_item->hide_read_msgs = src->hide_read_msgs;
        new_item->hide_del_msgs = src->hide_del_msgs;
+       new_item->hide_read_threads = src->hide_read_threads;
        new_item->sort_key  = src->sort_key;
        new_item->sort_type = src->sort_type;
 
+       mlist = folder_item_get_msg_list(src);
+
+       if (mlist != NULL) {
+               if (copy)
+                       folder_item_copy_msgs(new_item, mlist);
+               else
+                       folder_item_move_msgs(new_item, mlist);
+               procmsg_msg_list_free(mlist);
+       }
+
        prefs_matcher_write_config();
        
        /* recurse */
@@ -3272,6 +3301,12 @@ static FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest,
        old_id = folder_item_get_identifier(src);
        new_id = folder_item_get_identifier(new_item);
 
+       hookdata.folder = src->folder;
+       hookdata.update_flags = FOLDER_TREE_CHANGED | FOLDER_MOVE_FOLDERITEM;
+       hookdata.item = src;
+       hookdata.item2 = new_item;
+       hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
+
        /* if src supports removing, otherwise only copy folder */
        if (src->folder->klass->remove_folder != NULL && !copy) 
                src->folder->klass->remove_folder(src->folder, src);
@@ -3303,8 +3338,6 @@ gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_ite
                tmp = folder_item_parent(tmp);
        }
        
-       tmp = folder_item_parent(src);
-       
        src_identifier = folder_item_get_identifier(src);
        dst_identifier = folder_item_get_identifier(dest);
        
@@ -3351,6 +3384,27 @@ gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_ite
        return F_MOVE_OK;
 }
 
+struct find_data
+{
+       gboolean found;
+};     
+static void find_num(gpointer key, gpointer value, gpointer data)
+{
+       struct find_data *fdata = (struct find_data *)data;
+       if (GPOINTER_TO_INT(value) == 0)
+               fdata->found = TRUE;
+}
+
+static gboolean some_msgs_have_zero_num(GHashTable *hashtable)
+{
+       struct find_data fdata;
+       
+       fdata.found = FALSE;
+       g_hash_table_foreach(hashtable, find_num, &fdata);
+       
+       return fdata.found;
+}
+
 /**
  * Copy a list of message to a new folder and remove
  * source messages if wanted
@@ -3361,7 +3415,7 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
        GSList *l;
        gint num, lastnum = -1;
        gboolean folderscan = FALSE;
-       GRelation *relation;
+       GHashTable *relation;
        GSList *not_moved = NULL;
        gint total = 0, curmsg = 0;
        MsgInfo *msginfo = NULL;
@@ -3409,9 +3463,7 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                return queue_err ? -1:0;
        }
 
-       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);
+       relation = g_hash_table_new(g_direct_hash, g_direct_equal);
 
        for (l = msglist ; l != NULL ; l = g_slist_next(l)) {
                MsgInfo * msginfo = (MsgInfo *) l->data;
@@ -3430,7 +3482,7 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
         */
        if (folder->klass->copy_msgs != NULL) {
                if (folder->klass->copy_msgs(folder, dest, msglist, relation) < 0) {
-                       g_relation_destroy(relation);
+                       g_hash_table_destroy(relation);
                        return -1;
                }
        } else {
@@ -3441,7 +3493,7 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                if (l != NULL) {
                        msginfo = (MsgInfo *) l->data;
                        if (msginfo != NULL && msginfo->folder == dest) {
-                               g_relation_destroy(relation);
+                               g_hash_table_destroy(relation);
                                return -1;
                        }
                }
@@ -3451,7 +3503,7 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
 
                        num = folder->klass->copy_msg(folder, dest, msginfo);
                        if (num > 0)
-                               g_relation_insert(relation, msginfo, GINT_TO_POINTER(num));
+                               g_hash_table_insert(relation, msginfo, GINT_TO_POINTER(num));
                        else
                                not_moved = g_slist_prepend(not_moved, msginfo);
                }
@@ -3472,20 +3524,14 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                                                                relation);
                }
                for (l = msglist; l != NULL; l = g_slist_next(l)) {
-                       GTuples *tuples;
+                       gpointer old_key, data;
                        msginfo = (MsgInfo *) l->data;
                        item = msginfo->folder;
 
-                       tuples = g_relation_select(relation, msginfo, 0);
-                       if (tuples) {
-                               if (tuples->len)
-                                       num = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
-                               else
-                                       num = 0;
-                               g_tuples_destroy(tuples);
-                       } else {
-                               num = -1;
-                       }
+                       if (g_hash_table_lookup_extended(relation, msginfo, &old_key, &data))
+                               num = GPOINTER_TO_INT(data);
+                       else
+                               num = 0;
 
                        if (g_slist_find(not_moved, msginfo))
                                continue;
@@ -3509,7 +3555,7 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
         * Fetch new MsgInfos for new messages in dest folder,
         * add them to the msgcache and update folder message counts
         */
-       if (g_relation_count(relation, GINT_TO_POINTER(0), 1) > 0) {
+       if (some_msgs_have_zero_num(relation)) {
                folder_item_scan_full(dest, FALSE);
                folderscan = TRUE;
        }
@@ -3524,19 +3570,16 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
        folder_item_set_batch(dest, TRUE);
        for (l = msglist; l != NULL; l = g_slist_next(l)) {
                MsgInfo *msginfo = (MsgInfo *) l->data;
-                GTuples *tuples;
+                gpointer data, old_key;
 
                if (!msginfo)
                        continue;
-                tuples = g_relation_select(relation, msginfo, 0);
-               if (tuples && tuples->len > 0) {
-                       num = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
-                       g_tuples_destroy(tuples);
-               } else {
+
+                if (g_hash_table_lookup_extended(relation, msginfo, &old_key, &data))
+                       num = GPOINTER_TO_INT(data);
+               else
                        num = 0;
-                       if (tuples)
-                               g_tuples_destroy(tuples);
-               }
+
                statusbar_progress_all(curmsg++,total, 100);
                if (curmsg % 100 == 0)
                        GTK_EVENTS_FLUSH();
@@ -3563,13 +3606,12 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                                        }
                                }
                        }
-
-                       if (msginfo->planned_download 
-                           == POP3_PARTIAL_DLOAD_DELE) {
+                       if (newmsginfo != NULL 
+                        && msginfo->planned_download == POP3_PARTIAL_DLOAD_DELE) {
                                partial_mark_for_delete(newmsginfo);
                        }
-                       if (msginfo->planned_download 
-                           == POP3_PARTIAL_DLOAD_DLOAD) {
+                       if (newmsginfo != NULL 
+                        && msginfo->planned_download == POP3_PARTIAL_DLOAD_DLOAD) {
                                partial_mark_for_download(newmsginfo);
                        }
                        if (!MSG_IS_POSTFILTERED (msginfo->flags)) {
@@ -3590,7 +3632,7 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
        statusbar_progress_all(0,0,0);
        statusbar_pop_all();
 
-       g_relation_destroy(relation);
+       g_hash_table_destroy(relation);
        if (not_moved != NULL) {
                g_slist_free(not_moved);
                return -1;
@@ -3695,7 +3737,8 @@ gint folder_item_remove_msg(FolderItem *item, gint num)
 
        if (!item->folder->account || item->folder->account->imap_use_trash) {
                if (msginfo != NULL) {
-                       remove_msginfo_from_cache(item, msginfo);
+                       if (ret == 0)
+                               remove_msginfo_from_cache(item, msginfo);
                        procmsg_msginfo_free(msginfo);
                }
        }
@@ -3734,17 +3777,18 @@ gint folder_item_remove_msgs(FolderItem *item, GSList *msglist)
                                                        real_list,
                                                        NULL);
        }
-       while (ret == 0 && real_list != NULL) {
-               MsgInfo *msginfo = (MsgInfo *)real_list->data;
+       cur = real_list;
+       while (ret == 0 && cur != NULL) {
+               MsgInfo *msginfo = (MsgInfo *)cur->data;
                if (msginfo && MSG_IS_LOCKED(msginfo->flags)) {
-                       real_list = real_list->next;
+                       cur = cur->next;
                        continue;
                }
                if (!item->folder->klass->remove_msgs)
                        ret = folder_item_remove_msg(item, msginfo->msgnum);
                if (ret != 0) break;
                msgcache_remove_msg(item->cache, msginfo->msgnum);
-               real_list = real_list->next;
+               cur = cur->next;
        }
        g_slist_free(real_list);
        folder_item_scan_full(item, FALSE);
@@ -4025,6 +4069,8 @@ static gpointer xml_to_folder_item(gpointer nodedata, gpointer data)
 
 static gboolean folder_item_set_node(GNode *node, gpointer data)
 {
+       cm_return_val_if_fail(node->data != NULL, -1);
+
        FolderItem *item = (FolderItem *) node->data;
        item->node = node;
 
@@ -4078,7 +4124,7 @@ static Folder *folder_get_from_xml(GNode *node)
        return folder;
 }
 
-static gchar *folder_get_list_path(void)
+gchar *folder_get_list_path(void)
 {
        static gchar *filename = NULL;
 
@@ -4208,60 +4254,49 @@ static gchar * folder_item_get_tree_identifier(FolderItem * item)
 #define TEMP_FOLDER "TEMP_FOLDER"
 #define PROCESSING_FOLDER_ITEM "processing"    
 
-static FolderItem *processing_folder_item;
-
-static void folder_create_processing_folder(void)
+static FolderItem *folder_create_processing_folder(int account_id)
 {
-       Folder *processing_folder;
-       gchar      *tmpname;
+       static Folder *processing_folder = NULL;
+       FolderItem *processing_folder_item;
+
+       gchar *processing_folder_item_name = NULL;
 
-       if ((processing_folder = folder_find_from_name(TEMP_FOLDER, mh_get_class())) == NULL) {
-               gchar *tmppath;
+        processing_folder_item_name = g_strdup_printf("%s-%d", PROCESSING_FOLDER_ITEM, account_id);
 
-               tmppath =
+       if (processing_folder == NULL) {
+               gchar *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);
+               tmppath = NULL;
+               
+               g_assert(processing_folder != NULL);
+               processing_folder->klass->scan_tree(processing_folder);
        }
        g_assert(processing_folder != NULL);
 
-       debug_print("tmpparentroot %s\n", LOCAL_FOLDER(processing_folder)->rootpath);
-        /* FIXME: [W32] The code below does not correctly merge
-           relative filenames; there should be a function to handle
-           this.  */
-       if (!is_relative_filename(LOCAL_FOLDER(processing_folder)->rootpath))
-               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(processing_folder)->rootpath,
-                                     G_DIR_SEPARATOR_S, PROCESSING_FOLDER_ITEM,
-                                     NULL);
-
-       if (!is_dir_exist(tmpname)) {
-               debug_print("*TMP* creating %s\n", tmpname);
+       processing_folder_item = folder_find_child_item_by_name(FOLDER_ITEM(processing_folder->node->data),
+                                       processing_folder_item_name);
+       if (processing_folder_item) {
+               debug_print("*TMP* already created %s\n", folder_item_get_path(processing_folder_item));
+       } else {
                processing_folder_item = processing_folder->klass->create_folder(processing_folder,
                                                                                 processing_folder->node->data,
-                                                                                PROCESSING_FOLDER_ITEM);
-       } else {
-               debug_print("*TMP* already created\n");
-               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);
-       }
+                                                                                processing_folder_item_name);
+               folder_item_append(FOLDER_ITEM(processing_folder->node->data), processing_folder_item);
+               debug_print("*TMP* creating %s\n", folder_item_get_path(processing_folder_item));
+       } 
+       g_free(processing_folder_item_name);
        g_assert(processing_folder_item != NULL);
-       g_free(tmpname);
+
+       return(processing_folder_item);
 }
 
-FolderItem *folder_get_default_processing(void)
+FolderItem *folder_get_default_processing(int account_id)
 {
-       if (!processing_folder_item) {
-               folder_create_processing_folder();
-       }
-       return processing_folder_item;
+       return folder_create_processing_folder(account_id);
 }
 
 /* folder_persist_prefs_new() - return hash table with persistent
@@ -4313,6 +4348,7 @@ static void folder_item_restore_persist_prefs(FolderItem *item, GHashTable *ppta
        item->ret_rcpt  = pp->ret_rcpt;
        item->hide_read_msgs = pp->hide_read_msgs;
        item->hide_del_msgs = pp->hide_del_msgs;
+       item->hide_read_threads = pp->hide_read_threads;
        item->sort_key  = pp->sort_key;
        item->sort_type = pp->sort_type;
 }
@@ -4339,6 +4375,7 @@ static void folder_get_persist_prefs_recursive(GNode *node, GHashTable *pptable)
                pp->ret_rcpt  = item->ret_rcpt; 
                pp->hide_read_msgs = item->hide_read_msgs;
                pp->hide_del_msgs = item->hide_del_msgs;
+               pp->hide_read_threads = item->hide_read_threads;
                pp->sort_key  = item->sort_key;
                pp->sort_type = item->sort_type;
                g_hash_table_insert(pptable, id, pp);
@@ -4643,6 +4680,22 @@ gboolean folder_has_parent_of_type(FolderItem *item,
        return FALSE;
 }
 
+gboolean folder_is_child_of(FolderItem *item, FolderItem *parent)
+{
+       if (item == NULL || parent == NULL)
+               return FALSE;
+
+       while (item != NULL) {
+               if (parent == item)
+                       return TRUE;
+
+               item = folder_item_parent(item);
+       }
+
+       return FALSE;
+}
+
+
 gboolean folder_subscribe (const gchar *uri)
 {
        GList *cur;
@@ -4669,3 +4722,92 @@ gboolean folder_get_sort_type            (Folder         *folder,
        folder->klass->get_sort_type(folder, sort_key, sort_type); 
        return TRUE;
 }
+
+gint folder_item_search_msgs   (Folder                 *folder,
+                                FolderItem             *container,
+                                MsgNumberList          **msgs,
+                                gboolean               *on_server,
+                                MatcherList            *predicate,
+                                SearchProgressNotify   progress_cb,
+                                gpointer               progress_data)
+{
+       gint result = -1;
+       
+       folder_item_update_freeze();
+
+       if (folder->klass->search_msgs)
+               result = folder->klass->search_msgs(folder, container,
+                               msgs, on_server, predicate, progress_cb, progress_data);
+       if (result < 0)
+               result = folder_item_search_msgs_local(folder, container,
+                               msgs, on_server, predicate, progress_cb, progress_data);
+       
+       folder_item_update_thaw();
+
+       return result;
+}
+
+MsgNumberList *folder_item_get_number_list(FolderItem *item)
+{
+       GSList *nums = NULL;
+       GSList *msglist = folder_item_get_msg_list(item);
+
+       nums = procmsg_get_number_list_for_msgs(msglist);
+       procmsg_msg_list_free(msglist);
+       
+       return nums;
+}
+
+gint folder_item_search_msgs_local     (Folder                 *folder,
+                                        FolderItem             *container,
+                                        MsgNumberList          **msgs,
+                                        gboolean               *on_server,
+                                        MatcherList            *predicate,
+                                        SearchProgressNotify   progress_cb,
+                                        gpointer               progress_data)
+{
+       GSList *result = NULL;
+       GSList *cur = NULL;
+       gint matched_count = 0;
+       guint processed_count = 0;
+       gint msgcount;
+       GSList *nums = NULL;
+
+       if (*msgs == NULL) {
+               nums = folder_item_get_number_list(container);
+       } else {
+               nums = *msgs;
+       }
+
+       msgcount = g_slist_length(nums);
+
+       if (msgcount < 0)
+               return -1;
+
+       for (cur = nums; cur != NULL; cur = cur->next) {
+               guint msgnum = GPOINTER_TO_UINT(cur->data);
+               MsgInfo *msg = folder_item_get_msginfo(container, msgnum);
+
+               if (msg == NULL) {
+                       g_slist_free(result);
+                       return -1;
+               }
+
+               if (matcherlist_match(predicate, msg)) {
+                       result = g_slist_prepend(result, GUINT_TO_POINTER(msg->msgnum));
+                       matched_count++;
+               }
+               processed_count++;
+
+               if (progress_cb != NULL
+                   && !progress_cb(progress_data, FALSE, processed_count,
+                           matched_count, msgcount))
+                       break;
+       }
+
+       g_slist_free(nums);
+       *msgs = g_slist_reverse(result);
+
+       return matched_count;
+}
+