2006-07-07 [colin] 2.3.1cvs69
[claws.git] / src / folder.c
index 46d1b7e45695883b7e97360117be661bfa9b15a8..fb8e8f6bdc7c250ad25ed2abdb78c639db2a92f9 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws 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
@@ -14,7 +14,7 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <stdlib.h>
+#ifdef WIN32
+#include <w32lib.h>
+#endif
 
-#include "intl.h"
 #include "folder.h"
 #include "session.h"
+#include "inc.h"
 #include "imap.h"
 #include "news.h"
 #include "mh.h"
 #include "folder_item_prefs.h"
 #include "remotefolder.h"
 #include "partial_download.h"
+#include "statusbar.h"
+#include "gtkutils.h"
+#include "timing.h"
+#include "compose.h"
 
 /* Dependecies to be removed ?! */
 #include "prefs_common.h"
 #include "prefs_account.h"
 
+/* Define possible missing constants for Windows. */
+#ifdef G_OS_WIN32
+# ifndef S_IRGRP
+# define S_IRGRP 0
+# define S_IWGRP 0
+# endif
+# ifndef S_IROTH
+# define S_IROTH 0
+# define S_IWOTH 0
+# endif
+#endif
+
 static GList *folder_list = NULL;
 static GSList *class_list = NULL;
 static GSList *folder_unloaded_list = NULL;
@@ -71,7 +91,6 @@ 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);
 gint folder_item_scan_full             (FolderItem *item, gboolean filtering);
 static void folder_item_update_with_msg (FolderItem *item, FolderItemUpdateFlags update_flags,
                                          MsgInfo *msg);
@@ -154,6 +173,9 @@ Folder *folder_new(FolderClass *klass, const gchar *name, const gchar *path)
 
        /* Create root folder item */
        item = folder_item_new(folder, name, NULL);
+       if (item == NULL) {
+               return NULL;
+       }
        item->folder = folder;
        folder->node = item->node = g_node_new(item);
        folder->data = NULL;
@@ -177,6 +199,52 @@ 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;
+
+       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);
@@ -205,12 +273,10 @@ void folder_set_xml(Folder *folder, XMLTag *tag)
 
                if (!attr || !attr->name || !attr->value) continue;
                if (!strcmp(attr->name, "name")) {
-                       if (folder->name != NULL)
-                               g_free(folder->name);
+                       g_free(folder->name);
                        folder->name = g_strdup(attr->value);
                        if (rootitem != NULL) {
-                               if (rootitem->name != NULL)
-                                       g_free(rootitem->name);
+                               g_free(rootitem->name);
                                rootitem->name = g_strdup(attr->value);
                        }
                } else if (!strcmp(attr->name, "account_id")) {
@@ -255,7 +321,9 @@ XMLTag *folder_get_xml(Folder *folder)
 FolderItem *folder_item_new(Folder *folder, const gchar *name, const gchar *path)
 {
        FolderItem *item = NULL;
-
+       
+       g_return_val_if_fail(folder != NULL, NULL);
+       
        if (folder->klass->item_new) {
                item = folder->klass->item_new(folder);
        } else {
@@ -271,6 +339,7 @@ FolderItem *folder_item_new(Folder *folder, const gchar *name, const gchar *path
        item->new_msgs = 0;
        item->unread_msgs = 0;
        item->unreadmarked_msgs = 0;
+       item->marked_msgs = 0;
        item->total_msgs = 0;
        item->last_num = -1;
        item->cache = NULL;
@@ -287,6 +356,10 @@ FolderItem *folder_item_new(Folder *folder, const gchar *name, const gchar *path
        item->apply_sub = FALSE;
        item->mark_queue = NULL;
        item->data = NULL;
+       item->parent_stype = -1;
+
+       item->sort_key = SORT_BY_DATE;
+       item->sort_type = SORT_ASCENDING;
 
        item->prefs = folder_item_prefs_new();
 
@@ -304,11 +377,32 @@ void folder_item_append(FolderItem *parent, FolderItem *item)
        g_node_append(parent->node, item->node);
 }
 
-static gboolean folder_item_remove_func(GNode *node, gpointer data)
+void folder_item_remove(FolderItem *item)
 {
-       FolderItem *item = FOLDER_ITEM(node->data);
+       GNode *node, *start_node;
        FolderUpdateData hookdata;
 
+       g_return_if_fail(item != NULL);
+       g_return_if_fail(item->folder != NULL);
+       g_return_if_fail(item->folder->node != NULL);
+
+       start_node = node = item->node;
+       
+       node = item->folder->node;
+       
+       node = g_node_find(node, G_PRE_ORDER, G_TRAVERSE_ALL, item);
+       node = node->children;
+
+       /* remove my children */
+       while (node != NULL) {
+               if (node && node->data) {
+                       FolderItem *sub_item = (FolderItem*) node->data;
+                       node = node->next;
+                       folder_item_remove(sub_item);
+               }
+       }
+       
+       /* remove myself */
        if (item->cache != NULL) {
                msgcache_destroy(item->cache);
                item->cache = NULL;
@@ -319,26 +413,13 @@ static gboolean folder_item_remove_func(GNode *node, gpointer data)
        hookdata.item = item;
        hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
 
-       folder_item_destroy(item);
-
-       return FALSE;
-}
-
-void folder_item_remove(FolderItem *item)
-{
-       GNode *node;
-
-       g_return_if_fail(item != NULL);
-       g_return_if_fail(item->folder != NULL);
-       g_return_if_fail(item->node != NULL);
-
-       node = item->node;
+       node = start_node;
 
        if (item->folder->node == node)
                item->folder->node = NULL;
 
-       g_node_traverse(node, G_POST_ORDER, G_TRAVERSE_ALL, -1,
-                       folder_item_remove_func, NULL);
+       folder_item_destroy(item);
+
        g_node_destroy(node);
 }
 
@@ -379,7 +460,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);
@@ -426,12 +507,10 @@ void folder_item_set_xml(Folder *folder, FolderItem *item, XMLTag *tag)
                        else if (!g_ascii_strcasecmp(attr->value, "trash"))
                                item->stype = F_TRASH;
                } else if (!strcmp(attr->name, "name")) {
-                       if (item->name != NULL)
-                               g_free(item->name);
+                       g_free(item->name);
                        item->name = g_strdup(attr->value);
                } else if (!strcmp(attr->name, "path")) {
-                       if (item->path != NULL)
-                               g_free(item->path);
+                       g_free(item->path);
                        item->path = g_strdup(attr->value);
                } else if (!strcmp(attr->name, "mtime"))
                        item->mtime = strtoul(attr->value, NULL, 10);
@@ -441,6 +520,8 @@ void folder_item_set_xml(Folder *folder, FolderItem *item, XMLTag *tag)
                        item->unread_msgs = atoi(attr->value);
                else if (!strcmp(attr->name, "unreadmarked"))
                        item->unreadmarked_msgs = atoi(attr->value);
+               else if (!strcmp(attr->name, "marked"))
+                       item->marked_msgs = atoi(attr->value);
                else if (!strcmp(attr->name, "total"))
                        item->total_msgs = atoi(attr->value);
                else if (!strcmp(attr->name, "no_sub"))
@@ -542,6 +623,7 @@ XMLTag *folder_item_get_xml(Folder *folder, FolderItem *item)
        xml_tag_add_attr(tag, xml_attr_new_int("new", item->new_msgs));
        xml_tag_add_attr(tag, xml_attr_new_int("unread", item->unread_msgs));
        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));
 
        if (item->account)
@@ -684,7 +766,7 @@ gint folder_read_list(void)
        }
 
        xml_free_tree(node);
