2005-07-06 [colin] 1.9.12cvs24
[claws.git] / src / folder.c
index 80d7d9a6d565eea6e6ceef5805d6899dd3cc3c44..97ef715c403db387df8b05273e5702b981def8ea 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
@@ -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"
@@ -48,7 +49,8 @@
 #include "log.h"
 #include "folder_item_prefs.h"
 #include "remotefolder.h"
-#include "pop.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;
@@ -236,18 +241,18 @@ XMLTag *folder_get_xml(Folder *folder)
 {
        XMLTag *tag;
 
-       tag = xml_new_tag("folder");
+       tag = xml_tag_new("folder");
 
        if (folder->name)
-               xml_tag_add_attr(tag, "name", g_strdup(folder->name));
+               xml_tag_add_attr(tag, xml_attr_new("name", folder->name));
        if (folder->account)
-               xml_tag_add_attr(tag, "account_id", g_strdup_printf("%d", folder->account->account_id));
+               xml_tag_add_attr(tag, xml_attr_new_int("account_id", folder->account->account_id));
        if (folder->node && folder->node->data) {
                FolderItem *rootitem = (FolderItem *) folder->node->data;
 
-               xml_tag_add_attr(tag, "collapsed", g_strdup(rootitem->collapsed ? "1" : "0"));
+               xml_tag_add_attr(tag, xml_attr_new("collapsed", rootitem->collapsed ? "1" : "0"));
        }
-       xml_tag_add_attr(tag, "sort", g_strdup_printf("%d", folder->sort));
+       xml_tag_add_attr(tag, xml_attr_new_int("sort", folder->sort));
 
        return tag;
 }
@@ -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;
@@ -331,7 +339,6 @@ void folder_item_remove(FolderItem *item)
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
        g_return_if_fail(item->node != NULL);
-
        node = item->node;
 
        if (item->folder->node == node)
@@ -413,17 +420,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 +448,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"))
@@ -511,40 +520,44 @@ XMLTag *folder_item_get_xml(Folder *folder, FolderItem *item)
                                        "mark", "unread", "mime", "to", 
                                        "locked"};
        XMLTag *tag;
+       gchar *value;
 
-       tag = xml_new_tag("folderitem");
+       tag = xml_tag_new("folderitem");
 
-       xml_tag_add_attr(tag, "type", g_strdup(folder_item_stype_str[item->stype]));
+       xml_tag_add_attr(tag, xml_attr_new("type", folder_item_stype_str[item->stype]));
        if (item->name)
-               xml_tag_add_attr(tag, "name", g_strdup(item->name));
+               xml_tag_add_attr(tag, xml_attr_new("name", item->name));
        if (item->path)
-               xml_tag_add_attr(tag, "path", g_strdup(item->path));
+               xml_tag_add_attr(tag, xml_attr_new("path", item->path));
        if (item->no_sub)
-               xml_tag_add_attr(tag, "no_sub", g_strdup("1"));
+               xml_tag_add_attr(tag, xml_attr_new("no_sub", "1"));
        if (item->no_select)
-               xml_tag_add_attr(tag, "no_select", g_strdup("1"));
-       xml_tag_add_attr(tag, "collapsed", g_strdup(item->collapsed && item->node->children ? "1" : "0"));
-       xml_tag_add_attr(tag, "thread_collapsed", g_strdup(item->thread_collapsed ? "1" : "0"));
-       xml_tag_add_attr(tag, "threaded", g_strdup(item->threaded ? "1" : "0"));
-       xml_tag_add_attr(tag, "hidereadmsgs", g_strdup(item->hide_read_msgs ? "1" : "0"));
+               xml_tag_add_attr(tag, xml_attr_new("no_select", "1"));
+       xml_tag_add_attr(tag, xml_attr_new("collapsed", item->collapsed && item->node->children ? "1" : "0"));
+       xml_tag_add_attr(tag, xml_attr_new("thread_collapsed", item->thread_collapsed ? "1" : "0"));
+       xml_tag_add_attr(tag, xml_attr_new("threaded", item->threaded ? "1" : "0"));
+       xml_tag_add_attr(tag, xml_attr_new("hidereadmsgs", item->hide_read_msgs ? "1" : "0"));
        if (item->ret_rcpt)
