diff --git a/src/Message.php b/src/Message.php
index 10b96018..fd08d964 100755
--- a/src/Message.php
+++ b/src/Message.php
@@ -296,7 +296,9 @@ public static function make(int $uid, ?int $msglist, Client $client, string $raw
 
         $instance->parseRawHeader($raw_header);
         $instance->parseRawFlags($raw_flags);
-        $instance->parseRawBody($raw_body);
+        if($raw_body != ''){
+            $instance->parseRawBody($raw_body);
+        }
         $instance->peek();
 
         return $instance;