diff -ruN data/openwebmail/images/iconsets/Text.Chinese.Simplified/icontext data/openwebmail/images/iconsets/Text.Chinese.Simplified/icontext
--- data/openwebmail/images/iconsets/Text.Chinese.Simplified/icontext	Fri Apr  9 16:35:11 2004
+++ data/openwebmail/images/iconsets/Text.Chinese.Simplified/icontext	Tue Apr 13 21:15:32 2004
@@ -88,8 +88,10 @@
    'webdisk.gif'       => ' [ÍøÂ·Ó²µú] ',
    'webdisk.s.gif'     => ' [ÍøÂ·Ó²µú] ',
    'weekview.gif'      => ' [ÖÜÐÐÊÂÀú] ',
-   'yearview.gif'      => ' [ÄêÐÐÊÂÀú]'
+   'yearview.gif'      => ' [ÄêÐÐÊÂÀú]',
+   'spam.gif'          => ' [Learn As Spam] ',
+   'ham.gif'           => ' [Learn As Ham] ',
    );
 
 1;
-   
\ No newline at end of file
+   
diff -ruN data/openwebmail/images/iconsets/Text.Chinese.Traditional/icontext data/openwebmail/images/iconsets/Text.Chinese.Traditional/icontext
--- data/openwebmail/images/iconsets/Text.Chinese.Traditional/icontext	Fri Apr  9 16:35:34 2004
+++ data/openwebmail/images/iconsets/Text.Chinese.Traditional/icontext	Tue Apr 13 21:15:51 2004
@@ -88,7 +88,9 @@
    'webdisk.gif'       => ' [ºô¸ôµwºÐ] ',
    'webdisk.s.gif'     => ' [ºô¸ôµwºÐ] ',
    'weekview.gif'      => ' [¶g¦æ¨Æ¾ä] ',
-   'yearview.gif'      => ' [¦~¦æ¨Æ¾ä]'
+   'yearview.gif'      => ' [¦~¦æ¨Æ¾ä]',
+   'spam.gif'          => ' [Learn As Spam] ',
+   'ham.gif'           => ' [Learn As Ham] ',
    );
    
 1;
diff -ruN data/openwebmail/images/iconsets/Text.English/icontext data/openwebmail/images/iconsets/Text.English/icontext
--- data/openwebmail/images/iconsets/Text.English/icontext	Fri Apr  9 16:35:00 2004
+++ data/openwebmail/images/iconsets/Text.English/icontext	Tue Apr 13 21:13:54 2004
@@ -88,8 +88,10 @@
    'webdisk.gif'       => ' [WebDisk] ',
    'webdisk.s.gif'     => ' [WebDisk] ',
    'weekview.gif'      => ' [WeekView] ',
-   'yearview.gif'      => ' [YearView] '
+   'yearview.gif'      => ' [YearView] ',
+   'spam.gif'          => ' [Learn As Spam] ',
+   'ham.gif'           => ' [Learn As Ham] ',
    );
 
 1;
-   
\ No newline at end of file
+   
diff -ruN data/openwebmail/images/iconsets/Text.Korean/icontext data/openwebmail/images/iconsets/Text.Korean/icontext
--- data/openwebmail/images/iconsets/Text.Korean/icontext	Fri Apr  9 16:35:21 2004
+++ data/openwebmail/images/iconsets/Text.Korean/icontext	Tue Apr 13 21:16:07 2004
@@ -90,7 +90,9 @@
    'webdisk.gif'       => ' [À¥ µð½ºÅ©] ',
    'webdisk.s.gif'     => ' [À¥ µð½ºÅ©] ',
    'weekview.gif'      => ' [ÁÖ º¸±â] ',
-   'yearview.gif'      => ' [¿¬ º¸±â] '
+   'yearview.gif'      => ' [¿¬ º¸±â] ',
+   'spam.gif'          => ' [Learn As Spam] ',
+   'ham.gif'           => ' [Learn As Ham] ',
    );
    
 1;
diff -ru cgi-bin/openwebmail/etc/lang/ar.CP1256 cgi-bin/openwebmail/etc/lang/ar.CP1256
--- cgi-bin/openwebmail/etc/lang/ar.CP1256	Sun Jan 11 09:07:18 2004
+++ cgi-bin/openwebmail/etc/lang/ar.CP1256	Wed Apr 14 01:32:06 2004
@@ -424,7 +424,9 @@
    vdomain_localuser  => 'Local User',
    set_passwd         => 'Set Password',
    reset_passwd       => 'Reset Password',
-   email_alias        => 'E-MAIL Alias'
+   email_alias        => 'E-MAIL Alias',
+   learnspam          => 'Learn checked messages as Spam',
+   learnham           => 'Learn checked messages as Ham',
    );
 
 %lang_err =
@@ -436,6 +438,7 @@
    couldnt_seek      => 'Couldn\'t seek to the beginning of',
    couldnt_close     => 'Couldn\'t close',
    couldnt_updatedb  => 'Couldn\'t update index db ',
+   couldnt_load      => 'Couldn\'t load module @@@MODULENAME@@@',
    disallowed_pop3   => 'Disallowed POP3 server',
    disallowed_client => 'You are not allowed to connect from this client',
    disallowed_receiverdomain => 'You are not allowed to send message to this email address',
diff -ru cgi-bin/openwebmail/etc/lang/ar.ISO8859-6 cgi-bin/openwebmail/etc/lang/ar.ISO8859-6
--- cgi-bin/openwebmail/etc/lang/ar.ISO8859-6	Sun Jan 11 09:07:18 2004
+++ cgi-bin/openwebmail/etc/lang/ar.ISO8859-6	Wed Apr 14 01:32:14 2004
@@ -424,7 +424,9 @@
    vdomain_localuser  => 'Local User',
    set_passwd         => 'Set Password',
    reset_passwd       => 'Reset Password',
-   email_alias        => 'E-MAIL Alias'
+   email_alias        => 'E-MAIL Alias',
+   learnspam          => 'Learn checked messages as Spam',
+   learnham           => 'Learn checked messages as Ham',
    );
 
 %lang_err =
@@ -436,6 +438,7 @@
    couldnt_seek      => 'Couldn\'t seek to the beginning of',
    couldnt_close     => 'Couldn\'t close',
    couldnt_updatedb  => 'Couldn\'t update index db ',
+   couldnt_load      => 'Couldn\'t load module @@@MODULENAME@@@',
    disallowed_pop3   => 'Disallowed POP3 server',
    disallowed_client => 'You are not allowed to connect from this client',
    disallowed_receiverdomain => 'You are not allowed to send message to this email address',
diff -ru cgi-bin/openwebmail/etc/lang/bg cgi-bin/openwebmail/etc/lang/bg
--- cgi-bin/openwebmail/etc/lang/bg	Sun Jan 11 09:07:18 2004
+++ cgi-bin/openwebmail/etc/lang/bg	Wed Apr 14 01:32:23 2004
@@ -424,7 +424,9 @@
    vdomain_localuser  => 'Ëîêàëåí ïoòðåáèòåë',
    set_passwd         => 'Èçáåðè ïàðîëà', 
    reset_passwd       => 'Ðåñåò íà ïàðîëàòà',
-   email_alias        => 'E-MAIL ñèíîíèì'
+   email_alias        => 'E-MAIL ñèíîíèì',
+   learnspam          => 'Learn checked messages as Spam',
+   learnham           => 'Learn checked messages as Ham',
    );
 
 %lang_err =
@@ -436,6 +438,7 @@
    couldnt_seek      => 'Íå å íàìåðåíî íà÷àëîòî íà',
    couldnt_close     => 'Íåâúçìîæíî çàòâàðÿíå',
    couldnt_updatedb  => 'Íåâúçìîæíî îïðåñíÿâàíå íà èíäåêñèòå ',
+   couldnt_load      => 'Couldn\'t load module @@@MODULENAME@@@',
    disallowed_pop3   => 'Îòõâúðëåí POP3 ñúðâúð',
    disallowed_client => 'Ïðîáëåì ïðè ñâúðçâàíåòî îò',
    disallowed_receiverdomain => 'Íåâúçìîæíî èçïðàùàíåòî íà ïîùà äî òîçè àäðåñ',
diff -ru cgi-bin/openwebmail/etc/lang/ca cgi-bin/openwebmail/etc/lang/ca
--- cgi-bin/openwebmail/etc/lang/ca	Sun Jan 11 09:07:18 2004
+++ cgi-bin/openwebmail/etc/lang/ca	Wed Apr 14 01:32:30 2004
@@ -425,7 +425,9 @@
    vdomain_localuser  => 'Usuari local',
    set_passwd         => 'Establir contrassenya',
    reset_passwd       => 'Restablir contrassenya',
-   email_alias        => 'Àlies de correu electrònic'
+   email_alias        => 'Àlies de correu electrònic',
+   learnspam          => 'Learn checked messages as Spam',
+   learnham           => 'Learn checked messages as Ham',
    );
 
 %lang_err =
@@ -437,6 +439,7 @@
    couldnt_seek      => 'No puc trobar l\'inici de',
    couldnt_close     => 'No puc tancar',
    couldnt_updatedb  => 'No puc actualitzar l\'índex',
+   couldnt_load      => 'Couldn\'t load module @@@MODULENAME@@@',
    disallowed_pop3   => 'Servidor POP3 no permès',
    disallowed_client => 'No és permès de connectar-se des d\'aquest client',
    disallowed_receiverdomain => 'No té permís per enviar un missatge a aquesta adreça de correu',
diff -ru cgi-bin/openwebmail/etc/lang/cs cgi-bin/openwebmail/etc/lang/cs
--- cgi-bin/openwebmail/etc/lang/cs	Thu Apr  8 11:35:47 2004
+++ cgi-bin/openwebmail/etc/lang/cs	Wed Apr 14 01:32:39 2004
@@ -426,7 +426,9 @@
    vdomain_localuser  => 'Mï¿½stnï¿½ uï¿½ivatel',
    set_passwd         => 'Nastavit heslo',
    reset_passwd       => 'Znovunastavit heslo',
-   email_alias        => 'E-MAIL Alias'
+   email_alias        => 'E-MAIL Alias',
+   learnspam          => 'Learn checked messages as Spam',
+   learnham           => 'Learn checked messages as Ham',
    );
 
 %lang_err =
@@ -438,6 +440,7 @@
    couldnt_seek      => 'Nepodaï¿½ilo se pï¿½ejï¿½t na zaï¿½ï¿½tek',
    couldnt_close     => 'Nelze zavï¿½ï¿½t',
    couldnt_updatedb  => 'Nedï¿½ se aktualizovat index databï¿½ze',
+   couldnt_load      => 'Couldn\'t load module @@@MODULENAME@@@',
    disallowed_pop3   => 'Nepovolenï¿½ POP3 server',
    disallowed_client => 'Nemï¿½te oprï¿½vnï¿½nï¿½ pï¿½ipojit se z tohoto klienta',
    disallowed_receiverdomain => 'Nemï¿½te oprï¿½vnï¿½nï¿½ poslat zprï¿½vu na tuto adresu',
diff -ru cgi-bin/openwebmail/etc/lang/da cgi-bin/openwebmail/etc/lang/da
--- cgi-bin/openwebmail/etc/lang/da	Sun Jan 11 09:07:18 2004
+++ cgi-bin/openwebmail/etc/lang/da	Wed Apr 14 01:32:46 2004
@@ -424,7 +424,9 @@
    vdomain_localuser  => 'Local User',
    set_passwd         => 'Set Password',
    reset_passwd       => 'Reset Password',
-   email_alias        => 'E-MAIL Alias'
+   email_alias        => 'E-MAIL Alias',
+   learnspam          => 'Learn checked messages as Spam',
+   learnham           => 'Learn checked messages as Ham',
    );
 
 %lang_err =
@@ -436,6 +438,7 @@
    couldnt_seek      => 'Kunne ikke søge til starten af',
    couldnt_close     => 'Kunne ikke lukke',
    couldnt_updatedb  => 'Det var ikke muligt at opdatere indeks db ',
+   couldnt_load      => 'Couldn\'t load module @@@MODULENAME@@@',
    disallowed_pop3   => 'Ugyldig POP3 server',
    disallowed_client => 'Du har ikke tilladelse til at forbinde fra denne pc',
    disallowed_receiverdomain => 'Du har ikke tilladelse til at sende mail til denne mailadresse',
diff -ru cgi-bin/openwebmail/etc/lang/de cgi-bin/openwebmail/etc/lang/de
--- cgi-bin/openwebmail/etc/lang/de	Sun Jan 11 09:07:18 2004
+++ cgi-bin/openwebmail/etc/lang/de	Wed Apr 14 01:32:57 2004
@@ -426,7 +426,9 @@
    vdomain_localuser  => 'Lokaler User',
    set_passwd         => 'Passwort setzen',
    reset_passwd       => 'Passwort löschen',
-   email_alias        => 'eMail-Alias'
+   email_alias        => 'eMail-Alias',
+   learnspam          => 'Learn checked messages as Spam',
+   learnham           => 'Learn checked messages as Ham',
    );
 
 %lang_err =
@@ -438,6 +440,7 @@
    couldnt_seek      => 'Fehler beim Lesen der Datei',
    couldnt_close     => 'Fehler beim Schließen der Datei',
    couldnt_updatedb  => 'Kann Index-DB nicht aktualisieren ',
+   couldnt_load      => 'Couldn\'t load module @@@MODULENAME@@@',
    disallowed_pop3   => 'Gesperrter POP3 Server',
    disallowed_client => 'Zugriff über diesem Client nicht erlaubt',
    disallowed_receiverdomain => 'Emails an diese Domain sind nicht erlaubt',
diff -ru cgi-bin/openwebmail/etc/lang/el cgi-bin/openwebmail/etc/lang/el
--- cgi-bin/openwebmail/etc/lang/el	Sun Jan 11 09:07:18 2004
+++ cgi-bin/openwebmail/etc/lang/el	Wed Apr 14 01:33:04 2004
@@ -424,7 +424,9 @@
    vdomain_localuser  => 'Local User',
    set_passwd         => 'Set Password',
    reset_passwd       => 'Reset Password',
-   email_alias        => 'E-MAIL Alias'
+   email_alias        => 'E-MAIL Alias',
+   learnspam          => 'Learn checked messages as Spam',
+   learnham           => 'Learn checked messages as Ham',
    );
 
 %lang_err =
@@ -436,6 +438,7 @@
    couldnt_seek      => 'Couldn\'t seek to the beginning of',
    couldnt_close     => 'Couldn\'t close',
    couldnt_updatedb  => 'Couldn\'t update index db ',
+   couldnt_load      => 'Couldn\'t load module @@@MODULENAME@@@',
    disallowed_pop3   => 'Disallowed POP3 server',
    disallowed_client => 'You are not allowed to connect from this client',
    disallowed_receiverdomain => 'You are not allowed to send message to this email address',
diff -ru cgi-bin/openwebmail/etc/lang/en cgi-bin/openwebmail/etc/lang/en
--- cgi-bin/openwebmail/etc/lang/en	Sun Jan 11 09:07:18 2004
+++ cgi-bin/openwebmail/etc/lang/en	Mon Apr 12 01:37:58 2004
@@ -424,7 +424,9 @@
    vdomain_localuser  => 'Local User',
    set_passwd         => 'Set Password',
    reset_passwd       => 'Reset Password',
-   email_alias        => 'E-MAIL Alias'
+   email_alias        => 'E-MAIL Alias',
+   learnspam          => 'Learn checked messages as Spam',
+   learnham           => 'Learn checked messages as Ham',
    );
 
 %lang_err =
@@ -436,6 +438,7 @@
    couldnt_seek      => 'Couldn\'t seek to the beginning of',
    couldnt_close     => 'Couldn\'t close',
    couldnt_updatedb  => 'Couldn\'t update index db ',
+   couldnt_load      => 'Couldn\'t load module @@@MODULENAME@@@',
    disallowed_pop3   => 'Disallowed POP3 server',
    disallowed_client => 'You are not allowed to connect from this client',
    disallowed_receiverdomain => 'You are not allowed to send message to this email address',
Only in openwebmail-sa/etc/lang: en.orig
diff -ru cgi-bin/openwebmail/etc/lang/es cgi-bin/openwebmail/etc/lang/es
--- cgi-bin/openwebmail/etc/lang/es	Sun Jan 11 09:07:18 2004
+++ cgi-bin/openwebmail/etc/lang/es	Wed Apr 14 01:33:36 2004
@@ -424,7 +424,9 @@
    vdomain_localuser  => 'Usuario local',
    set_passwd         => 'Establecer contraseña',
    reset_passwd       => 'Restablecer contraseña',
-   email_alias        => 'Alias de E-mail'
+   email_alias        => 'Alias de E-mail',
+   learnspam          => 'Learn checked messages as Spam',
+   learnham           => 'Learn checked messages as Ham',
    );
 
 %lang_err =
@@ -436,6 +438,7 @@
    couldnt_seek      => 'No pude encontrar el comienzo de',
    couldnt_close     => 'No pude cerrar',
    couldnt_updatedb  => 'No pude actualizar el índice',
+   couldnt_load      => 'Couldn\'t load module @@@MODULENAME@@@',
    disallowed_pop3   => 'Servidor POP3 no permitido',
    disallowed_client => 'No esta permitido conectarse desde este cliente',
    disallowed_receiverdomain => 'No tiene permiso para enviar un mensaje a esa dirección de correo',
diff -ru cgi-bin/openwebmail/etc/lang/fi cgi-bin/openwebmail/etc/lang/fi
--- cgi-bin/openwebmail/etc/lang/fi	Sun Jan 11 09:07:18 2004
+++ cgi-bin/openwebmail/etc/lang/fi	Wed Apr 14 01:33:43 2004
@@ -424,7 +424,9 @@
    vdomain_localuser  => 'Local User',
    set_passwd         => 'Set Password',
    reset_passwd       => 'Reset Password',
