2007-07-27 [paul] 2.10.0cvs74
[claws.git] / src / procmsg.c
index ce066f08eb84ce82aece13d81eab5a900163ac1b..4f54ab73394721a09f4aba4378e863a5e2eabdfa 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,8 @@
  * GNU General Public License for more details.
  *
  * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #include "defs.h"
 #include "mainwindow.h"
 #include "summaryview.h"
 #include "log.h"
+#include "tags.h"
 #include "timing.h"
 #include "inc.h"
 
-static gint procmsg_send_message_queue_full(const gchar *file, gboolean keep_session, gchar **errstr);
-
+static gint procmsg_send_message_queue_full(const gchar *file, gboolean keep_session, gchar **errstr,
+                                           FolderItem *queue, gint msgnum, gboolean *queued_removed);
+static void procmsg_update_unread_children     (MsgInfo        *info,
+                                        gboolean        newly_marked);
 enum
 {
        Q_SENDER           = 0,
@@ -64,70 +67,13 @@ enum
        Q_PRIVACY_SYSTEM   = 9,
        Q_ENCRYPT          = 10,
        Q_ENCRYPT_DATA     = 11,
-       Q_SYLPHEED_HDRS    = 12,
+       Q_CLAWS_HDRS       = 12,
+       Q_PRIVACY_SYSTEM_OLD = 13,
+       Q_ENCRYPT_OLD        = 14,
+       Q_ENCRYPT_DATA_OLD   = 15,
+       Q_CLAWS_HDRS_OLD     = 16,
 };
 
