diff --git a/include/class.api.php b/include/class.api.php
index 082cc178d5704598742df3b7dfda646261e71967..fef6ddb477f6536ebcdeb1b0c0200e6bfa76bb89 100644
--- a/include/class.api.php
+++ b/include/class.api.php
@@ -297,7 +297,12 @@ class ApiController {
             $msg.="\n*[".$_SERVER['HTTP_X_API_KEY']."]*\n";
         $ost->logWarning(__('API Error')." ($code)", $msg, false);
 
-        $this->response($code, $error); //Responder should exit...
+        if (PHP_SAPI == 'cli') {
+            fwrite(STDERR, "({$code}) $error\n");
+        }
+        else {
+            $this->response($code, $error); //Responder should exit...
+        }
         return false;
     }
 
diff --git a/include/class.mailfetch.php b/include/class.mailfetch.php
index 363589b46ab2f9720960ac4a8084e80793d9f67c..1882e2e76177d3b061b1a2d7204a4e0a9aab0026 100644
--- a/include/class.mailfetch.php
+++ b/include/class.mailfetch.php
@@ -642,7 +642,7 @@ class MailFetcher {
                 $vars['in-reply-to'] = @$headers['in-reply-to'] ?: null;
             }
             // Fetch deliver status report
-            $vars['message'] = $this->getDeliveryStatusMessage($mid);
+            $data['message'] = $this->getDeliveryStatusMessage($mid) ?: $this->getBody($mid);
             $vars['thread-type'] = 'N';
             $vars['flags']['bounce'] = true;
         }
diff --git a/include/class.mailparse.php b/include/class.mailparse.php
index 2a91faf7f451b789a107e4fbe691b4ff50ac0bb5..4b8bcde818d81c6d2036f77db7842bec8d60b744 100644
--- a/include/class.mailparse.php
+++ b/include/class.mailparse.php
@@ -657,7 +657,7 @@ class EmailDataParser {
                 $data['in-reply-to'] = @$headers['in-reply-to'] ?: null;
             }
             // Fetch deliver status report
-            $data['message'] = $parser->getDeliveryStatusMessage();
+            $data['message'] = $parser->getDeliveryStatusMessage() ?: $parser->getBody();
             $data['thread-type'] = 'N';
             $data['flags']['bounce'] = true;
         }