diff --git a/include/class.thread.php b/include/class.thread.php
index b7a0d8eaf0df77ac3cf8ff9cff6a7fb4370c56cc..b2379b2e723c0cc4dbeb6ea33872bf751cf346a1 100644
--- a/include/class.thread.php
+++ b/include/class.thread.php
@@ -343,10 +343,10 @@ Class ThreadEntry {
 
     function getEmailReferences() {
         if (!isset($this->_references)) {
-            $this->_references = $this->getEmailMessageId();
             $headers = self::getEmailHeaders();
-            if (isset($headers['References']))
-                $this->_references .= " ".$headers['References'];
+            if (isset($headers['References']) && $headers['References'])
+                $this->_references = $headers['References']." ";
+            $this->_references .= $this->getEmailMessageId();
         }
         return $this->_references;
     }
@@ -358,9 +358,6 @@ Class ThreadEntry {
         $mid = substr_replace($this->getEmailMessageId(),
                 $ref, strpos($this->getEmailMessageId(), '@'), 0);
 
-        //TODO: Confirm how references are ordered on reply - we want the tagged
-        // reference to be processed first.
-
         return sprintf('%s %s', $this->getEmailReferences(), $mid);
     }