2007-08-09 [colin] 2.10.0cvs109
[claws.git] / src / folder.c
index a920fa2e5a1dd79e985d38b1c5a9e063c48f164b..8e06c7a6a34aa5b7ae48b6ceabd006d4748a4fee 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2007 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,
@@ -13,8 +13,8 @@
  * 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 "remotefolder.h"
 #include "partial_download.h"
 #include "statusbar.h"
+#include "gtkutils.h"
+#include "timing.h"
+#include "compose.h"
+#include "main.h"
 
 /* Dependecies to be removed ?! */
 #include "prefs_common.h"
@@ -78,6 +82,9 @@ static GSList *folder_unloaded_list = NULL;
 void folder_init               (Folder         *folder,
                                 const gchar    *name);
 
+static gchar *folder_item_get_cache_file       (FolderItem     *item);
+static gchar *folder_item_get_mark_file        (FolderItem     *item);
+static gchar *folder_item_get_tags_file        (FolderItem     *item);
 static gchar *folder_get_list_path     (void);
 static GNode *folder_get_xml_node      (Folder         *folder);
 static Folder *folder_get_from_xml     (GNode          *node);
@@ -87,11 +94,13 @@ static void folder_update_op_count_rec      (GNode          *node);
 static void folder_get_persist_prefs_recursive
                                        (GNode *node, GHashTable *pptable);
 static gboolean persist_prefs_free     (gpointer key, gpointer val, gpointer data);
-void folder_item_read_cache            (FolderItem *item);
-void folder_item_free_cache            (FolderItem *item);
+static void folder_item_read_cache             (FolderItem *item);
 gint folder_item_scan_full             (FolderItem *item, gboolean filtering);
 static void folder_item_update_with_msg (FolderItem *item, FolderItemUpdateFlags update_flags,
                                          MsgInfo *msg);
+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)
 {
@@ -100,7 +109,7 @@ void folder_system_init(void)
        folder_register_class(news_get_class());
 }
 
-GSList *folder_get_class_list(void)
+static GSList *folder_get_class_list(void)
 {
        return class_list;
 }
@@ -197,6 +206,55 @@ void folder_init(Folder *folder, const gchar *name)
        folder->trash = NULL;
 }
 
+static void reset_parent_type(FolderItem *item, gpointer data) {
+       item->parent_stype = -1;
+}
+
+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) {
+       case F_INBOX:
+               folder_item_change_type(folder->inbox, F_NORMAL);
+               folder->inbox = item;
+               break;
+       case F_OUTBOX:
+               folder_item_change_type(folder->outbox, F_NORMAL);
+               folder->outbox = item;
+               break;
+       case F_QUEUE:
+               folder_item_change_type(folder->queue, F_NORMAL);
+               folder->queue = item;
+               break;
+       case F_DRAFT:
+               folder_item_change_type(folder->draft, F_NORMAL);
+               folder->draft = item;
+               break;
+       case F_TRASH:
+               folder_item_change_type(folder->trash, F_NORMAL);
+               folder->trash = item;
+               break;
+       case F_NORMAL:
+       default:
+               break;
+       }
+       /* set new type for current folder and sons */
+       item->stype = newtype;
+       folder_func_to_all_folders(reset_parent_type, NULL);
+       
+       hookdata.folder = folder;
+       hookdata.update_flags = FOLDER_TREE_CHANGED;
+       hookdata.item = NULL;
+       hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
+}
+
 void folder_destroy(Folder *folder)
 {
        g_return_if_fail(folder != NULL);
@@ -293,6 +351,7 @@ 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->order = 0;
        item->last_num = -1;
        item->cache = NULL;
        item->no_sub = FALSE;
@@ -412,7 +471,7 @@ void folder_item_destroy(FolderItem *item)
        }
 
        if (item->cache)
-               folder_item_free_cache(item);
+               folder_item_free_cache(item, TRUE);
        if (item->prefs)
                folder_item_prefs_free(item->prefs);
        g_free(item->name);
@@ -474,6 +533,8 @@ 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, "order"))
+                       item->order = atoi(attr->value);
                else if (!strcmp(attr->name, "total"))
                        item->total_msgs = atoi(attr->value);
                else if (!strcmp(attr->name, "no_sub"))
@@ -517,6 +578,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;
@@ -530,8 +595,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;
+               }
        }
 }
 
@@ -542,7 +613,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;
 
@@ -577,12 +648,15 @@ 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("order", item->order));
 
        if (item->account)
                xml_tag_add_attr(tag, xml_attr_new_int("account_id", item->account->account_id));
        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;
 }
 
@@ -619,7 +693,7 @@ void folder_set_sort(Folder *folder, guint sort)
        }
 }
 
-gboolean folder_tree_destroy_func(GNode *node, gpointer data) {
+static gboolean folder_tree_destroy_func(GNode *node, gpointer data) {
        FolderItem *item = (FolderItem *) node->data;
 
        folder_item_destroy(item);
@@ -738,7 +812,11 @@ void folder_write_list(void)
        path = folder_get_list_path();
        if ((pfile = prefs_write_open(path)) == NULL) return;
 
-       xml_file_put_xml_decl(pfile->fp);
+       if (xml_file_put_xml_decl(pfile->fp) < 0) {
+               prefs_file_close_revert(pfile);
+               g_warning("failed to start write folder list.\n");
+               return;         
+       }
        tag = xml_tag_new("folderlist");
 
        xmlnode = xml_node_new(tag, NULL);
@@ -760,15 +838,16 @@ void folder_write_list(void)
                g_node_append(rootnode, (gpointer) xml_copy_tree(node));
        }
 
-       xml_write_tree(rootnode, pfile->fp);
-
-       if (prefs_file_close(pfile) < 0)
+       if (xml_write_tree(rootnode, pfile->fp) < 0) {
+               prefs_file_close_revert(pfile);
                g_warning("failed to write folder list.\n");
-
+       } else if (prefs_file_close(pfile) < 0) {
+               g_warning("failed to write folder list.\n");
+       }
        xml_free_tree(rootnode);
 }
 