-   email_alias        => 'E-MAIL Alias'
+   email_alias        => 'E-MAIL Alias',
+   learnspam          => 'Learn checked messages as Spam',
+   learnham           => 'Learn checked messages as Ham',
    );
 
 %lang_err =
@@ -436,6 +438,7 @@
    couldnt_seek      => 'Ei voitu hakea',
    couldnt_close     => 'Ei voitu sulkea',
    couldnt_updatedb  => 'Indeksoinnin päivitys epäonnistui',
+   couldnt_load      => 'Couldn\'t load module @@@MODULENAME@@@',
    disallowed_pop3   => 'Disallowed POP3 server',
    disallowed_client => 'You are not allowed to connect from this client',
    disallowed_receiverdomain => 'You are not allowed to send message to this email address',
diff -ru cgi-bin/openwebmail/etc/lang/fr cgi-bin/openwebmail/etc/lang/fr
--- cgi-bin/openwebmail/etc/lang/fr	Sun Jan 11 09:07:18 2004
+++ cgi-bin/openwebmail/etc/lang/fr	Wed Apr 14 01:33:50 2004
@@ -424,7 +424,9 @@
    vdomain_localuser  => 'Utilisateur local',
    set_passwd         => 'Mot de passe',
    reset_passwd       => 'RAZ du mot de passe',
-   email_alias        => 'E-MAIL Alias'
+   email_alias        => 'E-MAIL Alias',
+   learnspam          => 'Learn checked messages as Spam',
+   learnham           => 'Learn checked messages as Ham',
    );
 
 %lang_err =
@@ -436,6 +438,7 @@
    couldnt_seek      => 'Recherche impossible vers le début de',
    couldnt_close     => 'Fermeture impossible de',
    couldnt_updatedb  => 'Ne peut pas mettre à jour l\'index de base de données ',
+   couldnt_load      => 'Couldn\'t load module @@@MODULENAME@@@',
    disallowed_pop3   => 'Serveur POP3 interdit',
    disallowed_client => 'Vous n\'êtes pas autorisé à vous connecter de ce client',
    disallowed_receiverdomain => 'Vous n\'êtes pas autorisé à envoyer des messages à cette adresse mail',
diff -ru cgi-bin/openwebmail/etc/lang/he.CP1255 cgi-bin/openwebmail/etc/lang/he.CP1255
--- cgi-bin/openwebmail/etc/lang/he.CP1255	Sun Jan 11 09:07:18 2004
+++ cgi-bin/openwebmail/etc/lang/he.CP1255	Wed Apr 14 01:33:57 2004
@@ -425,7 +425,9 @@
    vdomain_localuser  => 'îùúîù î÷åîé',
    set_passwd         => '÷áò ñéñîà',
    reset_passwd       => 'àôñ ñéñîà',
-   email_alias        => 'ëéðåé E-mail'
+   email_alias        => 'ëéðåé E-mail',
+   learnspam          => 'Learn checked messages as Spam',
+   learnham           => 'Learn checked messages as Ham',
    );   
   
 %lang_err =
@@ -437,6 +439,7 @@
    couldnt_seek      => 'ìà ðúï ìñøå÷ ìúçéìä',
    couldnt_close     => 'ìà ðñâø',
    couldnt_updatedb  => 'ìà òåãëï àéðã÷ñ',
+   couldnt_load      => 'Couldn\'t load module @@@MODULENAME@@@',
    disallowed_pop3   => 'ìà îåøùä POP3  ùøú',
    disallowed_client => 'àéðê îåøùä ìäúçáø îúçðä æå',
    disallowed_receiverdomain => 'àéðê îåøùä ìùìåç ãåàø ìëúåáú æå',
diff -ru cgi-bin/openwebmail/etc/lang/he.ISO8859-8 cgi-bin/openwebmail/etc/lang/he.ISO8859-8
--- cgi-bin/openwebmail/etc/lang/he.ISO8859-8	Sun Jan 11 09:07:18 2004
+++ cgi-bin/openwebmail/etc/lang/he.ISO8859-8	Wed Apr 14 01:34:04 2004
@@ -424,7 +424,9 @@
    vdomain_localuser  => 'Local User',
    set_passwd         => 'Set Password',
    reset_passwd       => 'Reset Password',
-   email_alias        => 'E-MAIL Alias'
+   email_alias        => 'E-MAIL Alias',
+   learnspam          => 'Learn checked messages as Spam',
+   learnham           => 'Learn checked messages as Ham',
    );
 
 %lang_err =
@@ -436,6 +438,7 @@
    couldnt_seek      => 'äìéçúì ÷åøñì ïúð àì',
    couldnt_close     => 'øâñð àì',
    couldnt_updatedb  => 'ñ÷ãðéà ïëãåò àì',
+   couldnt_load      => 'Couldn\'t load module @@@MODULENAME@@@',
    disallowed_pop3   => 'úøù  POP3 äùøåî àì',
    disallowed_client => 'åæ äðçúî øáçúäì äùøåî êðéà',
    disallowed_receiverdomain => 'åæ úáåúëì øàåã çåìùì äùøåî êðéà',
diff -ru cgi-bin/openwebmail/etc/lang/hu cgi-bin/openwebmail/etc/lang/hu
--- cgi-bin/openwebmail/etc/lang/hu	Sun Jan 11 09:07:18 2004
+++ cgi-bin/openwebmail/etc/lang/hu	Wed Apr 14 01:34:10 2004
@@ -425,7 +425,9 @@
    vdomain_localuser  => 'Helyi felhasználó',
    set_passwd         => 'Jelszó megadása',
    reset_passwd       => 'Jelszó törlése',
-   email_alias        => 'Emil Alias'
+   email_alias        => 'Emil Alias',
+   learnspam          => 'Learn checked messages as Spam',
+   learnham           => 'Learn checked messages as Ham',
    );
 
 %lang_err =
@@ -437,6 +439,7 @@
    couldnt_seek      => 'Nem található az eleje',
    couldnt_close     => 'Nem sikerült bezárni',
    couldnt_updatedb  => 'Nem sikerült az index db frissítése ',
+   couldnt_load      => 'Couldn\'t load module @@@MODULENAME@@@',
    disallowed_pop3   => 'Tiltott POP3 szerver',
    disallowed_client => 'Nem léphet be errõl a géprõl',
    disallowed_receiverdomain => 'Nem küldhet levelet erre az email címre',
diff -ru cgi-bin/openwebmail/etc/lang/id cgi-bin/openwebmail/etc/lang/id
--- cgi-bin/openwebmail/etc/lang/id	Sun Jan 11 09:07:18 2004
+++ cgi-bin/openwebmail/etc/lang/id	Wed Apr 14 01:34:17 2004
@@ -424,7 +424,9 @@
    vdomain_localuser  => 'Local User',
    set_passwd         => 'Set Password',
    reset_passwd       => 'Reset Password',
-   email_alias        => 'E-MAIL Alias'
+   email_alias        => 'E-MAIL Alias',
+   learnspam          => 'Learn checked messages as Spam',
+   learnham           => 'Learn checked messages as Ham',
    );
 
 %lang_err =
@@ -436,6 +438,7 @@
    couldnt_seek      => 'Tidak dapat Mencari',
    couldnt_close     => 'Tidak dapat menutup',
    couldnt_updatedb  => 'Couldn\'t update index db ',
+   couldnt_load      => 'Couldn\'t load module @@@MODULENAME@@@',
    disallowed_pop3   => 'Tidak dapat berhubungan dengan server POP3',
    disallowed_client => 'Tidak diizinkan masuk WebMail dgn alamat ini',
    disallowed_receiverdomain => 'Anda tidak diizikan mengirim surat ke alamat ini',
diff -ru cgi-bin/openwebmail/etc/lang/it cgi-bin/openwebmail/etc/lang/it
--- cgi-bin/openwebmail/etc/lang/it	Sun Jan 11 09:07:18 2004
+++ cgi-bin/openwebmail/etc/lang/it	Wed Apr 14 01:34:29 2004
@@ -424,7 +424,9 @@
    vdomain_localuser  => 'Utente Locale',
    set_passwd         => 'Imposta Password',
    reset_passwd       => 'Azzera Password',
-   email_alias        => 'Alias E-MAIL'
+   email_alias        => 'Alias E-MAIL',
+   learnspam          => 'Learn checked messages as Spam',
+   learnham           => 'Learn checked messages as Ham',
    );
 
 %lang_err =
@@ -436,6 +438,7 @@
    couldnt_seek      => 'Non posso raggiungere l\'inizio di',
    couldnt_close     => 'Non posso chiudere',
    couldnt_updatedb  => 'Impossibile aggiornare l\'indice db ',
+   couldnt_load      => 'Couldn\'t load module @@@MODULENAME@@@',
    disallowed_pop3   => 'Server POP3 diabilitato',
    disallowed_client => 'Non sei abilitato a connetterti da questo client',
    disallowed_receiverdomain => 'Non sei abilitato a spedire mail a questo indirizzo',
diff -ru cgi-bin/openwebmail/etc/lang/ja_JP.Shift_JIS cgi-bin/openwebmail/etc/lang/ja_JP.Shift_JIS
--- cgi-bin/openwebmail/etc/lang/ja_JP.Shift_JIS	Sun Jan 11 09:07:18 2004
+++ cgi-bin/openwebmail/etc/lang/ja_JP.Shift_JIS	Wed Apr 14 01:34:38 2004
@@ -424,7 +424,9 @@
    vdomain_localuser  => 'Local User',
    set_passwd         => 'Set Password',
    reset_passwd       => 'Reset Password',
-   email_alias        => 'E-MAIL Alias'
+   email_alias        => 'E-MAIL Alias',
+   learnspam          => 'Learn checked messages as Spam',
+   learnham           => 'Learn checked messages as Ham',
    );
 
 %lang_err =
@@ -436,6 +438,7 @@
    couldnt_seek      => 'Žn‚Ü‚è‚ðŒ©‚Â‚¯‚é‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½',
    couldnt_close     => '•Â‚¶‚é‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ',
    couldnt_updatedb  => 'ƒCƒ“ƒfƒbƒNƒXƒf�[ƒ^ƒx�[ƒX‚ðƒAƒbƒvƒf�[ƒg‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½ ',
+   couldnt_load      => 'Couldn\'t load module @@@MODULENAME@@@',
    disallowed_pop3   => 'POP3ƒT�[ƒo�[‚ªŽg‚¦‚Ü‚¹‚ñ‚Å‚µ‚½',
    disallowed_client => '‚±‚ÌƒNƒ‰ƒCƒAƒ“ƒg‚©‚ç�Ú‘±‚·‚é‚±‚Æ‚Í‚Å‚«‚Ü‚¹‚ñ',
    disallowed_receiverdomain => '‚±‚ÌEƒ��[ƒ‹ƒAƒhƒŒƒX‚É‘—�M‚·‚é‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ',
diff -ru cgi-bin/openwebmail/etc/lang/ja_JP.eucJP cgi-bin/openwebmail/etc/lang/ja_JP.eucJP
--- cgi-bin/openwebmail/etc/lang/ja_JP.eucJP	Sun Jan 11 09:07:18 2004
+++ cgi-bin/openwebmail/etc/lang/ja_JP.eucJP	Wed Apr 14 01:34:44 2004
@@ -424,7 +424,9 @@
    vdomain_localuser  => 'Local User',
    set_passwd         => 'Set Password',
    reset_passwd       => 'Reset Password',
-   email_alias        => 'E-MAIL Alias'
+   email_alias        => 'E-MAIL Alias',
+   learnspam          => 'Learn checked messages as Spam',
+   learnham           => 'Learn checked messages as Ham',
    );
 
 %lang_err =
@@ -436,6 +438,7 @@
    couldnt_seek      => '»Ï¤Þ¤ê¤ò¸«¤Ä¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿',
    couldnt_close     => 'ÊÄ¤¸¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó',
    couldnt_updatedb  => '¥¤¥ó¥Ç¥Ã¥¯¥¹¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿ ',
+   couldnt_load      => 'Couldn\'t load module @@@MODULENAME@@@',
    disallowed_pop3   => 'POP3¥µ¡¼¥Ð¡¼¤¬»È¤¨¤Þ¤»¤ó¤Ç¤·¤¿',
    disallowed_client => '¤³¤Î¥¯¥é¥¤¥¢¥ó¥È¤«¤éÀÜÂ³¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó',
    disallowed_receiverdomain => '¤³¤ÎE¥á¡¼¥ë¥¢¥É¥ì¥¹¤ËÁ÷¿®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó',
diff -ru cgi-bin/openwebmail/etc/lang/kr cgi-bin/openwebmail/etc/lang/kr
--- cgi-bin/openwebmail/etc/lang/kr	Sun Jan 11 09:07:18 2004
+++ cgi-bin/openwebmail/etc/lang/kr	Wed Apr 14 01:34:49 2004
@@ -425,7 +425,9 @@
    vdomain_localuser  => 'Local User',
    set_passwd         => 'Set Password',
    reset_passwd       => 'Reset Password',
-   email_alias        => 'E-MAIL Alias'
+   email_alias        => 'E-MAIL Alias',
+   learnspam          => 'Learn checked messages as Spam',
+   learnham           => 'Learn checked messages as Ham',
    );
 
 %lang_err =
@@ -437,6 +439,7 @@
    couldnt_seek      => 'Couldn\'t seek to the beginning of',
    couldnt_close     => 'Couldn\'t close',
    couldnt_updatedb  => 'Couldn\'t update index db ',
+   couldnt_load      => 'Couldn\'t load module @@@MODULENAME@@@',
    disallowed_pop3   => 'Disallowed POP3 server',
    disallowed_client => 'You are not allowed to connect from this client',
    disallowed_receiverdomain => 'You are not allowed to send message to this email address',
diff -ru cgi-bin/openwebmail/etc/lang/lt cgi-bin/openwebmail/etc/lang/lt
--- cgi-bin/openwebmail/etc/lang/lt	Sun Jan 11 09:07:18 2004
+++ cgi-bin/openwebmail/etc/lang/lt	Wed Apr 14 01:34:57 2004
@@ -424,7 +424,9 @@
    vdomain_localuser  => 'Local User',
    set_passwd         => 'Set Password',
    reset_passwd       => 'Reset Password',
-   email_alias        => 'E-MAIL Alias'
+   email_alias        => 'E-MAIL Alias',
+   learnspam          => 'Learn checked messages as Spam',
+   learnham           => 'Learn checked messages as Ham',
    );
 
 %lang_err =
@@ -436,6 +438,7 @@
    couldnt_seek      => 'Nëra pradþios',
    couldnt_close     => 'Nepavyko uþdaryti',
    couldnt_updatedb  => 'Nepavyko atnaujinti "index db" ',
+   couldnt_load      => 'Couldn\'t load module @@@MODULENAME@@@',
    disallowed_pop3   => 'Nepriëmë  POP3 serveris',
    disallowed_client => 'Ðiam vardui nëra teisës prisijungti',
    disallowed_receiverdomain => 'Jums neleista siøsti ðiuo adresu',
diff -ru cgi-bin/openwebmail/etc/lang/nl cgi-bin/openwebmail/etc/lang/nl
--- cgi-bin/openwebmail/etc/lang/nl	Sun Jan 11 09:07:18 2004
+++ cgi-bin/openwebmail/etc/lang/nl	Wed Apr 14 01:35:04 2004
@@ -425,7 +425,9 @@
    vdomain_localuser  => 'Lokale gebruiker',
    set_passwd         => 'Maak wachtwoord',
    reset_passwd       => 'Wachtwoord',
-   email_alias        => 'E-MAIL Alias'
+   email_alias        => 'E-MAIL Alias',
+   learnspam          => 'Learn checked messages as Spam',
+   learnham           => 'Learn checked messages as Ham',
    );
 
 %lang_err =
@@ -437,6 +439,7 @@
    couldnt_seek      => 'Kan niet naar begin van',
    couldnt_close     => 'Kan niet gesloten worden',
    couldnt_updatedb  => 'Kan index DB niet bijwerken',
+   couldnt_load      => 'Couldn\'t load module @@@MODULENAME@@@',
    disallowed_pop3   => 'POP3 server niet toegestaan',
    disallowed_client => 'U bent niet gemachtigd om vanaf uw machine in te loggen.',
    disallowed_receiverdomain => 'U bent niet gemachtigd om een bericht naar dit e-mailadres te sturen.',
diff -ru cgi-bin/openwebmail/etc/lang/no cgi-bin/openwebmail/etc/lang/no
--- cgi-bin/openwebmail/etc/lang/no	Sun Jan 11 09:07:18 2004
+++ cgi-bin/openwebmail/etc/lang/no	Wed Apr 14 01:35:10 2004
@@ -424,7 +424,9 @@
    vdomain_localuser  => 'Lokal bruker',
    set_passwd         => 'Sett Passord',
    reset_passwd       => 'Resett Passord',
-   email_alias        => 'E-MAIL Alias'
+   email_alias        => 'E-MAIL Alias',
+   learnspam          => 'Learn checked messages as Spam',
+   learnham           => 'Learn checked messages as Ham',
    );
 
 %lang_err =
@@ -436,6 +438,7 @@
    couldnt_seek      => 'Kunne ikke finne starten på',
    couldnt_close     => 'Kunne ikke lukke',
    couldnt_updatedb  => 'Kunne ikke oppdatere indeks DB ',
+   couldnt_load      => 'Couldn\'t load module @@@MODULENAME@@@',
    disallowed_pop3   => 'Ulovelig POP3-tjener',
    disallowed_client => 'Du får ikke koble opp fra denne klienten',
    disallowed_receiverdomain => 'Du får ikke sende til denne adressen',
diff -ru cgi-bin/openwebmail/etc/lang/pl cgi-bin/openwebmail/etc/lang/pl
--- cgi-bin/openwebmail/etc/lang/pl	Sun Jan 11 09:07:18 2004
+++ cgi-bin/openwebmail/etc/lang/pl	Wed Apr 14 01:35:15 2004
@@ -428,7 +428,9 @@
    vdomain_localuser  => 'Lokalny U¿ytkownik',
    set_passwd         => 'Zmieñ has³o',
    reset_passwd       => 'Resetuj has³o',
