Fix typo
[claws.git] / src / procmsg.c
index e1c7e1f0b0d6c6cd32e922f083fbaa76a4bcfa69..0b2ada3c1a81ad93b5805c4a24e2e2e89cf8a392 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2012 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"
+#include "privacy.h"
+
+extern SessionStats session_stats;
 
 static gint procmsg_send_message_queue_full(const gchar *file, gboolean keep_session, gchar **errstr,
                                            FolderItem *queue, gint msgnum, gboolean *queued_removed);
@@ -85,6 +89,19 @@ void procmsg_msg_list_free(GSList *mlist)
        g_slist_free(mlist);
 }
 
+MsgNumberList *procmsg_get_number_list_for_msgs(MsgInfoList *msglist)
+{
+       GSList *cur = NULL;
+       GSList *nums = NULL;
+
+       for (cur = msglist; cur; cur = cur->next) {
+               MsgInfo *msg = (MsgInfo *)cur->data;
+               nums = g_slist_prepend(nums, GUINT_TO_POINTER(msg->msgnum));
+       }
+
+       return g_slist_reverse(nums);
+}
+
 struct MarkSum {
        gint *new_msgs;
        gint *unread_msgs;
@@ -97,41 +114,47 @@ struct MarkSum {
 /* CLAWS subject threading:
   
   in the first round it inserts subject lines in a 
-  relation (subject <-> node)
+  hashtable (subject <-> node)
 
   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
+  hashtable. 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)
+  days old (see subject_hashtable_lookup)
 */  
 
-static void subject_relation_insert(GRelation *relation, GNode *node)
+static void subject_hashtable_insert(GHashTable *hashtable, GNode *node)
 {
        gchar *subject;
        MsgInfo *msginfo;
+       GSList *list = NULL;
 
-       g_return_if_fail(relation != NULL);
-       g_return_if_fail(node != NULL);
+       cm_return_if_fail(hashtable != NULL);
+       cm_return_if_fail(node != NULL);
        msginfo = (MsgInfo *) node->data;
-       g_return_if_fail(msginfo != NULL);
+       cm_return_if_fail(msginfo != NULL);
 
        subject = msginfo->subject;
        if (subject == NULL)
                return;
+
        subject += subject_get_prefix_length(subject);
 
-       g_relation_insert(relation, subject, node);
+       list = g_hash_table_lookup(hashtable, subject);
+       list = g_slist_prepend(list, node);
+       g_hash_table_insert(hashtable, subject, list);
 }
 
-static GNode *subject_relation_lookup(GRelation *relation, MsgInfo *msginfo)
+static GNode *subject_hashtable_lookup(GHashTable *hashtable, MsgInfo *msginfo)
 {
        gchar *subject;
-       GTuples *tuples;
-       GNode *node = NULL;
+       GSList *list, *cur;
+       GNode *node = NULL, *hashtable_node = NULL;
        gint prefix_length;
+       MsgInfo *hashtable_msginfo = NULL, *best_msginfo = NULL;
+       gboolean match;
     
-       g_return_val_if_fail(relation != NULL, NULL);
+       cm_return_val_if_fail(hashtable != NULL, NULL);
 
        subject = msginfo->subject;
        if (subject == NULL)
@@ -141,55 +164,52 @@ static GNode *subject_relation_lookup(GRelation *relation, MsgInfo *msginfo)
                return NULL;
        subject += prefix_length;
        
-       tuples = g_relation_select(relation, subject, 0);
-       if (tuples == NULL)
+       list = g_hash_table_lookup(hashtable, subject);
+       if (list == NULL)
                return NULL;
 
-       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;
+       /* check all nodes with the same subject to find the best parent */
+       for (cur = list; cur; cur = cur->next) {
+               hashtable_node = (GNode *)cur->data;
+               hashtable_msginfo = (MsgInfo *) hashtable_node->data;
+               match = FALSE;
+
+               /* best node should be the oldest in the found nodes */
+               /* parent node must not be older then msginfo */
+               if ((hashtable_msginfo->date_t < msginfo->date_t) &&
+                   ((best_msginfo == NULL) ||
+                    (best_msginfo->date_t > hashtable_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, hashtable_msginfo->date_t)) >
+                    prefs_common.thread_by_subject_max_age * 3600 * 24)
                        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;
-                       }
-               }           
+               /* can add new tests for all matching
+                  nodes found by subject */
+
+               if (match) {
+                       node = hashtable_node;
+                       best_msginfo = hashtable_msginfo;
+               }
        }
 
-       g_tuples_destroy(tuples);
        return node;
 }
 