-gboolean folder_scan_tree_func(GNode *node, gpointer data)
+static gboolean folder_scan_tree_func(GNode *node, gpointer data)
 {
        GHashTable *pptable = (GHashTable *)data;
        FolderItem *item = (FolderItem *)node->data;
@@ -783,16 +862,22 @@ void folder_scan_tree(Folder *folder, gboolean rebuild)
 {
        GHashTable *pptable;
        FolderUpdateData hookdata;
-       
+       Folder *old_folder = folder;
+
        if (!folder->klass->scan_tree)
                return;
        
        pptable = folder_persist_prefs_new(folder);
 
        if (rebuild)
-               folder_tree_destroy(folder);
+               folder_remove(folder);
 
-       folder->klass->scan_tree(folder);
+       if (folder->klass->scan_tree(folder) < 0) {
+               if (rebuild)
+                       folder_add(old_folder);
+               return;
+       } else if (rebuild)
+               folder_add(folder);
 
        hookdata.folder = folder;
        hookdata.update_flags = FOLDER_TREE_CHANGED;
@@ -807,6 +892,43 @@ void folder_scan_tree(Folder *folder, gboolean rebuild)
        folder_write_list();
 }
 
+static gboolean folder_restore_prefs_func(GNode *node, gpointer data)
+{
+       GHashTable *pptable = (GHashTable *)data;
+       FolderItem *item = (FolderItem *)node->data;
+       
+       folder_item_restore_persist_prefs(item, pptable);
+
+       return FALSE;
+}
+
+void folder_fast_scan_tree(Folder *folder)
+{
+       GHashTable *pptable;
+       FolderUpdateData hookdata;
+
+       if (!folder->klass->scan_tree)
+               return;
+       
+       pptable = folder_persist_prefs_new(folder);
+
+       if (folder->klass->scan_tree(folder) < 0) {
+               return;
+       } 
+
+       hookdata.folder = folder;
+       hookdata.update_flags = FOLDER_TREE_CHANGED;
+       hookdata.item = NULL;
+       hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
+
+       g_node_traverse(folder->node, G_POST_ORDER, G_TRAVERSE_ALL, -1, folder_restore_prefs_func, pptable);
+       folder_persist_prefs_free(pptable);
+
+       prefs_matcher_read_config();
+
+       folder_write_list();
+}
+
 FolderItem *folder_create_folder(FolderItem *parent, const gchar *name)
 {
        FolderItem *new_item;
@@ -1088,14 +1210,20 @@ FolderItem *folder_find_item_from_path(const gchar *path)
 {
        Folder *folder;
        gpointer d[2];
-
-       folder = folder_get_default_folder();
+       GList *list = folder_get_list();
+       
+       folder = list ? list->data:NULL;
+       
        g_return_val_if_fail(folder != NULL, NULL);
 
        d[0] = (gpointer)path;
        d[1] = NULL;
-       g_node_traverse(folder->node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
+       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, d);
+               list = list->next;
+       }
        return d[1];
 }
 
@@ -1132,7 +1260,7 @@ FolderClass *folder_get_class_from_string(const gchar *str)
        return NULL;
 }
 
-gchar *folder_get_identifier(Folder *folder)
+static gchar *folder_get_identifier(Folder *folder)
 {
        gchar *type_str;
 
@@ -1148,7 +1276,9 @@ gchar *folder_item_get_identifier(FolderItem *item)
        gchar *folder_id = NULL;
 
        g_return_val_if_fail(item != NULL, NULL);
-       g_return_val_if_fail(item->path != NULL, NULL);
+
+       if (item->path == NULL)
+               return NULL;
 
        folder_id = folder_get_identifier(item->folder);
        id = g_strconcat(folder_id, "/", item->path, NULL);
@@ -1265,11 +1395,6 @@ gchar *folder_item_get_name(FolderItem *item)
        return name;
 }
 
-Folder *folder_get_default_folder(void)
-{
-       return folder_list ? FOLDER(folder_list->data) : NULL;
-}
-
 gboolean folder_have_mailbox (void)
 {
        GList *cur;
@@ -1292,6 +1417,28 @@ FolderItem *folder_get_default_inbox(void)
                        continue;
                if (folder->inbox == NULL)
                        continue;
+               if (folder->klass->type == F_UNKNOWN)
+                       continue;
+
+               return folder->inbox;
+       }
+
+       return NULL;
+}
+
+FolderItem *folder_get_default_inbox_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->inbox == NULL)
+                       continue;
+               if (folder->klass->type != type)
+                       continue;
 
                return folder->inbox;
        }
@@ -1310,6 +1457,8 @@ FolderItem *folder_get_default_outbox(void)
                        continue;
                if (folder->outbox == NULL)
                        continue;
+               if (folder->klass->type == F_UNKNOWN)
+                       continue;
 
                return folder->outbox;
        }
@@ -1328,6 +1477,8 @@ FolderItem *folder_get_default_draft(void)
                        continue;
                if (folder->draft == NULL)
                        continue;
+               if (folder->klass->type == F_UNKNOWN)
+                       continue;
 
                return folder->draft;
        }
@@ -1346,6 +1497,8 @@ FolderItem *folder_get_default_queue(void)
                        continue;
                if (folder->queue == NULL)
                        continue;
+               if (folder->klass->type == F_UNKNOWN)
+                       continue;
 
                return folder->queue;
        }