-   email_alias        => 'Alias e-mail'
+   email_alias        => 'Alias e-mail',
+   learnspam          => 'Learn checked messages as Spam',
+   learnham           => 'Learn checked messages as Ham',
    );
 
 %lang_err =
@@ -440,6 +442,7 @@
    couldnt_seek      => 'Nie mo¿na odnale¼æ pocz±tku',
    couldnt_close     => 'Nie mo¿na zamkn±æ',
    couldnt_updatedb  => 'Nie mo¿na uaktualniæ indeksu bazy ',
+   couldnt_load      => 'Couldn\'t load module @@@MODULENAME@@@',
    disallowed_pop3   => 'Niedozwolony serwer POP3',
    disallowed_client => 'Nie mo¿esz siê po³±czyæ za pomoc± tego klienta',
    disallowed_receiverdomain => 'Nie mo¿esz wys³aæ poczty e-mail na ten adres',
diff -ru cgi-bin/openwebmail/etc/lang/pt cgi-bin/openwebmail/etc/lang/pt
--- cgi-bin/openwebmail/etc/lang/pt	Sun Jan 11 09:07:18 2004
+++ cgi-bin/openwebmail/etc/lang/pt	Wed Apr 14 01:35:21 2004
@@ -424,7 +424,9 @@
    vdomain_localuser  => 'Local User',
    set_passwd         => 'Inserir senha',
    reset_passwd       => 'Restaurar senha',
-   email_alias        => 'E-MAIL Aliás'
+   email_alias        => 'E-MAIL Aliás',
+   learnspam          => 'Learn checked messages as Spam',
+   learnham           => 'Learn checked messages as Ham',
    );
 
 %lang_err =
@@ -436,6 +438,7 @@
    couldnt_seek      => 'Não foi possível procurar no inicio de',
    couldnt_close     => 'Não foi possível fechar',
    couldnt_updatedb  => 'Não foi possível actualizar índice db ',
+   couldnt_load      => 'Couldn\'t load module @@@MODULENAME@@@',
    disallowed_pop3   => 'Erro no servidor POP3',
    disallowed_client => 'Não tem permissão para se ligar deste cliente ',
    disallowed_receiverdomain => 'Não tem permissão para enviar mensagens para este endereço',
diff -ru cgi-bin/openwebmail/etc/lang/pt_BR cgi-bin/openwebmail/etc/lang/pt_BR
--- cgi-bin/openwebmail/etc/lang/pt_BR	Sun Apr 11 07:31:19 2004
+++ cgi-bin/openwebmail/etc/lang/pt_BR	Wed Apr 14 01:35:27 2004
@@ -426,7 +426,9 @@
    vdomain_localuser  => 'Usuário Local',
    set_passwd         => 'Setar Senha',
    reset_passwd       => 'Resetar Senha',
-   email_alias        => ' Apelido de E-MAIL'
+   email_alias        => ' Apelido de E-MAIL',
+   learnspam          => 'Learn checked messages as Spam',
+   learnham           => 'Learn checked messages as Ham',
    );
 
 %lang_err =
@@ -438,6 +440,7 @@
    couldnt_seek      => 'Não foi possível procurar no início de',
    couldnt_close     => 'Não foi possível fechar',
    couldnt_updatedb  => 'Não foi possível atualizar índice db ',
+   couldnt_load      => 'Couldn\'t load module @@@MODULENAME@@@',
    disallowed_pop3   => 'Erro no Servidor POP3',
    disallowed_client => 'Você não tem permissão para se conectar a partir deste endereço IP',
    disallowed_receiverdomain => 'Você não tem permissão para enviar mensagens para este endereço de e-mail',
diff -ru cgi-bin/openwebmail/etc/lang/ro cgi-bin/openwebmail/etc/lang/ro
--- cgi-bin/openwebmail/etc/lang/ro	Sun Jan 11 09:07:18 2004
+++ cgi-bin/openwebmail/etc/lang/ro	Wed Apr 14 01:35:33 2004
@@ -424,7 +424,9 @@
    vdomain_localuser  => 'Local User',
    set_passwd         => 'Seteaza parola',
    reset_passwd       => 'Reseteaza parola',
-   email_alias        => 'Alias e-mail'
+   email_alias        => 'Alias e-mail',
+   learnspam          => 'Learn checked messages as Spam',
+   learnham           => 'Learn checked messages as Ham',
    );
 
 %lang_err =
@@ -436,6 +438,7 @@
    couldnt_seek      => 'Nu se poate ajunge la inceput',
    couldnt_close     => 'Nu se poate inchide',
    couldnt_updatedb  => 'Nu se poate updata index-ul',
+   couldnt_load      => 'Couldn\'t load module @@@MODULENAME@@@',
    disallowed_pop3   => 'Server POP3 inaccesibil',
    disallowed_client => 'Nu aveti permisiunea sa va conectati de la acest client',
    disallowed_receiverdomain => 'Nu aveti permisiunea sa trimiteti mesaje la aceasta adresa',
diff -ru cgi-bin/openwebmail/etc/lang/ru cgi-bin/openwebmail/etc/lang/ru
--- cgi-bin/openwebmail/etc/lang/ru	Sun Jan 11 09:07:18 2004
+++ cgi-bin/openwebmail/etc/lang/ru	Wed Apr 14 01:35:38 2004
@@ -424,7 +424,9 @@
    vdomain_localuser  => 'Local User',
    set_passwd         => 'Set Password',
    reset_passwd       => 'Reset Password',
-   email_alias        => 'E-MAIL Alias'
+   email_alias        => 'E-MAIL Alias',
+   learnspam          => 'Learn checked messages as Spam',
+   learnham           => 'Learn checked messages as Ham',
    );
 
 %lang_err =
@@ -436,6 +438,7 @@
    couldnt_seek      => 'îÅ ÍÏÇÕ ÐÒÏÓÍÏÔÒÅÔØ ÎÁÞÁÌÏ ',
    couldnt_close     => 'îÅ ÍÏÇÕ ÚÁËÒÙÔØ',
    couldnt_updatedb  => 'Couldn\'t update index db ',
+   couldnt_load      => 'Couldn\'t load module @@@MODULENAME@@@',
    disallowed_pop3   => 'úÁÐÒÅÝÅÎÎÙÊ POP3 ÓÅÒ×ÅÒ',
    disallowed_client => '÷ÁÍ ÚÁÐÒÅÝÅÎÏ ÚÁÈÏÄÉÔØ Ó ÜÔÏÇÏ ËÌÉÅÎÔÁ',
    disallowed_receiverdomain => '÷ÁÍ ÚÁÐÒÅÝÅÎÏ ÓÌÁÔØ ÐÉÓØÍÁ ÎÁ ÜÔÏÔ ÄÏÍÅÎ',
diff -ru cgi-bin/openwebmail/etc/lang/sk cgi-bin/openwebmail/etc/lang/sk
--- cgi-bin/openwebmail/etc/lang/sk	Sun Jan 11 09:07:18 2004
+++ cgi-bin/openwebmail/etc/lang/sk	Wed Apr 14 01:35:44 2004
@@ -425,7 +425,9 @@
    vdomain_localuser  => 'Lokálny pou¾ívateµ',
    set_passwd         => 'Nastavi» heslo',
    reset_passwd       => 'Znovu nastavi» heslo',
-   email_alias        => 'E-mail alias'
+   email_alias        => 'E-mail alias',
+   learnspam          => 'Learn checked messages as Spam',
+   learnham           => 'Learn checked messages as Ham',
    );
 
 %lang_err =
@@ -437,6 +439,7 @@
    couldnt_seek      => 'Nedá sa presunú» na zaèiatok',
    couldnt_close     => 'Nedá sa zavrie»',
    couldnt_updatedb  => 'Nedá sa aktualizova» index databázy ',
+   couldnt_load      => 'Couldn\'t load module @@@MODULENAME@@@',
    disallowed_pop3   => 'Zakázaný POP3 server',
    disallowed_client => 'Nemáte povolenie pripája» sa z tohto poèítaèa',
    disallowed_receiverdomain => 'Nemáte povolenie odosiela» po¹tu na túto adresu',
diff -ru cgi-bin/openwebmail/etc/lang/sr cgi-bin/openwebmail/etc/lang/sr
--- cgi-bin/openwebmail/etc/lang/sr	Sun Jan 11 09:07:19 2004
+++ cgi-bin/openwebmail/etc/lang/sr	Wed Apr 14 01:35:50 2004
@@ -424,7 +424,9 @@
    vdomain_localuser  => 'Lokalni korisnik',
    set_passwd         => 'Postavi lozinku',
    reset_passwd       => 'Izbri¹i lozinku',
-   email_alias        => 'alias e-po¹te'
+   email_alias        => 'alias e-po¹te',
+   learnspam          => 'Learn checked messages as Spam',
+   learnham           => 'Learn checked messages as Ham',
    );
 
 %lang_err =
@@ -436,6 +438,7 @@
    couldnt_seek      => 'Ne mogu da naðem poèetak',
    couldnt_close     => 'Ne mogu da zatvorim',
    couldnt_updatedb  => 'Ne mogu da a¾uriram indeks bp',
+   couldnt_load      => 'Couldn\'t load module @@@MODULENAME@@@',
    disallowed_pop3   => 'Nedozvoljen POP3 server',
    disallowed_client => 'Nije Vam dozvoljeno da uspostavite vezu sa ovog klijenta',
    disallowed_receiverdomain => 'Nije Vam dozvoljeno da ¹aljete poruke na ovu email adresu',
diff -ru cgi-bin/openwebmail/etc/lang/sv cgi-bin/openwebmail/etc/lang/sv
--- cgi-bin/openwebmail/etc/lang/sv	Sun Jan 11 09:07:19 2004
+++ cgi-bin/openwebmail/etc/lang/sv	Wed Apr 14 01:35:55 2004
@@ -424,7 +424,9 @@
    vdomain_localuser  => 'Local User',
    set_passwd         => 'Set Password',
    reset_passwd       => 'Reset Password',
-   email_alias        => 'E-MAIL Alias'
+   email_alias        => 'E-MAIL Alias',
+   learnspam          => 'Learn checked messages as Spam',
+   learnham           => 'Learn checked messages as Ham',
    );
 
 %lang_err =
@@ -436,6 +438,7 @@
    couldnt_seek      => 'Kunde inte hitta början på',
    couldnt_close     => 'Kunde inte stänga',
    couldnt_updatedb  => 'Couldn\'t update index db ',
+   couldnt_load      => 'Couldn\'t load module @@@MODULENAME@@@',
    disallowed_pop3   => 'Disallowed POP3 server',
    disallowed_client => 'You are not allowed to connect from this client',
    disallowed_receiverdomain => 'You are not allowed to send message to this email address',
diff -ru cgi-bin/openwebmail/etc/lang/th cgi-bin/openwebmail/etc/lang/th
--- cgi-bin/openwebmail/etc/lang/th	Sun Jan 11 09:07:19 2004
+++ cgi-bin/openwebmail/etc/lang/th	Wed Apr 14 01:36:00 2004
@@ -424,7 +424,9 @@
    vdomain_localuser  => '¼Ùéãªéã¹à¤Ã×èÍ§',
    set_passwd         => '¡ÓË¹´ÃËÑÊ¼èÒ¹',
    reset_passwd       => 'ÅéÒ§ÃËÑÊ¼èÒ¹',
-   email_alias        => 'ª×èÍá½§¢Í§¨´ËÁÒÂ'
+   email_alias        => 'ª×èÍá½§¢Í§¨´ËÁÒÂ',
+   learnspam          => 'Learn checked messages as Spam',
+   learnham           => 'Learn checked messages as Ham',
    );
 
 %lang_err =
@@ -436,6 +438,7 @@
    couldnt_seek      => 'äÁèÊÒÁÒÃ¶ÍèÒ¹¨Ø´àÃÔèÁµé¹¢Í§',
    couldnt_close     => 'äÁèÊÒÁÒÃ¶»Ô´',
    couldnt_updatedb  => 'äÁèÊÒÁÒÃ¶»ÃÑº»ÃØ§´Ñª¹Õ¢éÍÁÙÅ',
+   couldnt_load      => 'Couldn\'t load module @@@MODULENAME@@@',
    disallowed_pop3   => 'äÁèÍ¹Ø­ÒµãËéãªé POP3 à«ÔÃì¿àÇÍÃì',
    disallowed_client => '¤Ø³äÁèä´éÃÑºÍ¹Ø­ÒµãËéãªé§Ò¹¨Ò¡à¤Ã×èÍ§¹Õéä´é',
    disallowed_receiverdomain => '¤Ø³äÁèä´éÃÑºÍ¹Ø­ÒµãËéÊè§¨´ËÁÒÂä»ÂÑ§·ÕèÍÂÙèÍÕàÁÅ¹Õé',
diff -ru cgi-bin/openwebmail/etc/lang/tr cgi-bin/openwebmail/etc/lang/tr
--- cgi-bin/openwebmail/etc/lang/tr	Sun Jan 11 09:07:19 2004
+++ cgi-bin/openwebmail/etc/lang/tr	Wed Apr 14 01:36:06 2004
@@ -424,7 +424,9 @@
    vdomain_localuser  => 'Local User',
    set_passwd         => 'Set Password',
    reset_passwd       => 'Reset Password',
-   email_alias        => 'E-MAIL Alias'
+   email_alias        => 'E-MAIL Alias',
+   learnspam          => 'Learn checked messages as Spam',
+   learnham           => 'Learn checked messages as Ham',
    );
 
 %lang_err =
@@ -436,6 +438,7 @@
    couldnt_seek      => 'Baþlangýca kadar aranamadý',
    couldnt_close     => 'Kapatamadý',
    couldnt_updatedb  => 'Ýndeks vt güncelleyemedi ',
+   couldnt_load      => 'Couldn\'t load module @@@MODULENAME@@@',
    disallowed_pop3   => 'Engellenmiþ POP3 sunucusu',
    disallowed_client => 'Buradan baðlantýnýz engellendi',
    disallowed_receiverdomain => 'Bu eposta adresine ileti göndermeniz engellenmiþtir',
diff -ru cgi-bin/openwebmail/etc/lang/uk cgi-bin/openwebmail/etc/lang/uk
--- cgi-bin/openwebmail/etc/lang/uk	Sun Jan 11 09:07:19 2004
+++ cgi-bin/openwebmail/etc/lang/uk	Wed Apr 14 01:36:11 2004
@@ -424,7 +424,9 @@
    vdomain_localuser  => 'ìÏËÁÌØÎÉÊ ËÏÒÉÓÔÕ×ÁÞ',
    set_passwd         => '÷ÓÔÁÎÏ×ÉÔÉ ÐÁÒÏÌØ',
    reset_passwd       => 'ðÅÒÅ×ÓÔÁÎÏ×ÉÔÉ ÐÁÒÏÌØ',
-   email_alias        => 'ðÓÅ×ÄÏÎ¦Í ÅÌÅËÔÒÏÎÎÏ§ ÐÏÛÔÉ'
+   email_alias        => 'ðÓÅ×ÄÏÎ¦Í ÅÌÅËÔÒÏÎÎÏ§ ÐÏÛÔÉ',
+   learnspam          => 'Learn checked messages as Spam',
+   learnham           => 'Learn checked messages as Ham',
    );
 
 %lang_err =
@@ -436,6 +438,7 @@
    couldnt_seek      => 'îÅ ÍÏÖÕ ÚÎÁÊÔÉ ÐÏÞÁÔÏË',
    couldnt_close     => 'îÅ ÍÏÖÕ ÚÁËÒÉÔÉ',
    couldnt_updatedb  => 'îÅ ÍÏÖÕ ÐÏÎÏ×ÉÔÉ âä ¦ÎÄÅËÓ¦× ',
+   couldnt_load      => 'Couldn\'t load module @@@MODULENAME@@@',
    disallowed_pop3   => 'îÅÄÏÐÕÓÔÉÍÉÊ POP3 ÓÅÒ×ÅÒ',
    disallowed_client => 'îÅ ÄÏÚ×ÏÌÑ¤ÔØÓÑ Ð¦Ä\'¤ÄÎÁÎÎÑ Ú Ð¦Ä ÃØÏÇÏ ËÌ¦¤ÎÔÁ',
    disallowed_receiverdomain => '÷ÁÍ ÎÅ ÄÏÚ×ÏÌÅÎÏ ×¦ÄÓÉÌÁÔÉ ÌÉÓÔÉ ÎÁ ÁÄÒÅÓÕ × ÃØÏÍÕ ÄÏÍÅÎ¦.',
diff -ru cgi-bin/openwebmail/etc/lang/ur cgi-bin/openwebmail/etc/lang/ur
--- cgi-bin/openwebmail/etc/lang/ur	Sun Jan 11 09:07:19 2004
+++ cgi-bin/openwebmail/etc/lang/ur	Wed Apr 14 01:36:17 2004
@@ -424,7 +424,9 @@
    vdomain_localuser  => 'Local User',
    set_passwd         => 'Set Password',
    reset_passwd       => 'Reset Password',
-   email_alias        => 'E-MAIL Alias'
+   email_alias        => 'E-MAIL Alias',
+   learnspam          => 'Learn checked messages as Spam',
+   learnham           => 'Learn checked messages as Ham',
    );
 
 %lang_err =
@@ -436,6 +438,7 @@
    couldnt_seek      => 'Couldn\'t seek to the beginning of',
    couldnt_close     => 'Couldn\'t close',
    couldnt_updatedb  => 'Couldn\'t update index db ',
+   couldnt_load      => 'Couldn\'t load module @@@MODULENAME@@@',
    disallowed_pop3   => 'Disallowed POP3 server',
    disallowed_client => 'You are not allowed to connect from this client',
    disallowed_receiverdomain => 'You are not allowed to send message to this email address',
