diff --git a/changelog.md b/changelog.md index aadbf9d28..a467c5d96 100644 --- a/changelog.md +++ b/changelog.md @@ -23,6 +23,7 @@ * Fix incorrect MIME structure when using S/MIME signing and isMail() (#372) * Improved checks and error messages for missing extensions * Store and report SMTP errors more consistently +* Add MIME multipart preamble for better Outlook compatibility ## Version 5.2.9 (Sept 25th 2014) * **Important: The autoloader is no longer autoloaded by the PHPMailer class** diff --git a/class.phpmailer.php b/class.phpmailer.php index fec7d19ab..dadf8e8cc 100644 --- a/class.phpmailer.php +++ b/class.phpmailer.php @@ -1874,7 +1874,7 @@ public function createBody() $altBodyCharSet = 'us-ascii'; } //Use this as a preamble in all multipart message types - $mimepre = "This is a multi-part message in MIME format.".$this->LE; + $mimepre = "This is a multi-part message in MIME format." . $this->LE . $this->LE; switch ($this->message_type) { case 'inline': $body .= $mimepre; diff --git a/test/phpmailerTest.php b/test/phpmailerTest.php index dbb4a9ccc..7064150f7 100644 --- a/test/phpmailerTest.php +++ b/test/phpmailerTest.php @@ -154,7 +154,7 @@ public function buildBody() } else { $eol = "\r\n"; $bullet_start = ' - '; - $bullet_end = ''; + $bullet_end = "\r\n"; $list_start = ''; $list_end = ''; }