diff --git a/lib/IMAP/ImapMessageFetcher.php b/lib/IMAP/ImapMessageFetcher.php
index 4f49718471..a60d13d437 100644
--- a/lib/IMAP/ImapMessageFetcher.php
+++ b/lib/IMAP/ImapMessageFetcher.php
@@ -234,12 +234,12 @@ public function fetchMessage(?Horde_Imap_Client_Data_Fetch $fetch = null): IMAPM
 			if ($structure_type === 'multipart') {
 				$i = 1;
 				foreach ($structure->getParts() as $p) {
-					$this->getPart($p, (string)$i++, $isEncrypted || $isSigned);
+					$this->getPart($p, (string)$i++, !$this->loadBody || $isEncrypted || $isSigned);
 				}
 			} else {
 				$bodyPartId = $structure->findBody();
 				if (!is_null($bodyPartId)) {
-					$this->getPart($structure[$bodyPartId], $bodyPartId, $isEncrypted || $isSigned);
+					$this->getPart($structure[$bodyPartId], $bodyPartId, !$this->loadBody || $isEncrypted || $isSigned);
 				}
 			}
 		}