-       if (folder_list)
+       if (folder_list || folder_unloaded_list)
                return 0;
        else
                return -1;
@@ -745,22 +827,26 @@ gboolean folder_scan_tree_func(GNode *node, gpointer data)
        return FALSE;
 }
 
-void folder_scan_tree(Folder *folder)
+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);
 
-       /*
-        * should be changed and tree update should be done without 
-        * destroying the tree first
-        */
-       folder_tree_destroy(folder);
-       folder->klass->scan_tree(folder);
+       if (rebuild)
+               folder_remove(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;
@@ -805,11 +891,17 @@ gint folder_item_rename(FolderItem *item, gchar *newname)
 
        if (retval >= 0) {
                FolderItemUpdateData hookdata;
+               FolderUpdateData hookdata2;
 
                hookdata.item = item;
                hookdata.update_flags = F_ITEM_UPDATE_NAME;
                hookdata.msg = NULL;
                hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &hookdata);
+
+               hookdata2.folder = item->folder;
+               hookdata2.item = item;
+               hookdata2.update_flags = FOLDER_RENAME_FOLDERITEM;
+               hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata2);
        }
 
        return retval;
@@ -820,6 +912,7 @@ struct TotalMsgCount
        guint new_msgs;
        guint unread_msgs;
        guint unreadmarked_msgs;
+       guint marked_msgs;
        guint total_msgs;
 };
 
@@ -870,6 +963,7 @@ static void folder_count_total_msgs_func(FolderItem *item, gpointer data)
        count->new_msgs += item->new_msgs;
        count->unread_msgs += item->unread_msgs;
        count->unreadmarked_msgs += item->unreadmarked_msgs;
+       count->marked_msgs += item->marked_msgs;
        count->total_msgs += item->total_msgs;
 }
 
@@ -980,7 +1074,9 @@ gchar *folder_get_status(GPtrArray *folders, gboolean full)
        return ret;
 }
 
-void folder_count_total_msgs(guint *new_msgs, guint *unread_msgs, guint *unreadmarked_msgs, guint *total_msgs)
+void folder_count_total_msgs(guint *new_msgs, guint *unread_msgs, 
+                            guint *unreadmarked_msgs, guint *marked_msgs,
+                            guint *total_msgs)
 {
        struct TotalMsgCount count;
 
@@ -993,6 +1089,7 @@ void folder_count_total_msgs(guint *new_msgs, guint *unread_msgs, guint *unreadm
        *new_msgs = count.new_msgs;
        *unread_msgs = count.unread_msgs;
        *unreadmarked_msgs = count.unreadmarked_msgs;
+       *marked_msgs = count.marked_msgs;
        *total_msgs = count.total_msgs;
 }
 
@@ -1227,6 +1324,17 @@ Folder *folder_get_default_folder(void)
        return folder_list ? FOLDER(folder_list->data) : NULL;
 }
 
+gboolean folder_have_mailbox (void)
+{
+       GList *cur;
+       for (cur = folder_list; cur != NULL; cur = g_list_next(cur)) {
+               Folder *folder = FOLDER(cur->data);
+               if (folder->inbox && folder->outbox)
+                       return TRUE;
+       }
+       return FALSE;
+}
+
 FolderItem *folder_get_default_inbox(void)
 {
        GList *flist;
@@ -1238,6 +1346,8 @@ FolderItem *folder_get_default_inbox(void)
                        continue;
                if (folder->inbox == NULL)
                        continue;
+               if (folder->klass->type == F_UNKNOWN)
+                       continue;
 
                return folder->inbox;
        }
