Fix broken encoding of HTML content encapsulated in a RTF attachment (#8444)

2 files changed, 2 insertions, 0 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b48afa2f..79df95df8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
 - Fix handling of message/rfc822 parts that are small and are multipart structures with a single part (#8458)
 - Fix bug where session could time out if DB and PHP timezone were different (#8303)
 - Fix bug where DSN flag state wasn't stored with a draft (#8371)
+- Fix broken encoding of HTML content encapsulated in a RTF attachment (#8444)
 
 ## Release 1.6-beta
 
diff --git a/program/lib/Roundcube/rcube_message.php b/program/lib/Roundcube/rcube_message.php
index d9bd1ed14..6fd0d6f24 100644
--- a/program/lib/Roundcube/rcube_message.php
+++ b/program/lib/Roundcube/rcube_message.php
@@ -1097,6 +1097,7 @@ class rcube_message
             $tpart->mime_id         = 'winmail.' . $part->mime_id . '.html';
             $tpart->size            = strlen($tnef_arr['message']);
             $tpart->body            = $tnef_arr['message'];
+            $tpart->charset         = RCUBE_CHARSET;
 
             $parts[] = $tpart;
         }