From 979467776675814a302b2bcdd35342c32d9696a5 Mon Sep 17 00:00:00 2001
From: Synchro <marcus@synchromedia.co.uk>
Date: Fri, 10 May 2013 01:52:03 +0200
Subject: [PATCH] Only set a content-transfer-encoding header if it's not 7bit

---
 class.phpmailer.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/class.phpmailer.php b/class.phpmailer.php
index 69b5dde9..1cc1e960 100644
--- a/class.phpmailer.php
+++ b/class.phpmailer.php
@@ -1504,7 +1504,10 @@ class PHPMailer {
         $result .= $this->TextLine('Content-Type: '.$this->ContentType.'; charset='.$this->CharSet);
         break;
     }
-    $result .= $this->HeaderLine('Content-Transfer-Encoding', $this->Encoding);
+    //RFC1341 part 5 says 7bit is assumed if not specified
+    if ($this->Encoding != '7bit') {
+      $result .= $this->HeaderLine('Content-Transfer-Encoding', $this->Encoding);
+    }
 
     if($this->Mailer != 'mail') {
       $result .= $this->LE;