@@ -1400,18 +1510,18 @@ gchar *folder_item_get_path(FolderItem *item)
 
 void folder_item_set_default_flags(FolderItem *dest, MsgFlags *flags)
 {
-       if (!(dest->stype == F_OUTBOX ||
-             dest->stype == F_QUEUE  ||
-             dest->stype == F_DRAFT  ||
-             dest->stype == F_TRASH)) {
+       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 (dest->stype == F_QUEUE) {
+               if (folder_has_parent_of_type(dest, F_QUEUE)) {
                        MSG_SET_TMP_FLAGS(*flags, MSG_QUEUED);
-               } else if (dest->stype == F_DRAFT) {
+               } else if (folder_has_parent_of_type(dest, F_DRAFT)) {
                        MSG_SET_TMP_FLAGS(*flags, MSG_DRAFT);
                }
        }
@@ -1433,26 +1543,56 @@ static gint folder_sort_folder_list(gconstpointer a, gconstpointer b)
        return (gint_a - gint_b);
 }
 
-gint folder_item_open(FolderItem *item)
+void folder_item_process_open (FolderItem *item,
+                                void (*before_proc_func)(gpointer data),
+                                void (*after_proc_func)(gpointer data),
+                                gpointer data)
 {
        gchar *buf;
-       if((item->folder->klass->scan_required != NULL) && (item->folder->klass->scan_required(item->folder, item))) {
+       if (item == NULL)
+               return;
+       if((item->folder->klass->scan_required != NULL) &&
+          (item->folder->klass->scan_required(item->folder, item))) {
                folder_item_scan_full(item, TRUE);
+       } else {
+               folder_item_syncronize_flags(item);
        }
-       folder_item_syncronize_flags(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)
+               before_proc_func(data);
+
        folder_item_apply_processing(item);
 
-       item->opened = TRUE;
+       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("folder_item_open"); 
+       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;
 }
 
@@ -1463,6 +1603,9 @@ gint folder_item_close(FolderItem *item)
        
        g_return_val_if_fail(item != NULL, -1);
 
+       if (item->no_select)
+               return -1;
+
        if (item->new_msgs) {
                folder_item_update_freeze();
                mlist = folder_item_get_msg_list(item);
@@ -1495,7 +1638,9 @@ static MsgInfoList *get_msginfos(FolderItem *item, MsgNumberList *numlist)
 {
        MsgInfoList *msglist = NULL;
        Folder *folder = item->folder;
-
+       if (item->no_select)
+               return NULL;
+       
        if (folder->klass->get_msginfos != NULL)
                msglist = folder->klass->get_msginfos(folder, item, numlist);
        else {
@@ -1541,14 +1686,17 @@ static gint syncronize_flags(FolderItem *item, MsgInfoList *msglist)
                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;
+               MsgPermFlags permflags = 0;
                gboolean skip;
 
                for (cur = msglist; cur != NULL; cur = g_slist_next(cur)) {
@@ -1563,13 +1711,13 @@ static gint syncronize_flags(FolderItem *item, MsgInfoList *msglist)
                                continue;
                        
                        if (msginfo->flags.perm_flags != permflags) {
-                               procmsg_msginfo_set_flags(msginfo,
-                                       permflags & ~msginfo->flags.perm_flags, 0);
-                               procmsg_msginfo_unset_flags(msginfo,
+                               procmsg_msginfo_change_flags(msginfo,
+                                       permflags & ~msginfo->flags.perm_flags, 0,
                                        ~permflags & msginfo->flags.perm_flags, 0);
                        }
                }
        }
+       folder_item_set_batch(item, FALSE);
        g_relation_destroy(relation);   
 
        return ret;
@@ -1582,10 +1730,12 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
        GSList *folder_list_cur, *cache_list_cur, *new_list = NULL;
        GSList *exists_list = NULL, *elem;
        GSList *newmsg_list = NULL;
-       guint newcnt = 0, unreadcnt = 0, totalcnt = 0, unreadmarkedcnt = 0;
+       guint newcnt = 0, unreadcnt = 0, totalcnt = 0;
+       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;
 
@@ -1594,14 +1744,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->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);
@@ -1721,9 +1878,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;
@@ -1749,48 +1913,86 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
        g_slist_free(folder_list);
 
        if (new_list != NULL) {
+               GSList *tmp_list = NULL;
                newmsg_list = get_msginfos(item, new_list);
                g_slist_free(new_list);
+               tmp_list = g_slist_concat(g_slist_copy(exists_list), g_slist_copy(newmsg_list));
+               syncronize_flags(item, tmp_list);
+               g_slist_free(tmp_list);
+       } else {
+               syncronize_flags(item, exists_list);
        }
 
-       syncronize_flags(item, exists_list);
-
        folder_item_update_freeze();
        if (newmsg_list != NULL) {
-               GSList *elem;
-
+               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"));
+               
                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))
-                               procmsg_msginfo_free(msginfo);
-                       else
+                               to_filter = g_slist_prepend(to_filter, msginfo);
+                       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);
+                               }
+                       }
+               }
+               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);
                }
+
+               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)))
                        procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
                if (!MSG_IS_IGNORE_THREAD(msginfo->flags) && procmsg_msg_has_flagged_parent(msginfo, MSG_IGNORE_THREAD)) {
-                       procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
-                       procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
+                       procmsg_msginfo_change_flags(msginfo, MSG_IGNORE_THREAD, 0, MSG_NEW | MSG_UNREAD, 0);
                }
-               if ((item->stype == F_OUTBOX ||
-                    item->stype == F_QUEUE  ||
-                    item->stype == F_DRAFT  ||
-                    item->stype == F_TRASH) &&
+               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)  ||
+                    folder_has_parent_of_type(item, F_TRASH)) &&
                    (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)))
                        procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
                if (MSG_IS_NEW(msginfo->flags))
@@ -1799,21 +2001,38 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
                        unreadcnt++;
                if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
                        unreadmarkedcnt++;
+               if (MSG_IS_MARKED(msginfo->flags))
+                       markedcnt++;
+
                totalcnt++;
 
                procmsg_msginfo_free(msginfo);
        }
+       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;
        item->total_msgs = totalcnt;
        item->unreadmarked_msgs = unreadmarkedcnt;
+       item->marked_msgs = markedcnt;
 
        update_flags |= F_ITEM_UPDATE_MSGCNT;
 
        folder_item_update(item, update_flags);
        folder_item_update_thaw();
+       
+       item->scanning = FALSE;
 
        return 0;
 }
@@ -1868,7 +2087,11 @@ gint folder_item_syncronize_flags(FolderItem *item)
        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);
        
@@ -1879,6 +2102,10 @@ gint folder_item_syncronize_flags(FolderItem *item)
        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;
 }
 
@@ -1904,27 +2131,43 @@ 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) {
+
+       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)
+{
+       int old_cache_max_mem_usage = prefs_common.cache_max_mem_usage;
+       int old_cache_min_keep_time = prefs_common.cache_min_keep_time;
+
+       prefs_common.cache_max_mem_usage = 0;
+       prefs_common.cache_min_keep_time = 0;
+
+       folder_clean_cache_memory(NULL);
+
+       prefs_common.cache_max_mem_usage = old_cache_max_mem_usage;
+       prefs_common.cache_min_keep_time = old_cache_min_keep_time;
 }
 
-void folder_clean_cache_memory(void)
+void folder_clean_cache_memory(FolderItem *protected_item)
 {
        gint memusage = 0;
 
@@ -1940,10 +2183,16 @@ void folder_clean_cache_memory(void)
                listitem = folder_item_list;
                while((listitem != NULL) && (memusage > (prefs_common.cache_max_mem_usage * 1024))) {
                        FolderItem *item = (FolderItem *)(listitem->data);
+                       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);
+                       cache_size = msgcache_get_memory_usage(item->cache);
+                       if (folder_item_free_cache(item, FALSE))
+                               memusage -= cache_size;
 
-                       debug_print("Freeing cache memory for %s\n", item->path);
-                       memusage -= msgcache_get_memory_usage(item->cache);
-                       folder_item_free_cache(item);
                        listitem = listitem->next;
                }
                g_slist_free(folder_item_list);
