diff --git a/modoboa/locale/de/LC_MESSAGES/django.po b/modoboa/locale/de/LC_MESSAGES/django.po
index 806d1ed1c..038c1187b 100644
--- a/modoboa/locale/de/LC_MESSAGES/django.po
+++ b/modoboa/locale/de/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Modoboa-0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-01 10:55+0200\n"
+"POT-Creation-Date: 2012-09-24 21:35+0200\n"
 "PO-Revision-Date: 2012-07-04 21:23+0100\n"
 "Last-Translator: Patrick Ben Koetter <p@state-of-mind.de>\n"
 "Language-Team: DE <p@state-of-mind.de>\n"
@@ -534,9 +534,9 @@ msgid_plural "Accounts deleted"
 msgstr[0] "Konto gelöscht"
 msgstr[1] "Konten gelöscht"
 
-#: admin/views.py:454 admin/views.py:459 extensions/amavis/views.py:213
-#: extensions/amavis/views.py:219 extensions/amavis/views.py:246
-#: extensions/amavis/views.py:250 extensions/amavis/views.py:252
+#: admin/views.py:454 admin/views.py:459 extensions/amavis/views.py:184
+#: extensions/amavis/views.py:190 extensions/amavis/views.py:221
+#: extensions/amavis/views.py:225 extensions/amavis/views.py:227
 #: extensions/stats/views.py:46 extensions/webmail/views.py:32
 #: extensions/webmail/views.py:55 extensions/webmail/views.py:68
 #: extensions/webmail/views.py:80 extensions/webmail/views.py:96
@@ -870,37 +870,41 @@ msgstr ""
 msgid "Quarantine"
 msgstr "Quarantäne"
 
-#: extensions/amavis/__init__.py:151
+#: extensions/amavis/__init__.py:158
 msgid "pending requests"
 msgstr "Offene Anfragen"
 
-#: extensions/amavis/__init__.py:167
+#: extensions/amavis/__init__.py:174
 #, python-format
 msgid "%d pending requests"
 msgstr "%d offene Anfragen"
 
-#: extensions/amavis/__init__.py:178
+#: extensions/amavis/__init__.py:185
 msgid "Content filter"
 msgstr "Inhaltsfilter"
 
+#: extensions/amavis/lib.py:51
+#, fuzzy, python-format
+msgid "Connection to amavis failed: %s"
+msgstr "Verbindung zu IMAP-Server fehlgeschlagen: %s"
+
 #: extensions/amavis/models.py:84
 msgid "Virus filter"
 msgstr "Virusfilter"
 
 #: extensions/amavis/models.py:85 extensions/amavis/models.py:93
-#: extensions/amavis/models.py:101 extensions/amavis/models.py:110
-#: extensions/sievefilters/views.py:265
+#: extensions/amavis/models.py:101 extensions/sievefilters/views.py:265
 msgid "yes"
 msgstr "Ja"
 
 #: extensions/amavis/models.py:86 extensions/amavis/models.py:94
-#: extensions/amavis/models.py:102 extensions/amavis/models.py:111
-#: extensions/sievefilters/views.py:269
+#: extensions/amavis/models.py:102 extensions/sievefilters/views.py:269
 msgid "no"
 msgstr "Nein"
 
 #: extensions/amavis/models.py:87 extensions/amavis/models.py:95
-#: extensions/amavis/models.py:103 extensions/amavis/models.py:112
+#: extensions/amavis/models.py:103
+#: extensions/amavis/templates/amavis/domain_content_filter.html:11
 msgid "default"
 msgstr "Standard"
 
@@ -930,33 +934,36 @@ msgstr ""
 "Unerwünschte Dateien umgehen oder nicht. Geben  Sie, um den Domain-Standard "
 "zu nutzen, keinen individuellen Wert an."
 
-#: extensions/amavis/models.py:109
+#: extensions/amavis/models.py:135
 msgid "Spam marker"
 msgstr "SPAM-Markierung"
 
-#: extensions/amavis/models.py:114
-msgid "Modify spam subject or not. Choose 'default' to use global settings."
+#: extensions/amavis/models.py:137
+#, fuzzy
+msgid ""
+"Modify spam subject using the specified text. Choose 'default' to use global "
+"settings."
 msgstr ""
 "Betreff:-Zeile verändern oder nicht. Geben  Sie, um den Domain-Standard zu "
 "nutzen, keinen individuellen Wert an."
 
-#: extensions/amavis/sql_listing.py:23 extensions/webmail/forms.py:5
+#: extensions/amavis/sql_listing.py:24 extensions/webmail/forms.py:5
 #: extensions/webmail/lib.py:34
 msgid "From"
 msgstr "Von"
 
-#: extensions/amavis/sql_listing.py:24 extensions/sievefilters/forms.py:68
+#: extensions/amavis/sql_listing.py:25 extensions/sievefilters/forms.py:68
 #: extensions/webmail/forms.py:9 extensions/webmail/lib.py:33
-#: extensions/webmail/lib.py:363 templates/common/email_searchbar.html:6
+#: extensions/webmail/lib.py:371 templates/common/email_searchbar.html:6
 msgid "Subject"
 msgstr "Betreff"
 
-#: extensions/amavis/sql_listing.py:25 extensions/webmail/lib.py:35
-#: extensions/webmail/lib.py:365
+#: extensions/amavis/sql_listing.py:26 extensions/webmail/lib.py:35
+#: extensions/webmail/lib.py:373
 msgid "Date"
 msgstr "Datum"
 
-#: extensions/amavis/sql_listing.py:26
+#: extensions/amavis/sql_listing.py:27
 #: extensions/amavis/templatetags/amextras.py:102
 #: extensions/webmail/forms.py:6
 msgid "To"
