From 9ea2adfd52697fa84390a621cbf4017d7d52170c Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Wed, 10 Feb 2010 10:58:00 -0700
Subject: [PATCH] Don't display PGP armored text data as separate part.

---
 imp/lib/Contents.php          | 3 ++-
 imp/lib/Mime/Viewer/Plain.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/imp/lib/Contents.php b/imp/lib/Contents.php
index f921f1290..c2646529a 100644
--- 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 5e03c206c..c8d80fd30 100644
--- 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.
-- 
2.11.0