-GHashTable *procmsg_msg_hash_table_create(GSList *mlist)
-{
-       GHashTable *msg_table;
-
-       if (mlist == NULL) return NULL;
-
-       msg_table = g_hash_table_new(NULL, g_direct_equal);
-       procmsg_msg_hash_table_append(msg_table, mlist);
-
-       return msg_table;
-}
-
-void procmsg_msg_hash_table_append(GHashTable *msg_table, GSList *mlist)
-{
-       GSList *cur;
-       MsgInfo *msginfo;
-
-       if (msg_table == NULL || mlist == NULL) return;
-
-       for (cur = mlist; cur != NULL; cur = cur->next) {
-               msginfo = (MsgInfo *)cur->data;
-
-               g_hash_table_insert(msg_table,
-                                   GUINT_TO_POINTER(msginfo->msgnum),
-                                   msginfo);
-       }
-}
-
-GHashTable *procmsg_to_folder_hash_table_create(GSList *mlist)
-{
-       GHashTable *msg_table;
-       GSList *cur;
-       MsgInfo *msginfo;
-
-       if (mlist == NULL) return NULL;
-
-       msg_table = g_hash_table_new(NULL, g_direct_equal);
-
-       for (cur = mlist; cur != NULL; cur = cur->next) {
-               msginfo = (MsgInfo *)cur->data;
-               g_hash_table_insert(msg_table, msginfo->to_folder, msginfo);
-       }
-
-       return msg_table;
-}
-
-gint procmsg_get_last_num_in_msg_list(GSList *mlist)
-{
-       GSList *cur;
-       MsgInfo *msginfo;
-       gint last = 0;
-
-       for (cur = mlist; cur != NULL; cur = cur->next) {
-               msginfo = (MsgInfo *)cur->data;
-               if (msginfo && msginfo->msgnum > last)
-                       last = msginfo->msgnum;
-       }
-
-       return last;
-}
-
 void procmsg_msg_list_free(GSList *mlist)
 {
        GSList *cur;
@@ -248,7 +194,7 @@ GNode *procmsg_get_thread_tree(GSList *mlist)
        MsgInfo *msginfo;
        const gchar *msgid;
         GSList *reflist;
-       START_TIMING("procmsg_get_thread_tree");
+       START_TIMING("");
        root = g_node_new(NULL);
        msgid_table = g_hash_table_new(g_str_hash, g_str_equal);
        
@@ -310,7 +256,7 @@ GNode *procmsg_get_thread_tree(GSList *mlist)
        }
 
        if (prefs_common.thread_by_subject) {
-               START_TIMING("procmsg_get_thread_tree(1)");
+               START_TIMING("thread by subject");
                for (node = root->children; node && node != NULL;) {
                        next = node->next;
                        msginfo = (MsgInfo *) node->data;
@@ -549,8 +495,10 @@ FILE *procmsg_open_message(MsgInfo *msginfo)
 
                while (fgets(buf, sizeof(buf), fp) != NULL) {
                        /* new way */
-                       if (!strncmp(buf, "X-Sylpheed-End-Special-Headers: 1",
-                               strlen("X-Sylpheed-End-Special-Headers:")))
+                       if ((!strncmp(buf, "X-Claws-End-Special-Headers: 1",
+                               strlen("X-Claws-End-Special-Headers:"))) ||
+                           (!strncmp(buf, "X-Sylpheed-End-Special-Headers: 1",
+                               strlen("X-Sylpheed-End-Special-Headers:"))))
                                break;
                        /* old way */
                        if (buf[0] == '\r' || buf[0] == '\n') break;
@@ -704,7 +652,7 @@ void procmsg_get_filter_keyword(MsgInfo *msginfo, gchar **header, gchar **key,
        }
 }
 
-void procmsg_empty_trash(FolderItem *trash)
+static void procmsg_empty_trash(FolderItem *trash)
 {
        GNode *node, *next;
 
@@ -718,8 +666,10 @@ void procmsg_empty_trash(FolderItem *trash)
                GSList *cur;
                for (cur = mlist ; cur != NULL ; cur = cur->next) {
                        MsgInfo * msginfo = (MsgInfo *) cur->data;
-                       if (MSG_IS_LOCKED(msginfo->flags))
+                       if (MSG_IS_LOCKED(msginfo->flags)) {
+                               procmsg_msginfo_free(msginfo);
                                continue;
+                       }
                        if (msginfo->total_size != 0 && 
                            msginfo->size != (off_t)msginfo->total_size)
                                partial_mark_for_delete(msginfo);
@@ -772,6 +722,10 @@ static PrefsAccount *procmsg_get_account_from_file(const gchar *file)
                                       {"SCF:",  NULL, FALSE},
                                       {"RMID:", NULL, FALSE},
                                       {"FMID:", NULL, FALSE},
+                                      {"X-Claws-Privacy-System:", NULL, FALSE},
+                                      {"X-Claws-Encrypt:", NULL, FALSE},
+                                      {"X-Claws-Encrypt-Data:", NULL, FALSE},
+                                      {"X-Claws-End-Special-Headers",    NULL, FALSE},
                                       {"X-Sylpheed-Privacy-System:", NULL, FALSE},
                                       {"X-Sylpheed-Encrypt:", NULL, FALSE},
                                       {"X-Sylpheed-Encrypt-Data:", NULL, FALSE},
@@ -903,7 +857,8 @@ gint procmsg_send_queue(FolderItem *queue, gboolean save_msgs, gchar **errstr)
        GNode *node, *next;
        
        if (send_queue_lock) {
-               log_error(_("Already trying to send\n"));
+               /* Avoid having to translate two similar strings */
+               log_warning(LOG_PROTOCOL, "%s\n", _("Already trying to send."));
                if (errstr) {
                        if (*errstr) g_free(*errstr);
                        *errstr = g_strdup_printf(_("Already trying to send."));
@@ -938,15 +893,17 @@ gint procmsg_send_queue(FolderItem *queue, gboolean save_msgs, gchar **errstr)
                if (!MSG_IS_LOCKED(msginfo->flags)) {
                        file = folder_item_fetch_msg(queue, msginfo->msgnum);
                        if (file) {
+                               gboolean queued_removed = FALSE;
                                if (procmsg_send_message_queue_full(file, 
                                                !procmsg_is_last_for_account(queue, msginfo, elem),
-                                               errstr) < 0) {
+                                               errstr, queue, msginfo->msgnum, &queued_removed) < 0) {
                                        g_warning("Sending queued message %d failed.\n", 
                                                  msginfo->msgnum);
                                        err++;
                                } else {
                                        sent++; 
-                                       folder_item_remove_msg(queue, msginfo->msgnum);
+                                       if (!queued_removed)
+                                               folder_item_remove_msg(queue, msginfo->msgnum);
                                }
                                g_free(file);
                        }
@@ -965,7 +922,9 @@ gint procmsg_send_queue(FolderItem *queue, gboolean save_msgs, gchar **errstr)
                while (node != NULL) {
                        int res = 0;
                        next = node->next;
+                       send_queue_lock = FALSE;
                        res = procmsg_send_queue(FOLDER_ITEM(node->data), save_msgs, errstr);
+                       send_queue_lock = TRUE;
                        if (res < 0) 
                                err = -res;
                        else
@@ -1036,8 +995,10 @@ gint procmsg_remove_special_headers(const gchar *in, const gchar *out)
        }
        while (fgets(buf, sizeof(buf), fp) != NULL) {
                /* new way */
-               if (!strncmp(buf, "X-Sylpheed-End-Special-Headers: 1",
-                       strlen("X-Sylpheed-End-Special-Headers:")))
+               if ((!strncmp(buf, "X-Claws-End-Special-Headers: 1",
+                       strlen("X-Claws-End-Special-Headers:"))) ||
+                   (!strncmp(buf, "X-Sylpheed-End-Special-Headers: 1",
+                       strlen("X-Sylpheed-End-Special-Headers:"))))
                        break;
                /* old way */
                if (buf[0] == '\r' || buf[0] == '\n') break;
@@ -1057,7 +1018,7 @@ gint procmsg_remove_special_headers(const gchar *in, const gchar *out)
        return 0;
 }
 
-gint procmsg_save_to_outbox(FolderItem *outbox, const gchar *file,
+static gint procmsg_save_to_outbox(FolderItem *outbox, const gchar *file,
                            gboolean is_queued)
 {
        gint num;
@@ -1366,6 +1327,7 @@ void procmsg_msginfo_free(MsgInfo *msginfo)
        }
        slist_free_strings(msginfo->references);
        g_slist_free(msginfo->references);
+       g_slist_free(msginfo->tags);
 
        g_free(msginfo->plaintext_file);
 
@@ -1375,7 +1337,7 @@ void procmsg_msginfo_free(MsgInfo *msginfo)
 guint procmsg_msginfo_memusage(MsgInfo *msginfo)
 {
        guint memusage = 0;
-       GSList *refs;
+       GSList *tmp;
        
        memusage += sizeof(MsgInfo);
        if (msginfo->fromname)
@@ -1396,13 +1358,17 @@ guint procmsg_msginfo_memusage(MsgInfo *msginfo)
                memusage += strlen(msginfo->msgid);
        if (msginfo->inreplyto)
                memusage += strlen(msginfo->inreplyto);
-       for (refs = msginfo->references; refs; refs=refs->next) {
-               gchar *r = (gchar *)refs->data;
-               memusage += r?strlen(r):0;
+
+       for (tmp = msginfo->references; tmp; tmp=tmp->next) {
+               gchar *r = (gchar *)tmp->data;
+               memusage += r?strlen(r):0 + sizeof(GSList);
        }
        if (msginfo->fromspace)
                memusage += strlen(msginfo->fromspace);
 
+       for (tmp = msginfo->tags; tmp; tmp=tmp->next) {
+               memusage += sizeof(GSList);
+       }
        if (msginfo->extradata) {
                memusage += sizeof(MsgInfoExtraData);
                if (msginfo->extradata->xface)
@@ -1437,20 +1403,8 @@ guint procmsg_msginfo_memusage(MsgInfo *msginfo)
        return memusage;
 }
 
-gint procmsg_cmp_msgnum_for_sort(gconstpointer a, gconstpointer b)
-{
-       const MsgInfo *msginfo1 = a;
-       const MsgInfo *msginfo2 = b;
-
-       if (!msginfo1)
-               return -1;
-       if (!msginfo2)
-               return -1;
-
-       return msginfo1->msgnum - msginfo2->msgnum;
-}
-
-static gint procmsg_send_message_queue_full(const gchar *file, gboolean keep_session, gchar **errstr)
+static gint procmsg_send_message_queue_full(const gchar *file, gboolean keep_session, gchar **errstr,
+                                           FolderItem *queue, gint msgnum, gboolean *queued_removed)
 {
        static HeaderEntry qentry[] = {{"S:",    NULL, FALSE},
                                       {"SSV:",  NULL, FALSE},
@@ -1461,6 +1415,10 @@ static gint procmsg_send_message_queue_full(const gchar *file, gboolean keep_ses
                                       {"SCF:",  NULL, FALSE},
                                       {"RMID:", NULL, FALSE},
                                       {"FMID:", NULL, FALSE},
+                                      {"X-Claws-Privacy-System:", NULL, FALSE},
+                                      {"X-Claws-Encrypt:", NULL, FALSE},
+                                      {"X-Claws-Encrypt-Data:", NULL, FALSE},
+                                      {"X-Claws-End-Special-Headers:", NULL, FALSE},
                                       {"X-Sylpheed-Privacy-System:", NULL, FALSE},
                                       {"X-Sylpheed-Encrypt:", NULL, FALSE},
                                       {"X-Sylpheed-Encrypt-Data:", NULL, FALSE},
@@ -1536,18 +1494,22 @@ static gint procmsg_send_message_queue_full(const gchar *file, gboolean keep_ses
                                fwdmessageid = g_strdup(p);
                        break;
                case Q_PRIVACY_SYSTEM:
+               case Q_PRIVACY_SYSTEM_OLD:
                        if (privacy_system == NULL) 
                                privacy_system = g_strdup(p);
                        break;
                case Q_ENCRYPT:
+               case Q_ENCRYPT_OLD:
                        if (p[0] == '1') 
                                encrypt = TRUE;
                        break;
                case Q_ENCRYPT_DATA:
+               case Q_ENCRYPT_DATA_OLD:
                        if (encrypt_data == NULL) 
                                encrypt_data = g_strdup(p);
                        break;
-               case Q_SYLPHEED_HDRS:
+               case Q_CLAWS_HDRS:
+               case Q_CLAWS_HDRS_OLD:
                        /* end of special headers reached */
                        goto send_mail; /* can't "break;break;" */
                }
@@ -1664,7 +1626,7 @@ send_mail:
                if (errstr) {
                        if (*errstr) g_free(*errstr);
                        *errstr = g_strdup(_("Couldn't determine sending informations. "
-                               "Maybe the email hasn't been generated by Sylpheed-Claws."));
+                               "Maybe the email hasn't been generated by Claws Mail."));
                }
                mailval = -1;
        }
@@ -1676,12 +1638,12 @@ send_mail:
                FILE *tmpfp;
 
                /* write to temporary file */
-               tmp = g_strdup_printf("%s%ctmp%d", g_get_tmp_dir(),
-                           G_DIR_SEPARATOR, (gint)file);
+               tmp = g_strdup_printf("%s%ctmp%p", g_get_tmp_dir(),
+                           G_DIR_SEPARATOR, file);
                if ((tmpfp = g_fopen(tmp, "wb")) == NULL) {
                        FILE_OP_ERROR(tmp, "fopen");
                        newsval = -1;
-                       alertpanel_error(_("Could not create temporary file for news sending."));
+                       alertpanel_error(_("Couldn't create temporary file for news sending."));
                } else {
                        if (change_file_mode_rw(tmpfp, tmp) < 0) {
                                FILE_OP_ERROR(tmp, "chmod");
@@ -1730,8 +1692,26 @@ send_mail:
                        outbox = folder_get_default_outbox();
                        
                if (save_clear_text || tmp_enc_file == NULL) {
-                       procmsg_save_to_outbox(outbox, file, TRUE);
+                       gboolean saved = FALSE;
+                       *queued_removed = FALSE;
+                       if (queue && msgnum > 0) {
+                               MsgInfo *queued_mail = folder_item_get_msginfo(queue, msgnum);
+                               if (folder_item_move_msg(outbox, queued_mail) >= 0) {
+                                       debug_print("moved queued mail %d to sent folder\n", msgnum);
+                                       saved = TRUE;
+                                       *queued_removed = TRUE;
+                               } else if (folder_item_copy_msg(outbox, queued_mail) >= 0) {
+                                       debug_print("copied queued mail %d to sent folder\n", msgnum);
+                                       saved = TRUE;
+                               }
+                               procmsg_msginfo_free(queued_mail);
+                       }
+                       if (!saved) {
+                               debug_print("resaving clear text queued mail to sent folder\n");
+                               procmsg_save_to_outbox(outbox, file, TRUE);
+                       }
                } else {
+                       debug_print("saving encrpyted queued mail to sent folder\n");
                        procmsg_save_to_outbox(outbox, tmp_enc_file, FALSE);
                }
        }
@@ -1771,8 +1751,13 @@ send_mail:
                        }
                        
                        if (msginfo != NULL) {
+                               MsgPermFlags to_unset = 0;
+
+                               if (prefs_common.mark_as_read_on_new_window)
+                                       to_unset = (MSG_NEW|MSG_UNREAD);
+
                                if (replymessageid != NULL) {
-                                       procmsg_msginfo_unset_flags(msginfo, MSG_FORWARDED, 0);
+                                       procmsg_msginfo_unset_flags(msginfo, to_unset|MSG_FORWARDED, 0);
                                        procmsg_msginfo_set_flags(msginfo, MSG_REPLIED, 0);
                                }  else {
                                        procmsg_msginfo_unset_flags(msginfo, MSG_REPLIED, 0);
@@ -1799,9 +1784,9 @@ send_mail:
        return (newsval != 0 ? newsval : mailval);
 }
 
-gint procmsg_send_message_queue(const gchar *file, gchar **errstr)
+gint procmsg_send_message_queue(const gchar *file, gchar **errstr, FolderItem *queue, gint msgnum, gboolean *queued_removed)
 {
-       gint result = procmsg_send_message_queue_full(file, FALSE, errstr);
+       gint result = procmsg_send_message_queue_full(file, FALSE, errstr, queue, msgnum, queued_removed);
        toolbar_main_set_sensitive(mainwindow_get_mainwindow());
        return result;
 }
@@ -1863,6 +1848,9 @@ void procmsg_msginfo_set_flags(MsgInfo *msginfo, MsgPermFlags perm_flags, MsgTmp
        if ((perm_flags & MSG_IGNORE_THREAD) || (perm_flags_old & MSG_IGNORE_THREAD)) {
                perm_flags_new &= ~(MSG_NEW | MSG_UNREAD);
        }
+       if ((perm_flags & MSG_WATCH_THREAD) || (perm_flags_old & MSG_WATCH_THREAD)) {
+               perm_flags_new &= ~(MSG_IGNORE_THREAD);
+       }
 
        if (perm_flags_old != perm_flags_new) {
                folder_item_change_msg_flags(msginfo->folder, msginfo, perm_flags_new);
@@ -1941,6 +1929,9 @@ void procmsg_msginfo_change_flags(MsgInfo *msginfo,
        if ((add_perm_flags & MSG_IGNORE_THREAD) || (perm_flags_old & MSG_IGNORE_THREAD)) {
                perm_flags_new &= ~(MSG_NEW | MSG_UNREAD);
        }
+       if ((add_perm_flags & MSG_WATCH_THREAD) || (perm_flags_old & MSG_WATCH_THREAD)) {
+               perm_flags_new &= ~(MSG_IGNORE_THREAD);
+       }
 
        if (perm_flags_old != perm_flags_new) {
                folder_item_change_msg_flags(msginfo->folder, msginfo, perm_flags_new);
@@ -1972,7 +1963,7 @@ void procmsg_msginfo_change_flags(MsgInfo *msginfo,
  *
  *\return      gboolean TRUE if perm_flags are found
  */
-gboolean procmsg_msg_has_flagged_parent_real(MsgInfo *info,
+static gboolean procmsg_msg_has_flagged_parent_real(MsgInfo *info,
                MsgPermFlags perm_flags, GHashTable *parentmsgs)
 {
        MsgInfo *tmp;
@@ -2009,7 +2000,7 @@ gboolean procmsg_msg_has_flagged_parent_real(MsgInfo *info,
 /*!
  *\brief       Callback for cleaning up hash of parentmsgs
  */
-gboolean parentmsgs_hash_remove(gpointer key,
+static gboolean parentmsgs_hash_remove(gpointer key,
                             gpointer value,
                             gpointer user_data)
 {
@@ -2023,11 +2014,14 @@ gboolean parentmsgs_hash_remove(gpointer key,
 gboolean procmsg_msg_has_flagged_parent(MsgInfo *info, MsgPermFlags perm_flags)
 {
        gboolean result;
-       GHashTable *parentmsgs = g_hash_table_new(NULL, NULL); 
+       static GHashTable *parentmsgs = NULL;
+       
+       if (parentmsgs == NULL)
+               parentmsgs = g_hash_table_new(NULL, NULL); 
 
        result = procmsg_msg_has_flagged_parent_real(info, perm_flags, parentmsgs);
        g_hash_table_foreach_remove(parentmsgs, parentmsgs_hash_remove, NULL);
-       g_hash_table_destroy(parentmsgs);
+
        return result;
 }
 
@@ -2041,7 +2035,7 @@ gboolean procmsg_msg_has_marked_parent(MsgInfo *info)
 }
 
 
-GSList *procmsg_find_children_func(MsgInfo *info, 
+static GSList *procmsg_find_children_func(MsgInfo *info, 
                                   GSList *children, GSList *all)
 {
        GSList *cur;
@@ -2067,7 +2061,7 @@ GSList *procmsg_find_children_func(MsgInfo *info,
        return children;
 }
 
-GSList *procmsg_find_children (MsgInfo *info)
+static GSList *procmsg_find_children (MsgInfo *info)
 {
        GSList *children;
        GSList *all, *cur;
@@ -2087,7 +2081,7 @@ GSList *procmsg_find_children (MsgInfo *info)
        return children;
 }
 
-void procmsg_update_unread_children(MsgInfo *info, gboolean newly_marked)
+static void procmsg_update_unread_children(MsgInfo *info, gboolean newly_marked)
 {
        GSList *children = procmsg_find_children(info);
        GSList *cur;
@@ -2131,24 +2125,110 @@ void procmsg_msginfo_set_to_folder(MsgInfo *msginfo, FolderItem *to_folder)
  * \return TRUE if the message was moved and MsgInfo is now invalid,
  *         FALSE otherwise
  */
-gboolean procmsg_msginfo_filter(MsgInfo *msginfo, PrefsAccount* ac_prefs)
+static gboolean procmsg_msginfo_filter(MsgInfo *msginfo, PrefsAccount* ac_prefs)
 {
        MailFilteringData mail_filtering_data;
                        
        mail_filtering_data.msginfo = msginfo;                  
-       if (hooks_invoke(MAIL_FILTERING_HOOKLIST, &mail_filtering_data)) {
+       mail_filtering_data.msglist = NULL;                     
+       mail_filtering_data.filtered = NULL;                    
+       mail_filtering_data.unfiltered = NULL;
+       mail_filtering_data.account = ac_prefs; 
+
+       if (!ac_prefs || ac_prefs->filterhook_on_recv)
+               if (hooks_invoke(MAIL_FILTERING_HOOKLIST, &mail_filtering_data))
                return TRUE;
-       }
 
        /* filter if enabled in prefs or move to inbox if not */
        if((filtering_rules != NULL) &&
-          filter_message_by_msginfo(filtering_rules, msginfo, ac_prefs)) {
+               filter_message_by_msginfo(filtering_rules, msginfo, ac_prefs,
+                               FILTERING_INCORPORATION, NULL)) {
                return TRUE;
        }
                
        return FALSE;
 }
 
+void procmsg_msglist_filter(GSList *list, PrefsAccount *ac, 
+                           GSList **filtered, GSList **unfiltered,
+                           gboolean do_filter)
+{
+       GSList *cur, *to_do = NULL;
+       gint total = 0, curnum = 0;
+       MailFilteringData mail_filtering_data;
+                       
+       g_return_if_fail(filtered != NULL);
+       g_return_if_fail(unfiltered != NULL);
+
+       *filtered = NULL;
+       *unfiltered = NULL;
+       
+       if (list == NULL)
+               return;
+
+       total = g_slist_length(list);
+
+       if (!do_filter) {
+               *filtered = NULL;
+               *unfiltered = g_slist_copy(list);
+               return;
+       }
+
+       statusbar_print_all(_("Filtering messages...\n"));
+
+       mail_filtering_data.msginfo = NULL;                     
+       mail_filtering_data.msglist = list;                     
+       mail_filtering_data.filtered = NULL;                    
+       mail_filtering_data.unfiltered = NULL;  
+       mail_filtering_data.account = ac;       
+                       
+       if (!ac || ac->filterhook_on_recv)
+       hooks_invoke(MAIL_LISTFILTERING_HOOKLIST, &mail_filtering_data);
+       
+       if (mail_filtering_data.filtered == NULL &&
+           mail_filtering_data.unfiltered == NULL) {
+               /* nothing happened */
+               debug_print(MAIL_LISTFILTERING_HOOKLIST " did nothing. filtering whole list normally.\n");
+               to_do = list;
+       } 
+       if (mail_filtering_data.filtered != NULL) {
+               /* keep track of what's been filtered by the hooks */
+               debug_print(MAIL_LISTFILTERING_HOOKLIST " filtered some stuff. total %d filtered %d unfilt %d.\n",
+                       g_slist_length(list),
+                       g_slist_length(mail_filtering_data.filtered),
+                       g_slist_length(mail_filtering_data.unfiltered));
+
+               *filtered = g_slist_copy(mail_filtering_data.filtered);
+       }
+       if (mail_filtering_data.unfiltered != NULL) {
+               /* what the hooks didn't handle will go in filtered or 
+                * unfiltered in the next loop */
+               debug_print(MAIL_LISTFILTERING_HOOKLIST " left unfiltered stuff. total %d filtered %d unfilt %d.\n",
+                       g_slist_length(list),
+                       g_slist_length(mail_filtering_data.filtered),
+                       g_slist_length(mail_filtering_data.unfiltered));
+               to_do = mail_filtering_data.unfiltered;
+       } 
+
+       for (cur = to_do; cur; cur = cur->next) {
+               MsgInfo *info = (MsgInfo *)cur->data;
+               if (procmsg_msginfo_filter(info, ac))
+                       *filtered = g_slist_prepend(*filtered, info);
+               else
+                       *unfiltered = g_slist_prepend(*unfiltered, info);
+               statusbar_progress_all(curnum++, total, prefs_common.statusbar_update_step);
+       }
+
+       g_slist_free(mail_filtering_data.filtered);
+       g_slist_free(mail_filtering_data.unfiltered);
+       
+       *filtered = g_slist_reverse(*filtered);
+       *unfiltered = g_slist_reverse(*unfiltered);
+
+       statusbar_progress_all(0,0,0);
+       statusbar_pop_all();
+}
+
 MsgInfo *procmsg_msginfo_new_from_mimeinfo(MsgInfo *src_msginfo, MimeInfo *mimeinfo)
 {
        MsgInfo *tmp_msginfo = NULL;
@@ -2230,19 +2310,31 @@ int procmsg_spam_learner_learn (MsgInfo *info, GSList *list, gboolean spam)
 }
 
 static gchar *spam_folder_item = NULL;
-void procmsg_spam_set_folder (const char *item_identifier)
+static FolderItem * (*procmsg_spam_get_folder_func)(MsgInfo *msginfo) = NULL;
+void procmsg_spam_set_folder (const char *item_identifier, FolderItem *(*spam_get_folder_func)(MsgInfo *info))
 {
        g_free(spam_folder_item);
        if (item_identifier)
                spam_folder_item = g_strdup(item_identifier);
        else
                spam_folder_item = NULL;
+       if (spam_get_folder_func != NULL)
+               procmsg_spam_get_folder_func = spam_get_folder_func;
+       else
+               procmsg_spam_get_folder_func = NULL;
 }
 
-FolderItem *procmsg_spam_get_folder (void)
+FolderItem *procmsg_spam_get_folder (MsgInfo *msginfo)
 {
-       FolderItem *item = spam_folder_item ? folder_find_item_from_identifier(spam_folder_item) : NULL;
-       return item ? item : folder_get_default_trash();
+       FolderItem *item = NULL;
+       
+       if (procmsg_spam_get_folder_func) 
+               item = procmsg_spam_get_folder_func(msginfo);
+       if (item == NULL && spam_folder_item)
+               item = folder_find_item_from_identifier(spam_folder_item);
+       if (item == NULL)
+               item = folder_get_default_trash();
+       return item;
 }
 
 static void item_has_queued_mails(FolderItem *item, gpointer data)
@@ -2260,3 +2352,69 @@ gboolean procmsg_have_queued_mails_fast (void)
        folder_func_to_all_folders(item_has_queued_mails, &result);
        return result;
 }
+
+static void item_has_trashed_mails(FolderItem *item, gpointer data)
+{
+       gboolean *result = (gboolean *)data;
+       if (*result == TRUE)
+               return;
+       if (folder_has_parent_of_type(item, F_TRASH) && item->total_msgs > 0)
+               *result = TRUE;
+}
+
+gboolean procmsg_have_trashed_mails_fast (void)
+{
+       gboolean result = FALSE;
+       folder_func_to_all_folders(item_has_trashed_mails, &result);
+       return result;
+}
+
+gchar *procmsg_msginfo_get_tags_str(MsgInfo *msginfo)
+{
+       GSList *cur = NULL;
+       gchar *tags = NULL;
+       
+       if (!msginfo)
+               return NULL;
+
+       if (msginfo->tags == NULL)
+               return NULL;
+       for (cur = msginfo->tags; cur; cur = cur->next) {
+               const gchar *tag = tags_get_tag(GPOINTER_TO_INT(cur->data));
+               if (!tag)
+                       continue;
+               if (!tags)
+                       tags = g_strdup(tag);
+               else {
+                       int olen = strlen(tags);
+                       int nlen = olen + strlen(tag) + 2 /* strlen(", ") */;
+                       tags = g_realloc(tags, nlen+1);
+                       if (!tags)
+                               return NULL;
+                       strcpy(tags+olen, ", ");
+                       strcpy(tags+olen+2, tag);
+                       tags[nlen]='\0';
+               }
+       }
+       return tags;
+}
+
+void procmsg_msginfo_update_tags(MsgInfo *msginfo, gboolean set, gint id)
+{
+       if (!set) {
+               msginfo->tags = g_slist_remove(
+                                       msginfo->tags,
+                                       GINT_TO_POINTER(id));
+       } else {
+               if (!g_slist_find(msginfo->tags, GINT_TO_POINTER(id)))
+                       msginfo->tags = g_slist_append(
+                                       msginfo->tags,
+                                       GINT_TO_POINTER(id));
+       }
+}
+
+void procmsg_msginfo_clear_tags(MsgInfo *msginfo)
+{
+       g_slist_free(msginfo->tags);
+       msginfo->tags = NULL;
+}