+static void subject_hashtable_free(gpointer key, gpointer value, gpointer data)
+{
+       g_slist_free(value);
+}
+
 /* return the reversed thread tree */
 GNode *procmsg_get_thread_tree(GSList *mlist)
 {
        GNode *root, *parent, *node, *next;
        GHashTable *msgid_table;
-       GRelation *subject_relation = NULL;
+       GHashTable *subject_hashtable = NULL;
        MsgInfo *msginfo;
        const gchar *msgid;
         GSList *reflist;
@@ -198,8 +218,7 @@ GNode *procmsg_get_thread_tree(GSList *mlist)
        msgid_table = g_hash_table_new(g_str_hash, g_str_equal);
        
        if (prefs_common.thread_by_subject) {
-               subject_relation = g_relation_new(2);
-               g_relation_index(subject_relation, 0, g_str_hash, g_str_equal);
+               subject_hashtable = g_hash_table_new(g_str_hash, g_str_equal);
        }
 
        for (; mlist != NULL; mlist = mlist->next) {
@@ -218,9 +237,9 @@ GNode *procmsg_get_thread_tree(GSList *mlist)
                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) */
+               /* CLAWS: add subject to hashtable (without prefix) */
                if (prefs_common.thread_by_subject) {
-                       subject_relation_insert(subject_relation, node);
+                       subject_hashtable_insert(subject_hashtable, node);
                }
        }
 
@@ -260,7 +279,7 @@ GNode *procmsg_get_thread_tree(GSList *mlist)
                        next = node->next;
                        msginfo = (MsgInfo *) node->data;
                        
