2006-02-05 [colin] 2.0.0cvs13
[claws.git] / src / procmsg.c
index 5f8c915bd6674fe93c37f8807ae49cd5b55c473d..0e0b4895cc86f96822c88db5e35a9d99503dea99 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * 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.
  */
 
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <ctype.h>
 
-#include "intl.h"
 #include "main.h"
 #include "utils.h"
 #include "procmsg.h"
 #include "procheader.h"
-#include "send.h"
+#include "send_message.h"
 #include "procmime.h"
 #include "statusbar.h"
+#include "prefs_filtering.h"
+#include "filtering.h"
 #include "folder.h"
 #include "prefs_common.h"
 #include "account.h"
-#if USE_GPGME
-#  include "rfc2015.h"
-#endif
 #include "alertpanel.h"
 #include "news.h"
-#include "imap.h"
 #include "hooks.h"
+#include "msgcache.h"
+#include "partial_download.h"
 
-typedef struct _FlagInfo       FlagInfo;
+static gint procmsg_send_message_queue_full(const gchar *file, gboolean keep_session);
 
-struct _FlagInfo
+enum
 {
-       guint    msgnum;
-       MsgFlags flags;
+       Q_SENDER           = 0,
+       Q_SMTPSERVER       = 1,
+       Q_RECIPIENTS       = 2,
+       Q_NEWSGROUPS       = 3,
+       Q_MAIL_ACCOUNT_ID  = 4,
+       Q_NEWS_ACCOUNT_ID  = 5,
+       Q_SAVE_COPY_FOLDER = 6,
+       Q_REPLY_MESSAGE_ID = 7,
+       Q_FWD_MESSAGE_ID   = 8,
+       Q_PRIVACY_SYSTEM   = 9,
+       Q_ENCRYPT          = 10,
+       Q_ENCRYPT_DATA     = 11,
 };
 
-static GHashTable *procmsg_read_mark_file      (const gchar    *folder);
-void   procmsg_msginfo_write_flags             (MsgInfo        *msginfo);
-
 GHashTable *procmsg_msg_hash_table_create(GSList *mlist)
 {
        GHashTable *msg_table;
@@ -99,241 +107,6 @@ GHashTable *procmsg_to_folder_hash_table_create(GSList *mlist)
        return msg_table;
 }
 
-static gint procmsg_read_cache_data_str(FILE *fp, gchar **str)
-{
-       gchar buf[BUFFSIZE];
-       gint ret = 0;
-       size_t len;
-
-       if (fread(&len, sizeof(len), 1, fp) == 1) {
-               if (len < 0)
-                       ret = -1;
-               else {
-                       gchar *tmp = NULL;
-
-                       while (len > 0) {
-                               size_t size = MIN(len, BUFFSIZE - 1);
-
-                               if (fread(buf, size, 1, fp) != 1) {
-                                       ret = -1;
-                                       if (tmp) g_free(tmp);
-                                       *str = NULL;
-                                       break;
-                               }
-
-                               buf[size] = '\0';
-                               if (tmp) {
-                                       *str = g_strconcat(tmp, buf, NULL);
-                                       g_free(tmp);
-                                       tmp = *str;
-                               } else
-                                       tmp = *str = g_strdup(buf);
-
-                               len -= size;
-                       }
-               }
-       } else
-               ret = -1;
-
-       if (ret < 0)
-               g_warning("Cache data is corrupted\n");
-
-       return ret;
-}
-
-#define READ_CACHE_DATA(data, fp) \
-{ \
-       if (procmsg_read_cache_data_str(fp, &data) < 0) { \
-               procmsg_msginfo_free(msginfo); \
-               break; \
-       } \
-}
-
-#define READ_CACHE_DATA_INT(n, fp) \
-{ \
-       if (fread(&n, sizeof(n), 1, fp) != 1) { \
-               g_warning("Cache data is corrupted\n"); \
-               procmsg_msginfo_free(msginfo); \
-               break; \
-       } \
-}
-
-GSList *procmsg_read_cache(FolderItem *item, gboolean scan_file)
-{
-       GSList *mlist = NULL;
-       GSList *last = NULL;
-       gchar *cache_file;
-       FILE *fp;
-       MsgInfo *msginfo;
-       MsgFlags default_flags;
-       gchar file_buf[BUFFSIZE];
-       gint ver;
-       guint num;
-       FolderType type;
-
-       g_return_val_if_fail(item != NULL, NULL);
-       g_return_val_if_fail(item->folder != NULL, NULL);
-       type = item->folder->type;
-
-       default_flags.perm_flags = MSG_NEW|MSG_UNREAD;
-       default_flags.tmp_flags = MSG_CACHED;
-       if (type == F_MH || type == F_IMAP) {
-               if (item->stype == F_QUEUE) {
-                       MSG_SET_TMP_FLAGS(default_flags, MSG_QUEUED);
-               } else if (item->stype == F_DRAFT) {
-                       MSG_SET_TMP_FLAGS(default_flags, MSG_DRAFT);
-               }
-       }
-       if (type == F_IMAP) {
-               MSG_SET_TMP_FLAGS(default_flags, MSG_IMAP);
-       } else if (type == F_NEWS) {
-               MSG_SET_TMP_FLAGS(default_flags, MSG_NEWS);
-       }
-
-       if (type == F_MH) {
-               gchar *path;
-
-               path = folder_item_get_path(item);
-               if (change_dir(path) < 0) {
-                       g_free(path);
-                       return NULL;
-               }
-               g_free(path);
-       }
-       cache_file = folder_item_get_cache_file(item);
-       if ((fp = fopen(cache_file, "rb")) == NULL) {
-               debug_print("\tNo cache file\n");
-               g_free(cache_file);
-               return NULL;
-       }
-       setvbuf(fp, file_buf, _IOFBF, sizeof(file_buf));
-       g_free(cache_file);
-
-       debug_print("\tReading summary cache...\n");
-
-       /* compare cache version */
-       if (fread(&ver, sizeof(ver), 1, fp) != 1 ||
-           CACHE_VERSION != ver) {
-               debug_print("Cache version is different. Discarding it.\n");
-               fclose(fp);
-               return NULL;
-       }
-
-       while (fread(&num, sizeof(num), 1, fp) == 1) {
-               msginfo = procmsg_msginfo_new();
-               msginfo->msgnum = num;
-               READ_CACHE_DATA_INT(msginfo->size, fp);
-               READ_CACHE_DATA_INT(msginfo->mtime, fp);
-               READ_CACHE_DATA_INT(msginfo->date_t, fp);
-               READ_CACHE_DATA_INT(msginfo->flags.tmp_flags, fp);
-
-               READ_CACHE_DATA(msginfo->fromname, fp);
-
-               READ_CACHE_DATA(msginfo->date, fp);
-               READ_CACHE_DATA(msginfo->from, fp);
-               READ_CACHE_DATA(msginfo->to, fp);
-               READ_CACHE_DATA(msginfo->cc, fp);
-               READ_CACHE_DATA(msginfo->newsgroups, fp);
-               READ_CACHE_DATA(msginfo->subject, fp);
-               READ_CACHE_DATA(msginfo->msgid, fp);
-               READ_CACHE_DATA(msginfo->inreplyto, fp);
-               READ_CACHE_DATA(msginfo->references, fp);
-                READ_CACHE_DATA(msginfo->xref, fp);
-
-
-               MSG_SET_PERM_FLAGS(msginfo->flags, default_flags.perm_flags);
-               MSG_SET_TMP_FLAGS(msginfo->flags, default_flags.tmp_flags);
-
-               /* if the message file doesn't exist or is changed,
-                  don't add the data */
-               if (type == F_MH && scan_file &&
-                   folder_item_is_msg_changed(item, msginfo))
-                       procmsg_msginfo_free(msginfo);
-               else {
-                       msginfo->folder = item;
-
-                       if (!mlist)
-                               last = mlist = g_slist_append(NULL, msginfo);
-                       else {
-                               last = g_slist_append(last, msginfo);
-                               last = last->next;
-                       }
-               }
-       }
-
-       fclose(fp);
-       debug_print("done.\n");
-
-       return mlist;
-}
-
-#undef READ_CACHE_DATA
-#undef READ_CACHE_DATA_INT
-
-void procmsg_set_flags(GSList *mlist, FolderItem *item)
-{
-       GSList *cur, *tmp;
-       gint newmsg = 0;
-       gint lastnum = 0;
-       gchar *markdir;
-       MsgInfo *msginfo;
-       GHashTable *mark_table;
-       MsgFlags *flags;
-
-       if (!mlist) return;
-       g_return_if_fail(item != NULL);
-       g_return_if_fail(item->folder != NULL);
-
-       debug_print("\tMarking the messages...\n");
-
-       markdir = folder_item_get_path(item);
-       if (!is_dir_exist(markdir))
-               make_dir_hier(markdir);
-
-       mark_table = procmsg_read_mark_file(markdir);
-       g_free(markdir);
-
-       if (!mark_table) return;
-
-       for (cur = mlist; cur != NULL; cur = cur->next) {
-               msginfo = (MsgInfo *)cur->data;
-
-               if (lastnum < msginfo->msgnum)
-                       lastnum = msginfo->msgnum;
-
-               flags = g_hash_table_lookup
-                       (mark_table, GUINT_TO_POINTER(msginfo->msgnum));
-
-               if (flags != NULL) {
-                       /* add the permanent flags only */
-                       msginfo->flags.perm_flags = flags->perm_flags;
-                       if (item->folder->type == F_IMAP) {
-                               MSG_SET_TMP_FLAGS(msginfo->flags, MSG_IMAP);
-                       } else if (item->folder->type == F_NEWS) {
-                               MSG_SET_TMP_FLAGS(msginfo->flags, MSG_NEWS);
-                       }
-               } else {
-                       /* not found (new message) */
-                       if (newmsg == 0) {
-                               for (tmp = mlist; tmp != cur; tmp = tmp->next)
-                                       MSG_UNSET_PERM_FLAGS
-                                               (((MsgInfo *)tmp->data)->flags,
-                                                MSG_NEW);
-                       }
-                       newmsg++;
-               }
-       }
-
-       item->last_num = lastnum;
-
-       debug_print("done.\n");
-       if (newmsg)
-               debug_print("\t%d new message(s)\n", newmsg);
-
-       hash_free_value_mem(mark_table);
-       g_hash_table_destroy(mark_table);
-}
-
 gint procmsg_get_last_num_in_msg_list(GSList *mlist)
 {
        GSList *cur;
@@ -361,183 +134,103 @@ void procmsg_msg_list_free(GSList *mlist)
        g_slist_free(mlist);
 }
 
