2005-11-14 [wwp] 1.9.100cvs12
[claws.git] / src / folder.c
index 8d023be4662047b48b1cf30ca2753a31da994516..d88beaf188ace4e5fbdc7e19708a4ae346d0aae8 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-2005 Hiroyuki Yamamoto
  *
  * 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
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
@@ -31,9 +32,9 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-#include "intl.h"
 #include "folder.h"
 #include "session.h"
+#include "inc.h"
 #include "imap.h"
 #include "news.h"
 #include "mh.h"
@@ -49,6 +50,7 @@
 #include "folder_item_prefs.h"
 #include "remotefolder.h"
 #include "partial_download.h"
+#include "statusbar.h"
 
 /* Dependecies to be removed ?! */
 #include "prefs_common.h"
@@ -154,6 +156,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;
@@ -255,7 +260,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 +278,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 +295,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 +316,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 +352,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);
 }
 
@@ -413,17 +433,17 @@ void folder_item_set_xml(Folder *folder, FolderItem *item, XMLTag *tag)
 
                if (!attr || !attr->name || !attr->value) continue;
                if (!strcmp(attr->name, "type")) {
-                       if (!strcasecmp(attr->value, "normal"))
+                       if (!g_ascii_strcasecmp(attr->value, "normal"))
                                item->stype = F_NORMAL;
-                       else if (!strcasecmp(attr->value, "inbox"))
+                       else if (!g_ascii_strcasecmp(attr->value, "inbox"))
                                item->stype = F_INBOX;
-                       else if (!strcasecmp(attr->value, "outbox"))
+                       else if (!g_ascii_strcasecmp(attr->value, "outbox"))
                                item->stype = F_OUTBOX;
-                       else if (!strcasecmp(attr->value, "draft"))
+                       else if (!g_ascii_strcasecmp(attr->value, "draft"))
                                item->stype = F_DRAFT;
-                       else if (!strcasecmp(attr->value, "queue"))
+                       else if (!g_ascii_strcasecmp(attr->value, "queue"))
                                item->stype = F_QUEUE;
-                       else if (!strcasecmp(attr->value, "trash"))
+                       else if (!g_ascii_strcasecmp(attr->value, "trash"))
                                item->stype = F_TRASH;
                } else if (!strcmp(attr->name, "name")) {
                        if (item->name != NULL)
@@ -441,6 +461,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 +564,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)
@@ -745,7 +768,7 @@ 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;
@@ -755,11 +778,9 @@ void folder_scan_tree(Folder *folder)
        
        pptable = folder_persist_prefs_new(folder);
 
-       /*
-        * should be changed and tree update should be done without 
-        * destroying the tree first
-        */
-       folder_tree_destroy(folder);
+       if (rebuild)
+               folder_tree_destroy(folder);
+
        folder->klass->scan_tree(folder);
 
        hookdata.folder = folder;
@@ -820,6 +841,7 @@ struct TotalMsgCount
        guint new_msgs;
        guint unread_msgs;
        guint unreadmarked_msgs;
+       guint marked_msgs;
        guint total_msgs;
 };
 
@@ -870,6 +892,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;
 }
 
