From a3c729eca33b3cc3e1d4b3b5187e4890d99ad470 Mon Sep 17 00:00:00 2001
From: bartbutler <bart.c.butler@gmail.com>
Date: Mon, 23 Nov 2015 23:16:15 -0800
Subject: [PATCH] Fix base64 encoding in alt body with long lines

Extend body base64 fix from https://github.com/PHPMailer/PHPMailer/commit/9269a656ca2dca1ab2653c4abe7c0f796f31af33 to alt body.
---
 class.phpmailer.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/class.phpmailer.php b/class.phpmailer.php
index e4dd00bf..2e284b21 100644
--- a/class.phpmailer.php
+++ b/class.phpmailer.php
@@ -2120,8 +2120,9 @@ class PHPMailer
             $altBodyEncoding = '7bit';
             $altBodyCharSet = 'us-ascii';
         }
-        //If lines are too long, change to quoted-printable transfer encoding
-        if (self::hasLineLongerThanMax($this->AltBody)) {
+        //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' != $altBodyEncoding and self::hasLineLongerThanMax($this->AltBody)) {
             $altBodyEncoding = 'quoted-printable';
         }
         //Use this as a preamble in all multipart message types