diff --git a/modoboa/admin/models.py b/modoboa/admin/models.py
index d6dd75645..c71dc60a1 100644
--- a/modoboa/admin/models.py
+++ b/modoboa/admin/models.py
@@ -1291,5 +1291,5 @@ def post_revision_commit(sender, **kwargs):
             "object": unicode(version.content_type).capitalize(), 
             "name": version.object_repr, "action": action,
             "user": kwargs["revision"].user.username
-        )
+        }
         getattr(logger, level)(message)
diff --git a/modoboa/core/templates/settings.py b/modoboa/core/templates/settings.py
index 46c5fcf3f..d8e1ed3a6 100644
--- a/modoboa/core/templates/settings.py
+++ b/modoboa/core/templates/settings.py
@@ -170,7 +170,7 @@ INSTALLED_APPS += MODOBOA_APPS
 
 AUTH_USER_MODEL = 'admin.User'
 
-#CUSTOM_LOGO = os.path.join(MEDIA_URL, "custom_logo.png")
+#MODOBOA_CUSTOM_LOGO = os.path.join(MEDIA_URL, "custom_logo.png")
 
 AUTHENTICATION_BACKENDS = (
     'modoboa.lib.authbackends.SimpleBackend',
diff --git a/modoboa/extensions/amavis/app_settings.py b/modoboa/extensions/amavis/app_settings.py
index 27f170e66..9d933476c 100644
--- a/modoboa/extensions/amavis/app_settings.py
+++ b/modoboa/extensions/amavis/app_settings.py
@@ -8,6 +8,8 @@ from modoboa.lib.formutils import SeparatorField, YesNoField, InlineRadioSelect
 class ParametersForm(AdminParametersForm):
     app = "amavis"
 
+    qsettings_sep = SeparatorField(label=_("Quarantine settings"))
+
     max_messages_age = forms.IntegerField(
         label=_("Maximum message age"),
         initial=14,
@@ -82,6 +84,8 @@ class ParametersForm(AdminParametersForm):
 class UserSettings(UserParametersForm):
     app = "amavis"
 
+    dsep = SeparatorField(label=_("Display"))
+
     messages_per_page = forms.IntegerField(
         initial=40,
         label=_("Number of displayed emails per page"),
diff --git a/modoboa/extensions/postfix_autoreply/app_settings.py b/modoboa/extensions/postfix_autoreply/app_settings.py
index ee5eeb324..1aec411a4 100644
--- a/modoboa/extensions/postfix_autoreply/app_settings.py
+++ b/modoboa/extensions/postfix_autoreply/app_settings.py
@@ -2,11 +2,14 @@
 from django.utils.translation import ugettext_lazy
 from django import forms
 from modoboa.lib.parameters import AdminParametersForm
+from modoboa.lib.formutils import SeparatorField
 
 
 class ParametersForm(AdminParametersForm):
     app = "postfix_autoreply"
 
+    general_sep = SeparatorField(label=ugettext_lazy("General"))
+
     autoreplies_timeout = forms.IntegerField(
         label=ugettext_lazy("Automatic reply timeout"),
         initial=86400,
diff --git a/modoboa/extensions/sievefilters/app_settings.py b/modoboa/extensions/sievefilters/app_settings.py
index 443af6285..9fb60c365 100644
--- a/modoboa/extensions/sievefilters/app_settings.py
+++ b/modoboa/extensions/sievefilters/app_settings.py
@@ -47,6 +47,8 @@ class ParametersForm(AdminParametersForm):
 class UserSettings(UserParametersForm):
     app = "sievefilters"
 
+    sep1 = SeparatorField(label=_("General"))
+
     editor_mode = forms.ChoiceField(
         initial="gui",
         label=_("Editor mode"),
diff --git a/modoboa/extensions/stats/app_settings.py b/modoboa/extensions/stats/app_settings.py
index bbb195b8b..8020e7299 100644
--- a/modoboa/extensions/stats/app_settings.py
+++ b/modoboa/extensions/stats/app_settings.py
@@ -2,11 +2,14 @@
 from django.utils.translation import ugettext_lazy
 from django import forms
 from modoboa.lib.parameters import AdminParametersForm
+from modoboa.lib.formutils import SeparatorField
 
 
 class ParametersForm(AdminParametersForm):
     app = "stats"
 
+    general_sep = SeparatorField(label=ugettext_lazy("General"))
+
     logfile = forms.CharField(
         label=ugettext_lazy("Path to the log file"),
         initial="/var/log/mail.log",
diff --git a/modoboa/locale/de/LC_MESSAGES/django.po b/modoboa/locale/de/LC_MESSAGES/django.po
index f854421e2..308248210 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: 2013-05-22 17:38+0200\n"
+"POT-Creation-Date: 2013-05-24 10:10+0200\n"
 "PO-Revision-Date: 2013-02-04 12:01+0100\n"
 "Last-Translator: Patrick Ben Koetter <p@sys4.de>\n"
 "Language-Team: DE <p@state-of-mind.de>\n"
@@ -30,7 +30,10 @@ msgid "Web based console to manage domains, accounts and aliases"
 msgstr ""
 
 #: admin/__init__.py:16 admin/forms.py:179 admin/forms.py:614
-#: admin/views.py:93 admin/views.py:441 extensions/webmail/app_settings.py:11
+#: admin/views.py:93 admin/views.py:441
+#: extensions/postfix_autoreply/app_settings.py:11
+#: extensions/sievefilters/app_settings.py:50
+#: extensions/stats/app_settings.py:11 extensions/webmail/app_settings.py:11
 #: userprefs/__init__.py:15
 msgid "General"
 msgstr "Grundsätzlich"
@@ -1233,106 +1236,117 @@ msgstr "%d offene Anfragen"
 msgid "Content filter"
 msgstr "Inhaltsfilter"
 
-#: extensions/amavis/app_settings.py:12
+#: extensions/amavis/app_settings.py:11
+#, fuzzy
+msgid "Quarantine settings"
+msgstr "Quarantäne"
+
+#: extensions/amavis/app_settings.py:14
 #, fuzzy
 msgid "Maximum message age"
 msgstr "Markiere Nachrichten"
 
-#: extensions/amavis/app_settings.py:14
+#: extensions/amavis/app_settings.py:16
 msgid "Quarantine messages maximum age (in days) before deletion"
 msgstr ""
 "Maximales Alter (in Tagen) von Nachrichten in der Quarantäne bevor sie "
 "gelöscht werden"
 
-#: extensions/amavis/app_settings.py:17
+#: extensions/amavis/app_settings.py:19
 #, fuzzy
 msgid "Messages releasing"
 msgstr "Nachricht freigegeben"
 
-#: extensions/amavis/app_settings.py:20
+#: extensions/amavis/app_settings.py:22
 #, fuzzy
 msgid "Remove released messages"
 msgstr "Empfangene Nachrichten"
 
-#: extensions/amavis/app_settings.py:22
+#: extensions/amavis/app_settings.py:24
 msgid "Remove messages marked as released while cleaning up the database"
 msgstr "Freigegebene Nachrichten löschen wenn Datenbank bereinigt wird"
 
-#: extensions/amavis/app_settings.py:26
+#: extensions/amavis/app_settings.py:28
 msgid "Amavis connection mode"
 msgstr ""
 
-#: extensions/amavis/app_settings.py:29
+#: extensions/amavis/app_settings.py:31
 msgid "Mode used to access the PDP server"
 msgstr "Modus für Zugriff auf den PDP-Server"
 
-#: extensions/amavis/app_settings.py:34
+#: extensions/amavis/app_settings.py:36
 #, fuzzy
 msgid "PDP server address"
 msgstr "PDP-Server addresse (im inet-Modus)"
 
-#: extensions/amavis/app_settings.py:36
+#: extensions/amavis/app_settings.py:38
 msgid "PDP server address (if inet mode)"
 msgstr "PDP-Server addresse (im inet-Modus)"
 
-#: extensions/amavis/app_settings.py:40
+#: extensions/amavis/app_settings.py:42
 #, fuzzy
 msgid "PDP server port"
 msgstr "PDP-Server port (im inet-Modus)"
 
-#: extensions/amavis/app_settings.py:42
+#: extensions/amavis/app_settings.py:44
 msgid "PDP server port (if inet mode)"
 msgstr "PDP-Server port (im inet-Modus)"
 
-#: extensions/amavis/app_settings.py:46
+#: extensions/amavis/app_settings.py:48
 msgid "PDP server socket"
 msgstr ""
 
-#: extensions/amavis/app_settings.py:48
+#: extensions/amavis/app_settings.py:50
 msgid "Path to the PDP server socket (if unix mode)"
 msgstr "Pfad zum PDP-Server Socket (im UNIX-Modus)"
 
-#: extensions/amavis/app_settings.py:52
+#: extensions/amavis/app_settings.py:54
 msgid "Check requests interval"
 msgstr ""
 
-#: extensions/amavis/app_settings.py:54
+#: extensions/amavis/app_settings.py:56
 msgid "Interval between two release requests checks"
 msgstr "Prüf-Intervall nach neuen Quarantäne-Release-Anfragen"
 
-#: extensions/amavis/app_settings.py:58
+#: extensions/amavis/app_settings.py:60
 #, fuzzy
 msgid "Allow direct release"
 msgstr "Anwender dürfen Nachrichten in Quarantäne selber freigeben"
 
-#: extensions/amavis/app_settings.py:60
+#: extensions/amavis/app_settings.py:62
 msgid "Allow users to directly release their messages"
 msgstr "Anwender dürfen Nachrichten in Quarantäne selber freigeben"
 
-#: extensions/amavis/app_settings.py:64
+#: extensions/amavis/app_settings.py:66
 #, fuzzy
 msgid "Enable self-service mode"
 msgstr "'Self-Service'-Modus aktivieren"
 
-#: extensions/amavis/app_settings.py:66
+#: extensions/amavis/app_settings.py:68
 msgid "Activate the 'self-service' mode"
 msgstr "'Self-Service'-Modus aktivieren"
 
-#: extensions/amavis/app_settings.py:70
+#: extensions/amavis/app_settings.py:72
 #, fuzzy
 msgid "Notifications sender"
 msgstr "Änderungen übernommen."
 
-#: extensions/amavis/app_settings.py:72
+#: extensions/amavis/app_settings.py:74
 msgid "The e-mail address used to send notitications"
 msgstr ""
 "Die Mailadresse, die verwendet wird, um Benachrichtigungen zu versenden"
 
-#: extensions/amavis/app_settings.py:87 extensions/webmail/app_settings.py:91
+#: extensions/amavis/app_settings.py:87 extensions/webmail/app_settings.py:73
+#: userprefs/app_settings.py:18
+#, fuzzy
+msgid "Display"
+msgstr "Optionen darstellen"
+
+#: extensions/amavis/app_settings.py:91 extensions/webmail/app_settings.py:91
 msgid "Number of displayed emails per page"
 msgstr "Anzahl dargestellter Nachrichten pro Seite"
 
-#: extensions/amavis/app_settings.py:88
+#: extensions/amavis/app_settings.py:92
 #, fuzzy
 msgid "Set the maximum number of messages displayed in a page"
 msgstr ""
@@ -1682,11 +1696,11 @@ msgstr ""
 msgid "Auto-reply message"
 msgstr "Automatische Antwort"
 
-#: extensions/postfix_autoreply/app_settings.py:11
+#: extensions/postfix_autoreply/app_settings.py:14
 msgid "Automatic reply timeout"
 msgstr ""
 
-#: extensions/postfix_autoreply/app_settings.py:13
+#: extensions/postfix_autoreply/app_settings.py:16
 msgid "Timeout in seconds between two auto-replies to the same recipient"
 msgstr ""
 "Zeit in Sekunden zwischen zwei automatisierten Antworten an denselben "
@@ -1779,11 +1793,11 @@ msgstr "Bevorzugte Authentifizierungsmethode"
 msgid "Prefered authentication mechanism"
 msgstr "Bevorzugte Authentifizierungsmethode"
 
-#: extensions/sievefilters/app_settings.py:52
+#: extensions/sievefilters/app_settings.py:54
 msgid "Editor mode"
 msgstr "Editor-Modus"
 
-#: extensions/sievefilters/app_settings.py:54
+#: extensions/sievefilters/app_settings.py:56
 msgid "Select the mode you want the editor to work in"
 msgstr "Wählen Sie den Modus aus in dem der Editor arbeiten soll"
 
@@ -1983,27 +1997,27 @@ msgstr "Grafische Statistiken"
 msgid "Statistics"
 msgstr "Statistiken"
 
-#: extensions/stats/app_settings.py:11
+#: extensions/stats/app_settings.py:14
 msgid "Path to the log file"
 msgstr ""
 
-#: extensions/stats/app_settings.py:13
+#: extensions/stats/app_settings.py:16
 msgid "Path to log file used to collect statistics"
 msgstr "Pfad zur Log-Datei, um Statistiken zu sammeln"
 
-#: extensions/stats/app_settings.py:17
+#: extensions/stats/app_settings.py:20
 msgid "Directory to store RRD files"
 msgstr ""
 
-#: extensions/stats/app_settings.py:19
+#: extensions/stats/app_settings.py:22
 msgid "Path to directory where RRD files are stored"
 msgstr "Pfad zum Verzeichnis in dem die RRD-Dateien abgelegt werden"
 
-#: extensions/stats/app_settings.py:23
+#: extensions/stats/app_settings.py:26
 msgid "Directory to store PNG files"
 msgstr ""
 
-#: extensions/stats/app_settings.py:25
+#: extensions/stats/app_settings.py:28
 msgid "Path to directory where PNG files are stored"
 msgstr "Pfad zu dem Verzeichnis in dem PNG-Dateien abgelegt werden"
 
@@ -2170,11 +2184,6 @@ msgstr ""
 msgid "Server needs authentication"
 msgstr "Server erfordert Authentifizierung"
 
-#: extensions/webmail/app_settings.py:73
-#, fuzzy
-msgid "Display"
-msgstr "Optionen darstellen"
-
 #: extensions/webmail/app_settings.py:77
 msgid "Default message display mode"
 msgstr "Standard Betrachtungsmodus für Nachrichten"
@@ -2535,11 +2544,11 @@ msgstr "Einstellungen"
 msgid "Per-user settings"
 msgstr ""
 
-#: userprefs/app_settings.py:19
+#: userprefs/app_settings.py:22
 msgid "Prefered language"
 msgstr "Bevorzugte Sprache"
 
-#: userprefs/app_settings.py:23
+#: userprefs/app_settings.py:26
 msgid "Prefered language to display pages"
 msgstr "Bevorzugte Sprache für Seitendarstellung"
 
diff --git a/modoboa/locale/en/LC_MESSAGES/django.po b/modoboa/locale/en/LC_MESSAGES/django.po
index 939e1d2ee..290faea63 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: 2013-05-22 17:38+0200\n"
+"POT-Creation-Date: 2013-05-24 10:10+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"
@@ -26,7 +26,10 @@ msgid "Web based console to manage domains, accounts and aliases"
 msgstr ""
 
 #: admin/__init__.py:16 admin/forms.py:179 admin/forms.py:614
-#: admin/views.py:93 admin/views.py:441 extensions/webmail/app_settings.py:11
+#: admin/views.py:93 admin/views.py:441
+#: extensions/postfix_autoreply/app_settings.py:11
+#: extensions/sievefilters/app_settings.py:50
+#: extensions/stats/app_settings.py:11 extensions/webmail/app_settings.py:11
 #: userprefs/__init__.py:15
 msgid "General"
 msgstr ""
@@ -1147,95 +1150,104 @@ msgstr ""
 msgid "Content filter"
 msgstr ""
 
-#: extensions/amavis/app_settings.py:12
-msgid "Maximum message age"
+#: extensions/amavis/app_settings.py:11
+msgid "Quarantine settings"
 msgstr ""
 
 #: extensions/amavis/app_settings.py:14
+msgid "Maximum message age"
+msgstr ""
+
+#: extensions/amavis/app_settings.py:16
 msgid "Quarantine messages maximum age (in days) before deletion"
 msgstr ""
 
-#: extensions/amavis/app_settings.py:17
+#: extensions/amavis/app_settings.py:19
 msgid "Messages releasing"
 msgstr ""
 
-#: extensions/amavis/app_settings.py:20
+#: extensions/amavis/app_settings.py:22
 msgid "Remove released messages"
 msgstr ""
 
-#: extensions/amavis/app_settings.py:22
+#: extensions/amavis/app_settings.py:24
 msgid "Remove messages marked as released while cleaning up the database"
 msgstr ""
 
-#: extensions/amavis/app_settings.py:26
+#: extensions/amavis/app_settings.py:28
 msgid "Amavis connection mode"
 msgstr ""
 
-#: extensions/amavis/app_settings.py:29
+#: extensions/amavis/app_settings.py:31
 msgid "Mode used to access the PDP server"
 msgstr ""
 
-#: extensions/amavis/app_settings.py:34
+#: extensions/amavis/app_settings.py:36
 msgid "PDP server address"
 msgstr ""
 
-#: extensions/amavis/app_settings.py:36
+#: extensions/amavis/app_settings.py:38
 msgid "PDP server address (if inet mode)"
 msgstr ""
 
-#: extensions/amavis/app_settings.py:40
+#: extensions/amavis/app_settings.py:42
 msgid "PDP server port"
 msgstr ""
 
-#: extensions/amavis/app_settings.py:42
+#: extensions/amavis/app_settings.py:44
 msgid "PDP server port (if inet mode)"
 msgstr ""
 
-#: extensions/amavis/app_settings.py:46
+#: extensions/amavis/app_settings.py:48
 msgid "PDP server socket"
 msgstr ""
 
-#: extensions/amavis/app_settings.py:48
+#: extensions/amavis/app_settings.py:50
 msgid "Path to the PDP server socket (if unix mode)"
 msgstr ""
 
-#: extensions/amavis/app_settings.py:52
+#: extensions/amavis/app_settings.py:54
 msgid "Check requests interval"
 msgstr ""
 
-#: extensions/amavis/app_settings.py:54
+#: extensions/amavis/app_settings.py:56
 msgid "Interval between two release requests checks"
 msgstr ""
 
-#: extensions/amavis/app_settings.py:58
+#: extensions/amavis/app_settings.py:60
 msgid "Allow direct release"
 msgstr ""
 
-#: extensions/amavis/app_settings.py:60
+#: extensions/amavis/app_settings.py:62
 msgid "Allow users to directly release their messages"
 msgstr ""
 
-#: extensions/amavis/app_settings.py:64
+#: extensions/amavis/app_settings.py:66
 msgid "Enable self-service mode"
 msgstr ""
 
-#: extensions/amavis/app_settings.py:66
+#: extensions/amavis/app_settings.py:68
 msgid "Activate the 'self-service' mode"
 msgstr ""
 
-#: extensions/amavis/app_settings.py:70
+#: extensions/amavis/app_settings.py:72
 msgid "Notifications sender"
 msgstr ""
 
-#: extensions/amavis/app_settings.py:72
+#: extensions/amavis/app_settings.py:74
 msgid "The e-mail address used to send notitications"
 msgstr ""
 
-#: extensions/amavis/app_settings.py:87 extensions/webmail/app_settings.py:91
+#: extensions/amavis/app_settings.py:87 extensions/webmail/app_settings.py:73
+#: userprefs/app_settings.py:18
+msgid "Display"
+msgstr ""
+
+#: extensions/amavis/app_settings.py:91 extensions/webmail/app_settings.py:91
 msgid "Number of displayed emails per page"
 msgstr ""
 
-#: extensions/amavis/app_settings.py:88
+#: extensions/amavis/app_settings.py:92
 msgid "Set the maximum number of messages displayed in a page"
 msgstr ""
 
@@ -1560,11 +1572,11 @@ msgstr ""
 msgid "Auto-reply message"
 msgstr ""
 
-#: extensions/postfix_autoreply/app_settings.py:11
+#: extensions/postfix_autoreply/app_settings.py:14
 msgid "Automatic reply timeout"
 msgstr ""
 
-#: extensions/postfix_autoreply/app_settings.py:13
+#: extensions/postfix_autoreply/app_settings.py:16
 msgid "Timeout in seconds between two auto-replies to the same recipient"
 msgstr ""
 
@@ -1650,11 +1662,11 @@ msgstr ""
 msgid "Prefered authentication mechanism"
 msgstr ""
 
-#: extensions/sievefilters/app_settings.py:52
+#: extensions/sievefilters/app_settings.py:54
 msgid "Editor mode"
 msgstr ""
 
-#: extensions/sievefilters/app_settings.py:54
+#: extensions/sievefilters/app_settings.py:56
 msgid "Select the mode you want the editor to work in"
 msgstr ""
 
@@ -1850,27 +1862,27 @@ msgstr ""
 msgid "Statistics"
 msgstr ""
 
-#: extensions/stats/app_settings.py:11
+#: extensions/stats/app_settings.py:14
 msgid "Path to the log file"
 msgstr ""
 
-#: extensions/stats/app_settings.py:13
+#: extensions/stats/app_settings.py:16
 msgid "Path to log file used to collect statistics"
 msgstr ""
 
-#: extensions/stats/app_settings.py:17
+#: extensions/stats/app_settings.py:20
 msgid "Directory to store RRD files"
 msgstr ""
 
-#: extensions/stats/app_settings.py:19
+#: extensions/stats/app_settings.py:22
 msgid "Path to directory where RRD files are stored"
 msgstr ""
 
-#: extensions/stats/app_settings.py:23
+#: extensions/stats/app_settings.py:26
 msgid "Directory to store PNG files"
 msgstr ""
 
-#: extensions/stats/app_settings.py:25
+#: extensions/stats/app_settings.py:28
 msgid "Path to directory where PNG files are stored"
 msgstr ""
 
@@ -2035,10 +2047,6 @@ msgstr ""
 msgid "Server needs authentication"
 msgstr ""
 
-#: extensions/webmail/app_settings.py:73
-msgid "Display"
-msgstr ""
-
 #: extensions/webmail/app_settings.py:77
 msgid "Default message display mode"
 msgstr ""
@@ -2394,11 +2402,11 @@ msgstr ""
 msgid "Per-user settings"
 msgstr ""
 
-#: userprefs/app_settings.py:19
+#: userprefs/app_settings.py:22
 msgid "Prefered language"
 msgstr ""
 
-#: userprefs/app_settings.py:23
+#: userprefs/app_settings.py:26
 msgid "Prefered language to display pages"
 msgstr ""
 
diff --git a/modoboa/locale/es/LC_MESSAGES/django.po b/modoboa/locale/es/LC_MESSAGES/django.po
index 3128d43c2..cef1cb525 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: 2013-05-22 17:38+0200\n"
+"POT-Creation-Date: 2013-05-24 10:10+0200\n"
 "PO-Revision-Date: 2013-02-05 08:26+0000\n"
 "Last-Translator: Pedro Gracia <lasarux@neuroomante.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,10 @@ msgid "Web based console to manage domains, accounts and aliases"
 msgstr ""
 
 #: admin/__init__.py:16 admin/forms.py:179 admin/forms.py:614
-#: admin/views.py:93 admin/views.py:441 extensions/webmail/app_settings.py:11
+#: admin/views.py:93 admin/views.py:441
+#: extensions/postfix_autoreply/app_settings.py:11
+#: extensions/sievefilters/app_settings.py:50
+#: extensions/stats/app_settings.py:11 extensions/webmail/app_settings.py:11
 #: userprefs/__init__.py:15
 msgid "General"
 msgstr "General"
@@ -1230,107 +1233,118 @@ msgstr "%d peticiones pendientes"
 msgid "Content filter"
 msgstr "Filtro de contenido"
 
-#: extensions/amavis/app_settings.py:12
+#: extensions/amavis/app_settings.py:11
+#, fuzzy
+msgid "Quarantine settings"
+msgstr "Cuarentena"
+
+#: extensions/amavis/app_settings.py:14
 #, fuzzy
 msgid "Maximum message age"
 msgstr "Marcar mensajes"
 
-#: extensions/amavis/app_settings.py:14
+#: extensions/amavis/app_settings.py:16
 msgid "Quarantine messages maximum age (in days) before deletion"
 msgstr ""
 "Máxima edad (en días) de los mensajes de cuarentena antes de proceder a su "
 "eliminación"
 
-#: extensions/amavis/app_settings.py:17
+#: extensions/amavis/app_settings.py:19
 #, fuzzy
 msgid "Messages releasing"
 msgstr "Mensaje publicado"
 
-#: extensions/amavis/app_settings.py:20
+#: extensions/amavis/app_settings.py:22
 #, fuzzy
 msgid "Remove released messages"
 msgstr "mensajes recibidos"
 
-#: extensions/amavis/app_settings.py:22
+#: extensions/amavis/app_settings.py:24
 msgid "Remove messages marked as released while cleaning up the database"
 msgstr ""
 "Eliminar los mensajes marcados como publicados cuando se haga limpieza de la "
 "base de datos"
 
-#: extensions/amavis/app_settings.py:26
+#: extensions/amavis/app_settings.py:28
 msgid "Amavis connection mode"
 msgstr ""
 
-#: extensions/amavis/app_settings.py:29
+#: extensions/amavis/app_settings.py:31
 msgid "Mode used to access the PDP server"
 msgstr "Modo usado para acceder al servidor PDP"
 
-#: extensions/amavis/app_settings.py:34
+#: extensions/amavis/app_settings.py:36
 #, fuzzy
 msgid "PDP server address"
 msgstr "Dirección del servidor de PDP (si está en modo inet)"
 
-#: extensions/amavis/app_settings.py:36
+#: extensions/amavis/app_settings.py:38
 msgid "PDP server address (if inet mode)"
 msgstr "Dirección del servidor de PDP (si está en modo inet)"
 
-#: extensions/amavis/app_settings.py:40
+#: extensions/amavis/app_settings.py:42
 #, fuzzy
 msgid "PDP server port"
 msgstr "Puerto del servidor de PDP (si está en modo inet)"
 
-#: extensions/amavis/app_settings.py:42
+#: extensions/amavis/app_settings.py:44
 msgid "PDP server port (if inet mode)"
 msgstr "Puerto del servidor de PDP (si está en modo inet)"
 
-#: extensions/amavis/app_settings.py:46
+#: extensions/amavis/app_settings.py:48
 msgid "PDP server socket"
 msgstr ""
 
-#: extensions/amavis/app_settings.py:48
+#: extensions/amavis/app_settings.py:50
 msgid "Path to the PDP server socket (if unix mode)"
 msgstr "Dirección del socket del servidor de PDP (si están en modo unix)"
 
-#: extensions/amavis/app_settings.py:52
+#: extensions/amavis/app_settings.py:54
 msgid "Check requests interval"
 msgstr ""
 
-#: extensions/amavis/app_settings.py:54
+#: extensions/amavis/app_settings.py:56
 msgid "Interval between two release requests checks"
 msgstr "Intervalo entre dos peticiones de chequeo"
 
-#: extensions/amavis/app_settings.py:58
+#: extensions/amavis/app_settings.py:60
 #, fuzzy
 msgid "Allow direct release"
 msgstr "Permitir a los usuarios enviar directamente sus mensajes"
 
-#: extensions/amavis/app_settings.py:60
+#: extensions/amavis/app_settings.py:62
 msgid "Allow users to directly release their messages"
 msgstr "Permitir a los usuarios enviar directamente sus mensajes"
 
-#: extensions/amavis/app_settings.py:64
+#: extensions/amavis/app_settings.py:66
 #, fuzzy
 msgid "Enable self-service mode"
 msgstr "Activar el modo 'auto-servicio'"
 
-#: extensions/amavis/app_settings.py:66
+#: extensions/amavis/app_settings.py:68
 msgid "Activate the 'self-service' mode"
 msgstr "Activar el modo 'auto-servicio'"
 
-#: extensions/amavis/app_settings.py:70
+#: extensions/amavis/app_settings.py:72
 #, fuzzy
 msgid "Notifications sender"
 msgstr "Modificaciones aplicadas."
 
-#: extensions/amavis/app_settings.py:72
+#: extensions/amavis/app_settings.py:74
 msgid "The e-mail address used to send notitications"
 msgstr "La dirección de correo usada para enviar notificaciones"
 
-#: extensions/amavis/app_settings.py:87 extensions/webmail/app_settings.py:91
+#: extensions/amavis/app_settings.py:87 extensions/webmail/app_settings.py:73
+#: userprefs/app_settings.py:18
+#, fuzzy
+msgid "Display"
+msgstr "Opciones de pantalla"
+
+#: extensions/amavis/app_settings.py:91 extensions/webmail/app_settings.py:91
 msgid "Number of displayed emails per page"
 msgstr "Número de emails mostrados por página"
 
-#: extensions/amavis/app_settings.py:88
+#: extensions/amavis/app_settings.py:92
 #, fuzzy
 msgid "Set the maximum number of messages displayed in a page"
 msgstr "Fija el número máximo de mensajes mostrados en una página"
@@ -1677,11 +1691,11 @@ msgstr ""
 msgid "Auto-reply message"
 msgstr "Mensaje de autorespuesta"
 
-#: extensions/postfix_autoreply/app_settings.py:11
+#: extensions/postfix_autoreply/app_settings.py:14
 msgid "Automatic reply timeout"
 msgstr ""
 
-#: extensions/postfix_autoreply/app_settings.py:13
+#: extensions/postfix_autoreply/app_settings.py:16
 msgid "Timeout in seconds between two auto-replies to the same recipient"
 msgstr "Tiempo en segundos entre dos autorespuestas para el mismo emisor"
 
@@ -1771,11 +1785,11 @@ msgstr "Mecanismo de autenticación preferido"
 msgid "Prefered authentication mechanism"
 msgstr "Mecanismo de autenticación preferido"
 
-#: extensions/sievefilters/app_settings.py:52
+#: extensions/sievefilters/app_settings.py:54
 msgid "Editor mode"
 msgstr "Modo editor"
 
-#: extensions/sievefilters/app_settings.py:54
+#: extensions/sievefilters/app_settings.py:56
 msgid "Select the mode you want the editor to work in"
 msgstr "Seleccione el modo en el que desea que el editor trabaje"
 
@@ -1973,27 +1987,27 @@ msgstr "Estadísticas gráficas"
 msgid "Statistics"
 msgstr "Estadísticas"
 
-#: extensions/stats/app_settings.py:11
+#: extensions/stats/app_settings.py:14
 msgid "Path to the log file"
 msgstr ""
 
-#: extensions/stats/app_settings.py:13
+#: extensions/stats/app_settings.py:16
 msgid "Path to log file used to collect statistics"
 msgstr "Ruta al fichero de log usado para recolectar estadísticas"
 
-#: extensions/stats/app_settings.py:17
+#: extensions/stats/app_settings.py:20
 msgid "Directory to store RRD files"
 msgstr ""
 
-#: extensions/stats/app_settings.py:19
+#: extensions/stats/app_settings.py:22
 msgid "Path to directory where RRD files are stored"
 msgstr "Ruta al directorio dónde están almacenados los ficheros RRD"
 
-#: extensions/stats/app_settings.py:23
+#: extensions/stats/app_settings.py:26
 msgid "Directory to store PNG files"
 msgstr ""
 
-#: extensions/stats/app_settings.py:25
+#: extensions/stats/app_settings.py:28
 msgid "Path to directory where PNG files are stored"
 msgstr "Ruta al directorio dónde están almacenados los ficheros PNG"
 
@@ -2160,11 +2174,6 @@ msgstr ""
 msgid "Server needs authentication"
 msgstr "El servidor requiere autenticación"
 
-#: extensions/webmail/app_settings.py:73
-#, fuzzy
-msgid "Display"
-msgstr "Opciones de pantalla"
-
 #: extensions/webmail/app_settings.py:77
 msgid "Default message display mode"
 msgstr "Modo por defecto para mostrar un mensaje"
@@ -2523,11 +2532,11 @@ msgstr "Preferencias"
 msgid "Per-user settings"
 msgstr ""
 
-#: userprefs/app_settings.py:19
+#: userprefs/app_settings.py:22
 msgid "Prefered language"
 msgstr "Idioma preferido"
 
-#: userprefs/app_settings.py:23
+#: userprefs/app_settings.py:26
 msgid "Prefered language to display pages"
 msgstr "Idioma preferido para mostrar las páginas"
 
diff --git a/modoboa/locale/fr/LC_MESSAGES/django.po b/modoboa/locale/fr/LC_MESSAGES/django.po
index 0136fe4d6..852aa2de3 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-1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-22 17:38+0200\n"
+"POT-Creation-Date: 2013-05-24 10:10+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"
@@ -26,7 +26,10 @@ msgid "Web based console to manage domains, accounts and aliases"
 msgstr "Console web pour gérer les domains, comptes et alias"
 
 #: admin/__init__.py:16 admin/forms.py:179 admin/forms.py:614
-#: admin/views.py:93 admin/views.py:441 extensions/webmail/app_settings.py:11
+#: admin/views.py:93 admin/views.py:441
+#: extensions/postfix_autoreply/app_settings.py:11
+#: extensions/sievefilters/app_settings.py:50
+#: extensions/stats/app_settings.py:11 extensions/webmail/app_settings.py:11
 #: userprefs/__init__.py:15
 msgid "General"
 msgstr "Général"
@@ -118,8 +121,9 @@ msgstr "ND de connexion"
 msgid ""
 "The distinguished name to use when binding to the LDAP server. Leave empty "
 "for an anonymous bind"
-msgstr "Le nom distinctif à utiliser pour les connections au serveur LDAP. "
-"Laisser vide pour une connexion anonyme"
+msgstr ""
+"Le nom distinctif à utiliser pour les connections au serveur LDAP. Laisser "
+"vide pour une connexion anonyme"
 
 #: admin/app_settings.py:97
 msgid "Bind password"
@@ -127,8 +131,9 @@ msgstr "Mot de passe de connexion"
 
 #: admin/app_settings.py:99
 msgid "The password to use when binding to the LDAP server (with 'Bind DN')"
-msgstr "Le mot de passe à utiliser pour les connections au serveur LDAP "
-"(avec 'ND de connexion')"
+msgstr ""
+"Le mot de passe à utiliser pour les connections au serveur LDAP (avec 'ND de "
+"connexion')"
 
 #: admin/app_settings.py:105
 msgid "Search base"
@@ -146,8 +151,9 @@ msgstr "Filtre de recherche"
 msgid ""
 "An optional filter string (e.g. '(objectClass=person)'). In order to be "
 "valid, it must be enclosed in parentheses."
-msgstr "Un filtre de recherche optionel (ex. '(objectClass=person)'). "
-"Pour être valide, il doit être entouré de parenthèses."
+msgstr ""
+"Un filtre de recherche optionel (ex. '(objectClass=person)'). Pour être "
+"valide, il doit être entouré de parenthèses."
 
 #: admin/app_settings.py:119
 msgid "User DN template"
@@ -158,8 +164,9 @@ msgstr "Modèle de nom distinctif utilisateur"
 msgid ""
 "The template used to construct a user's DN. It should contain one "
 "placeholder (ie. %(user)s)"
-msgstr "Le modèle utilisé pour construire le nom distinctif d'un utilisateur. "
-"Il doit contenir un espace réservé (ex. %(user)s)"
+msgstr ""
+"Le modèle utilisé pour construire le nom distinctif d'un utilisateur. Il "
+"doit contenir un espace réservé (ex. %(user)s)"
 
 #: admin/app_settings.py:126
 msgid "Password attribute"
@@ -167,8 +174,7 @@ msgstr "Attribut 'mot de passe'"
 
 #: admin/app_settings.py:128
 msgid "The attribute used to store user passwords"
-msgstr ""
-"L'attribut utilisé pour stocker les mots de passe"
+msgstr "L'attribut utilisé pour stocker les mots de passe"
 
 #: admin/app_settings.py:132
 msgid "Active Directory"
@@ -193,8 +199,9 @@ msgstr "Gérer les boites sur le système de fichiers"
 msgid ""
 "Rename or remove mailboxes on the filesystem when they get renamed or "
 "removed within Modoboa"
-msgstr "Renommer ou supprimer les boites sur le système de fichiers quand "
-"elles sont renommées ou supprimées dans Modoboa"
+msgstr ""
+"Renommer ou supprimer les boites sur le système de fichiers quand elles sont "
+"renommées ou supprimées dans Modoboa"
 
 #: admin/app_settings.py:146
 msgid "Mailboxes ower"
@@ -202,8 +209,7 @@ msgstr "Propriétaire des boites"
 
 #: admin/app_settings.py:148
 msgid "The UNIX account who owns mailboxes on the filesystem"
-msgstr ""
-"Le compte UNIX qui possède les boites sur le système de fichiers"
+msgstr "Le compte UNIX qui possède les boites sur le système de fichiers"
 
 #: admin/app_settings.py:152
 msgid "Automatic account removal"
@@ -289,8 +295,9 @@ msgstr "Nom"
 msgid ""
 "The administrator's name. Don't include the domain's name here, it will be "
 "automatically appended."
-msgstr "Le nom de l'administrateur. Ne pas include un nom de domaine ici, "
-"il sera ajouté automatiquement."
+msgstr ""
+"Le nom de l'administrateur. Ne pas include un nom de domaine ici, il sera "
+"ajouté automatiquement."
 
 #: admin/forms.py:128
 msgid "Create aliases"
@@ -444,8 +451,9 @@ msgid ""
 "Quota in MB for this mailbox. Define a custom value or use domain's default "
 "one. Leave empty to define an unlimited value (not allowed for domain "
 "administrators)."
-msgstr "Quota en Mo pour cette boite. Définir une valeur spécifique ou utiliser "
-"la valeur par défaut du domaine. Laisser vide pour définir une valeur illimitée "
+msgstr ""
+"Quota en Mo pour cette boite. Définir une valeur spécifique ou utiliser la "
+"valeur par défaut du domaine. Laisser vide pour définir une valeur illimitée "
 "(interdit pour les admins. de domaine)."
 
 #: admin/forms.py:461
@@ -503,8 +511,7 @@ msgstr "Ligne invalide"
 
 #: admin/models.py:498
 msgid "You can't import an account with a role greater than yours"
-msgstr "Vous ne pouvez pas importer un compte avec un rôle supérieur "
-"au votre"
+msgstr "Vous ne pouvez pas importer un compte avec un rôle supérieur au votre"
 
 #: admin/models.py:518
 #, python-format
@@ -1212,97 +1219,106 @@ msgstr "%d requêtes en attente"
 msgid "Content filter"
 msgstr "Filtrage de contenu"
 
-#: extensions/amavis/app_settings.py:12
+#: extensions/amavis/app_settings.py:11
+msgid "Quarantine settings"
+msgstr "Paramètres de quarantaine"
+
+#: extensions/amavis/app_settings.py:14
 msgid "Maximum message age"
 msgstr "Age maximal des messages"
 
-#: extensions/amavis/app_settings.py:14
+#: extensions/amavis/app_settings.py:16
 msgid "Quarantine messages maximum age (in days) before deletion"
 msgstr "Age maximum (en jours) des messages en quarantaine avant suppression"
 
-#: extensions/amavis/app_settings.py:17
+#: extensions/amavis/app_settings.py:19
 msgid "Messages releasing"
 msgstr "Libération des messages"
 
-#: extensions/amavis/app_settings.py:20
+#: extensions/amavis/app_settings.py:22
 msgid "Remove released messages"
 msgstr "Supprimer les messages libérés"
 
-#: extensions/amavis/app_settings.py:22
+#: extensions/amavis/app_settings.py:24
 msgid "Remove messages marked as released while cleaning up the database"
 msgstr ""
 "Supprimer les messages marqués comme relâchés pendant le nettoyage de la "
 "base de données"
 
-#: extensions/amavis/app_settings.py:26
+#: extensions/amavis/app_settings.py:28
 msgid "Amavis connection mode"
 msgstr "Mode de connexion à Amavis"
 
-#: extensions/amavis/app_settings.py:29
+#: extensions/amavis/app_settings.py:31
 msgid "Mode used to access the PDP server"
 msgstr "Mode utilisé pour accéder au serveur PDP"
 
-#: extensions/amavis/app_settings.py:34
+#: extensions/amavis/app_settings.py:36
 msgid "PDP server address"
 msgstr "Adresse du serveur PDP"
 
-#: extensions/amavis/app_settings.py:36
+#: extensions/amavis/app_settings.py:38
 msgid "PDP server address (if inet mode)"
 msgstr "Adresse du serveur PDP (en mode inet)"
 
-#: extensions/amavis/app_settings.py:40
+#: extensions/amavis/app_settings.py:42
 msgid "PDP server port"
 msgstr "Port du serveur PDP"
 
-#: extensions/amavis/app_settings.py:42
+#: extensions/amavis/app_settings.py:44
 msgid "PDP server port (if inet mode)"
 msgstr "Port du serveur PDP (en mode inet)"
 
-#: extensions/amavis/app_settings.py:46
+#: extensions/amavis/app_settings.py:48
 msgid "PDP server socket"
 msgstr "Socket du serveur PDP"
 
-#: extensions/amavis/app_settings.py:48
+#: extensions/amavis/app_settings.py:50
 msgid "Path to the PDP server socket (if unix mode)"
 msgstr "Emplacement de la socket du serveur PDP (en mode unix)"
 
-#: extensions/amavis/app_settings.py:52
+#: extensions/amavis/app_settings.py:54
 msgid "Check requests interval"
 msgstr "Intervalle entre deux requêtes de vérification"
 
-#: extensions/amavis/app_settings.py:54
+#: extensions/amavis/app_settings.py:56
 msgid "Interval between two release requests checks"
 msgstr "Intervalle entre deux vérifications de requêtes en attente"
 
-#: extensions/amavis/app_settings.py:58
+#: extensions/amavis/app_settings.py:60
 msgid "Allow direct release"
 msgstr "Autoriser la libération directe"
 
-#: extensions/amavis/app_settings.py:60
+#: extensions/amavis/app_settings.py:62
 msgid "Allow users to directly release their messages"
 msgstr "Autoriser les utilisateurs à relâcher directement leurs messages"
 
-#: extensions/amavis/app_settings.py:64
+#: extensions/amavis/app_settings.py:66
 msgid "Enable self-service mode"
 msgstr "Activer le mode 'libre service'"
 
-#: extensions/amavis/app_settings.py:66
+#: extensions/amavis/app_settings.py:68
 msgid "Activate the 'self-service' mode"
 msgstr "Activer le mode 'libre service'"
 
-#: extensions/amavis/app_settings.py:70
+#: extensions/amavis/app_settings.py:72
 msgid "Notifications sender"
 msgstr "Emetteur des notifications"
 
-#: extensions/amavis/app_settings.py:72
+#: extensions/amavis/app_settings.py:74
 msgid "The e-mail address used to send notitications"
 msgstr "L'adresse e-mail utilisée pour envoyer les notifications"
 
-#: extensions/amavis/app_settings.py:87 extensions/webmail/app_settings.py:91
+#: extensions/amavis/app_settings.py:87 extensions/webmail/app_settings.py:73
+#: userprefs/app_settings.py:18
+msgid "Display"
+msgstr "Afficher"
+
+#: extensions/amavis/app_settings.py:91 extensions/webmail/app_settings.py:91
 msgid "Number of displayed emails per page"
 msgstr "Nombre d'emails affichés par page"
 
-#: extensions/amavis/app_settings.py:88
+#: extensions/amavis/app_settings.py:92
 msgid "Set the maximum number of messages displayed in a page"
 msgstr "Définir le nombre maximal de messages affichés dans une page"
 
@@ -1641,11 +1657,11 @@ msgstr "Réponses automatiques"
 msgid "Auto-reply message"
 msgstr "Message de réponse automatique"
 
-#: extensions/postfix_autoreply/app_settings.py:11
+#: extensions/postfix_autoreply/app_settings.py:14
 msgid "Automatic reply timeout"
 msgstr "Délai d'expiration d'une réponse automatique"
 
-#: extensions/postfix_autoreply/app_settings.py:13
+#: extensions/postfix_autoreply/app_settings.py:16
 msgid "Timeout in seconds between two auto-replies to the same recipient"
 msgstr ""
 "Timeout en secondes entre deux réponses automatiques pour le même "
@@ -1733,11 +1749,11 @@ msgstr "Méthode d'authentification"
 msgid "Prefered authentication mechanism"
 msgstr "Méthode d'authentification préférée"
 
-#: extensions/sievefilters/app_settings.py:52
+#: extensions/sievefilters/app_settings.py:54
 msgid "Editor mode"
 msgstr "Mode de l'editeur"
 
-#: extensions/sievefilters/app_settings.py:54
+#: extensions/sievefilters/app_settings.py:56
 msgid "Select the mode you want the editor to work in"
 msgstr "Sélectionner le mode de fonctionnement de l'éditeur"
 
@@ -1937,27 +1953,27 @@ msgstr "Statistiques graphiques"
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: extensions/stats/app_settings.py:11
+#: extensions/stats/app_settings.py:14
 msgid "Path to the log file"
 msgstr "Chemin d'accès vers le journal"
 
-#: extensions/stats/app_settings.py:13
+#: extensions/stats/app_settings.py:16
 msgid "Path to log file used to collect statistics"
 msgstr "Emplacement du log utilisé pour collecter les statistiques"
 
-#: extensions/stats/app_settings.py:17
+#: extensions/stats/app_settings.py:20
 msgid "Directory to store RRD files"
 msgstr "Répertoire où stocker les fichiers RRD"
 
-#: extensions/stats/app_settings.py:19
+#: extensions/stats/app_settings.py:22
 msgid "Path to directory where RRD files are stored"
 msgstr "Emplacement du répertoire de stockage des fichiers RRD"
 
-#: extensions/stats/app_settings.py:23
+#: extensions/stats/app_settings.py:26
 msgid "Directory to store PNG files"
 msgstr "Répertoire où stocker les fichiers PNG"
 
-#: extensions/stats/app_settings.py:25
+#: extensions/stats/app_settings.py:28
 msgid "Path to directory where PNG files are stored"
 msgstr "Emplacement du répertoire de stockage des fichiers PNG"
 
@@ -2122,10 +2138,6 @@ msgstr "Authentification requise"
 msgid "Server needs authentication"
 msgstr "Le serveur nécessite une authentification"
 
-#: extensions/webmail/app_settings.py:73
-msgid "Display"
-msgstr "Afficher"
-
 #: extensions/webmail/app_settings.py:77
 msgid "Default message display mode"
 msgstr "Mode d'affichage par défaut d'un message"
@@ -2481,11 +2493,11 @@ msgstr "Préférences utilisateur"
 msgid "Per-user settings"
 msgstr "Paramètres par utilisateur"
 
-#: userprefs/app_settings.py:19
+#: userprefs/app_settings.py:22
 msgid "Prefered language"
 msgstr "Langage préféré"
 
-#: userprefs/app_settings.py:23
+#: userprefs/app_settings.py:26
 msgid "Prefered language to display pages"
 msgstr "Langage préféré pour afficher les pages"
 
diff --git a/modoboa/locale/pt_PT/LC_MESSAGES/django.po b/modoboa/locale/pt_PT/LC_MESSAGES/django.po
index fdac5fb8a..1464a05dc 100644
--- a/modoboa/locale/pt_PT/LC_MESSAGES/django.po
+++ b/modoboa/locale/pt_PT/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Modoboa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-22 17:38+0200\n"
+"POT-Creation-Date: 2013-05-24 10:10+0200\n"
 "PO-Revision-Date: 2013-01-27 23:38+0000\n"
 "Last-Translator: Sandra Ribeiro <sandrarib@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,7 +30,10 @@ msgid "Web based console to manage domains, accounts and aliases"
 msgstr ""
 
 #: admin/__init__.py:16 admin/forms.py:179 admin/forms.py:614
-#: admin/views.py:93 admin/views.py:441 extensions/webmail/app_settings.py:11
+#: admin/views.py:93 admin/views.py:441
+#: extensions/postfix_autoreply/app_settings.py:11
+#: extensions/sievefilters/app_settings.py:50
+#: extensions/stats/app_settings.py:11 extensions/webmail/app_settings.py:11
 #: userprefs/__init__.py:15
 msgid "General"
 msgstr "Geral"
@@ -1227,107 +1230,118 @@ msgstr "%d pedidos pendentes"
 msgid "Content filter"
 msgstr "Filtro de conteúdo"
 
-#: extensions/amavis/app_settings.py:12
+#: extensions/amavis/app_settings.py:11
+#, fuzzy
+msgid "Quarantine settings"
+msgstr "Quarentena"
+
+#: extensions/amavis/app_settings.py:14
 #, fuzzy
 msgid "Maximum message age"
 msgstr "Marcar mensagens"
 
-#: extensions/amavis/app_settings.py:14
+#: extensions/amavis/app_settings.py:16
 msgid "Quarantine messages maximum age (in days) before deletion"
 msgstr ""
 "Tempo máximo que as mensagens ficam na quarentena (em dias) até serem "
 "eliminadas"
 
-#: extensions/amavis/app_settings.py:17
+#: extensions/amavis/app_settings.py:19
 #, fuzzy
 msgid "Messages releasing"
 msgstr "Mensagem libertada"
 
-#: extensions/amavis/app_settings.py:20
+#: extensions/amavis/app_settings.py:22
 #, fuzzy
 msgid "Remove released messages"
 msgstr "mensagens recebidas"
 
-#: extensions/amavis/app_settings.py:22
+#: extensions/amavis/app_settings.py:24
 msgid "Remove messages marked as released while cleaning up the database"
 msgstr ""
 "Remova as mensagens, marcadas como enviadas, durante a limpeza da base de "
 "dados"
 
-#: extensions/amavis/app_settings.py:26
+#: extensions/amavis/app_settings.py:28
 msgid "Amavis connection mode"
 msgstr ""
 
-#: extensions/amavis/app_settings.py:29
+#: extensions/amavis/app_settings.py:31
 msgid "Mode used to access the PDP server"
 msgstr "Método usado para aceder ao servidor PDP"
 
-#: extensions/amavis/app_settings.py:34
+#: extensions/amavis/app_settings.py:36
 #, fuzzy
 msgid "PDP server address"
 msgstr "Endereço do servidor PDP (método inet)"
 
-#: extensions/amavis/app_settings.py:36
+#: extensions/amavis/app_settings.py:38
 msgid "PDP server address (if inet mode)"
 msgstr "Endereço do servidor PDP (método inet)"
 
-#: extensions/amavis/app_settings.py:40
+#: extensions/amavis/app_settings.py:42
 #, fuzzy
 msgid "PDP server port"
 msgstr "Porta do servidor PDP (método inet)"
 
-#: extensions/amavis/app_settings.py:42
+#: extensions/amavis/app_settings.py:44
 msgid "PDP server port (if inet mode)"
 msgstr "Porta do servidor PDP (método inet)"
 
-#: extensions/amavis/app_settings.py:46
+#: extensions/amavis/app_settings.py:48
 msgid "PDP server socket"
 msgstr ""
 
-#: extensions/amavis/app_settings.py:48
+#: extensions/amavis/app_settings.py:50
 msgid "Path to the PDP server socket (if unix mode)"
 msgstr "Caminho para a socket do servidor PDP (método unix)"
 
-#: extensions/amavis/app_settings.py:52
+#: extensions/amavis/app_settings.py:54
 msgid "Check requests interval"
 msgstr ""
 
-#: extensions/amavis/app_settings.py:54
+#: extensions/amavis/app_settings.py:56
 msgid "Interval between two release requests checks"
 msgstr "Intervalo entre dois pedidos "
 
-#: extensions/amavis/app_settings.py:58
+#: extensions/amavis/app_settings.py:60
 #, fuzzy
 msgid "Allow direct release"
 msgstr "Permitir que aos utilizadores libertar mensagens diretamente"
 
-#: extensions/amavis/app_settings.py:60
+#: extensions/amavis/app_settings.py:62
 msgid "Allow users to directly release their messages"
 msgstr "Permitir que aos utilizadores libertar mensagens diretamente"
 
-#: extensions/amavis/app_settings.py:64
+#: extensions/amavis/app_settings.py:66
 #, fuzzy
 msgid "Enable self-service mode"
 msgstr "Ativar o modo 'self-service'"
 
-#: extensions/amavis/app_settings.py:66
+#: extensions/amavis/app_settings.py:68
 msgid "Activate the 'self-service' mode"
 msgstr "Ativar o modo 'self-service'"
 
-#: extensions/amavis/app_settings.py:70
+#: extensions/amavis/app_settings.py:72
 #, fuzzy
 msgid "Notifications sender"
 msgstr "Alterações efectuadas."
 
-#: extensions/amavis/app_settings.py:72
+#: extensions/amavis/app_settings.py:74
 msgid "The e-mail address used to send notitications"
 msgstr "O endereço de e-mail usado para enviar notificações"
 
-#: extensions/amavis/app_settings.py:87 extensions/webmail/app_settings.py:91
+#: extensions/amavis/app_settings.py:87 extensions/webmail/app_settings.py:73
+#: userprefs/app_settings.py:18
+#, fuzzy
+msgid "Display"
+msgstr "Opções de Visualização"
+
+#: extensions/amavis/app_settings.py:91 extensions/webmail/app_settings.py:91
 msgid "Number of displayed emails per page"
 msgstr "Número de e-mails a visíveis por página"
 
-#: extensions/amavis/app_settings.py:88
+#: extensions/amavis/app_settings.py:92
 #, fuzzy
 msgid "Set the maximum number of messages displayed in a page"
 msgstr "Define o número máximo de mensagens a mostrar por página"
@@ -1679,11 +1693,11 @@ msgstr ""
 msgid "Auto-reply message"
 msgstr "Mensagem de resposta automática"
 
-#: extensions/postfix_autoreply/app_settings.py:11
+#: extensions/postfix_autoreply/app_settings.py:14
 msgid "Automatic reply timeout"
 msgstr ""
 
-#: extensions/postfix_autoreply/app_settings.py:13
+#: extensions/postfix_autoreply/app_settings.py:16
 msgid "Timeout in seconds between two auto-replies to the same recipient"
 msgstr ""
 "Tempo limite em segundos entre duas respostas automáticas para o mesmo "
@@ -1774,11 +1788,11 @@ msgstr "Método de autenticação preferencial"
 msgid "Prefered authentication mechanism"
 msgstr "Método de autenticação preferencial"
 
-#: extensions/sievefilters/app_settings.py:52
+#: extensions/sievefilters/app_settings.py:54
 msgid "Editor mode"
 msgstr "Modo de edição"
 
-#: extensions/sievefilters/app_settings.py:54
+#: extensions/sievefilters/app_settings.py:56
 msgid "Select the mode you want the editor to work in"
 msgstr "Seleccione o modo de funcionamento do editor"
 
@@ -1975,27 +1989,27 @@ msgstr "Estatísticas gráficas"
 msgid "Statistics"
 msgstr "Estatísticas"
 
-#: extensions/stats/app_settings.py:11
+#: extensions/stats/app_settings.py:14
 msgid "Path to the log file"
 msgstr ""
 
-#: extensions/stats/app_settings.py:13
+#: extensions/stats/app_settings.py:16
 msgid "Path to log file used to collect statistics"
 msgstr "Caminho para o ficheiro de log usado para recolher as estatísticas"
 
-#: extensions/stats/app_settings.py:17
+#: extensions/stats/app_settings.py:20
 msgid "Directory to store RRD files"
 msgstr ""
 
-#: extensions/stats/app_settings.py:19
+#: extensions/stats/app_settings.py:22
 msgid "Path to directory where RRD files are stored"
 msgstr "Caminho para o directório onde os ficheiros RRD são guardados"
 
-#: extensions/stats/app_settings.py:23
+#: extensions/stats/app_settings.py:26
 msgid "Directory to store PNG files"
 msgstr ""
 
-#: extensions/stats/app_settings.py:25
+#: extensions/stats/app_settings.py:28
 msgid "Path to directory where PNG files are stored"
 msgstr "Caminho para o directório PNG onde os ficheiros são guardados"
 
@@ -2162,11 +2176,6 @@ msgstr ""
 msgid "Server needs authentication"
 msgstr "O servidor requer autenticação"
 
-#: extensions/webmail/app_settings.py:73
-#, fuzzy
-msgid "Display"
-msgstr "Opções de Visualização"
-
 #: extensions/webmail/app_settings.py:77
 msgid "Default message display mode"
 msgstr "Modo de visualização predefinido"
@@ -2525,11 +2534,11 @@ msgstr "Preferências"
 msgid "Per-user settings"
 msgstr ""
 
-#: userprefs/app_settings.py:19
+#: userprefs/app_settings.py:22
 msgid "Prefered language"
 msgstr "Idioma preferido"
 
-#: userprefs/app_settings.py:23
+#: userprefs/app_settings.py:26
 msgid "Prefered language to display pages"
 msgstr "Idioma preferido para exibir páginas"
 
diff --git a/modoboa/locale/sv/LC_MESSAGES/django.po b/modoboa/locale/sv/LC_MESSAGES/django.po
index 0db1f4624..f16a94e7f 100644
--- a/modoboa/locale/sv/LC_MESSAGES/django.po
+++ b/modoboa/locale/sv/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Modoboa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-22 17:38+0200\n"
+"POT-Creation-Date: 2013-05-24 10:10+0200\n"
 "PO-Revision-Date: 2013-02-14 22:43+0000\n"
 "Last-Translator: ogg1980 <olle@dalnix.se>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,7 +28,10 @@ msgid "Web based console to manage domains, accounts and aliases"
 msgstr ""
 
 #: admin/__init__.py:16 admin/forms.py:179 admin/forms.py:614
-#: admin/views.py:93 admin/views.py:441 extensions/webmail/app_settings.py:11
+#: admin/views.py:93 admin/views.py:441
+#: extensions/postfix_autoreply/app_settings.py:11
+#: extensions/sievefilters/app_settings.py:50
+#: extensions/stats/app_settings.py:11 extensions/webmail/app_settings.py:11
 #: userprefs/__init__.py:15
 msgid "General"
 msgstr "Generellt"
@@ -1227,103 +1230,114 @@ msgstr "%d väntande förfrågningar"
 msgid "Content filter"
 msgstr "Innehålls filter"
 
-#: extensions/amavis/app_settings.py:12
+#: extensions/amavis/app_settings.py:11
+#, fuzzy
+msgid "Quarantine settings"
+msgstr "Karantän"
+
+#: extensions/amavis/app_settings.py:14
 #, fuzzy
 msgid "Maximum message age"
 msgstr "Markera meddelande"
 
-#: extensions/amavis/app_settings.py:14
+#: extensions/amavis/app_settings.py:16
 msgid "Quarantine messages maximum age (in days) before deletion"
 msgstr "Maximalt antal dagar meddelanden behålls i karantän innan radering"
 
-#: extensions/amavis/app_settings.py:17
+#: extensions/amavis/app_settings.py:19
 #, fuzzy
 msgid "Messages releasing"
 msgstr "Meddelande släppt"
 
-#: extensions/amavis/app_settings.py:20
+#: extensions/amavis/app_settings.py:22
 #, fuzzy
 msgid "Remove released messages"
 msgstr "mottagna meddelande"
 
-#: extensions/amavis/app_settings.py:22
+#: extensions/amavis/app_settings.py:24
 msgid "Remove messages marked as released while cleaning up the database"
 msgstr "Ta bort meddelanden markerade som släppta när vi städar databasen"
 
-#: extensions/amavis/app_settings.py:26
+#: extensions/amavis/app_settings.py:28
 msgid "Amavis connection mode"
 msgstr ""
 
-#: extensions/amavis/app_settings.py:29
+#: extensions/amavis/app_settings.py:31
 msgid "Mode used to access the PDP server"
 msgstr "Läge som används för att komma åt PDP-servern"
 
-#: extensions/amavis/app_settings.py:34
+#: extensions/amavis/app_settings.py:36
 #, fuzzy
 msgid "PDP server address"
 msgstr "PDP-server adress (om inet läge)"
 
-#: extensions/amavis/app_settings.py:36
+#: extensions/amavis/app_settings.py:38
 msgid "PDP server address (if inet mode)"
 msgstr "PDP-server adress (om inet läge)"
 
-#: extensions/amavis/app_settings.py:40
+#: extensions/amavis/app_settings.py:42
 #, fuzzy
 msgid "PDP server port"
 msgstr "PDP serverport (om inet läge)"
 
-#: extensions/amavis/app_settings.py:42
+#: extensions/amavis/app_settings.py:44
 msgid "PDP server port (if inet mode)"
 msgstr "PDP serverport (om inet läge)"
 
-#: extensions/amavis/app_settings.py:46
+#: extensions/amavis/app_settings.py:48
 msgid "PDP server socket"
 msgstr ""
 
-#: extensions/amavis/app_settings.py:48
+#: extensions/amavis/app_settings.py:50
 msgid "Path to the PDP server socket (if unix mode)"
 msgstr "Sökväg till PDP-servern uttaget (om Unix-läge)"
 
-#: extensions/amavis/app_settings.py:52
+#: extensions/amavis/app_settings.py:54
 msgid "Check requests interval"
 msgstr ""
 
-#: extensions/amavis/app_settings.py:54
+#: extensions/amavis/app_settings.py:56
 msgid "Interval between two release requests checks"
 msgstr "Intervall mellan frisläppskontroller"
 
-#: extensions/amavis/app_settings.py:58
+#: extensions/amavis/app_settings.py:60
 #, fuzzy
 msgid "Allow direct release"
 msgstr "Tillåt användare att frisläppa sina meddelanden"
 
-#: extensions/amavis/app_settings.py:60
+#: extensions/amavis/app_settings.py:62
 msgid "Allow users to directly release their messages"
 msgstr "Tillåt användare att frisläppa sina meddelanden"
 
-#: extensions/amavis/app_settings.py:64
+#: extensions/amavis/app_settings.py:66
 #, fuzzy
 msgid "Enable self-service mode"
 msgstr "Aktivera \"själv-service\" läge"
 
-#: extensions/amavis/app_settings.py:66
+#: extensions/amavis/app_settings.py:68
 msgid "Activate the 'self-service' mode"
 msgstr "Aktivera \"själv-service\" läge"
 
-#: extensions/amavis/app_settings.py:70
+#: extensions/amavis/app_settings.py:72
 #, fuzzy
 msgid "Notifications sender"
 msgstr "Modifieringar tillämpade."
 
-#: extensions/amavis/app_settings.py:72
+#: extensions/amavis/app_settings.py:74
 msgid "The e-mail address used to send notitications"
 msgstr "E-postadress att använda för att skicka notifikationer"
 
-#: extensions/amavis/app_settings.py:87 extensions/webmail/app_settings.py:91
+#: extensions/amavis/app_settings.py:87 extensions/webmail/app_settings.py:73
+#: userprefs/app_settings.py:18
+#, fuzzy
+msgid "Display"
+msgstr "Visnings alternativ"
+
+#: extensions/amavis/app_settings.py:91 extensions/webmail/app_settings.py:91
 msgid "Number of displayed emails per page"
 msgstr "Antalet visade e-postmeddelanden per sida"
 
-#: extensions/amavis/app_settings.py:88
+#: extensions/amavis/app_settings.py:92
 #, fuzzy
 msgid "Set the maximum number of messages displayed in a page"
 msgstr "Anger det maximala antalet meddelanden som visas på en sida"
@@ -1668,11 +1682,11 @@ msgstr ""
 msgid "Auto-reply message"
 msgstr "Auto-svar meddelande"
 
-#: extensions/postfix_autoreply/app_settings.py:11
+#: extensions/postfix_autoreply/app_settings.py:14
 msgid "Automatic reply timeout"
 msgstr ""
 
-#: extensions/postfix_autoreply/app_settings.py:13
+#: extensions/postfix_autoreply/app_settings.py:16
 msgid "Timeout in seconds between two auto-replies to the same recipient"
 msgstr "Timeout i sekunder mellan två auto-svar till samma mottagare"
 
@@ -1761,11 +1775,11 @@ msgstr "Önskad autentiseringsmekanism"
 msgid "Prefered authentication mechanism"
 msgstr "Önskad autentiseringsmekanism"
 
-#: extensions/sievefilters/app_settings.py:52
+#: extensions/sievefilters/app_settings.py:54
 msgid "Editor mode"
 msgstr "Redigeringsläge"
 
-#: extensions/sievefilters/app_settings.py:54
+#: extensions/sievefilters/app_settings.py:56
 msgid "Select the mode you want the editor to work in"
 msgstr "Välj det läge du vill redigeraren att arbeta i"
 
@@ -1965,27 +1979,27 @@ msgstr "Grafisk statistik"
 msgid "Statistics"
 msgstr "Statistik"
 
-#: extensions/stats/app_settings.py:11
+#: extensions/stats/app_settings.py:14
 msgid "Path to the log file"
 msgstr ""
 
-#: extensions/stats/app_settings.py:13
+#: extensions/stats/app_settings.py:16
 msgid "Path to log file used to collect statistics"
 msgstr "Sökväg till loggfil som används för att samla in statistik"
 
-#: extensions/stats/app_settings.py:17
+#: extensions/stats/app_settings.py:20
 msgid "Directory to store RRD files"
 msgstr ""
 
-#: extensions/stats/app_settings.py:19
+#: extensions/stats/app_settings.py:22
 msgid "Path to directory where RRD files are stored"
 msgstr "Sökväg till katalog där RRD filer lagras"
 
-#: extensions/stats/app_settings.py:23
+#: extensions/stats/app_settings.py:26
 msgid "Directory to store PNG files"
 msgstr ""
 
-#: extensions/stats/app_settings.py:25
+#: extensions/stats/app_settings.py:28
 msgid "Path to directory where PNG files are stored"
 msgstr "Sökväg till katalog där PNG-filer lagras"
 
@@ -2152,11 +2166,6 @@ msgstr ""
 msgid "Server needs authentication"
 msgstr "Servern behöver autentisering"
 
-#: extensions/webmail/app_settings.py:73
-#, fuzzy
-msgid "Display"
-msgstr "Visnings alternativ"
-
 #: extensions/webmail/app_settings.py:77
 msgid "Default message display mode"
 msgstr "Standard visningsläge för meddelande"
@@ -2515,11 +2524,11 @@ msgstr "Inställningar"
 msgid "Per-user settings"
 msgstr ""
 
-#: userprefs/app_settings.py:19
+#: userprefs/app_settings.py:22
 msgid "Prefered language"
 msgstr "Önskat språk"
 
-#: userprefs/app_settings.py:23
+#: userprefs/app_settings.py:26
 msgid "Prefered language to display pages"
 msgstr "Önskat språk för att visa sidor"
 
diff --git a/modoboa/userprefs/app_settings.py b/modoboa/userprefs/app_settings.py
index e48791581..2212b8095 100644
--- a/modoboa/userprefs/app_settings.py
+++ b/modoboa/userprefs/app_settings.py
@@ -3,6 +3,7 @@ from django import forms
 from django.utils.translation import ugettext_lazy
 from django.conf import settings
 from modoboa.lib.parameters import UserParametersForm
+from modoboa.lib.formutils import SeparatorField
 
 
 def translate_language_code(value):
@@ -14,6 +15,8 @@ def translate_language_code(value):
 class UserSettings(UserParametersForm):
     app = "general"
 
+    sep = SeparatorField(label=ugettext_lazy("Display"))
+
     lang = forms.ChoiceField(
         initial=translate_language_code(settings.LANGUAGE_CODE),
         label=ugettext_lazy("Prefered language"),