If we use the IP as the RHS of the Message-ID, we need to enclose it in brackets

[squirrelmail.git] / class / deliver / Deliver.class.php

diff --git a/class/deliver/Deliver.class.php b/class/deliver/Deliver.class.php
index 81b04b0c35d47c86ec5bf96f955b91415d4fda18..55c6a959ffc51767486ed542f43804b11ff32960 100644 (file)
--- a/class/deliver/Deliver.class.php
+++ b/class/deliver/Deliver.class.php
@@ -379,7 +379,7 @@ class Deliver {
         $date = date('D, j M Y H:i:s ', mktime()) . $this->timezone();
         /* Create a message-id */
         $message_id = '<' . $REMOTE_PORT . '.' . $REMOTE_ADDR . '.';
-        $message_id .= time() . '.squirrel@' . $REMOTE_ADDR .'>';
+        $message_id .= time() . '.squirrel@' . (isset($REMOTE_HOST) ? $REMOTE_HOST : "[$REMOTE_ADDR]") .'>';
         /* Make an RFC822 Received: line */
         if (isset($REMOTE_HOST)) {
             $received_from = "$REMOTE_HOST ([$REMOTE_ADDR])";