- Fix Received headers to behave better with SpamAssassin (#1486513)

2 files changed, 7 insertions, 6 deletions

diff --git a/CHANGELOG b/CHANGELOG
index ececfd769..184d06a83 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG RoundCube Webmail
 ===========================
 
+- Fix Received headers to behave better with SpamAssassin (#1486513)
 - Password: Make passwords encoding consistent with core, add 'password_charset' global option (#1486473)
 - Fix adding contacts SQL error on mysql (#1486459)
 - Squirrelmail_usercopy: support reply-to field (#1486506)
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index 13c162d96..7e9e89519 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -260,8 +260,8 @@ if ($CONFIG['http_received_header'])
         $http_header .= ' ('. rcmail_encrypt_header($host) . ')';
     } else {
       $http_header .= (($host != $hostname) ? $hostname : '[' . $host . ']');
-      $http_header .= ' ('. ($host == $hostname ? '' : $hostname . ' ') .
-        '[' . $host .'])';
+      if ($host != $hostname)
+        $http_header .= ' (['. $host .'])';
     }
     $http_header .= $nldlm . ' via ';
   }
@@ -273,14 +273,14 @@ if ($CONFIG['http_received_header'])
       $http_header .= ' ('. rcmail_encrypt_header($host) . ')';
   } else {
     $http_header .= (($host != $hostname) ? $hostname : '[' . $host . ']');
-    $http_header .= ' ('. ($host == $hostname ? '' : $hostname . ' ') .
-      '[' . $host .'])';
+    if ($host != $hostname)
+      $http_header .= ' (['. $host .'])';
   }
   // BY
   $http_header .= $nldlm . 'by ' . $_SERVER['HTTP_HOST'];
   // WITH
-  $http_header .= $nldlm . 'with ' . $_SERVER['SERVER_PROTOCOL'] .
-      ' ('.$_SERVER['REQUEST_METHOD'] . '); ' . date('r');
+  $http_header .= $nldlm . 'with HTTP (' . $_SERVER['SERVER_PROTOCOL'] .
+      ' '.$_SERVER['REQUEST_METHOD'] . '); ' . date('r');
   $http_header = wordwrap($http_header, 69, $nldlm);
 
   $headers['Received'] = $http_header;