--- /home/admispconfig/ispconfig/web/mailuser/mail/spamfilter.php.orig	2006-05-15 21:06:07.000000000 -0400
+++ /home/admispconfig/ispconfig/web/mailuser/mail/spamfilter.php	2006-05-15 21:05:40.000000000 -0400
@@ -58,9 +58,10 @@ if(count($_POST) > 1) {
         $rec["spam_strategy"] = $_POST["spam_strategy"];
         $rec["spam_rewrite_subject"] = $_POST["spam_rewrite_subject"];
         $rec["spam_hits"] = escapeshellcmd(substr($_POST["spam_hits"],0,7));
+        $rec["spam_wlist"] = substr($_POST["spam_wlist"],0,10000);
+        $rec["spam_blist"] = substr($_POST["spam_blist"],0,10000);
         $rec["spam_subject_tag"] = substr($_POST["spam_subject_tag"],0,50);
         $rec["status"] = 'u';
-
         $sql = $app->form->getSQL($rec,"UPDATE",$id);
 
         if($app->form->errorMessage == '') {
--- /home/admispconfig/ispconfig/web/mailuser/mail/table/user.table.php.orig	2006-05-15 21:06:07.000000000 -0400
+++ /home/admispconfig/ispconfig/web/mailuser/mail/table/user.table.php	2006-05-15 21:05:40.000000000 -0400
@@ -142,6 +142,17 @@ $table['spam_hits'] = array('datatype'  
                                                                   'errmsg'                => $app->lng("txt_error_spam_hits_format")." 0.0",
                                                                   'value'                 => "");
 
+$table['spam_wlist'] = array(         'datatype'                 => "VARCHAR",
+                                                                          'formtype'                 => "TEXT",
+                                                                          'regex'                        => "",
+                                                                          'errmsg'                => "",
+                                                                          'value'                 => "");
+
+$table['spam_blist'] = array(         'datatype'                 => "VARCHAR",
+                                                                          'formtype'                 => "TEXT",
+                                                                          'regex'                        => "",
+                                                                          'errmsg'                => "",
+                                                                          'value'                 => "");
 
 $table['spam_rewrite_subject'] = array(         'datatype'                 => "VARCHAR",
                                                                   'formtype'                 => "SELECT",
--- /home/admispconfig/ispconfig/web/mailuser/templates/spamfilter.tpl.htm.orig	2006-05-15 21:06:07.000000000 -0400
+++ /home/admispconfig/ispconfig/web/mailuser/templates/spamfilter.tpl.htm	2006-05-15 21:05:40.000000000 -0400
@@ -39,8 +39,8 @@
   <tr>
     <td>&nbsp;</td>
     <td colspan="2"><hr></td>
-    </tr
-  ><tr>
+  </tr>
+  <tr>
     <td width="50">&nbsp;</td>
     <td width="120" class="TxtForm"><strong><tmpl_var name='txt_rewrite_subject'>:</strong></td>
     <td class="TxtForm"><select name="spam_rewrite_subject">{tmpl_var name='spam_rewrite_subject'}</select></td>
@@ -52,8 +52,26 @@
   </tr>
   <tr>
     <td>&nbsp;</td>
+    <td colspan="2"><hr></td>
+  </tr>
+  <tr>
+    <td width="50">&nbsp;</td>
+    <td width="120" class="TxtForm" valign="top"><strong><tmpl_var name='txt_spam_wlist'>:</strong></td>
+    <td class="TxtForm"><textarea name="spam_wlist" cols="40" rows="6">{tmpl_var name='spam_wlist'}</textarea><td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
     <td colspan="2">&nbsp;</td>
-    </tr>
+  </tr>
+  <tr>
+    <td width="50">&nbsp;</td>
+    <td width="120" class="TxtForm" valign="top"><strong><tmpl_var name='txt_spam_blist'>:</strong></td>
+    <td class="TxtForm"><textarea name="spam_blist" cols="40" rows="6">{tmpl_var name='spam_blist'}</textarea><td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td colspan="2">&nbsp;</td>
+  </tr>
   <tr>
     <td>&nbsp;</td>
     <td>&nbsp;</td>
@@ -61,3 +79,4 @@
   </tr>
 </table>
 </form>
+