@@ -966,40 +973,40 @@ msgstr "An"
 msgid "Empty quarantine"
 msgstr "Quarantäne leeren"
 
-#: extensions/amavis/views.py:220
+#: extensions/amavis/views.py:191
 msgid "Message deleted"
 msgstr "Nachricht gelöscht"
 
-#: extensions/amavis/views.py:236
+#: extensions/amavis/views.py:211
 #, python-format
 msgid "%(count)d message deleted successfully"
 msgid_plural "%(count)d messages deleted successfully"
 msgstr[0] "%(count)d Nachricht erfolgreich gelöscht"
 msgstr[1] "%(count)d Nachrichten erfolgreich gelöscht"
 
-#: extensions/amavis/views.py:255
+#: extensions/amavis/views.py:230
 msgid "Request sent"
 msgstr "Anfrage gesendet"
 
-#: extensions/amavis/views.py:261
+#: extensions/amavis/views.py:236
 msgid "Message released"
 msgstr "Nachricht freigegeben"
 
-#: extensions/amavis/views.py:275
+#: extensions/amavis/views.py:257
 #, python-format
 msgid "%(count)d request sent"
 msgid_plural "%(count)d requests sent"
 msgstr[0] "%(count)d Anfrage gesendet"
 msgstr[1] "%(count)d Anfragen gesendet"
 
-#: extensions/amavis/views.py:298
+#: extensions/amavis/views.py:281
 #, python-format
 msgid "%(count)d message released successfully"
 msgid_plural "%(count)d messages released successfully"
 msgstr[0] "%(count)d Nachicht erfolgreich freigegeben"
 msgstr[1] "%(count)d Nachichten erfolgreich freigegeben"
 
-#: extensions/amavis/management/commands/amnotify.py:45
+#: extensions/amavis/management/commands/amnotify.py:46
 msgid "[modoboa] Pending release requests"
 msgstr "[modoboa] Offene Freigabeanfragen"
 
@@ -1683,20 +1690,20 @@ msgstr "Server-Antwort"
 msgid "Cci"
 msgstr "Cci"
 
-#: extensions/webmail/imaputils.py:251
+#: extensions/webmail/imaputils.py:252
 #, python-format
 msgid "Connection to IMAP server failed: %s"
 msgstr "Verbindung zu IMAP-Server fehlgeschlagen: %s"
 
-#: extensions/webmail/lib.py:310
+#: extensions/webmail/lib.py:318
 msgid "wrote:"
 msgstr "schrieb:"
 
-#: extensions/webmail/lib.py:377 extensions/webmail/lib.py:381
+#: extensions/webmail/lib.py:385 extensions/webmail/lib.py:389
 msgid "Original message"
 msgstr "Gesendete Nachrichten"
 
-#: extensions/webmail/lib.py:678
+#: extensions/webmail/lib.py:686
 msgid "Red fields are mandatories"
 msgstr "Rote markierte Felder sind MUSS-Felder"
 
@@ -1895,6 +1902,11 @@ msgstr "Konnte Zugriff nicht gewähren: %s"
 msgid "No entries to display"
 msgstr "Keine Einträge darzustellen"
 
+#: lib/templatetags/libextras.py:110
+#, fuzzy
+msgid "activate"
+msgstr "aktiv"
+
 #: templates/common/email_searchbar.html:5
 msgid "From address"
 msgstr "From:-Adresse"
diff --git a/modoboa/locale/en/LC_MESSAGES/django.po b/modoboa/locale/en/LC_MESSAGES/django.po
index ceef335cf..099181606 100644
--- a/modoboa/locale/en/LC_MESSAGES/django.po
+++ b/modoboa/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-01 10:55+0200\n"
+"POT-Creation-Date: 2012-09-24 21:35+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -504,9 +504,9 @@ msgid_plural "Accounts deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin/views.py:454 admin/views.py:459 extensions/amavis/views.py:213
-#: extensions/amavis/views.py:219 extensions/amavis/views.py:246
-#: extensions/amavis/views.py:250 extensions/amavis/views.py:252
+#: admin/views.py:454 admin/views.py:459 extensions/amavis/views.py:184
+#: extensions/amavis/views.py:190 extensions/amavis/views.py:221
+#: extensions/amavis/views.py:225 extensions/amavis/views.py:227
 #: extensions/stats/views.py:46 extensions/webmail/views.py:32
 #: extensions/webmail/views.py:55 extensions/webmail/views.py:68
 #: extensions/webmail/views.py:80 extensions/webmail/views.py:96
@@ -808,37 +808,41 @@ msgstr ""
 msgid "Quarantine"
 msgstr ""
 
-#: extensions/amavis/__init__.py:151
+#: extensions/amavis/__init__.py:158
 msgid "pending requests"
 msgstr ""
 
-#: extensions/amavis/__init__.py:167
+#: extensions/amavis/__init__.py:174
 #, python-format
 msgid "%d pending requests"
 msgstr ""
 
-#: extensions/amavis/__init__.py:178
+#: extensions/amavis/__init__.py:185
 msgid "Content filter"
 msgstr ""
 
+#: extensions/amavis/lib.py:51
+#, python-format
+msgid "Connection to amavis failed: %s"
+msgstr ""
+
 #: extensions/amavis/models.py:84
 msgid "Virus filter"
 msgstr ""
 
 #: extensions/amavis/models.py:85 extensions/amavis/models.py:93
