sync with 0.8.5
[claws.git] / src / procmsg.c
index c411b4d4aae45b110b55f9f4153610edbfa0e4d9..8e0fad864c973fa3689943b23a09abb98bfc6557 100644 (file)
@@ -37,6 +37,9 @@
 #if USE_GPGME
 #  include "rfc2015.h"
 #endif
+#include "alertpanel.h"
+#include "news.h"
+#include "imap.h"
 
 typedef struct _FlagInfo       FlagInfo;
 
@@ -46,15 +49,8 @@ struct _FlagInfo
        MsgFlags flags;
 };
 
-static void mark_sum_func                      (gpointer        key,
-                                                gpointer        value,
-                                                gpointer        data);
-
 static GHashTable *procmsg_read_mark_file      (const gchar    *folder);
-static gint procmsg_cmp_msgnum                 (gconstpointer   a,
-                                                gconstpointer   b);
-static gint procmsg_cmp_flag_msgnum            (gconstpointer   a,
-                                                gconstpointer   b);
+void   procmsg_msginfo_write_flags             (MsgInfo        *msginfo);
 
 
 GHashTable *procmsg_msg_hash_table_create(GSList *mlist)
@@ -206,25 +202,25 @@ GSList *procmsg_read_cache(FolderItem *item, gboolean scan_file)
        }
        cache_file = folder_item_get_cache_file(item);
        if ((fp = fopen(cache_file, "rb")) == NULL) {
-               debug_print(_("\tNo cache file\n"));
+               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"));
+       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"));
+               debug_print("Cache version is different. Discarding it.\n");
                fclose(fp);
                return NULL;
        }
 
        while (fread(&num, sizeof(num), 1, fp) == 1) {
-               msginfo = g_new0(MsgInfo, 1);
+               msginfo = procmsg_msginfo_new();
                msginfo->msgnum = num;
                READ_CACHE_DATA_INT(msginfo->size, fp);
                READ_CACHE_DATA_INT(msginfo->mtime, fp);
@@ -266,7 +262,7 @@ GSList *procmsg_read_cache(FolderItem *item, gboolean scan_file)
        }
 
        fclose(fp);
-       debug_print(_("done.\n"));
+       debug_print("done.\n");
 
        return mlist;
 }
@@ -288,7 +284,7 @@ void procmsg_set_flags(GSList *mlist, FolderItem *item)
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
 
-       debug_print(_("\tMarking the messages...\n"));
+       debug_print("\tMarking the messages...\n");
 
        markdir = folder_item_get_path(item);
        if (!is_dir_exist(markdir))
@@ -330,22 +326,20 @@ void procmsg_set_flags(GSList *mlist, FolderItem *item)
 
        item->last_num = lastnum;
 
-       debug_print(_("done.\n"));
+       debug_print("done.\n");
        if (newmsg)
-               debug_print(_("\t%d new message(s)\n"), 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_cache(GSList *mlist)
+gint procmsg_get_last_num_in_msg_list(GSList *mlist)
 {
        GSList *cur;
        MsgInfo *msginfo;
        gint last = 0;
 
-       if (mlist == NULL) return 0;
-
        for (cur = mlist; cur != NULL; cur = cur->next) {
                msginfo = (MsgInfo *)cur->data;
                if (msginfo && msginfo->msgnum > last)
@@ -460,49 +454,6 @@ struct MarkSum {
        gint first;
 };
 
-static void mark_sum_func(gpointer key, gpointer value, gpointer data)
-{
-       MsgFlags *flags = value;
-       gint num = GPOINTER_TO_INT(key);
-       struct MarkSum *marksum = data;
-
-       if (marksum->first <= num) {
-               if (MSG_IS_NEW(*flags) && !MSG_IS_IGNORE_THREAD(*flags)) (*marksum->new)++;
-               if (MSG_IS_UNREAD(*flags) && !MSG_IS_IGNORE_THREAD(*flags)) (*marksum->unread)++;
-               if (num > *marksum->max) *marksum->max = num;
-               if (num < *marksum->min || *marksum->min == 0) *marksum->min = num;
-               (*marksum->total)++;
-       }
-
-       g_free(flags);
-}
-
-void procmsg_get_mark_sum(const gchar *folder,
-                         gint *new, gint *unread, gint *total,
-                         gint *min, gint *max,
-                         gint first)
-{
-       GHashTable *mark_table;
-       struct MarkSum marksum;
-
-       *new = *unread = *total = *min = *max = 0;
-       marksum.new    = new;
-       marksum.unread = unread;
-       marksum.total  = total;
-       marksum.min    = min;
-       marksum.max    = max;
-       marksum.first  = first;
-
-       mark_table = procmsg_read_mark_file(folder);
-
-       if (mark_table) {
-               g_hash_table_foreach(mark_table, mark_sum_func, &marksum);
-               g_hash_table_destroy(mark_table);
-       }
-       debug_print("mark->new = %d, mark->unread = %d, mark->total = %d\n",
-                   *(marksum.new), *(marksum.unread), *(marksum.total));
-}
-
 static GHashTable *procmsg_read_mark_file(const gchar *folder)
 {
        FILE *fp;
@@ -519,10 +470,18 @@ static GHashTable *procmsg_read_mark_file(const gchar *folder)
        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;
-
-               g_hash_table_insert(mark_table, GUINT_TO_POINTER(num), 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));
+               }
        }
 
        fclose(fp);
@@ -538,10 +497,10 @@ FILE *procmsg_open_mark_file(const gchar *folder, gboolean append)
        markfile = g_strconcat(folder, G_DIR_SEPARATOR_S, MARK_FILE, NULL);
 
        if ((fp = fopen(markfile, "rb")) == NULL)
-               debug_print(_("Mark file not found.\n"));
+               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);
+               debug_print("Mark version is different (%d != %d). "
+                             "Discarding it.\n", ver, MARK_VERSION);
                fclose(fp);
                fp = NULL;
        }