@@ -1953,7 +2202,7 @@ void folder_clean_cache_memory(void)
 void folder_item_read_cache(FolderItem *item)
 {
        gchar *cache_file, *mark_file;
-       
+       START_TIMING("folder_item_read_cache");
        g_return_if_fail(item != NULL);
 
        if (item->path != NULL) {
@@ -1962,7 +2211,8 @@ void folder_item_read_cache(FolderItem *item)
                item->cache = msgcache_read_cache(item, cache_file);
                if (!item->cache) {
                        MsgInfoList *list, *cur;
-                       guint newcnt = 0, unreadcnt = 0, unreadmarkedcnt = 0;
+                       guint newcnt = 0, unreadcnt = 0;
+                       guint markedcnt = 0, unreadmarkedcnt = 0;
                        MsgInfo *msginfo;
 
                        item->cache = msgcache_new();
@@ -1980,10 +2230,13 @@ void folder_item_read_cache(FolderItem *item)
                                        unreadcnt++;
                                if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
                                        unreadmarkedcnt++;
+                               if (MSG_IS_MARKED(msginfo->flags))
+                                       markedcnt++;
                        }
                        item->new_msgs = newcnt;
                        item->unread_msgs = unreadcnt;
                        item->unreadmarked_msgs = unreadmarkedcnt;
+                       item->marked_msgs = markedcnt;
                        procmsg_msg_list_free(list);
                } else
                        msgcache_read_mark(item->cache, mark_file);
@@ -1993,8 +2246,8 @@ void folder_item_read_cache(FolderItem *item)
        } else {
                item->cache = msgcache_new();
        }
-
-       folder_clean_cache_memory();
+       END_TIMING();
+       folder_clean_cache_memory(item);
 }
 
 void folder_item_write_cache(FolderItem *item)
@@ -2034,7 +2287,8 @@ MsgInfo *folder_item_get_msginfo(FolderItem *item, gint num)
        MsgInfo *msginfo = NULL;
        
        g_return_val_if_fail(item != NULL, NULL);
-       
+       if (item->no_select)
+               return NULL;
        folder = item->folder;
        if (!item->cache)
                folder_item_read_cache(item);
@@ -2058,6 +2312,8 @@ MsgInfo *folder_item_get_msginfo_by_msgid(FolderItem *item, const gchar *msgid)
        
        g_return_val_if_fail(item != NULL, NULL);
        g_return_val_if_fail(msgid != NULL, NULL);
+       if (item->no_select)
+               return FALSE;
        
        folder = item->folder;
        if (!item->cache)
@@ -2072,6 +2328,8 @@ MsgInfo *folder_item_get_msginfo_by_msgid(FolderItem *item, const gchar *msgid)
 GSList *folder_item_get_msg_list(FolderItem *item)
 {
        g_return_val_if_fail(item != NULL, NULL);
+       if (item->no_select)
+               return FALSE;
        
        if (item->cache == 0)
                folder_item_read_cache(item);
@@ -2081,18 +2339,26 @@ GSList *folder_item_get_msg_list(FolderItem *item)
        return msgcache_get_msg_list(item->cache);
 }
 
-static void msginfo_set_mime_flags(GNode *node, gpointer data)
+void msginfo_set_mime_flags(GNode *node, gpointer data)
 {
        MsgInfo *msginfo = data;
        MimeInfo *mimeinfo = node->data;
-
-       if (mimeinfo->disposition == DISPOSITIONTYPE_ATTACHMENT) {
+       
+       if (mimeinfo->disposition == DISPOSITIONTYPE_ATTACHMENT
+        && (!mimeinfo->subtype ||  strcmp(mimeinfo->subtype, "pgp-signature"))) {
                procmsg_msginfo_set_flags(msginfo, 0, MSG_HAS_ATTACHMENT);
        } else if (mimeinfo->disposition == DISPOSITIONTYPE_UNKNOWN && 
                 mimeinfo->type != MIMETYPE_TEXT &&
                 mimeinfo->type != MIMETYPE_MULTIPART) {
+               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)
@@ -2121,6 +2387,8 @@ gchar *folder_item_fetch_msg(FolderItem *item, gint num)
        folder = item->folder;
 
        g_return_val_if_fail(folder->klass->fetch_msg != NULL, NULL);
+       if (item->no_select)
+               return NULL;
 
        msgfile = folder->klass->fetch_msg(folder, item, num);
 
@@ -2129,8 +2397,8 @@ gchar *folder_item_fetch_msg(FolderItem *item, gint num)
                if ((msginfo != NULL) && !MSG_IS_SCANNED(msginfo->flags)) {
                        MimeInfo *mimeinfo;
 
-                       if (msginfo->folder->stype != F_QUEUE && 
-                           msginfo->folder->stype != F_DRAFT)
+                       if (!folder_has_parent_of_type(msginfo->folder, F_QUEUE) && 
+                           !folder_has_parent_of_type(msginfo->folder, F_DRAFT))
                                mimeinfo = procmime_scan_file(msgfile);
                        else
                                mimeinfo = procmime_scan_queue_file(msgfile);
@@ -2142,11 +2410,56 @@ gchar *folder_item_fetch_msg(FolderItem *item, gint num)
                                procmsg_msginfo_set_flags(msginfo, 0, MSG_SCANNED);
                        }
                }
+               procmsg_msginfo_free(msginfo);
        }
 
        return msgfile;
 }
 
