diff --git a/include/class.mailfetch.php b/include/class.mailfetch.php
index f1ea77d74ac9979bdffccfd195ca76eabd98c3a9..dedfba84c028c19a8f1bbe62a091e0ab337bffff 100644
--- a/include/class.mailfetch.php
+++ b/include/class.mailfetch.php
@@ -541,7 +541,8 @@ class MailFetcher {
             $body = new TextThreadBody(
                     Format::html2text(Format::safe_html($html),
                         100, false));
-        else
+
+        if (!isset($body))
             $body = new TextThreadBody('');
 
         if ($cfg->stripQuotedReply())
diff --git a/include/class.mailparse.php b/include/class.mailparse.php
index 0ec0b4f190217b90c633f220f6440a7c89e625ce..654e0e05ed66d7a8bca9af76d3e9e3db9ba601dc 100644
--- a/include/class.mailparse.php
+++ b/include/class.mailparse.php
@@ -292,7 +292,8 @@ class Mail_Parse {
             $body = new TextThreadBody(
                     Format::html2text(Format::safe_html($html),
                         100, false));
-        else
+
+        if (!isset($body))
             $body = new TextThreadBody('');
 
         if ($cfg && $cfg->stripQuotedReply())