2011-04-08 [wwp] 3.7.8cvs74
[claws.git] / src / procmime.c
index a472df52a9a4be47be15aa822aaa1bc2e8a91533..e44627eade36ab0182444fb2406268d5714e1eb2 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto & The Claws Mail Team
+ * Copyright (C) 1999-2011 Hiroyuki Yamamoto & 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
@@ -156,8 +156,8 @@ void procmime_mimeinfo_free_all(MimeInfo *mimeinfo)
 
 MimeInfo *procmime_mimeinfo_parent(MimeInfo *mimeinfo)
 {
-       g_return_val_if_fail(mimeinfo != NULL, NULL);
-       g_return_val_if_fail(mimeinfo->node != NULL, NULL);
+       cm_return_val_if_fail(mimeinfo != NULL, NULL);
+       cm_return_val_if_fail(mimeinfo->node != NULL, NULL);
 
        if (mimeinfo->node->parent == NULL)
                return NULL;
@@ -166,8 +166,8 @@ MimeInfo *procmime_mimeinfo_parent(MimeInfo *mimeinfo)
 
 MimeInfo *procmime_mimeinfo_next(MimeInfo *mimeinfo)
 {
-       g_return_val_if_fail(mimeinfo != NULL, NULL);
-       g_return_val_if_fail(mimeinfo->node != NULL, NULL);
+       cm_return_val_if_fail(mimeinfo != NULL, NULL);
+       cm_return_val_if_fail(mimeinfo->node != NULL, NULL);
 
        if (mimeinfo->node->children)
                return (MimeInfo *) mimeinfo->node->children->data;
@@ -190,8 +190,8 @@ MimeInfo *procmime_scan_message(MsgInfo *msginfo)
 {
        gchar *filename;
        MimeInfo *mimeinfo;
-       START_TIMING("");
-       filename = procmsg_get_message_file_path(msginfo);
+
+       filename = procmsg_get_message_file_path(msginfo);
        if (!filename || !is_file_exist(filename)) {
                g_free(filename);
                return NULL;
@@ -204,7 +204,6 @@ MimeInfo *procmime_scan_message(MsgInfo *msginfo)
                mimeinfo = procmime_scan_queue_file(filename);
        g_free(filename);
 
-       END_TIMING();
        return mimeinfo;
 }
 
@@ -242,8 +241,8 @@ const gchar *procmime_mimeinfo_get_parameter(MimeInfo *mimeinfo, const gchar *na
 {
        const gchar *value;
 
-       g_return_val_if_fail(mimeinfo != NULL, NULL);
-       g_return_val_if_fail(name != NULL, NULL);
+       cm_return_val_if_fail(mimeinfo != NULL, NULL);
+       cm_return_val_if_fail(name != NULL, NULL);
 
        value = g_hash_table_lookup(mimeinfo->dispositionparameters, name);
        if (value == NULL)
@@ -291,7 +290,7 @@ gboolean procmime_decode_content(MimeInfo *mimeinfo)
        gchar lastline[BUFFSIZE];
        memset(lastline, 0, BUFFSIZE);
                   
-       g_return_val_if_fail(mimeinfo != NULL, FALSE);
+       cm_return_val_if_fail(mimeinfo != NULL, FALSE);
 
        if (prefs_common.respect_flowed_format &&
            mimeinfo->type == MIMETYPE_TEXT && 
@@ -345,11 +344,13 @@ gboolean procmime_decode_content(MimeInfo *mimeinfo)
                        FLUSH_LASTLINE();
        } else if (encoding == ENC_BASE64) {
                gchar outbuf[BUFFSIZE];
-               gint len;
+               gint len, inlen, inread;
                Base64Decoder *decoder;
                gboolean got_error = FALSE;
                gboolean uncanonicalize = FALSE;
                FILE *tmpfp = outfp;
+               gboolean null_bytes = FALSE;
+               gboolean starting = TRUE;
 
                if (mimeinfo->type == MIMETYPE_TEXT ||
                    mimeinfo->type == MIMETYPE_MESSAGE) {
@@ -364,9 +365,15 @@ gboolean procmime_decode_content(MimeInfo *mimeinfo)
                }
 
                decoder = base64_decoder_new();
-               while ((ftell(infp) < readend) && (fgets(buf, sizeof(buf), infp) != NULL)) {
-                       len = base64_decoder_decode(decoder, buf, outbuf);
-                       if (len < 0 && !got_error) {
+               while ((inlen = MIN(readend - ftell(infp), sizeof(buf))) > 0 && !err) {
+                       inread = fread(buf, 1, inlen, infp);
+                       len = base64_decoder_decode(decoder, buf, outbuf, inread);
+                       if (uncanonicalize == TRUE && strlen(outbuf) < len && starting) {
+                               uncanonicalize = FALSE;
+                               null_bytes = TRUE;
+                       }
+                       starting = FALSE;
+                       if (((inread != inlen) || len < 0) && !got_error) {
                                g_warning("Bad BASE64 content.\n");
                                if (fwrite(_("[Error decoding BASE64]\n"),
                                        sizeof(gchar),
@@ -378,8 +385,14 @@ gboolean procmime_decode_content(MimeInfo *mimeinfo)
                        } else if (len >= 0) {
                                /* print out the error message only once 
                                 * per block */
-                               if (fwrite(outbuf, sizeof(gchar), len, tmpfp) < len)
-                                       err = TRUE;
+                               if (null_bytes) {
+                                       /* we won't uncanonicalize, output to outfp directly */
+                                       if (fwrite(outbuf, sizeof(gchar), len, outfp) < len)
+                                               err = TRUE;
+                               } else {
+                                       if (fwrite(outbuf, sizeof(gchar), len, tmpfp) < len)
+                                               err = TRUE;
+                               }
                                got_error = FALSE;
                        }
                }
@@ -476,15 +489,18 @@ gboolean procmime_encode_content(MimeInfo *mimeinfo, EncodingType encoding)
                return FALSE;
        }
 
-       if (mimeinfo->content == MIMECONTENT_FILE) {
+       if (mimeinfo->content == MIMECONTENT_FILE && mimeinfo->data.filename) {
                if ((infp = g_fopen(mimeinfo->data.filename, "rb")) == NULL) {
                        g_warning("Can't open file %s\n", mimeinfo->data.filename);
+                       fclose(outfp);
                        return FALSE;
                }
        } else if (mimeinfo->content == MIMECONTENT_MEM) {
                infp = str_open_as_stream(mimeinfo->data.mem);
-               if (infp == NULL)
+               if (infp == NULL) {
+                       fclose(outfp);
                        return FALSE;
+               }
        }
 
        if (encoding == ENC_BASE64) {
@@ -499,6 +515,7 @@ gboolean procmime_encode_content(MimeInfo *mimeinfo, EncodingType encoding)
                                if (canonicalize_file(mimeinfo->data.filename, tmp_file) < 0) {
                                        g_free(tmp_file);
                                        fclose(infp);
+                                       fclose(outfp);
                                        return FALSE;
                                }
                                if ((tmp_fp = g_fopen(tmp_file, "rb")) == NULL) {
@@ -506,6 +523,7 @@ gboolean procmime_encode_content(MimeInfo *mimeinfo, EncodingType encoding)
                                        claws_unlink(tmp_file);
                                        g_free(tmp_file);
                                        fclose(infp);
+                                       fclose(outfp);
                                        return FALSE;
                                }
                        } else {
@@ -514,8 +532,10 @@ gboolean procmime_encode_content(MimeInfo *mimeinfo, EncodingType encoding)
                                infp = str_open_as_stream(out);
                                tmp_fp = infp;
                                g_free(out);
-                               if (infp == NULL)
+                               if (infp == NULL) {
+                                       fclose(outfp);
                                        return FALSE;
+                               }
                        }
                }
 
@@ -604,8 +624,8 @@ gint procmime_get_part(const gchar *outfile, MimeInfo *mimeinfo)
        gint restlength, readlength;
        gint saved_errno = 0;
 
-       g_return_val_if_fail(outfile != NULL, -1);
-       g_return_val_if_fail(mimeinfo != NULL, -1);
+       cm_return_val_if_fail(outfile != NULL, -1);
+       cm_return_val_if_fail(mimeinfo != NULL, -1);
 
        if (mimeinfo->encoding_type != ENC_BINARY && !procmime_decode_content(mimeinfo))
                return -EINVAL;
@@ -633,6 +653,7 @@ gint procmime_get_part(const gchar *outfile, MimeInfo *mimeinfo)
        while ((restlength > 0) && ((readlength = fread(buf, 1, restlength > BUFFSIZE ? BUFFSIZE : restlength, infp)) > 0)) {
                if (fwrite(buf, 1, readlength, outfp) != readlength) {
                        saved_errno = errno;
+                       fclose(infp);
                        fclose(outfp);
                        return -(saved_errno);
                }
@@ -650,7 +671,7 @@ gint procmime_get_part(const gchar *outfile, MimeInfo *mimeinfo)
        return 0;
 }
 
-static FILE *procmime_get_text_content(MimeInfo *mimeinfo)
+FILE *procmime_get_text_content(MimeInfo *mimeinfo)
 {
        FILE *tmpfp, *outfp;
        const gchar *src_codeset;
@@ -660,7 +681,7 @@ static FILE *procmime_get_text_content(MimeInfo *mimeinfo)
        gchar *tmpfile;
        gboolean err = FALSE;
 
-       g_return_val_if_fail(mimeinfo != NULL, NULL);
+       cm_return_val_if_fail(mimeinfo != NULL, NULL);
 
        if (!procmime_decode_content(mimeinfo))
                return NULL;
@@ -691,8 +712,15 @@ static FILE *procmime_get_text_content(MimeInfo *mimeinfo)
                      ? forced_charset : 
                      procmime_mimeinfo_get_parameter(mimeinfo, "charset");
 
+       /* use supersets transparently when possible */
        if (!forced_charset && src_codeset && !strcasecmp(src_codeset, CS_ISO_8859_1))
                src_codeset = CS_WINDOWS_1252;
+       else if (!forced_charset && src_codeset && !strcasecmp(src_codeset, CS_X_GBK))
+               src_codeset = CS_GB18030;
+       else if (!forced_charset && src_codeset && !strcasecmp(src_codeset, CS_GBK))
+               src_codeset = CS_GB18030;
+       else if (!forced_charset && src_codeset && !strcasecmp(src_codeset, CS_GB2312))
+               src_codeset = CS_GB18030;
 
        if (mimeinfo->type == MIMETYPE_TEXT && !g_ascii_strcasecmp(mimeinfo->subtype, "html")) {
                SC_HTMLParser *parser;
@@ -749,6 +777,38 @@ static FILE *procmime_get_text_content(MimeInfo *mimeinfo)
        return outfp;
 }
 
+FILE *procmime_get_binary_content(MimeInfo *mimeinfo)
+{
+       FILE *outfp;
+       gchar *tmpfile;
+
+       cm_return_val_if_fail(mimeinfo != NULL, NULL);
+
+       if (!procmime_decode_content(mimeinfo))
+               return NULL;
+
+       tmpfile = procmime_get_tmp_file_name(mimeinfo);
+       if (tmpfile == NULL)
+               return NULL;
+
+       if (procmime_get_part(tmpfile, mimeinfo) < 0) {
+               g_free(tmpfile);
+               return NULL;
+       }
+
+       outfp = g_fopen(tmpfile, "rb");
+       if (outfp == NULL) {
+               g_unlink(tmpfile);
+               g_free(tmpfile);
+               return NULL;
+       }
+
+       g_unlink(tmpfile);
+       g_free(tmpfile);
+
+       return outfp;
+}
+
 /* search the first text part of (multipart) MIME message,
    decode, convert it and output to outfp. */
 FILE *procmime_get_first_text_content(MsgInfo *msginfo)
@@ -756,8 +816,8 @@ FILE *procmime_get_first_text_content(MsgInfo *msginfo)
        FILE *outfp = NULL;
        MimeInfo *mimeinfo, *partinfo;
        gboolean empty_ok = FALSE, short_scan = TRUE;
-       START_TIMING("");
-       g_return_val_if_fail(msginfo != NULL, NULL);
+
+       cm_return_val_if_fail(msginfo != NULL, NULL);
 
        /* first we try to short-scan (for speed), refusing empty parts */
 scan_again:
@@ -790,7 +850,6 @@ scan_again:
                goto scan_again;
        }
        procmime_mimeinfo_free_all(mimeinfo);
-       END_TIMING();
        return outfp;
 }
 
@@ -825,7 +884,7 @@ FILE *procmime_get_first_encrypted_text_content(MsgInfo *msginfo)
        FILE *outfp = NULL;
        MimeInfo *mimeinfo, *partinfo, *encinfo;
 
-       g_return_val_if_fail(msginfo != NULL, NULL);
+       cm_return_val_if_fail(msginfo != NULL, NULL);
 
        mimeinfo = procmime_scan_message(msginfo);
        if (!mimeinfo) {
@@ -861,7 +920,7 @@ gboolean procmime_msginfo_is_encrypted(MsgInfo *msginfo)
        MimeInfo *mimeinfo, *partinfo;
        gboolean result = FALSE;
 
-       g_return_val_if_fail(msginfo != NULL, FALSE);
+       cm_return_val_if_fail(msginfo != NULL, FALSE);
 
        mimeinfo = procmime_scan_message(msginfo);
        if (!mimeinfo) {
@@ -875,68 +934,6 @@ gboolean procmime_msginfo_is_encrypted(MsgInfo *msginfo)
        return result;
 }
 
-static gboolean procmime_find_string_part(MimeInfo *mimeinfo, const gchar *filename,
-                                  const gchar *str, StrFindFunc find_func)
-{
-       FILE *outfp;
-       gchar buf[BUFFSIZE];
-
-       g_return_val_if_fail(mimeinfo != NULL, FALSE);
-       g_return_val_if_fail(mimeinfo->type == MIMETYPE_TEXT, FALSE);
-       g_return_val_if_fail(str != NULL, FALSE);
-       g_return_val_if_fail(find_func != NULL, FALSE);
-
-       outfp = procmime_get_text_content(mimeinfo);
-
-       if (!outfp)
-               return FALSE;
-
-       while (fgets(buf, sizeof(buf), outfp) != NULL) {
-               strretchomp(buf);
-               if (find_func(buf, str)) {
-                       fclose(outfp);
-                       return TRUE;
-               }
-       }
-
-       fclose(outfp);
-
-       return FALSE;
-}
-
-gboolean procmime_find_string(MsgInfo *msginfo, const gchar *str,
-                             StrFindFunc find_func)
-{
-       MimeInfo *mimeinfo;
-       MimeInfo *partinfo;
-       gchar *filename;
-       gboolean found = FALSE;
-
-       g_return_val_if_fail(msginfo != NULL, FALSE);
-       g_return_val_if_fail(str != NULL, FALSE);
-       g_return_val_if_fail(find_func != NULL, FALSE);
-
-       filename = procmsg_get_message_file(msginfo);
-       if (!filename) return FALSE;
-       mimeinfo = procmime_scan_message(msginfo);
-
-       for (partinfo = mimeinfo; partinfo != NULL;
-            partinfo = procmime_mimeinfo_next(partinfo)) {
-               if (partinfo->type == MIMETYPE_TEXT) {
-                       if (procmime_find_string_part
-                               (partinfo, filename, str, find_func) == TRUE) {
-                               found = TRUE;
-                               break;
-                       }
-               }
-       }
-
-       procmime_mimeinfo_free_all(mimeinfo);
-       g_free(filename);
-
-       return found;
-}
-
 gchar *procmime_get_tmp_file_name(MimeInfo *mimeinfo)
 {
        static guint32 id = 0;
@@ -944,7 +941,7 @@ gchar *procmime_get_tmp_file_name(MimeInfo *mimeinfo)
        gchar *filename;
        gchar f_prefix[10];
 
-       g_return_val_if_fail(mimeinfo != NULL, NULL);
+       cm_return_val_if_fail(mimeinfo != NULL, NULL);
 
        g_snprintf(f_prefix, sizeof(f_prefix), "%08x.", id++);
 
@@ -1357,32 +1354,32 @@ static void procmime_parse_message_rfc822(MimeInfo *mimeinfo, gboolean short_sca
        fseek(fp, mimeinfo->offset, SEEK_SET);
        procheader_get_header_fields(fp, hentry);
        if (hentry[0].body != NULL) {
-                tmp = conv_unmime_header(hentry[0].body, NULL);
+               tmp = conv_unmime_header(hentry[0].body, NULL, FALSE);
                 g_free(hentry[0].body);
                 hentry[0].body = tmp;
         }                
        if (hentry[2].body != NULL) {
-                tmp = conv_unmime_header(hentry[2].body, NULL);
+               tmp = conv_unmime_header(hentry[2].body, NULL, FALSE);
                 g_free(hentry[2].body);
                 hentry[2].body = tmp;
         }                
        if (hentry[4].body != NULL) {
-                tmp = conv_unmime_header(hentry[4].body, NULL);
+               tmp = conv_unmime_header(hentry[4].body, NULL, FALSE);
                 g_free(hentry[4].body);
                 hentry[4].body = tmp;
         }                
        if (hentry[5].body != NULL) {
-                tmp = conv_unmime_header(hentry[5].body, NULL);
+               tmp = conv_unmime_header(hentry[5].body, NULL, FALSE);
                 g_free(hentry[5].body);
                 hentry[5].body = tmp;
         }                
        if (hentry[7].body != NULL) {
-                tmp = conv_unmime_header(hentry[7].body, NULL);
+               tmp = conv_unmime_header(hentry[7].body, NULL, FALSE);
                 g_free(hentry[7].body);
                 hentry[7].body = tmp;
         }
        if (hentry[8].body != NULL) {
-                tmp = conv_unmime_header(hentry[8].body, NULL);
+               tmp = conv_unmime_header(hentry[8].body, NULL, FALSE);
                 g_free(hentry[8].body);
                 hentry[8].body = tmp;
         }
@@ -1435,8 +1432,10 @@ static void procmime_parse_disposition_notification(MimeInfo *mimeinfo,
        } else {
                procheader_get_header_fields(fp, hentry);
        }
+    
+        fclose(fp);
 
-       if (!hentry[0].body || !hentry[1].body) {
+       if (!hentry[0].body || !hentry[1].body) {
                debug_print("MsgId %s, Disp %s\n",
                        hentry[0].body ? hentry[0].body:"(nil)",
                        hentry[1].body ? hentry[1].body:"(nil)");
@@ -1480,32 +1479,32 @@ bail:
 #define GET_HEADERS() {                                                \
        procheader_get_header_fields(fp, hentry);               \
         if (hentry[0].body != NULL) {                          \
-                tmp = conv_unmime_header(hentry[0].body, NULL);        \
+               tmp = conv_unmime_header(hentry[0].body, NULL, FALSE);  \
                 g_free(hentry[0].body);                                \
                 hentry[0].body = tmp;                          \
         }                                                      \
         if (hentry[2].body != NULL) {                          \
-                tmp = conv_unmime_header(hentry[2].body, NULL);        \
+               tmp = conv_unmime_header(hentry[2].body, NULL, FALSE);  \
                 g_free(hentry[2].body);                                \
                 hentry[2].body = tmp;                          \
         }                                                      \
         if (hentry[4].body != NULL) {                          \
-                tmp = conv_unmime_header(hentry[4].body, NULL);        \
+               tmp = conv_unmime_header(hentry[4].body, NULL, FALSE);  \
                 g_free(hentry[4].body);                                \
                 hentry[4].body = tmp;                          \
         }                                                      \
         if (hentry[5].body != NULL) {                          \
-                tmp = conv_unmime_header(hentry[5].body, NULL);        \
+               tmp = conv_unmime_header(hentry[5].body, NULL, FALSE);  \
                 g_free(hentry[5].body);                                \
                 hentry[5].body = tmp;                          \
         }                                                      \
        if (hentry[6].body != NULL) {                           \
-                tmp = conv_unmime_header(hentry[6].body, NULL);        \
+               tmp = conv_unmime_header(hentry[6].body, NULL, FALSE);  \
                 g_free(hentry[6].body);                                \
                 hentry[6].body = tmp;                          \
         }                                                      \
        if (hentry[7].body != NULL) {                           \
-                tmp = conv_unmime_header(hentry[7].body, NULL);        \
+               tmp = conv_unmime_header(hentry[7].body, NULL, FALSE);  \
                 g_free(hentry[7].body);                                \
                 hentry[7].body = tmp;                          \
         }                                                      \
@@ -1536,6 +1535,8 @@ static void procmime_parse_multipart(MimeInfo *mimeinfo, gboolean short_scan)
        FILE *fp;
        int result = 0;
        gboolean done = FALSE;
+       gboolean start_found = FALSE;
+       gboolean end_found = FALSE;
 
        boundary = g_hash_table_lookup(mimeinfo->typeparameters, "boundary");
        if (!boundary)
@@ -1549,12 +1550,15 @@ static void procmime_parse_multipart(MimeInfo *mimeinfo, gboolean short_scan)
                FILE_OP_ERROR(mimeinfo->data.filename, "fopen");
                return;
        }
+
        fseek(fp, mimeinfo->offset, SEEK_SET);
        while ((p = fgets(buf, sizeof(buf), fp)) != NULL && result == 0) {
                if (ftell(fp) - 1 > (mimeinfo->offset + mimeinfo->length))
                        break;
 
                if (IS_BOUNDARY(buf, boundary, boundary_len)) {
+                       start_found = TRUE;
+
                        if (lastoffset != -1) {
                                gint len = (ftell(fp) - strlen(buf)) - lastoffset - 1;
                                if (len < 0)
@@ -1574,6 +1578,7 @@ static void procmime_parse_multipart(MimeInfo *mimeinfo, gboolean short_scan)
                        
                        if (buf[2 + boundary_len]     == '-' &&
                            buf[2 + boundary_len + 1] == '-') {
+                               end_found = TRUE;
                                break;
                        }
                        for (i = 0; i < (sizeof hentry / sizeof hentry[0]) ; i++) {
@@ -1584,6 +1589,22 @@ static void procmime_parse_multipart(MimeInfo *mimeinfo, gboolean short_scan)
                        lastoffset = ftell(fp);
                }
        }
+       
+       if (start_found && !end_found && lastoffset != -1) {
+               gint len = (ftell(fp) - strlen(buf)) - lastoffset - 1;
+
+               if (len >= 0) {
+                       result = procmime_parse_mimepart(mimeinfo,
+                                       hentry[0].body, hentry[1].body,
+                                       hentry[2].body, hentry[3].body, 
+                                       hentry[4].body, hentry[5].body,
+                                       hentry[6].body, hentry[7].body,
+                                       mimeinfo->data.filename, lastoffset,
+                                       len, short_scan);
+               }
+               mimeinfo->broken = TRUE;
+       }
+       
        for (i = 0; i < (sizeof hentry / sizeof hentry[0]); i++) {
                g_free(hentry[i].body);
                hentry[i].body = NULL;
@@ -1625,8 +1646,8 @@ static void parse_parameters(const gchar *parameters, GHashTable *table)
                down_attr = g_utf8_strdown(attribute, -1);
                orig_down_attr = down_attr;
        
-               len = strlen(down_attr);
-               if (down_attr[len - 1] == '*') {
+               len = down_attr ? strlen(down_attr):0;
+               if (len > 0 && down_attr[len - 1] == '*') {
                        gchar *srcpos, *dstpos, *endpos;
 
                        convert = TRUE;
@@ -1651,6 +1672,8 @@ static void parse_parameters(const gchar *parameters, GHashTable *table)
                                dstpos++;
                        }
                        *dstpos = '\0';
+                       if (value[0] == '"')
+                               extract_quote(value, '"');
                } else {
                        if (value[0] == '"')
                                extract_quote(value, '"');
@@ -1670,7 +1693,7 @@ static void parse_parameters(const gchar *parameters, GHashTable *table)
                        while (value[strlen(value)-1] == ' ') 
                                value[strlen(value)-1] = '\0';
                }               
-               if (strrchr(down_attr, '*') != NULL) {
+               if (down_attr && strrchr(down_attr, '*') != NULL) {
                        gchar *tmpattr;
 
                        tmpattr = g_strdup(down_attr);
@@ -1707,6 +1730,7 @@ static void parse_parameters(const gchar *parameters, GHashTable *table)
                while ((partvalue = g_hash_table_lookup(table, attrwnum)) != NULL) {
                        g_string_append(value, partvalue);
 
+                       g_hash_table_remove(table, attrwnum);
                        g_free(attrwnum);
                        n++;
                        attrwnum = g_strdup_printf("%s*%d", attribute, n);
@@ -1756,8 +1780,8 @@ static void parse_parameters(const gchar *parameters, GHashTable *table)
 
 static void procmime_parse_content_type(const gchar *content_type, MimeInfo *mimeinfo)
 {
-       g_return_if_fail(content_type != NULL);
-       g_return_if_fail(mimeinfo != NULL);
+       cm_return_if_fail(content_type != NULL);
+       cm_return_if_fail(mimeinfo != NULL);
 
        /* RFC 2045, page 13 says that the mime subtype is MANDATORY;
         * if it's not available we use the default Content-Type */
@@ -1797,8 +1821,8 @@ static void procmime_parse_content_disposition(const gchar *content_disposition,
 {
        gchar *tmp, *params;
 
-       g_return_if_fail(content_disposition != NULL);
-       g_return_if_fail(mimeinfo != NULL);
+       cm_return_if_fail(content_disposition != NULL);
+       cm_return_if_fail(mimeinfo != NULL);
 
        tmp = g_strdup(content_disposition);
        if ((params = strchr(tmp, ';')) != NULL) {
@@ -1862,7 +1886,7 @@ void procmime_mimeparser_unregister(MimeParser *parser)
 
 static gboolean procmime_mimeparser_parse(MimeParser *parser, MimeInfo *mimeinfo)
 {
-       g_return_val_if_fail(parser->parse != NULL, FALSE);
+       cm_return_val_if_fail(parser->parse != NULL, FALSE);
        return parser->parse(parser, mimeinfo); 
 }
 
@@ -1888,6 +1912,7 @@ static int procmime_parse_mimepart(MimeInfo *parent,
        /* Create MimeInfo */
        mimeinfo = procmime_mimeinfo_new();
        mimeinfo->content = MIMECONTENT_FILE;
+
        if (parent != NULL) {
                if (g_node_depth(parent->node) > 32) {
                        /* 32 is an arbitrary value
@@ -2041,7 +2066,7 @@ static MimeInfo *procmime_scan_file_full(const gchar *filename, gboolean short_s
 {
        MimeInfo *mimeinfo;
 
-       g_return_val_if_fail(filename != NULL, NULL);
+       cm_return_val_if_fail(filename != NULL, NULL);
 
        mimeinfo = procmime_scan_file_with_offset(filename, 0, short_scan);
 
@@ -2065,7 +2090,7 @@ static MimeInfo *procmime_scan_queue_file_full(const gchar *filename, gboolean s
        gchar buf[BUFFSIZE];
        gint offset = 0;
 
-       g_return_val_if_fail(filename != NULL, NULL);
+       cm_return_val_if_fail(filename != NULL, NULL);
 
        /* Open file */
        if ((fp = g_fopen(filename, "rb")) == NULL)
@@ -2111,13 +2136,12 @@ typedef enum {
     ENC_AS_TOKEN,
     ENC_AS_QUOTED_STRING,
     ENC_AS_EXTENDED,
-    ENC_TO_ASCII,
+    ENC_AS_ENCWORD
 } EncodeAs;
 
 typedef struct _ParametersData {
        FILE *fp;
        guint len;
-       guint ascii_only;
        gint error;
 } ParametersData;
 
@@ -2127,12 +2151,13 @@ static void write_parameters(gpointer key, gpointer value, gpointer user_data)
        gchar *val = value, *valpos, *tmp;
        ParametersData *pdata = (ParametersData *)user_data;
        GString *buf = g_string_new("");
+       gint len;
 
        EncodeAs encas = ENC_AS_TOKEN;
 
        for (valpos = val; *valpos != 0; valpos++) {
-               if (!IS_ASCII(*valpos) || *valpos == '"') {
-                       encas = ENC_AS_EXTENDED;
+               if (!IS_ASCII(*valpos)) {
+                       encas = ENC_AS_ENCWORD;
                        break;
                }
            
@@ -2154,7 +2179,7 @@ static void write_parameters(gpointer key, gpointer value, gpointer user_data)
                case ';':
                case ':':
                case '\\':
-               case '\'':
+               case '"':
                case '/':
                case '[':
                case ']':
@@ -2165,29 +2190,16 @@ static void write_parameters(gpointer key, gpointer value, gpointer user_data)
                }
        }
        
-       if (encas == ENC_AS_EXTENDED && pdata->ascii_only == TRUE) 
-               encas = ENC_TO_ASCII;
-
        switch (encas) {
        case ENC_AS_TOKEN:
                g_string_append_printf(buf, "%s=%s", param, val);
                break;
 
-       case ENC_TO_ASCII:
-               tmp = g_strdup(val);
-               g_strcanon(tmp, 
-                       " ()<>@,';:\\/[]?=.0123456789"
-                       "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                       "abcdefghijklmnopqrstuvwxyz",
-                       '_');
-               g_string_append_printf(buf, "%s=\"%s\"", param, tmp);
-               g_free(tmp);
-               break;
-
        case ENC_AS_QUOTED_STRING:
                g_string_append_printf(buf, "%s=\"%s\"", param, val);
                break;
 
+#if 0 /* we don't use that for now */
        case ENC_AS_EXTENDED:
                if (!g_utf8_validate(val, -1, NULL))
                        g_string_append_printf(buf, "%s*=%s''", param,
@@ -2204,11 +2216,48 @@ static void write_parameters(gpointer key, gpointer value, gpointer user_data)
                                g_string_append_printf(buf, "%%%s", hexstr);
                        }
                }
-               break;          
+               break;
+#else
+       case ENC_AS_EXTENDED:
+               debug_print("Unhandled ENC_AS_EXTENDED.");
+               break;
+#endif
+       case ENC_AS_ENCWORD:
+               len = MAX(strlen(val)*6, 512);
+               tmp = g_malloc(len+1);
+               codeconv_set_strict(TRUE);
+               conv_encode_header_full(tmp, len, val, pdata->len + strlen(param) + 4 , FALSE,
+                       prefs_common.outgoing_charset);
+               codeconv_set_strict(FALSE);
+               if (!tmp || !*tmp) {
+                       codeconv_set_strict(TRUE);
+                       conv_encode_header_full(tmp, len, val, pdata->len + strlen(param) + 4 , FALSE,
+                               conv_get_outgoing_charset_str());
+                       codeconv_set_strict(FALSE);
+               }
+               if (!tmp || !*tmp) {
+                       codeconv_set_strict(TRUE);
+                       conv_encode_header_full(tmp, len, val, pdata->len + strlen(param) + 4 , FALSE,
+                               CS_UTF_8);
+                       codeconv_set_strict(FALSE);
+               }
+               if (!tmp || !*tmp) {
+                       conv_encode_header_full(tmp, len, val, pdata->len + strlen(param) + 4 , FALSE,
+                               CS_UTF_8);
+               }
+               g_string_append_printf(buf, "%s=\"%s\"", param, tmp);
+               g_free(tmp);
+               break;
+
        }
        
        if (buf->str && strlen(buf->str)) {
-               if (pdata->len + strlen(buf->str) + 2 > 76) {
+               tmp = strstr(buf->str, "\n");
+               if (tmp)
+                       len = (tmp - buf->str);
+               else
+                       len = strlen(buf->str);
+               if (pdata->len + len > 76) {
                        if (fprintf(pdata->fp, ";\n %s", buf->str) < 0)
                                pdata->error = TRUE;
                        pdata->len = strlen(buf->str) + 1;
@@ -2234,7 +2283,6 @@ int procmime_write_mime_header(MimeInfo *mimeinfo, FILE *fp)
        debug_print("procmime_write_mime_header\n");
        
        pdata->fp = fp;
-       pdata->ascii_only = FALSE;
        pdata->error = FALSE;
        for (type_table = mime_type_table; type_table->str != NULL; type_table++)
                if (mimeinfo->type == type_table->type) {
@@ -2246,7 +2294,6 @@ int procmime_write_mime_header(MimeInfo *mimeinfo, FILE *fp)
                                return -1;
                        }
                        pdata->len = strlen(buf);
-                       pdata->ascii_only = TRUE;
                        g_free(buf);
                        break;
                }
@@ -2290,7 +2337,6 @@ int procmime_write_mime_header(MimeInfo *mimeinfo, FILE *fp)
                g_free(buf);
 
                pdata->fp = fp;
-               pdata->ascii_only = FALSE;
                pdata->error = FALSE;
                g_hash_table_foreach(mimeinfo->dispositionparameters, write_parameters, pdata);
                if (pdata->error == TRUE) {