update subject threading description
[claws.git] / src / procmsg.c
index f1cd5a3d7e1d30b117592c60b4295148a952e714..b8cbc6c6099fb77be3f7c8c13b0f470f6648c0a9 100644 (file)
 #include <glib.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"
 #endif
 #include "alertpanel.h"
 #include "news.h"
-#include "imap.h"
 #include "hooks.h"
-
-typedef struct _FlagInfo       FlagInfo;
-
-struct _FlagInfo
-{
-       guint    msgnum;
-       MsgFlags flags;
-};
-
-static GHashTable *procmsg_read_mark_file      (const gchar    *folder);
-void   procmsg_msginfo_write_flags             (MsgInfo        *msginfo);
-static void procmsg_update_unread_children (MsgInfo *info, gboolean newly_marked);
+#include "msgcache.h"
 
 GHashTable *procmsg_msg_hash_table_create(GSList *mlist)
 {
@@ -100,241 +91,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;
@@ -362,199 +118,126 @@ 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)
+static gboolean procmsg_ignore_node(GNode *node, gpointer data)
 {
-       FILE *fp;
-       GHashTable *mark_table = NULL;
-       gint num;
-       MsgFlags *flags;
-       MsgPermFlags perm_flags;
-
-       if ((fp = procmsg_open_mark_file(folder, FALSE)) == NULL)
-               return NULL;
-
-       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;
-
-               flags = g_hash_table_lookup(mark_table, GUINT_TO_POINTER(num));
-               if (flags != NULL)
-                       g_free(flags);
-
-               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));
-               }
-       }
+       MsgInfo *msginfo = (MsgInfo *)node->data;
+       
+       procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
+       procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
 
-       fclose(fp);
-       return mark_table;
+       return FALSE;
 }
 
-FILE *procmsg_open_mark_file(const gchar *folder, gboolean append)
-{
-       gchar *markfile;
-       FILE *fp;
-       gint ver;
+/* CLAWS subject threading:
+  
+  in the first round it inserts subject lines in a 
+  relation (subject <-> node)
 
-       markfile = g_strconcat(folder, G_DIR_SEPARATOR_S, MARK_FILE, 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)
+*/  
 
-       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;
-       }
+static void subject_relation_insert(GRelation *relation, GNode *node)
+{
+       gchar *subject;
+       MsgInfo *msginfo;
 
-       /* read mode */
-       if (append == FALSE) {
-               g_free(markfile);
-               return fp;
-       }
+       g_return_if_fail(relation != NULL);
+       g_return_if_fail(node != NULL);
+       msginfo = (MsgInfo *) node->data;
+       g_return_if_fail(msginfo != 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);
-               }
-       }
+       subject = msginfo->subject;
+       if (subject == NULL)
+               return;
+       subject += subject_get_prefix_length(subject);
 
-       g_free(markfile);
-       return fp;
+       g_relation_insert(relation, subject, node);
 }
 
-static gboolean procmsg_ignore_node(GNode *node, gpointer data)
+static GNode *subject_relation_lookup(GRelation *relation, MsgInfo *msginfo)
 {
-       MsgInfo *msginfo = (MsgInfo *)node->data;
+       gchar *subject;
+       GTuples *tuples;
+       GNode *node = NULL;
+    
+       g_return_val_if_fail(relation != NULL, NULL);
+
+       subject = msginfo->subject;
+       if (subject == NULL)
+               return NULL;
+       subject += subject_get_prefix_length(subject);
        
-       procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
+       tuples = g_relation_select(relation, subject, 0);
+       if (tuples == NULL)
+               return NULL;
 
-       return FALSE;
+       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_tuples_destroy(tuples);
+       return node;
 }
 
 /* return the reversed thread tree */
 GNode *procmsg_get_thread_tree(GSList *mlist)
 {
-       GNode *root, *parent, *node, *next;
+       GNode *root, *parent, *node, *next, *last;
+       GNode *prev; /* CLAWS */
        GHashTable *msgid_table;
-       GHashTable *subject_table;
+       GRelation *subject_relation;
        MsgInfo *msginfo;
        const gchar *msgid;
        const gchar *subject;
-       GNode *found_subject;
 
        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;
@@ -564,88 +247,71 @@ 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);
 
-               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);
-                       }       
+               /* CLAWS: add subject to relation (without prefix) */
+               if (prefs_common.thread_by_subject) {
+                       subject_relation_insert(subject_relation, node);
                }
        }
 
        /* complete the unfinished threads */
        for (node = root->children; node != NULL; ) {
+               prev = node->prev;      /* CLAWS: need the last node */
+               parent = NULL;
                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) {
-                       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 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);
+                       }                               
                }