-#: extensions/amavis/models.py:101 extensions/amavis/models.py:110
-#: extensions/sievefilters/views.py:265
+#: extensions/amavis/models.py:101 extensions/sievefilters/views.py:265
 msgid "yes"
 msgstr ""
 
 #: extensions/amavis/models.py:86 extensions/amavis/models.py:94
-#: extensions/amavis/models.py:102 extensions/amavis/models.py:111
-#: extensions/sievefilters/views.py:269
+#: extensions/amavis/models.py:102 extensions/sievefilters/views.py:269
 msgid "no"
 msgstr ""
 
 #: extensions/amavis/models.py:87 extensions/amavis/models.py:95
-#: extensions/amavis/models.py:103 extensions/amavis/models.py:112
+#: extensions/amavis/models.py:103
+#: extensions/amavis/templates/amavis/domain_content_filter.html:11
 msgid "default"
 msgstr ""
 
@@ -862,31 +866,33 @@ msgstr ""
 msgid "Bypass banned checks or not. Choose 'default' to use global settings."
 msgstr ""
 
-#: extensions/amavis/models.py:109
+#: extensions/amavis/models.py:135
 msgid "Spam marker"
 msgstr ""
 
-#: extensions/amavis/models.py:114
-msgid "Modify spam subject or not. Choose 'default' to use global settings."
+#: extensions/amavis/models.py:137
+msgid ""
+"Modify spam subject using the specified text. Choose 'default' to use global "
+"settings."
 msgstr ""
 
-#: extensions/amavis/sql_listing.py:23 extensions/webmail/forms.py:5
+#: extensions/amavis/sql_listing.py:24 extensions/webmail/forms.py:5
 #: extensions/webmail/lib.py:34
 msgid "From"
 msgstr ""
 
-#: extensions/amavis/sql_listing.py:24 extensions/sievefilters/forms.py:68
+#: extensions/amavis/sql_listing.py:25 extensions/sievefilters/forms.py:68
 #: extensions/webmail/forms.py:9 extensions/webmail/lib.py:33
-#: extensions/webmail/lib.py:363 templates/common/email_searchbar.html:6
+#: extensions/webmail/lib.py:371 templates/common/email_searchbar.html:6
 msgid "Subject"
 msgstr ""
 
-#: extensions/amavis/sql_listing.py:25 extensions/webmail/lib.py:35
-#: extensions/webmail/lib.py:365
+#: extensions/amavis/sql_listing.py:26 extensions/webmail/lib.py:35
+#: extensions/webmail/lib.py:373
 msgid "Date"
 msgstr ""
 
-#: extensions/amavis/sql_listing.py:26
+#: extensions/amavis/sql_listing.py:27
 #: extensions/amavis/templatetags/amextras.py:102
 #: extensions/webmail/forms.py:6
 msgid "To"
@@ -896,40 +902,40 @@ msgstr ""
 msgid "Empty quarantine"
 msgstr ""
 
-#: extensions/amavis/views.py:220
+#: extensions/amavis/views.py:191
 msgid "Message deleted"
 msgstr ""
 
-#: extensions/amavis/views.py:236
+#: extensions/amavis/views.py:211
 #, python-format
 msgid "%(count)d message deleted successfully"
 msgid_plural "%(count)d messages deleted successfully"
 msgstr[0] ""
 msgstr[1] ""
 
-#: extensions/amavis/views.py:255
+#: extensions/amavis/views.py:230
 msgid "Request sent"
 msgstr ""
 
-#: extensions/amavis/views.py:261
+#: extensions/amavis/views.py:236
 msgid "Message released"
 msgstr ""
 
-#: extensions/amavis/views.py:275
+#: extensions/amavis/views.py:257
 #, python-format
 msgid "%(count)d request sent"
 msgid_plural "%(count)d requests sent"
 msgstr[0] ""
 msgstr[1] ""
 
-#: extensions/amavis/views.py:298
+#: extensions/amavis/views.py:281
 #, python-format
 msgid "%(count)d message released successfully"
 msgid_plural "%(count)d messages released successfully"
 msgstr[0] ""
 msgstr[1] ""
 
-#: extensions/amavis/management/commands/amnotify.py:45
+#: extensions/amavis/management/commands/amnotify.py:46
 msgid "[modoboa] Pending release requests"
 msgstr ""
 
@@ -1597,20 +1603,20 @@ msgstr ""
 msgid "Cci"
 msgstr ""
 
-#: extensions/webmail/imaputils.py:251
+#: extensions/webmail/imaputils.py:252
 #, python-format
 msgid "Connection to IMAP server failed: %s"
 msgstr ""
 
-#: extensions/webmail/lib.py:310
+#: extensions/webmail/lib.py:318
 msgid "wrote:"
 msgstr ""
 
-#: extensions/webmail/lib.py:377 extensions/webmail/lib.py:381
+#: extensions/webmail/lib.py:385 extensions/webmail/lib.py:389
 msgid "Original message"
 msgstr ""
 
-#: extensions/webmail/lib.py:678
+#: extensions/webmail/lib.py:686
 msgid "Red fields are mandatories"
 msgstr ""
 
@@ -1809,6 +1815,10 @@ msgstr ""
 msgid "No entries to display"
 msgstr ""
 
+#: lib/templatetags/libextras.py:110
+msgid "activate"
+msgstr ""
+
 #: templates/common/email_searchbar.html:5
 msgid "From address"
 msgstr ""