@@ -1364,6 +1517,8 @@ FolderItem *folder_get_default_trash(void)
                        continue;
                if (folder->trash == NULL)
                        continue;
+               if (folder->klass->type == F_UNKNOWN)
+                       continue;
 
                return folder->trash;
        }
@@ -1505,7 +1660,6 @@ void folder_item_process_open (FolderItem *item,
        /* Processing */
        buf = g_strdup_printf(_("Processing (%s)...\n"), 
                              item->path ? item->path : item->name);
-       debug_print("%s\n", buf);
        g_free(buf);
 
        if (before_proc_func)
@@ -1516,21 +1670,26 @@ void folder_item_process_open (FolderItem *item,
        if (after_proc_func)
                after_proc_func(data);
 
-       debug_print("done.\n");
        item->processing_pending = FALSE;
        return; 
 }
 
 gint folder_item_open(FolderItem *item)
 {
+       START_TIMING(""); 
        if (item->no_select)
                return -1;
 
+       if (item->scanning) {
+               debug_print("%s is scanning... \n", item->path ? item->path : item->name);
+               return -2;
+       }
+
        item->processing_pending = TRUE;
        folder_item_process_open (item, NULL, NULL, NULL);
        
        item->opened = TRUE;
-
+       END_TIMING();
        return 0;
 }
 
@@ -1637,6 +1796,7 @@ static gint syncronize_flags(FolderItem *item, MsgInfoList *msglist)
                MsgPermFlags permflags = 0;
                gboolean skip;
 
+               folder_item_update_freeze();
                for (cur = msglist; cur != NULL; cur = g_slist_next(cur)) {
                        msginfo = (MsgInfo *) cur->data;
                
@@ -1654,6 +1814,7 @@ static gint syncronize_flags(FolderItem *item, MsgInfoList *msglist)
                                        ~permflags & msginfo->flags.perm_flags, 0);
                        }
                }
+               folder_item_update_thaw();
        }
        folder_item_set_batch(item, FALSE);
        g_relation_destroy(relation);   
@@ -1672,7 +1833,8 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
        guint markedcnt = 0, unreadmarkedcnt = 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);
        if (item->path == NULL) return -1;
 
@@ -1681,14 +1843,21 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
        g_return_val_if_fail(folder != NULL, -1);
        g_return_val_if_fail(folder->klass->get_num_list != NULL, -1);
 
-       debug_print("Scanning folder %s for cache changes.\n", item->path ? item->path : "(null)");
+       item->scanning = TRUE;
 
+       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;
                return(-1);
        }
 
+       if(prefs_common.thread_by_subject) {
+               subject_table = g_hash_table_new(g_str_hash, g_str_equal);
+       }
+       
        if (old_uids_valid) {
                if (!item->cache)
                        folder_item_read_cache(item);
@@ -1808,9 +1977,16 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
                                procmsg_msginfo_free(msginfo);
 
                                debug_print("Remembering message %d to update...\n", folder_cur_num);
-                       } else
+                       } else {
                                exists_list = g_slist_prepend(exists_list, msginfo);
 
+                               if(prefs_common.thread_by_subject &&
+                                       MSG_IS_IGNORE_THREAD(msginfo->flags) &&
+                                       !subject_table_lookup(subject_table, msginfo->subject)) {
+                                       subject_table_insert(subject_table, msginfo->subject, msginfo);
+                               }
+                       }
+                       
                        /* Move to next folder and cache number */
                        cache_list_cur = cache_list_cur->next;
                        folder_list_cur = folder_list_cur->next;