diff -ru cgi-bin/openwebmail/etc/lang/zh_CN.GB2312 cgi-bin/openwebmail/etc/lang/zh_CN.GB2312
--- cgi-bin/openwebmail/etc/lang/zh_CN.GB2312	Sun Jan 11 09:07:19 2004
+++ cgi-bin/openwebmail/etc/lang/zh_CN.GB2312	Wed Apr 14 01:36:23 2004
@@ -424,7 +424,9 @@
    vdomain_localuser  => '±¾µØÕÊºÅ',
    set_passwd         => 'Éè¶¨ÃÜÂë',
    reset_passwd       => 'ÖØÉèÃÜÂë',
-   email_alias        => 'Email Alias'
+   email_alias        => 'Email Alias',
+   learnspam          => 'Learn checked messages as Spam',
+   learnham           => 'Learn checked messages as Ham',
    );
 
 %lang_err =
@@ -436,6 +438,7 @@
    couldnt_seek      => 'ÎÞ·¨Ñ°ÕÒ',
    couldnt_close     => 'ÎÞ·¨¹Ø±Õ',
    couldnt_updatedb  => 'ÎÞ·¨¸üÐÂÓÊ¼þË÷Òý ',
+   couldnt_load      => 'Couldn\'t load module @@@MODULENAME@@@',
    disallowed_pop3   => '½ûÖ¹Á¬ÏßÖÁPOP3·þÎñÆ÷',
    disallowed_client => 'Äú±»½ûÖ¹ÓÉµ±Ç°µØÖ·Á¬ÏßÊ¹ÓÃ WebMail',
    disallowed_receiverdomain => 'Äú±»½ûÖ¹¼ÄÐÅµ½Õâ¸öÓÊ¼þµØÖ·',
diff -ru cgi-bin/openwebmail/etc/lang/zh_TW.Big5 cgi-bin/openwebmail/etc/lang/zh_TW.Big5
--- cgi-bin/openwebmail/etc/lang/zh_TW.Big5	Fri Jan 30 17:15:45 2004
+++ cgi-bin/openwebmail/etc/lang/zh_TW.Big5	Wed Apr 14 01:36:31 2004
@@ -424,7 +424,9 @@
    vdomain_localuser  => '¥»¦a±b¸¹',
    set_passwd         => '³]©w±K½X',
    reset_passwd       => '­«³]±K½X',
-   email_alias        => 'Email Alias'
+   email_alias        => 'Email Alias',
+   learnspam          => 'Learn checked messages as Spam',
+   learnham           => 'Learn checked messages as Ham',
    );
 
 %lang_err =
@@ -436,6 +438,7 @@
    couldnt_seek      => 'µLªk´M§ä',
    couldnt_close     => 'µLªkÃö³¬',
    couldnt_updatedb  => 'µLªk§ó·s«H¥ó¯Á¤Þ ',
+   couldnt_load      => 'Couldn\'t load module @@@MODULENAME@@@',
    disallowed_pop3   => '¸T¤î³s½u¨ì POP3 ¦øªA¾¹',
    disallowed_client => '±z¤£³Q¤¹³\¥Ñ¥Ø«eªº¦ì§}³s½u¨Ï¥Î WebMail',
    disallowed_receiverdomain => '±z¤£³Q¤¹³\±H«H¨ì³o­Ó¶l¥ó¦a§}',
--- cgi-bin/openwebmail/etc/openwebmail.conf.default	Tue Apr 13 13:21:57 2004
+++ cgi-bin/openwebmail/etc/openwebmail.conf.default	Mon Apr 12 02:03:12 2004
@@ -139,6 +138,11 @@
 enable_sshterm			yes
 enable_vdomain          	no
 
+enable_spamassassin             no
+sa_local_tests_only             yes
+sa_network_timeout              0
+sa_enable_bayesian              yes
+
 enable_pop3		yes
 pop3_disallowed_servers	your_server, your_server.domain
 pop3_delmail_by_default	yes
@@ -287,6 +291,17 @@
 default_filter_fakedsmtp	no
 default_filter_fakedfrom	no
 default_filter_fakedexecontenttype	no
+
+default_sa_enable               no
+default_sa_score_threshhold     15
+default_sa_use_bayes            no
+default_sa_bayes_auto_learn     no
+default_sa_use_blacklists       no
+default_sa_use_razor            no
+default_sa_use_dcc              no
+default_sa_use_pyzor            no
+default_sa_move_spam            no
+default_sa_spam_destination     mail-trash
 
 default_abook_width		360
 default_abook_height		300
--- cgi-bin/openwebmail/etc/openwebmail.conf.help	Tue Apr 13 04:59:58 2004
+++ cgi-bin/openwebmail/etc/openwebmail.conf.help	Mon Apr 12 02:16:40 2004
@@ -796,6 +790,39 @@
 available to the users that are specified in option vdomain_admlist.
 
 
+enable_spamassassin
+-----------------------------------------------------------------------
+If this option is set to 'yes' and the Mail::SpamAssassin module can
+be successfully loaded, then Spamassassin is enabled as an option for
+all users. Users must still choose to activate SpamAssassin in the
+user preferences, and they must set several parameters to determine how
+aggressive they want the filtering to be.
+
+
+sa_local_tests_only
+-----------------------------------------------------------------------
+If this option is set to 'yes' then no tests requiring a network
+connection will be allowed to be performed. This disables DNS blacklist
+checks, MX record validation, razor, dcc, and pyzor tests. Since these
+tests can be performed at the SMTP level it may be better to do it there.
+
+
+sa_network_timeout
+-----------------------------------------------------------------------
+Number of seconds before network spam tests timeout and are skipped.
+It checks the net per message, so high values can lead to big delays.
+
+
+sa_enable_bayesian
+-----------------------------------------------------------------------
+If this option is set to 'yes' then the Bayesian learning features of
+SpamAssassin will be allowed to be used. The Bayesian token databases
+are created in the users webmail directories to support this feature if
+the user also chooses to activate this feature. This feature is strongly
+recommended since it increases spam detection significantly and cutomizes
+spam detection to each users corpus of email.
+
+
 enable_pop3
 -----------------------------------------------------------------------
 Open WebMail has complete support as pop3 client. If you want to disable
@@ -1756,6 +1783,62 @@
 is set to 'yes', these messages will be moved to mail-trash.
 
 
+sa_enable
+-----------------------------------------------------------------------
+Use SpamAssassin message filtering if it is available.
+
+
+sa_score_threshhold
+-----------------------------------------------------------------------
+Anything at or above the threshold is marked as spam. Increasing this
+threshold will increase the amount of spam missed, but will reduce the
+risk of false positives. (required_hits)
+
+
+sa_use_bayes
+-----------------------------------------------------------------------
+Spamassassin can use a statistical, "Bayesian" analysis system to
+determine whether each message is spam based on previous examples of
+spam and nonspam. (use_bayes)
+
+
+sa_bayes_auto_learn
+-----------------------------------------------------------------------
+SpamAssassin can automatically train its Bayes database by analyzing
+messages that have a score that strongly suggests that they are spam
+or nonspam. (auto_learn)
+
+
+sa_use_blacklists
+-----------------------------------------------------------------------
+Choose whether SpamAssassin should use RBLs (DNS Blacklists). These
+can help detect difficult spam, but they require some time, some
+network bandwidth, and an available DNS server. (skip_rbl_checks)
+
+
+sa_use_razor
+sa_use_dcc
+sa_use_pyzor
+-----------------------------------------------------------------------
+Choose whether to use these services that compare message checksums to
+known spam: Vipul's Razor 2.x, DCC, and Pyzor. These will only work
+when the client software for each service is installed. (use_razor2,
+use_dcc, use_pyzor)
+
+
+sa_move_spam
+-----------------------------------------------------------------------
+When enabled, messages that have a spam score greater than the
+sa_score_threshhold will be automatically moved to the folder defined
+in sa_spam_destination
+
+
+sa_spam_destination
+-----------------------------------------------------------------------
+Folder to move messages to when the message spam score is greater than
+the sa_score_threshhold
+
+
 default_abook_width
 -----------------------------------------------------------------------
 default width (in pixels) of the addressbook popup window.
diff -ru cgi-bin/openwebmail/etc/templates/ar.CP1256/prefs.template cgi-bin/openwebmail/etc/templates/ar.CP1256/prefs.template
--- cgi-bin/openwebmail/etc/templates/ar.CP1256/prefs.template	Thu Jan  1 09:00:53 2004
+++ cgi-bin/openwebmail/etc/templates/ar.CP1256/prefs.template	Wed Apr 14 02:45:37 2004
@@ -301,6 +301,58 @@
 </td></tr>
 @@@FILTEREND@@@
 
+
+@@@SPAMASSASSINSTART@@@
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>SpamAssassin Filtering Options</B></td></tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Enable SpamAssassin:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINENABLE@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Filtering:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBAYES@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Auto-Learning:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINBAYESAUTOLEARN@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANEND@@@
+@@@SPAMASSASSINLOCALONLYSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DNS Blacklists:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBLACKLISTS@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Vipul's Razor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSERAZOR@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DCC:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEDCC@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Pyzor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEPYZOR@@@</td>
+</tr>
+@@@SPAMASSASSINLOCALONLYEND@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Move Messages Detected As Spam:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINMOVESPAM@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Spam Destination:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSPAMDESTINATION@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Message Is Spam When Score Is At Or Greater Than:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSCORETHRESHHOLD@@@&nbsp;(1 is aggressive, 15 is relaxed filtering)</td>
+</tr>
+@@@SPAMASSASSINEND@@@
+
+
+
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>ÎíÇÑÇÊ ÏÝÊÑ ÇáÚäÇæíä</B></td></tr>
 <tr><td align="left" bgcolor=@@@WINDOW_DARK@@@>
diff -ru cgi-bin/openwebmail/etc/templates/ar.ISO8859-6/prefs.template cgi-bin/openwebmail/etc/templates/ar.ISO8859-6/prefs.template
--- cgi-bin/openwebmail/etc/templates/ar.ISO8859-6/prefs.template	Thu Jan  1 09:00:52 2004
+++ cgi-bin/openwebmail/etc/templates/ar.ISO8859-6/prefs.template	Wed Apr 14 02:45:44 2004
@@ -301,6 +301,58 @@
 </td></tr>
 @@@FILTEREND@@@
 
+
+@@@SPAMASSASSINSTART@@@
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>SpamAssassin Filtering Options</B></td></tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Enable SpamAssassin:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINENABLE@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Filtering:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBAYES@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Auto-Learning:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINBAYESAUTOLEARN@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANEND@@@
+@@@SPAMASSASSINLOCALONLYSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DNS Blacklists:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBLACKLISTS@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Vipul's Razor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSERAZOR@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DCC:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEDCC@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Pyzor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEPYZOR@@@</td>
+</tr>
+@@@SPAMASSASSINLOCALONLYEND@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Move Messages Detected As Spam:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINMOVESPAM@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Spam Destination:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSPAMDESTINATION@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Message Is Spam When Score Is At Or Greater Than:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSCORETHRESHHOLD@@@&nbsp;(1 is aggressive, 15 is relaxed filtering)</td>
+</tr>
+@@@SPAMASSASSINEND@@@
+
+
+
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>ÎêÇÑÇÊ ÏáÊÑ ÇäÙæÇèêæ</B></td></tr>
 <tr><td align="left" bgcolor=@@@WINDOW_DARK@@@>
diff -ru cgi-bin/openwebmail/etc/templates/bg/prefs.template cgi-bin/openwebmail/etc/templates/bg/prefs.template
--- cgi-bin/openwebmail/etc/templates/bg/prefs.template	Thu Jan  1 09:00:53 2004
+++ cgi-bin/openwebmail/etc/templates/bg/prefs.template	Wed Apr 14 02:45:51 2004
@@ -301,6 +301,58 @@
 </td></tr>
 @@@FILTEREND@@@
 
+
+@@@SPAMASSASSINSTART@@@
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>SpamAssassin Filtering Options</B></td></tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Enable SpamAssassin:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINENABLE@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Filtering:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBAYES@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Auto-Learning:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINBAYESAUTOLEARN@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANEND@@@
+@@@SPAMASSASSINLOCALONLYSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DNS Blacklists:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBLACKLISTS@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Vipul's Razor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSERAZOR@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DCC:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEDCC@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Pyzor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEPYZOR@@@</td>
+</tr>
+@@@SPAMASSASSINLOCALONLYEND@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Move Messages Detected As Spam:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINMOVESPAM@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Spam Destination:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSPAMDESTINATION@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Message Is Spam When Score Is At Or Greater Than:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSCORETHRESHHOLD@@@&nbsp;(1 is aggressive, 15 is relaxed filtering)</td>
+</tr>
+@@@SPAMASSASSINEND@@@
+
+
+
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>AddressBook Options</B></td></tr>
 <tr><td align="right" bgcolor=@@@WINDOW_DARK@@@>
diff -ru cgi-bin/openwebmail/etc/templates/ca/prefs.template cgi-bin/openwebmail/etc/templates/ca/prefs.template
--- cgi-bin/openwebmail/etc/templates/ca/prefs.template	Thu Jan  1 09:00:52 2004
+++ cgi-bin/openwebmail/etc/templates/ca/prefs.template	Wed Apr 14 02:45:58 2004
@@ -301,6 +301,58 @@
 </td></tr>
 @@@FILTEREND@@@
 
+
+@@@SPAMASSASSINSTART@@@
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>SpamAssassin Filtering Options</B></td></tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Enable SpamAssassin:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINENABLE@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Filtering:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBAYES@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Auto-Learning:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINBAYESAUTOLEARN@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANEND@@@
+@@@SPAMASSASSINLOCALONLYSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DNS Blacklists:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBLACKLISTS@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Vipul's Razor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSERAZOR@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DCC:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEDCC@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Pyzor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEPYZOR@@@</td>
+</tr>
+@@@SPAMASSASSINLOCALONLYEND@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Move Messages Detected As Spam:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINMOVESPAM@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Spam Destination:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSPAMDESTINATION@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Message Is Spam When Score Is At Or Greater Than:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSCORETHRESHHOLD@@@&nbsp;(1 is aggressive, 15 is relaxed filtering)</td>
+</tr>
+@@@SPAMASSASSINEND@@@
+
+
+
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>Opcions de Llibreta d'Adreces</B></td></tr>
 <tr><td align="right" bgcolor=@@@WINDOW_DARK@@@>
diff -ru cgi-bin/openwebmail/etc/templates/cs/prefs.template cgi-bin/openwebmail/etc/templates/cs/prefs.template
--- cgi-bin/openwebmail/etc/templates/cs/prefs.template	Thu Jan  1 09:00:53 2004
+++ cgi-bin/openwebmail/etc/templates/cs/prefs.template	Wed Apr 14 02:46:04 2004
@@ -301,6 +301,58 @@
 </td></tr>
 @@@FILTEREND@@@
 
+
+@@@SPAMASSASSINSTART@@@
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>SpamAssassin Filtering Options</B></td></tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Enable SpamAssassin:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINENABLE@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Filtering:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBAYES@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Auto-Learning:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINBAYESAUTOLEARN@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANEND@@@
+@@@SPAMASSASSINLOCALONLYSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DNS Blacklists:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBLACKLISTS@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Vipul's Razor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSERAZOR@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DCC:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEDCC@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Pyzor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEPYZOR@@@</td>
+</tr>
+@@@SPAMASSASSINLOCALONLYEND@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Move Messages Detected As Spam:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINMOVESPAM@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Spam Destination:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSPAMDESTINATION@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Message Is Spam When Score Is At Or Greater Than:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSCORETHRESHHOLD@@@&nbsp;(1 is aggressive, 15 is relaxed filtering)</td>
+</tr>
+@@@SPAMASSASSINEND@@@
+
+
+
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>Adresáø</B></td></tr>
 <tr><td align="right" bgcolor=@@@WINDOW_DARK@@@>
diff -ru cgi-bin/openwebmail/etc/templates/da/prefs.template cgi-bin/openwebmail/etc/templates/da/prefs.template
--- cgi-bin/openwebmail/etc/templates/da/prefs.template	Thu Jan  1 09:00:52 2004
+++ cgi-bin/openwebmail/etc/templates/da/prefs.template	Wed Apr 14 02:46:10 2004
@@ -301,6 +301,58 @@
 </td></tr>
 @@@FILTEREND@@@
 
+
+@@@SPAMASSASSINSTART@@@
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>SpamAssassin Filtering Options</B></td></tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Enable SpamAssassin:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINENABLE@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Filtering:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBAYES@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Auto-Learning:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINBAYESAUTOLEARN@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANEND@@@
+@@@SPAMASSASSINLOCALONLYSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DNS Blacklists:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBLACKLISTS@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Vipul's Razor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSERAZOR@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DCC:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEDCC@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Pyzor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEPYZOR@@@</td>
+</tr>
+@@@SPAMASSASSINLOCALONLYEND@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Move Messages Detected As Spam:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINMOVESPAM@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Spam Destination:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSPAMDESTINATION@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Message Is Spam When Score Is At Or Greater Than:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSCORETHRESHHOLD@@@&nbsp;(1 is aggressive, 15 is relaxed filtering)</td>
+</tr>
+@@@SPAMASSASSINEND@@@
+
+
+
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>Standard indstillinger for adressebogen</B></td></tr>
 <tr><td align="right" bgcolor=@@@WINDOW_DARK@@@>
diff -ru cgi-bin/openwebmail/etc/templates/de/prefs.template cgi-bin/openwebmail/etc/templates/de/prefs.template
--- cgi-bin/openwebmail/etc/templates/de/prefs.template	Thu Jan  1 09:00:53 2004
+++ cgi-bin/openwebmail/etc/templates/de/prefs.template	Wed Apr 14 02:46:16 2004
@@ -301,6 +301,58 @@
 </td></tr>
 @@@FILTEREND@@@
 
