2011-01-06 [colin] 3.7.8cvs31
[claws.git] / src / procmime.c
index 9caa40251cc0cc6e6507e5876c710a8099c424d5..4b13271ff879f755d372373577c4acae7a344309 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-2009 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;
@@ -242,8 +242,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 +291,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 +345,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 +366,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 +386,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;
                        }
                }
@@ -436,7 +450,7 @@ gboolean procmime_decode_content(MimeInfo *mimeinfo)
                return FALSE;
        }
 
-       stat(tmpfilename, &statbuf);
+       g_stat(tmpfilename, &statbuf);
        if (mimeinfo->tmp && (mimeinfo->data.filename != NULL))
                claws_unlink(mimeinfo->data.filename);
        g_free(mimeinfo->data.filename);
@@ -476,15 +490,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 +516,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 +524,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 +533,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;
+                               }
                        }
                }
 
@@ -586,7 +607,7 @@ gboolean procmime_encode_content(MimeInfo *mimeinfo, EncodingType encoding)
                        g_free(mimeinfo->data.mem);
        }
 
-       stat(tmpfilename, &statbuf);
+       g_stat(tmpfilename, &statbuf);
        mimeinfo->content = MIMECONTENT_FILE;
        mimeinfo->data.filename = tmpfilename;
        mimeinfo->tmp = TRUE;
@@ -604,8 +625,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 +654,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);
                }
@@ -660,7 +682,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,6 +713,16 @@ 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;
                CodeConverter *conv;
@@ -754,7 +786,7 @@ FILE *procmime_get_first_text_content(MsgInfo *msginfo)
        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:
@@ -822,7 +854,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) {
@@ -841,6 +873,8 @@ FILE *procmime_get_first_encrypted_text_content(MsgInfo *msginfo)
        partinfo = mimeinfo;
        while (partinfo && partinfo->type != MIMETYPE_TEXT) {
                partinfo = procmime_mimeinfo_next(partinfo);
+               if (privacy_mimeinfo_is_signed(partinfo))
+                       procmsg_msginfo_set_flags(msginfo, 0, MSG_SIGNED);
        }
 
        if (partinfo)
@@ -856,7 +890,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) {
@@ -876,10 +910,10 @@ static gboolean procmime_find_string_part(MimeInfo *mimeinfo, const gchar *filen
        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);
+       cm_return_val_if_fail(mimeinfo != NULL, FALSE);
+       cm_return_val_if_fail(mimeinfo->type == MIMETYPE_TEXT, FALSE);
+       cm_return_val_if_fail(str != NULL, FALSE);
+       cm_return_val_if_fail(find_func != NULL, FALSE);
 
        outfp = procmime_get_text_content(mimeinfo);
 
@@ -907,9 +941,9 @@ gboolean procmime_find_string(MsgInfo *msginfo, const gchar *str,
        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);
+       cm_return_val_if_fail(msginfo != NULL, FALSE);
+       cm_return_val_if_fail(str != NULL, FALSE);
+       cm_return_val_if_fail(find_func != NULL, FALSE);
 
        filename = procmsg_get_message_file(msginfo);
        if (!filename) return FALSE;
@@ -939,7 +973,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++);
 
@@ -973,34 +1007,45 @@ static GList *mime_type_list = NULL;
 
 gchar *procmime_get_mime_type(const gchar *filename)
 {
-       static GHashTable *mime_type_table = NULL;
-       MimeType *mime_type;
        const gchar *p;
        gchar *ext = NULL;
        gchar *base;
+#ifndef G_OS_WIN32
+       static GHashTable *mime_type_table = NULL;
+       MimeType *mime_type;
 
        if (!mime_type_table) {
                mime_type_table = procmime_get_mime_type_table();
                if (!mime_type_table) return NULL;
        }
+#endif
+
+       if (filename == NULL)
+               return NULL;
 
        base = g_path_get_basename(filename);
        if ((p = strrchr(base, '.')) != NULL)
-               Xstrdup_a(ext, p + 1, p = NULL );
+               ext = g_utf8_strdown(p + 1, -1);
        g_free(base);
-       if (!p) return NULL;
 
-       g_strdown(ext);
+#ifndef G_OS_WIN32
        mime_type = g_hash_table_lookup(mime_type_table, ext);
+       
        if (mime_type) {
                gchar *str;
-
                str = g_strconcat(mime_type->type, "/", mime_type->sub_type,
                                  NULL);
+               debug_print("got type %s for %s\n", str, ext);
+               g_free(ext);
                return str;
-       }
-
+       } 
        return NULL;
+#else
+       gchar *str = get_content_type_from_registry_with_ext(ext);
+
+       g_free(ext);
+       return str;
+#endif
 }
 
 static guint procmime_str_hash(gconstpointer gptr)
@@ -1048,8 +1093,6 @@ static GHashTable *procmime_get_mime_type_table(void)
 
                exts = g_strsplit(mime_type->extension, " ", 16);
                for (i = 0; exts[i] != NULL; i++) {
-                       /* make the key case insensitive */
-                       g_strdown(exts[i]);
                        /* use previously dup'd key on overwriting */
                        if (g_hash_table_lookup(table, exts[i]))
                                key = exts[i];
@@ -1125,7 +1168,7 @@ GList *procmime_get_mime_type_list(void)
                }
 
                if (*p)
-                       mime_type->extension = g_strdup(p);
+                       mime_type->extension = g_utf8_strdown(p, -1);
                else
                        mime_type->extension = NULL;
 
@@ -1343,32 +1386,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;
         }
@@ -1466,32 +1509,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;                          \
         }                                                      \
