It complains even more about FAKED_MUA_01 when both headers are present.

SA has to be fixed, not SquirrelMail.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@6455 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/class/deliver/Deliver.class.php b/class/deliver/Deliver.class.php
index 190c576fc60403febeb7b6ef7c742028fa0b5dfb..2b5df58107eb16263b7e6a8a2e945a19bdedaeac 100644 (file)
--- a/class/deliver/Deliver.class.php
+++ b/class/deliver/Deliver.class.php
@@ -436,8 +436,6 @@ class Deliver {
         }
         /* Identify SquirrelMail */
         $header[] = 'User-Agent: SquirrelMail/' . $version . $rn;
-        // Spamassassin complains about no X-Mailer in combination with X-Priority
-        $header[] = 'X-Mailer: SquirrelMail/' . $version . $rn;
         /* Do the MIME-stuff */
         $header[] = 'MIME-Version: 1.0' . $rn;
         $contenttype = 'Content-Type: '. $rfc822_header->content_type->type0 .'/'.