--- Message.pm	Tue Feb 27 09:28:19 2007
+++ Message.pm	Tue Feb 27 09:30:20 2007
@@ -403,22 +403,6 @@
   $this->{spamreport} = "";
   $this->{sascore} = 0;
 
-  #
-  # Check to see if message is too large to be likely to be spam.
-  #
-  my $maxtestsize = MailScanner::Config::Value('maxspamchecksize',$this);
-  if ($this->{size} > $maxtestsize) {
-    $this->{spamreport} = MailScanner::Config::LanguageValue($this, 'skippedastoobig');
-    $this->{spamreport} = $this->ReflowHeader(
-                  MailScanner::Config::Value('spamheader',$this),
-                  $this->{spamreport});
-    MailScanner::Log::InfoLog("Message %s from %s (%s) to %s is too big for spam checks (%d > %d bytes)",
-                              $this->{id}, $this->{clientip},
-                              $this->{from}, $todomain,
-                              $this->{size}, $maxtestsize);
-    return 0;
-  }
-
   # Work out if they always want the SA header
   $includesaheader = MailScanner::Config::Value('includespamheader', $this);
   # If they want the GS scanner then we must carry on too
@@ -482,6 +466,22 @@
     $whitelistreport = ' (' .
                   MailScanner::Config::LanguageValue($this, 'whitelisted') .
                   ')';
+  }
+
+  #
+  # Check to see if message is too large to be likely to be spam.
+  #
+  my $maxtestsize = MailScanner::Config::Value('maxspamchecksize',$this);
+  if ($this->{size} > $maxtestsize) {
+    $this->{spamreport} = MailScanner::Config::LanguageValue($this, 'skippedastoobig');
+    $this->{spamreport} = $this->ReflowHeader(
+                  MailScanner::Config::Value('spamheader',$this),
+                  $this->{spamreport});
+    MailScanner::Log::InfoLog("Message %s from %s (%s) to %s is too big for spam checks (%d > %d bytes)",
+                              $this->{id}, $this->{clientip},
+                              $this->{from}, $todomain,
+                              $this->{size}, $maxtestsize);
+    return 0;
   }
 
   if (!$iswhitelisted) {
