summaryrefslogtreecommitdiff
path: root/program/steps/mail/sendmail.inc
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-08-05 13:07:53 +0200
committerAleksander Machniak <alec@alec.pl>2014-08-05 13:07:53 +0200
commite1b8f44e3f635a757d0d13cc2ac908a175593875 (patch)
treea2e00cf989d442d528ce0e10993f846cfa5070f3 /program/steps/mail/sendmail.inc
parentcd943ab071ece4b5bb0161f5cf6a6ff1f7144f9d (diff)
Fix invalid Content-Type header when send_format_flowed=false (#1489992)
Diffstat (limited to 'program/steps/mail/sendmail.inc')
-rw-r--r--program/steps/mail/sendmail.inc6
1 files changed, 1 insertions, 5 deletions
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index cdffd18e6..bac751298 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -484,15 +484,11 @@ if (preg_match('/[^\x00-\x7F]/', $MAIL_MIME->getTXTBody())) {
$transfer_encoding = $RCMAIL->config->get('force_7bit') ? 'quoted-printable' : '8bit';
}
else {
- $text_charset = '';
+ $text_charset = 'US-ASCII';
$transfer_encoding = '7bit';
}
if ($flowed) {
- if (!$text_charset) {
- $text_charset = 'US-ASCII';
- }
-
$text_charset .= ";\r\n format=flowed";
}