diff -Nur smeserver-wbl-0.1.0.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/wbl smeserver-wbl-0.1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/wbl
--- smeserver-wbl-0.1.0.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/wbl	2014-04-08 22:25:04.445107789 +0200
+++ smeserver-wbl-0.1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/wbl	2014-04-11 20:46:33.823813670 +0200
@@ -152,7 +152,7 @@
     <entry>
         <base>WHITELISTSENDERS_DESCRIPTION</base>
         <trans>
-	Any envelope sender of a mail (@host or user@host) matching an entry in whitelistsenders 
+	Any envelope sender of a mail (host.domain or user@host.domain) matching an entry in whitelistsenders  
 	will be exempted from further validation during the 'mail' stage.
         </trans>
     </entry>
diff -Nur smeserver-wbl-0.1.0.old/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/wbl.pm smeserver-wbl-0.1.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/wbl.pm
--- smeserver-wbl-0.1.0.old/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/wbl.pm	2014-04-08 22:25:04.450108424 +0200
+++ smeserver-wbl-0.1.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/wbl.pm	2014-04-11 20:12:22.233245931 +0200
@@ -190,14 +190,14 @@
 	}
 
     # qmail badmailfrom
-    my %list = $wdb->get('badmailfrom')->props;
-    my $parameter = "";
-    my $value = "";
-    while (($parameter,$value) = each(%list)) {
-        if ($parameter eq "type") {next;}
+    my %list_badmailfrom = $wdb->get('badmailfrom')->props;
+    my $parameter_badmailfrom = "";
+    my $value_badmailfrom = "";
+    while (($parameter_badmailfrom,$value_badmailfrom) = each(%list_badmailfrom)) {
+        if ($parameter_badmailfrom eq "type") {next;}
 
-        if ($value eq "Black") {
-            $wdb->get_prop_and_delete('badmailfrom', "$parameter");
+        if ($value_badmailfrom eq "Black") {
+            $wdb->get_prop_and_delete('badmailfrom', "$parameter_badmailfrom");
         }
     }
 
@@ -247,14 +247,14 @@
 	}
 
     # qpsmtpd whitelisthelo
-    my %list = $wdb->get('whitelisthelo')->props;
-    my $parameter = "";
-    my $value = "";
-    while (($parameter,$value) = each(%list)) {
-        if ($parameter eq "type") {next;}
+    my %list_whitelisthelo = $wdb->get('whitelisthelo')->props;
+    my $parameter_whitelisthelo = "";
+    my $value_whitelisthelo = "";
+    while (($parameter_whitelisthelo,$value_whitelisthelo) = each(%list_whitelisthelo)) {
+        if ($parameter_whitelisthelo eq "type") {next;}
 
-        if ($value eq "White") {
-            $wdb->get_prop_and_delete('whitelisthelo', "$parameter");
+        if ($value_whitelisthelo eq "White") {
+            $wdb->get_prop_and_delete('whitelisthelo', "$parameter_whitelisthelo");
         }
     }
 
@@ -267,14 +267,14 @@
 	}
 
     # qpsmtpd whitelistsenders
-    my %list = $wdb->get('whitelistsenders')->props;
-    my $parameter = "";
-    my $value = "";
-    while (($parameter,$value) = each(%list)) {
-        if ($parameter eq "type") {next;}
+    my %list_whitelistsenders = $wdb->get('whitelistsenders')->props;
+    my $parameter_whitelistsenders = "";
+    my $value_whitelistsenders = "";
+    while (($parameter_whitelistsenders,$value_whitelistsenders) = each(%list_whitelistsenders)) {
+        if ($parameter_whitelistsenders eq "type") {next;}
 
-        if ($value eq "White") {
-            $wdb->get_prop_and_delete('whitelistsenders', "$parameter");
+        if ($value_whitelistsenders eq "White") {
+            $wdb->get_prop_and_delete('whitelistsenders', "$parameter_whitelistsenders");
         }
     }
 
@@ -287,14 +287,14 @@
 	}
 
     # spamassassin whitelist_from
-    my %list = $sdb->get('wbl.global')->props;
-    my $parameter = "";
-    my $value = "";
-    while (($parameter,$value) = each(%list)) {
-        if ($parameter eq "type") {next;}
+    my %list_wblglobal = $sdb->get('wbl.global')->props;
+    my $parameter_wblglobal = "";
+    my $value_wblglobal = "";
+    while (($parameter_wblglobal,$value_wblglobal) = each(%list_wblglobal)) {
+        if ($parameter_wblglobal eq "type") {next;}
 
-        if ($value eq "White") {
-            $sdb->get_prop_and_delete('wbl.global', "$parameter");
+        if ($value_wblglobal eq "White") {
+            $sdb->get_prop_and_delete('wbl.global', "$parameter_wblglobal");
         }
     }