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 c264652..f8969e4 100644 (file)
--- 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(