+
+@@@SPAMASSASSINSTART@@@
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>SpamAssassin Filtering Options</B></td></tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Enable SpamAssassin:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINENABLE@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Filtering:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBAYES@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Auto-Learning:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINBAYESAUTOLEARN@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANEND@@@
+@@@SPAMASSASSINLOCALONLYSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DNS Blacklists:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBLACKLISTS@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Vipul's Razor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSERAZOR@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DCC:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEDCC@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Pyzor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEPYZOR@@@</td>
+</tr>
+@@@SPAMASSASSINLOCALONLYEND@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Move Messages Detected As Spam:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINMOVESPAM@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Spam Destination:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSPAMDESTINATION@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Message Is Spam When Score Is At Or Greater Than:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSCORETHRESHHOLD@@@&nbsp;(1 is aggressive, 15 is relaxed filtering)</td>
+</tr>
+@@@SPAMASSASSINEND@@@
+
+
+
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>Adressbuch</B></td></tr>
 <tr><td align="right" bgcolor=@@@WINDOW_DARK@@@>
diff -ru cgi-bin/openwebmail/etc/templates/el/prefs.template cgi-bin/openwebmail/etc/templates/el/prefs.template
--- cgi-bin/openwebmail/etc/templates/el/prefs.template	Thu Jan  1 09:00:52 2004
+++ cgi-bin/openwebmail/etc/templates/el/prefs.template	Wed Apr 14 02:46:21 2004
@@ -301,6 +301,58 @@
 </td></tr>
 @@@FILTEREND@@@
 
+
+@@@SPAMASSASSINSTART@@@
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>SpamAssassin Filtering Options</B></td></tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Enable SpamAssassin:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINENABLE@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Filtering:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBAYES@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Auto-Learning:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINBAYESAUTOLEARN@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANEND@@@
+@@@SPAMASSASSINLOCALONLYSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DNS Blacklists:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBLACKLISTS@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Vipul's Razor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSERAZOR@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DCC:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEDCC@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Pyzor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEPYZOR@@@</td>
+</tr>
+@@@SPAMASSASSINLOCALONLYEND@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Move Messages Detected As Spam:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINMOVESPAM@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Spam Destination:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSPAMDESTINATION@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Message Is Spam When Score Is At Or Greater Than:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSCORETHRESHHOLD@@@&nbsp;(1 is aggressive, 15 is relaxed filtering)</td>
+</tr>
+@@@SPAMASSASSINEND@@@
+
+
+
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>AddressBook Options</B></td></tr>
 <tr><td align="right" bgcolor=@@@WINDOW_DARK@@@>
Only in cgi-bin/openwebmail/etc/templates/en: detailaddresses.template
diff -ru cgi-bin/openwebmail/etc/templates/en/prefs.template cgi-bin/openwebmail/etc/templates/en/prefs.template
--- cgi-bin/openwebmail/etc/templates/en/prefs.template	Thu Jan  1 09:00:53 2004
+++ cgi-bin/openwebmail/etc/templates/en/prefs.template	Wed Apr 14 02:49:28 2004
@@ -301,6 +301,56 @@
 </td></tr>
 @@@FILTEREND@@@
 
+
+@@@SPAMASSASSINSTART@@@
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>SpamAssassin Filtering Options</B></td></tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Enable SpamAssassin:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINENABLE@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Filtering:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBAYES@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Auto-Learning:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINBAYESAUTOLEARN@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANEND@@@
+@@@SPAMASSASSINLOCALONLYSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DNS Blacklists:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBLACKLISTS@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Vipul's Razor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSERAZOR@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DCC:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEDCC@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Pyzor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEPYZOR@@@</td>
+</tr>
+@@@SPAMASSASSINLOCALONLYEND@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Move Messages Detected As Spam:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINMOVESPAM@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Spam Destination:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSPAMDESTINATION@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Message Is Spam When Score Is At Or Greater Than:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSCORETHRESHHOLD@@@&nbsp;(1 is aggressive, 15 is relaxed filtering)</td>
+</tr>
+@@@SPAMASSASSINEND@@@
+
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>AddressBook Options</B></td></tr>
 <tr><td align="right" bgcolor=@@@WINDOW_DARK@@@>
Only in cgi-bin/openwebmail/etc/templates/en: prefs.template.orig
diff -ru cgi-bin/openwebmail/etc/templates/es/prefs.template cgi-bin/openwebmail/etc/templates/es/prefs.template
--- cgi-bin/openwebmail/etc/templates/es/prefs.template	Thu Jan  1 09:00:52 2004
+++ cgi-bin/openwebmail/etc/templates/es/prefs.template	Wed Apr 14 02:46:34 2004
@@ -301,6 +301,58 @@
 </td></tr>
 @@@FILTEREND@@@
 
+
+@@@SPAMASSASSINSTART@@@
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>SpamAssassin Filtering Options</B></td></tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Enable SpamAssassin:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINENABLE@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Filtering:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBAYES@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Auto-Learning:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINBAYESAUTOLEARN@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANEND@@@
+@@@SPAMASSASSINLOCALONLYSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DNS Blacklists:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBLACKLISTS@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Vipul's Razor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSERAZOR@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DCC:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEDCC@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Pyzor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEPYZOR@@@</td>
+</tr>
+@@@SPAMASSASSINLOCALONLYEND@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Move Messages Detected As Spam:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINMOVESPAM@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Spam Destination:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSPAMDESTINATION@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Message Is Spam When Score Is At Or Greater Than:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSCORETHRESHHOLD@@@&nbsp;(1 is aggressive, 15 is relaxed filtering)</td>
+</tr>
+@@@SPAMASSASSINEND@@@
+
+
+
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>Opciones de Libreta de Direcciones</B></td></tr>
 <tr><td align="right" bgcolor=@@@WINDOW_DARK@@@>
diff -ru cgi-bin/openwebmail/etc/templates/fi/prefs.template cgi-bin/openwebmail/etc/templates/fi/prefs.template
--- cgi-bin/openwebmail/etc/templates/fi/prefs.template	Thu Jan  1 09:00:53 2004
+++ cgi-bin/openwebmail/etc/templates/fi/prefs.template	Wed Apr 14 02:46:39 2004
@@ -301,6 +301,58 @@
 </td></tr>
 @@@FILTEREND@@@
 
+
+@@@SPAMASSASSINSTART@@@
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>SpamAssassin Filtering Options</B></td></tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Enable SpamAssassin:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINENABLE@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Filtering:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBAYES@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Auto-Learning:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINBAYESAUTOLEARN@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANEND@@@
+@@@SPAMASSASSINLOCALONLYSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DNS Blacklists:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBLACKLISTS@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Vipul's Razor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSERAZOR@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DCC:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEDCC@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Pyzor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEPYZOR@@@</td>
+</tr>
+@@@SPAMASSASSINLOCALONLYEND@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Move Messages Detected As Spam:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINMOVESPAM@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Spam Destination:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSPAMDESTINATION@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Message Is Spam When Score Is At Or Greater Than:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSCORETHRESHHOLD@@@&nbsp;(1 is aggressive, 15 is relaxed filtering)</td>
+</tr>
+@@@SPAMASSASSINEND@@@
+
+
+
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>AddressBook Options</B></td></tr>
 <tr><td align="right" bgcolor=@@@WINDOW_DARK@@@>
diff -ru cgi-bin/openwebmail/etc/templates/fr/prefs.template cgi-bin/openwebmail/etc/templates/fr/prefs.template
--- cgi-bin/openwebmail/etc/templates/fr/prefs.template	Thu Jan  1 09:00:52 2004
+++ cgi-bin/openwebmail/etc/templates/fr/prefs.template	Wed Apr 14 02:46:44 2004
@@ -301,6 +301,58 @@
 </td></tr>
 @@@FILTEREND@@@
 
+
+@@@SPAMASSASSINSTART@@@
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>SpamAssassin Filtering Options</B></td></tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Enable SpamAssassin:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINENABLE@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Filtering:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBAYES@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Auto-Learning:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINBAYESAUTOLEARN@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANEND@@@
+@@@SPAMASSASSINLOCALONLYSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DNS Blacklists:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBLACKLISTS@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Vipul's Razor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSERAZOR@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DCC:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEDCC@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Pyzor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEPYZOR@@@</td>
+</tr>
+@@@SPAMASSASSINLOCALONLYEND@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Move Messages Detected As Spam:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINMOVESPAM@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Spam Destination:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSPAMDESTINATION@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Message Is Spam When Score Is At Or Greater Than:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSCORETHRESHHOLD@@@&nbsp;(1 is aggressive, 15 is relaxed filtering)</td>
+</tr>
+@@@SPAMASSASSINEND@@@
+
+
+
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>Options du carnet d'adresses</B></td></tr>
 <tr><td align="right" bgcolor=@@@WINDOW_DARK@@@>
diff -ru cgi-bin/openwebmail/etc/templates/he.CP1255/prefs.template cgi-bin/openwebmail/etc/templates/he.CP1255/prefs.template
--- cgi-bin/openwebmail/etc/templates/he.CP1255/prefs.template	Thu Jan  1 09:00:53 2004
+++ cgi-bin/openwebmail/etc/templates/he.CP1255/prefs.template	Wed Apr 14 02:46:49 2004
@@ -301,6 +301,58 @@
 </td></tr>
 @@@FILTEREND@@@
 
+
+@@@SPAMASSASSINSTART@@@
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>SpamAssassin Filtering Options</B></td></tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Enable SpamAssassin:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINENABLE@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Filtering:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBAYES@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Auto-Learning:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINBAYESAUTOLEARN@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANEND@@@
+@@@SPAMASSASSINLOCALONLYSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DNS Blacklists:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBLACKLISTS@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Vipul's Razor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSERAZOR@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DCC:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEDCC@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Pyzor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEPYZOR@@@</td>
+</tr>
+@@@SPAMASSASSINLOCALONLYEND@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Move Messages Detected As Spam:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINMOVESPAM@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Spam Destination:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSPAMDESTINATION@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Message Is Spam When Score Is At Or Greater Than:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSCORETHRESHHOLD@@@&nbsp;(1 is aggressive, 15 is relaxed filtering)</td>
+</tr>
+@@@SPAMASSASSINEND@@@
+
+
+
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>àôùøåéåú ôð÷ñ äëúåáåú</B></td></tr>
 <tr><td align="left" bgcolor=@@@WINDOW_DARK@@@>
diff -ru cgi-bin/openwebmail/etc/templates/he.ISO8859-8/prefs.template cgi-bin/openwebmail/etc/templates/he.ISO8859-8/prefs.template
--- cgi-bin/openwebmail/etc/templates/he.ISO8859-8/prefs.template	Thu Jan  1 09:00:50 2004
+++ cgi-bin/openwebmail/etc/templates/he.ISO8859-8/prefs.template	Wed Apr 14 02:46:54 2004
@@ -301,6 +301,58 @@
 </td></tr>
 @@@FILTEREND@@@
 
+
+@@@SPAMASSASSINSTART@@@
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>SpamAssassin Filtering Options</B></td></tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Enable SpamAssassin:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINENABLE@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Filtering:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBAYES@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Auto-Learning:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINBAYESAUTOLEARN@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANEND@@@
+@@@SPAMASSASSINLOCALONLYSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DNS Blacklists:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBLACKLISTS@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Vipul's Razor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSERAZOR@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DCC:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEDCC@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Pyzor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEPYZOR@@@</td>
+</tr>
+@@@SPAMASSASSINLOCALONLYEND@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Move Messages Detected As Spam:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINMOVESPAM@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Spam Destination:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSPAMDESTINATION@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Message Is Spam When Score Is At Or Greater Than:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSCORETHRESHHOLD@@@&nbsp;(1 is aggressive, 15 is relaxed filtering)</td>
+</tr>
+@@@SPAMASSASSINEND@@@
+
+
+
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>AddressBook Options</B></td></tr>
 <tr><td align="left" bgcolor=@@@WINDOW_DARK@@@>
diff -ru cgi-bin/openwebmail/etc/templates/hu/prefs.template cgi-bin/openwebmail/etc/templates/hu/prefs.template
--- cgi-bin/openwebmail/etc/templates/hu/prefs.template	Thu Jan  1 09:29:31 2004
+++ cgi-bin/openwebmail/etc/templates/hu/prefs.template	Wed Apr 14 02:47:00 2004
@@ -301,6 +301,58 @@
 </td></tr>
 @@@FILTEREND@@@
 
+
+@@@SPAMASSASSINSTART@@@
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>SpamAssassin Filtering Options</B></td></tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Enable SpamAssassin:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINENABLE@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Filtering:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBAYES@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Auto-Learning:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINBAYESAUTOLEARN@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANEND@@@
+@@@SPAMASSASSINLOCALONLYSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DNS Blacklists:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBLACKLISTS@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Vipul's Razor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSERAZOR@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DCC:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEDCC@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Pyzor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEPYZOR@@@</td>
+</tr>
+@@@SPAMASSASSINLOCALONLYEND@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Move Messages Detected As Spam:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINMOVESPAM@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Spam Destination:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSPAMDESTINATION@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Message Is Spam When Score Is At Or Greater Than:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSCORETHRESHHOLD@@@&nbsp;(1 is aggressive, 15 is relaxed filtering)</td>
+</tr>
+@@@SPAMASSASSINEND@@@
+
+
+
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>Címjegyzék beállítások</B></td></tr>
 <tr><td align="right" bgcolor=@@@WINDOW_DARK@@@>
diff -ru cgi-bin/openwebmail/etc/templates/id/prefs.template cgi-bin/openwebmail/etc/templates/id/prefs.template
--- cgi-bin/openwebmail/etc/templates/id/prefs.template	Thu Jan  1 09:00:48 2004
+++ cgi-bin/openwebmail/etc/templates/id/prefs.template	Wed Apr 14 02:47:07 2004
@@ -301,6 +301,58 @@
 </td></tr>
 @@@FILTEREND@@@
 
+
+@@@SPAMASSASSINSTART@@@
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>SpamAssassin Filtering Options</B></td></tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Enable SpamAssassin:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINENABLE@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Filtering:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBAYES@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Auto-Learning:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINBAYESAUTOLEARN@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANEND@@@
+@@@SPAMASSASSINLOCALONLYSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DNS Blacklists:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBLACKLISTS@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Vipul's Razor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSERAZOR@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DCC:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEDCC@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Pyzor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEPYZOR@@@</td>
+</tr>
+@@@SPAMASSASSINLOCALONLYEND@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Move Messages Detected As Spam:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINMOVESPAM@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Spam Destination:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSPAMDESTINATION@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Message Is Spam When Score Is At Or Greater Than:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSCORETHRESHHOLD@@@&nbsp;(1 is aggressive, 15 is relaxed filtering)</td>
+</tr>
+@@@SPAMASSASSINEND@@@
+
+
+
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>AddressBook Options</B></td></tr>
 <tr><td align="right" bgcolor=@@@WINDOW_DARK@@@>
diff -ru cgi-bin/openwebmail/etc/templates/it/prefs.template cgi-bin/openwebmail/etc/templates/it/prefs.template
--- cgi-bin/openwebmail/etc/templates/it/prefs.template	Fri Jan  2 20:05:04 2004
+++ cgi-bin/openwebmail/etc/templates/it/prefs.template	Wed Apr 14 02:47:15 2004
@@ -301,6 +301,58 @@
 </td></tr>
 @@@FILTEREND@@@
 
+
+@@@SPAMASSASSINSTART@@@
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>SpamAssassin Filtering Options</B></td></tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Enable SpamAssassin:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINENABLE@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Filtering:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBAYES@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Auto-Learning:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINBAYESAUTOLEARN@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANEND@@@
+@@@SPAMASSASSINLOCALONLYSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DNS Blacklists:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBLACKLISTS@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Vipul's Razor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSERAZOR@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DCC:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEDCC@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Pyzor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEPYZOR@@@</td>
+</tr>
+@@@SPAMASSASSINLOCALONLYEND@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Move Messages Detected As Spam:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINMOVESPAM@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Spam Destination:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSPAMDESTINATION@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Message Is Spam When Score Is At Or Greater Than:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSCORETHRESHHOLD@@@&nbsp;(1 is aggressive, 15 is relaxed filtering)</td>
+</tr>
+@@@SPAMASSASSINEND@@@
+
+
+
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>Opzioni Agenda</B></td></tr>
 <tr><td align="right" bgcolor=@@@WINDOW_DARK@@@>
diff -ru cgi-bin/openwebmail/etc/templates/ja_JP.Shift_JIS/prefs.template cgi-bin/openwebmail/etc/templates/ja_JP.Shift_JIS/prefs.template
--- cgi-bin/openwebmail/etc/templates/ja_JP.Shift_JIS/prefs.template	Thu Jan  1 09:00:53 2004
+++ cgi-bin/openwebmail/etc/templates/ja_JP.Shift_JIS/prefs.template	Wed Apr 14 02:47:21 2004
@@ -301,6 +301,58 @@
 </td></tr>
 @@@FILTEREND@@@
 
+
+@@@SPAMASSASSINSTART@@@
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>SpamAssassin Filtering Options</B></td></tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Enable SpamAssassin:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINENABLE@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Filtering:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBAYES@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Auto-Learning:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINBAYESAUTOLEARN@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANEND@@@
+@@@SPAMASSASSINLOCALONLYSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DNS Blacklists:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBLACKLISTS@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Vipul's Razor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSERAZOR@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DCC:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEDCC@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Pyzor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEPYZOR@@@</td>
+</tr>
+@@@SPAMASSASSINLOCALONLYEND@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Move Messages Detected As Spam:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINMOVESPAM@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Spam Destination:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSPAMDESTINATION@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Message Is Spam When Score Is At Or Greater Than:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSCORETHRESHHOLD@@@&nbsp;(1 is aggressive, 15 is relaxed filtering)</td>
+</tr>
+@@@SPAMASSASSINEND@@@
+
+
+
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>ƒAƒhƒŒƒX’ ƒIƒuƒVƒ‡ƒ“</B></td></tr>
 <tr><td align="right" bgcolor=@@@WINDOW_DARK@@@>
