From d121cc674c814ccc5d820c5e3d9e86d7028bfba1 Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Fri, 28 Apr 2017 17:57:22 +0200
Subject: [PATCH] The header charset for attachments is always UTF-8 (Bug
 #14618).

---
 imp/lib/Compose.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/imp/lib/Compose.php b/imp/lib/Compose.php
index cf0096d9884..1d5da4b6c8e 100644
--- a/imp/lib/Compose.php
+++ b/imp/lib/Compose.php
@@ -3274,6 +3274,7 @@ protected function _addAttachment($atc_file, $bytes, $filename, $type)
         }
 
         $atc->setType($type);
+        $atc->setHeaderCharset('UTF-8');
 
         if (($atc->getType() == 'application/octet-stream') ||
             ($atc->getPrimaryType() == 'text')) {
@@ -3288,8 +3289,6 @@ protected function _addAttachment($atc_file, $bytes, $filename, $type)
             } else {
                 $atc->setCharset('UTF-8');
             }
-        } else {
-            $atc->setHeaderCharset('UTF-8');
         }
 
         $atc_ob = new IMP_Compose_Attachment($this, $atc, $atc_file);