diff --git a/modoboa/locale/es/LC_MESSAGES/django.po b/modoboa/locale/es/LC_MESSAGES/django.po
index f616683f7..ab3127d7f 100644
--- a/modoboa/locale/es/LC_MESSAGES/django.po
+++ b/modoboa/locale/es/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Modoboa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-01 10:55+0200\n"
+"POT-Creation-Date: 2012-09-24 21:35+0200\n"
 "PO-Revision-Date: 2012-07-09 16:10+0000\n"
 "Last-Translator: Pedro Gracia <lasarux@neuroomante.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -532,9 +532,9 @@ msgid_plural "Accounts deleted"
 msgstr[0] "Cuenta eliminada"
 msgstr[1] "Cuentas eliminadas"
 
-#: admin/views.py:454 admin/views.py:459 extensions/amavis/views.py:213
-#: extensions/amavis/views.py:219 extensions/amavis/views.py:246
-#: extensions/amavis/views.py:250 extensions/amavis/views.py:252
+#: admin/views.py:454 admin/views.py:459 extensions/amavis/views.py:184
+#: extensions/amavis/views.py:190 extensions/amavis/views.py:221
+#: extensions/amavis/views.py:225 extensions/amavis/views.py:227
 #: extensions/stats/views.py:46 extensions/webmail/views.py:32
 #: extensions/webmail/views.py:55 extensions/webmail/views.py:68
 #: extensions/webmail/views.py:80 extensions/webmail/views.py:96
@@ -869,37 +869,41 @@ msgstr "Fija el número máximo de mensajes mostrados en una página"
 msgid "Quarantine"
 msgstr "Cuarentena"
 
-#: extensions/amavis/__init__.py:151
+#: extensions/amavis/__init__.py:158
 msgid "pending requests"
 msgstr "Peticiones pendientes"
 
-#: extensions/amavis/__init__.py:167
+#: extensions/amavis/__init__.py:174
 #, python-format
 msgid "%d pending requests"
 msgstr "%d peticiones pendientes"
 
-#: extensions/amavis/__init__.py:178
+#: extensions/amavis/__init__.py:185
 msgid "Content filter"
 msgstr "Filtro de contenido"
 
+#: extensions/amavis/lib.py:51
+#, fuzzy, python-format
+msgid "Connection to amavis failed: %s"
+msgstr "Falló la conexión con el servidor IMAP: %s"
+
 #: extensions/amavis/models.py:84
 msgid "Virus filter"
 msgstr "Filtro de virus"
 
 #: extensions/amavis/models.py:85 extensions/amavis/models.py:93
-#: extensions/amavis/models.py:101 extensions/amavis/models.py:110
-#: extensions/sievefilters/views.py:265
+#: extensions/amavis/models.py:101 extensions/sievefilters/views.py:265
 msgid "yes"
 msgstr "sí"
 
 #: extensions/amavis/models.py:86 extensions/amavis/models.py:94
-#: extensions/amavis/models.py:102 extensions/amavis/models.py:111
-#: extensions/sievefilters/views.py:269
+#: extensions/amavis/models.py:102 extensions/sievefilters/views.py:269
 msgid "no"
 msgstr "no"
 
 #: extensions/amavis/models.py:87 extensions/amavis/models.py:95
-#: extensions/amavis/models.py:103 extensions/amavis/models.py:112
+#: extensions/amavis/models.py:103
+#: extensions/amavis/templates/amavis/domain_content_filter.html:11
 msgid "default"
 msgstr "Por defecto"
 
@@ -929,33 +933,36 @@ msgstr ""
 "Saltarse la comprobación de expulsados o no. Elija 'Por defecto' para usar "
 "la configuración global."
 
-#: extensions/amavis/models.py:109
+#: extensions/amavis/models.py:135
 msgid "Spam marker"
 msgstr "Marcador de spam"
 
-#: extensions/amavis/models.py:114
-msgid "Modify spam subject or not. Choose 'default' to use global settings."
+#: extensions/amavis/models.py:137
+#, fuzzy
+msgid ""
+"Modify spam subject using the specified text. Choose 'default' to use global "
+"settings."
 msgstr ""
 "Modificar el asunto de spam o no. Elija 'Por defecto' para usar la "
 "configuración global."
 
-#: extensions/amavis/sql_listing.py:23 extensions/webmail/forms.py:5
+#: extensions/amavis/sql_listing.py:24 extensions/webmail/forms.py:5
 #: extensions/webmail/lib.py:34
 msgid "From"
 msgstr "Desde"
 
-#: extensions/amavis/sql_listing.py:24 extensions/sievefilters/forms.py:68
+#: extensions/amavis/sql_listing.py:25 extensions/sievefilters/forms.py:68
 #: extensions/webmail/forms.py:9 extensions/webmail/lib.py:33
-#: extensions/webmail/lib.py:363 templates/common/email_searchbar.html:6
+#: extensions/webmail/lib.py:371 templates/common/email_searchbar.html:6
 msgid "Subject"
 msgstr "Tema"
 
-#: extensions/amavis/sql_listing.py:25 extensions/webmail/lib.py:35
-#: extensions/webmail/lib.py:365
+#: extensions/amavis/sql_listing.py:26 extensions/webmail/lib.py:35
+#: extensions/webmail/lib.py:373
 msgid "Date"
 msgstr "Fecha"
 
-#: extensions/amavis/sql_listing.py:26
+#: extensions/amavis/sql_listing.py:27
 #: extensions/amavis/templatetags/amextras.py:102
 #: extensions/webmail/forms.py:6
 msgid "To"
@@ -965,40 +972,40 @@ msgstr "A"
 msgid "Empty quarantine"
 msgstr "Vaciar cuarentena"
 
-#: extensions/amavis/views.py:220
+#: extensions/amavis/views.py:191
 msgid "Message deleted"
 msgstr "Mensaje eliminado"
 
