RELEASE 1.1.7.

README.md

@@ -1,13 +1,13 @@
 A CodeIgniter compatible email-library powered by PHPMailer
 ===========================================================
 
-Version: 1.1.6  
+Version: 1.1.7  
 Author: Ivan Tcholakov <[email protected]>, 2012-2015.  
 License: The MIT License (MIT), http://opensource.org/licenses/MIT
 
 This library is intended to be compatible with CI 2.x and CI 3.x.
 
-Tested on CodeIgniter 3.0.0+ (May 4, 2015) and with PHPMailer Version 5.2.10 (May 4, 2015).
+Tested on CodeIgniter 3.0.0+ (May 4, 2015) and with PHPMailer Version 5.2.10+ (May 5, 2015).
 
 Installation
 ------------

libraries/MY_Email.php

@@ -2,15 +2,15 @@
 
 /**
  * CodeIgniter compatible email-library powered by PHPMailer.
- * Version: 1.1.6
+ * Version: 1.1.7
  * @author Ivan Tcholakov <[email protected]>, 2012-2015.
  * @license The MIT License (MIT), http://opensource.org/licenses/MIT
  * @link https://github.com/ivantcholakov/codeigniter-phpmailer
  *
  * This library is intended to be compatible with CI 2.x and CI 3.x.
  *
  * Tested on production sites with CodeIgniter 3.0.0+ (May 4, 2015) and
- * PHPMailer Version 5.2.10 (May 4, 2015).
+ * PHPMailer Version 5.2.10+ (May 5, 2015).
  */
 
 class MY_Email extends CI_Email {

third_party/phpmailer/changelog.md

@@ -1,5 +1,7 @@
 # ChangeLog
 
+* Don't switch to quoted-printable for long lines if already using base64
+
 ## Version 5.2.10 (May 4th 2015)
 * Add custom header getter
 * Use `application/javascript` for .js attachments

third_party/phpmailer/class.phpmailer.php

@@ -1897,8 +1897,9 @@ public function createBody()
             $bodyEncoding = '7bit';
             $bodyCharSet = 'us-ascii';
         }
-        //If lines are too long, change to quoted-printable transfer encoding
-        if (self::hasLineLongerThanMax($this->Body)) {
+        //If lines are too long, and we're not already using an encoding that will shorten them,
+        //change to quoted-printable transfer encoding
+        if ('base64' != $this->Encoding and self::hasLineLongerThanMax($this->Body)) {
             $this->Encoding = 'quoted-printable';
             $bodyEncoding = 'quoted-printable';
         }