fix bug 2979, 'claws fails to load (empty) folderlist.xml and shows account wizard'
[claws.git] / src / folder.c
index 0b5278ec7bd454951b71f58383e9b3575acfcd36..1b4ec03903d676eec50a8113deee414fbacac9de 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
+#include "claws-features.h"
 #endif
 
 #include "defs.h"
@@ -57,6 +58,9 @@
 #include "gtkutils.h"
 #include "timing.h"
 #include "compose.h"
+#include "main.h"
+#include "msgcache.h"
+#include "privacy.h"
 
 /* Dependecies to be removed ?! */
 #include "prefs_common.h"
@@ -83,7 +87,7 @@ 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_get_list_path     (void);
+static gchar *folder_item_get_tags_file        (FolderItem     *item);
 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);
@@ -100,7 +104,6 @@ static GHashTable *folder_persist_prefs_new (Folder *folder);
 static void folder_persist_prefs_free          (GHashTable *pptable);
 static void folder_item_restore_persist_prefs  (FolderItem *item, GHashTable *pptable);
 
-
 void folder_system_init(void)
 {
        folder_register_class(mh_get_class());
@@ -135,9 +138,10 @@ void folder_register_class(FolderClass *klass)
                                Folder *folder;
 
                                folder = folder_get_from_xml(node);
-                               folder_add(folder);
-                               folder_unloaded_list = g_slist_remove(folder_unloaded_list, node);
-
+                               if (folder) {
+                                       folder_add(folder);
+                                       folder_unloaded_list = g_slist_remove(folder_unloaded_list, node);
+                               }
                                cur = NULL;
                                continue;
                        }
@@ -172,7 +176,7 @@ Folder *folder_new(FolderClass *klass, const gchar *name, const gchar *path)
        Folder *folder = NULL;
        FolderItem *item;
 
-       g_return_val_if_fail(klass != NULL, NULL);
+       cm_return_val_if_fail(klass != NULL, NULL);
 
        name = name ? name : path;
        folder = klass->new_folder(name, path);
