From 3db15995382ccf551aee8387ebb5ca073d197f27 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 22 Oct 2014 14:35:00 +0200
Subject: Fix download of attachments that are part of TNEF message (#1490091)

---
 program/steps/mail/get.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'program')

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;
-- 
cgit v1.2.3