--- SQLBlackWhiteList-original.pm	2007-03-29 18:28:37.000000000 +0100
+++ SQLBlackWhiteList.pm	2007-03-30 10:05:22.000000000 +0100
@@ -99,7 +99,7 @@
 
 sub CreateList {
   my($type, $BlackWhite) = @_;
-  my($dbh, $sth, $sql, $to_address, $from_address, $count);
+  my($dbh, $sth, $sql, $to_address, $from_address, $count, $filter);
   my($db_name) = 'mailscanner';
   my($db_host) = 'localhost';
   my($db_user) = 'mailwatch';
@@ -127,6 +127,15 @@
    $count++;
   }  
 
+  $sql = "SELECT filter, from_address FROM $type INNER JOIN user_filters ON $type.to_address = user_filters.username";
+  $sth = $dbh->prepare($sql);
+  $sth->execute;
+  $sth->bind_columns(undef,\$filter,\$from_address);
+  while($sth->fetch()) {
+   $BlackWhite->{lc($filter)}{lc($from_address)} = 1; # Store entry
+   $count++;
+  }  
+
   # Close connections  
   $sth->finish();
   $dbh->disconnect();