diff -ru cgi-bin/openwebmail/etc/templates/ja_JP.eucJP/prefs.template cgi-bin/openwebmail/etc/templates/ja_JP.eucJP/prefs.template
--- cgi-bin/openwebmail/etc/templates/ja_JP.eucJP/prefs.template	Thu Jan  1 09:00:52 2004
+++ cgi-bin/openwebmail/etc/templates/ja_JP.eucJP/prefs.template	Wed Apr 14 02:47:26 2004
@@ -301,6 +301,58 @@
 </td></tr>
 @@@FILTEREND@@@
 
+
+@@@SPAMASSASSINSTART@@@
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>SpamAssassin Filtering Options</B></td></tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Enable SpamAssassin:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINENABLE@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Filtering:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBAYES@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Auto-Learning:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINBAYESAUTOLEARN@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANEND@@@
+@@@SPAMASSASSINLOCALONLYSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DNS Blacklists:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBLACKLISTS@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Vipul's Razor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSERAZOR@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DCC:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEDCC@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Pyzor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEPYZOR@@@</td>
+</tr>
+@@@SPAMASSASSINLOCALONLYEND@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Move Messages Detected As Spam:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINMOVESPAM@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Spam Destination:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSPAMDESTINATION@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Message Is Spam When Score Is At Or Greater Than:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSCORETHRESHHOLD@@@&nbsp;(1 is aggressive, 15 is relaxed filtering)</td>
+</tr>
+@@@SPAMASSASSINEND@@@
+
+
+
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>¥¢¥É¥ì¥¹Ä¢¥ª¥Ö¥·¥ç¥ó</B></td></tr>
 <tr><td align="right" bgcolor=@@@WINDOW_DARK@@@>
diff -ru cgi-bin/openwebmail/etc/templates/kr/prefs.template cgi-bin/openwebmail/etc/templates/kr/prefs.template
--- cgi-bin/openwebmail/etc/templates/kr/prefs.template	Thu Jan  1 09:00:53 2004
+++ cgi-bin/openwebmail/etc/templates/kr/prefs.template	Wed Apr 14 02:47:31 2004
@@ -301,6 +301,58 @@
 </td></tr>
 @@@FILTEREND@@@
 
+
+@@@SPAMASSASSINSTART@@@
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>SpamAssassin Filtering Options</B></td></tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Enable SpamAssassin:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINENABLE@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Filtering:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBAYES@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Auto-Learning:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINBAYESAUTOLEARN@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANEND@@@
+@@@SPAMASSASSINLOCALONLYSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DNS Blacklists:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBLACKLISTS@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Vipul's Razor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSERAZOR@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DCC:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEDCC@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Pyzor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEPYZOR@@@</td>
+</tr>
+@@@SPAMASSASSINLOCALONLYEND@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Move Messages Detected As Spam:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINMOVESPAM@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Spam Destination:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSPAMDESTINATION@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Message Is Spam When Score Is At Or Greater Than:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSCORETHRESHHOLD@@@&nbsp;(1 is aggressive, 15 is relaxed filtering)</td>
+</tr>
+@@@SPAMASSASSINEND@@@
+
+
+
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>AddressBook Options</B></td></tr>
 <tr><td align="right" bgcolor=@@@WINDOW_DARK@@@>
diff -ru cgi-bin/openwebmail/etc/templates/lt/prefs.template cgi-bin/openwebmail/etc/templates/lt/prefs.template
--- cgi-bin/openwebmail/etc/templates/lt/prefs.template	Thu Jan  1 09:00:52 2004
+++ cgi-bin/openwebmail/etc/templates/lt/prefs.template	Wed Apr 14 02:47:38 2004
@@ -301,6 +301,58 @@
 </td></tr>
 @@@FILTEREND@@@
 
+
+@@@SPAMASSASSINSTART@@@
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>SpamAssassin Filtering Options</B></td></tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Enable SpamAssassin:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINENABLE@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Filtering:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBAYES@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Auto-Learning:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINBAYESAUTOLEARN@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANEND@@@
+@@@SPAMASSASSINLOCALONLYSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DNS Blacklists:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBLACKLISTS@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Vipul's Razor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSERAZOR@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DCC:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEDCC@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Pyzor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEPYZOR@@@</td>
+</tr>
+@@@SPAMASSASSINLOCALONLYEND@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Move Messages Detected As Spam:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINMOVESPAM@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Spam Destination:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSPAMDESTINATION@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Message Is Spam When Score Is At Or Greater Than:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSCORETHRESHHOLD@@@&nbsp;(1 is aggressive, 15 is relaxed filtering)</td>
+</tr>
+@@@SPAMASSASSINEND@@@
+
+
+
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>AddressBook Options</B></td></tr>
 <tr><td align="right" bgcolor=@@@WINDOW_DARK@@@>
diff -ru cgi-bin/openwebmail/etc/templates/nl/prefs.template cgi-bin/openwebmail/etc/templates/nl/prefs.template
--- cgi-bin/openwebmail/etc/templates/nl/prefs.template	Thu Jan  1 09:00:53 2004
+++ cgi-bin/openwebmail/etc/templates/nl/prefs.template	Wed Apr 14 02:47:42 2004
@@ -301,6 +301,58 @@
 </td></tr>
 @@@FILTEREND@@@
 
+
+@@@SPAMASSASSINSTART@@@
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>SpamAssassin Filtering Options</B></td></tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Enable SpamAssassin:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINENABLE@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Filtering:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBAYES@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Auto-Learning:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINBAYESAUTOLEARN@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANEND@@@
+@@@SPAMASSASSINLOCALONLYSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DNS Blacklists:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBLACKLISTS@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Vipul's Razor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSERAZOR@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DCC:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEDCC@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Pyzor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEPYZOR@@@</td>
+</tr>
+@@@SPAMASSASSINLOCALONLYEND@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Move Messages Detected As Spam:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINMOVESPAM@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Spam Destination:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSPAMDESTINATION@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Message Is Spam When Score Is At Or Greater Than:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSCORETHRESHHOLD@@@&nbsp;(1 is aggressive, 15 is relaxed filtering)</td>
+</tr>
+@@@SPAMASSASSINEND@@@
+
+
+
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>Adressenboek Instellingen</B></td></tr>
 <tr><td align="right" bgcolor=@@@WINDOW_DARK@@@>
diff -ru cgi-bin/openwebmail/etc/templates/no/prefs.template cgi-bin/openwebmail/etc/templates/no/prefs.template
--- cgi-bin/openwebmail/etc/templates/no/prefs.template	Thu Jan  1 09:00:52 2004
+++ cgi-bin/openwebmail/etc/templates/no/prefs.template	Wed Apr 14 02:47:47 2004
@@ -301,6 +301,58 @@
 </td></tr>
 @@@FILTEREND@@@
 
+
+@@@SPAMASSASSINSTART@@@
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>SpamAssassin Filtering Options</B></td></tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Enable SpamAssassin:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINENABLE@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Filtering:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBAYES@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Auto-Learning:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINBAYESAUTOLEARN@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANEND@@@
+@@@SPAMASSASSINLOCALONLYSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DNS Blacklists:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBLACKLISTS@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Vipul's Razor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSERAZOR@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DCC:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEDCC@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Pyzor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEPYZOR@@@</td>
+</tr>
+@@@SPAMASSASSINLOCALONLYEND@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Move Messages Detected As Spam:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINMOVESPAM@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Spam Destination:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSPAMDESTINATION@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Message Is Spam When Score Is At Or Greater Than:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSCORETHRESHHOLD@@@&nbsp;(1 is aggressive, 15 is relaxed filtering)</td>
+</tr>
+@@@SPAMASSASSINEND@@@
+
+
+
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>Adressebok-oppsett</B></td></tr>
 <tr><td align="right" bgcolor=@@@WINDOW_DARK@@@>
diff -ru cgi-bin/openwebmail/etc/templates/pl/prefs.template cgi-bin/openwebmail/etc/templates/pl/prefs.template
--- cgi-bin/openwebmail/etc/templates/pl/prefs.template	Thu Jan  1 09:32:25 2004
+++ cgi-bin/openwebmail/etc/templates/pl/prefs.template	Wed Apr 14 02:47:52 2004
@@ -301,6 +301,58 @@
 </td></tr>
 @@@FILTEREND@@@
 
+
+@@@SPAMASSASSINSTART@@@
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>SpamAssassin Filtering Options</B></td></tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Enable SpamAssassin:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINENABLE@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Filtering:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBAYES@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Auto-Learning:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINBAYESAUTOLEARN@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANEND@@@
+@@@SPAMASSASSINLOCALONLYSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DNS Blacklists:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBLACKLISTS@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Vipul's Razor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSERAZOR@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DCC:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEDCC@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Pyzor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEPYZOR@@@</td>
+</tr>
+@@@SPAMASSASSINLOCALONLYEND@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Move Messages Detected As Spam:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINMOVESPAM@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Spam Destination:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSPAMDESTINATION@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Message Is Spam When Score Is At Or Greater Than:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSCORETHRESHHOLD@@@&nbsp;(1 is aggressive, 15 is relaxed filtering)</td>
+</tr>
+@@@SPAMASSASSINEND@@@
+
+
+
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>Opcje ksi±¿ki adresowej</B></td></tr>
 <tr><td align="right" bgcolor=@@@WINDOW_DARK@@@>
diff -ru cgi-bin/openwebmail/etc/templates/pt/prefs.template cgi-bin/openwebmail/etc/templates/pt/prefs.template
--- cgi-bin/openwebmail/etc/templates/pt/prefs.template	Thu Jan  1 09:00:52 2004
+++ cgi-bin/openwebmail/etc/templates/pt/prefs.template	Wed Apr 14 02:47:56 2004
@@ -301,6 +301,58 @@
 </td></tr>
 @@@FILTEREND@@@
 
+
+@@@SPAMASSASSINSTART@@@
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>SpamAssassin Filtering Options</B></td></tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Enable SpamAssassin:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINENABLE@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Filtering:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBAYES@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Auto-Learning:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINBAYESAUTOLEARN@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANEND@@@
+@@@SPAMASSASSINLOCALONLYSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DNS Blacklists:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBLACKLISTS@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Vipul's Razor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSERAZOR@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DCC:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEDCC@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Pyzor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEPYZOR@@@</td>
+</tr>
+@@@SPAMASSASSINLOCALONLYEND@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Move Messages Detected As Spam:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINMOVESPAM@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Spam Destination:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSPAMDESTINATION@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Message Is Spam When Score Is At Or Greater Than:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSCORETHRESHHOLD@@@&nbsp;(1 is aggressive, 15 is relaxed filtering)</td>
+</tr>
+@@@SPAMASSASSINEND@@@
+
+
+
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>Opções Livro de Endereços</B></td></tr>
 <tr><td align="right" bgcolor=@@@WINDOW_DARK@@@>
diff -ru cgi-bin/openwebmail/etc/templates/pt_BR/prefs.template cgi-bin/openwebmail/etc/templates/pt_BR/prefs.template
--- cgi-bin/openwebmail/etc/templates/pt_BR/prefs.template	Sat Apr 10 00:58:11 2004
+++ cgi-bin/openwebmail/etc/templates/pt_BR/prefs.template	Wed Apr 14 02:48:02 2004
@@ -301,6 +301,58 @@
 </td></tr>
 @@@FILTEREND@@@
 
+
+@@@SPAMASSASSINSTART@@@
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>SpamAssassin Filtering Options</B></td></tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Enable SpamAssassin:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINENABLE@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Filtering:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBAYES@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Auto-Learning:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINBAYESAUTOLEARN@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANEND@@@
+@@@SPAMASSASSINLOCALONLYSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DNS Blacklists:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBLACKLISTS@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Vipul's Razor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSERAZOR@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DCC:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEDCC@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Pyzor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEPYZOR@@@</td>
+</tr>
+@@@SPAMASSASSINLOCALONLYEND@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Move Messages Detected As Spam:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINMOVESPAM@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Spam Destination:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSPAMDESTINATION@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Message Is Spam When Score Is At Or Greater Than:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSCORETHRESHHOLD@@@&nbsp;(1 is aggressive, 15 is relaxed filtering)</td>
+</tr>
+@@@SPAMASSASSINEND@@@
+
+
+
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>Opções do Livro de Endereços</B></td></tr>
 <tr><td align="right" bgcolor=@@@WINDOW_DARK@@@>
diff -ru cgi-bin/openwebmail/etc/templates/ro/prefs.template cgi-bin/openwebmail/etc/templates/ro/prefs.template
--- cgi-bin/openwebmail/etc/templates/ro/prefs.template	Thu Jan  1 09:00:52 2004
+++ cgi-bin/openwebmail/etc/templates/ro/prefs.template	Wed Apr 14 02:48:07 2004
@@ -301,6 +301,58 @@
 </td></tr>
 @@@FILTEREND@@@
 
+
+@@@SPAMASSASSINSTART@@@
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>SpamAssassin Filtering Options</B></td></tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Enable SpamAssassin:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINENABLE@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Filtering:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBAYES@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Auto-Learning:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINBAYESAUTOLEARN@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANEND@@@
+@@@SPAMASSASSINLOCALONLYSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DNS Blacklists:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBLACKLISTS@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Vipul's Razor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSERAZOR@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DCC:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEDCC@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Pyzor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEPYZOR@@@</td>
+</tr>
+@@@SPAMASSASSINLOCALONLYEND@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Move Messages Detected As Spam:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINMOVESPAM@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Spam Destination:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSPAMDESTINATION@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Message Is Spam When Score Is At Or Greater Than:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSCORETHRESHHOLD@@@&nbsp;(1 is aggressive, 15 is relaxed filtering)</td>
+</tr>
+@@@SPAMASSASSINEND@@@
+
+
+
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>Optiuni Agenda</B></td></tr>
 <tr><td align="right" bgcolor=@@@WINDOW_DARK@@@>
diff -ru cgi-bin/openwebmail/etc/templates/ru/prefs.template cgi-bin/openwebmail/etc/templates/ru/prefs.template
--- cgi-bin/openwebmail/etc/templates/ru/prefs.template	Thu Jan  1 09:00:53 2004
+++ cgi-bin/openwebmail/etc/templates/ru/prefs.template	Wed Apr 14 02:48:14 2004
@@ -301,6 +301,58 @@
 </td></tr>
 @@@FILTEREND@@@
 
+
+@@@SPAMASSASSINSTART@@@
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>SpamAssassin Filtering Options</B></td></tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Enable SpamAssassin:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINENABLE@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Filtering:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBAYES@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Auto-Learning:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINBAYESAUTOLEARN@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANEND@@@
+@@@SPAMASSASSINLOCALONLYSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DNS Blacklists:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBLACKLISTS@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Vipul's Razor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSERAZOR@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DCC:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEDCC@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Pyzor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEPYZOR@@@</td>
+</tr>
+@@@SPAMASSASSINLOCALONLYEND@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Move Messages Detected As Spam:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINMOVESPAM@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Spam Destination:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSPAMDESTINATION@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Message Is Spam When Score Is At Or Greater Than:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSCORETHRESHHOLD@@@&nbsp;(1 is aggressive, 15 is relaxed filtering)</td>
+</tr>
+@@@SPAMASSASSINEND@@@
+
+
+
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>AddressBook Options</B></td></tr>
 <tr><td align="right" bgcolor=@@@WINDOW_DARK@@@>
diff -ru cgi-bin/openwebmail/etc/templates/sk/prefs.template cgi-bin/openwebmail/etc/templates/sk/prefs.template
--- cgi-bin/openwebmail/etc/templates/sk/prefs.template	Thu Jan  1 09:00:52 2004
+++ cgi-bin/openwebmail/etc/templates/sk/prefs.template	Wed Apr 14 02:48:20 2004
@@ -301,6 +301,58 @@
 </td></tr>
 @@@FILTEREND@@@
 
+
+@@@SPAMASSASSINSTART@@@
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>SpamAssassin Filtering Options</B></td></tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Enable SpamAssassin:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINENABLE@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Filtering:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBAYES@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Auto-Learning:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINBAYESAUTOLEARN@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANEND@@@
+@@@SPAMASSASSINLOCALONLYSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DNS Blacklists:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBLACKLISTS@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Vipul's Razor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSERAZOR@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DCC:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEDCC@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Pyzor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEPYZOR@@@</td>
+</tr>
+@@@SPAMASSASSINLOCALONLYEND@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Move Messages Detected As Spam:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINMOVESPAM@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Spam Destination:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSPAMDESTINATION@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Message Is Spam When Score Is At Or Greater Than:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSCORETHRESHHOLD@@@&nbsp;(1 is aggressive, 15 is relaxed filtering)</td>
+</tr>
+@@@SPAMASSASSINEND@@@
+
+
+
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>Nastavenia adresára</B></td></tr>
 <tr><td align="right" bgcolor=@@@WINDOW_DARK@@@>
diff -ru cgi-bin/openwebmail/etc/templates/sr/prefs.template cgi-bin/openwebmail/etc/templates/sr/prefs.template
--- cgi-bin/openwebmail/etc/templates/sr/prefs.template	Sat Jan 10 04:11:44 2004
+++ cgi-bin/openwebmail/etc/templates/sr/prefs.template	Wed Apr 14 02:48:26 2004
@@ -301,6 +301,58 @@
 </td></tr>
 @@@FILTEREND@@@
 
+
+@@@SPAMASSASSINSTART@@@
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>SpamAssassin Filtering Options</B></td></tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Enable SpamAssassin:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINENABLE@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Filtering:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBAYES@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Auto-Learning:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINBAYESAUTOLEARN@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANEND@@@
+@@@SPAMASSASSINLOCALONLYSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DNS Blacklists:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBLACKLISTS@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Vipul's Razor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSERAZOR@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DCC:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEDCC@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Pyzor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEPYZOR@@@</td>
+</tr>
+@@@SPAMASSASSINLOCALONLYEND@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Move Messages Detected As Spam:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINMOVESPAM@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Spam Destination:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSPAMDESTINATION@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Message Is Spam When Score Is At Or Greater Than:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSCORETHRESHHOLD@@@&nbsp;(1 is aggressive, 15 is relaxed filtering)</td>
+</tr>
+@@@SPAMASSASSINEND@@@
+
+
+
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>Pode¹avanje adresara</B></td></tr>
 <tr><td align="right" bgcolor=@@@WINDOW_DARK@@@>