@@ -899,7 +922,7 @@ static gboolean folder_get_status_full_all_func(GNode *node, gpointer data)
 
        if (status->str) {
                id = folder_item_get_identifier(item);
-               g_string_sprintfa(status->str, "%5d %5d %5d %s\n",
+               g_string_append_printf(status->str, "%5d %5d %5d %s\n",
                                  item->new_msgs, item->unread_msgs,
                                  item->total_msgs, id);
                g_free(id);
@@ -958,7 +981,7 @@ gchar *folder_get_status(GPtrArray *folders, gboolean full)
                                gchar *id;
 
                                id = folder_item_get_identifier(item);
-                               g_string_sprintfa(str, "%5d %5d %5d %s\n",
+                               g_string_append_printf(str, "%5d %5d %5d %s\n",
                                                  item->new_msgs, item->unread_msgs,
                                                  item->total_msgs, id);
                                g_free(id);
@@ -970,9 +993,9 @@ gchar *folder_get_status(GPtrArray *folders, gboolean full)
        }
 
        if (full)
-               g_string_sprintfa(str, "%5d %5d %5d\n", new, unread, total);
+               g_string_append_printf(str, "%5d %5d %5d\n", new, unread, total);
        else
-               g_string_sprintfa(str, "%d %d %d\n", new, unread, total);
+               g_string_append_printf(str, "%d %d %d\n", new, unread, total);
 
        ret = str->str;
        g_string_free(str, FALSE);
@@ -980,7 +1003,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 +1018,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;
 }
 
@@ -1062,9 +1088,14 @@ FolderItem *folder_find_child_item_by_name(FolderItem *item, const gchar *name)
        FolderItem *child;
 
        for (node = item->node->children; node != NULL; node = node->next) {
+               gchar *base;
                child = FOLDER_ITEM(node->data);
-               if (strcmp2(g_basename(child->path), name) == 0)
+               base = g_path_get_basename(child->path);
+               if (strcmp2(base, name) == 0) {
+                       g_free(base);
                        return child;
+               }
+               g_free(base);
        }
 
        return NULL;
@@ -1077,7 +1108,7 @@ FolderClass *folder_get_class_from_string(const gchar *str)
        classlist = folder_get_class_list();
        for (; classlist != NULL; classlist = g_slist_next(classlist)) {
                FolderClass *class = (FolderClass *) classlist->data;
-               if (g_strcasecmp(class->idstr, str) == 0)
+               if (g_ascii_strcasecmp(class->idstr, str) == 0)
                        return class;
        }
 
@@ -1395,18 +1426,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);
                }
        }
@@ -1428,25 +1459,48 @@ 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)
+{
+       g_return_val_if_fail(item->no_select == FALSE, -1);
+
+       item->processing_pending = TRUE;
+       folder_item_process_open (item, NULL, NULL, NULL);
+       
+       item->opened = TRUE;
 
        return 0;
 }
@@ -1457,6 +1511,7 @@ gint folder_item_close(FolderItem *item)
        Folder *folder;
        
        g_return_val_if_fail(item != NULL, -1);
+       g_return_val_if_fail(item->no_select == FALSE, -1);
 
        if (item->new_msgs) {
                folder_item_update_freeze();
@@ -1490,7 +1545,8 @@ static MsgInfoList *get_msginfos(FolderItem *item, MsgNumberList *numlist)
 {
        MsgInfoList *msglist = NULL;
        Folder *folder = item->folder;
-
+       g_return_val_if_fail(item->no_select == FALSE, NULL);
+       
        if (folder->klass->get_msginfos != NULL)
                msglist = folder->klass->get_msginfos(folder, item, numlist);
        else {
@@ -1526,6 +1582,52 @@ 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;
+       g_return_val_if_fail(item->no_select == FALSE, 0);
+
+       relation = g_relation_new(2);
+       g_relation_index(relation, 0, g_direct_hash, g_direct_equal);
+       folder_item_set_batch(item, TRUE);
+       if ((ret = item->folder->klass->get_flags(
+           item->folder, item, msglist, relation)) == 0) {
+               GTuples *tuples;
+               MsgInfo *msginfo;
+               MsgPermFlags permflags = 0;
+               gboolean skip;
+
+               for (cur = msglist; cur != NULL; cur = g_slist_next(cur)) {
+                       msginfo = (MsgInfo *) cur->data;
+               
+                       tuples = g_relation_select(relation, msginfo, 0);
+                       skip = tuples->len < 1;
+                       if (!skip)
+                               permflags = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
+                       g_tuples_destroy(tuples);
+                       if (skip)
+                               continue;
+                       
+                       if (msginfo->flags.perm_flags != permflags) {
+                               procmsg_msginfo_change_flags(msginfo,
+                                       permflags & ~msginfo->flags.perm_flags, 0,
+                                       ~permflags & msginfo->flags.perm_flags, 0);
+                       }
+               }
+       }
+       folder_item_set_batch(item, FALSE);
+       g_relation_destroy(relation);   
+
+       return ret;
+}
+
 gint folder_item_scan_full(FolderItem *item, gboolean filtering)
 {
        Folder *folder;
@@ -1533,7 +1635,8 @@ 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;
     
@@ -1545,7 +1648,7 @@ 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);
+       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) {
@@ -1700,17 +1803,32 @@ 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);
        }
 
        folder_item_update_freeze();
        if (newmsg_list != NULL) {
                GSList *elem;
-
+               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) &&
@@ -1723,9 +1841,12 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
                }
                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;
 
