2009-01-11 [colin] 3.7.0cvs30
[claws.git] / src / folder.c
index 5ed9790d58ce2c4d6a12cd17ef077ea3bff48e24..2a7c9320d047efac446787df26f10b904fac2e90 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2009 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
@@ -136,9 +136,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;
                        }
@@ -351,6 +352,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;
@@ -392,6 +398,7 @@ void folder_item_remove(FolderItem *item)
 {
        GNode *node, *start_node;
        FolderUpdateData hookdata;
+       gchar *tags_file = NULL;
 
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
@@ -418,6 +425,10 @@ 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);
+       g_free(tags_file);
 
        hookdata.folder = item->folder;
        hookdata.update_flags = FOLDER_TREE_CHANGED | FOLDER_REMOVE_FOLDERITEM;
@@ -533,6 +544,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"))
@@ -648,6 +669,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)
@@ -727,6 +753,12 @@ void folder_add(Folder *folder)
 
        g_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);
                if (cur_folder->sort < folder->sort)
@@ -932,6 +964,8 @@ void folder_fast_scan_tree(Folder *folder)
 FolderItem *folder_create_folder(FolderItem *parent, const gchar *name)
 {
        FolderItem *new_item;
+       
+       g_return_val_if_fail(parent != NULL, NULL);
 
        new_item = parent->folder->klass->create_folder(parent->folder, parent, name);
        if (new_item) {
@@ -982,6 +1016,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
@@ -1033,6 +1072,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
@@ -1144,11 +1188,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");
 
@@ -1159,6 +1208,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)
@@ -1227,20 +1281,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;
+       
+       g_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;
@@ -1260,7 +1347,7 @@ 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;
 
@@ -1466,6 +1553,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;
@@ -1486,6 +1593,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;
@@ -1506,6 +1633,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;
@@ -1526,6 +1673,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) {                                  \
@@ -1607,25 +1774,6 @@ gchar *folder_item_get_path(FolderItem *item)
        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;
@@ -1642,7 +1790,87 @@ 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)
+{
+       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);
+       if ((ret = item->folder->klass->get_flags(
+           item->folder, item, msglist, relation)) == 0) {
+               GTuples *tuples;
+               MsgInfo *msginfo;
+               MsgPermFlags permflags = 0;
+               gboolean skip;
+
+               folder_item_update_freeze();
+               folder_item_set_batch(item, TRUE);
+               for (cur = msglist; cur != NULL; cur = g_slist_next(cur)) {
+                       msginfo = (MsgInfo *) cur->data;
+               
+                       tuples = g_relation_select(relation, msginfo, 0);
+                       skip = tuples->len < 1;
+                       if (!skip)
+                               permflags = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
+                       g_tuples_destroy(tuples);
+                       if (skip)
+                               continue;
+                       
+                       if (msginfo->flags.perm_flags != permflags) {
+                               procmsg_msginfo_change_flags(msginfo,
+                                       permflags & ~msginfo->flags.perm_flags, 0,
+                                       ~permflags & msginfo->flags.perm_flags, 0);
+                       }
+               }
+               folder_item_set_batch(item, FALSE);
+               folder_item_update_thaw();
+       }
+       g_relation_destroy(relation);   
+
+       return ret;
+}
+
+static 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 = 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)
@@ -1658,18 +1886,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; 
 }
@@ -1680,7 +1909,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;
        }
@@ -1773,55 +2002,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;
-
-               folder_item_update_freeze();
-               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_update_thaw();
-       }
-       folder_item_set_batch(item, FALSE);
-       g_relation_destroy(relation);   
-
-       return ret;
-}
-
 gint folder_item_scan_full(FolderItem *item, gboolean filtering)
 {
        Folder *folder;
@@ -1831,6 +2011,9 @@ 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;
@@ -1843,14 +2026,14 @@ 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);
 
-       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);
        }
 
@@ -1932,7 +2115,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);
@@ -1951,7 +2135,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;
@@ -1988,8 +2173,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;
@@ -2023,6 +2211,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) &&
@@ -2047,9 +2238,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) {
@@ -2094,6 +2288,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)))
@@ -2117,6 +2314,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++;
 