-#: extensions/amavis/views.py:236
+#: extensions/amavis/views.py:211
 #, python-format
 msgid "%(count)d message deleted successfully"
 msgid_plural "%(count)d messages deleted successfully"
 msgstr[0] "%(count)d mensaje eliminado correctamente"
 msgstr[1] "%(count)d mensajes eliminados correctamente"
 
-#: extensions/amavis/views.py:255
+#: extensions/amavis/views.py:230
 msgid "Request sent"
 msgstr "Petición enviada"
 
-#: extensions/amavis/views.py:261
+#: extensions/amavis/views.py:236
 msgid "Message released"
 msgstr "Mensaje publicado"
 
-#: extensions/amavis/views.py:275
+#: extensions/amavis/views.py:257
 #, python-format
 msgid "%(count)d request sent"
 msgid_plural "%(count)d requests sent"
 msgstr[0] "%(count)d petición enviada"
 msgstr[1] "%(count)d peticiones enviadas"
 
-#: extensions/amavis/views.py:298
+#: extensions/amavis/views.py:281
 #, python-format
 msgid "%(count)d message released successfully"
 msgid_plural "%(count)d messages released successfully"
 msgstr[0] "%(count)d mensaje publicado correctamente"
 msgstr[1] "%(count)d mensajes publicados correctamente"
 
-#: extensions/amavis/management/commands/amnotify.py:45
+#: extensions/amavis/management/commands/amnotify.py:46
 msgid "[modoboa] Pending release requests"
 msgstr "[modoboa] Pendiente de publicar las peticiones"
 
@@ -1675,20 +1682,20 @@ msgstr "Respuesta del servidor"
 msgid "Cci"
 msgstr "Cco"
 
-#: extensions/webmail/imaputils.py:251
+#: extensions/webmail/imaputils.py:252
 #, python-format
 msgid "Connection to IMAP server failed: %s"
 msgstr "Falló la conexión con el servidor IMAP: %s"
 
-#: extensions/webmail/lib.py:310
+#: extensions/webmail/lib.py:318
 msgid "wrote:"
 msgstr "escribió:"
 
-#: extensions/webmail/lib.py:377 extensions/webmail/lib.py:381
+#: extensions/webmail/lib.py:385 extensions/webmail/lib.py:389
 msgid "Original message"
 msgstr "Mensaje original"
 
-#: extensions/webmail/lib.py:678
+#: extensions/webmail/lib.py:686
 msgid "Red fields are mandatories"
 msgstr "Los campos en rojo son obligatorios"
 
@@ -1887,6 +1894,11 @@ msgstr "Fallo al dar acceso (%s)"
 msgid "No entries to display"
 msgstr "No hay entradas que mostrar"
 
+#: lib/templatetags/libextras.py:110
+#, fuzzy
+msgid "activate"
+msgstr "activo"
+
 #: templates/common/email_searchbar.html:5
 msgid "From address"
 msgstr "De la dirección"
diff --git a/modoboa/locale/fr/LC_MESSAGES/django.po b/modoboa/locale/fr/LC_MESSAGES/django.po
index 9ae3debda..4215c4d90 100644
--- a/modoboa/locale/fr/LC_MESSAGES/django.po
+++ b/modoboa/locale/fr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: modoboa-0.9.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-01 10:55+0200\n"
+"POT-Creation-Date: 2012-09-24 21:35+0200\n"
 "PO-Revision-Date: 2011-01-07 10:00+100\n"
 "Last-Translator: Antoine Nguyen <tonio@ngyn.org>\n"
 "Language-Team: FR <tonio@ngyn.org>\n"
@@ -113,8 +113,8 @@ msgid ""
 "The distribution list address. Use the '*' character to create a 'catchall' "
 "address (ex: *@domain.tld)."
 msgstr ""
-"L'adresse de la liste de distribution. Utiliser le caractère '*' pour créer une adresse 'attrape tout' "
-"(ex: *@domain.tld)."
+"L'adresse de la liste de distribution. Utiliser le caractère '*' pour créer "
+"une adresse 'attrape tout' (ex: *@domain.tld)."
 
 #: admin/forms.py:136
 msgid "Recipients"
@@ -163,8 +163,8 @@ msgid ""
 "A valid e-mail address. Use the '*' character to create a 'catchall' address "
 "(ex: *@domain.tld)."
 msgstr ""
-"Une adresse email valide. Utiliser le caractère '*' pour créer une adresse 'attrape tout' "
-"(ex: *@domain.tld)."
+"Une adresse email valide. Utiliser le caractère '*' pour créer une adresse "
+"'attrape tout' (ex: *@domain.tld)."
 
 #: admin/forms.py:267 admin/forms.py:296 extensions/sievefilters/forms.py:70
 msgid "Recipient"
@@ -258,8 +258,8 @@ msgid ""
 "*@domain.tld)."
 msgstr ""
 "Alias de cette boite. Indiquer seulement une adresse par champ, appuyer sur "
-"ENTREE pour ajouter un nouveau champ. Utiliser le caractère '*' pour créer une adresse 'attrape tout' "
-"(ex: *@domain.tld)."
+"ENTREE pour ajouter un nouveau champ. Utiliser le caractère '*' pour créer "
+"une adresse 'attrape tout' (ex: *@domain.tld)."
 
 #: admin/forms.py:505
 msgid "Failed to rename mailbox, check permissions"
@@ -530,9 +530,9 @@ msgid_plural "Accounts deleted"
 msgstr[0] "Compte supprimé"
 msgstr[1] "Comptes supprimés"
 