-               xml_tag_add_attr(tag, "reqretrcpt", g_strdup("1"));
+               xml_tag_add_attr(tag, xml_attr_new("reqretrcpt", "1"));
 
        if (item->sort_key != SORT_BY_NONE) {
-               xml_tag_add_attr(tag, "sort_key", g_strdup(sort_key_str[item->sort_key]));
-               xml_tag_add_attr(tag, "sort_type", g_strdup(item->sort_type == SORT_ASCENDING ? "ascending" : "descending"));
+               xml_tag_add_attr(tag, xml_attr_new("sort_key", sort_key_str[item->sort_key]));
+               xml_tag_add_attr(tag, xml_attr_new("sort_type", item->sort_type == SORT_ASCENDING ? "ascending" : "descending"));
        }
 
-       xml_tag_add_attr(tag, "mtime", g_strdup_printf("%ld", (unsigned long int) item->mtime));
-       xml_tag_add_attr(tag, "new", g_strdup_printf("%d", item->new_msgs));
-       xml_tag_add_attr(tag, "unread", g_strdup_printf("%d", item->unread_msgs));
-       xml_tag_add_attr(tag, "unreadmarked", g_strdup_printf("%d", item->unreadmarked_msgs));
-       xml_tag_add_attr(tag, "total", g_strdup_printf("%d", item->total_msgs));
+       value = g_strdup_printf("%ld", (unsigned long int) item->mtime);
+       xml_tag_add_attr(tag, xml_attr_new("mtime", value));
+       g_free(value);
+       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)
-               xml_tag_add_attr(tag, "account_id", g_strdup_printf("%d", item->account->account_id));
+               xml_tag_add_attr(tag, xml_attr_new_int("account_id", item->account->account_id));
        if (item->apply_sub)
-               xml_tag_add_attr(tag, "apply_sub", g_strdup("1"));
+               xml_tag_add_attr(tag, xml_attr_new("apply_sub", "1"));
 
        return tag;
 }
@@ -701,13 +714,10 @@ void folder_write_list(void)
        path = folder_get_list_path();
        if ((pfile = prefs_write_open(path)) == NULL) return;
 
-       fprintf(pfile->fp, "<?xml version=\"1.0\" encoding=\"%s\"?>\n",
-               conv_get_current_charset_str());
-       tag = xml_new_tag("folderlist");
+       xml_file_put_xml_decl(pfile->fp);
+       tag = xml_tag_new("folderlist");
 
-       xmlnode = g_new0(XMLNode, 1);
-       xmlnode->tag = tag;
-       xmlnode->element = NULL;
+       xmlnode = xml_node_new(tag, NULL);
 
        rootnode = g_node_new(xmlnode);
 
@@ -820,6 +830,7 @@ struct TotalMsgCount
        guint new_msgs;
        guint unread_msgs;
        guint unreadmarked_msgs;
+       guint marked_msgs;
        guint total_msgs;
 };
 
@@ -870,6 +881,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 +911,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 +970,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 +982,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 +992,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 +1007,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 +1077,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 +1097,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;
        }
 
@@ -1096,8 +1116,8 @@ gchar *folder_get_identifier(Folder *folder)
 
 gchar *folder_item_get_identifier(FolderItem *item)
 {
-       gchar *id;
-       gchar *folder_id;
+       gchar *id = NULL;
+       gchar *folder_id = NULL;
 
        g_return_val_if_fail(item != NULL, NULL);
        g_return_val_if_fail(item->path != NULL, NULL);
@@ -1403,7 +1423,6 @@ void folder_item_set_default_flags(FolderItem *dest, MsgFlags *flags)
        } else {
                flags->perm_flags = 0;
        }