@@ -1849,46 +2025,68 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
        folder_item_update_freeze();
        if (newmsg_list != NULL) {
                GSList *elem, *to_filter = NULL;
-               int total = g_slist_length(newmsg_list), cur = 0;
-               
-               if ((filtering == TRUE) &&
-                   (item->stype == F_INBOX) &&
-                   (item->folder->account != NULL) && 
-                   (item->folder->account->filter_on_recv)) 
-                       statusbar_print_all(_("Filtering messages...\n"));
+               gboolean do_filter = (filtering == TRUE) &&
+                                       (item->stype == F_INBOX) &&
+                                       (item->folder->account != NULL) && 
+                                       (item->folder->account->filter_on_recv);
                
                for (elem = newmsg_list; elem != NULL; elem = g_slist_next(elem)) {
                        MsgInfo *msginfo = (MsgInfo *) elem->data;
 
-                       statusbar_progress_all(cur++,total, 10);
-
                        msgcache_add_msg(item->cache, msginfo);
-                       if ((filtering == TRUE) &&
-                           (item->stype == F_INBOX) &&
-                           (item->folder->account != NULL) && 
-                           (item->folder->account->filter_on_recv) &&
-                           procmsg_msginfo_filter(msginfo))
-                               to_filter = g_slist_prepend(to_filter, msginfo);
-                       else
+                       if (!do_filter) {
                                exists_list = g_slist_prepend(exists_list, msginfo);
+
+                               if(prefs_common.thread_by_subject &&
+                                       MSG_IS_IGNORE_THREAD(msginfo->flags) &&
+                                       !subject_table_lookup(subject_table, msginfo->subject)) {
+                                       subject_table_insert(subject_table, msginfo->subject, msginfo);
+                               }                       
+                       }
                }
-               filtering_move_and_copy_msgs(to_filter);
-               for (elem = to_filter; elem; elem = g_slist_next(elem)) {
-                       MsgInfo *msginfo = (MsgInfo *)elem->data;
-                       procmsg_msginfo_free(msginfo);
+
+               if (do_filter) {
+                       GSList *unfiltered;
+                       procmsg_msglist_filter(newmsg_list, item->folder->account, 
+                                       &to_filter, &unfiltered, 
+                                       TRUE);
+                       
+                       filtering_move_and_copy_msgs(newmsg_list);
+                       if (to_filter != NULL) {
+                               for (elem = to_filter; elem; elem = g_slist_next(elem)) {
+                                       MsgInfo *msginfo = (MsgInfo *)elem->data;
+                                       procmsg_msginfo_free(msginfo);
+                               }
+                               g_slist_free(to_filter);
+                       }
+                       if (unfiltered != NULL) {
+                               for (elem = unfiltered; elem; elem = g_slist_next(elem)) {
+                                       MsgInfo *msginfo = (MsgInfo *)elem->data;
+                                       exists_list = g_slist_prepend(exists_list, msginfo);
+
+                                       if(prefs_common.thread_by_subject &&
+                                               MSG_IS_IGNORE_THREAD(msginfo->flags) &&
+                                               !subject_table_lookup(subject_table, msginfo->subject)) {
+                                               subject_table_insert(subject_table, msginfo->subject, msginfo);
+                                       }
+                               }
+                               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(to_filter);
                g_slist_free(newmsg_list);
 
-               statusbar_progress_all(0,0,0);
-               statusbar_pop_all();
                update_flags |= F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT;
        }
 
        folder_item_set_batch(item, TRUE);
        for (elem = exists_list; elem != NULL; elem = g_slist_next(elem)) {
-               MsgInfo *msginfo;
+               MsgInfo *msginfo, *parent_msginfo;
 
                msginfo = elem->data;
                if (MSG_IS_IGNORE_THREAD(msginfo->flags) && (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)))
@@ -1896,6 +2094,18 @@ 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)))
+               {
+                       if(MSG_IS_IGNORE_THREAD(parent_msginfo->flags)) {
+                               procmsg_msginfo_change_flags(msginfo, MSG_IGNORE_THREAD, 0,
+                                               MSG_NEW | MSG_UNREAD, 0);
+                       }
+               }
                if ((folder_has_parent_of_type(item, F_OUTBOX) ||
                     folder_has_parent_of_type(item, F_QUEUE)  ||
                     folder_has_parent_of_type(item, F_DRAFT)  ||
@@ -1917,6 +2127,16 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
        }
        folder_item_set_batch(item, FALSE);
        g_slist_free(exists_list);
+       
+       if(prefs_common.thread_by_subject) {
+               g_hash_table_destroy(subject_table);
+       }
+       
+       if (item->new_msgs != newcnt || item->unread_msgs != unreadcnt
+       ||  item->total_msgs != totalcnt || item->marked_msgs != markedcnt
+       ||  item->unreadmarked_msgs != unreadmarkedcnt) {
+               update_flags |= F_ITEM_UPDATE_CONTENT;
+       }
 
        item->new_msgs = newcnt;
        item->unread_msgs = unreadcnt;
@@ -1928,6 +2148,8 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
 
        folder_item_update(item, update_flags);
        folder_item_update_thaw();
+       
+       item->scanning = FALSE;
 
        return 0;
 }
@@ -1937,21 +2159,6 @@ gint folder_item_scan(FolderItem *item)
        return folder_item_scan_full(item, TRUE);
 }
 
-static gboolean folder_scan_all_items_func(GNode *node, gpointer data)
-{
-       FolderItem *item = node->data;
-
-       folder_item_scan(item);
-
-       return FALSE;
-}
-
-void folder_scan_all_items(Folder * folder)
-{
-       g_node_traverse(folder->node, G_PRE_ORDER,
-                       G_TRAVERSE_ALL, -1, folder_scan_all_items_func, NULL);
-}
-
 static void folder_item_scan_foreach_func(gpointer key, gpointer val,
                                          gpointer data)
 {
@@ -1963,7 +2170,7 @@ void folder_item_scan_foreach(GHashTable *table)
        g_hash_table_foreach(table, folder_item_scan_foreach_func, NULL);
 }
 
-void folder_count_total_cache_memusage(FolderItem *item, gpointer data)
+static void folder_count_total_cache_memusage(FolderItem *item, gpointer data)
 {
        gint *memusage = (gint *)data;
 
@@ -1985,6 +2192,8 @@ gint folder_item_syncronize_flags(FolderItem *item)
        if (item->no_select)
                return -1;
 
+       item->scanning = TRUE;
+
        if (item->cache == NULL)
                folder_item_read_cache(item);
        
@@ -1997,10 +2206,12 @@ gint folder_item_syncronize_flags(FolderItem *item)
        
        g_slist_free(msglist);
 
+       item->scanning = FALSE;
+
        return ret;
 }
 
-gint folder_cache_time_compare_func(gconstpointer a, gconstpointer b)
+static gint folder_cache_time_compare_func(gconstpointer a, gconstpointer b)
 {
        FolderItem *fa = (FolderItem *)a;
        FolderItem *fb = (FolderItem *)b;
@@ -2008,7 +2219,7 @@ gint folder_cache_time_compare_func(gconstpointer a, gconstpointer b)
        return (gint) (msgcache_get_last_access_time(fa->cache) - msgcache_get_last_access_time(fb->cache));
 }
 
-void folder_find_expired_caches(FolderItem *item, gpointer data)
+static void folder_find_expired_caches(FolderItem *item, gpointer data)
 {
        GSList **folder_item_list = (GSList **)data;
        gint difftime, expiretime;
@@ -2022,24 +2233,26 @@ void folder_find_expired_caches(FolderItem *item, gpointer data)
        difftime = (gint) (time(NULL) - msgcache_get_last_access_time(item->cache));
        expiretime = prefs_common.cache_min_keep_time * 60;
        debug_print("Cache unused time: %d (Expire time: %d)\n", difftime, expiretime);
+
        if (difftime > expiretime && !item->opened && !item->processing_pending) {
                *folder_item_list = g_slist_insert_sorted(*folder_item_list, item, folder_cache_time_compare_func);
        }
 }
 