+gchar *folder_item_fetch_msg_full(FolderItem *item, gint num, gboolean headers,
+                                 gboolean body)
+{
+       Folder *folder;
+       gchar *msgfile;
+       MsgInfo *msginfo;
+
+       g_return_val_if_fail(item != NULL, NULL);
+       if (item->no_select)
+               return NULL;
+       
+       folder = item->folder;
+
+       if (folder->klass->fetch_msg_full == NULL)
+               return folder_item_fetch_msg(item, num);
+
+       msgfile = folder->klass->fetch_msg_full(folder, item, num, 
+                                               headers, body);
+
+       if (msgfile != NULL) {
+               msginfo = folder_item_get_msginfo(item, num);
+               if ((msginfo != NULL) && !MSG_IS_SCANNED(msginfo->flags)) {
+                       MimeInfo *mimeinfo;
+
+                       if (!folder_has_parent_of_type(msginfo->folder, F_QUEUE) &&
+                           !folder_has_parent_of_type(msginfo->folder, F_DRAFT))
+                               mimeinfo = procmime_scan_file(msgfile);
+                       else
+                               mimeinfo = procmime_scan_queue_file(msgfile);
+                       /* check for attachments */
+                       if (mimeinfo != NULL) { 
+                               g_node_children_foreach(mimeinfo->node, G_TRAVERSE_ALL, msginfo_set_mime_flags, msginfo);
+                               procmime_mimeinfo_free_all(mimeinfo);
+
+                               procmsg_msginfo_set_flags(msginfo, 0, MSG_SCANNED);
+                       }
+               }
+               procmsg_msginfo_free(msginfo);
+       }
+
+       return msgfile;
+}
+
+
 gint folder_item_fetch_all_msg(FolderItem *item)
 {
        Folder *folder;
@@ -2154,10 +2467,14 @@ gint folder_item_fetch_all_msg(FolderItem *item)
        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);
+       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;
 
@@ -2167,11 +2484,14 @@ gint folder_item_fetch_all_msg(FolderItem *item)
 
        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;
 
-               num++;
+               statusbar_progress_all(num++,total, 10);
+
                if (folder->ui_func)
                        folder->ui_func(folder, item,
                                        folder->ui_func_data ?
@@ -2187,7 +2507,9 @@ gint folder_item_fetch_all_msg(FolderItem *item)
                }
                g_free(msg);
        }
-
+       
+       statusbar_progress_all(0,0,0);
+       statusbar_pop_all();
        procmsg_msg_list_free(mlist);
 
        return ret;
@@ -2202,10 +2524,11 @@ static gint folder_item_get_msg_num_by_file(FolderItem *dest, const gchar *file)
        gint msgnum = 0;
        gchar buf[BUFFSIZE];
 
-       if ((fp = fopen(file, "rb")) == NULL)
+       if ((fp = g_fopen(file, "rb")) == NULL)
                return 0;
 
-       if ((dest->stype == F_QUEUE) || (dest->stype == F_DRAFT))
+       if ((folder_has_parent_of_type(dest, F_QUEUE)) || 
+           (folder_has_parent_of_type(dest, F_DRAFT)))
                while (fgets(buf, sizeof(buf), fp) != NULL)
                        if (buf[0] == '\r' || buf[0] == '\n') break;
 
@@ -2244,10 +2567,10 @@ static void copy_msginfo_flags(MsgInfo *source, MsgInfo *dest)
        }
 
        /* remove new, unread and deleted in special folders */
-       if (dest->folder->stype == F_OUTBOX ||
-           dest->folder->stype == F_QUEUE  ||
-           dest->folder->stype == F_DRAFT  ||
-           dest->folder->stype == F_TRASH)
+       if (folder_has_parent_of_type(dest->folder, F_OUTBOX) || 
+           folder_has_parent_of_type(dest->folder, F_QUEUE) || 
+           folder_has_parent_of_type(dest->folder, F_DRAFT) || 
+           folder_has_parent_of_type(dest->folder, F_TRASH))
                perm_flags &= ~(MSG_NEW | MSG_UNREAD | MSG_DELETED);
 
        /* set ignore flag of ignored parent exists */
@@ -2258,13 +2581,12 @@ static void copy_msginfo_flags(MsgInfo *source, MsgInfo *dest)
        tmp_flags &= ~(MSG_MOVE | MSG_COPY);
 
        /* unset flags that are set but should not */
-       procmsg_msginfo_unset_flags(dest,
-                                   dest->flags.perm_flags & ~perm_flags,
-                                   dest->flags.tmp_flags  & ~tmp_flags);
-       /* set new flags */
-       procmsg_msginfo_set_flags(dest,
+       /* and set new flags */
+       procmsg_msginfo_change_flags(dest,
                                  ~dest->flags.perm_flags & perm_flags,
-                                 ~dest->flags.tmp_flags  & tmp_flags);
+                                 ~dest->flags.tmp_flags  & tmp_flags,
+                                  dest->flags.perm_flags & ~perm_flags,
+                                  dest->flags.tmp_flags  & ~tmp_flags);
 }
 
 static void add_msginfo_to_cache(FolderItem *item, MsgInfo *newmsginfo, MsgInfo *flagsource)