-       flags->tmp_flags = MSG_CACHED;
        if (FOLDER_TYPE(dest->folder) == F_MH) {
                if (dest->stype == F_QUEUE) {
                        MSG_SET_TMP_FLAGS(*flags, MSG_QUEUED);
@@ -1432,7 +1451,10 @@ static gint folder_sort_folder_list(gconstpointer a, gconstpointer b)
 gint folder_item_open(FolderItem *item)
 {
        gchar *buf;
-       if((item->folder->klass->scan_required != NULL) && (item->folder->klass->scan_required(item->folder, item))) {
+       g_return_val_if_fail(item->no_select == FALSE, -1);
+
+       if((item->folder->klass->scan_required != NULL) &&
+          (item->folder->klass->scan_required(item->folder, item))) {
                folder_item_scan_full(item, TRUE);
        }
        folder_item_syncronize_flags(item);
@@ -1458,6 +1480,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();
@@ -1487,41 +1510,12 @@ gint folder_item_close(FolderItem *item)
        return folder->klass->close(folder, item);
 }
 
-static void msginfo_set_mime_flags(GNode *node, gpointer data)
-{
-       MsgInfo *msginfo = data;
-       MimeInfo *mimeinfo = node->data;
-
-       if (mimeinfo->disposition == DISPOSITIONTYPE_ATTACHMENT) {
-               MSG_SET_TMP_FLAGS(msginfo->flags, MSG_HAS_ATTACHMENT);
-       } else if (mimeinfo->disposition == DISPOSITIONTYPE_UNKNOWN && 
-                mimeinfo->type != MIMETYPE_TEXT &&
-                mimeinfo->type != MIMETYPE_MULTIPART) {
-               MSG_SET_TMP_FLAGS(msginfo->flags, MSG_HAS_ATTACHMENT)
-       }
-
-       /* don't descend below top level message for signed and encrypted info */
-       if (mimeinfo->type == MIMETYPE_MESSAGE)
-               return;
-
-       if (privacy_mimeinfo_is_signed(mimeinfo)) {
-               MSG_SET_TMP_FLAGS(msginfo->flags, MSG_SIGNED);
-       }
-
-       if (privacy_mimeinfo_is_encrypted(mimeinfo)) {
-               MSG_SET_TMP_FLAGS(msginfo->flags, MSG_ENCRYPTED);
-       } else {
-               /* searching inside encrypted parts doesn't really make sense */
-               g_node_children_foreach(mimeinfo->node, G_TRAVERSE_ALL, msginfo_set_mime_flags, msginfo);
-       }
-}
-
 static MsgInfoList *get_msginfos(FolderItem *item, MsgNumberList *numlist)
 {
        MsgInfoList *msglist = NULL;
        Folder *folder = item->folder;
-       MsgInfoList *elem;
-
+       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 {
@@ -1538,19 +1532,6 @@ static MsgInfoList *get_msginfos(FolderItem *item, MsgNumberList *numlist)
                }               
        }
 
-       for (elem = msglist; elem != NULL; elem = g_slist_next(elem)) {
-               MsgInfo *msginfo = elem->data;
-
-               if (MSG_IS_MULTIPART(msginfo->flags)) {
-                       MimeInfo *mimeinfo;
-
-                       mimeinfo = procmime_scan_message(msginfo);
-                       g_node_children_foreach(mimeinfo->node, G_TRAVERSE_ALL, msginfo_set_mime_flags, msginfo);
-                       procmime_mimeinfo_free_all(mimeinfo);
-                       /* check for attachments */
-               }
-       }
-
        return msglist;
 }
 
@@ -1570,6 +1551,51 @@ 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);
+       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_set_flags(msginfo,
+                                       permflags & ~msginfo->flags.perm_flags, 0);
+                               procmsg_msginfo_unset_flags(msginfo,
+                                       ~permflags & msginfo->flags.perm_flags, 0);
+                       }
+               }
+       }
+       g_relation_destroy(relation);   
+
+       return ret;
+}
+
 gint folder_item_scan_full(FolderItem *item, gboolean filtering)
 {
        Folder *folder;
@@ -1577,7 +1603,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;
     
@@ -1748,6 +1775,8 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
                g_slist_free(new_list);
        }
 