-#: admin/views.py:454 admin/views.py:459 extensions/amavis/views.py:213
-#: extensions/amavis/views.py:219 extensions/amavis/views.py:246
-#: extensions/amavis/views.py:250 extensions/amavis/views.py:252
+#: admin/views.py:454 admin/views.py:459 extensions/amavis/views.py:184
+#: extensions/amavis/views.py:190 extensions/amavis/views.py:221
+#: extensions/amavis/views.py:225 extensions/amavis/views.py:227
 #: extensions/stats/views.py:46 extensions/webmail/views.py:32
 #: extensions/webmail/views.py:55 extensions/webmail/views.py:68
 #: extensions/webmail/views.py:80 extensions/webmail/views.py:96
@@ -863,37 +863,41 @@ msgstr "Définit le nombre maximal de messages affichés dans une page"
 msgid "Quarantine"
 msgstr "Quarantaine"
 
-#: extensions/amavis/__init__.py:151
+#: extensions/amavis/__init__.py:158
 msgid "pending requests"
 msgstr "requêtes en attente"
 
-#: extensions/amavis/__init__.py:167
+#: extensions/amavis/__init__.py:174
 #, python-format
 msgid "%d pending requests"
 msgstr "%d requêtes en attente"
 
-#: extensions/amavis/__init__.py:178
+#: extensions/amavis/__init__.py:185
 msgid "Content filter"
 msgstr "Filtrage de contenu"
 
+#: extensions/amavis/lib.py:51
+#, python-format
+msgid "Connection to amavis failed: %s"
+msgstr "La connexion avec amavis a échoué : %s"
+
 #: extensions/amavis/models.py:84
 msgid "Virus filter"
 msgstr "Filtrage des virus"
 
 #: extensions/amavis/models.py:85 extensions/amavis/models.py:93
-#: extensions/amavis/models.py:101 extensions/amavis/models.py:110
-#: extensions/sievefilters/views.py:265
+#: extensions/amavis/models.py:101 extensions/sievefilters/views.py:265
 msgid "yes"
 msgstr "oui"
 
 #: extensions/amavis/models.py:86 extensions/amavis/models.py:94
-#: extensions/amavis/models.py:102 extensions/amavis/models.py:111
-#: extensions/sievefilters/views.py:269
+#: extensions/amavis/models.py:102 extensions/sievefilters/views.py:269
 msgid "no"
 msgstr "non"
 
 #: extensions/amavis/models.py:87 extensions/amavis/models.py:95
-#: extensions/amavis/models.py:103 extensions/amavis/models.py:112
+#: extensions/amavis/models.py:103
+#: extensions/amavis/templates/amavis/domain_content_filter.html:11
 msgid "default"
 msgstr "défaut"
 
@@ -923,33 +927,35 @@ msgstr ""
 "Désactiver le filtrage des messages bannis ou non. Choisir 'défaut' pour "
 "utiliser les paramètres globaux."
 
-#: extensions/amavis/models.py:109
+#: extensions/amavis/models.py:135
 msgid "Spam marker"
 msgstr "Marquage du spam"
 
-#: extensions/amavis/models.py:114
-msgid "Modify spam subject or not. Choose 'default' to use global settings."
+#: extensions/amavis/models.py:137
+msgid ""
+"Modify spam subject using the specified text. Choose 'default' to use global "
+"settings."
 msgstr ""
-"Modifier le sujet du spam ou non. Choisir 'défaut' pour utiliser les "
+"Modifier le sujet du spam en utilisant le texte spécifié. Choisir 'défaut' pour utiliser les "
 "paramètres globaux."
 
-#: extensions/amavis/sql_listing.py:23 extensions/webmail/forms.py:5
+#: extensions/amavis/sql_listing.py:24 extensions/webmail/forms.py:5
 #: extensions/webmail/lib.py:34
 msgid "From"
 msgstr "De"
 
-#: extensions/amavis/sql_listing.py:24 extensions/sievefilters/forms.py:68
+#: extensions/amavis/sql_listing.py:25 extensions/sievefilters/forms.py:68
 #: extensions/webmail/forms.py:9 extensions/webmail/lib.py:33
-#: extensions/webmail/lib.py:363 templates/common/email_searchbar.html:6
+#: extensions/webmail/lib.py:371 templates/common/email_searchbar.html:6
 msgid "Subject"
 msgstr "Sujet"
 
-#: extensions/amavis/sql_listing.py:25 extensions/webmail/lib.py:35
-#: extensions/webmail/lib.py:365
+#: extensions/amavis/sql_listing.py:26 extensions/webmail/lib.py:35
+#: extensions/webmail/lib.py:373
 msgid "Date"
 msgstr "Date"
 
-#: extensions/amavis/sql_listing.py:26
+#: extensions/amavis/sql_listing.py:27
 #: extensions/amavis/templatetags/amextras.py:102
 #: extensions/webmail/forms.py:6
 msgid "To"
@@ -959,40 +965,40 @@ msgstr "A"
 msgid "Empty quarantine"
 msgstr "Quarantaine vide"
 
-#: extensions/amavis/views.py:220
+#: extensions/amavis/views.py:191
 msgid "Message deleted"
 msgstr "Message supprimé"
 
-#: extensions/amavis/views.py:236
+#: extensions/amavis/views.py:211
 #, python-format
 msgid "%(count)d message deleted successfully"
 msgid_plural "%(count)d messages deleted successfully"
 msgstr[0] "%(count)d message supprimé correctement"
 msgstr[1] "%(count)d messages supprimés correctement"
 
-#: extensions/amavis/views.py:255
+#: extensions/amavis/views.py:230
 msgid "Request sent"
 msgstr "Requête envoyée"
 
