From: Michael M Slusarz <slusarz@curecanti.org>
Date: Fri, 19 Feb 2010 16:52:29 +0000 (-0700)
Subject: Text parts were not being caught here since they all potentially have embedded parts
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=4c3e968f46bcc009cf71d51db34776b5d2be88ad;p=horde.git

Text parts were not being caught here since they all potentially have embedded parts
---

diff --git a/imp/lib/Contents.php b/imp/lib/Contents.php
index c2646529a..f8969e4c0 100644
--- a/imp/lib/Contents.php
+++ b/imp/lib/Contents.php
@@ -475,10 +475,10 @@ class IMP_Contents
             $ret[$mime_id]['name'] = $mime_part->getName(true);
         }
 
-        if (($textmode == 'inline') &&
+        if (!is_null($ret[$mime_id]['data']) &&
+            ($textmode == 'inline') &&
             !strlen($ret[$mime_id]['data']) &&
-            $this->isAttachment($type) &&
-            !$viewer->embeddedMimeParts()) {
+            $this->isAttachment($type)) {
             if (empty($ret[$mime_id]['status'])) {
                 $ret[$mime_id]['status'] = array(
                     array(