-                       parent = subject_relation_lookup(subject_relation, msginfo);
+                       parent = subject_hashtable_lookup(subject_hashtable, msginfo);
                        
                        /* the node may already be threaded by IN-REPLY-TO, so go up 
                         * in the tree to 
@@ -283,7 +302,10 @@ GNode *procmsg_get_thread_tree(GSList *mlist)
        }
        
        if (prefs_common.thread_by_subject)
-               g_relation_destroy(subject_relation);
+       {
+               g_hash_table_foreach(subject_hashtable, subject_hashtable_free, NULL);
+               g_hash_table_destroy(subject_hashtable);
+       }
 
        g_hash_table_destroy(msgid_table);
        END_TIMING();
@@ -382,7 +404,7 @@ gchar *procmsg_get_message_file_path(MsgInfo *msginfo)
 {
        gchar *file;
 
-       g_return_val_if_fail(msginfo != NULL, NULL);
+       cm_return_val_if_fail(msginfo != NULL, NULL);
 
        if (msginfo->plaintext_file)
                file = g_strdup(msginfo->plaintext_file);
@@ -397,7 +419,7 @@ gchar *procmsg_get_message_file(MsgInfo *msginfo)
 {
        gchar *filename = NULL;
 
-       g_return_val_if_fail(msginfo != NULL, NULL);
+       cm_return_val_if_fail(msginfo != NULL, NULL);
 
        filename = folder_item_fetch_msg(msginfo->folder, msginfo->msgnum);
        if (!filename)
@@ -410,7 +432,7 @@ gchar *procmsg_get_message_file_full(MsgInfo *msginfo, gboolean headers, gboolea
 {
        gchar *filename = NULL;
 
-       g_return_val_if_fail(msginfo != NULL, NULL);
+       cm_return_val_if_fail(msginfo != NULL, NULL);
 
        filename = folder_item_fetch_msg_full(msginfo->folder, msginfo->msgnum,
                                                headers, body);
@@ -469,10 +491,10 @@ FILE *procmsg_open_message(MsgInfo *msginfo)
        FILE *fp;
        gchar *file;
 
-       g_return_val_if_fail(msginfo != NULL, NULL);
-
+       cm_return_val_if_fail(msginfo != NULL, NULL);
+       
        file = procmsg_get_message_file_path(msginfo);
-       g_return_val_if_fail(file != NULL, NULL);
+       cm_return_val_if_fail(file != NULL, NULL);
 
        if (!is_file_exist(file)) {
                g_free(file);
@@ -556,9 +578,9 @@ void procmsg_get_filter_keyword(MsgInfo *msginfo, gchar **header, gchar **key,
 
        FILE *fp;
 
-       g_return_if_fail(msginfo != NULL);
-       g_return_if_fail(header != NULL);
-       g_return_if_fail(key != NULL);
+       cm_return_if_fail(msginfo != NULL);
+       cm_return_if_fail(header != NULL);
+       cm_return_if_fail(key != NULL);
 
        *header = NULL;
        *key = NULL;
@@ -579,7 +601,10 @@ void procmsg_get_filter_keyword(MsgInfo *msginfo, gchar **header, gchar **key,
        hentry[idx].body = NULL;        \
 }
 
-               if (hentry[H_X_BEENTHERE].body != NULL) {
+               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_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);
@@ -587,10 +612,7 @@ void procmsg_get_filter_keyword(MsgInfo *msginfo, gchar **header, gchar **key,
                        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) {
+               } else  if (hentry[H_X_SEQUENCE].body != NULL) {
                        gchar *p;
 
                        SET_FILTER_KEY("X-Sequence", H_X_SEQUENCE);
@@ -665,8 +687,10 @@ static 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);
@@ -728,7 +752,7 @@ static PrefsAccount *procmsg_get_account_from_file(const gchar *file)
                                       {"X-Sylpheed-Encrypt-Data:", NULL, FALSE},
                                       {NULL,    NULL, FALSE}};
        
-       g_return_val_if_fail(file != NULL, NULL);
+       cm_return_val_if_fail(file != NULL, NULL);
 
        if ((fp = g_fopen(file, "rb")) == NULL) {
                FILE_OP_ERROR(file, "fopen");
@@ -748,6 +772,52 @@ static PrefsAccount *procmsg_get_account_from_file(const gchar *file)
        return mailac;
 }
 
+gchar *procmsg_msginfo_get_identifier(MsgInfo *msginfo)
+{
+       gchar *folder_id;
+       const gchar *msgid;
+       gchar *id;
+
+       cm_return_val_if_fail(msginfo != NULL, NULL);
+       folder_id = folder_item_get_identifier(msginfo->folder);
+       msgid = msginfo->msgid;
+
+       id = g_strconcat(folder_id, G_DIR_SEPARATOR_S, msgid, NULL);
+
+       g_free(folder_id);
+
+       return id;
+}
+
+MsgInfo *procmsg_get_msginfo_from_identifier(const gchar *id)
+{
+       gchar *folder_id = g_strdup(id);
+       gchar *separator = strrchr(folder_id, G_DIR_SEPARATOR);
+       const gchar *msgid;
+       FolderItem *item;
+       MsgInfo *msginfo;
+
+       if (separator == NULL) {
+               g_free(folder_id);
+               return NULL;
+       }
+
+       *separator = '\0';
+       msgid = separator + 1;
+
+       item = folder_find_item_from_identifier(folder_id);
+
+       if (item == NULL) {
+               g_free(folder_id);
+               return NULL;
+       }
+
+       msginfo = folder_item_get_msginfo_by_msgid(item, msgid);
+       g_free(folder_id);
+
+       return msginfo;
+}
+
 static GSList *procmsg_list_sort_by_account(FolderItem *queue, GSList *list)
 {
        GSList *result = NULL;
@@ -807,7 +877,7 @@ 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("sort after %s\n", ((MsgInfo *)cur->data)->from);
 
        debug_print("\n");
 
@@ -818,7 +888,7 @@ static gboolean procmsg_is_last_for_account(FolderItem *queue, MsgInfo *msginfo,
 {
        gchar *file = folder_item_fetch_msg(queue, msginfo->msgnum);
        PrefsAccount *ac = procmsg_get_account_from_file(file);
-       GSList *cur = elem;
+       GSList *cur;
        g_free(file);
        for (cur = elem; cur; cur = cur->next) {
                MsgInfo *cur_msginfo = (MsgInfo *)cur->data;
@@ -837,6 +907,25 @@ static gboolean procmsg_is_last_for_account(FolderItem *queue, MsgInfo *msginfo,
 }
 
 static gboolean send_queue_lock = FALSE;
+
+gboolean procmsg_queue_lock(char **errstr)
+{
+       if (send_queue_lock) {
+               /* 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."));
+               }
+               return FALSE;
+       }
+       send_queue_lock = TRUE;
+       return TRUE;
+}
+void procmsg_queue_unlock(void)
+{
+       send_queue_lock = FALSE;
+}
 /*!
  *\brief       Send messages in queue
  *
@@ -853,27 +942,22 @@ gint procmsg_send_queue(FolderItem *queue, gboolean save_msgs, gchar **errstr)
        GSList *sorted_list = NULL;
        GNode *node, *next;
        
-       if (send_queue_lock) {
-               /* Avoid having to translate two similar strings */
-               log_warning("%s\n", _("Already trying to send."));
-               if (errstr) {
-                       if (*errstr) g_free(*errstr);
-                       *errstr = g_strdup_printf(_("Already trying to send."));
-               }
+       if (!procmsg_queue_lock(errstr)) {
+               main_window_set_menu_sensitive(mainwindow_get_mainwindow());
                toolbar_main_set_sensitive(mainwindow_get_mainwindow());
                return -1;
        }