@@ -191,7 +195,7 @@ Folder *folder_new(FolderClass *klass, const gchar *name, const gchar *path)
 
 void folder_init(Folder *folder, const gchar *name)
 {
-       g_return_if_fail(folder != NULL);
+       cm_return_if_fail(folder != NULL);
 
        folder_set_name(folder, name);
 
@@ -214,6 +218,9 @@ void folder_item_change_type(FolderItem *item, SpecialFolderItemType newtype)
        Folder *folder = NULL;
        FolderUpdateData hookdata;
 
+       if (item == NULL)
+               return;
+
        folder = item->folder;
        /* unset previous root of newtype */
        switch(newtype) {
@@ -253,8 +260,8 @@ void folder_item_change_type(FolderItem *item, SpecialFolderItemType newtype)
 
 void folder_destroy(Folder *folder)
 {
-       g_return_if_fail(folder != NULL);
-       g_return_if_fail(folder->klass->destroy_folder != NULL);
+       cm_return_if_fail(folder != NULL);
+       cm_return_if_fail(folder->klass->destroy_folder != NULL);
 
        folder_remove(folder);
 
@@ -328,7 +335,7 @@ FolderItem *folder_item_new(Folder *folder, const gchar *name, const gchar *path
 {
        FolderItem *item = NULL;
        
-       g_return_val_if_fail(folder != NULL, NULL);
+       cm_return_val_if_fail(folder != NULL, NULL);
        
        if (folder->klass->item_new) {
                item = folder->klass->item_new(folder);
@@ -336,7 +343,7 @@ FolderItem *folder_item_new(Folder *folder, const gchar *name, const gchar *path
                item = g_new0(FolderItem, 1);
        }
 
-       g_return_val_if_fail(item != NULL, NULL);
+       cm_return_val_if_fail(item != NULL, NULL);
 
        item->stype = F_NORMAL;
        item->name = g_strdup(name);
@@ -347,6 +354,11 @@ FolderItem *folder_item_new(Folder *folder, const gchar *name, const gchar *path
        item->unreadmarked_msgs = 0;
        item->marked_msgs = 0;
        item->total_msgs = 0;
+       item->replied_msgs = 0;
+       item->forwarded_msgs = 0;
+       item->locked_msgs = 0;
+       item->ignored_msgs = 0;
+       item->watched_msgs = 0;
        item->order = 0;
        item->last_num = -1;
        item->cache = NULL;
@@ -375,10 +387,10 @@ FolderItem *folder_item_new(Folder *folder, const gchar *name, const gchar *path
 
 void folder_item_append(FolderItem *parent, FolderItem *item)
 {
-       g_return_if_fail(parent != NULL);
-       g_return_if_fail(parent->folder != NULL);
-       g_return_if_fail(parent->node != NULL);
-       g_return_if_fail(item != NULL);
+       cm_return_if_fail(parent != NULL);
+       cm_return_if_fail(parent->folder != NULL);
+       cm_return_if_fail(parent->node != NULL);
+       cm_return_if_fail(item != NULL);
 
        item->folder = parent->folder;
        g_node_append(parent->node, item->node);
@@ -388,12 +400,13 @@ void folder_item_remove(FolderItem *item)
 {
        GNode *node, *start_node;
        FolderUpdateData hookdata;
+       gchar *tags_file = NULL, *tags_dir = NULL;
 
-       g_return_if_fail(item != NULL);
-       g_return_if_fail(item->folder != NULL);
-       g_return_if_fail(item->folder->node != 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;
        
@@ -414,6 +427,15 @@ void folder_item_remove(FolderItem *item)
                msgcache_destroy(item->cache);
                item->cache = NULL;
        }
+       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;
@@ -434,9 +456,9 @@ void folder_item_remove_children(FolderItem *item)
 {
        GNode *node, *next;
 
-       g_return_if_fail(item != NULL);
-       g_return_if_fail(item->folder != NULL);
-       g_return_if_fail(item->node != NULL);
+       cm_return_if_fail(item != NULL);
+       cm_return_if_fail(item->folder != NULL);
+       cm_return_if_fail(item->node != NULL);
 
        node = item->node->children;
        while (node != NULL) {
@@ -450,7 +472,7 @@ void folder_item_destroy(FolderItem *item)
 {
        Folder *folder;
 
-       g_return_if_fail(item != NULL);
+       cm_return_if_fail(item != NULL);
 
        folder = item->folder;
        if (folder) {
@@ -484,8 +506,8 @@ void folder_item_destroy(FolderItem *item)
 
 FolderItem *folder_item_parent(FolderItem *item)
 {
-       g_return_val_if_fail(item != NULL, NULL);
-       g_return_val_if_fail(item->node != NULL, NULL);
+       cm_return_val_if_fail(item != NULL, NULL);
+       cm_return_val_if_fail(item->node != NULL, NULL);
 
        if (item->node->parent == NULL)
                return NULL;
@@ -529,6 +551,16 @@ void folder_item_set_xml(Folder *folder, FolderItem *item, XMLTag *tag)
                        item->unreadmarked_msgs = atoi(attr->value);
                else if (!strcmp(attr->name, "marked"))
                        item->marked_msgs = atoi(attr->value);
+               else if (!strcmp(attr->name, "replied"))
+                       item->replied_msgs = atoi(attr->value);
+               else if (!strcmp(attr->name, "forwarded"))
+                       item->forwarded_msgs = atoi(attr->value);
+               else if (!strcmp(attr->name, "locked"))
+                       item->locked_msgs = atoi(attr->value);
+               else if (!strcmp(attr->name, "ignored"))
+                       item->ignored_msgs = atoi(attr->value);
+               else if (!strcmp(attr->name, "watched"))
+                       item->watched_msgs = atoi(attr->value);
                else if (!strcmp(attr->name, "order"))
                        item->order = atoi(attr->value);
                else if (!strcmp(attr->name, "total"))
@@ -545,6 +577,10 @@ void folder_item_set_xml(Folder *folder, FolderItem *item, XMLTag *tag)
                        item->threaded =  *attr->value == '1' ? TRUE : FALSE;
                else if (!strcmp(attr->name, "hidereadmsgs"))
                        item->hide_read_msgs =  *attr->value == '1' ? TRUE : FALSE;
+               else if (!strcmp(attr->name, "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")) {
@@ -574,6 +610,10 @@ void folder_item_set_xml(Folder *folder, FolderItem *item, XMLTag *tag)
                                item->sort_key = SORT_BY_TO;
                        else if (!strcmp(attr->value, "locked"))
                                item->sort_key = SORT_BY_LOCKED;
+                       else if (!strcmp(attr->value, "tags"))
+                               item->sort_key = SORT_BY_TAGS;
+                       else if (!strcmp(attr->value, "thread_date"))
+                               item->sort_key = SORT_BY_THREAD_DATE;
                } else if (!strcmp(attr->name, "sort_type")) {
                        if (!strcmp(attr->value, "ascending"))
                                item->sort_type = SORT_ASCENDING;
@@ -587,8 +627,14 @@ void folder_item_set_xml(Folder *folder, FolderItem *item, XMLTag *tag)
                                g_warning("account_id: %s not found\n", attr->value);
                        else
                                item->account = account;
-               } else if (!strcmp(attr->name, "apply_sub"))
+               } else if (!strcmp(attr->name, "apply_sub")) {
                        item->apply_sub = *attr->value == '1' ? TRUE : FALSE;
+               } else if (!strcmp(attr->name, "last_seen")) {
+                       if (!claws_crashed())
+                               item->last_seen = atoi(attr->value);
+                       else
+                               item->last_seen = 0;
+               }
        }
 }
 
@@ -599,7 +645,7 @@ XMLTag *folder_item_get_xml(Folder *folder, FolderItem *item)
        static gchar *sort_key_str[] = {"none", "number", "size", "date",
                                        "from", "subject", "score", "label",
                                        "mark", "unread", "mime", "to", 
-                                       "locked"};
+                                       "locked", "tags", "thread_date" };
        XMLTag *tag;
        gchar *value;
 
@@ -618,6 +664,8 @@ XMLTag *folder_item_get_xml(Folder *folder, FolderItem *item)
        xml_tag_add_attr(tag, xml_attr_new("thread_collapsed", item->thread_collapsed ? "1" : "0"));
        xml_tag_add_attr(tag, xml_attr_new("threaded", item->threaded ? "1" : "0"));
        xml_tag_add_attr(tag, xml_attr_new("hidereadmsgs", item->hide_read_msgs ? "1" : "0"));
+       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"));
 
@@ -634,6 +682,11 @@ XMLTag *folder_item_get_xml(Folder *folder, FolderItem *item)
        xml_tag_add_attr(tag, xml_attr_new_int("unreadmarked", item->unreadmarked_msgs));
        xml_tag_add_attr(tag, xml_attr_new_int("marked", item->marked_msgs));
        xml_tag_add_attr(tag, xml_attr_new_int("total", item->total_msgs));
+       xml_tag_add_attr(tag, xml_attr_new_int("replied", item->replied_msgs));
+       xml_tag_add_attr(tag, xml_attr_new_int("forwarded", item->forwarded_msgs));
+       xml_tag_add_attr(tag, xml_attr_new_int("locked", item->locked_msgs));
+       xml_tag_add_attr(tag, xml_attr_new_int("ignore", item->ignored_msgs));
+       xml_tag_add_attr(tag, xml_attr_new_int("watched", item->watched_msgs));
        xml_tag_add_attr(tag, xml_attr_new_int("order", item->order));
 
        if (item->account)
@@ -641,12 +694,14 @@ XMLTag *folder_item_get_xml(Folder *folder, FolderItem *item)
        if (item->apply_sub)
                xml_tag_add_attr(tag, xml_attr_new("apply_sub", "1"));
 
+       xml_tag_add_attr(tag, xml_attr_new_int("last_seen", item->last_seen));
+
        return tag;
 }
 
 void folder_set_ui_func(Folder *folder, FolderUIFunc func, gpointer data)
 {
-       g_return_if_fail(folder != NULL);
+       cm_return_if_fail(folder != NULL);
 
        folder->ui_func = func;
        folder->ui_func_data = data;
@@ -654,7 +709,7 @@ void folder_set_ui_func(Folder *folder, FolderUIFunc func, gpointer data)
 
 void folder_set_name(Folder *folder, const gchar *name)
 {
-       g_return_if_fail(folder != NULL);
+       cm_return_if_fail(folder != NULL);
 
        g_free(folder->name);
        folder->name = name ? g_strdup(name) : NULL;
@@ -668,7 +723,7 @@ void folder_set_name(Folder *folder, const gchar *name)
 
 void folder_set_sort(Folder *folder, guint sort)
 {
-       g_return_if_fail(folder != NULL);
+       cm_return_if_fail(folder != NULL);
 
        if (folder->sort != sort) {
                folder_remove(folder);
@@ -688,7 +743,7 @@ void folder_tree_destroy(Folder *folder)
 {
        GNode *node;
 
-       g_return_if_fail(folder != NULL);
+       cm_return_if_fail(folder != NULL);
 
        node = folder->node;
        
@@ -709,7 +764,13 @@ void folder_add(Folder *folder)
        gint i;
        FolderUpdateData hookdata;
 
-       g_return_if_fail(folder != NULL);
+       cm_return_if_fail(folder != NULL);
+
+       if ((FOLDER_TYPE(folder) == F_IMAP ||
+            FOLDER_TYPE(folder) == F_NEWS) &&
+           folder->account == NULL) {
+               return;
+       }
 
        for (i = 0, cur = folder_list; cur != NULL; cur = cur->next, i++) {
                cur_folder = FOLDER(cur->data);
@@ -729,7 +790,7 @@ void folder_remove(Folder *folder)
 {
        FolderUpdateData hookdata;
 
-       g_return_if_fail(folder != NULL);
+       cm_return_if_fail(folder != NULL);
 
        folder_list = g_list_remove(folder_list, folder);
 
@@ -916,12 +977,17 @@ void folder_fast_scan_tree(Folder *folder)
 FolderItem *folder_create_folder(FolderItem *parent, const gchar *name)
 {
        FolderItem *new_item;
+       
+       cm_return_val_if_fail(parent != NULL, NULL);
 
        new_item = parent->folder->klass->create_folder(parent->folder, parent, name);
        if (new_item) {
                FolderUpdateData hookdata;
 
                new_item->cache = msgcache_new();
+               new_item->cache_dirty = TRUE;
+               new_item->mark_dirty = TRUE;
+               new_item->tags_dirty = TRUE;
 
                hookdata.folder = new_item->folder;
                hookdata.update_flags = FOLDER_TREE_CHANGED | FOLDER_ADD_FOLDERITEM;
@@ -936,8 +1002,8 @@ gint folder_item_rename(FolderItem *item, gchar *newname)
 {
        gint retval;
 
-       g_return_val_if_fail(item != NULL, -1);
-       g_return_val_if_fail(newname != NULL, -1);
+       cm_return_val_if_fail(item != NULL, -1);
+       cm_return_val_if_fail(newname != NULL, -1);
 
        retval = item->folder->klass->rename_folder(item->folder, item, newname);
 
@@ -966,6 +1032,11 @@ struct TotalMsgCount
        guint unreadmarked_msgs;
        guint marked_msgs;
        guint total_msgs;
+       guint replied_msgs;
+       guint forwarded_msgs;
+       guint locked_msgs;
+       guint ignored_msgs;
+       guint watched_msgs;
 };
 
 struct FuncToAllFoldersData
@@ -979,10 +1050,10 @@ static gboolean folder_func_to_all_folders_func(GNode *node, gpointer data)
        FolderItem *item;
        struct FuncToAllFoldersData *function_data = (struct FuncToAllFoldersData *) data;
 
-       g_return_val_if_fail(node->data != NULL, FALSE);
+       cm_return_val_if_fail(node->data != NULL, FALSE);
 
        item = FOLDER_ITEM(node->data);
-       g_return_val_if_fail(item != NULL, FALSE);
+       cm_return_val_if_fail(item != NULL, FALSE);
 
        function_data->function(item, function_data->data);
 
@@ -1017,6 +1088,11 @@ static void folder_count_total_msgs_func(FolderItem *item, gpointer data)
        count->unreadmarked_msgs += item->unreadmarked_msgs;
        count->marked_msgs += item->marked_msgs;
        count->total_msgs += item->total_msgs;
+       count->replied_msgs += item->replied_msgs;
+       count->forwarded_msgs += item->forwarded_msgs;
+       count->locked_msgs += item->locked_msgs;
+       count->ignored_msgs += item->ignored_msgs;
+       count->watched_msgs += item->watched_msgs;
 }
 
 struct TotalMsgStatus
@@ -1033,7 +1109,7 @@ static gboolean folder_get_status_full_all_func(GNode *node, gpointer data)
        struct TotalMsgStatus *status = (struct TotalMsgStatus *)data;
        gchar *id;
  
-       g_return_val_if_fail(node->data != NULL, FALSE);
+       cm_return_val_if_fail(node->data != NULL, FALSE);
  
        item = FOLDER_ITEM(node->data);
 
@@ -1128,11 +1204,16 @@ gchar *folder_get_status(GPtrArray *folders, gboolean full)
 
 void folder_count_total_msgs(guint *new_msgs, guint *unread_msgs, 
                             guint *unreadmarked_msgs, guint *marked_msgs,
-                            guint *total_msgs)
+                            guint *total_msgs, guint *replied_msgs,
+                            guint *forwarded_msgs, guint *locked_msgs,
+                            guint *ignored_msgs, guint *watched_msgs)
 {
        struct TotalMsgCount count;
 
-       count.new_msgs = count.unread_msgs = count.unreadmarked_msgs = count.total_msgs = 0;
+       count.new_msgs = count.unread_msgs = count.unreadmarked_msgs = 0;
+       count.total_msgs = count.replied_msgs = count.forwarded_msgs = 0;
+       count.locked_msgs = count.ignored_msgs = count.watched_msgs = 0;
+       count.marked_msgs = 0;
 
        debug_print("Counting total number of messages...\n");
 
@@ -1143,6 +1224,11 @@ void folder_count_total_msgs(guint *new_msgs, guint *unread_msgs,
        *unreadmarked_msgs = count.unreadmarked_msgs;
        *marked_msgs = count.marked_msgs;
        *total_msgs = count.total_msgs;
+       *replied_msgs = count.replied_msgs;
+       *forwarded_msgs = count.forwarded_msgs;
+       *locked_msgs = count.locked_msgs;
+       *ignored_msgs = count.ignored_msgs;
+       *watched_msgs = count.watched_msgs;
 }
 
 Folder *folder_find_from_path(const gchar *path)
@@ -1198,7 +1284,7 @@ FolderItem *folder_find_item_from_path(const gchar *path)
        
        folder = list ? list->data:NULL;
        
-       g_return_val_if_fail(folder != NULL, NULL);
+       cm_return_val_if_fail(folder != NULL, NULL);
 
        d[0] = (gpointer)path;
        d[1] = NULL;
@@ -1211,20 +1297,53 @@ FolderItem *folder_find_item_from_path(const gchar *path)
        return d[1];
 }
 
+static gboolean folder_item_find_func_real_path(GNode *node, gpointer data)
+{
+       FolderItem *item = node->data;
+       gpointer *d = data;
+       const gchar *path = d[0];
+       gchar *tmp = folder_item_get_path(item);
+       if (path_cmp(path, tmp) != 0) {
+               g_free(tmp);
+               return FALSE;
+       }
+       g_free(tmp);
+       d[1] = item;
+
+       return TRUE;
+}
+
+FolderItem *folder_find_item_from_real_path(const gchar *path)
+{
+       Folder *folder;
+       gpointer d[2];
+       GList *list = folder_get_list();
+       
+       folder = list ? list->data:NULL;
+       
+       cm_return_val_if_fail(folder != NULL, NULL);
+
+       d[0] = (gpointer)path;
+       d[1] = NULL;
+       while (d[1] == NULL && list) {
+               folder = FOLDER(list->data);
+               g_node_traverse(folder->node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
+                       folder_item_find_func_real_path, d);
+               list = list->next;
+       }
+       return d[1];
+}
+
 FolderItem *folder_find_child_item_by_name(FolderItem *item, const gchar *name)
 {
        GNode *node;
        FolderItem *child;
 
        for (node = item->node->children; node != NULL; node = node->next) {
-               gchar *base;
                child = FOLDER_ITEM(node->data);
-               base = g_path_get_basename(child->path);
-               if (strcmp2(base, name) == 0) {
-                       g_free(base);
+               if (strcmp2(child->name, name) == 0) {
                        return child;
                }
-               g_free(base);
        }
 
        return NULL;
@@ -1244,11 +1363,11 @@ FolderClass *folder_get_class_from_string(const gchar *str)
        return NULL;
 }
 
-static gchar *folder_get_identifier(Folder *folder)
+gchar *folder_get_identifier(Folder *folder)
 {
        gchar *type_str;
 
-       g_return_val_if_fail(folder != NULL, NULL);
+       cm_return_val_if_fail(folder != NULL, NULL);
 
        type_str = folder->klass->idstr;
        return g_strconcat("#", type_str, "/", folder->name, NULL);
@@ -1259,7 +1378,7 @@ gchar *folder_item_get_identifier(FolderItem *item)
        gchar *id = NULL;
        gchar *folder_id = NULL;
 
-       g_return_val_if_fail(item != NULL, NULL);
+       cm_return_val_if_fail(item != NULL, NULL);
 
        if (item->path == NULL)
                return NULL;
@@ -1271,6 +1390,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;
@@ -1281,7 +1431,7 @@ FolderItem *folder_find_item_from_identifier(const gchar *identifier)
        gchar *path;
        FolderClass *class;
 
-       g_return_val_if_fail(identifier != NULL, NULL);
+       cm_return_val_if_fail(identifier != NULL, NULL);
 
        if (*identifier != '#')
                return folder_find_item_from_path(identifier);
@@ -1317,6 +1467,91 @@ FolderItem *folder_find_item_from_identifier(const gchar *identifier)
        return d[1];
 }
 
+/** Returns the FolderItem from a given identifier
+ *
+ * The FolderItem is created if it doesn't already exist.
+ * If creation failed, the function returns NULL.
+ * 
+ * Identifiers are of the form #type/Mailbox/FolderA/FolderB/FolderC
+ */
+FolderItem *folder_get_item_from_identifier(const gchar *identifier)
+{
+       FolderItem *item, *last_parent;
+       Folder *folder;
+       gchar *p1, *p2, *str;
+       size_t len;
+       FolderClass *class;
+       gboolean created_something = FALSE;
+
+       item = folder_find_item_from_identifier(identifier);
+       if(item)
+               return item;
+
+       /* trivial sanity check: need at least # and two slashes */
+       len = strlen(identifier);
+       if(len < 3)
+               return NULL;
+
+       /* make sure identifier ends with a slash */
+       if(identifier[len-1] == G_DIR_SEPARATOR) {
+               Xstrdup_a(str, identifier, return NULL);
+       }
+       else {
+               Xstrndup_a(str, identifier, len+1, return NULL);
+               str[len] = G_DIR_SEPARATOR;
+       }
+
+       /* find folder class */
+       p1 = strchr(str, G_DIR_SEPARATOR);
+       if(!p1)
+               return NULL;
+       *p1 = '\0';
+       class = folder_get_class_from_string(&str[1]);
+       if(!class)
+               return NULL;
+       *p1 = G_DIR_SEPARATOR;
+       ++p1;
+
+       /* find folder from class and name */
+       p2 = strchr(p1, G_DIR_SEPARATOR);
+       if(!p2)
+               return NULL;
+       *p2 = '\0';
+       folder = folder_find_from_name(p1, class);
+       if(!folder)
+               return NULL;
+       *p2 = G_DIR_SEPARATOR;
+       ++p2;
+       p1 = p2;
+
+       /* Now, move forward and make sure all sections in the path exist */
+       last_parent = folder->node->data;
+       while((p1 = strchr(p1, G_DIR_SEPARATOR)) != NULL) {
+               *p1 = '\0';
+               item = folder_find_item_from_identifier(str);
+               if(!item) {
+                       item = folder_create_folder(last_parent, p2);
+                       if(!item)
+                               return NULL;
+                       debug_print("Created folder '%s'\n", str);
+                       created_something = TRUE;
+                       if(prefs_common.inherit_folder_props && (last_parent != item->folder->node->data)) {
+                               folder_item_prefs_copy_prefs(last_parent, item);
+                       }
+               }
+               last_parent = item;
+               *p1 = G_DIR_SEPARATOR;
+               ++p1;
+               p2 = p1;
+       }
+
+       if(created_something)
+               folder_write_list();
+
+       return item;
+}
+
+
 /**
  * Get a displayable name for a FolderItem
  *
@@ -1328,7 +1563,7 @@ gchar *folder_item_get_name(FolderItem *item)
 {
        gchar *name = NULL;
 
-       g_return_val_if_fail(item != NULL, g_strdup(""));
+       cm_return_val_if_fail(item != NULL, g_strdup(""));
 
        switch (item->stype) {
        case F_INBOX:
@@ -1450,6 +1685,26 @@ FolderItem *folder_get_default_outbox(void)
        return NULL;
 }
 
+FolderItem *folder_get_default_outbox_for_class(FolderType type)
+{
+       GList *flist;
+
+       for (flist = folder_list; flist != NULL; flist = g_list_next(flist)) {
+               Folder * folder = FOLDER(flist->data);
+
+               if (folder == NULL)
+                       continue;
+               if (folder->outbox == NULL)
+                       continue;
+               if (folder->klass->type != type)
+                       continue;
+
+               return folder->outbox;
+       }
+
+       return NULL;
+}
+
 FolderItem *folder_get_default_draft(void)
 {
        GList *flist;
@@ -1470,6 +1725,26 @@ FolderItem *folder_get_default_draft(void)
        return NULL;
 }
 
+FolderItem *folder_get_default_draft_for_class(FolderType type)
+{
+       GList *flist;
+
+       for (flist = folder_list; flist != NULL; flist = g_list_next(flist)) {
+               Folder * folder = FOLDER(flist->data);
+
+               if (folder == NULL)
+                       continue;
+               if (folder->draft == NULL)
+                       continue;
+               if (folder->klass->type != type)
+                       continue;
+
+               return folder->draft;
+       }
+
+       return NULL;
+}
+
 FolderItem *folder_get_default_queue(void)
 {
        GList *flist;
@@ -1490,6 +1765,26 @@ FolderItem *folder_get_default_queue(void)
        return NULL;
 }
 
+FolderItem *folder_get_default_queue_for_class(FolderType type)
+{
+       GList *flist;
+
+       for (flist = folder_list; flist != NULL; flist = g_list_next(flist)) {
+               Folder * folder = FOLDER(flist->data);
+
+               if (folder == NULL)
+                       continue;
+               if (folder->queue == NULL)
+                       continue;
+               if (folder->klass->type != type)
+                       continue;
+
+               return folder->queue;
+       }
+
+       return NULL;
+}
+
 FolderItem *folder_get_default_trash(void)
 {
        GList *flist;
@@ -1510,6 +1805,26 @@ FolderItem *folder_get_default_trash(void)
        return NULL;
 }
 
+FolderItem *folder_get_default_trash_for_class(FolderType type)
+{
+       GList *flist;
+
+       for (flist = folder_list; flist != NULL; flist = g_list_next(flist)) {
+               Folder * folder = FOLDER(flist->data);
+
+               if (folder == NULL)
+                       continue;
+               if (folder->trash == NULL)
+                       continue;
+               if (folder->klass->type != type)
+                       continue;
+
+               return folder->trash;
+       }
+
+       return NULL;
+}
+
 #define CREATE_FOLDER_IF_NOT_EXIST(member, dir, type)          \
 {                                                              \
        if (!folder->member) {                                  \
@@ -1531,7 +1846,7 @@ void folder_set_missing_folders(void)
                folder = list->data;
                if (FOLDER_TYPE(folder) != F_MH) continue;
                rootitem = FOLDER_ITEM(folder->node->data);
-               g_return_if_fail(rootitem != NULL);
+               cm_return_if_fail(rootitem != NULL);
 
                if (folder->inbox && folder->outbox && folder->draft &&
                    folder->queue && folder->trash)
@@ -1584,32 +1899,13 @@ gchar *folder_item_get_path(FolderItem *item)
 {
        Folder *folder;
 
-       g_return_val_if_fail(item != NULL, NULL);
+       cm_return_val_if_fail(item != NULL, NULL);
        folder = item->folder;
-       g_return_val_if_fail(folder != NULL, NULL);
+       cm_return_val_if_fail(folder != NULL, NULL);
 
        return folder->klass->item_get_path(folder, item);
 }
 
-void folder_item_set_default_flags(FolderItem *dest, MsgFlags *flags)
-{
-       if (!(folder_has_parent_of_type(dest, F_OUTBOX) ||
-             folder_has_parent_of_type(dest, F_QUEUE)  ||
-             folder_has_parent_of_type(dest, F_DRAFT) ||
-             folder_has_parent_of_type(dest, F_TRASH))) {
-               flags->perm_flags = MSG_NEW|MSG_UNREAD;
-       } else {
-               flags->perm_flags = 0;
-       }
-       if (FOLDER_TYPE(dest->folder) == F_MH) {
-               if (folder_has_parent_of_type(dest, F_QUEUE)) {
-                       MSG_SET_TMP_FLAGS(*flags, MSG_QUEUED);
-               } else if (folder_has_parent_of_type(dest, F_DRAFT)) {
-                       MSG_SET_TMP_FLAGS(*flags, MSG_DRAFT);
-               }
-       }
-}
-
 static gint folder_sort_cache_list_by_msgnum(gconstpointer a, gconstpointer b)
 {
        MsgInfo *msginfo_a = (MsgInfo *) a;
@@ -1626,7 +1922,81 @@ static gint folder_sort_folder_list(gconstpointer a, gconstpointer b)
        return (gint_a - gint_b);
 }
 
-void folder_item_process_open (FolderItem *item,
+static gint syncronize_flags(FolderItem *item, MsgInfoList *msglist)
+{
+       GHashTable *relation;
+       gint ret = 0;
+       GSList *cur;
+
+       if(msglist == NULL)
+               return 0;
+       if(item->folder->klass->get_flags == NULL)
+               return 0;
+       if (item->no_select)
+               return 0;
+
+       relation = g_hash_table_new(g_direct_hash, g_direct_equal);
+       if ((ret = item->folder->klass->get_flags(
+           item->folder, item, msglist, relation)) == 0) {
+               gpointer data, old_key;
+               MsgInfo *msginfo;
+               MsgPermFlags permflags = 0;
+
+               folder_item_update_freeze();
+               folder_item_set_batch(item, TRUE);
+               for (cur = msglist; cur != NULL; cur = g_slist_next(cur)) {
+                       msginfo = (MsgInfo *) cur->data;
+               
+                       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_hash_table_destroy(relation); 
+
+       return ret;
+}
+
+static gint folder_item_syncronize_flags(FolderItem *item)
+{
+       MsgInfoList *msglist = NULL;
+       GSList *cur;
+       gint ret = 0;
+       
+       cm_return_val_if_fail(item != NULL, -1);
+       cm_return_val_if_fail(item->folder != NULL, -1);
+       cm_return_val_if_fail(item->folder->klass != NULL, -1);
+       if (item->no_select)
+               return -1;
+
+       item->scanning = ITEM_SCANNING_WITH_FLAGS;
+
+       if (item->cache == NULL)
+               folder_item_read_cache(item);
+       
+       msglist = msgcache_get_msg_list(item->cache);
+       
+       ret = syncronize_flags(item, msglist);
+
+       for (cur = msglist; cur != NULL; cur = g_slist_next(cur))
+               procmsg_msginfo_free((MsgInfo *) cur->data);
+       
+       g_slist_free(msglist);
+
+       item->scanning = ITEM_NOT_SCANNING;
+
+       return ret;
+}
+
+static void folder_item_process_open (FolderItem *item,
                                 void (*before_proc_func)(gpointer data),
                                 void (*after_proc_func)(gpointer data),
                                 gpointer data)
@@ -1642,18 +2012,19 @@ void folder_item_process_open (FolderItem *item,
        }
        
        /* Processing */
-       buf = g_strdup_printf(_("Processing (%s)...\n"), 
+       if (item->prefs->enable_processing_when_opening) {
+               buf = g_strdup_printf(_("Processing (%s)...\n"), 
                              item->path ? item->path : item->name);
-       g_free(buf);
+               g_free(buf);
 
-       if (before_proc_func)
-               before_proc_func(data);
+               if (before_proc_func)
+                       before_proc_func(data);
 
-       folder_item_apply_processing(item);
-
-       if (after_proc_func)
-               after_proc_func(data);
+               folder_item_apply_processing(item);
 
+               if (after_proc_func)
+                       after_proc_func(data);
+       }
        item->processing_pending = FALSE;
        return; 
 }
@@ -1664,7 +2035,7 @@ gint folder_item_open(FolderItem *item)
        if (item->no_select)
                return -1;
 
-       if (item->scanning) {
+       if (item->scanning != ITEM_NOT_SCANNING) {
                debug_print("%s is scanning... \n", item->path ? item->path : item->name);
                return -2;
        }
@@ -1682,7 +2053,7 @@ gint folder_item_close(FolderItem *item)
        GSList *mlist, *cur;
        Folder *folder;
        
-       g_return_val_if_fail(item != NULL, -1);
+       cm_return_val_if_fail(item != NULL, -1);
 
        if (item->no_select)
                return -1;
@@ -1757,53 +2128,6 @@ static MsgInfo *get_msginfo(FolderItem *item, guint num)
        return msginfo;
 }
 
-static gint syncronize_flags(FolderItem *item, MsgInfoList *msglist)
-{
-       GRelation *relation;
-       gint ret = 0;
-       GSList *cur;
-
-       if(msglist == NULL)
-               return 0;
-       if(item->folder->klass->get_flags == NULL)
-               return 0;
-       if (item->no_select)
-               return 0;
-
-       relation = g_relation_new(2);
-       g_relation_index(relation, 0, g_direct_hash, g_direct_equal);
-       folder_item_set_batch(item, TRUE);
-       if ((ret = item->folder->klass->get_flags(
-           item->folder, item, msglist, relation)) == 0) {
-               GTuples *tuples;
-               MsgInfo *msginfo;
-               MsgPermFlags permflags = 0;
-               gboolean skip;
-
-               for (cur = msglist; cur != NULL; cur = g_slist_next(cur)) {
-                       msginfo = (MsgInfo *) cur->data;
-               
-                       tuples = g_relation_select(relation, msginfo, 0);
-                       skip = tuples->len < 1;
-                       if (!skip)
-                               permflags = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
-                       g_tuples_destroy(tuples);
-                       if (skip)
-                               continue;
-                       
-                       if (msginfo->flags.perm_flags != permflags) {
-                               procmsg_msginfo_change_flags(msginfo,
-                                       permflags & ~msginfo->flags.perm_flags, 0,
-                                       ~permflags & msginfo->flags.perm_flags, 0);
-                       }
-               }
-       }
-       folder_item_set_batch(item, FALSE);
-       g_relation_destroy(relation);   
-
-       return ret;
-}
-
 gint folder_item_scan_full(FolderItem *item, gboolean filtering)
 {
        Folder *folder;
@@ -1813,26 +2137,29 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
        GSList *newmsg_list = NULL;
        guint newcnt = 0, unreadcnt = 0, totalcnt = 0;
        guint markedcnt = 0, unreadmarkedcnt = 0;
+       guint repliedcnt = 0, forwardedcnt = 0;
+       guint lockedcnt = 0, ignoredcnt = 0, watchedcnt = 0;
+
        guint cache_max_num, folder_max_num, cache_cur_num, folder_cur_num;
        gboolean update_flags = 0, old_uids_valid = FALSE;
        GHashTable *subject_table = NULL;
        
-       g_return_val_if_fail(item != NULL, -1);
+       cm_return_val_if_fail(item != NULL, -1);
        if (item->path == NULL) return -1;
 
        folder = item->folder;
 
-       g_return_val_if_fail(folder != NULL, -1);
-       g_return_val_if_fail(folder->klass->get_num_list != NULL, -1);
+       cm_return_val_if_fail(folder != NULL, -1);
+       cm_return_val_if_fail(folder->klass->get_num_list != NULL, -1);
 
-       item->scanning = TRUE;
+       item->scanning = ITEM_SCANNING_WITH_FLAGS;
 
        debug_print("Scanning folder %s for cache changes.\n", item->path ? item->path : "(null)");
        
        /* Get list of messages for folder and cache */
        if (folder->klass->get_num_list(item->folder, item, &folder_list, &old_uids_valid) < 0) {
                debug_print("Error fetching list of message numbers\n");
-               item->scanning = FALSE;
+               item->scanning = ITEM_NOT_SCANNING;
                return(-1);
        }
 
@@ -1848,6 +2175,9 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
                if (item->cache)
                        msgcache_destroy(item->cache);
                item->cache = msgcache_new();
+               item->cache_dirty = TRUE;
+               item->mark_dirty = TRUE;
+               item->tags_dirty = TRUE;
                cache_list = NULL;
        }
 
@@ -1914,7 +2244,8 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
                        }
 
                        /* Move to next folder number */
-                       folder_list_cur = folder_list_cur->next;
+                       if (folder_list_cur)
+                               folder_list_cur = folder_list_cur->next;
 
                        if (folder_list_cur != NULL)
                                folder_cur_num = GPOINTER_TO_INT(folder_list_cur->data);
@@ -1933,7 +2264,8 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
                        debug_print("Removed message %d from cache.\n", cache_cur_num);
 
                        /* Move to next cache number */
-                       cache_list_cur = cache_list_cur->next;
+                       if (cache_list_cur)
+                               cache_list_cur = cache_list_cur->next;
 
                        if (cache_list_cur != NULL)
                                cache_cur_num = ((MsgInfo *)cache_list_cur->data)->msgnum;
@@ -1953,13 +2285,13 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
                        MsgInfo *msginfo;
 
                        msginfo = msgcache_get_msg(item->cache, folder_cur_num);
-                       if (folder->klass->is_msg_changed && folder->klass->is_msg_changed(folder, item, msginfo)) {
+                       if (msginfo && 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);
 
                                debug_print("Remembering message %d to update...\n", folder_cur_num);
-                       } else {
+                       } else if (msginfo) {
                                exists_list = g_slist_prepend(exists_list, msginfo);
 
                                if(prefs_common.thread_by_subject &&
@@ -1970,8 +2302,11 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
                        }
                        
                        /* Move to next folder and cache number */
-                       cache_list_cur = cache_list_cur->next;
-                       folder_list_cur = folder_list_cur->next;
+                       if (cache_list_cur)
+                               cache_list_cur = cache_list_cur->next;
+                       
+                       if (folder_list_cur)
+                               folder_list_cur = folder_list_cur->next;
 
                        if (cache_list_cur != NULL)
                                cache_cur_num = ((MsgInfo *)cache_list_cur->data)->msgnum;
@@ -2005,6 +2340,9 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
        }
 
        folder_item_update_freeze();
+       
+       item->scanning = ITEM_SCANNING;
+
        if (newmsg_list != NULL) {
                GSList *elem, *to_filter = NULL;
                gboolean do_filter = (filtering == TRUE) &&
@@ -2029,9 +2367,12 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
 
                if (do_filter) {
                        GSList *unfiltered;
+                       
+                       folder_item_set_batch(item, TRUE);
                        procmsg_msglist_filter(newmsg_list, item->folder->account, 
                                        &to_filter, &unfiltered, 
                                        TRUE);
+                       folder_item_set_batch(item, FALSE);
                        
                        filtering_move_and_copy_msgs(newmsg_list);
                        if (to_filter != NULL) {
@@ -2054,7 +2395,12 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
                                }
                                g_slist_free(unfiltered);
                        }
-               } 
+                       if (prefs_common.real_time_sync)
+                               folder_item_synchronise(item);
+               } else {
+                       if (prefs_common.real_time_sync)
+                               folder_item_synchronise(item);
+               }
 
                g_slist_free(newmsg_list);
 
@@ -2071,6 +2417,9 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
                if (!MSG_IS_IGNORE_THREAD(msginfo->flags) && procmsg_msg_has_flagged_parent(msginfo, MSG_IGNORE_THREAD)) {
                        procmsg_msginfo_change_flags(msginfo, MSG_IGNORE_THREAD, 0, MSG_NEW | MSG_UNREAD, 0);
                }
+               if (!MSG_IS_WATCH_THREAD(msginfo->flags) && procmsg_msg_has_flagged_parent(msginfo, MSG_WATCH_THREAD)) {
+                       procmsg_msginfo_set_flags(msginfo, MSG_WATCH_THREAD, 0);
+               }
                if(prefs_common.thread_by_subject && !msginfo->inreplyto &&
                        !msginfo->references && !MSG_IS_IGNORE_THREAD(msginfo->flags) &&
                        (parent_msginfo = subject_table_lookup(subject_table, msginfo->subject)))
@@ -2094,6 +2443,16 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
                        unreadmarkedcnt++;
                if (MSG_IS_MARKED(msginfo->flags))
                        markedcnt++;
+               if (MSG_IS_REPLIED(msginfo->flags))
+                       repliedcnt++;
+               if (MSG_IS_FORWARDED(msginfo->flags))
+                       forwardedcnt++;
+               if (MSG_IS_LOCKED(msginfo->flags))
+                       lockedcnt++;
+               if (MSG_IS_IGNORE_THREAD(msginfo->flags))
+                       ignoredcnt++;
+               if (MSG_IS_WATCH_THREAD(msginfo->flags))
+                       watchedcnt++;
 
                totalcnt++;
 
@@ -2108,7 +2467,10 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
        
        if (item->new_msgs != newcnt || item->unread_msgs != unreadcnt
        ||  item->total_msgs != totalcnt || item->marked_msgs != markedcnt
-       ||  item->unreadmarked_msgs != unreadmarkedcnt) {
+       ||  item->unreadmarked_msgs != unreadmarkedcnt
+       ||  item->replied_msgs != repliedcnt || item->forwarded_msgs != forwardedcnt
+       ||  item->locked_msgs != lockedcnt || item->ignored_msgs != ignoredcnt
+       ||  item->watched_msgs != watchedcnt) {
                update_flags |= F_ITEM_UPDATE_CONTENT;
        }
 
@@ -2117,72 +2479,35 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
        item->total_msgs = totalcnt;
        item->unreadmarked_msgs = unreadmarkedcnt;
        item->marked_msgs = markedcnt;
+       item->replied_msgs = repliedcnt;
+       item->forwarded_msgs = forwardedcnt;
+       item->locked_msgs = lockedcnt;
+       item->ignored_msgs = ignoredcnt;
+       item->watched_msgs = watchedcnt;
 
        update_flags |= F_ITEM_UPDATE_MSGCNT;
 
        folder_item_update(item, update_flags);
        folder_item_update_thaw();
        
-       item->scanning = FALSE;
+       item->scanning = ITEM_NOT_SCANNING;
 
        return 0;
 }
 
 gint folder_item_scan(FolderItem *item)
-{
-       return folder_item_scan_full(item, TRUE);
-}
-
-static void folder_item_scan_foreach_func(gpointer key, gpointer val,
-                                         gpointer data)
-{
-       folder_item_scan(FOLDER_ITEM(key));
-}
-
-void folder_item_scan_foreach(GHashTable *table)
-{
-       g_hash_table_foreach(table, folder_item_scan_foreach_func, NULL);
-}
-
-static void folder_count_total_cache_memusage(FolderItem *item, gpointer data)
-{
-       gint *memusage = (gint *)data;
-
-       if (item->cache == NULL)
-               return;
-       
-       *memusage += msgcache_get_memory_usage(item->cache);
-}
-
-gint folder_item_syncronize_flags(FolderItem *item)
-{
-       MsgInfoList *msglist = NULL;
-       GSList *cur;
-       gint ret = 0;
-       
-       g_return_val_if_fail(item != NULL, -1);
-       g_return_val_if_fail(item->folder != NULL, -1);
-       g_return_val_if_fail(item->folder->klass != NULL, -1);
-       if (item->no_select)
-               return -1;
-
-       item->scanning = TRUE;
-
-       if (item->cache == NULL)
-               folder_item_read_cache(item);
-       
-       msglist = msgcache_get_msg_list(item->cache);
-       
-       ret = syncronize_flags(item, msglist);
-
-       for (cur = msglist; cur != NULL; cur = g_slist_next(cur))
-               procmsg_msginfo_free((MsgInfo *) cur->data);
-       
-       g_slist_free(msglist);
+{
+       return folder_item_scan_full(item, TRUE);
+}
 
-       item->scanning = FALSE;
+static void folder_count_total_cache_memusage(FolderItem *item, gpointer data)
+{
+       gint *memusage = (gint *)data;
 
-       return ret;
+       if (item->cache == NULL)
+               return;
+       
+       *memusage += msgcache_get_memory_usage(item->cache);
 }
 
 static gint folder_cache_time_compare_func(gconstpointer a, gconstpointer b)
@@ -2215,7 +2540,7 @@ static void folder_find_expired_caches(FolderItem *item, gpointer data)
 
 gboolean folder_item_free_cache(FolderItem *item, gboolean force)
 {
-       g_return_val_if_fail(item != NULL, TRUE);
+       cm_return_val_if_fail(item != NULL, TRUE);
        
        if (item->cache == NULL)
                return TRUE;
@@ -2275,23 +2600,65 @@ void folder_clean_cache_memory(FolderItem *protected_item)
        }
 }
 
+static void folder_item_remove_cached_msg(FolderItem *item, MsgInfo *msginfo)
+{
+       Folder *folder = item->folder;
+
+       cm_return_if_fail(folder != NULL);
+
+       if (folder->klass->remove_cached_msg == NULL)
+               return;
+       
+       folder->klass->remove_cached_msg(folder, item, msginfo);
+}
+
+static void folder_item_clean_local_files(FolderItem *item, gint days)
+{
+       cm_return_if_fail(item != NULL);
+       cm_return_if_fail(item->folder != NULL);
+
+       if (FOLDER_TYPE(item->folder) == F_IMAP ||
+           FOLDER_TYPE(item->folder) == F_NEWS) {
+               GSList *msglist = folder_item_get_msg_list(item);
+               GSList *cur;
+               time_t t = time(NULL);
+               for (cur = msglist; cur; cur = cur->next) {
+                       MsgInfo *msginfo = (MsgInfo *)cur->data;
+                       gint age = (t - msginfo->date_t) / (60*60*24);
+                       if (age > days)
+                               folder_item_remove_cached_msg(item, msginfo);
+               }
+               procmsg_msg_list_free(msglist);
+       }
+}
+
 static void folder_item_read_cache(FolderItem *item)
 {
-       gchar *cache_file, *mark_file;
+       gchar *cache_file, *mark_file, *tags_file;
        START_TIMING("");
-       g_return_if_fail(item != NULL);
+       cm_return_if_fail(item != NULL);
 
        if (item->path != NULL) {
                cache_file = folder_item_get_cache_file(item);
                mark_file = folder_item_get_mark_file(item);
+               tags_file = folder_item_get_tags_file(item);
                item->cache = msgcache_read_cache(item, cache_file);
+               item->cache_dirty = FALSE;
+               item->mark_dirty = FALSE;
+               item->tags_dirty = FALSE;
                if (!item->cache) {
                        MsgInfoList *list, *cur;
                        guint newcnt = 0, unreadcnt = 0;
                        guint markedcnt = 0, unreadmarkedcnt = 0;
+                       guint repliedcnt = 0, forwardedcnt = 0;
+                       guint lockedcnt = 0, ignoredcnt = 0;
+                       guint watchedcnt = 0;
                        MsgInfo *msginfo;
 
                        item->cache = msgcache_new();
+                       item->cache_dirty = TRUE;
+                       item->mark_dirty = TRUE;
+                       item->tags_dirty = TRUE;
                        folder_item_scan_full(item, TRUE);
 
                        msgcache_read_mark(item->cache, mark_file);
@@ -2308,27 +2675,50 @@ static void folder_item_read_cache(FolderItem *item)
                                        unreadmarkedcnt++;
                                if (MSG_IS_MARKED(msginfo->flags))
                                        markedcnt++;
+                               if (MSG_IS_REPLIED(msginfo->flags))
+                                       repliedcnt++;
+                               if (MSG_IS_FORWARDED(msginfo->flags))
+                                       forwardedcnt++;
+                               if (MSG_IS_LOCKED(msginfo->flags))
+                                       lockedcnt++;
+                               if (MSG_IS_IGNORE_THREAD(msginfo->flags))
+                                       ignoredcnt++;
+                               if (MSG_IS_WATCH_THREAD(msginfo->flags))
+                                       watchedcnt++;
+                               procmsg_msginfo_unset_flags(msginfo, MSG_FULLY_CACHED, 0);
                        }
                        item->new_msgs = newcnt;
                        item->unread_msgs = unreadcnt;
                        item->unreadmarked_msgs = unreadmarkedcnt;
                        item->marked_msgs = markedcnt;
+                       item->replied_msgs = repliedcnt;
+                       item->forwarded_msgs = forwardedcnt;
+                       item->locked_msgs = lockedcnt;
+                       item->ignored_msgs = ignoredcnt;
+                       item->watched_msgs = watchedcnt;
                        procmsg_msg_list_free(list);
                } else
                        msgcache_read_mark(item->cache, mark_file);
 
+               msgcache_read_tags(item->cache, tags_file);
+
                g_free(cache_file);
                g_free(mark_file);
+               g_free(tags_file);
        } else {
                item->cache = msgcache_new();
+               item->cache_dirty = TRUE;
+               item->mark_dirty = TRUE;
+               item->tags_dirty = TRUE;
        }
+
        END_TIMING();
        folder_clean_cache_memory(item);
 }
 
 void folder_item_write_cache(FolderItem *item)
 {
-       gchar *cache_file, *mark_file;
+       gchar *cache_file = NULL, *mark_file = NULL, *tags_file = NULL;
        FolderItemPrefs *prefs;
        gint filemode = 0;
        gchar *id;
@@ -2338,18 +2728,25 @@ void folder_item_write_cache(FolderItem *item)
        if (!item || !item->path || !item->cache)
                return;
 
-       if (FOLDER_TYPE(item->folder) == F_MH) {
-               last_mtime = item->mtime;
-               need_scan = item->folder->klass->scan_required(item->folder, item);
+       last_mtime = item->mtime;
+       if (item->folder->klass->set_mtime) {
+               if (item->folder->klass->scan_required)
+                       need_scan = item->folder->klass->scan_required(item->folder, item);
+               else
+                       need_scan = TRUE;
        }
 
        id = folder_item_get_identifier(item);
        debug_print("Save cache for folder %s\n", id);
        g_free(id);
 
-       cache_file = folder_item_get_cache_file(item);
-       mark_file = folder_item_get_mark_file(item);
-       if (msgcache_write(cache_file, mark_file, item->cache) < 0) {
+       if (item->cache_dirty)
+               cache_file = folder_item_get_cache_file(item);
+       if (item->cache_dirty || item->mark_dirty)
+               mark_file = folder_item_get_mark_file(item);
+       if (item->cache_dirty || item->tags_dirty)
+               tags_file = folder_item_get_tags_file(item);
+       if (msgcache_write(cache_file, mark_file, tags_file, item->cache) < 0) {
                prefs = item->prefs;
                if (prefs && prefs->enable_folder_chmod && prefs->folder_chmod) {
                        /* for cache file */
@@ -2358,27 +2755,30 @@ void folder_item_write_cache(FolderItem *item)
                        if (filemode & S_IROTH) filemode |= S_IWOTH;
                        chmod(cache_file, filemode);
                }
-        }
+        } else {
+               item->cache_dirty = FALSE;
+               item->mark_dirty = FALSE;
+               item->tags_dirty = FALSE;
+       }
 
-       if (!need_scan && FOLDER_TYPE(item->folder) == F_MH) {
+       if (!need_scan && item->folder->klass->set_mtime) {
                if (item->mtime == last_mtime) {
-                       mh_set_mtime(item);
+                       item->folder->klass->set_mtime(item->folder, item);
                }
        }
 
        g_free(cache_file);
        g_free(mark_file);
+       g_free(tags_file);
 }
 
 MsgInfo *folder_item_get_msginfo(FolderItem *item, gint num)
 {
-       Folder *folder;
        MsgInfo *msginfo = NULL;
        
-       g_return_val_if_fail(item != NULL, 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);
        
@@ -2396,15 +2796,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;
        
-       g_return_val_if_fail(item != NULL, NULL);
-       g_return_val_if_fail(msgid != NULL, NULL);
+       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);
        
@@ -2416,14 +2814,14 @@ MsgInfo *folder_item_get_msginfo_by_msgid(FolderItem *item, const gchar *msgid)
 
 GSList *folder_item_get_msg_list(FolderItem *item)
 {
-       g_return_val_if_fail(item != NULL, NULL);
+       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);
 
-       g_return_val_if_fail(item->cache != NULL, NULL);
+       cm_return_val_if_fail(item->cache != NULL, NULL);
        
        return msgcache_get_msg_list(item->cache);
 }
@@ -2434,16 +2832,24 @@ static void msginfo_set_mime_flags(GNode *node, gpointer data)
        MimeInfo *mimeinfo = node->data;
        
        if (mimeinfo->disposition == DISPOSITIONTYPE_ATTACHMENT
-        && (!mimeinfo->subtype ||  strcmp(mimeinfo->subtype, "pgp-signature"))) {
+        && (!mimeinfo->subtype || (strcmp(mimeinfo->subtype, "pgp-signature") &&
+            strcmp(mimeinfo->subtype, "x-pkcs7-signature") &&
+            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 
-               ||  strcmp(mimeinfo->subtype, "pgp-signature"))
+               || (strcmp(mimeinfo->subtype, "pgp-signature") && 
+                   strcmp(mimeinfo->subtype, "x-pkcs7-signature") &&
+                   strcmp(mimeinfo->subtype, "pkcs7-signature")))
                        procmsg_msginfo_set_flags(msginfo, 0, MSG_HAS_ATTACHMENT);
        } else if (mimeinfo->disposition == DISPOSITIONTYPE_INLINE &&
-               strcmp(mimeinfo->subtype, "pgp-signature") && 
+                mimeinfo->id == NULL &&
+               (strcmp(mimeinfo->subtype, "pgp-signature") &&
+                strcmp(mimeinfo->subtype, "x-pkcs7-signature") &&
+                strcmp(mimeinfo->subtype, "pkcs7-signature")) && 
                (procmime_mimeinfo_get_parameter(mimeinfo, "name") != NULL ||
                 procmime_mimeinfo_get_parameter(mimeinfo, "filename") != NULL)) {
                procmsg_msginfo_set_flags(msginfo, 0, MSG_HAS_ATTACHMENT);
@@ -2471,11 +2877,11 @@ gchar *folder_item_fetch_msg(FolderItem *item, gint num)
        gchar *msgfile;
        MsgInfo *msginfo;
 
-       g_return_val_if_fail(item != NULL, NULL);
+       cm_return_val_if_fail(item != NULL, NULL);
 
        folder = item->folder;
 
-       g_return_val_if_fail(folder->klass->fetch_msg != NULL, NULL);
+       cm_return_val_if_fail(folder->klass->fetch_msg != NULL, NULL);
        if (item->no_select)
                return NULL;
 
@@ -2512,7 +2918,7 @@ gchar *folder_item_fetch_msg_full(FolderItem *item, gint num, gboolean headers,
        gchar *msgfile;
        MsgInfo *msginfo;
 
-       g_return_val_if_fail(item != NULL, NULL);
+       cm_return_val_if_fail(item != NULL, NULL);
        if (item->no_select)
                return NULL;
        
@@ -2521,7 +2927,11 @@ gchar *folder_item_fetch_msg_full(FolderItem *item, gint num, gboolean headers,
        if (folder->klass->fetch_msg_full == NULL)
                return folder_item_fetch_msg(item, num);
 
-       msgfile = folder->klass->fetch_msg_full(folder, item, num, 
+       if (item->prefs->offlinesync && prefs_common.real_time_sync)
+               msgfile = folder->klass->fetch_msg_full(folder, item, num, 
+                                               TRUE, TRUE);
+       else
+               msgfile = folder->klass->fetch_msg_full(folder, item, num, 
                                                headers, body);
 
        if (msgfile != NULL) {
@@ -2549,61 +2959,6 @@ gchar *folder_item_fetch_msg_full(FolderItem *item, gint num, gboolean headers,
 }
 
 
-gint folder_item_fetch_all_msg(FolderItem *item)
-{
-       Folder *folder;
-       GSList *mlist;
-       GSList *cur;
-       gint num = 0;
-       gint ret = 0;
-       gint total = 0;
-
-       g_return_val_if_fail(item != NULL, -1);
-       if (item->no_select)
-               return -1;
-
-       debug_print("fetching all messages in %s ...\n", item->path ? item->path : "(null)");
-       statusbar_print_all(_("Fetching all messages in %s ...\n"), item->path ? item->path : "(null)");
-
-       folder = item->folder;
-
-       if (folder->ui_func)
-               folder->ui_func(folder, item, folder->ui_func_data ?
-                               folder->ui_func_data : GINT_TO_POINTER(num));
-
-       mlist = folder_item_get_msg_list(item);
-
-       total = g_slist_length(mlist);
-
-       for (cur = mlist; cur != NULL; cur = cur->next) {
-               MsgInfo *msginfo = (MsgInfo *)cur->data;
-               gchar *msg;
-
-               statusbar_progress_all(num++,total, 10);
-
-               if (folder->ui_func)
-                       folder->ui_func(folder, item,
-                                       folder->ui_func_data ?
-                                       folder->ui_func_data :
-                                       GINT_TO_POINTER(num));
-
-               msg = folder_item_fetch_msg(item, msginfo->msgnum);
-               if (!msg) {
-                       g_warning("Can't fetch message %d. Aborting.\n",
-                                 msginfo->msgnum);
-                       ret = -1;
-                       break;
-               }
-               g_free(msg);
-       }
-       
-       statusbar_progress_all(0,0,0);
-       statusbar_pop_all();
-       procmsg_msg_list_free(mlist);
-
-       return ret;
-}
-
 static gint folder_item_get_msg_num_by_file(FolderItem *dest, const gchar *file)
 {
        static HeaderEntry hentry[] = {{"Message-ID:",  NULL, TRUE},
@@ -2618,10 +2973,27 @@ static gint folder_item_get_msg_num_by_file(FolderItem *dest, const gchar *file)
 
        if ((folder_has_parent_of_type(dest, F_QUEUE)) || 
            (folder_has_parent_of_type(dest, F_DRAFT)))
-               while (fgets(buf, sizeof(buf), fp) != NULL)
+               while (fgets(buf, sizeof(buf), fp) != NULL) {
+                       /* new way */
+                       if ((!strncmp(buf, "X-Claws-End-Special-Headers: 1",
+                               strlen("X-Claws-End-Special-Headers:"))) ||
+                           (!strncmp(buf, "X-Sylpheed-End-Special-Headers: 1",
+                               strlen("X-Sylpheed-End-Special-Headers:"))))
+                               break;
+                       /* old way */
                        if (buf[0] == '\r' || buf[0] == '\n') break;
+                       /* from other mailers */
+                       if (!strncmp(buf, "Date: ", 6)
+                       ||  !strncmp(buf, "To: ", 4)
+                       ||  !strncmp(buf, "From: ", 6)
+                       ||  !strncmp(buf, "Subject: ", 9)) {
+                               rewind(fp);
+                               break;
+                       }
+               }
 
        procheader_get_header_fields(fp, hentry);
+       debug_print("looking for %s\n", hentry[0].body);
        if (hentry[0].body) {
                extract_parenthesis(hentry[0].body, '<', '>');
                remove_space(hentry[0].body);
@@ -2666,6 +3038,12 @@ static void copy_msginfo_flags(MsgInfo *source, MsgInfo *dest)
        if (procmsg_msg_has_flagged_parent(dest, MSG_IGNORE_THREAD))
                perm_flags |= MSG_IGNORE_THREAD;
 
+       /* unset FULLY_CACHED flags */
+       perm_flags &= ~MSG_FULLY_CACHED;
+
+       if (procmsg_msg_has_flagged_parent(dest, MSG_WATCH_THREAD))
+               perm_flags |= MSG_WATCH_THREAD;
+
        /* Unset tmp flags that should not be copied */
        tmp_flags &= ~(MSG_MOVE | MSG_COPY | MSG_MOVE_DONE);
 
@@ -2676,6 +3054,12 @@ static void copy_msginfo_flags(MsgInfo *source, MsgInfo *dest)
                                  ~dest->flags.tmp_flags  & tmp_flags,
                                   dest->flags.perm_flags & ~perm_flags,
                                   dest->flags.tmp_flags  & ~tmp_flags);
+       
+       if (source && source->tags) {
+               g_slist_free(dest->tags);
+               dest->tags = g_slist_copy(source->tags);
+               folder_item_commit_tags(dest->folder, dest, dest->tags, NULL);
+       }
 }
 
 static void add_msginfo_to_cache(FolderItem *item, MsgInfo *newmsginfo, MsgInfo *flagsource)
@@ -2689,6 +3073,16 @@ static void add_msginfo_to_cache(FolderItem *item, MsgInfo *newmsginfo, MsgInfo
                item->unreadmarked_msgs++;
        if (MSG_IS_MARKED(newmsginfo->flags))
                item->marked_msgs++;
+       if (MSG_IS_REPLIED(newmsginfo->flags))
+               item->replied_msgs++;
+       if (MSG_IS_FORWARDED(newmsginfo->flags))
+               item->forwarded_msgs++;
+       if (MSG_IS_LOCKED(newmsginfo->flags))
+               item->locked_msgs++;
+       if (MSG_IS_IGNORE_THREAD(newmsginfo->flags))
+               item->ignored_msgs++;
+       if (MSG_IS_WATCH_THREAD(newmsginfo->flags))
+               item->watched_msgs++;
        item->total_msgs++;
 
        folder_item_update_freeze();
@@ -2717,6 +3111,16 @@ static void remove_msginfo_from_cache(FolderItem *item, MsgInfo *msginfo)
                msginfo->folder->unreadmarked_msgs--;
        if (MSG_IS_MARKED(msginfo->flags))
                item->marked_msgs--;
+       if (MSG_IS_REPLIED(msginfo->flags))
+               item->replied_msgs--;
+       if (MSG_IS_FORWARDED(msginfo->flags))
+               item->forwarded_msgs--;
+       if (MSG_IS_LOCKED(msginfo->flags))
+               item->locked_msgs--;
+       if (MSG_IS_IGNORE_THREAD(msginfo->flags))
+               item->ignored_msgs--;
+       if (MSG_IS_WATCH_THREAD(msginfo->flags))
+               item->watched_msgs--;
 
        msginfo->folder->total_msgs--;
 
@@ -2734,8 +3138,8 @@ gint folder_item_add_msg(FolderItem *dest, const gchar *file,
         GSList file_list;
         MsgFileInfo fileinfo;
 
-       g_return_val_if_fail(dest != NULL, -1);
-       g_return_val_if_fail(file != NULL, -1);
+       cm_return_val_if_fail(dest != NULL, -1);
+       cm_return_val_if_fail(file != NULL, -1);
  
        fileinfo.msginfo = NULL;
         fileinfo.file = (gchar *)file;
@@ -2752,25 +3156,24 @@ 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;
 
-        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);
+        cm_return_val_if_fail(dest != NULL, -1);
+        cm_return_val_if_fail(file_list != NULL, -1);
+        cm_return_val_if_fail(dest->folder != NULL, -1);
        if (dest->no_select)
                return -1;
 
         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 {
@@ -2779,20 +3182,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;
@@ -2803,13 +3207,14 @@ gint folder_item_add_msgs(FolderItem *dest, GSList *file_list,
                                        folderscan = TRUE;
                                }
                                num = folder_item_get_msg_num_by_file(dest, fileinfo->file);
+                               debug_print("got num %d\n", num);
                        }
 
                        if (num > lastnum)
                                lastnum = num;
 
                        if (num >= 0 && remove_source) {
-                               if (g_unlink(fileinfo->file) < 0)
+                               if (claws_unlink(fileinfo->file) < 0)
                                        FILE_OP_ERROR(fileinfo->file, "unlink");
                        }
 
@@ -2827,7 +3232,7 @@ gint folder_item_add_msgs(FolderItem *dest, GSList *file_list,
                }
        }
 
-       g_relation_destroy(relation);
+       g_hash_table_destroy(relation);
 
         return lastnum;
 }
@@ -2844,7 +3249,7 @@ static FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest,
        debug_print("%s %s to %s\n", copy?"Copying":"Moving", src->path, dest->path);
        new_item = folder_create_folder(dest, src->name);
        if (new_item == NULL) {
-               printf("Can't create folder\n");
+               g_print("Can't create folder\n");
                return NULL;
        }
        
@@ -2878,6 +3283,8 @@ static FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest,
        new_item->threaded  = src->threaded;
        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;
 
@@ -2930,8 +3337,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);
        
@@ -2978,6 +3383,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
@@ -2988,17 +3414,17 @@ 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;
 
-       g_return_val_if_fail(dest != NULL, -1);
-       g_return_val_if_fail(msglist != NULL, -1);
+       cm_return_val_if_fail(dest != NULL, -1);
+       cm_return_val_if_fail(msglist != NULL, -1);
 
        folder = dest->folder;
 
-       g_return_val_if_fail(folder->klass->copy_msg != NULL, -1);
+       cm_return_val_if_fail(folder->klass->copy_msg != NULL, -1);
        if (dest->no_select)
                return -1;
 
@@ -3036,9 +3462,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;
@@ -3057,7 +3481,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 {
@@ -3068,7 +3492,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;
                        }
                }
@@ -3078,7 +3502,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);
                }
@@ -3099,20 +3523,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;
@@ -3122,7 +3540,9 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                                        item->folder->klass->remove_msg(item->folder,
                                                                msginfo->folder,
                                                                msginfo->msgnum);
-                               remove_msginfo_from_cache(item, msginfo);
+                               if (!item->folder->account || item->folder->account->imap_use_trash) {
+                                       remove_msginfo_from_cache(item, msginfo);
+                               }
                        }
                }
        }
@@ -3134,26 +3554,31 @@ 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;
        }
 
        statusbar_print_all(_("Updating cache for %s..."), dest->path ? dest->path : "(null)");
        total = g_slist_length(msglist);
+       
+       if (FOLDER_TYPE(dest->folder) == F_IMAP && total > 1) {
+               folder_item_scan_full(dest, FALSE);
+               folderscan = TRUE;
+       }
+       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;
 
-                tuples = g_relation_select(relation, msginfo, 0);
-               if (tuples->len > 0) {
-                       num = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
-                       g_tuples_destroy(tuples);
-               } else {
+               if (!msginfo)
+                       continue;
+
+                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();
@@ -3161,7 +3586,17 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                if (num >= 0) {
                        MsgInfo *newmsginfo = NULL;
 
-                       if (folderscan) {
+                       if (!folderscan && num > 0) {
+                               newmsginfo = get_msginfo(dest, num);
+                               if (newmsginfo != NULL) {
+                                       add_msginfo_to_cache(dest, newmsginfo, msginfo);
+                               }
+                       }
+                       if (newmsginfo == NULL) {
+                               if (!folderscan) {
+                                       folder_item_scan_full(dest, FALSE);
+                                       folderscan = TRUE;
+                               }
                                if (msginfo->msgid != NULL) {
                                        newmsginfo = folder_item_get_msginfo_by_msgid(dest, msginfo->msgid);
                                        if (newmsginfo != NULL) {
@@ -3169,11 +3604,6 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                                                num = newmsginfo->msgnum;
                                        }
                                }
-                       } else {
-                               newmsginfo = get_msginfo(dest, num);
-                               if (newmsginfo != NULL) {
-                                       add_msginfo_to_cache(dest, newmsginfo, msginfo);
-                               }
                        }
 
                        if (msginfo->planned_download 
@@ -3185,9 +3615,11 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                                partial_mark_for_download(newmsginfo);
                        }
                        if (!MSG_IS_POSTFILTERED (msginfo->flags)) {
-                           procmsg_msginfo_set_flags (   msginfo, MSG_POSTFILTERED, 0);
-                           procmsg_msginfo_set_flags (newmsginfo, MSG_POSTFILTERED, 0);
-                           hooks_invoke (MAIL_POSTFILTERING_HOOKLIST, newmsginfo);
+                               procmsg_msginfo_set_flags (   msginfo, MSG_POSTFILTERED, 0);
+                               if (newmsginfo) {
+                                       procmsg_msginfo_set_flags (newmsginfo, MSG_POSTFILTERED, 0);
+                                       hooks_invoke (MAIL_POSTFILTERING_HOOKLIST, newmsginfo);
+                               }
                        }
                        procmsg_msginfo_free(newmsginfo);
 
@@ -3196,10 +3628,11 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                                lastnum = num;
                }
        }
+       folder_item_set_batch(dest, FALSE);
        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;
@@ -3217,8 +3650,8 @@ gint folder_item_move_msg(FolderItem *dest, MsgInfo *msginfo)
 {
        GSList list;
 
-       g_return_val_if_fail(dest != NULL, -1);
-       g_return_val_if_fail(msginfo != NULL, -1);
+       cm_return_val_if_fail(dest != NULL, -1);
+       cm_return_val_if_fail(msginfo != NULL, -1);
 
        list.data = msginfo;
        list.next = NULL;
@@ -3235,8 +3668,8 @@ gint folder_item_move_msg(FolderItem *dest, MsgInfo *msginfo)
 gint folder_item_move_msgs(FolderItem *dest, GSList *msglist)
 {
        gint result = -1;
-       g_return_val_if_fail(dest != NULL, -1);
-       g_return_val_if_fail(msglist != NULL, -1);
+       cm_return_val_if_fail(dest != NULL, -1);
+       cm_return_val_if_fail(msglist != NULL, -1);
        inc_lock();
        result = do_copy_msgs(dest, msglist, TRUE);
        inc_unlock();
@@ -3253,8 +3686,8 @@ gint folder_item_copy_msg(FolderItem *dest, MsgInfo *msginfo)
 {
        GSList list;
 
-       g_return_val_if_fail(dest != NULL, -1);
-       g_return_val_if_fail(msginfo != NULL, -1);
+       cm_return_val_if_fail(dest != NULL, -1);
+       cm_return_val_if_fail(msginfo != NULL, -1);
     
        list.data = msginfo;
        list.next = NULL;
@@ -3271,8 +3704,8 @@ gint folder_item_copy_msg(FolderItem *dest, MsgInfo *msginfo)
 gint folder_item_copy_msgs(FolderItem *dest, GSList *msglist)
 {
        gint result;
-       g_return_val_if_fail(dest != NULL, -1);
-       g_return_val_if_fail(msglist != NULL, -1);
+       cm_return_val_if_fail(dest != NULL, -1);
+       cm_return_val_if_fail(msglist != NULL, -1);
 
        inc_lock();
        result = do_copy_msgs(dest, msglist, FALSE);
@@ -3287,20 +3720,27 @@ gint folder_item_remove_msg(FolderItem *item, gint num)
        gint ret;
        MsgInfo *msginfo;
 
-       g_return_val_if_fail(item != NULL, -1);
+       cm_return_val_if_fail(item != NULL, -1);
        folder = item->folder;
-       g_return_val_if_fail(folder->klass->remove_msg != NULL, -1);
+       cm_return_val_if_fail(folder->klass->remove_msg != NULL, -1);
        if (item->no_select)
                return -1;
 
        if (!item->cache) folder_item_read_cache(item);
 
-       ret = folder->klass->remove_msg(folder, item, num);
-
        msginfo = msgcache_get_msg(item->cache, num);
-       if (msginfo != NULL) {
-               remove_msginfo_from_cache(item, msginfo);
+       if (msginfo && MSG_IS_LOCKED(msginfo->flags)) {
                procmsg_msginfo_free(msginfo);
+               return -1;
+       }
+       ret = folder->klass->remove_msg(folder, item, num);
+
+       if (!item->folder->account || item->folder->account->imap_use_trash) {
+               if (msginfo != NULL) {
+                       if (ret == 0)
+                               remove_msginfo_from_cache(item, msginfo);
+                       procmsg_msginfo_free(msginfo);
+               }
        }
 
        return ret;
@@ -3310,46 +3750,81 @@ gint folder_item_remove_msgs(FolderItem *item, GSList *msglist)
 {
        Folder *folder;
        gint ret = 0;
+       GSList *real_list = NULL, *cur = NULL;
 
-       g_return_val_if_fail(item != NULL, -1);
+       cm_return_val_if_fail(item != NULL, -1);
        folder = item->folder;
-       g_return_val_if_fail(folder != NULL, -1);
+       cm_return_val_if_fail(folder != NULL, -1);
        if (item->no_select)
                return -1;
        inc_lock();
        if (!item->cache) folder_item_read_cache(item);
 
        folder_item_update_freeze();
+       
+       /* filter out locked mails */
+       for (cur = msglist; cur; cur = cur->next) {
+               MsgInfo *info = (MsgInfo *)cur->data;
+               if (!MSG_IS_LOCKED(info->flags))
+                       real_list = g_slist_prepend(real_list, info);
+       }
+
+       real_list = g_slist_reverse(real_list);
+
        if (item->folder->klass->remove_msgs) {
                ret = item->folder->klass->remove_msgs(item->folder,
                                                        item,
-                                                       msglist,
+                                                       real_list,
                                                        NULL);
        }
-       while (ret == 0 && msglist != NULL) {
-               MsgInfo *msginfo = (MsgInfo *)msglist->data;
-               if (MSG_IS_LOCKED(msginfo->flags)) {
-                       msglist = msglist->next;
+       while (ret == 0 && real_list != NULL) {
+               MsgInfo *msginfo = (MsgInfo *)real_list->data;
+               if (msginfo && MSG_IS_LOCKED(msginfo->flags)) {
+                       real_list = real_list->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);
-               msglist = msglist->next;
+               real_list = real_list->next;
        }
+       g_slist_free(real_list);
        folder_item_scan_full(item, FALSE);
        folder_item_update_thaw();
        inc_unlock();
        return ret;
 }
 
+gint folder_item_expunge(FolderItem *item)
+{
+       Folder *folder = item->folder;
+       gint result = 0;
+       if (folder == NULL)
+               return -1;
+       if (folder->klass->expunge) {
+               GSList *msglist = folder_item_get_msg_list(item);
+               GSList *cur;
+               result = folder->klass->expunge(folder, item);
+               if (result == 0) {
+                       for (cur = msglist; cur; cur = cur->next) {
+                               MsgInfo *msginfo = (MsgInfo *)cur->data;
+                               if (MSG_IS_DELETED(msginfo->flags)) {
+                                       remove_msginfo_from_cache(item, msginfo);
+                               }
+                       }
+               }
+               procmsg_msg_list_free(msglist);
+       }
+       return result;
+}
+
 gint folder_item_remove_all_msg(FolderItem *item)
 {
        Folder *folder;
        gint result;
 
-       g_return_val_if_fail(item != NULL, -1);
+       cm_return_val_if_fail(item != NULL, -1);
        if (item->no_select)
                return -1;
 
@@ -3362,6 +3837,9 @@ gint folder_item_remove_all_msg(FolderItem *item)
                if (result == 0) {
                        folder_item_free_cache(item, TRUE);
                        item->cache = msgcache_new();
+                       item->cache_dirty = TRUE;
+                       item->mark_dirty = TRUE;
+                       item->tags_dirty = TRUE;
                }
        } else {
                MsgInfoList *msglist;
@@ -3377,6 +3855,11 @@ gint folder_item_remove_all_msg(FolderItem *item)
                item->unreadmarked_msgs = 0;
                item->marked_msgs = 0;
                item->total_msgs = 0;
+               item->replied_msgs = 0;
+               item->forwarded_msgs = 0;
+               item->locked_msgs = 0;
+               item->ignored_msgs = 0;
+               item->watched_msgs = 0;
                folder_item_update(item, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
        }
 
@@ -3386,46 +3869,102 @@ gint folder_item_remove_all_msg(FolderItem *item)
 
 void folder_item_change_msg_flags(FolderItem *item, MsgInfo *msginfo, MsgPermFlags newflags)
 {
-       g_return_if_fail(item != NULL);
-       g_return_if_fail(msginfo != NULL);
+       cm_return_if_fail(item != NULL);
+       cm_return_if_fail(msginfo != NULL);
+       
+       item->mark_dirty = TRUE;
+
        if (item->no_select)
                return;
        
-       if (item->folder->klass->change_flags != NULL) {
+       if (item->folder->klass->change_flags != NULL && item->scanning != ITEM_SCANNING_WITH_FLAGS) {
                item->folder->klass->change_flags(item->folder, item, msginfo, newflags);
        } else {
                msginfo->flags.perm_flags = newflags;
        }
 }
 
+void folder_item_commit_tags(FolderItem *item, MsgInfo *msginfo, GSList *tags_set, GSList *tags_unset)
+{
+       Folder *folder = NULL;
+
+       if (!msginfo)
+               return;
+       if (!item)
+               return;
+       if (!tags_set && !tags_unset)
+               return;
+
+       folder = item->folder;
+       if (!folder)
+               return;
+       
+       item->tags_dirty = TRUE;
+
+       if (folder->klass->commit_tags == NULL)
+               return;
+       
+       folder->klass->commit_tags(item, msginfo, tags_set, tags_unset);
+}
+
 gboolean folder_item_is_msg_changed(FolderItem *item, MsgInfo *msginfo)
 {
        Folder *folder;
 
-       g_return_val_if_fail(item != NULL, FALSE);
+       cm_return_val_if_fail(item != NULL, FALSE);
        if (item->no_select)
                return FALSE;
 
        folder = item->folder;
 
-       g_return_val_if_fail(folder->klass->is_msg_changed != NULL, -1);
+       cm_return_val_if_fail(folder->klass->is_msg_changed != NULL, -1);
 
        return folder->klass->is_msg_changed(folder, item, msginfo);
 }
 
+void folder_item_discard_cache(FolderItem *item)
+{
+       gchar *dir;
+       gchar *cache;
+
+       if (!item)
+               return;
+
+       if (item->cache) {
+               msgcache_destroy(item->cache);
+               item->cache = NULL;
+       }
+       dir = folder_item_get_path(item);
+       if (is_dir_exist(dir))
+               remove_all_numbered_files(dir);
+       g_free(dir);
+       
+       cache = folder_item_get_cache_file(item);
+       if (is_file_exist(cache))
+               claws_unlink(cache);
+       g_free(cache);
+       
+}
+
 static gchar *folder_item_get_cache_file(FolderItem *item)
 {
        gchar *path;
        gchar *file;
+       gchar *old_file;
 
-       g_return_val_if_fail(item != NULL, NULL);
-       g_return_val_if_fail(item->path != NULL, NULL);
+       cm_return_val_if_fail(item != NULL, NULL);
+       cm_return_val_if_fail(item->path != NULL, NULL);
 
        path = folder_item_get_path(item);
-       g_return_val_if_fail(path != NULL, NULL);
+       cm_return_val_if_fail(path != NULL, NULL);
        if (!is_dir_exist(path))
                make_dir_hier(path);
        file = g_strconcat(path, G_DIR_SEPARATOR_S, CACHE_FILE, NULL);
+       old_file = g_strconcat(path, G_DIR_SEPARATOR_S, OLD_CACHE_FILE, NULL);
+
+       if (!is_file_exist(file) && is_file_exist(old_file))
+               move_file(old_file, file, FALSE);
+       g_free(old_file);
        g_free(path);
 
        return file;
@@ -3435,15 +3974,58 @@ static gchar *folder_item_get_mark_file(FolderItem *item)
 {
        gchar *path;
        gchar *file;
+       gchar *old_file;
 
-       g_return_val_if_fail(item != NULL, NULL);
-       g_return_val_if_fail(item->path != NULL, NULL);
+       cm_return_val_if_fail(item != NULL, NULL);
+       cm_return_val_if_fail(item->path != NULL, NULL);
 
        path = folder_item_get_path(item);
-       g_return_val_if_fail(path != NULL, NULL);
+       cm_return_val_if_fail(path != NULL, NULL);
        if (!is_dir_exist(path))
                make_dir_hier(path);
        file = g_strconcat(path, G_DIR_SEPARATOR_S, MARK_FILE, NULL);
+       old_file = g_strconcat(path, G_DIR_SEPARATOR_S, OLD_MARK_FILE, NULL);
+
+       if (!is_file_exist(file) && is_file_exist(old_file))
+               move_file(old_file, file, FALSE);
+       g_free(old_file);
+       g_free(path);
+
+       return file;
+}
+
+static gchar *folder_item_get_tags_file(FolderItem *item)
+{
+       gchar *path;
+       gchar *identifier;
+       gchar *file;
+
+       /* we save tags files in rc_dir, because tagsrc is there too,
+        * and storing tags directly in the mailboxes would give strange
+        * result when using another Claws mailbox from another install
+        * with different tags. */
+
+       cm_return_val_if_fail(item != NULL, NULL);
+
+       identifier = folder_item_get_identifier(item);
+       cm_return_val_if_fail(identifier != NULL, NULL);
+
+#ifdef G_OS_WIN32
+       while (strchr(identifier, '/'))
+               *strchr(identifier, '/') = '\\';
+#endif
+
+       path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
+                          "tagsdb", G_DIR_SEPARATOR_S,
+                          identifier, NULL);
+       
+       g_free(identifier);
+                          
+       if (!is_dir_exist(path))
+               make_dir_hier(path);
+
+       file = g_strconcat(path, G_DIR_SEPARATOR_S, TAGS_FILE, NULL);
+       
        g_free(path);
 
        return file;
@@ -3455,8 +4037,8 @@ static gpointer xml_to_folder_item(gpointer nodedata, gpointer data)
        Folder *folder = (Folder *) data;
        FolderItem *item;
 
-       g_return_val_if_fail(xmlnode != NULL, NULL);
-       g_return_val_if_fail(folder != NULL, NULL);
+       cm_return_val_if_fail(xmlnode != NULL, NULL);
+       cm_return_val_if_fail(folder != NULL, NULL);
 
        if (strcmp2(xmlnode->tag->tag, "folderitem") != 0) {
                g_warning("tag name != \"folderitem\"\n");
@@ -3500,7 +4082,7 @@ static Folder *folder_get_from_xml(GNode *node)
        FolderClass *klass = NULL;
        GNode *cur;
 
-       g_return_val_if_fail(node->data != NULL, NULL);
+       cm_return_val_if_fail(node->data != NULL, NULL);
 
        xmlnode = node->data;
        if (strcmp2(xmlnode->tag->tag, "folder") != 0) {
@@ -3519,7 +4101,7 @@ static Folder *folder_get_from_xml(GNode *node)
                return NULL;
 
        folder = folder_new(klass, "", "");
-       g_return_val_if_fail(folder != NULL, NULL);
+       cm_return_val_if_fail(folder != NULL, NULL);
 
        if (klass->set_xml)
                klass->set_xml(folder, xmlnode->tag);
@@ -3539,7 +4121,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;
 
@@ -3550,19 +4132,12 @@ static gchar *folder_get_list_path(void)
        return filename;
 }
 
-#define PUT_ESCAPE_STR(fp, attr, str)                  \
-{                                                      \
-       fputs(" " attr "=\"", fp);                      \
-       xml_file_put_escape_str(fp, str);               \
-       fputs("\"", fp);                                \
-}
-
 static gpointer folder_item_to_xml(gpointer nodedata, gpointer data)
 {
        FolderItem *item = (FolderItem *) nodedata;
        XMLTag *tag;
 
-       g_return_val_if_fail(item != NULL, NULL);
+       cm_return_val_if_fail(item != NULL, NULL);
 
        if (item->folder->klass->item_get_xml != NULL)
                tag = item->folder->klass->item_get_xml(item->folder, item);
@@ -3578,7 +4153,7 @@ static GNode *folder_get_xml_node(Folder *folder)
        XMLNode *xmlnode;
        XMLTag *tag;
 
-       g_return_val_if_fail(folder != NULL, NULL);
+       cm_return_val_if_fail(folder != NULL, NULL);
 
        if (folder->klass->get_xml != NULL)
                tag = folder->klass->get_xml(folder);
@@ -3591,7 +4166,7 @@ static GNode *folder_get_xml_node(Folder *folder)
 
        node = g_node_new(xmlnode);
        
-       g_return_val_if_fail (folder->node != NULL, NULL);
+       cm_return_val_if_fail (folder->node != NULL, NULL);
        
        if (folder->node->children) {
                GNode *cur;
@@ -3741,7 +4316,7 @@ static GHashTable *folder_persist_prefs_new(Folder *folder)
 {
        GHashTable *pptable;
 
-       g_return_val_if_fail(folder, NULL);
+       cm_return_val_if_fail(folder, NULL);
        pptable = g_hash_table_new(g_str_hash, g_str_equal);
        folder_get_persist_prefs_recursive(folder->node, pptable);
        return pptable;
@@ -3749,7 +4324,7 @@ static GHashTable *folder_persist_prefs_new(Folder *folder)
 
 static void folder_persist_prefs_free(GHashTable *pptable)
 {
-       g_return_if_fail(pptable);
+       cm_return_if_fail(pptable);
        g_hash_table_foreach_remove(pptable, persist_prefs_free, NULL);
        g_hash_table_destroy(pptable);
 }
@@ -3780,6 +4355,8 @@ static void folder_item_restore_persist_prefs(FolderItem *item, GHashTable *ppta
        item->threaded  = pp->threaded;
        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;
 }
@@ -3791,20 +4368,22 @@ static void folder_get_persist_prefs_recursive(GNode *node, GHashTable *pptable)
        GNode *child, *cur;
        gchar *id;
 
-       g_return_if_fail(node != NULL);
-       g_return_if_fail(item != NULL);
+       cm_return_if_fail(node != NULL);
+       cm_return_if_fail(item != NULL);
 
        /* NOTE: item->path == NULL means top level folder; not interesting
         * to store preferences of that one.  */
        if (item->path) {
                id = folder_item_get_identifier(item);
                pp = g_new0(PersistPrefs, 1);
-               g_return_if_fail(pp != NULL);
+               cm_return_if_fail(pp != NULL);
                pp->collapsed = item->collapsed;
                pp->thread_collapsed = item->thread_collapsed;
                pp->threaded  = item->threaded;
                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);
@@ -3834,7 +4413,7 @@ void folder_item_apply_processing(FolderItem *item)
        guint total = 0, curmsg = 0;
        gint last_apply_per_account;
 
-       g_return_if_fail(item != NULL);
+       cm_return_if_fail(item != NULL);
 
        if (item->no_select)
               return;
@@ -3848,6 +4427,8 @@ void folder_item_apply_processing(FolderItem *item)
        debug_print("processing %s\n", item->name);
        folder_item_update_freeze();
 
+       inc_lock();
+
        mlist = folder_item_get_msg_list(item);
        total = g_slist_length(mlist);
        statusbar_print_all(_("Processing messages..."));
@@ -3855,6 +4436,7 @@ void folder_item_apply_processing(FolderItem *item)
        last_apply_per_account = prefs_common.apply_per_account_filtering_rules;
        prefs_common.apply_per_account_filtering_rules = FILTERING_ACCOUNT_RULES_SKIP;
 
+       folder_item_set_batch(item, TRUE);
        for (cur = mlist ; cur != NULL ; cur = cur->next) {
                MsgInfo * msginfo;
 
@@ -3877,7 +4459,11 @@ void folder_item_apply_processing(FolderItem *item)
                 /* apply post global rules */
                filter_message_by_msginfo(post_global_processing, msginfo, NULL,
                                FILTERING_POST_PROCESSING, NULL);
+               if (curmsg % 1000 == 0)
+                       GTK_EVENTS_FLUSH();
        }
+       folder_item_set_batch(item, FALSE);
+
        prefs_common.apply_per_account_filtering_rules = last_apply_per_account;
 
        if (pre_global_processing || processing_list
@@ -3892,6 +4478,8 @@ void folder_item_apply_processing(FolderItem *item)
        statusbar_progress_all(0,0,0);
        statusbar_pop_all();
 
+       inc_unlock();
+
        folder_item_update_thaw();
 }
 
@@ -3974,12 +4562,26 @@ void folder_item_update_thaw(void)
        }
 }
 
+void folder_item_synchronise(FolderItem *item)
+{
+       if (!item)
+               return;
+       if (item->prefs->offlinesync && item->folder->klass->synchronise) {
+               statuswindow_print_all(_("Synchronising %s for offline use...\n"), item->path ? item->path : "(null)");
+               item->folder->klass->synchronise(item, 
+                       item->prefs->offlinesync_days);
+               if (item->prefs->offlinesync_days > 0 &&
+                   item->prefs->remove_old_bodies)
+                       folder_item_clean_local_files(item, item->prefs->offlinesync_days);
+               statuswindow_pop_all();
+       }
+}
+
 static void folder_item_synchronise_func(FolderItem *item, gpointer data)
 {
        Folder *folder = (Folder *)data;
        if (folder == NULL || item->folder == folder) {
-               if(item->prefs->offlinesync && item->folder->klass->synchronise)
-                       item->folder->klass->synchronise(item);
+               folder_item_synchronise(item);
        }
 }
 
@@ -4020,6 +4622,8 @@ gboolean folder_want_synchronise(Folder *folder)
 
 void folder_item_set_batch (FolderItem *item, gboolean batch)
 {
+       if (!item || !item->folder)
+               return;
        if (item->folder->klass->set_batch) {
                item->folder->klass->set_batch(item->folder, item, batch);
        }
@@ -4030,6 +4634,8 @@ gboolean folder_has_parent_of_type(FolderItem *item,
 {
        FolderItem *cur = item;
 
+       if (!item)
+               return FALSE;
        /* if we already know it, make it short */
        if (item->parent_stype != -1) {
                return (item->parent_stype == type);
@@ -4082,6 +4688,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;
@@ -4109,4 +4731,91 @@ gboolean folder_get_sort_type            (Folder         *folder,
        return TRUE;
 }
 
-#undef PUT_ESCAPE_STR
+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;
+}
+