+       syncronize_flags(item, exists_list);
+
        folder_item_update_freeze();
        if (newmsg_list != NULL) {
                GSList *elem;
@@ -1792,6 +1821,9 @@ 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);
@@ -1802,6 +1834,7 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
        item->unread_msgs = unreadcnt;
        item->total_msgs = totalcnt;
        item->unreadmarked_msgs = unreadmarkedcnt;
+       item->marked_msgs = markedcnt;
 
        update_flags |= F_ITEM_UPDATE_MSGCNT;
 
@@ -1811,60 +1844,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);
@@ -1906,6 +1885,30 @@ 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);
+       
+       return ret;
+}
+
 gint folder_cache_time_compare_func(gconstpointer a, gconstpointer b)
 {
        FolderItem *fa = (FolderItem *)a;
@@ -1965,7 +1968,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;
@@ -1985,10 +1988,37 @@ void folder_item_read_cache(FolderItem *item)
                mark_file = folder_item_get_mark_file(item);
                item->cache = msgcache_read_cache(item, cache_file);
                if (!item->cache) {
+                       MsgInfoList *list, *cur;
+                       guint newcnt = 0, unreadcnt = 0;
+                       guint markedcnt = 0, unreadmarkedcnt = 0;
+                       MsgInfo *msginfo;
+
                        item->cache = msgcache_new();
                        folder_item_scan_full(item, TRUE);
-               }
-               msgcache_read_mark(item->cache, mark_file);
+
+                       msgcache_read_mark(item->cache, mark_file);
+
+                       list = msgcache_get_msg_list(item->cache);
+                       for (cur = list; cur != NULL; cur = g_slist_next(cur)) {
+                               msginfo = cur->data;
+
+                               if (MSG_IS_NEW(msginfo->flags))
+                                       newcnt++;
+                               if (MSG_IS_UNREAD(msginfo->flags))
+                                       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);
+
                g_free(cache_file);
                g_free(mark_file);
        } else {
@@ -2035,7 +2065,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);
@@ -2059,6 +2089,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)
@@ -2073,6 +2104,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);
@@ -2082,19 +2114,117 @@ GSList *folder_item_get_msg_list(FolderItem *item)
        return msgcache_get_msg_list(item->cache);
 }
 
+void msginfo_set_mime_flags(GNode *node, gpointer data)
+{
+       MsgInfo *msginfo = data;
+       MimeInfo *mimeinfo = node->data;
+       
+       if (mimeinfo->disposition == DISPOSITIONTYPE_ATTACHMENT) {
+               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);
+       }
+
+       /* don't descend below top level message for signed and encrypted info */
+       if (mimeinfo->type == MIMETYPE_MESSAGE)
+               return;
+
+       if (privacy_mimeinfo_is_signed(mimeinfo)) {
+               procmsg_msginfo_set_flags(msginfo, 0, MSG_SIGNED);
+       }
+
+       if (privacy_mimeinfo_is_encrypted(mimeinfo)) {
+               procmsg_msginfo_set_flags(msginfo, 0, MSG_ENCRYPTED);
+       } else {
+               /* searching inside encrypted parts doesn't really make sense */
+               g_node_children_foreach(mimeinfo->node, G_TRAVERSE_ALL, msginfo_set_mime_flags, msginfo);
+       }
+}
+
 gchar *folder_item_fetch_msg(FolderItem *item, gint num)
 {
        Folder *folder;
+       gchar *msgfile;
+       MsgInfo *msginfo;
 
        g_return_val_if_fail(item != NULL, NULL);
 
        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);