-       send_queue_lock = TRUE;
        inc_lock();
        if (!queue)
                queue = folder_get_default_queue();
        
        if (queue == NULL) {
-               send_queue_lock = FALSE;
+               procmsg_queue_unlock();
                inc_unlock();
                return -1;
        }
 
+       main_window_set_menu_sensitive(mainwindow_get_mainwindow());
        toolbar_main_set_sensitive(mainwindow_get_mainwindow());
 
        folder_item_scan(queue);
@@ -887,7 +971,7 @@ gint procmsg_send_queue(FolderItem *queue, gboolean save_msgs, gchar **errstr)
                MsgInfo *msginfo;
                        
                msginfo = (MsgInfo *)(elem->data);
-               if (!MSG_IS_LOCKED(msginfo->flags)) {
+               if (!MSG_IS_LOCKED(msginfo->flags) && !MSG_IS_DELETED(msginfo->flags)) {
                        file = folder_item_fetch_msg(queue, msginfo->msgnum);
                        if (file) {
                                gboolean queued_removed = FALSE;
@@ -919,7 +1003,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
@@ -927,8 +1013,9 @@ gint procmsg_send_queue(FolderItem *queue, gboolean save_msgs, gchar **errstr)
                        node = next;
                }
        }
-       send_queue_lock = FALSE;
+       procmsg_queue_unlock();
        inc_unlock();
+       main_window_set_menu_sensitive(mainwindow_get_mainwindow());
        toolbar_main_set_sensitive(mainwindow_get_mainwindow());
 
        return (err != 0 ? -err : sent);
@@ -952,7 +1039,7 @@ gboolean procmsg_queue_is_empty(FolderItem *queue)
        gboolean res = FALSE;
        if (!queue)
                queue = folder_get_default_queue();
-       g_return_val_if_fail(queue != NULL, TRUE);
+       cm_return_val_if_fail(queue != NULL, TRUE);
 
        folder_item_scan(queue);
        list = folder_item_get_msg_list(queue);
@@ -1024,7 +1111,7 @@ static gint procmsg_save_to_outbox(FolderItem *outbox, const gchar *file,
 
        if (!outbox)
                outbox = folder_get_default_outbox();
-       g_return_val_if_fail(outbox != NULL, -1);
+       cm_return_val_if_fail(outbox != NULL, -1);
 
        /* remove queueing headers */
        if (is_queued) {
@@ -1039,7 +1126,7 @@ static gint procmsg_save_to_outbox(FolderItem *outbox, const gchar *file,
                folder_item_scan(outbox);
                if ((num = folder_item_add_msg(outbox, tmp, &flag, TRUE)) < 0) {
                        g_warning("can't save message\n");
-                       g_unlink(tmp);
+                       claws_unlink(tmp);
                        return -1;
                }
        } else {
@@ -1067,6 +1154,7 @@ static gint procmsg_save_to_outbox(FolderItem *outbox, const gchar *file,
        return 0;
 }
 
+
 void procmsg_print_message(MsgInfo *msginfo, const gchar *cmdline)
 {
        static const gchar *def_cmd = "lpr %s";
@@ -1075,8 +1163,9 @@ void procmsg_print_message(MsgInfo *msginfo, const gchar *cmdline)
        FILE *tmpfp, *prfp;
        gchar buf[1024];
        gchar *p;
+       int r;
 
-       g_return_if_fail(msginfo);
+       cm_return_if_fail(msginfo);
 
        if (procmime_msginfo_is_encrypted(msginfo))
                tmpfp = procmime_get_first_encrypted_text_content(msginfo);
@@ -1097,17 +1186,20 @@ void procmsg_print_message(MsgInfo *msginfo, const gchar *cmdline)
                return;
        }
 
-       if (msginfo->date) fprintf(prfp, "Date: %s\n", msginfo->date);
-       if (msginfo->from) fprintf(prfp, "From: %s\n", msginfo->from);
-       if (msginfo->to)   fprintf(prfp, "To: %s\n", msginfo->to);
-       if (msginfo->cc)   fprintf(prfp, "Cc: %s\n", msginfo->cc);
-       if (msginfo->newsgroups)
-               fprintf(prfp, "Newsgroups: %s\n", msginfo->newsgroups);
-       if (msginfo->subject) fprintf(prfp, "Subject: %s\n", msginfo->subject);
-       fputc('\n', prfp);
+       if (msginfo->date) { r = fprintf(prfp, "Date: %s\n", msginfo->date); if (r < 0) goto fpferr; }
+       if (msginfo->from) { r = fprintf(prfp, "From: %s\n", msginfo->from); if (r < 0) goto fpferr; }
+       if (msginfo->to)   { r = fprintf(prfp, "To: %s\n", msginfo->to); if (r < 0) goto fpferr; }
+       if (msginfo->cc)   { r = fprintf(prfp, "Cc: %s\n", msginfo->cc); if (r < 0) goto fpferr; }
+       if (msginfo->newsgroups) {
+               r = fprintf(prfp, "Newsgroups: %s\n", msginfo->newsgroups); if (r < 0) goto fpferr;
+       }
+       if (msginfo->subject) { r = fprintf(prfp, "Subject: %s\n", msginfo->subject); if (r < 0) goto fpferr; }
+       if (fputc('\n', prfp) == EOF) goto fpferr;
 
-       while (fgets(buf, sizeof(buf), tmpfp) != NULL)
-               fputs(buf, prfp);
+       while (fgets(buf, sizeof(buf), tmpfp) != NULL) {
+               r = fputs(buf, prfp);
+               if (r == EOF) goto fpferr;
+       }
 
        fclose(prfp);
        fclose(tmpfp);
@@ -1117,7 +1209,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);
        }
@@ -1125,8 +1217,16 @@ void procmsg_print_message(MsgInfo *msginfo, const gchar *cmdline)
        g_free(prtmp);
 
        g_strchomp(buf);
-       if (buf[strlen(buf) - 1] != '&') strcat(buf, "&");
-       system(buf);
+       if (buf[strlen(buf) - 1] != '&')
+               strncat(buf, "&", sizeof(buf) - strlen(buf) - 1);
+       if (system(buf) == -1)
+               g_warning("system(%s) failed.", buf);
+       return;
+fpferr:
+       FILE_OP_ERROR(prtmp, "fprintf/fputc/fputs");
+       g_free(prtmp);
+       fclose(tmpfp);
+       fclose(prfp);
 }
 
 MsgInfo *procmsg_msginfo_new_ref(MsgInfo *msginfo)
@@ -1213,25 +1313,18 @@ MsgInfo *procmsg_msginfo_copy(MsgInfo *msginfo)
        return newmsginfo;
 }
 