+               last = (next == NULL) ? prev : node;
                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 */
-       for (node = root->children; 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 (prefs_common.thread_by_subject) {
+               for (node = last; node && node != NULL;) {
+                       next = node->prev;
+                       msginfo = (MsgInfo *) node->data;
+                       
+                       /* may not parentize if parent was delivered after childs */
+                       if (subject != msginfo->subject)
+                               parent = subject_relation_lookup(subject_relation, msginfo);
+                       else
+                               parent = NULL; 
+                       
+                       /* 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);
-                               /* 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);
+                       node = next;
+               }       
+       }
+       
+       g_relation_destroy(subject_relation);
        g_hash_table_destroy(msgid_table);
 
        return root;
@@ -669,7 +335,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;
@@ -679,7 +345,7 @@ void procmsg_move_messages(GSList *mlist)
        }
 
        if (movelist) {
-               folder_item_move_msgs_with_dest(dest, movelist);
+               folder_item_move_msgs(dest, movelist);
                g_slist_free(movelist);
        }
 
@@ -704,7 +370,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;
@@ -714,7 +380,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);
        }
 
@@ -723,17 +389,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;
@@ -752,6 +415,50 @@ gchar *procmsg_get_message_file(MsgInfo *msginfo)
        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;
@@ -791,6 +498,7 @@ FILE *procmsg_open_message_decrypted(MsgInfo *msginfo, MimeInfo **mimeinfo)
 {
        FILE *fp;
        MimeInfo *mimeinfo_;
+       glong fpos;
 
        g_return_val_if_fail(msginfo != NULL, NULL);
 
@@ -810,7 +518,9 @@ FILE *procmsg_open_message_decrypted(MsgInfo *msginfo, MimeInfo **mimeinfo)
        }
 
        if (MSG_IS_ENCRYPTED(msginfo->flags) &&
-           (!msginfo->plaintext_file || msginfo->decryption_failed)) {
+           !msginfo->plaintext_file &&
+           !msginfo->decryption_failed) {
+               fpos = ftell(fp);
                rfc2015_decrypt_message(msginfo, mimeinfo_, fp);
                if (msginfo->plaintext_file &&
                    !msginfo->decryption_failed) {
@@ -823,6 +533,9 @@ FILE *procmsg_open_message_decrypted(MsgInfo *msginfo, MimeInfo **mimeinfo)
                                fclose(fp);
                                return NULL;
                        }
+               } else {
+                       if (fseek(fp, fpos, SEEK_SET) < 0)
+                               perror("fseek");
                }
        }
 
@@ -846,6 +559,112 @@ gboolean procmsg_msg_exist(MsgInfo *msginfo)
        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},
+                                      {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
+       };
+
+       FILE *fp;
+
+       g_return_if_fail(msginfo != NULL);
+       g_return_if_fail(header != NULL);
+       g_return_if_fail(key != NULL);
+
+       *header = NULL;
+       *key = NULL;
+
+       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);
+
+#define SET_FILTER_KEY(hstr, idx)      \
+{                                      \
+       *header = g_strdup(hstr);       \
+       *key = hentry[idx].body;        \
+       hentry[idx].body = 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' && !isspace(*p)) p++;
+                               while (isspace(*p)) p++;
+                               if (isdigit(*p)) {
+                                       *p = '\0';
+                                       break;
+                               }
+                       }
+                       g_strstrip(*key);
+               } else if (msginfo->subject) {
+                       *header = g_strdup("subject");
+                       *key = g_strdup(msginfo->subject);
+               }
+
+#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;
+
+               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;
+       }
+}
+
 void procmsg_empty_trash(void)
 {
        FolderItem *trash;
@@ -853,14 +672,23 @@ void procmsg_empty_trash(void)
 
        for (cur = folder_get_list(); cur != NULL; cur = cur->next) {
                trash = FOLDER(cur->data)->trash;
-               if (trash && trash->total > 0)
+               if (trash && trash->total_msgs > 0)
                        folder_item_remove_all_msg(trash);
        }
 }
 
+/*!
+ *\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 ret = 1, count = 0;
        GSList *list, *elem;
 
        if (!queue)
@@ -870,37 +698,42 @@ 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) {
                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(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);
+                                        */
+                                       count++; 
+                                       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;
+       return ret * count;
 }
 
 gint procmsg_remove_special_headers(const gchar *in, const gchar *out)
@@ -930,7 +763,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");
 
@@ -949,23 +783,31 @@ gint procmsg_save_to_outbox(FolderItem *outbox, const gchar *file,
                        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);
                        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);
 
@@ -1037,7 +879,7 @@ MsgInfo *procmsg_msginfo_new_ref(MsgInfo *msginfo)
        return msginfo;
 }
 