@@ -2276,9 +2598,15 @@ static void add_msginfo_to_cache(FolderItem *item, MsgInfo *newmsginfo, MsgInfo
                item->unread_msgs++;
        if (MSG_IS_UNREAD(newmsginfo->flags) && procmsg_msg_has_marked_parent(newmsginfo))
                item->unreadmarked_msgs++;
+       if (MSG_IS_MARKED(newmsginfo->flags))
+               item->marked_msgs++;
        item->total_msgs++;
 
        folder_item_update_freeze();
+
+       if (!item->cache)
+               folder_item_read_cache(item);
+
        msgcache_add_msg(item->cache, newmsginfo);
        copy_msginfo_flags(flagsource, newmsginfo);
        folder_item_update_with_msg(item,  F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT | F_ITEM_UPDATE_ADDMSG, newmsginfo);
@@ -2298,6 +2626,9 @@ static void remove_msginfo_from_cache(FolderItem *item, MsgInfo *msginfo)
                msginfo->folder->unread_msgs--;
        if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
                msginfo->folder->unreadmarked_msgs--;
+       if (MSG_IS_MARKED(msginfo->flags))
+               item->marked_msgs--;
+
        msginfo->folder->total_msgs--;
 
        msginfo_update.msginfo = msginfo;
@@ -2339,6 +2670,8 @@ gint folder_item_add_msgs(FolderItem *dest, GSList *file_list,
         g_return_val_if_fail(dest != NULL, -1);
         g_return_val_if_fail(file_list != NULL, -1);
         g_return_val_if_fail(dest->folder != NULL, -1);
+       if (dest->no_select)
+               return -1;
 
         folder = dest->folder;
 
@@ -2387,7 +2720,7 @@ gint folder_item_add_msgs(FolderItem *dest, GSList *file_list,
                                lastnum = num;
 
                        if (num >= 0 && remove_source) {
-                               if (unlink(fileinfo->file) < 0)
+                               if (g_unlink(fileinfo->file) < 0)
                                        FILE_OP_ERROR(fileinfo->file, "unlink");
                        }
 
@@ -2409,25 +2742,6 @@ gint folder_item_add_msgs(FolderItem *dest, GSList *file_list,
 
         return lastnum;
 }
-
-/*
-gint folder_item_move_msg(FolderItem *dest, MsgInfo *msginfo)
-{
-       Folder *folder;
-       gint num;
-
-       g_return_val_if_fail(dest != NULL, -1);
-       g_return_val_if_fail(msginfo != NULL, -1);
-
-       folder = dest->folder;
-       if (dest->last_num < 0) folder->scan(folder, dest);
-
-       num = folder->move_msg(folder, dest, msginfo);
-       if (num > 0) dest->last_num = num;
-
-       return num;
-}
-*/
                
 FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest) 
 {
@@ -2437,8 +2751,6 @@ FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest)
        GNode *srcnode;
        gchar *old_id, *new_id;
 
-       mlist = folder_item_get_msg_list(src);
-
        /* move messages */
        debug_print("Moving %s to %s\n", src->path, dest->path);
        new_item = folder_create_folder(dest, src->name);
@@ -2453,8 +2765,13 @@ FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest)
        /* move messages */
        log_message(_("Moving %s to %s...\n"), 
                        src->name, new_item->path);
-       if (mlist != NULL)
+
+       mlist = folder_item_get_msg_list(src);
+       
+       if (mlist != NULL) {
                folder_item_move_msgs(new_item, mlist);
+               procmsg_msg_list_free(mlist);
+       }
        
        /*copy prefs*/
        folder_item_prefs_copy_prefs(src, new_item);
@@ -2476,8 +2793,9 @@ 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) == NULL) {
                                return NULL;
+                       }
                }
        }
        old_id = folder_item_get_identifier(src);
@@ -2489,11 +2807,13 @@ FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest)
                src->folder->klass->remove_folder(src->folder, src);
        folder_write_list();
 
-       if (old_id != NULL && new_id != NULL)
+       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);
-
+       
        return new_item;
 }
 
@@ -2501,13 +2821,13 @@ gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_ite
 {
        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;
                }
-               tmp = folder_item_parent(tmp);;
+               tmp = folder_item_parent(tmp);
        }
        
        tmp = folder_item_parent(src);
@@ -2529,10 +2849,12 @@ gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_ite
        }
 
        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);
@@ -2567,6 +2889,9 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
        gint num, lastnum = -1;
        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);
@@ -2574,6 +2899,42 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
        folder = dest->folder;
 
        g_return_val_if_fail(folder->klass->copy_msg != NULL, -1);
+       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);
@@ -2600,11 +2961,62 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                        return -1;
                }
        } else {
-               for (l = msglist ; l != NULL ; l = g_slist_next(l)) {
-                       MsgInfo * msginfo = (MsgInfo *) l->data;
+               MsgInfo * msginfo;
+               l = msglist;
+
+               /* immediately stop if src and dest folders are identical */
+               if (l != NULL) {
+                       msginfo = (MsgInfo *) l->data;
+                       if (msginfo != NULL && msginfo->folder == dest) {
+                               g_relation_destroy(relation);
+                               return -1;
+                       }
+               }
+
+               for (; l != NULL ; l = g_slist_next(l)) {
+                       msginfo = (MsgInfo *) l->data;
 
                        num = folder->klass->copy_msg(folder, dest, msginfo);
-                       g_relation_insert(relation, msginfo, GINT_TO_POINTER(num));
+                       if (num > 0)
+                               g_relation_insert(relation, msginfo, GINT_TO_POINTER(num));
+                       else
+                               not_moved = g_slist_prepend(not_moved, msginfo);
+               }
+       }
+
+       if (remove_source) {
+               MsgInfo *msginfo = (MsgInfo *) msglist->data;
+               FolderItem *item = msginfo->folder;
+               /*
+                * Remove source messages from their folders if
+                * copying was successfull and update folder
+                * message counts
+                */
+               if (item->folder->klass->remove_msgs) {
+                       item->folder->klass->remove_msgs(item->folder,
+                                                               msginfo->folder,
+                                                               msglist,
+                                                               relation);
+               }
+               for (l = msglist; l != NULL; l = g_slist_next(l)) {
+                       GTuples *tuples;
+                       msginfo = (MsgInfo *) l->data;
+                       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 (g_slist_find(not_moved, msginfo))
+                               continue;
+
+                       if ((num >= 0) && (item->folder->klass->remove_msg != NULL)) {
+                               if (!item->folder->klass->remove_msgs)
+                                       item->folder->klass->remove_msg(item->folder,
+                                                               msginfo->folder,
+                                                               msginfo->msgnum);
+                               remove_msginfo_from_cache(item, msginfo);
+                       }
                }
        }
 
@@ -2620,6 +3032,8 @@ 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;
@@ -2628,6 +3042,10 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                 num = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
                 g_tuples_destroy(tuples);
 
+               statusbar_progress_all(curmsg++,total, 100);
+               if (curmsg % 100 == 0)
+                       GTK_EVENTS_FLUSH();
+
                if (num >= 0) {
                        MsgInfo *newmsginfo = NULL;
 
@@ -2654,6 +3072,11 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                            == POP3_PARTIAL_DLOAD_DLOAD) {
                                partial_mark_for_download(newmsginfo);
                        }
+                       if (!MSG_IS_POSTFILTERED (msginfo->flags)) {
+                           procmsg_msginfo_set_flags (   msginfo, MSG_POSTFILTERED, 0);
+                           procmsg_msginfo_set_flags (newmsginfo, MSG_POSTFILTERED, 0);
+                           hooks_invoke (MAIL_POSTFILTERING_HOOKLIST, newmsginfo);
+                       }
                        procmsg_msginfo_free(newmsginfo);
 
 
@@ -2661,33 +3084,15 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                                lastnum = num;
                }
        }