-MsgInfo *procmsg_msginfo_get_full_info(MsgInfo *msginfo)
+MsgInfo *procmsg_msginfo_get_full_info_from_file(MsgInfo *msginfo, const gchar *file)
 {
        MsgInfo *full_msginfo;
-       gchar *file;
 
        if (msginfo == NULL) return NULL;
 
-       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");
+               g_warning("procmsg_msginfo_get_full_info_from_file(): can't get message file.\n");
                return NULL;
        }
 
        full_msginfo = procheader_parse_file(file, msginfo->flags, TRUE, FALSE);
-       g_free(file);
        if (!full_msginfo) return NULL;
 
        msginfo->total_size = full_msginfo->total_size;
@@ -1277,6 +1370,28 @@ MsgInfo *procmsg_msginfo_get_full_info(MsgInfo *msginfo)
        return procmsg_msginfo_new_ref(msginfo);
 }
 
+MsgInfo *procmsg_msginfo_get_full_info(MsgInfo *msginfo)
+{
+       MsgInfo *full_msginfo;
+       gchar *file;
+
+       if (msginfo == NULL) return NULL;
+
+       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;
+       }
+
+       full_msginfo = procmsg_msginfo_get_full_info_from_file(msginfo, file);
+       g_free(file);
+       return full_msginfo;
+}
+
 void procmsg_msginfo_free(MsgInfo *msginfo)
 {
        if (msginfo == NULL) return;
@@ -1320,8 +1435,8 @@ void procmsg_msginfo_free(MsgInfo *msginfo)
                g_free(msginfo->extradata->account_login);
                g_free(msginfo->extradata);
        }
-       slist_free_strings(msginfo->references);
-       g_slist_free(msginfo->references);
+       slist_free_strings_full(msginfo->references);
+       g_slist_free(msginfo->tags);
 
        g_free(msginfo->plaintext_file);
 