-MsgInfo *procmsg_msginfo_new()
+MsgInfo *procmsg_msginfo_new(void)
 {
        MsgInfo *newmsginfo;
 
@@ -1110,6 +952,20 @@ MsgInfo *procmsg_msginfo_get_full_info(MsgInfo *msginfo)
        g_free(file);
        if (!full_msginfo) return NULL;
 
+       /* 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->dispositionnotificationto)
+               msginfo->dispositionnotificationto = 
+                       g_strdup(full_msginfo->dispositionnotificationto);
+       if (!msginfo->returnreceiptto)
+               msginfo->returnreceiptto = g_strdup
+                       (full_msginfo->returnreceiptto);
+       procmsg_msginfo_free(full_msginfo);
+
+       return procmsg_msginfo_new_ref(msginfo);
+#if 0
        full_msginfo->msgnum = msginfo->msgnum;
        full_msginfo->size = msginfo->size;
        full_msginfo->mtime = msginfo->mtime;
@@ -1121,6 +977,7 @@ MsgInfo *procmsg_msginfo_get_full_info(MsgInfo *msginfo)
        procmsg_msginfo_set_to_folder(full_msginfo, msginfo->to_folder);
 
        return full_msginfo;
+#endif
 }
 
 void procmsg_msginfo_free(MsgInfo *msginfo)
@@ -1131,7 +988,7 @@ 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)");
+       debug_print("freeing msginfo %d in %s\n", msginfo->msgnum, msginfo->folder ? msginfo->folder->path : "(nil)");
 
        if (msginfo->to_folder) {
                msginfo->to_folder->op_count--;
@@ -1328,18 +1185,6 @@ 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);
@@ -1416,11 +1261,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;
                        }
@@ -1451,18 +1302,47 @@ gint procmsg_send_message_queue(const gchar *file)
        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); \
+static void update_folder_msg_counts(FolderItem *item, MsgInfo *msginfo, MsgPermFlags old_flags)
+{
+       MsgPermFlags new_flags = msginfo->flags.perm_flags;
+
+       /* NEW flag */
+       if (!(old_flags & MSG_NEW) && (new_flags & MSG_NEW)) {
+               item->new_msgs++;
+       }
+
+       if ((old_flags & MSG_NEW) && !(new_flags & MSG_NEW)) {
+               item->new_msgs--;
+       }
+
+       /* 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 ((old_flags & MSG_UNREAD) && !(new_flags & MSG_UNREAD)) {
+               item->unread_msgs--;
+               if (procmsg_msg_has_marked_parent(msginfo))
+                       item->unreadmarked_msgs--;
+       }
+       
+       /* MARK flag */
+       if (!(old_flags & MSG_MARKED) && (new_flags & MSG_MARKED)) {
+               procmsg_update_unread_children(msginfo, TRUE);
+       }
+
+       if ((old_flags & MSG_MARKED) && !(new_flags & MSG_MARKED)) {
+               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;
 
        g_return_if_fail(msginfo != NULL);
        item = msginfo->folder;
@@ -1470,144 +1350,55 @@ void procmsg_msginfo_set_flags(MsgInfo *msginfo, MsgPermFlags perm_flags, MsgTmp
        
        debug_print("Setting flags for message %d in folder %s\n", msginfo->msgnum, item->path);
 
-       /* if new flag is set */
-       if ((perm_flags & MSG_NEW) && !MSG_IS_NEW(msginfo->flags) &&
-          !MSG_IS_IGNORE_THREAD(msginfo->flags)) {
-               item->new++;
+       /* 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 unread flag is set */
-       if ((perm_flags & MSG_UNREAD) && !MSG_IS_UNREAD(msginfo->flags) &&
-          !MSG_IS_IGNORE_THREAD(msginfo->flags)) {
-               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);
-       }
+       if (perm_flags_old != perm_flags_new) {
+               folder_item_change_msg_flags(msginfo->folder, msginfo, perm_flags_new);
 
+               update_folder_msg_counts(item, msginfo, perm_flags_old);
 
-       /* 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);
-               }
-
+               msginfo_update.msginfo = msginfo;
+               hooks_invoke(MSGINFO_UPDATE_HOOKLIST, &msginfo_update);
+               folder_item_update(msginfo->folder, F_ITEM_UPDATE_MSGCNT);
        }
 
-       if (MSG_IS_IMAP(msginfo->flags))
-               imap_msg_set_perm_flags(msginfo, perm_flags);
-
-       msginfo->flags.perm_flags |= perm_flags;
+       /* Tmp flags hanlding */
        msginfo->flags.tmp_flags |= tmp_flags;
-
-       msginfo_update.msginfo = msginfo;
-       hooks_invoke(MSGINFO_UPDATE_HOOKLIST, &msginfo_update);
-       folder_item_update(msginfo->folder, F_ITEM_UPDATE_MSGCNT);
-
-       CHANGE_FLAGS(msginfo);
-       procmsg_msginfo_write_flags(msginfo);
 }
 
 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;
 
        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);
-       }
-
-       /* 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);
-               }
+               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);
        }
 
-       if (MSG_IS_IMAP(msginfo->flags))
-               imap_msg_unset_perm_flags(msginfo, perm_flags);
-
-       msginfo->flags.perm_flags &= ~perm_flags;
+       /* Tmp flags hanlding */
        msginfo->flags.tmp_flags &= ~tmp_flags;
-
-       msginfo_update.msginfo = msginfo;
-       hooks_invoke(MSGINFO_UPDATE_HOOKLIST, &msginfo_update);
-       folder_item_update(msginfo->folder, F_ITEM_UPDATE_MSGCNT);
-
-       CHANGE_FLAGS(msginfo);
-       procmsg_msginfo_write_flags(msginfo);
-}
-
-void procmsg_msginfo_write_flags(MsgInfo *msginfo)
-{
-       gchar *destdir;
-       FILE *fp;
-
-       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");
-       }
-       
-       g_free(destdir);
 }
 
 /*!
@@ -1689,33 +1480,53 @@ gboolean procmsg_msg_has_marked_parent(MsgInfo *info)
 }
 
 
-GSList *procmsg_find_children (MsgInfo *info)
+GSList *procmsg_find_children_func(MsgInfo *info, 
+                                  GSList *children, GSList *all)
 {
-       GSList *children = NULL;
-       GSList *all, *cur;
+       GSList *cur;
 
-       g_return_val_if_fail(info!=NULL, NULL);
+       g_return_val_if_fail(info!=NULL, children);
        if (info->msgid == NULL)
-               return NULL;
-       all = folder_item_get_msg_list(info->folder);
+               return children;
+
        for (cur = all; cur != NULL; cur = g_slist_next(cur)) {
                MsgInfo *tmp = (MsgInfo *)cur->data;
                if (tmp->inreplyto && !strcmp(tmp->inreplyto, info->msgid)) {
-                       GSList *grand_children;
-                       children = g_slist_prepend(children, tmp);
-                       grand_children = procmsg_find_children(tmp);
-                       children = slist_concat_unique(children, grand_children);
-                       g_slist_free(grand_children);
+                       /* Check if message is already in the list */
+                       if ((children == NULL) || 
+                           (g_slist_index(children, tmp) == -1)) {
+                               children = g_slist_prepend(children,
+                                               procmsg_msginfo_new_ref(tmp));
+                               children = procmsg_find_children_func(tmp, 
+                                                       children, 
+                                                       all);
+                       }
+               }
+       }
+       return children;
+}
+
+GSList *procmsg_find_children (MsgInfo *info)
+{
+       GSList *children;
+       GSList *all, *cur;
+
+       g_return_val_if_fail(info!=NULL, NULL);
+       all = folder_item_get_msg_list(info->folder);
+       children = procmsg_find_children_func(info, NULL, all);
+       if (children != NULL) {
+               for (cur = all; cur != NULL; cur = g_slist_next(cur)) {
+                       /* this will not free the used pointers
+                          created with procmsg_msginfo_new_ref */
+                       procmsg_msginfo_free((MsgInfo *)cur->data);
                }
-               if (tmp && tmp != info)
-                       procmsg_msginfo_free(tmp);
        }
        g_slist_free(all);
 
        return children;
 }
 
-static void procmsg_update_unread_children(MsgInfo *info, gboolean newly_marked)
+void procmsg_update_unread_children(MsgInfo *info, gboolean newly_marked)
 {
        GSList *children = procmsg_find_children(info);
        GSList *cur;
@@ -1723,9 +1534,9 @@ static 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);
@@ -1751,3 +1562,26 @@ 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))
+               return TRUE;
+
+       /* filter if enabled in prefs or move to inbox if not */
+       if((global_processing != NULL) &&
+          filter_message_by_msginfo(global_processing, msginfo))
+               return TRUE;
+
+       return FALSE;
+}