Using a bit more fail save uid / msgNo by calling imap_msgno()

Author: Webklex

src/IMAP/Client.php

@@ -109,6 +109,15 @@ public function setConfig(array $config) {
         return $this;
     }
 
+    /**
+     * Get the current imap resource
+     *
+     * @return resource
+     */
+    public function getConnection(){
+        return $this->connection;
+    }
+
     /**
      * Set read only property and reconnect if it's necessary.
      *

src/IMAP/Message.php

@@ -128,9 +128,9 @@ class Message {
      * @param $fetch_options
      */
     public function __construct($uid, $msglist, Client $client, $fetch_options = null) {
-        $this->uid = $uid;
         $this->msglist = $msglist;
         $this->client = $client;
+        $this->uid = imap_msgno($this->client->getConnection(), $uid);
 
         $this->setFetchOption($fetch_options);
         $this->parseHeader();
@@ -258,7 +258,7 @@ private function parseHeader() {
             $this->message_id = str_replace(['<', '>'], '', $header->message_id);
         }
         if (property_exists($header, 'Msgno')) {
-            $this->message_no = trim($header->Msgno);
+            $this->message_no = imap_msgno($this->client->getConnection(), trim($header->Msgno));
         }
     }