@@ -1733,13 +1854,12 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
                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 ((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))
@@ -1748,16 +1868,21 @@ 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);
 
        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;
 
@@ -1767,60 +1892,6 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
        return 0;
 }
 
-gint folder_item_syncronize_flags(FolderItem *item)
-{
-       MsgInfoList *msglist = NULL;
-       GSList *cur;
-       GRelation *relation;
-       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->folder->klass->get_flags == NULL)
-               return 0;
-       
-       if (item->cache == NULL)
-               folder_item_read_cache(item);
-       
-       msglist = msgcache_get_msg_list(item->cache);
-       
-       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;
-               gboolean skip;
-
-               for (cur = msglist; cur != NULL; cur = g_slist_next(cur)) {
-                       msginfo = (MsgInfo *) cur->data;
-               
-                       tuples = g_relation_select(relation, msginfo, 0);
-                       skip = tuples->len < 1;
-                       if (!skip)
-                               permflags = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
-                       g_tuples_destroy(tuples);
-                       if (skip)
-                               continue;
-                       
-                       if (msginfo->flags.perm_flags != permflags) {
-                               procmsg_msginfo_set_flags(msginfo,
-                                       permflags & ~msginfo->flags.perm_flags, 0);
-                               procmsg_msginfo_unset_flags(msginfo,
-                                       ~permflags & msginfo->flags.perm_flags, 0);
-                       }
-               }
-       }
-       g_relation_destroy(relation);
-       
-       for (cur = msglist; cur != NULL; cur = g_slist_next(cur))
-               procmsg_msginfo_free((MsgInfo *) cur->data);
-       
-       return ret;
-}
-
 gint folder_item_scan(FolderItem *item)
 {
        return folder_item_scan_full(item, TRUE);
@@ -1862,6 +1933,32 @@ 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);
+       g_return_val_if_fail(item->no_select == FALSE, -1);     
+
+       if (item->cache == NULL)
+               folder_item_read_cache(item);
+       
+       msglist = msgcache_get_msg_list(item->cache);
+       
+       ret = syncronize_flags(item, msglist);
+
+       for (cur = msglist; cur != NULL; cur = g_slist_next(cur))
+               procmsg_msginfo_free((MsgInfo *) cur->data);
+       
+       g_slist_free(msglist);
+
+       return ret;
+}
+
 gint folder_cache_time_compare_func(gconstpointer a, gconstpointer b)
 {
        FolderItem *fa = (FolderItem *)a;
@@ -1904,6 +2001,20 @@ void folder_item_free_cache(FolderItem *item)
        item->cache = NULL;
 }
 
