Fix finding message text from signed/encrypted messages.

horde · Feb 10, 2016 · 1a0dbce · 1a0dbce
1 parent 226ae30
commit 1a0dbce
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/imp/lib/Compose.php b/imp/lib/Compose.php
@@ -3108,6 +3108,12 @@ protected function _getMessageText($contents, array $options = array())
             self::canHtmlCompose() &&
             (($body_id = $contents->findBody('html')) !== null)) {
             $mime_message = $contents->getMIMEMessage();
+            if ($mime_message->getType() == 'multipart/encrypted' ||
+                $mime_message->getType() == 'multipart/signed') {
+                $mime_message = $mime_message->getPart(1);
+                $mime_message->buildMimeIds();
+                $body_id = $mime_message->findBody('html');
+            }
 
             switch ($mime_message->getPrimaryType()) {
             case 'multipart':