@@ -1331,7 +1446,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)
@@ -1352,13 +1467,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)
@@ -1433,9 +1552,7 @@ static gint procmsg_send_message_queue_full(const gchar *file, gboolean keep_ses
        gboolean save_clear_text = TRUE;
        gchar *tmp_enc_file = NULL;
 
-       int local = 0;
-
-       g_return_val_if_fail(file != NULL, -1);
+       cm_return_val_if_fail(file != NULL, -1);
 
        if ((fp = g_fopen(file, "rb")) == NULL) {
                FILE_OP_ERROR(file, "fopen");
@@ -1528,10 +1645,8 @@ send_mail:
                        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);
+                       slist_free_strings_full(to_list);
+                       slist_free_strings_full(newsgroup_list);
                        g_free(savecopyfolder);
                        g_free(replymessageid);
                        g_free(fwdmessageid);
@@ -1578,7 +1693,6 @@ send_mail:
                } else if (mailac && mailac->use_mail_command &&
                           mailac->mail_command && (* mailac->mail_command)) {
                        mailval = send_message_local(mailac->mail_command, fp);
-                       local = 1;
                } else {
                        if (!mailac) {
                                mailac = account_find_from_smtp_server(from, smtpserver);
@@ -1615,20 +1729,20 @@ send_mail:
        } else if (!to_list && !newsgroup_list) {
                if (errstr) {
                        if (*errstr) g_free(*errstr);
-                       *errstr = g_strdup(_("Couldn't determine sending informations. "
+                       *errstr = g_strdup(_("Couldn't determine sending information. "
                                "Maybe the email hasn't been generated by Claws Mail."));
                }
                mailval = -1;
        }
 
        fseek(fp, filepos, SEEK_SET);
-       if (newsgroup_list && (mailval == 0)) {
+       if (newsgroup_list && newsac && (mailval == 0)) {
                Folder *folder;
                gchar *tmp = NULL;
                FILE *tmpfp;
 
                /* write to temporary file */
-               tmp = g_strdup_printf("%s%ctmp%p", g_get_tmp_dir(),
+               tmp = g_strdup_printf("%s%cnntp%p", get_tmp_dir(),
                            G_DIR_SEPARATOR, file);
                if ((tmpfp = g_fopen(tmp, "wb")) == NULL) {
                        FILE_OP_ERROR(tmp, "fopen");
@@ -1664,13 +1778,24 @@ send_mail:
                                         newsac->nntp_server);
                                }
                        }
-                       g_unlink(tmp);
+                       claws_unlink(tmp);
                }
                g_free(tmp);
        }
 
        fclose(fp);
 
+       /* update session statistics */
+       if (mailval == 0 && newsval == 0) {
+               /* update session stats */
+               if (replymessageid)
+                       session_stats.replied++;
+               else if (fwdmessageid)
+                       session_stats.forwarded++;
+               else
+                       session_stats.sent++;
+       }
+
        /* save message to outbox */
        if (mailval == 0 && newsval == 0 && savecopyfolder) {
                FolderItem *outbox;
@@ -1707,7 +1832,7 @@ send_mail:
        }
 
        if (tmp_enc_file != NULL) {
-               g_unlink(tmp_enc_file);
+               claws_unlink(tmp_enc_file);
                free(tmp_enc_file);
                tmp_enc_file = NULL;
        }
@@ -1742,10 +1867,14 @@ send_mail:
                        
                        if (msginfo != NULL) {
                                if (replymessageid != NULL) {
-                                       procmsg_msginfo_unset_flags(msginfo, MSG_FORWARDED, 0);
+                                       MsgPermFlags to_unset = 0;
+
+                                       if (prefs_common.mark_as_read_on_new_window)
+                                               to_unset = (MSG_NEW|MSG_UNREAD);
+
+                                       procmsg_msginfo_unset_flags(msginfo, to_unset, 0);
                                        procmsg_msginfo_set_flags(msginfo, MSG_REPLIED, 0);
                                }  else {
-                                       procmsg_msginfo_unset_flags(msginfo, MSG_REPLIED, 0);
                                        procmsg_msginfo_set_flags(msginfo, MSG_FORWARDED, 0);
                                }
                                procmsg_msginfo_free(msginfo);
@@ -1756,10 +1885,8 @@ send_mail:
 
        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);
+       slist_free_strings_full(to_list);
+       slist_free_strings_full(newsgroup_list);
        g_free(savecopyfolder);
        g_free(replymessageid);
        g_free(fwdmessageid);
@@ -1772,10 +1899,22 @@ send_mail:
 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, queue, msgnum, queued_removed);
+       main_window_set_menu_sensitive(mainwindow_get_mainwindow());
        toolbar_main_set_sensitive(mainwindow_get_mainwindow());
        return result;
 }
 
