From fb70deb117abcfe78b3471568916b88bfd87e275 Mon Sep 17 00:00:00 2001
From: Synchro <marcus@synchromedia.co.uk>
Date: Fri, 27 Apr 2012 21:54:57 +0200
Subject: [PATCH] Reapply charset quiting fix

---
 class.phpmailer.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/class.phpmailer.php b/class.phpmailer.php
index af089d59..22752b40 100644
--- a/class.phpmailer.php
+++ b/class.phpmailer.php
@@ -1259,7 +1259,7 @@ class PHPMailer {
     switch($this->message_type) {
       case 'plain':
         $result .= $this->HeaderLine('Content-Transfer-Encoding', $this->Encoding);
-        $result .= $this->TextLine('Content-Type: '.$this->ContentType.'; charset="'.$this->CharSet.'"');
+        $result .= $this->TextLine('Content-Type: '.$this->ContentType.'; charset='.$this->CharSet);
         break;
       case 'inline':
         $result .= $this->HeaderLine('Content-Type', 'multipart/related;');
@@ -1444,7 +1444,7 @@ class PHPMailer {
       $encoding = $this->Encoding;
     }
     $result .= $this->TextLine('--' . $boundary);
-    $result .= sprintf("Content-Type: %s; charset=\"%s\"", $contentType, $charSet);
+    $result .= sprintf("Content-Type: %s; charset=%s", $contentType, $charSet);
     $result .= $this->LE;
     $result .= $this->HeaderLine('Content-Transfer-Encoding', $encoding);
     $result .= $this->LE;