+
+       if (msgfile != NULL) {
+               msginfo = folder_item_get_msginfo(item, num);
+               if ((msginfo != NULL) && !MSG_IS_SCANNED(msginfo->flags)) {
+                       MimeInfo *mimeinfo;
 
-       return folder->klass->fetch_msg(folder, item, num);
+                       if (msginfo->folder->stype != F_QUEUE && 
+                           msginfo->folder->stype != 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;
 }
 
+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 (msginfo->folder->stype != F_QUEUE && 
+                           msginfo->folder->stype != 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;
@@ -2102,10 +2232,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);
+       statusbar_print_all(_("Fetching all messages in %s ...\n"), item->path);
 
        folder = item->folder;
 
@@ -2115,11 +2248,24 @@ 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++;
+               if (num % 10 == 0) {
+                       gchar buf[32];
+                       g_snprintf(buf, sizeof(buf), "%d / %d",
+                                  num, total);
+                       gtk_progress_bar_set_text
+                               (GTK_PROGRESS_BAR(mainwindow_get_mainwindow()->progressbar), buf);
+                       gtk_progress_bar_set_fraction
+                       (GTK_PROGRESS_BAR(mainwindow_get_mainwindow()->progressbar),
+                        (gfloat)num / (gfloat)total);
+               }
+
                if (folder->ui_func)
                        folder->ui_func(folder, item,
                                        folder->ui_func_data ?
@@ -2136,6 +2282,11 @@ gint folder_item_fetch_all_msg(FolderItem *item)
                g_free(msg);
        }
 
+       gtk_progress_bar_set_fraction
+               (GTK_PROGRESS_BAR(mainwindow_get_mainwindow()->progressbar), 0);
+       gtk_progress_bar_set_text
+               (GTK_PROGRESS_BAR(mainwindow_get_mainwindow()->progressbar), "");
+       statusbar_pop_all();
        procmsg_msg_list_free(mlist);
 
        return ret;
@@ -2224,6 +2375,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();
@@ -2246,6 +2399,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;
@@ -2287,6 +2443,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;
 
@@ -2357,25 +2514,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) 
 {
@@ -2386,7 +2524,7 @@ FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest)
        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);
@@ -2455,7 +2593,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);
@@ -2477,7 +2615,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);
@@ -2512,6 +2653,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);
@@ -2519,6 +2661,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);
@@ -2529,7 +2672,7 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
 
                if (msginfo->planned_download != 0) {
                        int old_planned = msginfo->planned_download;
-                       pop3_unmark(msginfo);
+                       partial_unmark(msginfo);
                        /* little hack to reenable after */
                        msginfo->planned_download = old_planned;
                }
@@ -2549,7 +2692,10 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                        MsgInfo * 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);
                }
        }
 