+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();
+
+       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)
 {
        gint memusage = 0;
@@ -1921,7 +2032,7 @@ void folder_clean_cache_memory(void)
                while((listitem != NULL) && (memusage > (prefs_common.cache_max_mem_usage * 1024))) {
                        FolderItem *item = (FolderItem *)(listitem->data);
 
-                       debug_print("Freeing cache memory for %s\n", item->path);
+                       debug_print("Freeing cache memory for %s\n", item->path ? item->path : item->name);
                        memusage -= msgcache_get_memory_usage(item->cache);
                        folder_item_free_cache(item);
                        listitem = listitem->next;
@@ -1942,7 +2053,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();
@@ -1960,10 +2072,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);
@@ -2014,7 +2129,7 @@ MsgInfo *folder_item_get_msginfo(FolderItem *item, gint num)
        MsgInfo *msginfo = NULL;
        
        g_return_val_if_fail(item != NULL, NULL);
-       
+       g_return_val_if_fail(item->no_select == FALSE, NULL);   
        folder = item->folder;
        if (!item->cache)
                folder_item_read_cache(item);
@@ -2038,6 +2153,7 @@ 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);
+       g_return_val_if_fail(item->no_select == FALSE, FALSE);
        
        folder = item->folder;
        if (!item->cache)
@@ -2052,6 +2168,7 @@ 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);
+       g_return_val_if_fail(item->no_select == FALSE, FALSE);
        
        if (item->cache == 0)
                folder_item_read_cache(item);
@@ -2061,17 +2178,20 @@ 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) {
-               procmsg_msginfo_set_flags(msginfo, 0, MSG_HAS_ATTACHMENT);
+               if (!mimeinfo->subtype 
+               ||  strcmp(mimeinfo->subtype, "pgp-signature"))
+                       procmsg_msginfo_set_flags(msginfo, 0, MSG_HAS_ATTACHMENT);
        }
 
        /* don't descend below top level message for signed and encrypted info */
@@ -2101,6 +2221,7 @@ gchar *folder_item_fetch_msg(FolderItem *item, gint num)
        folder = item->folder;
 
        g_return_val_if_fail(folder->klass->fetch_msg != NULL, NULL);
+       g_return_val_if_fail(item->no_select == FALSE, NULL);
 
        msgfile = folder->klass->fetch_msg(folder, item, num);
 
@@ -2109,8 +2230,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);
@@ -2127,6 +2248,48 @@ gchar *folder_item_fetch_msg(FolderItem *item, gint num)
        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);
+       g_return_val_if_fail(item->no_select == FALSE, 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);
+                       }
+               }
+       }
+
+       return msgfile;
+}
+
+
 gint folder_item_fetch_all_msg(FolderItem *item)
 {
        Folder *folder;
@@ -2134,10 +2297,13 @@ 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);
+       g_return_val_if_fail(item->no_select == FALSE, -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;
 
@@ -2147,11 +2313,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 ?
@@ -2167,7 +2336,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;
@@ -2182,10 +2353,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;
 
@@ -2224,10 +2396,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 */
@@ -2238,13 +2410,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)
@@ -2256,6 +2427,8 @@ 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();
@@ -2278,6 +2451,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;
@@ -2319,6 +2495,7 @@ 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);
+       g_return_val_if_fail(dest->no_select == FALSE, -1);
 
         folder = dest->folder;
 
@@ -2367,7 +2544,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");
                        }
 
@@ -2389,25 +2566,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) 
 {
@@ -2417,8 +2575,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);
@@ -2433,8 +2589,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);
@@ -2456,8 +2617,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);
@@ -2473,7 +2635,7 @@ FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest)
                prefs_filtering_rename_path(old_id, new_id);
        g_free(old_id);
        g_free(new_id);
-
+       
        return new_item;
 }
 
@@ -2487,7 +2649,7 @@ gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_ite
                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);
@@ -2509,7 +2671,10 @@ 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),G_DIR_SEPARATOR_S,g_basename(phys_srcpath),NULL);
+       phys_dstpath = g_strconcat(folder_item_get_path(dest),
+                      G_DIR_SEPARATOR_S,
+                      g_path_get_basename(phys_srcpath),
+                      NULL);
 
        if (folder_item_parent(src) == dest || src == dest) {
                g_free(src_identifier);
@@ -2544,6 +2709,7 @@ 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;
 
        g_return_val_if_fail(dest != NULL, -1);
        g_return_val_if_fail(msglist != NULL, -1);
@@ -2551,6 +2717,7 @@ 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);
+       g_return_val_if_fail(dest->no_select == FALSE, -1);
 
        relation = g_relation_new(2);
        g_relation_index(relation, 0, g_direct_hash, g_direct_equal);
