diff --git a/src/Fetch/Message.php b/src/Fetch/Message.php
index f61eddf..3755869 100644
--- a/src/Fetch/Message.php
+++ b/src/Fetch/Message.php
@@ -432,7 +432,6 @@ class Message
$attachment = new Attachment($this, $structure, $partIdentifier);
$this->attachments[] = $attachment;
} elseif ($structure->type == 0 || $structure->type == 1) {
-
$messageBody = isset($partIdentifier) ?
imap_fetchbody($this->imapStream, $this->uid, $partIdentifier, FT_UID)
: imap_body($this->imapStream, $this->uid, FT_UID);
@@ -442,7 +441,7 @@ class Message
if (!empty($parameters['charset']) && $parameters['charset'] !== self::$charset)
$messageBody = iconv($parameters['charset'], self::$charset, $messageBody);
- if (strtolower($structure->subtype) == 'plain' || $structure->type == 1) {
+ if (strtolower($structure->subtype) === 'plain' || ($structure->type == 1 && strtolower($structure->subtype) !== 'alternative')) {
if (isset($this->plaintextMessage)) {
$this->plaintextMessage .= PHP_EOL . PHP_EOL;
} else {
@@ -451,7 +450,6 @@ class Message
$this->plaintextMessage .= trim($messageBody);
} else {
-
if (isset($this->htmlMessage)) {
$this->htmlMessage .= '
';
} else {