Merge branch 'jc/nostat'

diff --git a/mailinfo.c b/mailinfo.c
index 9f95f37651e2ce5a3930051fe875f1c16ede97c2..ff2d4d403826b035a7bb123dc74a50af9a76e353 100644 (file)
--- a/mailinfo.c
+++ b/mailinfo.c
@@ -472,7 +472,7 @@ static void convert_to_utf8(char *line, char *charset)
        char *in, *out;
        size_t insize, outsize, nrc;
        char outbuf[4096]; /* cheat */
-       static char latin_one[] = "latin-1";
+       static char latin_one[] = "latin1";
        char *input_charset = *charset ? charset : latin_one;
        iconv_t conv = iconv_open(metainfo_charset, input_charset);
 
@@ -707,6 +707,9 @@ static void handle_multipart_body(void)
                if (!len) {
                        if (handle_multipart_one_part() < 0)
                                return;
+                       /* Reset per part headers */
+                       transfer_encoding = TE_DONTCARE;
+                       charset[0] = 0;
                }
                else
                        check_subheader_line(line, len);