jmap_mail.c: set charset=utf-8 for any text content from BodyValue

cyrusimap · Jul 24, 2024 · f635f45 · f635f45
1 parent 59238dc
commit f635f45
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/cassandane/tiny-tests/JMAPEmail/email_set_create_encoding b/cassandane/tiny-tests/JMAPEmail/email_set_create_encoding
@@ -284,6 +284,14 @@ sub test_email_set_create_encoding
         },
         wantEncoding => 'quoted-printable',
         wantContentType => 'text/html',
+    }, {
+        desc => 'text/html UTF-8 without charset from EmailBodyValue',
+        bodyValue => "some \N{TOMATO} utf-8",
+        bodyStructure => {
+            type => 'text/html',
+        },
+        wantEncoding => 'quoted-printable',
+        wantContentType => 'text/html; charset=utf-8'
     });
 
     my @rfc822Tests = ({

diff --git a/imap/jmap_mail.c b/imap/jmap_mail.c
@@ -10801,7 +10801,7 @@ static void _emailpart_body_to_mime(jmap_req_t *req, struct jmap_parser *parser,
 
             // Set charset for plain text EmailBodyValues if required
             if (!part->charset && part->part_id &&
-                !strcasecmp(media_subtype, "plain") &&
+                // XXX !strcasecmp(media_subtype, "plain") &&
                 (body_flags & MIMEBODY_HAS_NON_ASCII)) {
                 part->charset = xstrdup("utf-8");
             }