--- lib/Mail/SpamAssassin/Plugin/RelayCountry.pm.orig	2010-03-16 14:49:21.000000000 +0000
+++ lib/Mail/SpamAssassin/Plugin/RelayCountry.pm	2010-07-22 15:39:53.000000000 +0100
@@ -78,16 +78,27 @@
   my $msg = $opts->{msg};
 
   my $countries = '';
+  my $prev_country = 'Trusted_';
+  my $country_tokens = '';
   foreach my $relay (@{$msg->{metadata}->{relays_untrusted}}) {
     my $ip = $relay->{ip};
     my $cc = $reg->inet_atocc($ip) || "XX";
     $countries .= $cc." ";
+    if ($cc ne $prev_country && $cc ne "**") {
+      $country_tokens .= $prev_country.$cc." ";
+      $prev_country = $cc;
+    }
   }
 
   chop $countries;
+  chop $country_tokens;
+
   $msg->put_metadata("X-Relay-Countries", $countries);
   dbg("metadata: X-Relay-Countries: $countries");
 
+  $msg->put_metadata("X-Relay-Country-Tokens", $country_tokens);
+  dbg("metadata: X-Relay-Country-Tokens: $country_tokens");
+
   return 1;
 }
 
@@ -95,6 +106,8 @@
   my ($self, $opts) = @_;
   $opts->{permsgstatus}->set_tag ("RELAYCOUNTRY",
           $opts->{permsgstatus}->get_message->get_metadata('X-Relay-Countries'));
+  $opts->{permsgstatus}->set_tag ("RELAYCOUNTRYTOKENS",
+          $opts->{permsgstatus}->get_message->get_metadata('X-Relay-Country-Tokens'));
   return 1;
 }