-void folder_item_free_cache(FolderItem *item)
+gboolean folder_item_free_cache(FolderItem *item, gboolean force)
 {
-       g_return_if_fail(item != NULL);
+       g_return_val_if_fail(item != NULL, TRUE);
        
        if (item->cache == NULL)
-               return;
+               return TRUE;
        
-       if (item->opened > 0)
-               return;
+       if (item->opened > 0 && !force)
+               return FALSE;
 
        folder_item_write_cache(item);
        msgcache_destroy(item->cache);
        item->cache = NULL;
+       return TRUE;
 }
 
 void folder_clean_cache_memory_force(void)
@@ -2072,26 +2285,64 @@ void folder_clean_cache_memory(FolderItem *protected_item)
                listitem = folder_item_list;
                while((listitem != NULL) && (memusage > (prefs_common.cache_max_mem_usage * 1024))) {
                        FolderItem *item = (FolderItem *)(listitem->data);
-                       if (item == protected_item)
+                       gint cache_size = 0;
+                       if (item == protected_item) {
+                               listitem = listitem->next;
                                continue;
+                       }
                        debug_print("Freeing cache memory for %s\n", item->path ? item->path : item->name);
-                       memusage -= msgcache_get_memory_usage(item->cache);
-                       folder_item_free_cache(item);
+                       cache_size = msgcache_get_memory_usage(item->cache);
+                       if (folder_item_free_cache(item, FALSE))
+                               memusage -= cache_size;
+
                        listitem = listitem->next;
                }
                g_slist_free(folder_item_list);
        }
 }
 
-void folder_item_read_cache(FolderItem *item)
+static void folder_item_remove_cached_msg(FolderItem *item, MsgInfo *msginfo)
 {
-       gchar *cache_file, *mark_file;
+       Folder *folder = item->folder;
+
+       g_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)
+{
+       g_return_if_fail(item != NULL);
+       g_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, *tags_file;
+       START_TIMING("");
        g_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);
                if (!item->cache) {
                        MsgInfoList *list, *cur;
@@ -2125,32 +2376,43 @@ void folder_item_read_cache(FolderItem *item)
                } 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();
        }
-
+       END_TIMING();
        folder_clean_cache_memory(item);
 }
 
 void folder_item_write_cache(FolderItem *item)
 {
-       gchar *cache_file, *mark_file;
+       gchar *cache_file, *mark_file, *tags_file;
        FolderItemPrefs *prefs;
        gint filemode = 0;
        gchar *id;
+       time_t last_mtime = (time_t)0;
+       gboolean need_scan = FALSE;
        
        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);
+       }
+
        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) {
+       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 */
@@ -2161,8 +2423,15 @@ void folder_item_write_cache(FolderItem *item)
                }
         }
 
+       if (!need_scan && FOLDER_TYPE(item->folder) == F_MH) {
+               if (item->mtime == last_mtime) {
+                       mh_set_mtime(item);
+               }
+       }
+
        g_free(cache_file);
        g_free(mark_file);
+       g_free(tags_file);
 }
 
 MsgInfo *folder_item_get_msginfo(FolderItem *item, gint num)
@@ -2223,7 +2492,7 @@ GSList *folder_item_get_msg_list(FolderItem *item)
        return msgcache_get_msg_list(item->cache);
 }
 
-void msginfo_set_mime_flags(GNode *node, gpointer data)
+static void msginfo_set_mime_flags(GNode *node, gpointer data)
 {
        MsgInfo *msginfo = data;
        MimeInfo *mimeinfo = node->data;
@@ -2237,7 +2506,12 @@ void msginfo_set_mime_flags(GNode *node, gpointer data)
                if (!mimeinfo->subtype 
                ||  strcmp(mimeinfo->subtype, "pgp-signature"))
                        procmsg_msginfo_set_flags(msginfo, 0, MSG_HAS_ATTACHMENT);
-       }
+       } else if (mimeinfo->disposition == DISPOSITIONTYPE_INLINE &&
+               strcmp(mimeinfo->subtype, "pgp-signature") && 
+               (procmime_mimeinfo_get_parameter(mimeinfo, "name") != NULL ||
+                procmime_mimeinfo_get_parameter(mimeinfo, "filename") != NULL)) {
+               procmsg_msginfo_set_flags(msginfo, 0, MSG_HAS_ATTACHMENT);
+       } 
 
        /* don't descend below top level message for signed and encrypted info */
        if (mimeinfo->type == MIMETYPE_MESSAGE)
@@ -2289,6 +2563,7 @@ gchar *folder_item_fetch_msg(FolderItem *item, gint num)
                                procmsg_msginfo_set_flags(msginfo, 0, MSG_SCANNED);
                        }
                }
+               procmsg_msginfo_free(msginfo);
        }
 
        return msgfile;
@@ -2310,7 +2585,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) {
@@ -2331,6 +2610,7 @@ gchar *folder_item_fetch_msg_full(FolderItem *item, gint num, gboolean headers,
                                procmsg_msginfo_set_flags(msginfo, 0, MSG_SCANNED);
                        }
                }
+               procmsg_msginfo_free(msginfo);
        }
 
        return msgfile;
@@ -2374,6 +2654,8 @@ gint folder_item_fetch_all_msg(FolderItem *item)
                                        folder->ui_func_data ?
                                        folder->ui_func_data :
                                        GINT_TO_POINTER(num));
