Ask for header first instead of body

Author: stevebauman

src/MessageQuery.php

@@ -269,18 +269,18 @@ protected function fetch(Collection $messages): array
             $fetch[] = 'RFC822.SIZE';
         }
 
-        if ($this->fetchBody) {
-            $fetch[] = $this->fetchAsUnread
-                ? 'BODY.PEEK[TEXT]'
-                : 'BODY[TEXT]';
-        }
-
         if ($this->fetchHeaders) {
             $fetch[] = $this->fetchAsUnread
                 ? 'BODY.PEEK[HEADER]'
                 : 'BODY[HEADER]';
         }
 
+        if ($this->fetchBody) {
+            $fetch[] = $this->fetchAsUnread
+                ? 'BODY.PEEK[TEXT]'
+                : 'BODY[TEXT]';
+        }
+
         if (empty($fetch)) {
             return $uids->mapWithKeys(fn (string|int $uid) => [
                 $uid => [