diff -ru cgi-bin/openwebmail/etc/templates/sv/prefs.template cgi-bin/openwebmail/etc/templates/sv/prefs.template
--- cgi-bin/openwebmail/etc/templates/sv/prefs.template	Thu Jan  1 09:00:52 2004
+++ cgi-bin/openwebmail/etc/templates/sv/prefs.template	Wed Apr 14 02:48:32 2004
@@ -301,6 +301,58 @@
 </td></tr>
 @@@FILTEREND@@@
 
+
+@@@SPAMASSASSINSTART@@@
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>SpamAssassin Filtering Options</B></td></tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Enable SpamAssassin:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINENABLE@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Filtering:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBAYES@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Auto-Learning:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINBAYESAUTOLEARN@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANEND@@@
+@@@SPAMASSASSINLOCALONLYSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DNS Blacklists:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBLACKLISTS@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Vipul's Razor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSERAZOR@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DCC:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEDCC@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Pyzor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEPYZOR@@@</td>
+</tr>
+@@@SPAMASSASSINLOCALONLYEND@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Move Messages Detected As Spam:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINMOVESPAM@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Spam Destination:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSPAMDESTINATION@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Message Is Spam When Score Is At Or Greater Than:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSCORETHRESHHOLD@@@&nbsp;(1 is aggressive, 15 is relaxed filtering)</td>
+</tr>
+@@@SPAMASSASSINEND@@@
+
+
+
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>AddressBook Options</B></td></tr>
 <tr><td align="right" bgcolor=@@@WINDOW_DARK@@@>
diff -ru cgi-bin/openwebmail/etc/templates/th/prefs.template cgi-bin/openwebmail/etc/templates/th/prefs.template
--- cgi-bin/openwebmail/etc/templates/th/prefs.template	Thu Jan  1 09:00:53 2004
+++ cgi-bin/openwebmail/etc/templates/th/prefs.template	Wed Apr 14 02:48:38 2004
@@ -301,6 +301,58 @@
 </td></tr>
 @@@FILTEREND@@@
 
+
+@@@SPAMASSASSINSTART@@@
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>SpamAssassin Filtering Options</B></td></tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Enable SpamAssassin:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINENABLE@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Filtering:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBAYES@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Auto-Learning:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINBAYESAUTOLEARN@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANEND@@@
+@@@SPAMASSASSINLOCALONLYSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DNS Blacklists:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBLACKLISTS@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Vipul's Razor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSERAZOR@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DCC:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEDCC@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Pyzor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEPYZOR@@@</td>
+</tr>
+@@@SPAMASSASSINLOCALONLYEND@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Move Messages Detected As Spam:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINMOVESPAM@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Spam Destination:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSPAMDESTINATION@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Message Is Spam When Score Is At Or Greater Than:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSCORETHRESHHOLD@@@&nbsp;(1 is aggressive, 15 is relaxed filtering)</td>
+</tr>
+@@@SPAMASSASSINEND@@@
+
+
+
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>µÑÇàÅ×Í¡ÊÁØ´ÃÒÂª×èÍ</B></td></tr>
 <tr><td align="right" bgcolor=@@@WINDOW_DARK@@@>
diff -ru cgi-bin/openwebmail/etc/templates/tr/prefs.template cgi-bin/openwebmail/etc/templates/tr/prefs.template
--- cgi-bin/openwebmail/etc/templates/tr/prefs.template	Thu Jan  1 09:00:52 2004
+++ cgi-bin/openwebmail/etc/templates/tr/prefs.template	Wed Apr 14 02:48:43 2004
@@ -301,6 +301,58 @@
 </td></tr>
 @@@FILTEREND@@@
 
+
+@@@SPAMASSASSINSTART@@@
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>SpamAssassin Filtering Options</B></td></tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Enable SpamAssassin:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINENABLE@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Filtering:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBAYES@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Auto-Learning:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINBAYESAUTOLEARN@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANEND@@@
+@@@SPAMASSASSINLOCALONLYSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DNS Blacklists:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBLACKLISTS@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Vipul's Razor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSERAZOR@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DCC:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEDCC@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Pyzor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEPYZOR@@@</td>
+</tr>
+@@@SPAMASSASSINLOCALONLYEND@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Move Messages Detected As Spam:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINMOVESPAM@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Spam Destination:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSPAMDESTINATION@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Message Is Spam When Score Is At Or Greater Than:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSCORETHRESHHOLD@@@&nbsp;(1 is aggressive, 15 is relaxed filtering)</td>
+</tr>
+@@@SPAMASSASSINEND@@@
+
+
+
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>AddressBook Options</B></td></tr>
 <tr><td align="right" bgcolor=@@@WINDOW_DARK@@@>
diff -ru cgi-bin/openwebmail/etc/templates/uk/prefs.template cgi-bin/openwebmail/etc/templates/uk/prefs.template
--- cgi-bin/openwebmail/etc/templates/uk/prefs.template	Thu Jan  1 09:00:53 2004
+++ cgi-bin/openwebmail/etc/templates/uk/prefs.template	Wed Apr 14 02:48:49 2004
@@ -301,6 +301,58 @@
 </td></tr>
 @@@FILTEREND@@@
 
+
+@@@SPAMASSASSINSTART@@@
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>SpamAssassin Filtering Options</B></td></tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Enable SpamAssassin:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINENABLE@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Filtering:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBAYES@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Auto-Learning:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINBAYESAUTOLEARN@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANEND@@@
+@@@SPAMASSASSINLOCALONLYSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DNS Blacklists:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBLACKLISTS@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Vipul's Razor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSERAZOR@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DCC:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEDCC@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Pyzor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEPYZOR@@@</td>
+</tr>
+@@@SPAMASSASSINLOCALONLYEND@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Move Messages Detected As Spam:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINMOVESPAM@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Spam Destination:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSPAMDESTINATION@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Message Is Spam When Score Is At Or Greater Than:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSCORETHRESHHOLD@@@&nbsp;(1 is aggressive, 15 is relaxed filtering)</td>
+</tr>
+@@@SPAMASSASSINEND@@@
+
+
+
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>ðÁÒÁÍÅÔÒÉ ÁÄÒÅÓÎÏ§ ËÎÉÇÉ</B></td></tr>
 <tr><td align="right" bgcolor=@@@WINDOW_DARK@@@>
diff -ru cgi-bin/openwebmail/etc/templates/ur/prefs.template cgi-bin/openwebmail/etc/templates/ur/prefs.template
--- cgi-bin/openwebmail/etc/templates/ur/prefs.template	Thu Jan  1 09:00:52 2004
+++ cgi-bin/openwebmail/etc/templates/ur/prefs.template	Wed Apr 14 02:48:54 2004
@@ -301,6 +301,58 @@
 </td></tr>
 @@@FILTEREND@@@
 
+
+@@@SPAMASSASSINSTART@@@
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>SpamAssassin Filtering Options</B></td></tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Enable SpamAssassin:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINENABLE@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Filtering:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBAYES@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Auto-Learning:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINBAYESAUTOLEARN@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANEND@@@
+@@@SPAMASSASSINLOCALONLYSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DNS Blacklists:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBLACKLISTS@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Vipul's Razor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSERAZOR@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DCC:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEDCC@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Pyzor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEPYZOR@@@</td>
+</tr>
+@@@SPAMASSASSINLOCALONLYEND@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Move Messages Detected As Spam:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINMOVESPAM@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Spam Destination:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSPAMDESTINATION@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Message Is Spam When Score Is At Or Greater Than:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSCORETHRESHHOLD@@@&nbsp;(1 is aggressive, 15 is relaxed filtering)</td>
+</tr>
+@@@SPAMASSASSINEND@@@
+
+
+
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B> ïº�ï»³ï®‰ïº­ïº± ïº‘ï®� ï»›ï®¯ ïº�ï­˜ïº¸ï»¦ </B></td></tr>
 <tr><td align="left" bgcolor=@@@WINDOW_DARK@@@>
diff -ru cgi-bin/openwebmail/etc/templates/zh_CN.GB2312/prefs.template cgi-bin/openwebmail/etc/templates/zh_CN.GB2312/prefs.template
--- cgi-bin/openwebmail/etc/templates/zh_CN.GB2312/prefs.template	Thu Jan  1 09:00:53 2004
+++ cgi-bin/openwebmail/etc/templates/zh_CN.GB2312/prefs.template	Wed Apr 14 02:48:59 2004
@@ -301,6 +301,58 @@
 </td></tr>
 @@@FILTEREND@@@
 
+
+@@@SPAMASSASSINSTART@@@
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>SpamAssassin Filtering Options</B></td></tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Enable SpamAssassin:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINENABLE@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Filtering:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBAYES@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Auto-Learning:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINBAYESAUTOLEARN@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANEND@@@
+@@@SPAMASSASSINLOCALONLYSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DNS Blacklists:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBLACKLISTS@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Vipul's Razor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSERAZOR@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DCC:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEDCC@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Pyzor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEPYZOR@@@</td>
+</tr>
+@@@SPAMASSASSINLOCALONLYEND@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Move Messages Detected As Spam:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINMOVESPAM@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Spam Destination:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSPAMDESTINATION@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Message Is Spam When Score Is At Or Greater Than:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSCORETHRESHHOLD@@@&nbsp;(1 is aggressive, 15 is relaxed filtering)</td>
+</tr>
+@@@SPAMASSASSINEND@@@
+
+
+
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>Í¨Ñ¶Â¼Éè¶¨</B></td></tr>
 <tr><td align="right" bgcolor=@@@WINDOW_DARK@@@>
diff -ru cgi-bin/openwebmail/etc/templates/zh_TW.Big5/prefs.template cgi-bin/openwebmail/etc/templates/zh_TW.Big5/prefs.template
--- cgi-bin/openwebmail/etc/templates/zh_TW.Big5/prefs.template	Thu Jan  1 09:00:52 2004
+++ cgi-bin/openwebmail/etc/templates/zh_TW.Big5/prefs.template	Wed Apr 14 02:49:05 2004
@@ -301,6 +301,58 @@
 </td></tr>
 @@@FILTEREND@@@
 
+
+@@@SPAMASSASSINSTART@@@
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>SpamAssassin Filtering Options</B></td></tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Enable SpamAssassin:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINENABLE@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Filtering:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBAYES@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Bayesian Auto-Learning:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINBAYESAUTOLEARN@@@</td>
+</tr>
+@@@SPAMASSASSINBAYESIANEND@@@
+@@@SPAMASSASSINLOCALONLYSTART@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DNS Blacklists:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEBLACKLISTS@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Vipul's Razor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSERAZOR@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use DCC:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEDCC@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Use Pyzor:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINUSEPYZOR@@@</td>
+</tr>
+@@@SPAMASSASSINLOCALONLYEND@@@
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Move Messages Detected As Spam:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINMOVESPAM@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Spam Destination:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSPAMDESTINATION@@@</td>
+</tr>
+<tr>
+   <td align="right" bgcolor=@@@WINDOW_DARK@@@><B>Message Is Spam When Score Is At Or Greater Than:</B></td>
+   <td bgcolor=@@@WINDOW_DARK@@@>@@@SPAMASSASSINSCORETHRESHHOLD@@@&nbsp;(1 is aggressive, 15 is relaxed filtering)</td>
+</tr>
+@@@SPAMASSASSINEND@@@
+
+
+
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>³q°T¿ý³]©w</B></td></tr>
 <tr><td align="right" bgcolor=@@@WINDOW_DARK@@@>
--- cgi-bin/openwebmail/openwebmail-main.pl	Tue Apr 13 13:30:17 2004
+++ cgi-bin/openwebmail/openwebmail-main.pl	Wed Apr 14 03:08:04 2004
@@ -97,6 +97,17 @@
    } else {
       listmessages();
    }