@@ -2131,7 +2338,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;
        }
 
@@ -2140,13 +2350,18 @@ 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;
 }
@@ -2156,17 +2371,6 @@ 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;
@@ -2177,37 +2381,6 @@ static void folder_count_total_cache_memusage(FolderItem *item, gpointer data)
        *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);
-
-       item->scanning = FALSE;
-
-       return ret;
-}
-
 static gint folder_cache_time_compare_func(gconstpointer a, gconstpointer b)
 {
        FolderItem *fa = (FolderItem *)a;
@@ -2345,6 +2518,9 @@ static void folder_item_read_cache(FolderItem *item)
                        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();
@@ -2364,11 +2540,27 @@ 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);
@@ -2397,10 +2589,11 @@ 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;
+       last_mtime = item->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);
@@ -2420,9 +2613,9 @@ void folder_item_write_cache(FolderItem *item)
                }
         }
 
-       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);
                }
        }
 
@@ -2614,63 +2807,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));
-               if (num % 50 == 0)
-                       GTK_EVENTS_FLUSH();
-
-               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},
@@ -2685,10 +2821,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);
@@ -2733,6 +2886,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);
 
@@ -2747,6 +2906,7 @@ static void copy_msginfo_flags(MsgInfo *source, MsgInfo *dest)
        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);
        }
 }
 
@@ -2761,6 +2921,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();
@@ -2789,6 +2959,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--;
 
@@ -2875,13 +3055,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");
                        }
 
@@ -2916,7 +3097,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;
        }
        
@@ -3213,6 +3394,12 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
 
        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;
@@ -3273,6 +3460,7 @@ 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();
 
@@ -3372,9 +3560,13 @@ gint folder_item_remove_msg(FolderItem *item, gint num)
 
        if (!item->cache) folder_item_read_cache(item);
 
+       msginfo = msgcache_get_msg(item->cache, num);
+       if (msginfo && MSG_IS_LOCKED(msginfo->flags)) {
+               procmsg_msginfo_free(msginfo);
+               return -1;
+       }
        ret = folder->klass->remove_msg(folder, item, num);
 
-       msginfo = msgcache_get_msg(item->cache, num);
        if (msginfo != NULL) {
                remove_msginfo_from_cache(item, msginfo);
                procmsg_msginfo_free(msginfo);
@@ -3387,6 +3579,7 @@ 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);
        folder = item->folder;
@@ -3397,24 +3590,35 @@ gint folder_item_remove_msgs(FolderItem *item, GSList *msglist)
        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();
@@ -3454,6 +3658,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);
        }
 
@@ -3468,13 +3677,34 @@ void folder_item_change_msg_flags(FolderItem *item, MsgInfo *msginfo, MsgPermFla
        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;
+       
+       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;
@@ -3490,6 +3720,30 @@ gboolean folder_item_is_msg_changed(FolderItem *item, MsgInfo *msginfo)
        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;
@@ -3553,7 +3807,12 @@ static gchar *folder_item_get_tags_file(FolderItem *item)
 
        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);
@@ -3671,13 +3930,6 @@ 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;
@@ -3969,6 +4221,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..."));
@@ -3976,6 +4230,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;
 
@@ -3998,9 +4253,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 % 10 == 0)
+               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
@@ -4015,6 +4272,8 @@ void folder_item_apply_processing(FolderItem *item)
        statusbar_progress_all(0,0,0);
        statusbar_pop_all();
 
+       inc_unlock();
+
        folder_item_update_thaw();
 }
 
@@ -4102,13 +4361,13 @@ 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)");
+               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);
-               statusbar_pop_all();
+               statuswindow_pop_all();
        }
 }
 
@@ -4157,6 +4416,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);
        }
@@ -4245,5 +4506,3 @@ gboolean folder_get_sort_type             (Folder         *folder,
        folder->klass->get_sort_type(folder, sort_key, sort_type); 
        return TRUE;
 }
-
-#undef PUT_ESCAPE_STR