-void procmsg_write_cache(MsgInfo *msginfo, FILE *fp)
-{
-       MsgTmpFlags flags = msginfo->flags.tmp_flags & MSG_CACHED_FLAG_MASK;
-
-       WRITE_CACHE_DATA_INT(msginfo->msgnum, fp);
-       WRITE_CACHE_DATA_INT(msginfo->size, fp);
-       WRITE_CACHE_DATA_INT(msginfo->mtime, fp);
-       WRITE_CACHE_DATA_INT(msginfo->date_t, fp);
-       WRITE_CACHE_DATA_INT(flags, fp);
-
-       WRITE_CACHE_DATA(msginfo->fromname, fp);
-
-       WRITE_CACHE_DATA(msginfo->date, fp);
-       WRITE_CACHE_DATA(msginfo->from, fp);
-       WRITE_CACHE_DATA(msginfo->to, fp);
-       WRITE_CACHE_DATA(msginfo->cc, fp);
-       WRITE_CACHE_DATA(msginfo->newsgroups, fp);
-       WRITE_CACHE_DATA(msginfo->subject, fp);
-       WRITE_CACHE_DATA(msginfo->msgid, fp);
-       WRITE_CACHE_DATA(msginfo->inreplyto, fp);
-       WRITE_CACHE_DATA(msginfo->references, fp);
-       WRITE_CACHE_DATA(msginfo->xref, fp);
-
-}
-
-void procmsg_write_flags(MsgInfo *msginfo, FILE *fp)
-{
-       MsgPermFlags flags = msginfo->flags.perm_flags;
-
-       WRITE_CACHE_DATA_INT(msginfo->msgnum, fp);
-       WRITE_CACHE_DATA_INT(flags, fp);
-}
-
-void procmsg_flush_mark_queue(FolderItem *item, FILE *fp)
-{
-       MsgInfo *flaginfo;
-
-       g_return_if_fail(item != NULL);
-       g_return_if_fail(fp != NULL);
-
-       while (item->mark_queue != NULL) {
-               flaginfo = (MsgInfo *)item->mark_queue->data;
-               procmsg_write_flags(flaginfo, fp);
-               procmsg_msginfo_free(flaginfo);
-               item->mark_queue = g_slist_remove(item->mark_queue, flaginfo);
-       }
-}
-
-void procmsg_add_flags(FolderItem *item, gint num, MsgFlags flags)
-{
-       FILE *fp;
-       gchar *path;
-       MsgInfo msginfo;
-
-       g_return_if_fail(item != NULL);
-
-       if (item->opened) {
-               MsgInfo *queue_msginfo;
-
-               queue_msginfo = g_new0(MsgInfo, 1);
-               queue_msginfo->msgnum = num;
-               queue_msginfo->flags = flags;
-               item->mark_queue = g_slist_append
-                       (item->mark_queue, queue_msginfo);
-               return;
-       }
-
-       path = folder_item_get_path(item);
-       g_return_if_fail(path != NULL);
-
-       if ((fp = procmsg_open_mark_file(path, TRUE)) == NULL) {
-               g_warning("can't open mark file\n");
-               g_free(path);
-               return;
-       }
-       g_free(path);
-
-       msginfo.msgnum = num;
-       msginfo.flags = flags;
-
-       procmsg_write_flags(&msginfo, fp);
-       fclose(fp);
-}
-
 struct MarkSum {
-       gint *new;
-       gint *unread;
-       gint *total;
+       gint *new_msgs;
+       gint *unread_msgs;
+       gint *total_msgs;
        gint *min;
        gint *max;
        gint first;
 };
 
-static GHashTable *procmsg_read_mark_file(const gchar *folder)
-{
-       FILE *fp;
-       GHashTable *mark_table = NULL;
-       gint num;
-       MsgFlags *flags;
-       MsgPermFlags perm_flags;
+/* CLAWS subject threading:
+  
+  in the first round it inserts subject lines in a 
+  relation (subject <-> node)
 
-       if ((fp = procmsg_open_mark_file(folder, FALSE)) == NULL)
-               return NULL;
+  the second round finishes the threads by attaching
+  matching subject lines to the one found in the
+  relation. will use the oldest node with the same
+  subject that is not more then thread_by_subject_max_age
+  days old (see subject_relation_lookup)
+*/  
 
-       mark_table = g_hash_table_new(NULL, g_direct_equal);
-
-       while (fread(&num, sizeof(num), 1, fp) == 1) {
-               if (fread(&perm_flags, sizeof(perm_flags), 1, fp) != 1) break;
+static void subject_relation_insert(GRelation *relation, GNode *node)
+{
+       gchar *subject;
+       MsgInfo *msginfo;
 
-               flags = g_hash_table_lookup(mark_table, GUINT_TO_POINTER(num));
-               if (flags != NULL)
-                       g_free(flags);
+       g_return_if_fail(relation != NULL);
+       g_return_if_fail(node != NULL);
+       msginfo = (MsgInfo *) node->data;
+       g_return_if_fail(msginfo != NULL);
 
-               flags = g_new0(MsgFlags, 1);
-               flags->perm_flags = perm_flags;
-    
-               if (!MSG_IS_REALLY_DELETED(*flags)) {
-                       g_hash_table_insert(mark_table, GUINT_TO_POINTER(num), flags);
-               } else {
-                       g_hash_table_remove(mark_table, GUINT_TO_POINTER(num));
-               }
-       }
+       subject = msginfo->subject;
+       if (subject == NULL)
+               return;
+       subject += subject_get_prefix_length(subject);
 
-       fclose(fp);
-       return mark_table;
+       g_relation_insert(relation, subject, node);
 }
 
-FILE *procmsg_open_mark_file(const gchar *folder, gboolean append)
+static GNode *subject_relation_lookup(GRelation *relation, MsgInfo *msginfo)
 {
-       gchar *markfile;
-       FILE *fp;
-       gint ver;
-
-       markfile = g_strconcat(folder, G_DIR_SEPARATOR_S, MARK_FILE, NULL);
-
-       if ((fp = fopen(markfile, "rb")) == NULL)
-               debug_print("Mark file not found.\n");
-       else if (fread(&ver, sizeof(ver), 1, fp) != 1 || MARK_VERSION != ver) {
-               debug_print("Mark version is different (%d != %d). "
-                             "Discarding it.\n", ver, MARK_VERSION);
-               fclose(fp);
-               fp = NULL;
-       }
+       gchar *subject;
+       GTuples *tuples;
+       GNode *node = NULL;
+       gint prefix_length;
+    
+       g_return_val_if_fail(relation != NULL, NULL);
 
-       /* read mode */
-       if (append == FALSE) {
-               g_free(markfile);
-               return fp;
-       }
+       subject = msginfo->subject;
+       if (subject == NULL)
+               return NULL;
+       prefix_length = subject_get_prefix_length(subject);
+       if (prefix_length <= 0)
+               return NULL;
+       subject += prefix_length;
+       
+       tuples = g_relation_select(relation, subject, 0);
+       if (tuples == NULL)
+               return NULL;
 
-       if (fp) {
-               /* reopen with append mode */
-               fclose(fp);
-               if ((fp = fopen(markfile, "ab")) == NULL)
-                       g_warning("Can't open mark file with append mode.\n");
-       } else {
-               /* open with overwrite mode if mark file doesn't exist or
-                  version is different */
-               if ((fp = fopen(markfile, "wb")) == NULL)
-                       g_warning("Can't open mark file with write mode.\n");
-               else {
-                       ver = MARK_VERSION;
-                       WRITE_CACHE_DATA_INT(ver, fp);
-               }
+       if (tuples->len > 0) {
+               int i;
+               GNode *relation_node;
+               MsgInfo *relation_msginfo = NULL, *best_msginfo = NULL;
+               gboolean match;
+
+               /* check all nodes with the same subject to find the best parent */
+               for (i = 0; i < tuples->len; i++) {
+                       relation_node = (GNode *) g_tuples_index(tuples, i, 1);
+                       relation_msginfo = (MsgInfo *) relation_node->data;
+                       match = FALSE;
+
+                       /* best node should be the oldest in the found nodes */
+                       /* parent node must not be older then msginfo */
+                       if ((relation_msginfo->date_t < msginfo->date_t) &&
+                           ((best_msginfo == NULL) ||
+                            (best_msginfo->date_t > relation_msginfo->date_t)))
+                               match = TRUE;
+
+                       /* parent node must not be more then thread_by_subject_max_age
+                          days older then msginfo */
+                       if (abs(difftime(msginfo->date_t, relation_msginfo->date_t)) >
+                            prefs_common.thread_by_subject_max_age * 3600 * 24)
+                               match = FALSE;
+
+                       /* can add new tests for all matching
+                          nodes found by subject */
+
+                       if (match) {
+                               node = relation_node;
+                               best_msginfo = relation_msginfo;
+                       }
+               }           
        }
 
-       g_free(markfile);
-       return fp;
-}
-
-static gboolean procmsg_ignore_node(GNode *node, gpointer data)
-{
-       MsgInfo *msginfo = (MsgInfo *)node->data;
-       
-       procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
-
-       return FALSE;
+       g_tuples_destroy(tuples);
+       return node;
 }
 
 /* return the reversed thread tree */
@@ -545,15 +238,15 @@ GNode *procmsg_get_thread_tree(GSList *mlist)
 {
        GNode *root, *parent, *node, *next;
        GHashTable *msgid_table;
-       GHashTable *subject_table;
+       GRelation *subject_relation;
        MsgInfo *msginfo;
        const gchar *msgid;
-       const gchar *subject;
-       GNode *found_subject;
+        GSList *reflist;
 
        root = g_node_new(NULL);
        msgid_table = g_hash_table_new(g_str_hash, g_str_equal);
-       subject_table = g_hash_table_new(g_str_hash, g_str_equal);
+       subject_relation = g_relation_new(2);
+       g_relation_index(subject_relation, 0, g_str_hash, g_str_equal);
 
        for (; mlist != NULL; mlist = mlist->next) {
                msginfo = (MsgInfo *)mlist->data;
@@ -563,35 +256,17 @@ GNode *procmsg_get_thread_tree(GSList *mlist)
                        parent = g_hash_table_lookup(msgid_table, msginfo->inreplyto);
                        if (parent == NULL) {
                                parent = root;
-                       } else {
-                               if (MSG_IS_IGNORE_THREAD(((MsgInfo *)parent->data)->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)) {
-                                       procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
-                               }
                        }
                }
                node = g_node_insert_data_before
                        (parent, parent == root ? parent->children : NULL,
                         msginfo);
-               if ((msgid = msginfo->msgid) &&
-                   g_hash_table_lookup(msgid_table, msgid) == NULL)
+               if ((msgid = msginfo->msgid) && g_hash_table_lookup(msgid_table, msgid) == NULL)
                        g_hash_table_insert(msgid_table, (gchar *)msgid, node);
 
+               /* CLAWS: add subject to relation (without prefix) */
                if (prefs_common.thread_by_subject) {
-                       subject = msginfo->subject;
-                       found_subject = subject_table_lookup(subject_table,
-                                                            (gchar *) subject);
-                       if (found_subject == NULL)
-                               subject_table_insert(subject_table, (gchar *) subject,
-                                                    node);
-                       else {
-                               /* replace if msg in table is older than current one 
-                                * can add here more stuff. */
-                               if ( ((MsgInfo*)(found_subject->data))->date_t >
-                                    ((MsgInfo*)(node->data))->date_t )  {
-                                       subject_table_remove(subject_table, (gchar *) subject);
-                                       subject_table_insert(subject_table, (gchar *) subject, node);
-                               }       
-                       }
+                       subject_relation_insert(subject_relation, node);
                }
        }
 
@@ -600,67 +275,71 @@ GNode *procmsg_get_thread_tree(GSList *mlist)
                next = node->next;
                msginfo = (MsgInfo *)node->data;
                parent = NULL;
-               if (msginfo->inreplyto) 
+               
+                if (msginfo->inreplyto)
                        parent = g_hash_table_lookup(msgid_table, msginfo->inreplyto);
-               if (parent && parent != node) {
+
+               /* try looking for the indirect parent */
+               if (!parent && msginfo->references) {
+                       for (reflist = msginfo->references;
+                            reflist != NULL; reflist = reflist->next)
+                               if ((parent = g_hash_table_lookup
+                                       (msgid_table, reflist->data)) != NULL)
+                                       break;
+                }                                        
+              
+               /* node should not be the parent, and node should not
+                  be an ancestor of parent (circular reference) */
+               if (parent && parent != node &&
+                   !g_node_is_ancestor(node, parent)) {
                        g_node_unlink(node);
                        g_node_insert_before
                                (parent, parent->children, node);
-                       /* CLAWS: ignore thread */
-                       if (MSG_IS_IGNORE_THREAD(((MsgInfo *)parent->data)->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)) {
-                               g_node_traverse(node, G_PRE_ORDER, G_TRAVERSE_ALL, -1, procmsg_ignore_node, NULL);
-                       }
                }
+               
                node = next;
        }
 
-       /* CLAWS: now see if the first level (below root) still has some nodes that can be
-        * threaded by subject line. we need to handle this in a special way to prevent
-        * circular reference from a node that has already been threaded by IN-REPLY-TO
-        * but is also in the subject line hash table */
        if (prefs_common.thread_by_subject) {
-               for (node = root->children; node != NULL; ) {
+               for (node = root->children; node && node != NULL;) {
                        next = node->next;
                        msginfo = (MsgInfo *) node->data;
-                       parent = NULL;
-                       if (subject_is_reply(msginfo->subject)) {
-                               parent = subject_table_lookup(subject_table,
-                                                             msginfo->subject);
-                               /* the node may already be threaded by IN-REPLY-TO,
-                                  so go up in the tree to find the parent node */
-                               if (parent != NULL) {
-                                       if (g_node_is_ancestor(node, parent))
-                                               parent = NULL;
-                                       if (parent == node)
-                                               parent = NULL;
-                               }
+                       
+                       parent = subject_relation_lookup(subject_relation, msginfo);
+                       
+                       /* the node may already be threaded by IN-REPLY-TO, so go up 
+                        * in the tree to 
+                          find the parent node */
+                       if (parent != NULL) {
+                               if (g_node_is_ancestor(node, parent))
+                                       parent = NULL;
+                               if (parent == node)
+                                       parent = NULL;
+                       }
+                       
+                       if (parent) {
+                               g_node_unlink(node);
+                               g_node_append(parent, node);
+                       }
 
-                               if (parent) {
-                                       g_node_unlink(node);
-                                       g_node_append(parent, node);
-                                       /* CLAWS: ignore thread */
-                                       if (MSG_IS_IGNORE_THREAD(((MsgInfo *)parent->data)->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)) {
-                                               g_node_traverse(node, G_PRE_ORDER, G_TRAVERSE_ALL, -1, procmsg_ignore_node, NULL);
-                                       }
-                               }
-                       }                                       
                        node = next;
                }       
        }
        
-       g_hash_table_destroy(subject_table);
+       g_relation_destroy(subject_relation);
        g_hash_table_destroy(msgid_table);
 
        return root;
 }
 
-void procmsg_move_messages(GSList *mlist)
+gint procmsg_move_messages(GSList *mlist)
 {
        GSList *cur, *movelist = NULL;
        MsgInfo *msginfo;
        FolderItem *dest = NULL;
+       gint retval = 0;
 
-       if (!mlist) return;
+       if (!mlist) return 0;
 
        folder_item_update_freeze();
 
@@ -672,7 +351,7 @@ void procmsg_move_messages(GSList *mlist)
                } else if (dest == msginfo->to_folder) {
                        movelist = g_slist_append(movelist, msginfo);
                } else {
-                       folder_item_move_msgs_with_dest(dest, movelist);
+                       folder_item_move_msgs(dest, movelist);
                        g_slist_free(movelist);
                        movelist = NULL;
                        dest = msginfo->to_folder;
@@ -682,11 +361,12 @@ void procmsg_move_messages(GSList *mlist)
        }
 
        if (movelist) {
-               folder_item_move_msgs_with_dest(dest, movelist);
+               retval = folder_item_move_msgs(dest, movelist);
                g_slist_free(movelist);
        }
 
        folder_item_update_thaw();
+       return retval;
 }
 
 void procmsg_copy_messages(GSList *mlist)
@@ -707,7 +387,7 @@ void procmsg_copy_messages(GSList *mlist)
                } else if (dest == msginfo->to_folder) {
                        copylist = g_slist_append(copylist, msginfo);
                } else {
-                       folder_item_copy_msgs_with_dest(dest, copylist);
+                       folder_item_copy_msgs(dest, copylist);
                        g_slist_free(copylist);
                        copylist = NULL;
                        dest = msginfo->to_folder;
@@ -717,7 +397,7 @@ void procmsg_copy_messages(GSList *mlist)
        }
 
        if (copylist) {
-               folder_item_copy_msgs_with_dest(dest, copylist);
+               folder_item_copy_msgs(dest, copylist);
                g_slist_free(copylist);
        }
 