@@ -1522,6 +1565,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)
@@ -1535,12 +1580,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)
@@ -1560,6 +1608,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++) {
@@ -1570,6 +1619,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;
@@ -1586,7 +1651,7 @@ static void parse_parameters(const gchar *parameters, GHashTable *table)
        param = params;
        next = params;
        for (; next != NULL; param = next) {
-               gchar *attribute, *value, *tmp;
+               gchar *attribute, *value, *tmp, *down_attr, *orig_down_attr;
                gint len;
                gboolean convert = FALSE;
 
@@ -1608,14 +1673,15 @@ static void parse_parameters(const gchar *parameters, GHashTable *table)
                while (value[0] == ' ')
                        value++;
 
-               g_strdown(attribute);
-
-               len = strlen(attribute);
-               if (attribute[len - 1] == '*') {
+               down_attr = g_utf8_strdown(attribute, -1);
+               orig_down_attr = down_attr;
+       
+               len = down_attr ? strlen(down_attr):0;
+               if (len > 0 && down_attr[len - 1] == '*') {
                        gchar *srcpos, *dstpos, *endpos;
 
                        convert = TRUE;
-                       attribute[len - 1] = '\0';
+                       down_attr[len - 1] = '\0';
 
                        srcpos = value;
                        dstpos = value;
@@ -1643,11 +1709,11 @@ static void parse_parameters(const gchar *parameters, GHashTable *table)
                                *tmp = '\0';
                }
 
-               if (attribute) {
-                       while (attribute[0] == ' ')
-                               attribute++;
-                       while (attribute[strlen(attribute)-1] == ' ') 
-                               attribute[strlen(attribute)-1] = '\0';
+               if (down_attr) {
+                       while (down_attr[0] == ' ')
+                               down_attr++;
+                       while (down_attr[strlen(down_attr)-1] == ' ') 
+                               down_attr[strlen(down_attr)-1] = '\0';
                } 
                if (value) {
                        while (value[0] == ' ')
@@ -1655,28 +1721,29 @@ static void parse_parameters(const gchar *parameters, GHashTable *table)
                        while (value[strlen(value)-1] == ' ') 
                                value[strlen(value)-1] = '\0';
                }               
-               if (strrchr(attribute, '*') != NULL) {
+               if (down_attr && strrchr(down_attr, '*') != NULL) {
                        gchar *tmpattr;
 
-                       tmpattr = g_strdup(attribute);
+                       tmpattr = g_strdup(down_attr);
                        tmp = strrchr(tmpattr, '*');
                        tmp[0] = '\0';
 
                        if ((tmp[1] == '0') && (tmp[2] == '\0') && 
-                           (g_slist_find_custom(concatlist, attribute, g_str_equal) == NULL))
+                           (g_slist_find_custom(concatlist, down_attr, g_str_equal) == NULL))
                                concatlist = g_slist_prepend(concatlist, g_strdup(tmpattr));
 
-                       if (convert && (g_slist_find_custom(convlist, attribute, g_str_equal) == NULL))
+                       if (convert && (g_slist_find_custom(convlist, down_attr, g_str_equal) == NULL))
                                convlist = g_slist_prepend(convlist, g_strdup(tmpattr));
 
                        g_free(tmpattr);
                } else if (convert) {
-                       if (g_slist_find_custom(convlist, attribute, g_str_equal) == NULL)
-                               convlist = g_slist_prepend(convlist, g_strdup(attribute));
+                       if (g_slist_find_custom(convlist, down_attr, g_str_equal) == NULL)
+                               convlist = g_slist_prepend(convlist, g_strdup(down_attr));
                }
 
-               if (g_hash_table_lookup(table, attribute) == NULL)
-                       g_hash_table_insert(table, g_strdup(attribute), g_strdup(value));
+               if (g_hash_table_lookup(table, down_attr) == NULL)
+                       g_hash_table_insert(table, g_strdup(down_attr), g_strdup(value));
+               g_free(orig_down_attr);
        }
 
        for (cur = concatlist; cur != NULL; cur = g_slist_next(cur)) {
@@ -1691,6 +1758,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);
@@ -1740,8 +1808,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 */
@@ -1781,8 +1849,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) {
@@ -1846,7 +1914,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); 
 }
 
@@ -1872,6 +1940,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
@@ -2003,7 +2072,7 @@ static MimeInfo *procmime_scan_file_with_offset(const gchar *filename, int offse
        MimeInfo *mimeinfo;
        struct stat buf;
 
-       stat(filename, &buf);
+       g_stat(filename, &buf);
 
        mimeinfo = procmime_mimeinfo_new();
        mimeinfo->content = MIMECONTENT_FILE;
@@ -2025,7 +2094,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);
 
@@ -2049,7 +2118,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)
@@ -2095,13 +2164,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;
 
@@ -2111,12 +2179,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;
                }
            
@@ -2138,7 +2207,7 @@ static void write_parameters(gpointer key, gpointer value, gpointer user_data)
                case ';':
                case ':':
                case '\\':
-               case '\'':
+               case '"':
                case '/':
                case '[':
                case ']':
@@ -2149,29 +2218,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,
@@ -2188,11 +2244,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;
@@ -2218,7 +2311,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) {
@@ -2230,7 +2322,6 @@ int procmime_write_mime_header(MimeInfo *mimeinfo, FILE *fp)
                                return -1;
                        }
                        pdata->len = strlen(buf);
-                       pdata->ascii_only = TRUE;
                        g_free(buf);
                        break;
                }
@@ -2274,7 +2365,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) {