-
-       if (remove_source) {
-               /*
-                * Remove source messages from their folders if
-                * copying was successfull and update folder
-                * message counts
-                */
-               for (l = msglist; l != NULL; l = g_slist_next(l)) {
-                       MsgInfo *msginfo = (MsgInfo *) l->data;
-                       FolderItem *item = msginfo->folder;
-                       GTuples *tuples;
-
-                       tuples = g_relation_select(relation, msginfo, 0);
-                       num = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
-                       g_tuples_destroy(tuples);
-
-                       if ((num >= 0) && (item->folder->klass->remove_msg != NULL)) {
-                               item->folder->klass->remove_msg(item->folder,
-                                                               msginfo->folder,
-                                                               msginfo->msgnum);
-                               remove_msginfo_from_cache(item, msginfo);
-                       }
-               }
-       }
+       statusbar_progress_all(0,0,0);
+       statusbar_pop_all();
 
        g_relation_destroy(relation);
-       return lastnum;
+       if (not_moved != NULL) {
+               g_slist_free(not_moved);
+               return -1;
+       } else
+               return lastnum;
 }
 
 /**
@@ -2717,10 +3122,13 @@ gint folder_item_move_msg(FolderItem *dest, MsgInfo *msginfo)
  */
 gint folder_item_move_msgs(FolderItem *dest, GSList *msglist)
 {
+       gint result = -1;
        g_return_val_if_fail(dest != NULL, -1);
        g_return_val_if_fail(msglist != NULL, -1);
-
-       return do_copy_msgs(dest, msglist, TRUE);
+       inc_lock();
+       result = do_copy_msgs(dest, msglist, TRUE);
+       inc_unlock();
+       return result;
 }
 
 /**
@@ -2738,7 +3146,7 @@ gint folder_item_copy_msg(FolderItem *dest, MsgInfo *msginfo)
     
        list.data = msginfo;
        list.next = NULL;
-       
+
        return do_copy_msgs(dest, &list, FALSE);
 }
 
@@ -2750,10 +3158,15 @@ gint folder_item_copy_msg(FolderItem *dest, MsgInfo *msginfo)
  */
 gint folder_item_copy_msgs(FolderItem *dest, GSList *msglist)
 {
+       gint result;
        g_return_val_if_fail(dest != NULL, -1);
        g_return_val_if_fail(msglist != NULL, -1);
 
-       return do_copy_msgs(dest, msglist, FALSE);
+       inc_lock();
+       result = do_copy_msgs(dest, msglist, FALSE);
+       inc_unlock();
+       
+       return result;
 }
 
 gint folder_item_remove_msg(FolderItem *item, gint num)
@@ -2765,6 +3178,8 @@ gint folder_item_remove_msg(FolderItem *item, gint num)
        g_return_val_if_fail(item != NULL, -1);
        folder = item->folder;
        g_return_val_if_fail(folder->klass->remove_msg != NULL, -1);
+       if (item->no_select)
+               return -1;
 
        if (!item->cache) folder_item_read_cache(item);
 
@@ -2787,20 +3202,33 @@ gint folder_item_remove_msgs(FolderItem *item, GSList *msglist)
        g_return_val_if_fail(item != NULL, -1);
        folder = item->folder;
        g_return_val_if_fail(folder != NULL, -1);
-
+       if (item->no_select)
+               return -1;
+       inc_lock();
        if (!item->cache) folder_item_read_cache(item);
 
        folder_item_update_freeze();