+               if (num % 50 == 0)
+                       GTK_EVENTS_FLUSH();
 
                msg = folder_item_fetch_msg(item, msginfo->msgnum);
                if (!msg) {
@@ -2406,10 +2688,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);
@@ -2454,8 +2753,11 @@ static void copy_msginfo_flags(MsgInfo *source, MsgInfo *dest)
        if (procmsg_msg_has_flagged_parent(dest, MSG_IGNORE_THREAD))
                perm_flags |= MSG_IGNORE_THREAD;
 
+       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);
+       tmp_flags &= ~(MSG_MOVE | MSG_COPY | MSG_MOVE_DONE);
 
        /* unset flags that are set but should not */
        /* and set new flags */
@@ -2464,6 +2766,11 @@ 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);
+       }
 }
 
 static void add_msginfo_to_cache(FolderItem *item, MsgInfo *newmsginfo, MsgInfo *flagsource)
@@ -2591,6 +2898,7 @@ 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)
@@ -2619,8 +2927,8 @@ gint folder_item_add_msgs(FolderItem *dest, GSList *file_list,
 
         return lastnum;
 }
-               
-FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest
+
+static FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest, gboolean copy
 {
        GSList *mlist;
        FolderItem *new_item;
@@ -2629,7 +2937,7 @@ FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest)
        gchar *old_id, *new_id;
 
        /* move messages */
-       debug_print("Moving %s to %s\n", src->path, dest->path);
+       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");
@@ -2640,18 +2948,27 @@ FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest)
                new_item->folder = dest->folder;
 
        /* move messages */
-       log_message(_("Moving %s to %s...\n"), 
+       log_message(LOG_PROTOCOL, copy ?_("Copying %s to %s...\n"):_("Moving %s to %s...\n"), 
                        src->name, new_item->path);
 
        mlist = folder_item_get_msg_list(src);
        
        if (mlist != NULL) {
-               folder_item_move_msgs(new_item, mlist);
+               if (copy)
+                       folder_item_copy_msgs(new_item, mlist);
+               else
+                       folder_item_move_msgs(new_item, mlist);
                procmsg_msg_list_free(mlist);
        }
        
        /*copy prefs*/
        folder_item_prefs_copy_prefs(src, new_item);
+       
+       /* copy internal data */
+       if (src->folder->klass == new_item->folder->klass &&
+           src->folder->klass->copy_private_data != NULL)
+               src->folder->klass->copy_private_data(src->folder,
+                                       src, new_item);
        new_item->collapsed = src->collapsed;
        new_item->thread_collapsed = src->thread_collapsed;
        new_item->threaded  = src->threaded;
@@ -2670,23 +2987,25 @@ FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest)
                if (srcnode && srcnode->data) {
                        next_item = (FolderItem*) srcnode->data;
                        srcnode = srcnode->next;
-                       if (folder_item_move_recursive(next_item, new_item) == NULL) {
+                       if (folder_item_move_recursive(next_item, new_item, copy) == NULL) {
                                return NULL;
                        }
                }
        }
        old_id = folder_item_get_identifier(src);
        new_id = folder_item_get_identifier(new_item);
-       debug_print("updating rules : %s => %s\n", old_id, new_id);
 
        /* if src supports removing, otherwise only copy folder */
-       if (src->folder->klass->remove_folder != NULL 
+       if (src->folder->klass->remove_folder != NULL && !copy) 
                src->folder->klass->remove_folder(src->folder, src);
        folder_write_list();
 
-       if (old_id != NULL && new_id != NULL) {
-               prefs_filtering_rename_path(old_id, new_id);
-               account_rename_path(old_id, new_id);
+       if (!copy) {
+               debug_print("updating rules : %s => %s\n", old_id, new_id);
+               if (old_id != NULL && new_id != NULL) {
+                       prefs_filtering_rename_path(old_id, new_id);
+                       account_rename_path(old_id, new_id);
+               }
        }
        g_free(old_id);
        g_free(new_id);
@@ -2694,12 +3013,12 @@ FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest)
        return new_item;
 }
 
-gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_item)
+gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_item, gboolean copy)
 {
        FolderItem *tmp = folder_item_parent(dest);
        gchar * src_identifier, * dst_identifier;
-       gchar * phys_srcpath, * phys_dstpath;
-       
+       gchar * phys_srcpath, * phys_dstpath, *tmppath;
+
        while (tmp) {
                if (tmp == src) {
                        return F_MOVE_FAILED_DEST_IS_CHILD;
@@ -2721,15 +3040,17 @@ gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_ite
                return F_MOVE_FAILED;
        }
 
-       if (src->folder != dest->folder) {
+       if (src->folder != dest->folder && !copy) {
                return F_MOVE_FAILED_DEST_OUTSIDE_MAILBOX;
        }
 
        phys_srcpath = folder_item_get_path(src);
-       phys_dstpath = g_strconcat(folder_item_get_path(dest),
+       tmppath = folder_item_get_path(dest);
+       phys_dstpath = g_strconcat(tmppath,
                       G_DIR_SEPARATOR_S,
                       g_path_get_basename(phys_srcpath),
                       NULL);
+       g_free(tmppath);
 
        if (folder_item_parent(src) == dest || src == dest) {
                g_free(src_identifier);
@@ -2739,7 +3060,7 @@ gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_ite
                return F_MOVE_FAILED_DEST_IS_PARENT;
        }
        debug_print("moving \"%s\" to \"%s\"\n", phys_srcpath, phys_dstpath);
-       if ((tmp = folder_item_move_recursive(src, dest)) == NULL) {
+       if ((tmp = folder_item_move_recursive(src, dest, copy)) == NULL) {
                return F_MOVE_FAILED;
        }
        
@@ -2765,6 +3086,8 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
        gboolean folderscan = FALSE;
        GRelation *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);
@@ -2775,6 +3098,40 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
        if (dest->no_select)
                return -1;
 
+       msginfo = (MsgInfo *)msglist->data;
+       
+       if (!msginfo)
+               return -1;
+       
+       if (!MSG_IS_QUEUED(msginfo->flags) && 
+           MSG_IS_DRAFT(msginfo->flags) && 
+           folder_has_parent_of_type(dest, F_QUEUE)) {
+               GSList *cur = msglist;
+               gboolean queue_err = FALSE;
+               for (; cur; cur = cur->next) {
+                       Compose *compose = NULL;
+                       FolderItem *queue = dest;
+                       int val = 0;
+                       
+                       msginfo = (MsgInfo *)cur->data;
+                       compose = compose_reedit(msginfo, TRUE);
+                       if (compose == NULL) {
+                               queue_err = TRUE;
+                               continue;
+                       }
+                       val = compose_queue(compose, NULL, &queue, NULL,
+                                       FALSE);
+                       if (val < 0) {
+                               queue_err = TRUE;
+                       } else if (remove_source) {
+                               folder_item_remove_msg(msginfo->folder, msginfo->msgnum);
+                       }
+                       if (val == 0)
+                               compose_close(compose);
+               }
+               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);
@@ -2831,7 +3188,7 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                 * copying was successfull and update folder
                 * message counts
                 */
-               if (item->folder->klass->remove_msgs) {
+               if (not_moved == NULL && item->folder->klass->remove_msgs) {
                        item->folder->klass->remove_msgs(item->folder,
                                                                msginfo->folder,
                                                                msglist,
@@ -2843,8 +3200,15 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                        item = msginfo->folder;
 
                        tuples = g_relation_select(relation, msginfo, 0);
-                       num = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
-                       g_tuples_destroy(tuples);
+                       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_slist_find(not_moved, msginfo))
                                continue;
@@ -2871,18 +3235,39 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                folderscan = TRUE;
        }
 
+       statusbar_print_all(_("Updating cache for %s..."), dest->path ? dest->path : "(null)");
+       total = g_slist_length(msglist);
        for (l = msglist; l != NULL; l = g_slist_next(l)) {
                MsgInfo *msginfo = (MsgInfo *) l->data;
                 GTuples *tuples;
 
                 tuples = g_relation_select(relation, msginfo, 0);
-                num = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
-                g_tuples_destroy(tuples);
+               if (tuples->len > 0) {
+                       num = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
+                       g_tuples_destroy(tuples);
+               } else {
+                       num = 0;
+                       if (tuples)
+                               g_tuples_destroy(tuples);
+               }
+               statusbar_progress_all(curmsg++,total, 100);
+               if (curmsg % 100 == 0)
+                       GTK_EVENTS_FLUSH();
 
                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) {
@@ -2890,11 +3275,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 
@@ -2917,6 +3297,8 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                                lastnum = num;
                }
        }
+       statusbar_progress_all(0,0,0);
+       statusbar_pop_all();
 
        g_relation_destroy(relation);
        if (not_moved != NULL) {
@@ -3079,7 +3461,7 @@ gint folder_item_remove_all_msg(FolderItem *item)
                result = folder->klass->remove_all_msg(folder, item);
 
                if (result == 0) {
-                       folder_item_free_cache(item);
+                       folder_item_free_cache(item, TRUE);
                        item->cache = msgcache_new();
                }
        } else {
@@ -3132,10 +3514,11 @@ gboolean folder_item_is_msg_changed(FolderItem *item, MsgInfo *msginfo)
        return folder->klass->is_msg_changed(folder, item, msginfo);
 }
 
-gchar *folder_item_get_cache_file(FolderItem *item)
+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);
@@ -3145,15 +3528,21 @@ gchar *folder_item_get_cache_file(FolderItem *item)
        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;
 }
 
-gchar *folder_item_get_mark_file(FolderItem *item)
+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);
@@ -3163,6 +3552,48 @@ gchar *folder_item_get_mark_file(FolderItem *item)
        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. */
+
+       g_return_val_if_fail(item != NULL, NULL);
+
+       identifier = folder_item_get_identifier(item);
+       g_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;
@@ -3309,6 +3740,9 @@ static GNode *folder_get_xml_node(Folder *folder)
        xmlnode = xml_node_new(tag, NULL);
 
        node = g_node_new(xmlnode);
+       
+       g_return_val_if_fail (folder->node != NULL, NULL);
+       
        if (folder->node->children) {
                GNode *cur;
 
@@ -3453,7 +3887,7 @@ FolderItem *folder_get_default_processing(void)
  * (note that in claws other options are in the folder_item_prefs_RC
  * file, so those don't need to be included in PersistPref yet) 
  */
-GHashTable *folder_persist_prefs_new(Folder *folder)
+static GHashTable *folder_persist_prefs_new(Folder *folder)
 {
        GHashTable *pptable;
 
@@ -3463,20 +3897,20 @@ GHashTable *folder_persist_prefs_new(Folder *folder)
        return pptable;
 }
 
-void folder_persist_prefs_free(GHashTable *pptable)
+static void folder_persist_prefs_free(GHashTable *pptable)
 {
        g_return_if_fail(pptable);
        g_hash_table_foreach_remove(pptable, persist_prefs_free, NULL);
        g_hash_table_destroy(pptable);
 }
 
-const PersistPrefs *folder_get_persist_prefs(GHashTable *pptable, const char *name)
+static const PersistPrefs *folder_get_persist_prefs(GHashTable *pptable, const char *name)
 {
        if (pptable == NULL || name == NULL) return NULL;
        return g_hash_table_lookup(pptable, name);
 }
 
-void folder_item_restore_persist_prefs(FolderItem *item, GHashTable *pptable)
+static void folder_item_restore_persist_prefs(FolderItem *item, GHashTable *pptable)
 {
        const PersistPrefs *pp;
        gchar *id = folder_item_get_identifier(item);
@@ -3548,6 +3982,7 @@ void folder_item_apply_processing(FolderItem *item)
        GSList *processing_list;
        GSList *mlist, *cur;
        guint total = 0, curmsg = 0;
+       gint last_apply_per_account;
 
        g_return_if_fail(item != NULL);
 
@@ -3560,11 +3995,16 @@ void folder_item_apply_processing(FolderItem *item)
        &&  !post_global_processing)
                return;
 
+       debug_print("processing %s\n", item->name);
        folder_item_update_freeze();
 
        mlist = folder_item_get_msg_list(item);
        total = g_slist_length(mlist);
        statusbar_print_all(_("Processing messages..."));
+
+       last_apply_per_account = prefs_common.apply_per_account_filtering_rules;
+       prefs_common.apply_per_account_filtering_rules = FILTERING_ACCOUNT_RULES_SKIP;
+
        for (cur = mlist ; cur != NULL ; cur = cur->next) {
                MsgInfo * msginfo;
 
@@ -3577,15 +4017,21 @@ void folder_item_apply_processing(FolderItem *item)
                statusbar_progress_all(curmsg++,total, 10);
 
                 /* apply pre global rules */
-               filter_message_by_msginfo(pre_global_processing, msginfo);
+               filter_message_by_msginfo(pre_global_processing, msginfo, NULL,
+                               FILTERING_PRE_PROCESSING, NULL);
                
                 /* apply rules of the folder */
-               filter_message_by_msginfo(processing_list, msginfo);
+               filter_message_by_msginfo(processing_list, msginfo, NULL,
+                               FILTERING_FOLDER_PROCESSING, item->name);
 
                 /* apply post global rules */
-               filter_message_by_msginfo(post_global_processing, msginfo);
-                
+               filter_message_by_msginfo(post_global_processing, msginfo, NULL,
+                               FILTERING_POST_PROCESSING, NULL);
+               if (curmsg % 1000 == 0)
+                       GTK_EVENTS_FLUSH();
        }
+       prefs_common.apply_per_account_filtering_rules = last_apply_per_account;
+
        if (pre_global_processing || processing_list
            || post_global_processing)
                filtering_move_and_copy_msgs(mlist);
@@ -3680,12 +4126,26 @@ void folder_item_update_thaw(void)
        }
 }
 
+void folder_item_synchronise(FolderItem *item)
+{
+       if (!item)
+               return;
+       if (item->prefs->offlinesync && item->folder->klass->synchronise) {
+               statusbar_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);
+               statusbar_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);
        }
 }
 