-#: extensions/amavis/views.py:261
+#: extensions/amavis/views.py:236
 msgid "Message released"
 msgstr "Message relâché"
 
-#: extensions/amavis/views.py:275
+#: extensions/amavis/views.py:257
 #, python-format
 msgid "%(count)d request sent"
 msgid_plural "%(count)d requests sent"
 msgstr[0] "%(count)d requête envoyée"
 msgstr[1] "%(count)d requêtes envoyées"
 
-#: extensions/amavis/views.py:298
+#: extensions/amavis/views.py:281
 #, python-format
 msgid "%(count)d message released successfully"
 msgid_plural "%(count)d messages released successfully"
 msgstr[0] "%(count)d message relâché correctement"
 msgstr[1] "%(count)d messages relâchés correctement"
 
-#: extensions/amavis/management/commands/amnotify.py:45
+#: extensions/amavis/management/commands/amnotify.py:46
 msgid "[modoboa] Pending release requests"
 msgstr "[modoboa] requêtes de libération en attente"
 
@@ -1672,20 +1678,20 @@ msgstr "Réponse du serveur"
 msgid "Cci"
 msgstr "Cci"
 
-#: extensions/webmail/imaputils.py:251
+#: extensions/webmail/imaputils.py:252
 #, python-format
 msgid "Connection to IMAP server failed: %s"
 msgstr "La connexion au serveur IMAP a échoué : %s"
 
-#: extensions/webmail/lib.py:310
+#: extensions/webmail/lib.py:318
 msgid "wrote:"
 msgstr "a écrit :"
 
-#: extensions/webmail/lib.py:377 extensions/webmail/lib.py:381
+#: extensions/webmail/lib.py:385 extensions/webmail/lib.py:389
 msgid "Original message"
 msgstr "Message original"
 
-#: extensions/webmail/lib.py:678
+#: extensions/webmail/lib.py:686
 msgid "Red fields are mandatories"
 msgstr "Les champs rouges sont obligatoires"
 
@@ -1884,6 +1890,10 @@ msgstr "Impossible de donner l'accès : %s"
 msgid "No entries to display"
 msgstr "Aucune entrée à afficher"
 
+#: lib/templatetags/libextras.py:110
+msgid "activate"
+msgstr "activer"
+
 #: templates/common/email_searchbar.html:5
 msgid "From address"
 msgstr "Emetteur"
diff --git a/modoboa/locale/pt_PT/LC_MESSAGES/django.po b/modoboa/locale/pt_PT/LC_MESSAGES/django.po
index 2a9960b45..1917cc5c7 100644
--- a/modoboa/locale/pt_PT/LC_MESSAGES/django.po
+++ b/modoboa/locale/pt_PT/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Modoboa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-01 10:55+0200\n"
+"POT-Creation-Date: 2012-09-24 21:35+0200\n"
 "PO-Revision-Date: 2012-07-09 00:36+0000\n"
 "Last-Translator: Sandra Ribeiro <sandrarib@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -534,9 +534,9 @@ msgid_plural "Accounts deleted"
 msgstr[0] "Conta eliminada"
 msgstr[1] "Contas eliminadas"
 
-#: admin/views.py:454 admin/views.py:459 extensions/amavis/views.py:213
-#: extensions/amavis/views.py:219 extensions/amavis/views.py:246
-#: extensions/amavis/views.py:250 extensions/amavis/views.py:252
+#: admin/views.py:454 admin/views.py:459 extensions/amavis/views.py:184
+#: extensions/amavis/views.py:190 extensions/amavis/views.py:221
+#: extensions/amavis/views.py:225 extensions/amavis/views.py:227
 #: extensions/stats/views.py:46 extensions/webmail/views.py:32
 #: extensions/webmail/views.py:55 extensions/webmail/views.py:68
 #: extensions/webmail/views.py:80 extensions/webmail/views.py:96
@@ -866,37 +866,41 @@ msgstr "Define o número máximo de mensagens a mostrar por página"
 msgid "Quarantine"
 msgstr "Quarentena"
 
-#: extensions/amavis/__init__.py:151
+#: extensions/amavis/__init__.py:158
 msgid "pending requests"
 msgstr "pedidos pendentes"
 
-#: extensions/amavis/__init__.py:167
+#: extensions/amavis/__init__.py:174
 #, python-format
 msgid "%d pending requests"
 msgstr "%d pedidos pendentes"
 
-#: extensions/amavis/__init__.py:178
+#: extensions/amavis/__init__.py:185
 msgid "Content filter"
 msgstr "Filtro de conteúdo"
 
+#: extensions/amavis/lib.py:51
+#, fuzzy, python-format
+msgid "Connection to amavis failed: %s"
+msgstr "A ligação ao servidor IMAP falhou: %s"
+
 #: extensions/amavis/models.py:84
 msgid "Virus filter"
 msgstr "Filtro de vírus"
 
 #: extensions/amavis/models.py:85 extensions/amavis/models.py:93
-#: extensions/amavis/models.py:101 extensions/amavis/models.py:110
-#: extensions/sievefilters/views.py:265
+#: extensions/amavis/models.py:101 extensions/sievefilters/views.py:265
 msgid "yes"
 msgstr "sim"
 
 #: extensions/amavis/models.py:86 extensions/amavis/models.py:94
-#: extensions/amavis/models.py:102 extensions/amavis/models.py:111
-#: extensions/sievefilters/views.py:269
+#: extensions/amavis/models.py:102 extensions/sievefilters/views.py:269
 msgid "no"
 msgstr "não"
 
 #: extensions/amavis/models.py:87 extensions/amavis/models.py:95