@@ -2574,7 +2720,7 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                 g_tuples_destroy(tuples);
 
                if (num >= 0) {
-                       MsgInfo *newmsginfo;
+                       MsgInfo *newmsginfo = NULL;
 
                        if (folderscan) {
                                if (msginfo->msgid != NULL) {
@@ -2593,11 +2739,11 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
 
                        if (msginfo->planned_download 
                            == POP3_PARTIAL_DLOAD_DELE) {
-                               pop3_mark_for_delete(newmsginfo);
+                               partial_mark_for_delete(newmsginfo);
                        }
                        if (msginfo->planned_download 
                            == POP3_PARTIAL_DLOAD_DLOAD) {
-                               pop3_mark_for_download(newmsginfo);
+                               partial_mark_for_download(newmsginfo);
                        }
                        procmsg_msginfo_free(newmsginfo);
 
@@ -2608,22 +2754,34 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
        }
 
        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)) {
-                       MsgInfo *msginfo = (MsgInfo *) l->data;
-                       FolderItem *item = msginfo->folder;
+                       msginfo = (MsgInfo *) l->data;
+                       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 (g_slist_find(not_moved, msginfo))
+                               continue;
+
                        if ((num >= 0) && (item->folder->klass->remove_msg != NULL)) {
-                               item->folder->klass->remove_msg(item->folder,
+                               if (!item->folder->klass->remove_msgs)
+                                       item->folder->klass->remove_msg(item->folder,
                                                                msginfo->folder,
                                                                msginfo->msgnum);
                                remove_msginfo_from_cache(item, msginfo);
@@ -2662,10 +2820,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;
 }
 
 /**
@@ -2683,7 +2844,7 @@ gint folder_item_copy_msg(FolderItem *dest, MsgInfo *msginfo)
     
        list.data = msginfo;
        list.next = NULL;
-       
+
        return do_copy_msgs(dest, &list, FALSE);
 }
 
@@ -2695,10 +2856,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)
@@ -2710,6 +2876,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);
 
@@ -2732,20 +2899,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;
 }
 
@@ -2755,24 +2934,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;
 }
 
@@ -2780,6 +2971,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);
@@ -2793,6 +2985,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;
 
@@ -2948,7 +3141,6 @@ static gchar *folder_get_list_path(void)
 static gpointer folder_item_to_xml(gpointer nodedata, gpointer data)
 {
        FolderItem *item = (FolderItem *) nodedata;
-       XMLNode *xmlnode;
        XMLTag *tag;
 
        g_return_val_if_fail(item != NULL, NULL);
@@ -2958,11 +3150,7 @@ static gpointer folder_item_to_xml(gpointer nodedata, gpointer data)
        else
                tag = folder_item_get_xml(item->folder, item);
 
-       xmlnode = g_new0(XMLNode, 1);
-       xmlnode->tag = tag;
-       xmlnode->element = NULL;
-
-       return xmlnode;
+       return xml_node_new(tag, NULL);;
 }
 
 static GNode *folder_get_xml_node(Folder *folder)
@@ -2978,11 +3166,9 @@ static GNode *folder_get_xml_node(Folder *folder)
        else
                tag = folder_get_xml(folder);
 
-       xml_tag_add_attr(tag, "type", g_strdup(folder->klass->idstr));
+       xml_tag_add_attr(tag, xml_attr_new("type", folder->klass->idstr));
 
-       xmlnode = g_new0(XMLNode, 1);
-       xmlnode->tag = tag;
-       xmlnode->element = NULL;
+       xmlnode = xml_node_new(tag, NULL);
 
        node = g_node_new(xmlnode);
        if (folder->node->children) {
@@ -3222,14 +3408,18 @@ void folder_item_apply_processing(FolderItem *item)
 {
        GSList *processing_list;
        GSList *mlist, *cur;
-       
+       guint total = 0, curmsg = 0;
+       gchar buf[32];
+
        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;
 
@@ -3238,7 +3428,16 @@ void folder_item_apply_processing(FolderItem *item)
                 /* reset parameters that can be modified by processing */
                 msginfo->hidden = 0;
                 msginfo->score = 0;
-                
+                curmsg ++;
+               if (curmsg % 10 == 0) {
+                       g_snprintf(buf, sizeof(buf), "%d / %d",
+                                  curmsg, total);
+                       gtk_progress_bar_set_text
+                               (GTK_PROGRESS_BAR(mainwindow_get_mainwindow()->progressbar), buf);
+                       gtk_progress_bar_set_fraction
+                       (GTK_PROGRESS_BAR(mainwindow_get_mainwindow()->progressbar),
+                        (gfloat)curmsg / (gfloat)total);
+               }
                 /* apply pre global rules */
                filter_message_by_msginfo(pre_global_processing, msginfo);
                 
@@ -3251,6 +3450,12 @@ void folder_item_apply_processing(FolderItem *item)
                procmsg_msginfo_free(msginfo);
        }
        g_slist_free(mlist);
+       
+       gtk_progress_bar_set_text
+               (GTK_PROGRESS_BAR(mainwindow_get_mainwindow()->progressbar), "");
+       gtk_progress_bar_set_fraction
+               (GTK_PROGRESS_BAR(mainwindow_get_mainwindow()->progressbar), 0);
+       statusbar_pop_all();
 
        folder_item_update_thaw();
 }
@@ -3262,7 +3467,7 @@ static gint folder_item_update_freeze_cnt = 0;
 
 static void folder_item_update_with_msg(FolderItem *item, FolderItemUpdateFlags update_flags, MsgInfo *msg)
 {
-       if (folder_item_update_freeze_cnt == 0 || (msg != NULL && item->opened)) {
+       if (folder_item_update_freeze_cnt == 0 /* || (msg != NULL && item->opened) */) {
                FolderItemUpdateData source;
        
                source.item = item;
@@ -3333,4 +3538,11 @@ void folder_item_update_thaw(void)
        }
 }
 
+void folder_item_set_batch (FolderItem *item, gboolean batch)
+{
+       if (item->folder->klass->set_batch) {
+               item->folder->klass->set_batch(item->folder, item, batch);
+       }
+}
+
 #undef PUT_ESCAPE_STR