Don't display PGP armored text data as separate part.

diff --git a/imp/lib/Contents.php b/imp/lib/Contents.php
index f921f12..c264652 100644 (file)
--- a/imp/lib/Contents.php
+++ b/imp/lib/Contents.php
@@ -477,7 +477,8 @@ class IMP_Contents
 
         if (($textmode == 'inline') &&
             !strlen($ret[$mime_id]['data']) &&
-            $this->isAttachment($type)) {
+            $this->isAttachment($type) &&
+            !$viewer->embeddedMimeParts()) {
             if (empty($ret[$mime_id]['status'])) {
                 $ret[$mime_id]['status'] = array(
                     array(

diff --git a/imp/lib/Mime/Viewer/Plain.php b/imp/lib/Mime/Viewer/Plain.php
index 5e03c20..c8d80fd 100644 (file)
--- a/imp/lib/Mime/Viewer/Plain.php
+++ b/imp/lib/Mime/Viewer/Plain.php
@@ -58,7 +58,7 @@ class IMP_Horde_Mime_Viewer_Plain extends Horde_Mime_Viewer_Plain
         $mime_id = $this->_mimepart->getMimeId();
 
         if (isset(self::$_cache[$mime_id])) {
-            return null;
+            return array($mime_id => null);
         }
 
         // Trim extra whitespace in the text.