-#: extensions/amavis/models.py:103 extensions/amavis/models.py:112
+#: extensions/amavis/models.py:103
+#: extensions/amavis/templates/amavis/domain_content_filter.html:11
 msgid "default"
 msgstr "predifinido"
 
@@ -926,33 +930,36 @@ msgstr ""
 "Ignorar a verificação de ficheiros proibidos. Escolher 'predefinido' para "
 "utilizar as definições gerais."
 
-#: extensions/amavis/models.py:109
+#: extensions/amavis/models.py:135
 msgid "Spam marker"
 msgstr "Marcador spam"
 
-#: extensions/amavis/models.py:114
-msgid "Modify spam subject or not. Choose 'default' to use global settings."
+#: extensions/amavis/models.py:137
+#, fuzzy
+msgid ""
+"Modify spam subject using the specified text. Choose 'default' to use global "
+"settings."
 msgstr ""
 "Modificar o assunto da mensagem ou não. Escolher 'predefinido' para utilizar "
 "as definições gerais."
 
-#: extensions/amavis/sql_listing.py:23 extensions/webmail/forms.py:5
+#: extensions/amavis/sql_listing.py:24 extensions/webmail/forms.py:5
 #: extensions/webmail/lib.py:34
 msgid "From"
 msgstr "De"
 
-#: extensions/amavis/sql_listing.py:24 extensions/sievefilters/forms.py:68
+#: extensions/amavis/sql_listing.py:25 extensions/sievefilters/forms.py:68
 #: extensions/webmail/forms.py:9 extensions/webmail/lib.py:33
-#: extensions/webmail/lib.py:363 templates/common/email_searchbar.html:6
+#: extensions/webmail/lib.py:371 templates/common/email_searchbar.html:6
 msgid "Subject"
 msgstr "Assunto"
 
-#: extensions/amavis/sql_listing.py:25 extensions/webmail/lib.py:35
-#: extensions/webmail/lib.py:365
+#: extensions/amavis/sql_listing.py:26 extensions/webmail/lib.py:35
+#: extensions/webmail/lib.py:373
 msgid "Date"
 msgstr "Data"
 
-#: extensions/amavis/sql_listing.py:26
+#: extensions/amavis/sql_listing.py:27
 #: extensions/amavis/templatetags/amextras.py:102
 #: extensions/webmail/forms.py:6
 msgid "To"
@@ -962,40 +969,40 @@ msgstr "Para"
 msgid "Empty quarantine"
 msgstr "Quarentena vazia"
 
-#: extensions/amavis/views.py:220
+#: extensions/amavis/views.py:191
 msgid "Message deleted"
 msgstr "Mensagem apagada"
 
-#: extensions/amavis/views.py:236
+#: extensions/amavis/views.py:211
 #, python-format
 msgid "%(count)d message deleted successfully"
 msgid_plural "%(count)d messages deleted successfully"
 msgstr[0] "%(count)d mensagem eliminada com sucesso"
 msgstr[1] "%(count)d mensagens eliminadas com sucesso"
 
-#: extensions/amavis/views.py:255
+#: extensions/amavis/views.py:230
 msgid "Request sent"
 msgstr "Pedido enviado"
 
-#: extensions/amavis/views.py:261
+#: extensions/amavis/views.py:236
 msgid "Message released"
 msgstr "Mensagem libertada"
 
-#: extensions/amavis/views.py:275
+#: extensions/amavis/views.py:257
 #, python-format
 msgid "%(count)d request sent"
 msgid_plural "%(count)d requests sent"
 msgstr[0] "%(count)d pedido enviado"
 msgstr[1] "%(count)d pedidos enviados"
 
-#: extensions/amavis/views.py:298
+#: extensions/amavis/views.py:281
 #, python-format
 msgid "%(count)d message released successfully"
 msgid_plural "%(count)d messages released successfully"
 msgstr[0] "%(count)d mensagem libertada com sucesso"
 msgstr[1] "%(count)d mensagens libertadas com sucesso"
 
-#: extensions/amavis/management/commands/amnotify.py:45
+#: extensions/amavis/management/commands/amnotify.py:46
 msgid "[modoboa] Pending release requests"
 msgstr "[modoboa] Pedidos de libertação pendentes"
 
@@ -1674,20 +1681,20 @@ msgstr "Resposta do servidor"
 msgid "Cci"
 msgstr "Cci"
 
-#: extensions/webmail/imaputils.py:251
+#: extensions/webmail/imaputils.py:252
 #, python-format
 msgid "Connection to IMAP server failed: %s"
 msgstr "A ligação ao servidor IMAP falhou: %s"
 
-#: extensions/webmail/lib.py:310
+#: extensions/webmail/lib.py:318
 msgid "wrote:"
 msgstr "escreveu:"
 
-#: extensions/webmail/lib.py:377 extensions/webmail/lib.py:381
+#: extensions/webmail/lib.py:385 extensions/webmail/lib.py:389
 msgid "Original message"
 msgstr "Mensagem original"
 
-#: extensions/webmail/lib.py:678
+#: extensions/webmail/lib.py:686
 msgid "Red fields are mandatories"
 msgstr "Os campos a vermelho são de preenchimento obrigatório"
 
@@ -1886,6 +1893,11 @@ msgstr "Falha ao conceder acesso (%s)"
 msgid "No entries to display"
 msgstr "Não há dados para apresentar"
 
+#: lib/templatetags/libextras.py:110
+#, fuzzy
+msgid "activate"
+msgstr "ativo"
+
 #: templates/common/email_searchbar.html:5
 msgid "From address"
 msgstr "Do endereço"