@@ -572,6 +531,15 @@ FILE *procmsg_open_mark_file(const gchar *folder, gboolean append)
        return fp;
 }
 
+static gboolean procmsg_ignore_node(GNode *node, gpointer data)
+{
+       MsgInfo *msginfo = (MsgInfo *)node->data;
+       
+       procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
+
+       return FALSE;
+}
+
 /* return the reversed thread tree */
 GNode *procmsg_get_thread_tree(GSList *mlist)
 {
@@ -581,6 +549,7 @@ GNode *procmsg_get_thread_tree(GSList *mlist)
        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);
@@ -595,8 +564,8 @@ GNode *procmsg_get_thread_tree(GSList *mlist)
                        if (parent == NULL) {
                                parent = root;
                        } else {
-                               if(MSG_IS_IGNORE_THREAD(((MsgInfo *)parent->data)->flags)) {
-                                       MSG_SET_PERM_FLAGS(msginfo->flags, MSG_IGNORE_THREAD);
+                               if (MSG_IS_IGNORE_THREAD(((MsgInfo *)parent->data)->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)) {
+                                       procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
                                }
                        }
                }
@@ -608,10 +577,20 @@ GNode *procmsg_get_thread_tree(GSList *mlist)
                        g_hash_table_insert(msgid_table, (gchar *)msgid, node);
 
                subject = msginfo->subject;
-               if (subject_table_lookup(subject_table,
-                                        (gchar *) subject) == NULL)
-                       subject_table_insert(subject_table, (gchar *)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);
+                       }       
+               }
        }
 
        /* complete the unfinished threads */
@@ -626,8 +605,8 @@ GNode *procmsg_get_thread_tree(GSList *mlist)
                        g_node_insert_before
                                (parent, parent->children, node);
                        /* CLAWS: ignore thread */
-                       if(MSG_IS_IGNORE_THREAD(((MsgInfo *)parent->data)->flags)) {
-                               MSG_SET_PERM_FLAGS(msginfo->flags, MSG_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;
@@ -657,14 +636,14 @@ GNode *procmsg_get_thread_tree(GSList *mlist)
                                g_node_unlink(node);
                                g_node_append(parent, node);
                                /* CLAWS: ignore thread */
-                               if(MSG_IS_IGNORE_THREAD(((MsgInfo *)parent->data)->flags)) {
-                                       MSG_SET_PERM_FLAGS(msginfo->flags, MSG_IGNORE_THREAD);
+                               if (MSG_IS_IGNORE_THREAD(((MsgInfo *)parent->data)->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)) {
+                                       g_node_traverse(node, G_PRE_ORDER, G_TRAVERSE_ALL, -1, procmsg_ignore_node, NULL);
                                }
                        }
                }                                       
                node = next;
        }               
-               
+
        g_hash_table_destroy(subject_table);
        g_hash_table_destroy(msgid_table);
 
