Only add charset param if dealing with text/* part.

diff --git a/framework/Mime/lib/Horde/Mime/Part.php b/framework/Mime/lib/Horde/Mime/Part.php
index ee0b462..bc3a54e 100644 (file)
--- a/framework/Mime/lib/Horde/Mime/Part.php
+++ b/framework/Mime/lib/Horde/Mime/Part.php
@@ -741,7 +741,12 @@ class Horde_Mime_Part
         }
 
         /* Get the Content-Type itself. */
-        $headers->replaceHeader('Content-Type', $this->getType(), array('params' => $this->getAllContentTypeParameters()));
+        $ptype = $this->getPrimaryType();
+        $c_params = $this->getAllContentTypeParameters();
+        if ($ptype != 'text') {
+            unset($c_params['charset']);
+        }
+        $headers->replaceHeader('Content-Type', $this->getType(), array('params' => $c_params));
 
         /* Get the description, if any. */
         if (($descrip = $this->getDescription())) {
@@ -754,7 +759,6 @@ class Horde_Mime_Part
         }
 
         /* message/* parts require no additional header information. */
-        $ptype = $this->getPrimaryType();
         if ($ptype == 'message') {
             return $headers;
         }