+} elsif ($action eq "learnspam" || $action eq "learnham") {
+   my @messageids = param('message_ids');
+   sabayeslearn(\@messageids,$folder) if ($#messageids>=0);
+   if (param('messageaftermove')) {
+      my $headers = param('headers') || $prefs{'headers'} || 'simple';
+      my $attmode = param('attmode') || 'simple';
+      my $escapedmessageid=ow::tool::escapeURL(param('message_id')||'');
+      print redirect(-location=>"$config{'ow_cgiurl'}/openwebmail-read.pl?sessionid=$thissession&folder=$escapedfolder&page=$page&sort=$sort&keyword=$escapedkeyword&searchtype=$searchtype&message_id=$escapedmessageid&action=readmessage&headers=$headers&attmode=$attmode");
+   } else {
+      listmessages();
+   }
 } elsif ($action eq "listmessages_afterlogin") {
    cleantrash($prefs{'trashreserveddays'});
    if ($quotalimit>0 && $quotausage>$quotalimit) {
@@ -359,12 +371,17 @@
 
    $html =~ s/\@\@\@LEFTMENUBARLINKS\@\@\@/$temphtml/;
 
+   $temphtml = '';
+   if ($config{'enable_spamassassin'} && $config{'sa_enable_bayesian'} && $prefs{'sa_enable'} && $prefs{'sa_use_bayes'}) {
+      $temphtml .= iconlink("spam.gif", $lang_text{'learnspam'}, qq|accesskey="S" href="Javascript:document.pageform.action.value='learnspam'; document.pageform.submit();"|);
+      $temphtml .= iconlink("ham.gif", $lang_text{'learnham'}, qq|accesskey="H" href="Javascript:document.pageform.action.value='learnham'; document.pageform.submit();"|);
+   }
    if ($folder eq 'mail-trash') {
-      $temphtml = iconlink("trash.gif", $lang_text{'emptytrash'}, qq|accesskey="Z" href="$main_url_with_keyword&amp;action=emptytrash&amp;page=$page&amp;longpage=$longpage" onclick="return confirm('$lang_text{emptytrash} ($trash_allmessages $lang_text{messages}) ?');"|);
+      $temphtml .= iconlink("trash.gif", $lang_text{'emptytrash'}, qq|accesskey="Z" href="$main_url_with_keyword&amp;action=emptytrash&amp;page=$page&amp;longpage=$longpage" onclick="return confirm('$lang_text{emptytrash} ($trash_allmessages $lang_text{messages}) ?');"|);
    } else {
       my $trashfolder='mail-trash';
       $trashfolder='DELETE' if ($quotalimit>0 && $quotausage>$quotalimit);
-      $temphtml = iconlink("totrash.gif", $lang_text{'totrash'}, qq|accesskey="Z" href="JavaScript:document.pageform.destination.value='$trashfolder'; document.pageform.movebutton.click();"|);
+      $temphtml .= iconlink("totrash.gif", $lang_text{'totrash'}, qq|accesskey="Z" href="JavaScript:document.pageform.destination.value='$trashfolder'; document.pageform.movebutton.click();"|);
    }
    $temphtml .= qq|&nbsp;\n|;
 
--- cgi-bin/openwebmail/shares/mailfilter.pl	Sun Apr 11 06:38:33 2004
+++ cgi-bin/openwebmail/shares/mailfilter.pl	Wed Apr 14 03:08:33 2004
@@ -1,6 +1,9 @@
 #
 # mailfilter.pl - mail filter routines
 #
+# 2004/04/09 ateslik.AT.users.sourceforge.net
+#            integrate SpamAssassin filtering
+#
 # 2001/11/13 Ebola.AT.turtle.ee.ncku.edu.tw
 #            tung.AT.turtle.ee.ncku.edu.tw
 #
@@ -130,6 +133,25 @@
       return -6;
    }
 
+   my $spamtest = '';
+   if ($config{'enable_spamassassin'} && $prefs{'sa_enable'}) {
+      eval "use Mail::SpamAssassin;";
+      if ($@) {
+         $lang_err{'couldnt_load'} =~ s/\@\@\@MODULENAME\@\@\@/'Mail::SpamAssassin'/;
+         openwebmailerror(__FILE__, __LINE__, "$lang_err{'couldnt_load'} !");
+      }
+
+      my %spamtestconfig = (   userprefs_filename => dotpath('spamassassin_user_prefs'),
+                                    userstate_dir => dotpath('webmail'),
+                                  dont_copy_prefs => 1,
+                             home_dir_for_helpers => dotpath('webmail') );
+
+      $spamtestconfig{'local_tests_only'} = 1 if ($prefs{'sa_local_tests_only'});
+
+      $spamtest = Mail::SpamAssassin->new(\%spamtestconfig);
+      $spamtest->compile_now(1);
+   }
+
    foreach my $messageid (@allmessageids) {
       next if ($messageid=~/^DUP\d+\-/);        # skip duplicated msg in src folder
       my @attr = get_data_attr($FDB{$messageid});
@@ -455,7 +477,35 @@
             }
          } # end of if enable_smartfilter
 
-         # 3. mark to be moved message as zap
+         # 3. Check what SpamAssassin thinks of this message
+         if ($config{'enable_spamassassin'} && $prefs{'sa_enable'} && $to_be_moved != 1) {
+            if ($currmessage eq "") {
+               seek($folderhandle, $attr[$_OFFSET], 0);
+               read($folderhandle, $currmessage, $attr[$_SIZE]);
+            }
+            my $status = $spamtest->check_message_text($currmessage);
+            if ($status->is_spam()) {
+               if ($prefs{'sa_move_spam'}) {
+                  my $appended = undef;
+                  if ($prefs{'sa_spam_destination'} eq $folder) {
+                     $reserved_in_folder=1;
+                  } else {
+                     $appended=append_message_to_folder($messageid, $folderhandle,
+         				\@attr, \$currmessage, $user, $prefs{'sa_spam_destination'});
+                  }
+                  unless ($reserved_in_folder) {
+                     if ($appended>=0) {
+                        $to_be_moved=1;
+                     } else {
+                        $ioerr++;
+                     }
+                  }
+               }
+            }
+            $status->finish(); # cleanup $status object
+         }
+
+         # 4. mark to be moved message as zap
          if ($to_be_moved) {
             $attr[$_STATUS].='Z' if ($attr[$_STATUS]!~/Z/i);
             index_msg_attr(\%FDB, $messageid, @attr);
@@ -662,4 +712,114 @@
 }
 ########## END FILTERMESSAGE2 ####################################
 
+########## SABAYESLEARN ###########################################
+sub sabayeslearn {
+   unless ($config{'enable_spamassassin'} && $config{'sa_enable_bayesian'} && $prefs{'sa_enable'} && $prefs{'sa_use_bayes'}) {
+      return;
+   };
+
+   my ($r_messageids,$folder)=@_;
+
+   # will we go over our quota if we move messages around?
+   if ($quotalimit>0 && $quotausage>$quotalimit && $prefs{'sa_spam_destination'} ne "DELETE" && $prefs{'sa_move_spam'}) {
+      openwebmailerror(__FILE__, __LINE__, "$lang_err{'quotahit_alert'}");
+   }
+
+   # get our folder info
+   my ($folderfile, $folderdb)=get_folderpath_folderdb($user, $folder);
+   if (! -f "$folderfile" ) {
+      openwebmailerror(__FILE__, __LINE__, "$folderfile $lang_err{'doesnt_exist'}");
+   }
+
+   # get our destination folder info
+   my ($dstfile, $dstdb)=get_folderpath_folderdb($user, $prefs{'sa_spam_destination'});
+   if ($prefs{'sa_spam_destination'} ne 'DELETE' && ! -f "$dstfile" ) {
+      open (F,">>$dstfile") or
+         openwebmailerror(__FILE__, __LINE__, "$lang_err{'couldnt_open'} $lang_err{'destination_folder'} $dstfile! ($!)");
+      close(F);
+   }
+
+   # lock our folders for reading and writing
+   ow::filelock::lock("$folderfile", LOCK_EX|LOCK_NB) or openwebmailerror(__FILE__, __LINE__, "$lang_err{'couldnt_lock'} $folderfile!");
+   if ($prefs{'sa_spam_destination'} ne 'DELETE') {
+      ow::filelock::lock($dstfile, LOCK_EX|LOCK_NB) or openwebmailerror(__FILE__, __LINE__, "$lang_err{'couldnt_lock'} $dstfile!");
+   }
+
+   # initialize learner
+   eval "use Mail::SpamAssassin;";
+   if ($@) {
+      $lang_err{'couldnt_load'} =~ s/\@\@\@MODULENAME\@\@\@/'Mail::SpamAssassin'/;
+      openwebmailerror(__FILE__, __LINE__, "$lang_err{'couldnt_load'} !");
+   }
+   my $bayeslearn = Mail::SpamAssassin->new( {   userprefs_filename => dotpath('spamassassin_user_prefs'),
+                                                      userstate_dir => dotpath('webmail'),
+                                                    dont_copy_prefs => 1,
+                                               home_dir_for_helpers => dotpath('webmail') } );
+   $bayeslearn->compile_now(1);
+
+   my $learntype = param('action') eq 'learnspam' ? 1 : undef;
+
+   my $folderhandle=do { local *FH };
+   open ($folderhandle, "+<$folderfile") or openwebmailerror(__FILE__, __LINE__, "$lang_err{'couldnt_open'} $folderfile!");
+   foreach my $messageid (@{$r_messageids}) {
+      my @attr=get_message_attributes($messageid, $folderdb);
+      my $currmessage = '';
+      if ($currmessage eq "") {
+         seek($folderhandle, $attr[$_OFFSET], 0);
+         read($folderhandle, $currmessage, $attr[$_SIZE]);
+      }
+
+      # encapsulate message in a Mail::Audit object
+      my @lines = split (/^/m, $currmessage);
+      my $mail_obj = Mail::SpamAssassin::NoMailAudit->new ('data' => \@lines);
+
+      # learn this mail
+      $bayeslearn->init_learner();
+      $bayeslearn->learn($mail_obj, undef, $learntype, undef);
+      $bayeslearn->finish_learner();
+   }
+   $bayeslearn->rebuild_learner_caches();
+   close($folderhandle);
+
+   # move the spam if requested
+   my $op = $prefs{'sa_spam_destination'} eq 'DELETE' ? 'delete' : 'move';
+   my $counted=0;
+   if ($prefs{'sa_move_spam'} && $learntype) {
+      if ($op eq "delete") {
+         $counted=operate_message_with_ids($op, $r_messageids, $folderfile, $folderdb);
+      } else {
+         $counted=operate_message_with_ids($op, $r_messageids, $folderfile, $folderdb, $dstfile, $dstdb);
+      }
+      $counted=folder_zapmessages($folderfile, $folderdb);
+   }
+
+   # unlock the folders
+   ow::filelock::lock($dstfile, LOCK_UN);
+   ow::filelock::lock($folderfile, LOCK_UN);
+
+   # write the logs
+   if ($counted>0){
+      my $msg;
+      if ( $op eq 'move') {
+         $msg="move message - move $counted learned spam msgs from $folder to $prefs{'sa_spam_destination'} - ids=".join(", ", @{$r_messageids});
+      } else {
+         $msg="delete message - delete $counted learned spam msgs from $folder - ids=".join(", ", @{$r_messageids});
+        # recalc used quota for del if user quotahit
+        if ($quotalimit>0 && $quotausage>$quotalimit) {
+           $quotausage=(ow::quota::get_usage_limit(\%config, $user, $homedir, 1))[2];
+        }
+      }
+      writelog($msg);
+      writehistory($msg);
+   } elsif ($counted==-1) {
+      openwebmailerror(__FILE__, __LINE__, "$lang_err{'inv_msg_op'}");
+   } elsif ($counted==-2) {
+      openwebmailerror(__FILE__, __LINE__, "$lang_err{'couldnt_open'} $folderfile");
+   } elsif ($counted==-3) {
+      openwebmailerror(__FILE__, __LINE__, "$lang_err{'couldnt_open'} $dstfile!");
+   }
+
+   return;
+}
+########## END SABAYESLEARN #######################################
 1;
--- cgi-bin/openwebmail/shares/ow-shared.pl	Tue Apr 13 05:05:49 2004
+++ cgi-bin/openwebmail/shares/ow-shared.pl	Mon Apr 12 01:14:08 2004
@@ -43,6 +44,7 @@
    enable_smartfilter enable_userfilter
    enable_webmail enable_spellcheck enable_calendar enable_webdisk 
    enable_sshterm enable_vdomain
+   enable_spamassassin sa_local_tests_only sa_enable_bayesian
    enable_pop3 pop3_delmail_by_default pop3_delmail_hidden pop3_usessl_by_default 
    authpop3_getmail authpop3_delmail authpop3_usessl
    webdisk_readonly webdisk_lsmailfolder webdisk_lshidden webdisk_lsunixspec webdisk_lssymlink
@@ -61,6 +63,10 @@
    default_abook_defaultfilter
    default_filter_badaddrformat default_filter_fakedsmtp
    default_filter_fakedfrom default_filter_fakedexecontenttype
+   default_sa_enable
+   default_sa_use_bayes default_sa_bayes_auto_learn
+   default_sa_use_blacklists default_sa_use_razor default_sa_use_dcc default_sa_use_pyzor
+   default_sa_move_spam
    default_calendar_showemptyhours default_calendar_reminderforglobal
    default_webdisk_confirmmovecopy default_webdisk_confirmdel
    default_webdisk_confirmcompress
@@ -126,6 +132,9 @@
    reparagraphorigmsg replywithorigmsg backupsentmsg sendcharset
    filter_repeatlimit filter_badaddrformat
    filter_fakedsmtp filter_fakedfrom filter_fakedexecontenttype
+   sa_enable sa_score_threshhold sa_use_bayes sa_bayes_auto_learn
+   sa_use_blacklists sa_use_razor sa_use_dcc sa_use_pyzor
+   sa_move_spam sa_spam_destination
    abook_width abook_height abook_buttonposition
    abook_defaultfilter abook_defaultsearchtype abook_defaultkeyword
    calendar_defaultview calendar_holidaydef
@@ -1601,7 +1617,7 @@
    return(ow::tool::untaint($dotdir)) if ($name eq '/');
 
    return(ow::tool::untaint("$dotdir/$name"))         if ($_is_dotpath{'root'}{$name});
-   return(ow::tool::untaint("$dotdir/webmail/$name")) if ($_is_dotpath{'webmail'}{$name} || $name=~/^filter\.book/);
+   return(ow::tool::untaint("$dotdir/webmail/$name")) if ($_is_dotpath{'webmail'}{$name} || $name=~/^filter\.book/ || $name=~/^spamassassin_user_prefs$/);
    return(ow::tool::untaint("$dotdir/webcal/$name"))  if ($_is_dotpath{'webcal'}{$name});
    return(ow::tool::untaint("$dotdir/webdisk/$name")) if ($_is_dotpath{'webdisk'}{$name});
    return(ow::tool::untaint("$dotdir/pop3/$name"))    if ($_is_dotpath{'pop3'}{$name} || $name=~/^uidl\./);
--- cgi-bin/openwebmail/openwebmail-prefs.pl	Tue Apr 13 13:30:17 2004
+++ cgi-bin/openwebmail/openwebmail-prefs.pl	Tue Apr 13 20:14:49 2004
@@ -964,6 +964,105 @@
             templateblock_disable($html, 'FILTER');
          }
 
+         if ($config{'enable_spamassassin'}) {
+            templateblock_enable($html, 'SPAMASSASSIN');
+
+            $temphtml = checkbox(-name=>'sa_enable',
+                                 -value=>'1',
+                                 -checked=>$prefs{'sa_enable'},
+                                 -label=>'',
+                                 defined($config_raw{'DEFAULT_sa_enable'})?('-disabled'=>'1'):());
+            $html =~ s/\@\@\@SPAMASSASSINENABLE\@\@\@/$temphtml/;
+
+            if ($config{'sa_enable_bayesian'}) {
+               templateblock_enable($html, 'SPAMASSASSINBAYESIAN');
+               $temphtml = checkbox(-name=>'sa_use_bayes',
+                                    -value=>'1',
+                                    -checked=>$prefs{'sa_use_bayes'},
+                                    -label=>'',
+                                    defined($config_raw{'DEFAULT_sa_use_bayes'})?('-disabled'=>'1'):());
+               $html =~ s/\@\@\@SPAMASSASSINUSEBAYES\@\@\@/$temphtml/;
+
+               $temphtml = checkbox(-name=>'sa_bayes_auto_learn',
+                                    -value=>'1',
+                                    -checked=>$prefs{'sa_bayes_auto_learn'},
+                                    -label=>'',
+                                    defined($config_raw{'DEFAULT_sa_bayes_auto_learn'})?('-disabled'=>'1'):());
+               $html =~ s/\@\@\@SPAMASSASSINBAYESAUTOLEARN\@\@\@/$temphtml/;
+            } else {
+               templateblock_disable($html, 'SPAMASSASSINBAYESIAN');
+            }
+
+            if ($config{'sa_local_tests_only'}) {
+               templateblock_disable($html, 'SPAMASSASSINLOCALONLY');
+            } else {
+               templateblock_enable($html, 'SPAMASSASSINLOCALONLY');
+               $temphtml = checkbox(-name=>'sa_use_blacklists',
+                                    -value=>'1',
+                                    -checked=>$prefs{'sa_use_blacklists'},
+                                    -label=>'',
+                                    defined($config_raw{'DEFAULT_sa_use_blacklists'})?('-disabled'=>'1'):());
+               $html =~ s/\@\@\@SPAMASSASSINUSEBLACKLISTS\@\@\@/$temphtml/;
+
+               $temphtml = checkbox(-name=>'sa_use_razor',
+                                    -value=>'1',
+                                    -checked=>$prefs{'sa_use_razor'},
+                                    -label=>'',
+                                    defined($config_raw{'DEFAULT_sa_use_razor'})?('-disabled'=>'1'):());
+               $html =~ s/\@\@\@SPAMASSASSINUSERAZOR\@\@\@/$temphtml/;
+
+               $temphtml = checkbox(-name=>'sa_use_dcc',
+                                    -value=>'1',
+                                    -checked=>$prefs{'sa_use_dcc'},
+                                    -label=>'',
+                                    defined($config_raw{'DEFAULT_sa_use_dcc'})?('-disabled'=>'1'):());
+               $html =~ s/\@\@\@SPAMASSASSINUSEDCC\@\@\@/$temphtml/;
+
+               $temphtml = checkbox(-name=>'sa_use_pyzor',
+                                    -value=>'1',
+                                    -checked=>$prefs{'sa_use_pyzor'},
+                                    -label=>'',
+                                    defined($config_raw{'DEFAULT_sa_use_pyzor'})?('-disabled'=>'1'):());
+               $html =~ s/\@\@\@SPAMASSASSINUSEPYZOR\@\@\@/$temphtml/;
+            }
+
+            $temphtml = checkbox(-name=>'sa_move_spam',
+                                 -value=>'1',
+                                 -checked=>$prefs{'sa_move_spam'},
+                                 -label=>'',
+                                 defined($config_raw{'DEFAULT_sa_move_spam'})?('-disabled'=>'1'):());
+            $html =~ s/\@\@\@SPAMASSASSINMOVESPAM\@\@\@/$temphtml/;
+
+            my (@validfolders, $folderusage, %labels);
+            getfolders(\@validfolders, \$folderusage);
+            foreach (@validfolders, 'DELETE') {
+               if ( defined($lang_folders{$_}) ) {
+                   $labels{$_} = $lang_folders{$_};
+               } else {
+                  $labels{$_} = $_;
+               }
+            }
+            $temphtml = popup_menu(-name=>'sa_spam_destination',
+                                   -values=>[@validfolders, 'DELETE'],
+                                   -default=>$prefs{'sa_spam_destination'} || 'mail-trash',
+                                   -override=>'1',
+                                   -labels=>\%labels,
+                                   defined($config_raw{'DEFAULT_sa_spam_destination'})?('-disabled'=>'1'):());
+            $html =~ s/\@\@\@SPAMASSASSINSPAMDESTINATION\@\@\@/$temphtml/;
+
+            $temphtml = popup_menu(-name=>'sa_score_threshhold',
+                                   -values=>[1..15],
+                                   -labels=>'',
+                                   -default=>$prefs{'sa_score_threshhold'},
+                                   -override=>'1',
+                                   defined($config_raw{'DEFAULT_sa_score_threshhold'})?('-disabled'=>'1'):());
+            $html =~ s/\@\@\@SPAMASSASSINSCORETHRESHHOLD\@\@\@/$temphtml/;
+         } else {
+            templateblock_disable($html, 'SPAMASSASSIN');
+         }
+
+
+
          my @pvalues=(300,320,340,360,380,400,420,440,460,480,500,600,700,800,900,1000);
          my %plabels;
          foreach (@pvalues) {
@@ -1343,9 +1442,18 @@
       showimgaslink 1
       reparagraphorigmsg 1
       backupsentmsg 1
+      filter_badaddrformat 1
       filter_fakedsmtp 1
       filter_fakedfrom 1
       filter_fakedexecontenttype 1
+      sa_enable 1
+      sa_use_bayes 1
+      sa_bayes_auto_learn 1
+      sa_use_blacklists 1
+      sa_use_razor 1
+      sa_use_dcc 1
+      sa_use_pyzor 1
+      sa_move_spam 1
       abook_defaultfilter 1
       calendar_showemptyhours 1
       calendar_reminderforglobal 1
@@ -1449,6 +1557,29 @@
    print SIGNATURE $newprefs{'signature'};
    close (SIGNATURE) or openwebmailerror(__FILE__, __LINE__, "$lang_err{'couldnt_close'} $signaturefile! ($!)");
    chown($uuid, (split(/\s+/,$ugid))[0], $signaturefile) if ($signaturefile eq "$homedir/.signature");
+
+   # save spamassassin_user_prefs
+   if ($config{'enable_spamassassin'}) {
+      my $sa_user_prefs=dotpath('spamassassin_user_prefs');
+      my $sa_configtext = qq|# SpamAssassin config file for version 2.5x\n|.
+                          qq|# generated by $config{'name'} $config{'version'} $config{'releasedate'}\n|.
+                          qq|required_hits   $newprefs{'sa_score_threshhold'}\n|.
+                          qq|use_bayes       $newprefs{'sa_use_bayes'}\n|.
+                          qq|auto_learn      $newprefs{'sa_bayes_auto_learn'}\n|.
+                          qq|skip_rbl_checks $newprefs{'sa_use_blacklists'}\n|.
+                          qq|rbl_timeout     $config{'sa_network_timeout'}\n|.
+                          qq|use_razor2      $newprefs{'sa_use_razor'}\n|.
+                          qq|razor_timeout   $config{'sa_network_timeout'}\n|.
+                          qq|use_dcc         $newprefs{'sa_use_dcc'}\n|.
+                          qq|dcc_timeout     $config{'sa_network_timeout'}\n|.
+                          qq|use_pyzor       $newprefs{'sa_use_pyzor'}\n|.
+                          qq|pyzor_timeout   $config{'sa_network_timeout'}\n|.
+                          qq|clear_headers   1\n|;
+      open (SAPREFS,">$sa_user_prefs") or
+         openwebmailerror(__FILE__, __LINE__, "$lang_err{'couldnt_open'} $sa_user_prefs! ($!)");
+      print SAPREFS $sa_configtext;
+      close (SAPREFS) or openwebmailerror(__FILE__, __LINE__, "$lang_err{'couldnt_close'} $sa_user_prefs! ($!)");
+   }
 
    # save .openwebmailrc
    my $rcfile=dotpath('openwebmailrc');
