--- class/deliver/Deliver.class.php.orig	Wed May  5 00:57:28 2004
+++ class/deliver/Deliver.class.php	Mon Mar 28 16:56:41 2005
@@ -380,13 +380,17 @@
         /* This creates an RFC 822 date */
         $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 = '<' . $REMOTE_PORT . '.' . $REMOTE_ADDR . '.';
+#        $message_id .= time() . '.squirrel@' . $REMOTE_ADDR .'>';
+        $message_id = '<' . $REMOTE_PORT . '.' . '127.0.0.1' . '.';
+        $message_id .= time() . '.squirrel@' . 'localhost' .'>';
         /* Make an RFC822 Received: line */
         if (isset($REMOTE_HOST)) {
-            $received_from = "$REMOTE_HOST ([$REMOTE_ADDR])";
+#            $received_from = "$REMOTE_HOST ([$REMOTE_ADDR])";
+	    $received_from = "localhost ([127.0.0.1])";
         } else {
-            $received_from = $REMOTE_ADDR;
+#            $received_from = $REMOTE_ADDR;
+	    $received_from = "localhost";
         }
         if (isset($HTTP_VIA) || isset ($HTTP_X_FORWARDED_FOR)) {
             if (!isset($HTTP_X_FORWARDED_FOR) || $HTTP_X_FORWARDED_FOR == '') {