2005-08-10 [colin] 1.9.13cvs32

[claws.git] / src / procmsg.c

diff --git a/src/procmsg.c b/src/procmsg.c
index 16ff841327c8d63196b89fabd80f3145cd8958c1..b19098f94037bf441f472a6f6440f8e201835793 100644 (file)
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -1878,7 +1878,8 @@ MsgInfo *procmsg_msginfo_new_from_mimeinfo(MsgInfo *src_msginfo, MimeInfo *mimei
                g_warning("procmsg_msginfo_new_from_mimeinfo(): unsuitable mimeinfo");
                return NULL;
        }
-                   
+       
+       
        if (mimeinfo->content == MIMECONTENT_MEM) {
                gchar *tmpfile = get_tmp_file();
                str_write_to_file(mimeinfo->data.mem, tmpfile);
@@ -1897,12 +1898,17 @@ MsgInfo *procmsg_msginfo_new_from_mimeinfo(MsgInfo *src_msginfo, MimeInfo *mimei
        } else {
                gchar *tmpfile = get_tmp_file();
                FILE *fp = fopen(tmpfile, "wb");
-               if (fp && procmime_write_message_rfc822(mimeinfo, fp) >= 0) {
+               if (fp && procmime_write_mimeinfo(mimeinfo, fp) >= 0) {
+                       if (fp)
+                               fclose(fp);
+                       fp = NULL;
                        tmp_msginfo = procheader_parse_file(
-                               tmpfile, flags, TRUE, FALSE);
+                               tmpfile, flags, 
+                               TRUE, FALSE);
                }
                if (fp)
                        fclose(fp);
+
                if (tmp_msginfo != NULL) {
                        tmp_msginfo->folder = src_msginfo->folder;
                        tmp_msginfo->plaintext_file = g_strdup(tmpfile);