@@ -3719,7 +4179,8 @@ gboolean folder_want_synchronise(Folder *folder)
        folder_func_to_all_folders(folder_item_want_synchronise_func, want_sync_data);
        result = want_sync_data->want_sync;
        g_free(want_sync_data);
-       debug_print("Folder %s wants sync: %d\n", folder->name, result);
+       if (result > 0)
+               debug_print("Folder %s wants sync\n", folder->name);
        return result;
 }
 
@@ -3759,10 +4220,6 @@ gboolean folder_has_parent_of_type(FolderItem *item,
                        /* here's an exception: Inbox subfolders are normal. */
                        if (item->parent_stype == -1 && cur->stype == F_INBOX 
                        && item != cur) {
-                               debug_print("set item %s parent type to %d "
-                                       "even if %s is F_INBOX\n",
-                                       item->path ? item->path : "(null)",
-                                       0, cur->path);
                                item->parent_stype = F_NORMAL;
                                break;
                        }
@@ -3770,21 +4227,11 @@ gboolean folder_has_parent_of_type(FolderItem *item,
                         * well copy it instead of going up the full way */
                        if (cur->parent_stype != -1) {
                                item->parent_stype = cur->parent_stype;
-                               debug_print("set item %s parent type to %d "
-                                       "from %s's parent type\n",
-                                       item->path ? item->path : "(null)",
-                                       cur->parent_stype ? cur->parent_stype : 0, 
-                                       cur->path ? cur->path : "(null)");
                                break;
                        }
                        /* we found a parent that has a special type. That's 
                         * our parent type. */
                        if (cur->stype != F_NORMAL) {
-                               debug_print("set item %s parent type to %d "
-                                       "from %s's type\n",
-                                       item->path ? item->path : "(null)",
-                                       cur->stype ? cur->stype : 0, 
-                                       cur->path ? cur->path : "(null)");
                                cur->parent_stype = cur->stype;
                                item->parent_stype = cur->stype;
                                break;
@@ -3795,8 +4242,6 @@ gboolean folder_has_parent_of_type(FolderItem *item,
                /* as we still didn't find anything, our parents must all be 
                 * normal. */
                if (item->parent_stype == -1) {
-                       debug_print("set item %s to 0 from default\n", 
-                               item->path ? item->path : "(null)");
                        item->parent_stype = F_NORMAL;
                }
        }
@@ -3817,4 +4262,17 @@ gboolean folder_subscribe (const gchar *uri)
        return FALSE;
 
 }
+
+gboolean folder_get_sort_type          (Folder         *folder,
+                                        FolderSortKey  *sort_key,
+                                        FolderSortType *sort_type)
+{
+       if (!folder || !sort_key || !sort_type)
+               return FALSE;
+       if (folder->klass->get_sort_type == NULL)
+               return FALSE;
+       folder->klass->get_sort_type(folder, sort_key, sort_type); 
+       return TRUE;
+}
+
 #undef PUT_ESCAPE_STR