Don't put encoding on multipart/alt message parts

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@13060 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/class/deliver/Deliver.class.php b/class/deliver/Deliver.class.php
index e9038fdd54f99fe96d2b5b0538f4082263b3b004..ad4e1fd79544f964573571dedfa595011a7fa9d6 100644 (file)
--- a/class/deliver/Deliver.class.php
+++ b/class/deliver/Deliver.class.php
@@ -437,6 +437,8 @@ class Deliver {
         } else {
             if ($mime_header->type0 == 'text' || $mime_header->type0 == 'message') {
                 $header[] = 'Content-Transfer-Encoding: 8bit' .  $rn;
         } else {
             if ($mime_header->type0 == 'text' || $mime_header->type0 == 'message') {
                 $header[] = 'Content-Transfer-Encoding: 8bit' .  $rn;

+            } else if ($mime_header->type0 == 'multipart' || $mime_header->type0 == 'alternative') {
+                /* no-op; no encoding needed */

             } else {
                 $header[] = 'Content-Transfer-Encoding: base64' .  $rn;
             }
             } else {
                 $header[] = 'Content-Transfer-Encoding: base64' .  $rn;
             }