--- /usr/share/perl5/Mail/SpamAssassin/Message/Metadata/Received.pm.bak	2011-03-04 15:00:50.762571312 +0000
+++ /usr/share/perl5/Mail/SpamAssassin/Message/Metadata/Received.pm	2011-03-04 16:25:01.259069980 +0000
@@ -411,12 +411,27 @@
       $envfrom = $1;
     }
 
-    # bug 3236: ignore Squirrelmail injection steps.
+    # bug 3236: deal with Squirrelmail injection steps.
+    # see also bugs 4008, 2462 and particularly 3302
     # from 142.169.110.122 (SquirrelMail authenticated user synapse) by
     # mail.nomis80.org with HTTP; Sat, 3 Apr 2004 10:33:43 -0500 (EST)
-    if (/ \(SquirrelMail authenticated user /) {
-      dbg("received-header: ignored SquirrelMail injection: $_");
-      return 0;
+
+    #Received: from 212.116.219.52 (proxying for 41.220.75.3)
+    #   (SquirrelMail authenticated user u159201872)
+    #   by webmail.telia.dk with HTTP;
+    #   Wed, 24 Jun 2009 08:24:44 +0200 (CEST)
+
+    if (/\(SquirrelMail authenticated user / && /by (\S+) with (HTTP)/)  {
+      $by = $1; $auth = $2;
+      if (/\(proxying for (${IP_ADDRESS})/) {
+          $ip = $1;
+      } elsif (/^(${IP_ADDRESS})\s+\(SquirrelMail/) {
+          $ip = $1;
+      } else {
+          dbg("received-header: ignored SquirrelMail injection: $_");
+          return 0;
+      }
+      goto enough;
     }
 
     # AOL WebMail headers