Fixed message headers encoding; improved recipient splitting; applied patch for attachment download (#1484198)

1 files changed, 2 insertions, 2 deletions

diff --git a/program/lib/Mail/mime.php b/program/lib/Mail/mime.php
index a9f798ed8..e7129db23 100644
--- a/program/lib/Mail/mime.php
+++ b/program/lib/Mail/mime.php
@@ -836,9 +836,9 @@ class Mail_mime
                     default:
                         // quoted-printable encoding has been selected
                         $mode = 'Q';
-                        $encoded = preg_replace('/([\x20-\x25\x2C\x80-\xFF])/e', "'='.sprintf('%02X', ord('\\1'))", $value);
+                        $encoded = preg_replace('/([\x2C\x3F\x80-\xFF])/e', "'='.sprintf('%02X', ord('\\1'))", $value);
                         // replace spaces with _
-                        $encoded = str_replace('=20', '_', $encoded);
+                        $encoded = str_replace(' ', '_', $encoded);
                     }
 
                 $value = '=?' . $this->_build_params['head_charset'] . '?' . $mode . '?' . $encoded . '?=' . $suffix;