Method for getting additional header information added

Author: Webklex

src/IMAP/Message.php

@@ -52,6 +52,11 @@ class Message {
      */
     public $header = null;
 
+    /**
+     * @var null|object $header_info
+     */
+    public $header_info = null;
+
     /**
      * Message header components
      *
@@ -288,7 +293,23 @@ private function parseHeader() {
         }
         if (property_exists($header, 'Msgno')) {
             $this->message_no = ($this->fetch_options == FT_UID) ? trim($header->Msgno) : imap_msgno($this->client->getConnection(), trim($header->Msgno));
+        }else{
+            $this->message_no = imap_msgno($this->client->getConnection(), $this->getUid());
+        }
+    }
+
+    /**
+     * Get the current Message header info
+     *
+     * @return object
+     */
+    public function getHeaderInfo(){
+        if($this->header_info == null){
+            $this->header_info =
+            $this->header_info = imap_headerinfo($this->client->getConnection(), $this->getMessageNo());;
         }
+
+        return $this->header_info;
     }
 
     /**