@@ -2577,11 +2744,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);
+                       }
                }
        }
 
@@ -2639,32 +2857,12 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                }
        }
 
-       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);
-                       }
-               }
-       }
-
        g_relation_destroy(relation);
-       return lastnum;
+       if (not_moved != NULL) {
+               g_slist_free(not_moved);
+               return -1;
+       } else
+               return lastnum;
 }
 
 /**
@@ -2694,10 +2892,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;
 }
 
 /**
@@ -2715,7 +2916,7 @@ gint folder_item_copy_msg(FolderItem *dest, MsgInfo *msginfo)
     
        list.data = msginfo;
        list.next = NULL;
-       
+
        return do_copy_msgs(dest, &list, FALSE);
 }
 
@@ -2727,10 +2928,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)
@@ -2742,6 +2948,7 @@ 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);
+       g_return_val_if_fail(item->no_select == FALSE, -1);
 
        if (!item->cache) folder_item_read_cache(item);
 
@@ -2764,20 +2971,32 @@ 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);
-
+       g_return_val_if_fail(item->no_select == FALSE, -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;
 }
 
@@ -2787,24 +3006,36 @@ gint folder_item_remove_all_msg(FolderItem *item)
        gint result;
 
        g_return_val_if_fail(item != NULL, -1);
+       g_return_val_if_fail(item->no_select == FALSE, -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);
+                       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;
 }
 
@@ -2812,6 +3043,7 @@ void folder_item_change_msg_flags(FolderItem *item, MsgInfo *msginfo, MsgPermFla
 {
        g_return_if_fail(item != NULL);
        g_return_if_fail(msginfo != NULL);
+       g_return_if_fail(item->no_select == FALSE);
        
        if (item->folder->klass->change_flags != NULL) {
                item->folder->klass->change_flags(item->folder, item, msginfo, newflags);
@@ -2825,6 +3057,7 @@ gboolean folder_item_is_msg_changed(FolderItem *item, MsgInfo *msginfo)
        Folder *folder;
 
        g_return_val_if_fail(item != NULL, FALSE);
+       g_return_val_if_fail(item->no_select == FALSE, FALSE);
 
        folder = item->folder;
 
@@ -2989,7 +3222,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)
@@ -3247,14 +3480,17 @@ void folder_item_apply_processing(FolderItem *item)
 {
        GSList *processing_list;
        GSList *mlist, *cur;
-       
+       guint total = 0, curmsg = 0;
+
        g_return_if_fail(item != NULL);
-       
+       g_return_if_fail(item->no_select == FALSE);     
        processing_list = item->prefs->processing;
 
        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;
 
@@ -3263,7 +3499,9 @@ 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);
                 
@@ -3276,6 +3514,9 @@ void folder_item_apply_processing(FolderItem *item)
                procmsg_msginfo_free(msginfo);
        }
        g_slist_free(mlist);
+       
+       statusbar_progress_all(0,0,0);
+       statusbar_pop_all();
 
        folder_item_update_thaw();
 }
@@ -3343,6 +3584,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;
        }
@@ -3358,4 +3600,128 @@ 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;
+               else
+                       want_sync_data->want_sync = FALSE;
+       }
+}
+
+gboolean folder_want_synchronise(Folder *folder)
+{
+       WantSyncData *want_sync_data = g_new0(WantSyncData, 1);
+       gboolean result;
+       want_sync_data->folder = folder;
+       
+       folder_func_to_all_folders(folder_item_want_synchronise_func, want_sync_data);
+       result = want_sync_data->want_sync;
+       g_free(want_sync_data);
+       debug_print("Folder %s wants sync: %d\n", folder->name, result);
+       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;
+}
+
 #undef PUT_ESCAPE_STR