+gint procmsg_send_message_queue_with_lock(const gchar *file, gchar **errstr, FolderItem *queue, gint msgnum, gboolean *queued_removed)
+{
+       gint val;
+       if (procmsg_queue_lock(errstr)) {
+               val = procmsg_send_message_queue(file, errstr, queue, msgnum, queued_removed);
+               procmsg_queue_unlock();
+               return val;
+       }
+       return -1;
+}
+
 static void update_folder_msg_counts(FolderItem *item, MsgInfo *msginfo, MsgPermFlags old_flags)
 {
        MsgPermFlags new_flags = msginfo->flags.perm_flags;
@@ -1812,6 +1951,46 @@ static void update_folder_msg_counts(FolderItem *item, MsgInfo *msginfo, MsgPerm
                procmsg_update_unread_children(msginfo, FALSE);
                item->marked_msgs--;
        }
+
+       if (!(old_flags & MSG_REPLIED) && (new_flags & MSG_REPLIED)) {
+               item->replied_msgs++;
+       }
+
+       if ((old_flags & MSG_REPLIED) && !(new_flags & MSG_REPLIED)) {
+               item->replied_msgs--;
+       }
+
+       if (!(old_flags & MSG_FORWARDED) && (new_flags & MSG_FORWARDED)) {
+               item->forwarded_msgs++;
+       }
+
+       if ((old_flags & MSG_FORWARDED) && !(new_flags & MSG_FORWARDED)) {
+               item->forwarded_msgs--;
+       }
+
+       if (!(old_flags & MSG_LOCKED) && (new_flags & MSG_LOCKED)) {
+               item->locked_msgs++;
+       }
+
+       if ((old_flags & MSG_LOCKED) && !(new_flags & MSG_LOCKED)) {
+               item->locked_msgs--;
+       }
+
+       if ((old_flags & MSG_IGNORE_THREAD) && !(new_flags & MSG_IGNORE_THREAD)) {
+               item->ignored_msgs--;
+       }
+
+       if (!(old_flags & MSG_IGNORE_THREAD) && (new_flags & MSG_IGNORE_THREAD)) {
+               item->ignored_msgs++;
+       }
+
+       if ((old_flags & MSG_WATCH_THREAD) && !(new_flags & MSG_WATCH_THREAD)) {
+               item->watched_msgs--;
+       }
+
+       if (!(old_flags & MSG_WATCH_THREAD) && (new_flags & MSG_WATCH_THREAD)) {
+               item->watched_msgs++;
+       }
 }
 
 void procmsg_msginfo_set_flags(MsgInfo *msginfo, MsgPermFlags perm_flags, MsgTmpFlags tmp_flags)
@@ -1821,9 +2000,9 @@ void procmsg_msginfo_set_flags(MsgInfo *msginfo, MsgPermFlags perm_flags, MsgTmp
        MsgPermFlags perm_flags_new, perm_flags_old;
        MsgTmpFlags tmp_flags_old;
 
-       g_return_if_fail(msginfo != NULL);
+       cm_return_if_fail(msginfo != NULL);
        item = msginfo->folder;
-       g_return_if_fail(item != NULL);
+       cm_return_if_fail(item != NULL);
        
        debug_print("Setting flags for message %d in folder %s\n", msginfo->msgnum, item->path);
 
@@ -1833,12 +2012,15 @@ 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);
 
                update_folder_msg_counts(item, msginfo, perm_flags_old);
-
+               summary_update_unread(mainwindow_get_mainwindow()->summaryview, NULL);
        }
 
        /* Tmp flags handling */