@@ -676,14 +655,9 @@ void procmsg_move_messages(GSList *mlist)
        GSList *cur, *movelist = NULL;
        MsgInfo *msginfo;
        FolderItem *dest = NULL;
-       GHashTable *hash;
 
        if (!mlist) return;
 
-       hash = procmsg_to_folder_hash_table_create(mlist);
-       folder_item_scan_foreach(hash);
-       g_hash_table_destroy(hash);
-
        for (cur = mlist; cur != NULL; cur = cur->next) {
                msginfo = (MsgInfo *)cur->data;
                if (!dest) {
@@ -711,13 +685,17 @@ void procmsg_copy_messages(GSList *mlist)
        GSList *cur, *copylist = NULL;
        MsgInfo *msginfo;
        FolderItem *dest = NULL;
-       GHashTable *hash;
 
        if (!mlist) return;
 
+       /* 
+       
+       Horrible: Scanning 2 times for every copy!
+
        hash = procmsg_to_folder_hash_table_create(mlist);
        folder_item_scan_foreach(hash);
        g_hash_table_destroy(hash);
+       */
 
        for (cur = mlist; cur != NULL; cur = cur->next) {
                msginfo = (MsgInfo *)cur->data;
@@ -796,7 +774,7 @@ FILE *procmsg_open_message(MsgInfo *msginfo)
 
        g_free(file);
 
-       if (MSG_IS_QUEUED(msginfo->flags)) {
+       if (MSG_IS_QUEUED(msginfo->flags) || MSG_IS_DRAFT(msginfo->flags)) {
                gchar buf[BUFFSIZE];
 
                while (fgets(buf, sizeof(buf), fp) != NULL)
@@ -881,24 +859,27 @@ void procmsg_empty_trash(void)
 
 gint procmsg_send_queue(FolderItem *queue, gboolean save_msgs)
 {
-       gint i;
        gint ret = 0;
+       GSList *list, *elem;
 
        if (!queue)
                queue = folder_get_default_queue();
        g_return_val_if_fail(queue != NULL, -1);
 
        folder_item_scan(queue);
-       if (queue->last_num < 0) return -1;
-       else if (queue->last_num == 0) return 0;
+       list = folder_item_get_msg_list(queue);
 
-       for (i = 1; i <= queue->last_num; i++) {
+
+       for (elem = list; elem != NULL; elem = elem->next) {
                gchar *file;
+               MsgInfo *msginfo;
+               
+               msginfo = (MsgInfo *)(elem->data);
 
-               file = folder_item_fetch_msg(queue, i);
+               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"), i);
+                               g_warning(_("Sending queued message %d failed.\n"), msginfo->msgnum);
                                ret = -1;
                        } else {
                        /* CLAWS: 
@@ -911,12 +892,15 @@ gint procmsg_send_queue(FolderItem *queue, gboolean save_msgs)
                                                (queue->folder->outbox,
                                                 file, TRUE);
 */
-                               folder_item_remove_msg(queue, i);
+                               folder_item_remove_msg(queue, msginfo->msgnum);
                        }
                        g_free(file);
                }
+               procmsg_msginfo_free(msginfo);
        }
 
+       folderview_update_item(queue, FALSE);
+
        return ret;
 }
 
@@ -925,9 +909,9 @@ gint procmsg_save_to_outbox(FolderItem *outbox, const gchar *file,
 {
        gint num;
        FILE *fp;
-       MsgFlags flag = {0, 0};
+       MsgInfo *msginfo;
 
-       debug_print(_("saving sent message...\n"));
+       debug_print("saving sent message...\n");
 
        if (!outbox)
                outbox = folder_get_default_outbox();
@@ -956,21 +940,27 @@ gint procmsg_save_to_outbox(FolderItem *outbox, const gchar *file,
                        fputs(buf, outfp);
                fclose(outfp);
                fclose(fp);
-               Xstrdup_a(file, tmp, return -1);
-       }
 
-       folder_item_scan(outbox);
-       if ((num = folder_item_add_msg(outbox, file, FALSE)) < 0) {
-               g_warning(_("can't save message\n"));
+               folder_item_scan(outbox);
+               if ((num = folder_item_add_msg(outbox, tmp, 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) {
+                       g_warning("can't save message\n");
+                       return -1;
+               }
                return -1;
        }
-
-       if(is_queued) {
-               unlink(file);
+       msginfo = folder_item_fetch_msginfo(outbox, num);
+       if (msginfo != NULL) {
+           procmsg_msginfo_unset_flags(msginfo, ~0, 0);
+           procmsg_msginfo_free(msginfo);
        }
 
-       procmsg_add_flags(outbox, num, flag);
-
        return 0;
 }
 
@@ -1032,6 +1022,23 @@ void procmsg_print_message(MsgInfo *msginfo, const gchar *cmdline)
        system(buf);
 }
 
+MsgInfo *procmsg_msginfo_new_ref(MsgInfo *msginfo)
+{
+       msginfo->refcnt++;
+       
+       return msginfo;
+}
+
+MsgInfo *procmsg_msginfo_new()
+{
+       MsgInfo *newmsginfo;
+
+       newmsginfo = g_new0(MsgInfo, 1);
+       newmsginfo->refcnt = 1;
+       
+       return newmsginfo;
+}
+
 MsgInfo *procmsg_msginfo_copy(MsgInfo *msginfo)
 {
        MsgInfo *newmsginfo;
@@ -1040,6 +1047,8 @@ MsgInfo *procmsg_msginfo_copy(MsgInfo *msginfo)
 
        newmsginfo = g_new0(MsgInfo, 1);
 
+       newmsginfo->refcnt = 1;
+
 #define MEMBCOPY(mmb)  newmsginfo->mmb = msginfo->mmb
 #define MEMBDUP(mmb)   newmsginfo->mmb = msginfo->mmb ? \
                        g_strdup(msginfo->mmb) : NULL
@@ -1076,10 +1085,45 @@ MsgInfo *procmsg_msginfo_copy(MsgInfo *msginfo)
        return newmsginfo;
 }
 
+MsgInfo *procmsg_msginfo_get_full_info(MsgInfo *msginfo)
+{
+       MsgInfo *full_msginfo;
+       gchar *file;
+
+       if (msginfo == NULL) return NULL;
+
+       file = procmsg_get_message_file(msginfo);
+       if (!file) {
+               g_warning("procmsg_msginfo_get_full_info(): 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;
+
+       full_msginfo->msgnum = msginfo->msgnum;
+       full_msginfo->size = msginfo->size;
+       full_msginfo->mtime = msginfo->mtime;
+       full_msginfo->folder = msginfo->folder;
+       full_msginfo->to_folder = msginfo->to_folder;
+#if USE_GPGME
+       full_msginfo->plaintext_file = g_strdup(msginfo->plaintext_file);
+       full_msginfo->decryption_failed = msginfo->decryption_failed;
+#endif
+
+       /* return full_msginfo;*/
+       return procmsg_msginfo_new_ref(msginfo);
+}
+
 void procmsg_msginfo_free(MsgInfo *msginfo)
 {
        if (msginfo == NULL) return;
 
+       msginfo->refcnt--;
+       if (msginfo->refcnt > 0)
+               return;
+
        g_free(msginfo->fromspace);
        g_free(msginfo->references);
        g_free(msginfo->returnreceiptto);
@@ -1101,15 +1145,41 @@ void procmsg_msginfo_free(MsgInfo *msginfo)
        g_free(msginfo);
 }
 
-static gint procmsg_cmp_msgnum(gconstpointer a, gconstpointer b)
+guint procmsg_msginfo_memusage(MsgInfo *msginfo)
 {
-       const MsgInfo *msginfo = a;
-       const guint msgnum = GPOINTER_TO_UINT(b);
-
-       if (!msginfo)
-               return -1;
-
-       return msginfo->msgnum - msgnum;
+       guint memusage = 0;
+       
+       memusage += sizeof(MsgInfo);
+       if (msginfo->fromname)
+               memusage += strlen(msginfo->fromname);
+       if (msginfo->date)
+               memusage += strlen(msginfo->date);
+       if (msginfo->from)
+               memusage += strlen(msginfo->from);
+       if (msginfo->to)
+               memusage += strlen(msginfo->to);
+       if (msginfo->cc)
+               memusage += strlen(msginfo->cc);
+       if (msginfo->newsgroups)
+               memusage += strlen(msginfo->newsgroups);
+       if (msginfo->subject)
+               memusage += strlen(msginfo->subject);
+       if (msginfo->msgid)
+               memusage += strlen(msginfo->msgid);
+       if (msginfo->inreplyto)
+               memusage += strlen(msginfo->inreplyto);
+       if (msginfo->xface)
+               memusage += strlen(msginfo->xface);
+       if (msginfo->dispositionnotificationto)
+               memusage += strlen(msginfo->dispositionnotificationto);
+       if (msginfo->returnreceiptto)
+               memusage += strlen(msginfo->returnreceiptto);
+       if (msginfo->references)
+               memusage += strlen(msginfo->references);
+       if (msginfo->fromspace)
+               memusage += strlen(msginfo->fromspace);
+
+       return memusage;
 }
 
 gint procmsg_cmp_msgnum_for_sort(gconstpointer a, gconstpointer b)
@@ -1125,17 +1195,6 @@ gint procmsg_cmp_msgnum_for_sort(gconstpointer a, gconstpointer b)
        return msginfo1->msgnum - msginfo2->msgnum;
 }
 
-static gint procmsg_cmp_flag_msgnum(gconstpointer a, gconstpointer b)
-{
-       const FlagInfo *finfo = a;
-       const guint msgnum = GPOINTER_TO_UINT(b);
-
-       if (!finfo)
-               return -1;
-
-       return finfo->msgnum - msgnum;
-}
-
 enum
 {
        Q_SENDER           = 0,
@@ -1144,7 +1203,8 @@ enum
        Q_NEWSGROUPS       = 3,
        Q_MAIL_ACCOUNT_ID  = 4,
        Q_NEWS_ACCOUNT_ID  = 5,
-       Q_SAVE_COPY_FOLDER = 6
+       Q_SAVE_COPY_FOLDER = 6,
+       Q_REPLY_MESSAGE_ID = 7,
 };
 
 gint procmsg_send_message_queue(const gchar *file)
@@ -1156,6 +1216,7 @@ gint procmsg_send_message_queue(const gchar *file)
                                       {"MAID:", NULL, FALSE},
                                       {"NAID:", NULL, FALSE},
                                       {"SCF:",  NULL, FALSE},
+                                      {"RMID:", NULL, FALSE},
                                       {NULL,    NULL, FALSE}};
        FILE *fp;
        gint filepos;
@@ -1165,6 +1226,7 @@ gint procmsg_send_message_queue(const gchar *file)
        GSList *to_list = NULL;
        GSList *newsgroup_list = NULL;
        gchar *savecopyfolder = NULL;
+       gchar *replymessageid = NULL;
        gchar buf[BUFFSIZE];
        gint hnum;
        PrefsAccount *mailac = NULL, *newsac = NULL;
@@ -1203,14 +1265,16 @@ gint procmsg_send_message_queue(const gchar *file)
                case Q_SAVE_COPY_FOLDER:
                        if (!savecopyfolder) savecopyfolder = g_strdup(p);
                        break;
+               case Q_REPLY_MESSAGE_ID:
+                       if (!replymessageid) replymessageid = g_strdup(p);
+                       break;
                }
        }
        filepos = ftell(fp);
 
-       fseek(fp, filepos, SEEK_SET);
        if (to_list) {
-               debug_print(_("Sending message by mail\n"));
-               if(!from) {
+               debug_print("Sending message by mail\n");
+               if (!from) {
                        g_warning(_("Queued message header is broken.\n"));
                        mailval = -1;
                } else if (mailac && mailac->use_mail_command &&
@@ -1258,7 +1322,8 @@ gint procmsg_send_message_queue(const gchar *file)
                }
        }
 
-       if(newsgroup_list && (newsval == 0)) {
+       fseek(fp, filepos, SEEK_SET);
+       if (newsgroup_list && (newsval == 0)) {
                Folder *folder;
                gchar *tmp = NULL;
                FILE *tmpfp;
@@ -1269,7 +1334,7 @@ gint procmsg_send_message_queue(const gchar *file)
                if ((tmpfp = fopen(tmp, "wb")) == NULL) {
                        FILE_OP_ERROR(tmp, "fopen");
                        newsval = -1;
-                       alertpanel_error(_("Could not create temorary file for news sending."));
+                       alertpanel_error(_("Could not create temporary file for news sending."));
                } else {
                        if (change_file_mode_rw(tmpfp, tmp) < 0) {
                                FILE_OP_ERROR(tmp, "chmod");
@@ -1285,8 +1350,8 @@ gint procmsg_send_message_queue(const gchar *file)
                        }
                        fclose(tmpfp);
 
-                       if(newsval == 0) {
-                               debug_print(_("Sending message by news\n"));
+                       if (newsval == 0) {
+                               debug_print("Sending message by news\n");
 
                                folder = FOLDER(newsac->folder);
 
@@ -1313,14 +1378,164 @@ gint procmsg_send_message_queue(const gchar *file)
        if (mailval == 0 && newsval == 0 && savecopyfolder) {
                FolderItem *outbox;
 
-               debug_print(_("saving sent message...\n"));
+               debug_print("saving sent message...\n");
 
                outbox = folder_find_item_from_identifier(savecopyfolder);
-               if(!outbox)
+               if (!outbox)
                        outbox = folder_get_default_outbox();
 
                procmsg_save_to_outbox(outbox, file, TRUE);
        }
 
+       if (replymessageid != NULL) {
+               gchar **tokens;
+               FolderItem *item;
+               
+               tokens = g_strsplit(replymessageid, "\x7f", 0);
+               item = folder_find_item_from_identifier(tokens[0]);
+               if (item != NULL) {
+                       MsgInfo *msginfo;
+                       
+                       msginfo = folder_item_fetch_msginfo(item, atoi(tokens[1]));
+                       if ((msginfo != NULL) && (strcmp(msginfo->msgid, tokens[2]) != 0)) {
+                               procmsg_msginfo_free(msginfo);
+                               msginfo = NULL;
+                       }
+                       
+                       if (msginfo == NULL) {
+                               msginfo = folder_item_fetch_msginfo_by_id(item, tokens[2]);
+                       }
+                       
+                       if (msginfo != NULL) {
+                               procmsg_msginfo_unset_flags(msginfo, MSG_FORWARDED, 0);
+                               procmsg_msginfo_set_flags(msginfo, MSG_REPLIED, 0);
+
+                               procmsg_msginfo_free(msginfo);
+                       }
+               }
+               g_strfreev(tokens);
+       }
+
+       g_free(savecopyfolder);
+       g_free(replymessageid);
+       
        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); \
+}
+
+void procmsg_msginfo_set_flags(MsgInfo *msginfo, MsgPermFlags perm_flags, MsgTmpFlags tmp_flags)
+{
+       gboolean changed = FALSE;
+       FolderItem *item = msginfo->folder;
+
+       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++;
+               changed = TRUE;
+       }
+
+       /* if unread flag is set */
+       if ((perm_flags & MSG_UNREAD) && !MSG_IS_UNREAD(msginfo->flags) &&
+          !MSG_IS_IGNORE_THREAD(msginfo->flags)) {
+               item->unread++;
+               changed = TRUE;
+       }
+
+       /* 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--;
+                       changed = TRUE;
+               }
+               if (MSG_IS_UNREAD(msginfo->flags) || (perm_flags & MSG_UNREAD)) {
+                       item->unread--;
+                       changed = TRUE;
+               }
+       }
+
+       if (MSG_IS_IMAP(msginfo->flags))
+               imap_msg_set_perm_flags(msginfo, perm_flags);
+
+       msginfo->flags.perm_flags |= perm_flags;
+       msginfo->flags.tmp_flags |= tmp_flags;
+
+       if (changed) {
+               folderview_update_item(item, FALSE);
+       }
+       CHANGE_FLAGS(msginfo);
+       procmsg_msginfo_write_flags(msginfo);
+}
+
+void procmsg_msginfo_unset_flags(MsgInfo *msginfo, MsgPermFlags perm_flags, MsgTmpFlags tmp_flags)
+{
+       gboolean changed = FALSE;
+       FolderItem *item = msginfo->folder;
+       
+       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--;
+               changed = TRUE;
+       }
+
+       /* if unread flag is unset */
+       if ((perm_flags & MSG_UNREAD) && MSG_IS_UNREAD(msginfo->flags) &&
+          !MSG_IS_IGNORE_THREAD(msginfo->flags)) {
+               item->unread--;
+               changed = TRUE;
+       }
+
+       /* 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++;
+                       changed = TRUE;
+               }
+               if (MSG_IS_UNREAD(msginfo->flags) && !(perm_flags & MSG_UNREAD)) {
+                       item->unread++;
+                       changed = TRUE;
+               }
+       }
+
+       if (MSG_IS_IMAP(msginfo->flags))
+               imap_msg_unset_perm_flags(msginfo, perm_flags);
+
+       msginfo->flags.perm_flags &= ~perm_flags;
+       msginfo->flags.tmp_flags &= ~tmp_flags;
+
+       if (changed) 
+               folderview_update_item(item, FALSE);
+       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);
+}