--- /root/ispconfig/isp/conf/user_prefs.master.orig	2006-05-15 21:06:07.000000000 -0400
+++ /root/ispconfig/isp/conf/user_prefs.master	2006-05-15 21:05:40.000000000 -0400
@@ -15,7 +15,9 @@ required_score                {HITS}
 
 # Whitelist and blacklist addresses are now file-glob-style patterns, so
 # "friend@somewhere.com", "*@isp.com", or "*.domain.net" will all work.
-# whitelist_from        someone@somewhere.com
+{WHITELIST_2}whitelist_from        {WHITELIST}
+
+{BLACKLIST_2}blacklist_from        {BLACKLIST}
 
 # Add your own customised scores for some tests below.  The default scores are
 # read from the installed spamassassin rules files, but you can override them
@@ -33,3 +35,4 @@ required_score                {HITS}
 # score UPPERCASE_25_50                0
 # score UPPERCASE_50_75                0
 # score UPPERCASE_75_100        0
+
--- /root/ispconfig/scripts/lib/classes/ispconfig_procmail.lib.php.orig	2006-05-15 21:06:07.000000000 -0400
+++ /root/ispconfig/scripts/lib/classes/ispconfig_procmail.lib.php	2006-05-15 21:05:40.000000000 -0400
@@ -309,12 +309,18 @@ function make_recipes($doc_id) {
   if(!isset($user["spam_hits"])) $user["spam_hits"] = "5";
   if(!isset($user["spam_rewrite_subject"])) $user["spam_rewrite_subject"] = "1";
   if(!isset($user["spam_subject_tag"])) $user["spam_subject_tag"] = "***SPAM*** ";
-
+  if(!isset($user["spam_wlist"])) $user["spam_wlist"] = "friend@somewhere.com";
+  if(!isset($user["spam_blist"])) $user["spam_blist"] = "spammer@somewhere.com";
+  
   // Variablen zuweisen
   $mod->tpl->assign( array(HITS => $user["spam_hits"],
                            REWRITE_SUBJECT => $user["spam_rewrite_subject"],
                            REWRITE_SUBJECT_2 => (($user["spam_rewrite_subject"] == 1)? '':'# '),
-                           SUBJECT_TAG => $user["spam_subject_tag"]));
+                           SUBJECT_TAG => $user["spam_subject_tag"],
+			   WHITELIST => stripcslashes(ereg_replace("(\r\n|\r)", "\n", $user["spam_wlist"])),
+			   WHITELIST_2 => (($user["spam_wlist"] == "")? '# ':''),
+			   BLACKLIST => stripcslashes(ereg_replace("(\r\n|\r)", "\n", $user["spam_blist"])),
+			   BLACKLIST_2 => (($user["spam_blist"] == "")? '# ':'')));
 
   $mod->tpl->parse(TABLE, table);
 
@@ -349,3 +355,4 @@ function make_recipes($doc_id) {
 
 }
 ?>
+