For base (ID = 0) parts, any subpart is a body part

diff --git a/framework/Mime/lib/Horde/Mime/Part.php b/framework/Mime/lib/Horde/Mime/Part.php
index 8215baf..596bab3 100644 (file)
--- a/framework/Mime/lib/Horde/Mime/Part.php
+++ b/framework/Mime/lib/Horde/Mime/Part.php
@@ -1450,9 +1450,11 @@ class Horde_Mime_Part
      */
     public function findBody($subtype = null)
     {
+        $initial_id = $this->getMimeId();
+
         foreach ($this->contentTypeMap() as $mime_id => $mime_type) {
             if ((strpos($mime_type, 'text/') === 0) &&
-                (intval($mime_id) == 1) &&
+                (!$initial_id || (intval($mime_id) == 1)) &&
                 (is_null($subtype) || (substr($mime_type, 5) == $subtype))) {
                 return $mime_id;
             }