diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index f58cf01834f3c3262e2cdb15c538a06f53dc4005..ae64463c1722e648e8101ae6392574fc3be66941 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -854,10 +854,6 @@ class installer_base {
 
 	}
 	
-	public function configure_postgrey() {
-		
-	}
-
 	public function configure_saslauthd() {
 		global $conf;
 
diff --git a/install/tpl/mysql-virtual_policy_greylist.cf.master b/install/tpl/mysql-virtual_policy_greylist.cf.master
index 6172450dc0409fbba3745eff93fd1f7d6b461aff..8beb7c4509c505f189313e401718a76deccaa473 100644
--- a/install/tpl/mysql-virtual_policy_greylist.cf.master
+++ b/install/tpl/mysql-virtual_policy_greylist.cf.master
@@ -1,5 +1,5 @@
 user = {mysql_server_ispconfig_user}
 password = {mysql_server_ispconfig_password}
 dbname = {mysql_server_database}
-query = SELECT DISTINCT('greylisting') FROM mail_forwarding mf, mail_user mu where (mf.source='%s' and mf.greylisting='y' and mf.server_id = {server_id}) or (mu.email='%s' and mu.greylisting='y' and mu.server_id = {server_id})
+query = SELECT 'greylisting' FROM (SELECT greylisting, source AS email FROM mail_forwarding WHERE server_id = {server_id} UNION SELECT greylisting, email FROM mail_user WHERE server_id = {server_id}) addresses WHERE addresses.email='%s' AND addresses.greylisting='y'
 hosts = {mysql_server_ip}
\ No newline at end of file