Fix download of attachments that are part of TNEF message (#1490091)

2 files changed, 3 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 10f6ba17c..f923311b7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@ CHANGELOG Roundcube Webmail
 - Fix regression in SHAA password generation in ldap driver of password plugin (#1490094)
 - Fix displaying of HTML messages with absolutely positioned elements in Larry skin (#1490103)
 - Fix font style display issue in HTML messages with styled <span> elements (#1490101)
+- Fix download of attachments that are part of TNEF message (#1490091)
 
 RELEASE 1.0.3
 -------------
diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc
index b10a052d6..8b9a0392c 100644
--- a/program/steps/mail/get.inc
+++ b/program/steps/mail/get.inc
@@ -356,7 +356,8 @@ else if (strlen($part_id)) {
             }
             // send part as-it-is
             else {
-                if ($part->body && empty($plugin['download'])) {
+                // here we trust attachments from TNEF/uuencode message are untouched (#1490091)
+                if ($part->body && (!is_numeric($part->mime_id) || empty($plugin['download']))) {
                     header("Content-Length: " . strlen($part->body));
                     echo $part->body;
                     $sent = true;