Use multipart/alternative for HTML+text emails

diff --git a/mailboxes/folders-lib.pl b/mailboxes/folders-lib.pl
index 69861d3..7662e8f 100644 (file)
--- a/mailboxes/folders-lib.pl
+++ b/mailboxes/folders-lib.pl
@@ -3527,7 +3527,6 @@ if ($ctype =~ /charset="([a-z0-9\-]+)"/i ||
     $ctype =~ /charset=([a-z0-9\-]+)/i) {
        $charset = $1;
        }
-}
 ## Special handling of HTML header charset ($force_charset):
 ## For japanese text(ISO-2022-JP/EUC=JP/SJIS), the HTML output and
 ## text contents ($bodycontents) are already converted to EUC,

diff --git a/mailboxes/send_mail.cgi b/mailboxes/send_mail.cgi
index 1eb50a4..5b9a990 100755 (executable)
--- a/mailboxes/send_mail.cgi
+++ b/mailboxes/send_mail.cgi
@@ -110,6 +110,11 @@ if ($in{'body'} =~ /\S/) {
                                             '7bit' ] ],
                            'data' => $plainbody });
                        }
+
+               # Set content type to multipart/alternative, to tell mail
+               # clients about the optional body
+               push(@{$mail->{'headers'}}, [ 'Content-Type',
+                                             'multipart/alternative' ]);
                }
        }
 $attachsize = 0;