diff --git a/modules/imap/hm-imap.php b/modules/imap/hm-imap.php
index 3e8759c32..40d7b716e 100644
--- a/modules/imap/hm-imap.php
+++ b/modules/imap/hm-imap.php
@@ -901,7 +901,7 @@ public function get_message_list($uids, $raw=false, $include_content_body = fals
             }
             $command .= "BODY.PEEK[HEADER.FIELDS (SUBJECT X-AUTO-BCC FROM DATE CONTENT-TYPE X-PRIORITY TO LIST-ARCHIVE REFERENCES MESSAGE-ID X-SNOOZED)]";
             if ($include_content_body) {
-                $command .= " BODY.PEEK[0.1]";
+                $command .= " BODY.PEEK[1]";
             }
             $command .= ")\r\n";
             $cache_command = $command.(string)$raw;
@@ -958,7 +958,7 @@ public function get_message_list($uids, $raw=false, $include_content_body = fals
                                 }
                             }
                         }
-                        elseif ($vals[$i] == 'BODY[0.1') {
+                        elseif ($vals[$i] == 'BODY[1') {
                             $content = '';
                             $i++;
                             $i++;