@@ -726,17 +406,14 @@ void procmsg_copy_messages(GSList *mlist)
 
 gchar *procmsg_get_message_file_path(MsgInfo *msginfo)
 {
-       gchar *path, *file;
+       gchar *file;
 
        g_return_val_if_fail(msginfo != NULL, NULL);
 
        if (msginfo->plaintext_file)
                file = g_strdup(msginfo->plaintext_file);
        else {
-               path = folder_item_get_path(msginfo->folder);
-               file = g_strconcat(path, G_DIR_SEPARATOR_S,
-                                  itos(msginfo->msgnum), NULL);
-               g_free(path);
+               file = folder_item_fetch_msg(msginfo->folder, msginfo->msgnum);
        }
 
        return file;
@@ -750,11 +427,69 @@ gchar *procmsg_get_message_file(MsgInfo *msginfo)
 
        filename = folder_item_fetch_msg(msginfo->folder, msginfo->msgnum);
        if (!filename)
-               g_warning("can't fetch message %d\n", msginfo->msgnum);
+               debug_print("can't fetch message %d\n", msginfo->msgnum);
 
        return filename;
 }
 
+gchar *procmsg_get_message_file_full(MsgInfo *msginfo, gboolean headers, gboolean body)
+{
+       gchar *filename = NULL;
+
+       g_return_val_if_fail(msginfo != NULL, NULL);
+
+       filename = folder_item_fetch_msg_full(msginfo->folder, msginfo->msgnum,
+                                               headers, body);
+       if (!filename)
+               debug_print("can't fetch message %d\n", msginfo->msgnum);
+
+       return filename;
+}
+
+GSList *procmsg_get_message_file_list(GSList *mlist)
+{
+        GSList *file_list = NULL;
+        MsgInfo *msginfo;
+        MsgFileInfo *fileinfo;
+        gchar *file;
+
+        while (mlist != NULL) {
+                msginfo = (MsgInfo *)mlist->data;
+                file = procmsg_get_message_file(msginfo);
+                if (!file) {
+                        procmsg_message_file_list_free(file_list);
+                        return NULL;
+                }
+                fileinfo = g_new(MsgFileInfo, 1);
+               fileinfo->msginfo = procmsg_msginfo_new_ref(msginfo);
+                fileinfo->file = file;
+                fileinfo->flags = g_new(MsgFlags, 1);
+                *fileinfo->flags = msginfo->flags;
+                file_list = g_slist_prepend(file_list, fileinfo);
+                mlist = mlist->next;
+        }
+
+        file_list = g_slist_reverse(file_list);
+
+        return file_list;
+}
+
+void procmsg_message_file_list_free(MsgInfoList *file_list)
+{
+       GSList *cur;
+       MsgFileInfo *fileinfo;
+
+       for (cur = file_list; cur != NULL; cur = cur->next) {
+               fileinfo = (MsgFileInfo *)cur->data;
+               procmsg_msginfo_free(fileinfo->msginfo);
+               g_free(fileinfo->file);
+               g_free(fileinfo->flags);
+               g_free(fileinfo);
+       }
+
+       g_slist_free(file_list);
+}
+
 FILE *procmsg_open_message(MsgInfo *msginfo)
 {
        FILE *fp;
@@ -768,10 +503,11 @@ FILE *procmsg_open_message(MsgInfo *msginfo)
        if (!is_file_exist(file)) {
                g_free(file);
                file = procmsg_get_message_file(msginfo);
-               g_return_val_if_fail(file != NULL, NULL);
+               if (!file)
+                       return NULL;
        }
 
-       if ((fp = fopen(file, "rb")) == NULL) {
+       if ((fp = g_fopen(file, "rb")) == NULL) {
                FILE_OP_ERROR(file, "fopen");
                g_free(file);
                return NULL;
@@ -789,82 +525,338 @@ FILE *procmsg_open_message(MsgInfo *msginfo)
        return fp;
 }
 
-#if USE_GPGME
-FILE *procmsg_open_message_decrypted(MsgInfo *msginfo, MimeInfo **mimeinfo)
+gboolean procmsg_msg_exist(MsgInfo *msginfo)
 {
-       FILE *fp;
-       MimeInfo *mimeinfo_;
+       gchar *path;
+       gboolean ret;
 
-       g_return_val_if_fail(msginfo != NULL, NULL);
+       if (!msginfo) return FALSE;
+
+       path = folder_item_get_path(msginfo->folder);
+       change_dir(path);
+       ret = !folder_item_is_msg_changed(msginfo->folder, msginfo);
+       g_free(path);
+
+       return ret;
+}
+
+void procmsg_get_filter_keyword(MsgInfo *msginfo, gchar **header, gchar **key,
+                               PrefsFilterType type)
+{
+       static HeaderEntry hentry[] = {{"X-BeenThere:",    NULL, TRUE},
+                                      {"X-ML-Name:",      NULL, TRUE},
+                                      {"X-List:",         NULL, TRUE},
+                                      {"X-Mailing-list:", NULL, TRUE},
+                                      {"List-Id:",        NULL, TRUE},
+                                      {"X-Sequence:",     NULL, TRUE},
+                                      {"Sender:",         NULL, TRUE},
+                                      {"List-Post:",      NULL, TRUE},
+                                      {NULL,              NULL, FALSE}};
+       enum
+       {
+               H_X_BEENTHERE    = 0,
+               H_X_ML_NAME      = 1,
+               H_X_LIST         = 2,
+               H_X_MAILING_LIST = 3,
+               H_LIST_ID        = 4,
+               H_X_SEQUENCE     = 5,
+               H_SENDER         = 6,
+               H_LIST_POST      = 7
+       };
 
-       if (mimeinfo) *mimeinfo = NULL;
+       FILE *fp;
+
+       g_return_if_fail(msginfo != NULL);
+       g_return_if_fail(header != NULL);
+       g_return_if_fail(key != NULL);
 
-       if ((fp = procmsg_open_message(msginfo)) == NULL) return NULL;
+       *header = NULL;
+       *key = NULL;
 
-       mimeinfo_ = procmime_scan_mime_header(fp);
-       if (!mimeinfo_) {
+       switch (type) {
+       case FILTER_BY_NONE:
+               return;
+       case FILTER_BY_AUTO:
+               if ((fp = procmsg_open_message(msginfo)) == NULL)
+                       return;
+               procheader_get_header_fields(fp, hentry);
                fclose(fp);
-               return NULL;
-       }
 
-       if (!MSG_IS_ENCRYPTED(msginfo->flags) &&
-           rfc2015_is_encrypted(mimeinfo_)) {
-               MSG_SET_TMP_FLAGS(msginfo->flags, MSG_ENCRYPTED);
-       }
+#define SET_FILTER_KEY(hstr, idx)      \
+{                                      \
+       *header = g_strdup(hstr);       \
+       *key = hentry[idx].body;        \
+       hentry[idx].body = NULL;        \
+}
 
-       if (MSG_IS_ENCRYPTED(msginfo->flags) &&
-           (!msginfo->plaintext_file || msginfo->decryption_failed)) {
-               rfc2015_decrypt_message(msginfo, mimeinfo_, fp);
-               if (msginfo->plaintext_file &&
-                   !msginfo->decryption_failed) {
-                       fclose(fp);
-                       procmime_mimeinfo_free_all(mimeinfo_);
-                       if ((fp = procmsg_open_message(msginfo)) == NULL)
-                               return NULL;
-                       mimeinfo_ = procmime_scan_mime_header(fp);
-                       if (!mimeinfo_) {
-                               fclose(fp);
-                               return NULL;
+               if (hentry[H_X_BEENTHERE].body != NULL) {
+                       SET_FILTER_KEY("header \"X-BeenThere\"", H_X_BEENTHERE);
+               } else if (hentry[H_X_ML_NAME].body != NULL) {
+                       SET_FILTER_KEY("header \"X-ML-Name\"", H_X_ML_NAME);
+               } else if (hentry[H_X_LIST].body != NULL) {
+                       SET_FILTER_KEY("header \"X-List\"", H_X_LIST);
+               } else if (hentry[H_X_MAILING_LIST].body != NULL) {
+                       SET_FILTER_KEY("header \"X-Mailing-List\"", H_X_MAILING_LIST);
+               } else if (hentry[H_LIST_ID].body != NULL) {
+                       SET_FILTER_KEY("header \"List-Id\"", H_LIST_ID);
+                       extract_list_id_str(*key);
+               } else if (hentry[H_X_SEQUENCE].body != NULL) {
+                       gchar *p;
+
+                       SET_FILTER_KEY("X-Sequence", H_X_SEQUENCE);
+                       p = *key;
+                       while (*p != '\0') {
+                               while (*p != '\0' && !g_ascii_isspace(*p)) p++;
+                               while (g_ascii_isspace(*p)) p++;
+                               if (g_ascii_isdigit(*p)) {
+                                       *p = '\0';
+                                       break;
+                               }
                        }
+                       g_strstrip(*key);
+               } else if (hentry[H_SENDER].body != NULL) {
+                       SET_FILTER_KEY("header \"Sender\"", H_SENDER);
+               } else if (hentry[H_LIST_POST].body != NULL) {
+                       SET_FILTER_KEY("header \"Sender\"", H_LIST_POST);
+               } else if (msginfo->to) {
+                       *header = g_strdup("to");
+                       *key = g_strdup(msginfo->to);
+               } else if (msginfo->subject) {
+                       *header = g_strdup("subject");
+                       *key = g_strdup(msginfo->subject);
                }
-       }
 
-       if (mimeinfo) *mimeinfo = mimeinfo_;
-       return fp;
+#undef SET_FILTER_KEY
+
+               g_free(hentry[H_X_BEENTHERE].body);
+               hentry[H_X_BEENTHERE].body = NULL;
+               g_free(hentry[H_X_ML_NAME].body);
+               hentry[H_X_ML_NAME].body = NULL;
+               g_free(hentry[H_X_LIST].body);
+               hentry[H_X_LIST].body = NULL;
+               g_free(hentry[H_X_MAILING_LIST].body);
+               hentry[H_X_MAILING_LIST].body = NULL;
+               g_free(hentry[H_LIST_ID].body);
+               hentry[H_LIST_ID].body = NULL;
+               g_free(hentry[H_SENDER].body);
+               hentry[H_SENDER].body = NULL;
+               g_free(hentry[H_LIST_POST].body);
+               hentry[H_LIST_POST].body = NULL;
+
+               break;
+       case FILTER_BY_FROM:
+               *header = g_strdup("from");
+               *key = g_strdup(msginfo->from);
+               break;
+       case FILTER_BY_TO:
+               *header = g_strdup("to");
+               *key = g_strdup(msginfo->to);
+               break;
+       case FILTER_BY_SUBJECT:
+               *header = g_strdup("subject");
+               *key = g_strdup(msginfo->subject);
+               break;
+       default:
+               break;
+       }
 }
-#endif
 
-gboolean procmsg_msg_exist(MsgInfo *msginfo)
+void procmsg_empty_trash(FolderItem *trash)
 {
-       gchar *path;
-       gboolean ret;
+       GNode *node, *next;
 
-       if (!msginfo) return FALSE;
+       if (!trash || 
+           (trash->stype != F_TRASH && 
+            !folder_has_parent_of_type(trash, F_TRASH)))
+               return;
 
-       path = folder_item_get_path(msginfo->folder);
-       change_dir(path);
-       ret = !folder_item_is_msg_changed(msginfo->folder, msginfo);
-       g_free(path);
+       if (trash && trash->total_msgs > 0) {
+               GSList *mlist = folder_item_get_msg_list(trash);
+               GSList *cur;
+               for (cur = mlist ; cur != NULL ; cur = cur->next) {
+                       MsgInfo * msginfo = (MsgInfo *) cur->data;
+                       if (MSG_IS_LOCKED(msginfo->flags))
+                               continue;
+                       if (msginfo->total_size != 0 && 
+                           msginfo->size != (off_t)msginfo->total_size)
+                               partial_mark_for_delete(msginfo);
 
-       return ret;
+                       procmsg_msginfo_free(msginfo);
+               }
+               g_slist_free(mlist);
+               folder_item_remove_all_msg(trash);
+       }
+
+       if (!trash->node || !trash->node->children)
+               return;
+
+       node = trash->node->children;
+       while (node != NULL) {
+               next = node->next;
+               procmsg_empty_trash(FOLDER_ITEM(node->data));
+               node = next;
+       }
 }
 
-void procmsg_empty_trash(void)
+void procmsg_empty_all_trash(void)
 {
        FolderItem *trash;
        GList *cur;
 
        for (cur = folder_get_list(); cur != NULL; cur = cur->next) {
-               trash = FOLDER(cur->data)->trash;
-               if (trash && trash->total > 0)
-                       folder_item_remove_all_msg(trash);
+               Folder *folder = FOLDER(cur->data);
+               trash = folder->trash;
+               procmsg_empty_trash(trash);
+               if (folder->account && folder->account->set_trash_folder && 
+                   folder_find_item_from_identifier(folder->account->trash_folder))
+                       procmsg_empty_trash(
+                               folder_find_item_from_identifier(folder->account->trash_folder));
+       }
+}
+
+static PrefsAccount *procmsg_get_account_from_file(const gchar *file)
+{
+       PrefsAccount *mailac = NULL;
+       FILE *fp;
+       int hnum;
+       gchar buf[BUFFSIZE];
+       static HeaderEntry qentry[] = {{"S:",    NULL, FALSE},
+                                      {"SSV:",  NULL, FALSE},
+                                      {"R:",    NULL, FALSE},
+                                      {"NG:",   NULL, FALSE},
+                                      {"MAID:", NULL, FALSE},
+                                      {"NAID:", NULL, FALSE},
+                                      {"SCF:",  NULL, FALSE},
+                                      {"RMID:", NULL, FALSE},
+                                      {"FMID:", NULL, FALSE},
+                                      {"X-Sylpheed-Privacy-System:", NULL, FALSE},
+                                      {"X-Sylpheed-Encrypt:", NULL, FALSE},
+                                      {"X-Sylpheed-Encrypt-Data:", NULL, FALSE},
+                                      {NULL,    NULL, FALSE}};
+       
+       g_return_val_if_fail(file != NULL, NULL);
+
+       if ((fp = g_fopen(file, "rb")) == NULL) {
+               FILE_OP_ERROR(file, "fopen");
+               return NULL;
+       }
+
+       while ((hnum = procheader_get_one_field(buf, sizeof(buf), fp, qentry))
+              != -1) {
+               gchar *p = buf + strlen(qentry[hnum].name);
+
+               if (hnum == Q_MAIL_ACCOUNT_ID) {
+                       mailac = account_find_from_id(atoi(p));
+                       break;
+               }
+       }
+       fclose(fp);
+       return mailac;
+}
+
+static GSList *procmsg_list_sort_by_account(FolderItem *queue, GSList *list)
+{
+       GSList *result = NULL;
+       GSList *orig = NULL;
+       PrefsAccount *last_account = NULL;
+       MsgInfo *msg = NULL;
+       GSList *cur = NULL;
+       gboolean nothing_to_sort = TRUE;
+
+       if (!list)
+               return NULL;
+
+       orig = g_slist_copy(list);
+       
+       msg = (MsgInfo *)orig->data;
+       
+       for (cur = orig; cur; cur = cur->next)
+               debug_print("sort before %s\n", ((MsgInfo *)cur->data)->from);
+       
+       debug_print("\n");
+
+parse_again:   
+       nothing_to_sort = TRUE;
+       cur = orig;
+       while (cur) {
+               gchar *file = NULL;
+               PrefsAccount *ac = NULL;
+               msg = (MsgInfo *)cur->data;
+               file = folder_item_fetch_msg(queue, msg->msgnum);
+               ac = procmsg_get_account_from_file(file);
+               g_free(file);
+
+               if (last_account == NULL || (ac != NULL && ac == last_account)) {
+                       result = g_slist_append(result, msg);
+                       orig = g_slist_remove(orig, msg);
+                       last_account = ac;
+                       nothing_to_sort = FALSE;
+                       goto parse_again;
+               }
+               cur = cur->next;
+       }
+       
+       if (orig || g_slist_length(orig)) {
+               if (!last_account && nothing_to_sort) {
+                       /* can't find an account for the rest of the list */
+                       cur = orig;
+                       while (cur) {
+                               result = g_slist_append(result, cur->data);
+                               cur = cur->next;
+                       }
+               } else {
+                       last_account = NULL;
+                       goto parse_again;
+               }
+       }
+       
+       g_slist_free(orig);
+       
+       for (cur = result; cur; cur = cur->next)
+               debug_print("sort after  %s\n", ((MsgInfo *)cur->data)->from);
+
+       debug_print("\n");
+
+       return result;
+}
+
+static gboolean procmsg_is_last_for_account(FolderItem *queue, MsgInfo *msginfo, GSList *elem)
+{
+       gchar *file = folder_item_fetch_msg(queue, msginfo->msgnum);
+       PrefsAccount *ac = procmsg_get_account_from_file(file);
+       GSList *cur = elem;
+       g_free(file);
+       for (cur = elem; cur; cur = cur->next) {
+               MsgInfo *cur_msginfo = (MsgInfo *)cur->data;
+               file = folder_item_fetch_msg(queue, cur_msginfo->msgnum);
+               
+               if (cur_msginfo != msginfo && !MSG_IS_LOCKED(cur_msginfo->flags)) {
+                       if (procmsg_get_account_from_file(file) == ac) {
+                               g_free(file);
+                               return FALSE;
+                       }
+               }
+               
+               g_free(file);
        }
+       return TRUE;
 }
 
+/*!
+ *\brief       Send messages in queue
+ *
+ *\param       queue Queue folder to process
+ *\param       save_msgs Unused
+ *
+ *\return      Number of messages sent, negative if an error occurred
+ *             positive if no error occurred
+ */
 gint procmsg_send_queue(FolderItem *queue, gboolean save_msgs)
 {
-       gint ret = 0;
+       gint sent = 0, err = 0;
        GSList *list, *elem;
+       GSList *sorted_list = NULL;
+       GNode *node, *next;
 
        if (!queue)
                queue = folder_get_default_queue();
@@ -873,37 +865,98 @@ gint procmsg_send_queue(FolderItem *queue, gboolean save_msgs)
        folder_item_scan(queue);
        list = folder_item_get_msg_list(queue);
 
-
-       for (elem = list; elem != NULL; elem = elem->next) {
+       /* sort the list per sender account; this helps reusing the same SMTP server */
+       sorted_list = procmsg_list_sort_by_account(queue, list);
+       
+       for (elem = sorted_list; elem != NULL; elem = elem->next) {
                gchar *file;
                MsgInfo *msginfo;
-               
+                       
                msginfo = (MsgInfo *)(elem->data);
-
-               file = folder_item_fetch_msg(queue, msginfo->msgnum);
-               if (file) {
-                       if (procmsg_send_message_queue(file) < 0) {
-                               g_warning("Sending queued message %d failed.\n", msginfo->msgnum);
-                               ret = -1;
-                       } else {
-                       /* CLAWS: 
-                        * We save in procmsg_send_message_queue because
-                        * we need the destination folder from the queue
-                        * header
-                                               
-                               if (save_msgs)
-                                       procmsg_save_to_outbox
-                                               (queue->folder->outbox,
-                                                file, TRUE);
-*/
-                               folder_item_remove_msg(queue, msginfo->msgnum);
+               if (!MSG_IS_LOCKED(msginfo->flags)) {
+                       file = folder_item_fetch_msg(queue, msginfo->msgnum);
+                       if (file) {
+                               if (procmsg_send_message_queue_full(file, 
+                                               !procmsg_is_last_for_account(queue, msginfo, elem)) < 0) {
+                                       g_warning("Sending queued message %d failed.\n", 
+                                                 msginfo->msgnum);
+                                       err++;
+                               } else {
+                                       /* CLAWS: 
+                                        * We save in procmsg_send_message_queue because
+                                        * we need the destination folder from the queue
+                                        * header
+                                                       
+                                       if (save_msgs)
+                                               procmsg_save_to_outbox
+                                                       (queue->folder->outbox,
+                                                        file, TRUE);
+                                        */
+                                       sent++; 
+                                       folder_item_remove_msg(queue, msginfo->msgnum);
+                               }
+                               g_free(file);
                        }
-                       g_free(file);
                }
+               /* FIXME: supposedly if only one message is locked, and queue
+                * is being flushed, the following free says something like 
+                * "freeing msg ## in folder (nil)". */
                procmsg_msginfo_free(msginfo);
        }
 
-       return ret;
+       g_slist_free(sorted_list);
+       folder_item_scan(queue);
+
+       if (queue->node && queue->node->children) {
+               node = queue->node->children;
+               while (node != NULL) {
+                       int res = 0;
+                       next = node->next;
+                       res = procmsg_send_queue(FOLDER_ITEM(node->data), save_msgs);
+                       if (res < 0) 
+                               err = -res;
+                       else
+                               sent += res;
+                       node = next;
+               }
+       }
+
+       return (err != 0 ? -err : sent);
+}
+
+/*!
+ *\brief       Determine if a queue folder is empty
+ *
+ *\param       queue Queue folder to process
+ *
+ *\return      TRUE if the queue folder is empty, otherwise return FALSE
+ */
+gboolean procmsg_queue_is_empty(FolderItem *queue)
+{
+       GSList *list;
+       gboolean res = FALSE;
+       if (!queue)
+               queue = folder_get_default_queue();
+       g_return_val_if_fail(queue != NULL, TRUE);
+
+       folder_item_scan(queue);
+       list = folder_item_get_msg_list(queue);
+       res = (list == NULL);
+       procmsg_msg_list_free(list);
+
+       if (res == TRUE) {
+               GNode *node, *next;
+               if (queue->node && queue->node->children) {
+                       node = queue->node->children;
+                       while (node != NULL) {
+                               next = node->next;
+                               if (!procmsg_queue_is_empty(FOLDER_ITEM(node->data)))
+                                       return FALSE;
+                               node = next;
+                       }
+               }
+       }
+       return res;
 }
 
 gint procmsg_remove_special_headers(const gchar *in, const gchar *out)
@@ -911,11 +964,11 @@ gint procmsg_remove_special_headers(const gchar *in, const gchar *out)
        FILE *fp, *outfp;
        gchar buf[BUFFSIZE];
        
-       if ((fp = fopen(in, "rb")) == NULL) {
+       if ((fp = g_fopen(in, "rb")) == NULL) {
                FILE_OP_ERROR(in, "fopen");
                return -1;
        }
-       if ((outfp = fopen(out, "wb")) == NULL) {
+       if ((outfp = g_fopen(out, "wb")) == NULL) {
                FILE_OP_ERROR(out, "fopen");
                fclose(fp);
                return -1;
@@ -933,7 +986,8 @@ gint procmsg_save_to_outbox(FolderItem *outbox, const gchar *file,
                            gboolean is_queued)
 {
        gint num;
-       MsgInfo *msginfo;
+       MsgInfo *msginfo, *tmp_msginfo;
+       MsgFlags flag = {0, 0};
 
        debug_print("saving sent message...\n");
 
@@ -946,31 +1000,38 @@ gint procmsg_save_to_outbox(FolderItem *outbox, const gchar *file,
                gchar tmp[MAXPATHLEN + 1];
 
                g_snprintf(tmp, sizeof(tmp), "%s%ctmpmsg.out.%08x",
-                          get_rc_dir(), G_DIR_SEPARATOR, (guint)random());
+                          get_rc_dir(), G_DIR_SEPARATOR, (guint) rand());
                
                if (procmsg_remove_special_headers(file, tmp) !=0)
                        return -1;
 
                folder_item_scan(outbox);
-               if ((num = folder_item_add_msg(outbox, tmp, TRUE)) < 0) {
+               if ((num = folder_item_add_msg(outbox, tmp, &flag, TRUE)) < 0) {
                        g_warning("can't save message\n");
-                       unlink(tmp);
+                       g_unlink(tmp);
                        return -1;
                }
        } else {
                folder_item_scan(outbox);
-               if ((num = folder_item_add_msg(outbox, file, FALSE)) < 0) {
+               if ((num = folder_item_add_msg
+                       (outbox, file, &flag, FALSE)) < 0) {
                        g_warning("can't save message\n");
                        return -1;
                }
                return -1;
        }
-       msginfo = folder_item_get_msginfo(outbox, num);
+       msginfo = folder_item_get_msginfo(outbox, num);         /* refcnt++ */
+       tmp_msginfo = procmsg_msginfo_get_full_info(msginfo);   /* refcnt++ */ 
        if (msginfo != NULL) {
-           procmsg_msginfo_unset_flags(msginfo, ~0, 0);
-           procmsg_msginfo_free(msginfo);
+               procmsg_msginfo_unset_flags(msginfo, ~0, 0);
+               procmsg_msginfo_free(msginfo);                  /* refcnt-- */
+               /* tmp_msginfo == msginfo */
+               if (tmp_msginfo && (msginfo->dispositionnotificationto || 
+                   msginfo->returnreceiptto)) {
+                       procmsg_msginfo_set_flags(msginfo, MSG_RETRCPT_SENT, 0); 
+                       procmsg_msginfo_free(msginfo);          /* refcnt-- */
+               }       
        }
-       folder_item_update(outbox, TRUE);
 
        return 0;
 }
@@ -986,7 +1047,11 @@ void procmsg_print_message(MsgInfo *msginfo, const gchar *cmdline)
 
        g_return_if_fail(msginfo);
 
-       if ((tmpfp = procmime_get_first_text_content(msginfo)) == NULL) {
+       if (procmime_msginfo_is_encrypted(msginfo))
+               tmpfp = procmime_get_first_encrypted_text_content(msginfo);
+       else
+               tmpfp = procmime_get_first_text_content(msginfo);
+       if (tmpfp == NULL) {
                g_warning("Can't get text part\n");
                return;
        }
@@ -994,7 +1059,7 @@ void procmsg_print_message(MsgInfo *msginfo, const gchar *cmdline)
        prtmp = g_strdup_printf("%s%cprinttmp.%08x",
                                get_mime_tmp_dir(), G_DIR_SEPARATOR, id++);
 
-       if ((prfp = fopen(prtmp, "wb")) == NULL) {
+       if ((prfp = g_fopen(prtmp, "wb")) == NULL) {
                FILE_OP_ERROR(prtmp, "fopen");
                g_free(prtmp);
                fclose(tmpfp);
@@ -1021,7 +1086,7 @@ void procmsg_print_message(MsgInfo *msginfo, const gchar *cmdline)
                g_snprintf(buf, sizeof(buf) - 1, cmdline, prtmp);
        else {
                if (cmdline)
-                       g_warning("Print command line is invalid: `%s'\n",
+                       g_warning("Print command line is invalid: '%s'\n",
                                  cmdline);
                g_snprintf(buf, sizeof(buf) - 1, def_cmd, prtmp);
        }
@@ -1040,7 +1105,7 @@ MsgInfo *procmsg_msginfo_new_ref(MsgInfo *msginfo)
        return msginfo;
 }
 
-MsgInfo *procmsg_msginfo_new()
+MsgInfo *procmsg_msginfo_new(void)
 {
        MsgInfo *newmsginfo;
 
@@ -1053,6 +1118,7 @@ MsgInfo *procmsg_msginfo_new()
 MsgInfo *procmsg_msginfo_copy(MsgInfo *msginfo)
 {
        MsgInfo *newmsginfo;
+        GSList *refs;
 
        if (msginfo == NULL) return NULL;
 
@@ -1068,6 +1134,7 @@ MsgInfo *procmsg_msginfo_copy(MsgInfo *msginfo)
        MEMBCOPY(size);
        MEMBCOPY(mtime);
        MEMBCOPY(date_t);
+
        MEMBCOPY(flags);
 
        MEMBDUP(fromname);
@@ -1085,13 +1152,20 @@ MsgInfo *procmsg_msginfo_copy(MsgInfo *msginfo)
        MEMBCOPY(folder);
        MEMBCOPY(to_folder);
 
+       MEMBDUP(face);
        MEMBDUP(xface);
        MEMBDUP(dispositionnotificationto);
        MEMBDUP(returnreceiptto);
-       MEMBDUP(references);
+
+        refs = msginfo->references;
+        for (refs = msginfo->references; refs != NULL; refs = refs->next) {
+                newmsginfo->references = g_slist_prepend
+                        (newmsginfo->references, g_strdup(refs->data)); 
+        }
+        newmsginfo->references = g_slist_reverse(newmsginfo->references);
 
        MEMBCOPY(score);
-       MEMBCOPY(threadscore);
+       MEMBDUP(plaintext_file);
 
        return newmsginfo;
 }
@@ -1103,8 +1177,12 @@ MsgInfo *procmsg_msginfo_get_full_info(MsgInfo *msginfo)
 
        if (msginfo == NULL) return NULL;
 
-       file = procmsg_get_message_file(msginfo);
-       if (!file) {
+       file = procmsg_get_message_file_path(msginfo);
+       if (!file || !is_file_exist(file)) {
+               g_free(file);
+               file = procmsg_get_message_file(msginfo);
+       }
+       if (!file || !is_file_exist(file)) {
                g_warning("procmsg_msginfo_get_full_info(): can't get message file.\n");
                return NULL;
        }
@@ -1113,17 +1191,32 @@ MsgInfo *procmsg_msginfo_get_full_info(MsgInfo *msginfo)
        g_free(file);
        if (!full_msginfo) return NULL;
 
-       full_msginfo->msgnum = msginfo->msgnum;
-       full_msginfo->size = msginfo->size;
-       full_msginfo->mtime = msginfo->mtime;
-       full_msginfo->folder = msginfo->folder;
-#if USE_GPGME
-       full_msginfo->plaintext_file = g_strdup(msginfo->plaintext_file);
-       full_msginfo->decryption_failed = msginfo->decryption_failed;
-#endif
-       procmsg_msginfo_set_to_folder(full_msginfo, msginfo->to_folder);
-
-       return full_msginfo;
+       /* CLAWS: make sure we add the missing members; see: 
+        * procheader.c::procheader_get_headernames() */
+       if (!msginfo->xface)
+               msginfo->xface = g_strdup(full_msginfo->xface);
+       if (!msginfo->face)
+               msginfo->face = g_strdup(full_msginfo->face);
+       if (!msginfo->dispositionnotificationto)
+               msginfo->dispositionnotificationto = 
+                       g_strdup(full_msginfo->dispositionnotificationto);
+       if (!msginfo->returnreceiptto)
+               msginfo->returnreceiptto = g_strdup
+                       (full_msginfo->returnreceiptto);
+       if (!msginfo->partial_recv && full_msginfo->partial_recv)
+               msginfo->partial_recv = g_strdup
+                       (full_msginfo->partial_recv);
+       msginfo->total_size = full_msginfo->total_size;
+       if (!msginfo->account_server && full_msginfo->account_server)
+               msginfo->account_server = g_strdup
+                       (full_msginfo->account_server);
+       if (!msginfo->account_login && full_msginfo->account_login)
+               msginfo->account_login = g_strdup
+                       (full_msginfo->account_login);
+       msginfo->planned_download = full_msginfo->planned_download;
+       procmsg_msginfo_free(full_msginfo);
+
+       return procmsg_msginfo_new_ref(msginfo);
 }
 
 void procmsg_msginfo_free(MsgInfo *msginfo)
@@ -1134,18 +1227,16 @@ void procmsg_msginfo_free(MsgInfo *msginfo)
        if (msginfo->refcnt > 0)
                return;
 
-       debug_print("freeing msginfo %d is %s\n", msginfo->msgnum, msginfo->folder ? msginfo->folder->path : "(nil)");
-
        if (msginfo->to_folder) {
                msginfo->to_folder->op_count--;
                folder_item_update(msginfo->to_folder, F_ITEM_UPDATE_MSGCNT);
        }
 
        g_free(msginfo->fromspace);
-       g_free(msginfo->references);
        g_free(msginfo->returnreceiptto);
        g_free(msginfo->dispositionnotificationto);
        g_free(msginfo->xface);
+       g_free(msginfo->face);
 
        g_free(msginfo->fromname);
 
@@ -1159,12 +1250,22 @@ void procmsg_msginfo_free(MsgInfo *msginfo)
        g_free(msginfo->inreplyto);
        g_free(msginfo->xref);
 
+       g_free(msginfo->partial_recv);
+       g_free(msginfo->account_server);
+       g_free(msginfo->account_login);
+       
+       slist_free_strings(msginfo->references);
+       g_slist_free(msginfo->references);
+
+       g_free(msginfo->plaintext_file);
+
        g_free(msginfo);
 }
 
 guint procmsg_msginfo_memusage(MsgInfo *msginfo)
 {
        guint memusage = 0;
+       GSList *refs;
        
        memusage += sizeof(MsgInfo);
        if (msginfo->fromname)
@@ -1187,12 +1288,16 @@ guint procmsg_msginfo_memusage(MsgInfo *msginfo)
                memusage += strlen(msginfo->inreplyto);
        if (msginfo->xface)
                memusage += strlen(msginfo->xface);
+       if (msginfo->face)
+               memusage += strlen(msginfo->face);
        if (msginfo->dispositionnotificationto)
                memusage += strlen(msginfo->dispositionnotificationto);
        if (msginfo->returnreceiptto)
                memusage += strlen(msginfo->returnreceiptto);
-       if (msginfo->references)
-               memusage += strlen(msginfo->references);
+       for (refs = msginfo->references; refs; refs=refs->next) {
+               gchar *r = (gchar *)refs->data;
+               memusage += r?strlen(r):0;
+       }
        if (msginfo->fromspace)
                memusage += strlen(msginfo->fromspace);
 
@@ -1212,20 +1317,7 @@ gint procmsg_cmp_msgnum_for_sort(gconstpointer a, gconstpointer b)
        return msginfo1->msgnum - msginfo2->msgnum;
 }
 
-enum
-{
-       Q_SENDER           = 0,
-       Q_SMTPSERVER       = 1,
-       Q_RECIPIENTS       = 2,
-       Q_NEWSGROUPS       = 3,
-       Q_MAIL_ACCOUNT_ID  = 4,
-       Q_NEWS_ACCOUNT_ID  = 5,
-       Q_SAVE_COPY_FOLDER = 6,
-       Q_REPLY_MESSAGE_ID = 7,
-       Q_FWD_MESSAGE_ID   = 8
-};
-
-gint procmsg_send_message_queue(const gchar *file)
+static gint procmsg_send_message_queue_full(const gchar *file, gboolean keep_session)
 {
        static HeaderEntry qentry[] = {{"S:",    NULL, FALSE},
                                       {"SSV:",  NULL, FALSE},
@@ -1236,6 +1328,9 @@ gint procmsg_send_message_queue(const gchar *file)
                                       {"SCF:",  NULL, FALSE},
                                       {"RMID:", NULL, FALSE},
                                       {"FMID:", NULL, FALSE},
+                                      {"X-Sylpheed-Privacy-System:", NULL, FALSE},
+                                      {"X-Sylpheed-Encrypt:", NULL, FALSE},
+                                      {"X-Sylpheed-Encrypt-Data:", NULL, FALSE},
                                       {NULL,    NULL, FALSE}};
        FILE *fp;
        gint filepos;
@@ -1247,14 +1342,20 @@ gint procmsg_send_message_queue(const gchar *file)
        gchar *savecopyfolder = NULL;
        gchar *replymessageid = NULL;
        gchar *fwdmessageid = NULL;
+       gchar *privacy_system = NULL;
+       gboolean encrypt = FALSE;
+       gchar *encrypt_data = NULL;
        gchar buf[BUFFSIZE];
        gint hnum;
        PrefsAccount *mailac = NULL, *newsac = NULL;
+       gboolean save_clear_text = TRUE;
+       gchar *tmp_enc_file = NULL;
+
        int local = 0;
 
        g_return_val_if_fail(file != NULL, -1);
 
-       if ((fp = fopen(file, "rb")) == NULL) {
+       if ((fp = g_fopen(file, "rb")) == NULL) {
                FILE_OP_ERROR(file, "fopen");
                return -1;
        }
@@ -1265,10 +1366,12 @@ gint procmsg_send_message_queue(const gchar *file)
 
                switch (hnum) {
                case Q_SENDER:
-                       if (!from) from = g_strdup(p);
+                       if (from == NULL) 
+                               from = g_strdup(p);
                        break;
                case Q_SMTPSERVER:
-                       if (!smtpserver) smtpserver = g_strdup(p);
+                       if (smtpserver == NULL) 
+                               smtpserver = g_strdup(p);
                        break;
                case Q_RECIPIENTS:
                        to_list = address_list_append(to_list, p);
@@ -1283,18 +1386,84 @@ gint procmsg_send_message_queue(const gchar *file)
                        newsac = account_find_from_id(atoi(p));
                        break;
                case Q_SAVE_COPY_FOLDER:
-                       if (!savecopyfolder) savecopyfolder = g_strdup(p);
+                       if (savecopyfolder == NULL) 
+                               savecopyfolder = g_strdup(p);
                        break;
                case Q_REPLY_MESSAGE_ID:
-                       if (!replymessageid) replymessageid = g_strdup(p);
+                       if (replymessageid == NULL) 
+                               replymessageid = g_strdup(p);
                        break;
                case Q_FWD_MESSAGE_ID:
-                       if (!fwdmessageid) fwdmessageid = g_strdup(p);
+                       if (fwdmessageid == NULL) 
+                               fwdmessageid = g_strdup(p);
+                       break;
+               case Q_PRIVACY_SYSTEM:
+                       if (privacy_system == NULL) 
+                               privacy_system = g_strdup(p);
+                       break;
+               case Q_ENCRYPT:
+                       if (p[0] == '1') 
+                               encrypt = TRUE;
+                       break;
+               case Q_ENCRYPT_DATA:
+                       if (encrypt_data == NULL) 
+                               encrypt_data = g_strdup(p);
                        break;
                }
        }
        filepos = ftell(fp);
 
+       if (encrypt) {
+               MimeInfo *mimeinfo;
+
+               save_clear_text = (mailac != NULL && mailac->save_encrypted_as_clear_text);
+
+               fclose(fp);
+               fp = NULL;
+
+               mimeinfo = procmime_scan_queue_file(file);
+               if (!privacy_encrypt(privacy_system, mimeinfo, encrypt_data)
+               || (fp = my_tmpfile()) == NULL
+               ||  procmime_write_mimeinfo(mimeinfo, fp) < 0) {
+                       if (fp)
+                               fclose(fp);
+                       procmime_mimeinfo_free_all(mimeinfo);
+                       g_free(from);
+                       g_free(smtpserver);
+                       slist_free_strings(to_list);
+                       g_slist_free(to_list);
+                       slist_free_strings(newsgroup_list);
+                       g_slist_free(newsgroup_list);
+                       g_free(savecopyfolder);
+                       g_free(replymessageid);
+                       g_free(fwdmessageid);
+                       g_free(privacy_system);
+                       g_free(encrypt_data);
+                       return -1;
+               }
+               
+               rewind(fp);
+               if (!save_clear_text) {
+                       gchar *content = NULL;
+                       FILE *tmpfp = get_tmpfile_in_dir(get_mime_tmp_dir(), &tmp_enc_file);
+                       if (tmpfp) {
+                               fclose(tmpfp);
+
+                               content = file_read_stream_to_str(fp);
+                               rewind(fp);
+
+                               str_write_to_file(content, tmp_enc_file);
+                               g_free(content);
+                       } else {
+                               g_warning("couldn't get tempfile\n");
+                       }
+               } 
+               
+               procmime_mimeinfo_free_all(mimeinfo);
+               
+               filepos = 0;
+       }
+
        if (to_list) {
                debug_print("Sending message by mail\n");
                if (!from) {
@@ -1304,9 +1473,6 @@ gint procmsg_send_message_queue(const gchar *file)
                           mailac->mail_command && (* mailac->mail_command)) {
                        mailval = send_message_local(mailac->mail_command, fp);
                        local = 1;
-               } else if (prefs_common.use_extsend && prefs_common.extsend_cmd) {
-                       mailval = send_message_local(prefs_common.extsend_cmd, fp);
-                       local = 1;
                } else {
                        if (!mailac) {
                                mailac = account_find_from_smtp_server(from, smtpserver);
@@ -1318,7 +1484,7 @@ gint procmsg_send_message_queue(const gchar *file)
                        }
 
                        if (mailac)
-                               mailval = send_message_smtp(mailac, to_list, fp);
+                               mailval = send_message_smtp_full(mailac, to_list, fp, keep_session);
                        else {
                                PrefsAccount tmp_ac;
 
@@ -1331,22 +1497,10 @@ gint procmsg_send_message_queue(const gchar *file)
                                mailval = send_message_smtp(&tmp_ac, to_list, fp);
                        }
                }
-               if (mailval < 0) {
-                       if (!local)
-                               alertpanel_error_log(
-                                       _("Error occurred while sending the message to `%s'."),
-                                       mailac ? mailac->smtp_server : smtpserver);
-                       else
-                               alertpanel_error_log(
-                                       _("Error occurred while sending the message with command `%s'."),
-                                       (mailac && mailac->use_mail_command && 
-                                        mailac->mail_command && (*mailac->mail_command)) ? 
-                                               mailac->mail_command : prefs_common.extsend_cmd);
-               }
        }
 
        fseek(fp, filepos, SEEK_SET);
-       if (newsgroup_list && (newsval == 0)) {
+       if (newsgroup_list && (mailval == 0)) {
                Folder *folder;
                gchar *tmp = NULL;
                FILE *tmpfp;
@@ -1354,7 +1508,7 @@ gint procmsg_send_message_queue(const gchar *file)
                /* write to temporary file */
                tmp = g_strdup_printf("%s%ctmp%d", g_get_tmp_dir(),
                            G_DIR_SEPARATOR, (gint)file);
-               if ((tmpfp = fopen(tmp, "wb")) == NULL) {
+               if ((tmpfp = g_fopen(tmp, "wb")) == NULL) {
                        FILE_OP_ERROR(tmp, "fopen");
                        newsval = -1;
                        alertpanel_error(_("Could not create temporary file for news sending."));
@@ -1384,17 +1538,11 @@ gint procmsg_send_message_queue(const gchar *file)
                                                 newsac->nntp_server);
                                }
                        }
-                       unlink(tmp);
+                       g_unlink(tmp);
                }
                g_free(tmp);
        }
 
-       slist_free_strings(to_list);
-       g_slist_free(to_list);
-       slist_free_strings(newsgroup_list);
-       g_slist_free(newsgroup_list);
-       g_free(from);
-       g_free(smtpserver);
        fclose(fp);
 
        /* save message to outbox */
@@ -1406,8 +1554,18 @@ gint procmsg_send_message_queue(const gchar *file)
                outbox = folder_find_item_from_identifier(savecopyfolder);
                if (!outbox)
                        outbox = folder_get_default_outbox();
+                       
+               if (save_clear_text || tmp_enc_file == NULL) {
+                       procmsg_save_to_outbox(outbox, file, TRUE);
+               } else {
+                       procmsg_save_to_outbox(outbox, tmp_enc_file, FALSE);
+               }
+       }
 
-               procmsg_save_to_outbox(outbox, file, TRUE);
+       if (tmp_enc_file != NULL) {
+               g_unlink(tmp_enc_file);
+               free(tmp_enc_file);
+               tmp_enc_file = NULL;
        }
 
        if (replymessageid != NULL || fwdmessageid != NULL) {
@@ -1419,11 +1577,17 @@ gint procmsg_send_message_queue(const gchar *file)
                else
                        tokens = g_strsplit(fwdmessageid, "\x7f", 0);
                item = folder_find_item_from_identifier(tokens[0]);
-               if (item != NULL) {
+
+               /* check if queued message has valid folder and message id */
+               if (item != NULL && tokens[2] != NULL) {
                        MsgInfo *msginfo;
                        
                        msginfo = folder_item_get_msginfo(item, atoi(tokens[1]));
-                       if ((msginfo != NULL) && (strcmp(msginfo->msgid, tokens[2]) != 0)) {
+               
+                       /* check if referring message exists and has a message id */
+                       if ((msginfo != NULL) && 
+                           (msginfo->msgid != NULL) &&
+                           (strcmp(msginfo->msgid, tokens[2]) != 0)) {
                                procmsg_msginfo_free(msginfo);
                                msginfo = NULL;
                        }
@@ -1436,8 +1600,7 @@ gint procmsg_send_message_queue(const gchar *file)
                                if (replymessageid != NULL) {
                                        procmsg_msginfo_unset_flags(msginfo, MSG_FORWARDED, 0);
                                        procmsg_msginfo_set_flags(msginfo, MSG_REPLIED, 0);
-                               } 
-                               else {
+                               }  else {
                                        procmsg_msginfo_unset_flags(msginfo, MSG_REPLIED, 0);
                                        procmsg_msginfo_set_flags(msginfo, MSG_FORWARDED, 0);
                                }
@@ -1447,170 +1610,186 @@ gint procmsg_send_message_queue(const gchar *file)
                g_strfreev(tokens);
        }
 
+       g_free(from);
+       g_free(smtpserver);
+       slist_free_strings(to_list);
+       g_slist_free(to_list);
+       slist_free_strings(newsgroup_list);
+       g_slist_free(newsgroup_list);
        g_free(savecopyfolder);
        g_free(replymessageid);
        g_free(fwdmessageid);
-       
+       g_free(privacy_system);
+       g_free(encrypt_data);
+
        return (newsval != 0 ? newsval : mailval);
 }
 
-#define CHANGE_FLAGS(msginfo) \
-{ \
-if (msginfo->folder->folder->change_flags != NULL) \
-msginfo->folder->folder->change_flags(msginfo->folder->folder, \
-                                     msginfo->folder, \
-                                     msginfo); \
+gint procmsg_send_message_queue(const gchar *file)
+{
+       return procmsg_send_message_queue_full(file, FALSE);
 }
 
-void procmsg_msginfo_set_flags(MsgInfo *msginfo, MsgPermFlags perm_flags, MsgTmpFlags tmp_flags)
+static void update_folder_msg_counts(FolderItem *item, MsgInfo *msginfo, MsgPermFlags old_flags)
 {
-       FolderItem *item;
-       MsgInfoUpdate msginfo_update;
+       MsgPermFlags new_flags = msginfo->flags.perm_flags;
 
-       g_return_if_fail(msginfo != NULL);
-       item = msginfo->folder;
-       g_return_if_fail(item != NULL);
-       
-       debug_print("Setting flags for message %d in folder %s\n", msginfo->msgnum, item->path);
+       /* NEW flag */
+       if (!(old_flags & MSG_NEW) && (new_flags & MSG_NEW)) {
+               item->new_msgs++;
+       }
 
-       /* if new flag is set */
-       if ((perm_flags & MSG_NEW) && !MSG_IS_NEW(msginfo->flags) &&
-          !MSG_IS_IGNORE_THREAD(msginfo->flags)) {
-               item->new++;
+       if ((old_flags & MSG_NEW) && !(new_flags & MSG_NEW)) {
+               item->new_msgs--;
        }
 
-       /* if unread flag is set */
-       if ((perm_flags & MSG_UNREAD) && !MSG_IS_UNREAD(msginfo->flags) &&
-          !MSG_IS_IGNORE_THREAD(msginfo->flags)) {
-               item->unread++;
+       /* UNREAD flag */
+       if (!(old_flags & MSG_UNREAD) && (new_flags & MSG_UNREAD)) {
+               item->unread_msgs++;
+               if (procmsg_msg_has_marked_parent(msginfo))
+                       item->unreadmarked_msgs++;
        }
 
-       if (!MSG_IS_UNREAD(msginfo->flags) &&(perm_flags & MSG_UNREAD)
-       && procmsg_msg_has_marked_parent(msginfo)) {
-               item->unreadmarked++;
+       if ((old_flags & MSG_UNREAD) && !(new_flags & MSG_UNREAD)) {
+               item->unread_msgs--;
+               if (procmsg_msg_has_marked_parent(msginfo))
+                       item->unreadmarked_msgs--;
        }
        
-       if (!MSG_IS_MARKED(msginfo->flags) && (perm_flags & MSG_MARKED)) {
+       /* MARK flag */
+       if (!(old_flags & MSG_MARKED) && (new_flags & MSG_MARKED)) {
                procmsg_update_unread_children(msginfo, TRUE);
+               item->marked_msgs++;
        }
 
+       if ((old_flags & MSG_MARKED) && !(new_flags & MSG_MARKED)) {
+               procmsg_update_unread_children(msginfo, FALSE);
+               item->marked_msgs--;
+       }
+}
 
-       /* if ignore thread flag is set */
-       if ((perm_flags & MSG_IGNORE_THREAD) && !MSG_IS_IGNORE_THREAD(msginfo->flags)) {
-               if (MSG_IS_NEW(msginfo->flags) || (perm_flags & MSG_NEW)) {
-                       item->new--;
-               }
-               if (MSG_IS_UNREAD(msginfo->flags) || (perm_flags & MSG_UNREAD)) {
-                       item->unread--;
-               }
-               if ((perm_flags & MSG_UNREAD) || (MSG_IS_UNREAD(msginfo->flags)
-               && procmsg_msg_has_marked_parent(msginfo))) {
-                       item->unreadmarked--;
-               }
-               if ((perm_flags & MSG_MARKED) || (MSG_IS_MARKED(msginfo->flags)
-               && !MSG_IS_IGNORE_THREAD(msginfo->flags))) {
-                       procmsg_update_unread_children(msginfo, FALSE);
-               }
+void procmsg_msginfo_set_flags(MsgInfo *msginfo, MsgPermFlags perm_flags, MsgTmpFlags tmp_flags)
+{
+       FolderItem *item;
+       MsgInfoUpdate msginfo_update;
+       MsgPermFlags perm_flags_new, perm_flags_old;
+       MsgTmpFlags tmp_flags_old;
 
+       g_return_if_fail(msginfo != NULL);
+       item = msginfo->folder;
+       g_return_if_fail(item != NULL);
+       
+       debug_print("Setting flags for message %d in folder %s\n", msginfo->msgnum, item->path);
+
+       /* Perm Flags handling */
+       perm_flags_old = msginfo->flags.perm_flags;
+       perm_flags_new = msginfo->flags.perm_flags | perm_flags;
+       if ((perm_flags & MSG_IGNORE_THREAD) || (perm_flags_old & MSG_IGNORE_THREAD)) {
+               perm_flags_new &= ~(MSG_NEW | MSG_UNREAD);
        }
 
-       if (MSG_IS_IMAP(msginfo->flags))
-               imap_msg_set_perm_flags(msginfo, perm_flags);
+       if (perm_flags_old != perm_flags_new) {
+               folder_item_change_msg_flags(msginfo->folder, msginfo, perm_flags_new);
 
-       msginfo->flags.perm_flags |= perm_flags;
-       msginfo->flags.tmp_flags |= tmp_flags;
+               update_folder_msg_counts(item, msginfo, perm_flags_old);
 
-       msginfo_update.msginfo = msginfo;
-       hooks_invoke(MSGINFO_UPDATE_HOOKLIST, &msginfo_update);
-       folder_item_update(msginfo->folder, F_ITEM_UPDATE_MSGCNT);
+       }
+
+       /* Tmp flags handling */
+       tmp_flags_old = msginfo->flags.tmp_flags;
+       msginfo->flags.tmp_flags |= tmp_flags;
 
-       CHANGE_FLAGS(msginfo);
-       procmsg_msginfo_write_flags(msginfo);
+       /* update notification */
+       if ((perm_flags_old != perm_flags_new) || (tmp_flags_old != msginfo->flags.tmp_flags)) {
+               msginfo_update.msginfo = msginfo;
+               msginfo_update.flags = MSGINFO_UPDATE_FLAGS;
+               hooks_invoke(MSGINFO_UPDATE_HOOKLIST, &msginfo_update);
+               folder_item_update(msginfo->folder, F_ITEM_UPDATE_MSGCNT);
+       }
 }
 
 void procmsg_msginfo_unset_flags(MsgInfo *msginfo, MsgPermFlags perm_flags, MsgTmpFlags tmp_flags)
 {
        FolderItem *item;
        MsgInfoUpdate msginfo_update;
+       MsgPermFlags perm_flags_new, perm_flags_old;
+       MsgTmpFlags tmp_flags_old;
 
        g_return_if_fail(msginfo != NULL);
        item = msginfo->folder;
-       g_return_if_fail(item != NULL); 
+       g_return_if_fail(item != NULL);
        
        debug_print("Unsetting flags for message %d in folder %s\n", msginfo->msgnum, item->path);
 
-       /* if new flag is unset */
-       if ((perm_flags & MSG_NEW) && MSG_IS_NEW(msginfo->flags) &&
-          !MSG_IS_IGNORE_THREAD(msginfo->flags)) {
-               item->new--;
-       }
-
-       /* if unread flag is unset */
-       if ((perm_flags & MSG_UNREAD) && MSG_IS_UNREAD(msginfo->flags) &&
-          !MSG_IS_IGNORE_THREAD(msginfo->flags)) {
-               item->unread--;
-       }
+       /* Perm Flags handling */
+       perm_flags_old = msginfo->flags.perm_flags;
+       perm_flags_new = msginfo->flags.perm_flags & ~perm_flags;
        
-       if (MSG_IS_UNREAD(msginfo->flags) && (perm_flags & MSG_UNREAD)
-       && !MSG_IS_IGNORE_THREAD(msginfo->flags)
-       && procmsg_msg_has_marked_parent(msginfo)) {
-               item->unreadmarked--;
-       }
+       if (perm_flags_old != perm_flags_new) {
+               folder_item_change_msg_flags(msginfo->folder, msginfo, perm_flags_new);
 
-       if (MSG_IS_MARKED(msginfo->flags) && (perm_flags & MSG_MARKED)
-       && !MSG_IS_IGNORE_THREAD(msginfo->flags)) {
-               procmsg_update_unread_children(msginfo, FALSE);
+               update_folder_msg_counts(item, msginfo, perm_flags_old);
+
+               msginfo_update.msginfo = msginfo;
+               msginfo_update.flags = MSGINFO_UPDATE_FLAGS;
+               hooks_invoke(MSGINFO_UPDATE_HOOKLIST, &msginfo_update);
+               folder_item_update(msginfo->folder, F_ITEM_UPDATE_MSGCNT);
        }
 
-       /* if ignore thread flag is unset */
-       if ((perm_flags & MSG_IGNORE_THREAD) && MSG_IS_IGNORE_THREAD(msginfo->flags)) {
-               if (MSG_IS_NEW(msginfo->flags) && !(perm_flags & MSG_NEW)) {
-                       item->new++;
-               }
-               if (MSG_IS_UNREAD(msginfo->flags) && !(perm_flags & MSG_UNREAD)) {
-                       item->unread++;
-               }
-               if (MSG_IS_UNREAD(msginfo->flags) && !(perm_flags & MSG_UNREAD)
-               && procmsg_msg_has_marked_parent(msginfo)) {
-                       item->unreadmarked++;
-               }
-               if (MSG_IS_MARKED(msginfo->flags) && !(perm_flags & MSG_MARKED)) {
-                       procmsg_update_unread_children(msginfo, TRUE);
-               }
+       /* Tmp flags hanlding */
+       tmp_flags_old = msginfo->flags.tmp_flags;
+       msginfo->flags.tmp_flags &= ~tmp_flags;
 
+       /* update notification */
+       if ((perm_flags_old != perm_flags_new) || (tmp_flags_old != msginfo->flags.tmp_flags)) {
+               msginfo_update.msginfo = msginfo;
+               msginfo_update.flags = MSGINFO_UPDATE_FLAGS;
+               hooks_invoke(MSGINFO_UPDATE_HOOKLIST, &msginfo_update);
+               folder_item_update(msginfo->folder, F_ITEM_UPDATE_MSGCNT);
        }
+}
 
-       if (MSG_IS_IMAP(msginfo->flags))
-               imap_msg_unset_perm_flags(msginfo, perm_flags);
+void procmsg_msginfo_change_flags(MsgInfo *msginfo, 
+                               MsgPermFlags add_perm_flags, MsgTmpFlags add_tmp_flags,
+                               MsgPermFlags rem_perm_flags, MsgTmpFlags rem_tmp_flags)
+{
+       FolderItem *item;
+       MsgInfoUpdate msginfo_update;
+       MsgPermFlags perm_flags_new, perm_flags_old;
+       MsgTmpFlags tmp_flags_old;
 
-       msginfo->flags.perm_flags &= ~perm_flags;
-       msginfo->flags.tmp_flags &= ~tmp_flags;
+       g_return_if_fail(msginfo != NULL);
+       item = msginfo->folder;
+       g_return_if_fail(item != NULL);
+       
+       debug_print("Changing flags for message %d in folder %s\n", msginfo->msgnum, item->path);
 
-       msginfo_update.msginfo = msginfo;
-       hooks_invoke(MSGINFO_UPDATE_HOOKLIST, &msginfo_update);
-       folder_item_update(msginfo->folder, F_ITEM_UPDATE_MSGCNT);
+       /* Perm Flags handling */
+       perm_flags_old = msginfo->flags.perm_flags;
+       perm_flags_new = (msginfo->flags.perm_flags & ~rem_perm_flags) | add_perm_flags;
+       if ((add_perm_flags & MSG_IGNORE_THREAD) || (perm_flags_old & MSG_IGNORE_THREAD)) {
+               perm_flags_new &= ~(MSG_NEW | MSG_UNREAD);
+       }
 
-       CHANGE_FLAGS(msginfo);
-       procmsg_msginfo_write_flags(msginfo);
-}
+       if (perm_flags_old != perm_flags_new) {
+               folder_item_change_msg_flags(msginfo->folder, msginfo, perm_flags_new);
 
-void procmsg_msginfo_write_flags(MsgInfo *msginfo)
-{
-       gchar *destdir;
-       FILE *fp;
+               update_folder_msg_counts(item, msginfo, perm_flags_old);
 
-       destdir = folder_item_get_path(msginfo->folder);
-       if (!is_dir_exist(destdir))
-               make_dir_hier(destdir);
+       }
 
-       if ((fp = procmsg_open_mark_file(destdir, TRUE))) {
-               procmsg_write_flags(msginfo, fp);
-               fclose(fp);
-       } else {
-               g_warning("Can't open mark file.\n");
+       /* Tmp flags handling */
+       tmp_flags_old = msginfo->flags.tmp_flags;
+       msginfo->flags.tmp_flags &= ~rem_tmp_flags;
+       msginfo->flags.tmp_flags |= add_tmp_flags;
+
+       /* update notification */
+       if ((perm_flags_old != perm_flags_new) || (tmp_flags_old != msginfo->flags.tmp_flags)) {
+               msginfo_update.msginfo = msginfo;
+               msginfo_update.flags = MSGINFO_UPDATE_FLAGS;
+               hooks_invoke(MSGINFO_UPDATE_HOOKLIST, &msginfo_update);
+               folder_item_update(msginfo->folder, F_ITEM_UPDATE_MSGCNT);
        }
-       
-       g_free(destdir);
 }
 
 /*!
@@ -1746,9 +1925,9 @@ void procmsg_update_unread_children(MsgInfo *info, gboolean newly_marked)
                MsgInfo *tmp = (MsgInfo *)cur->data;
                if(MSG_IS_UNREAD(tmp->flags) && !MSG_IS_IGNORE_THREAD(tmp->flags)) {
                        if(newly_marked) 
-                               info->folder->unreadmarked++;
+                               info->folder->unreadmarked_msgs++;
                        else
-                               info->folder->unreadmarked--;
+                               info->folder->unreadmarked_msgs--;
                        folder_item_update(info->folder, F_ITEM_UPDATE_MSGCNT);
                }
                procmsg_msginfo_free(tmp);
@@ -1774,3 +1953,70 @@ void procmsg_msginfo_set_to_folder(MsgInfo *msginfo, FolderItem *to_folder)
                folder_item_update(msginfo->to_folder, F_ITEM_UPDATE_MSGCNT);
        }
 }
+
+/**
+ * Apply filtering actions to the msginfo
+ *
+ * \param msginfo The MsgInfo describing the message that should be filtered
+ * \return TRUE if the message was moved and MsgInfo is now invalid,
+ *         FALSE otherwise
+ */
+gboolean procmsg_msginfo_filter(MsgInfo *msginfo)
+{
+       MailFilteringData mail_filtering_data;
+                       
+       mail_filtering_data.msginfo = msginfo;                  
+       if (hooks_invoke(MAIL_FILTERING_HOOKLIST, &mail_filtering_data)) {
+               hooks_invoke(MAIL_POSTFILTERING_HOOKLIST, msginfo);
+               return TRUE;
+       }
+
+       /* filter if enabled in prefs or move to inbox if not */
+       if((filtering_rules != NULL) &&
+          filter_message_by_msginfo(filtering_rules, msginfo)) {
+               hooks_invoke(MAIL_POSTFILTERING_HOOKLIST, msginfo);
+               return TRUE;
+       }
+               
+       hooks_invoke(MAIL_POSTFILTERING_HOOKLIST, msginfo);
+       return FALSE;
+}
+
+MsgInfo *procmsg_msginfo_new_from_mimeinfo(MsgInfo *src_msginfo, MimeInfo *mimeinfo)
+{
+       MsgInfo *tmp_msginfo = NULL;
+       MsgFlags flags = {0, 0};
+       gchar *tmpfile = get_tmp_file();
+       FILE *fp = g_fopen(tmpfile, "wb");
+       
+       if (!mimeinfo || mimeinfo->type != MIMETYPE_MESSAGE ||
+           g_ascii_strcasecmp(mimeinfo->subtype, "rfc822")) {
+               g_warning("procmsg_msginfo_new_from_mimeinfo(): unsuitable mimeinfo");
+               if (fp) 
+                       fclose(fp);
+               g_free(tmpfile);
+               return NULL;
+       }
+       
+       if (fp && procmime_write_mimeinfo(mimeinfo, fp) >= 0) {
+               fclose(fp);
+               fp = NULL;
+               tmp_msginfo = procheader_parse_file(
+                       tmpfile, flags, 
+                       TRUE, FALSE);
+       }
+       if (fp)
+               fclose(fp);
+
+       if (tmp_msginfo != NULL) {
+               if (src_msginfo)
+                       tmp_msginfo->folder = src_msginfo->folder;
+               tmp_msginfo->plaintext_file = g_strdup(tmpfile);
+       } else {
+               g_warning("procmsg_msginfo_new_from_mimeinfo(): Can't generate new msginfo");
+       }
+
+       g_free(tmpfile);
+
+       return tmp_msginfo;
+}