--- MailScanner-4.81.3-1.orig/lib/MailScanner/Message.pm	2010-08-13 18:15:32.000000000 +0200
+++ MailScanner-4.81.3-1/lib/MailScanner/Message.pm	2010-12-01 12:52:23.000000000 +0200
@@ -281,8 +281,9 @@
       if($header_line =~ /Received:/) {
         $rcvd_count++;
         $last_rcvd = $header_line;
-        my($rcvd_ip) = $last_rcvd =~ /\(.*\[(.+)\]\)/;
+        my($rcvd_ip) = $last_rcvd =~ /\(.*\[(.+)\].*\)|\[(.+)\]/;
         # print STDERR "DEBUG: $last_rcvd - IP: $rcvd_ip\n";
+        $rcvd_ip = $2 unless $rcvd_ip;
         $last_rcvd_ip = $rcvd_ip;
         last if $rcvd_count > 2;
       }