-       while (msglist != NULL) {
+       if (item->folder->klass->remove_msgs) {
+               ret = item->folder->klass->remove_msgs(item->folder,
+                                                       item,
+                                                       msglist,
+                                                       NULL);
+       }
+       while (ret == 0 && msglist != NULL) {
                MsgInfo *msginfo = (MsgInfo *)msglist->data;
-
-               ret = folder_item_remove_msg(item, msginfo->msgnum);
+               if (MSG_IS_LOCKED(msginfo->flags)) {
+                       msglist = msglist->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;
        }
+       folder_item_scan_full(item, FALSE);
        folder_item_update_thaw();
-
+       inc_unlock();
        return ret;
 }
 
@@ -2810,24 +3238,37 @@ gint folder_item_remove_all_msg(FolderItem *item)
        gint result;
 
        g_return_val_if_fail(item != NULL, -1);
+       if (item->no_select)
+               return -1;
 
        folder = item->folder;
 
-       g_return_val_if_fail(folder->klass->remove_all_msg != NULL, -1);
+       inc_lock();
+       if (folder->klass->remove_all_msg != NULL) {
+               result = folder->klass->remove_all_msg(folder, item);
 
-       result = folder->klass->remove_all_msg(folder, item);
+               if (result == 0) {
+                       folder_item_free_cache(item, TRUE);
+                       item->cache = msgcache_new();
+               }
+       } else {
+               MsgInfoList *msglist;
 
-       if (result == 0) {
-               folder_item_free_cache(item);
-               item->cache = msgcache_new();
+               msglist = folder_item_get_msg_list(item);
+               result = folder_item_remove_msgs(item, msglist);
+               procmsg_msg_list_free(msglist);
+       }
 
+       if (result == 0) {
                item->new_msgs = 0;
                item->unread_msgs = 0;
                item->unreadmarked_msgs = 0;
+               item->marked_msgs = 0;
                item->total_msgs = 0;
                folder_item_update(item, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
        }
 
+       inc_unlock();
        return result;
 }
 
@@ -2835,6 +3276,8 @@ void folder_item_change_msg_flags(FolderItem *item, MsgInfo *msginfo, MsgPermFla
 {
        g_return_if_fail(item != NULL);
        g_return_if_fail(msginfo != NULL);
+       if (item->no_select)
+               return;
        
        if (item->folder->klass->change_flags != NULL) {
                item->folder->klass->change_flags(item->folder, item, msginfo, newflags);
@@ -2848,6 +3291,8 @@ gboolean folder_item_is_msg_changed(FolderItem *item, MsgInfo *msginfo)
        Folder *folder;
 
        g_return_val_if_fail(item != NULL, FALSE);
+       if (item->no_select)
+               return FALSE;
 
        folder = item->folder;
 
@@ -3012,7 +3457,7 @@ static gpointer folder_item_to_xml(gpointer nodedata, gpointer data)
        else
                tag = folder_item_get_xml(item->folder, item);
 
-       return xml_node_new(tag, NULL);;
+       return xml_node_new(tag, NULL);
 }
 
 static GNode *folder_get_xml_node(Folder *folder)
@@ -3033,6 +3478,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;
 
@@ -3136,7 +3584,10 @@ static void folder_create_processing_folder(void)
        g_assert(processing_folder != NULL);
 
        debug_print("tmpparentroot %s\n", LOCAL_FOLDER(processing_folder)->rootpath);
-       if (LOCAL_FOLDER(processing_folder)->rootpath[0] == '/')
+        /* FIXME: [W32] The code below does not correctly merge
+           relative filenames; there should be a function to handle
+           this.  */
+       if (!is_relative_filename(LOCAL_FOLDER(processing_folder)->rootpath))
                tmpname = g_strconcat(LOCAL_FOLDER(processing_folder)->rootpath,
                                      G_DIR_SEPARATOR_S, PROCESSING_FOLDER_ITEM,
                                      NULL);
@@ -3259,10 +3710,8 @@ static void folder_get_persist_prefs_recursive(GNode *node, GHashTable *pptable)
 
 static gboolean persist_prefs_free(gpointer key, gpointer val, gpointer data)
 {
-       if (key) 
-               g_free(key);
-       if (val) 
-               g_free(val);
+       g_free(key);
+       g_free(val);
        return TRUE;    
 }
 
@@ -3270,14 +3719,24 @@ void folder_item_apply_processing(FolderItem *item)
 {
        GSList *processing_list;
        GSList *mlist, *cur;
-       
+       guint total = 0, curmsg = 0;
+
        g_return_if_fail(item != NULL);
-       
+
+       if (item->no_select)
+              return;
+
        processing_list = item->prefs->processing;
 
+       if (!pre_global_processing && !processing_list
+       &&  !post_global_processing)
+               return;
+
        folder_item_update_freeze();
 
        mlist = folder_item_get_msg_list(item);
+       total = g_slist_length(mlist);
+       statusbar_print_all(_("Processing messages..."));
        for (cur = mlist ; cur != NULL ; cur = cur->next) {
                MsgInfo * msginfo;
 
@@ -3286,19 +3745,30 @@ void folder_item_apply_processing(FolderItem *item)
                 /* reset parameters that can be modified by processing */
                 msginfo->hidden = 0;
                 msginfo->score = 0;
-                
+
+               statusbar_progress_all(curmsg++,total, 10);
+
                 /* apply pre global rules */
                filter_message_by_msginfo(pre_global_processing, msginfo);
-                
+               
                 /* apply rules of the folder */
                filter_message_by_msginfo(processing_list, msginfo);
 
                 /* apply post global rules */
                filter_message_by_msginfo(post_global_processing, msginfo);
                 
+       }
+       if (pre_global_processing || processing_list
+           || post_global_processing)
+               filtering_move_and_copy_msgs(mlist);
+       for (cur = mlist ; cur != NULL ; cur = cur->next) {
+               MsgInfo * msginfo = (MsgInfo *)cur->data;
                procmsg_msginfo_free(msginfo);
        }
        g_slist_free(mlist);
+       
+       statusbar_progress_all(0,0,0);
+       statusbar_pop_all();
 
        folder_item_update_thaw();
 }
@@ -3366,6 +3836,7 @@ static void folder_item_update_func(FolderItem *item, gpointer data)
        if (item->update_flags) {
                source.item = item;
                source.update_flags = item->update_flags;
+               source.msg = NULL;
                hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &source);                             
                item->update_flags = 0;
        }
@@ -3381,4 +3852,141 @@ void folder_item_update_thaw(void)
        }
 }
 
+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);
+       }
+}
+
+void folder_synchronise(Folder *folder)
+{
+       folder_func_to_all_folders(folder_item_synchronise_func, folder);
+}
+
+typedef struct _WantSyncData {
+       Folder *folder;
+       gboolean want_sync;
+} WantSyncData;
+
+static void folder_item_want_synchronise_func(FolderItem *item, gpointer data)
+{
+       WantSyncData *want_sync_data = (WantSyncData *)data;
+       
+       if (want_sync_data->folder == NULL || item->folder == want_sync_data->folder) {
+               if (item->prefs->offlinesync && item->folder->klass->synchronise)
+                       want_sync_data->want_sync |= TRUE;
+       }
+}
+
+gboolean folder_want_synchronise(Folder *folder)
+{
+       WantSyncData *want_sync_data = g_new0(WantSyncData, 1);
+       gboolean result;
+       want_sync_data->folder = folder;
+       want_sync_data->want_sync = FALSE;
+       
+       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);
+       return result;
+}
+
+void folder_item_set_batch (FolderItem *item, gboolean batch)
+{
+       if (item->folder->klass->set_batch) {
+               item->folder->klass->set_batch(item->folder, item, batch);
+       }
+}
+
+gboolean folder_has_parent_of_type(FolderItem *item, 
+                                         SpecialFolderItemType type) 
+{
+       FolderItem *cur = item;
+
+       /* if we already know it, make it short */
+       if (item->parent_stype != -1) {
+               return (item->parent_stype == type);
+       }
+       
+       /* if we don't, find the type from the first possible parent,
+        * and set our parent type to be faster next time */
+       while (cur) {
+               if (cur->stype == type || cur->parent_stype == type) {
+                       item->parent_stype = type;
+                       return TRUE;
+               }
+               cur = folder_item_parent(cur);
+       }
+       
+       /* if we didn't match what was asked, we didn't return. If our
+        * parent type is unknown, we may as well find it now to be faster
+        * later. */
+       if (item->parent_stype == -1) {
+               cur = item;
+               while (cur) {
+                       /* 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;
+                       }
+                       /* ah, we know this parent's parent's type, we may as 
+                        * 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;
+                       }
+                       /* if we didn't find anything, go up once more */
+                       cur = folder_item_parent(cur);
+               }
+               /* 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;
+               }
+       }
+       return FALSE;
+}
+
+gboolean folder_subscribe (const gchar *uri)
+{
+       GList *cur;
+       for (cur = folder_get_list(); cur != NULL; cur = g_list_next(cur)) {
+               Folder *folder = (Folder *) cur->data;
+
+               if (folder->klass->subscribe
+               &&  folder->klass->subscribe(folder, uri)) {
+                       return TRUE;
+               }
+       }
+       return FALSE;
+
+}
 #undef PUT_ESCAPE_STR