@@ -1861,9 +2043,9 @@ void procmsg_msginfo_unset_flags(MsgInfo *msginfo, MsgPermFlags perm_flags, MsgT
        MsgPermFlags perm_flags_new, perm_flags_old;
        MsgTmpFlags tmp_flags_old;
 
-       g_return_if_fail(msginfo != NULL);
+       cm_return_if_fail(msginfo != NULL);
        item = msginfo->folder;
-       g_return_if_fail(item != NULL);
+       cm_return_if_fail(item != NULL);
        
        debug_print("Unsetting flags for message %d in folder %s\n", msginfo->msgnum, item->path);
 
@@ -1899,9 +2081,9 @@ void procmsg_msginfo_change_flags(MsgInfo *msginfo,
        MsgPermFlags perm_flags_new, perm_flags_old;
        MsgTmpFlags tmp_flags_old;
 
-       g_return_if_fail(msginfo != NULL);
+       cm_return_if_fail(msginfo != NULL);
        item = msginfo->folder;
-       g_return_if_fail(item != NULL);
+       cm_return_if_fail(item != NULL);
        
        debug_print("Changing flags for message %d in folder %s\n", msginfo->msgnum, item->path);
 
@@ -1911,6 +2093,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);
@@ -1947,7 +2132,7 @@ static gboolean procmsg_msg_has_flagged_parent_real(MsgInfo *info,
 {
        MsgInfo *tmp;
 
-       g_return_val_if_fail(info != NULL, FALSE);
+       cm_return_val_if_fail(info != NULL, FALSE);
 
        if (info != NULL && info->folder != NULL && info->inreplyto != NULL) {
                tmp = folder_item_get_msginfo_by_msgid(info->folder,
@@ -2019,7 +2204,7 @@ static GSList *procmsg_find_children_func(MsgInfo *info,
 {
        GSList *cur;
 
-       g_return_val_if_fail(info!=NULL, children);
+       cm_return_val_if_fail(info!=NULL, children);
        if (info->msgid == NULL)
                return children;
 
@@ -2045,7 +2230,7 @@ static GSList *procmsg_find_children (MsgInfo *info)
        GSList *children;
        GSList *all, *cur;
 
-       g_return_val_if_fail(info!=NULL, NULL);
+       cm_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) {
@@ -2111,14 +2296,17 @@ static gboolean procmsg_msginfo_filter(MsgInfo *msginfo, PrefsAccount* ac_prefs)
        mail_filtering_data.msginfo = msginfo;                  
        mail_filtering_data.msglist = NULL;                     
        mail_filtering_data.filtered = NULL;                    
-       mail_filtering_data.unfiltered = NULL;                  
-       if (hooks_invoke(MAIL_FILTERING_HOOKLIST, &mail_filtering_data)) {
+       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;
        }
                
@@ -2133,8 +2321,8 @@ void procmsg_msglist_filter(GSList *list, PrefsAccount *ac,
        gint total = 0, curnum = 0;
        MailFilteringData mail_filtering_data;
                        
-       g_return_if_fail(filtered != NULL);
-       g_return_if_fail(unfiltered != NULL);
+       cm_return_if_fail(filtered != NULL);
+       cm_return_if_fail(unfiltered != NULL);
 
        *filtered = NULL;
        *unfiltered = NULL;
@@ -2156,7 +2344,9 @@ void procmsg_msglist_filter(GSList *list, PrefsAccount *ac,
        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 &&
@@ -2284,19 +2474,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)
@@ -2304,8 +2506,23 @@ static void item_has_queued_mails(FolderItem *item, gpointer data)
        gboolean *result = (gboolean *)data;
        if (*result == TRUE)
                return;
-       if (folder_has_parent_of_type(item, F_QUEUE) && item->total_msgs > 0)
-               *result = TRUE;
+       if (folder_has_parent_of_type(item, F_QUEUE)) {
+               if (item->total_msgs == 0)
+                       return;
+               else {
+                       GSList *msglist = folder_item_get_msg_list(item);
+                       GSList *cur;
+                       for (cur = msglist; cur; cur = cur->next) {
+                               MsgInfo *msginfo = (MsgInfo *)cur->data;
+                               if (!MSG_IS_DELETED(msginfo->flags) &&
+                                   !MSG_IS_LOCKED(msginfo->flags)) {
+                                       *result = TRUE;
+                                       break;
+                               }
+                       }
+                       procmsg_msg_list_free(msglist);
+               }
+       }
 }
 
 gboolean procmsg_have_queued_mails_fast (void)
@@ -2314,3 +2531,84 @@ 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)
+{
+       GSList changed;
+
+       if (id == 0)
+               return;
+
+       if (!set) {
+               msginfo->tags = g_slist_remove(
+                                       msginfo->tags,
+                                       GINT_TO_POINTER(id));
+               changed.data = GINT_TO_POINTER(id);
+               changed.next = NULL;
+               folder_item_commit_tags(msginfo->folder, msginfo, NULL, &changed);
+       } else {
+               if (!g_slist_find(msginfo->tags, GINT_TO_POINTER(id))) {
+                       msginfo->tags = g_slist_append(
+                                       msginfo->tags,
+                                       GINT_TO_POINTER(id));
+               }
+               changed.data = GINT_TO_POINTER(id);
+               changed.next = NULL;
+               folder_item_commit_tags(msginfo->folder, msginfo, &changed, NULL);
+       }
+       
+}
+
+void procmsg_msginfo_clear_tags(MsgInfo *msginfo)
+{
+       GSList *unset = msginfo->tags;
+       msginfo->tags = NULL;
+       folder_item_commit_tags(msginfo->folder, msginfo, NULL, unset);
+       g_slist_free(unset);
+}