diff --git a/modoboa/admin/locale/cs_CZ/LC_MESSAGES/django.po b/modoboa/admin/locale/cs_CZ/LC_MESSAGES/django.po
index 6d13d7152..049b780d7 100644
--- a/modoboa/admin/locale/cs_CZ/LC_MESSAGES/django.po
+++ b/modoboa/admin/locale/cs_CZ/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Modoboa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-14 14:13+0100\n"
+"POT-Creation-Date: 2017-01-16 13:02+0100\n"
 "PO-Revision-Date: 2015-01-06 10:05+0000\n"
 "Last-Translator: Miroslav Abrahám <miris@kunago.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/"
@@ -19,47 +19,46 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: admin/app_settings.py:17 admin/handlers.py:245
-#: admin/templates/admin/domain_statistics.html:30
-#: admin/templates/admin/domains.html:4
+#: app_settings.py:17 handlers.py:252
+#: templates/admin/domain_statistics.html:30 templates/admin/domains.html:4
 msgid "Domains"
 msgstr "Domény"
 
-#: admin/app_settings.py:20
+#: app_settings.py:20
 msgid "Enable MX checks"
 msgstr ""
 
-#: admin/app_settings.py:23
+#: app_settings.py:23
 msgid "Check that every domain has a valid MX record"
 msgstr ""
 
-#: admin/app_settings.py:28
+#: app_settings.py:28
 msgid "Valid MXs"
 msgstr ""
 
-#: admin/app_settings.py:31
+#: app_settings.py:31
 msgid ""
-"IP(s) or network(s) of the MX that should match with domains' MX records. On "
-"per line."
+"A list of IP or network address every MX record should match. A warning will "
+"be sent if a record does not respect it."
 msgstr ""
 
-#: admin/app_settings.py:40
+#: app_settings.py:39
 msgid "Enable DNSBL checks"
 msgstr ""
 
-#: admin/app_settings.py:43
+#: app_settings.py:42
 msgid "Check every domain against major DNSBL providers"
 msgstr ""
 
-#: admin/app_settings.py:47 admin/templates/admin/domain_detail.html.py:44
+#: app_settings.py:46 templates/admin/domain_detail.html:44
 msgid "Mailboxes"
 msgstr "Schránky"
 
-#: admin/app_settings.py:50
+#: app_settings.py:49
 msgid "Handle mailboxes on filesystem"
 msgstr "Spravovat schránky v souborovém systému"
 
-#: admin/app_settings.py:53
+#: app_settings.py:52
 msgid ""
 "Rename or remove mailboxes on the filesystem when they get renamed or "
 "removed within Modoboa"
@@ -67,19 +66,19 @@ msgstr ""
 "Přejmenovat nebo odstranit schránky v souborovém systému, pokud jsou "
 "přejmenovány nebo odstraněny v Modoboa"
 
-#: admin/app_settings.py:59
+#: app_settings.py:58
 msgid "Mailboxes owner"
 msgstr "Majitel schránky"
 
-#: admin/app_settings.py:62
+#: app_settings.py:61
 msgid "The UNIX account who owns mailboxes on the filesystem"
 msgstr "Účet UNIXu, který vlastní schránky v souborovém systému"
 
-#: admin/app_settings.py:67
+#: app_settings.py:66
 msgid "Default domain quota"
 msgstr "Výchozí kvóta domény"
 
-#: admin/app_settings.py:70
+#: app_settings.py:69
 msgid ""
 "Default quota (in MB) applied to freshly created domains with no value "
 "specified. A value of 0 means no quota."
@@ -87,36 +86,35 @@ msgstr ""
 "Výchozí kvóta (v MB), které se použije u nově vytvořených domén bez uvedené "
 "hodnoty kvóty. Hodnota 0 znamená, že se kvóta nepoužívá."
 
-#: admin/app_settings.py:76
+#: app_settings.py:75
 msgid "Automatic account removal"
 msgstr "Automatické odstranění účtu"
 
-#: admin/app_settings.py:79
+#: app_settings.py:78
 msgid "When a mailbox is removed, also remove the associated account"
 msgstr "Když je schránka odstraněná, odstranit také přiřazený účet uživatele"
 
-#: admin/app_settings.py:83
+#: app_settings.py:82
 msgid "Automatic domain/mailbox creation"
 msgstr "Automatické vytvoření domény/schránky"
 
-#: admin/app_settings.py:86
+#: app_settings.py:85
 msgid "Create a domain and a mailbox when an account is automatically created."
 msgstr "Při založení účtu automaticky vytvořit doménu a schránku."
 
-#: admin/app_settings.py:133 admin/forms/account.py:288
-#: admin/forms/domain.py:87
+#: app_settings.py:132 forms/account.py:288 forms/domain.py:87
 msgid "Must be a positive integer"
 msgstr "Musí se jednat o kladné číslo"
 
-#: admin/app_settings.py:143
+#: app_settings.py:142
 msgid "Administration"
 msgstr "Správa"
 
-#: admin/forms/account.py:34 admin/templates/admin/domain_detail.html.py:72
+#: forms/account.py:34 templates/admin/domain_detail.html:72
 msgid "Username"
 msgstr "Uživatelské jméno"
 
-#: admin/forms/account.py:36
+#: forms/account.py:36
 msgid ""
 "The user's name. Must be a valid e-mail address for simple users or "
 "administrators with a mailbox."
@@ -124,56 +122,56 @@ msgstr ""
 "Název uživatele. U běžných uživatelů musí být uvedena platná e-mailová "
 "adresa nebo u administrátorů schránka."
 
-#: admin/forms/account.py:41 admin/templates/admin/account_detail.html.py:29
+#: forms/account.py:41 templates/admin/account_detail.html:29
 msgid "Role"
 msgstr "Role"
 
-#: admin/forms/account.py:42
+#: forms/account.py:42
 msgid "Choose"
 msgstr "Vybrat"
 
-#: admin/forms/account.py:43
+#: forms/account.py:43
 msgid "What level of permission this user will have"
 msgstr "Jaká úroveň oprávnění bude tomuto uživateli nastavena"
 
-#: admin/forms/account.py:46
+#: forms/account.py:46
 msgid "Password"
 msgstr "Heslo"
 
-#: admin/forms/account.py:50
+#: forms/account.py:50
 msgid "Confirmation"
 msgstr "Potvrzení"
 
-#: admin/forms/account.py:53
+#: forms/account.py:53
 msgid "Enter the same password as above, for verification."
 msgstr "Vložte stejné heslo jako v poli výše, pro jeho ověření."
 
-#: admin/forms/account.py:64
+#: forms/account.py:64
 msgid "Enabled"
 msgstr "Povoleno"
 
-#: admin/forms/account.py:156
+#: forms/account.py:156
 msgid "The two password fields didn't match."
 msgstr "Obě pole s heslem se neshodují."
 
-#: admin/forms/account.py:171
+#: forms/account.py:171
 msgid "Only super administrators are allowed for this mode"
 msgstr ""
 
-#: admin/forms/account.py:179
+#: forms/account.py:179
 msgid "You can't disable your own account"
 msgstr "Nemůžete zakázat váš vlastní účet"
 
-#: admin/forms/account.py:194
+#: forms/account.py:194
 msgid "E-mail"
 msgstr "E-mail"
 
-#: admin/forms/account.py:196 admin/forms/domain.py:38
-#: admin/templates/admin/account_detail.html:45
+#: forms/account.py:196 forms/domain.py:38
+#: templates/admin/account_detail.html:45
 msgid "Quota"
 msgstr "Kvóta"
 
-#: admin/forms/account.py:198
+#: forms/account.py:198
 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 "
@@ -183,12 +181,11 @@ msgstr ""
 "hodnotu domény. Ponechejte prázdné pro neomezenou kvótu (není povoleno "
 "správcům domény)."
 
-#: admin/forms/account.py:206 admin/forms/domain.py:46
-#: admin/templates/admin/domains.html:35
+#: forms/account.py:206 forms/domain.py:46 templates/admin/domains.html:35
 msgid "Alias(es)"
 msgstr "Alias(y)"
 
-#: admin/forms/account.py:209
+#: forms/account.py:209
 #, fuzzy
 #| msgid ""
 #| "Alias(es) of this mailbox. Indicate only one address per input, press "
@@ -203,13 +200,13 @@ msgstr ""
 "pro vložení dalšího aliasu. Pro vytvoření doménového koše vložte '*' (např. "
 "*@domena.cz)."
 
-#: admin/forms/account.py:215
+#: forms/account.py:215
 #, fuzzy
 #| msgid "Invalid request"
 msgid "Sender addresses"
 msgstr "Neplatný požadavek"
 
-#: admin/forms/account.py:218
+#: forms/account.py:218
 #, fuzzy
 #| msgid ""
 #| "Mailbox(es) this alias will point to. Indicate only one address per "
@@ -223,61 +220,60 @@ msgstr ""
 "řádek pouze jednu adresu; pro vložení další adresy stiskněte po vložení "
 "ENTER."
 
-#: admin/forms/account.py:267 admin/forms/alias.py:92
-#: admin/models/mailbox.py:295
+#: forms/account.py:267 forms/alias.py:92 models/mailbox.py:295
 msgid "Domain does not exist"
 msgstr "Doména neexistuje"
 
-#: admin/forms/account.py:297
+#: forms/account.py:297
 #, fuzzy
 #| msgid "Domain does not exist"
 msgid "Local domain does not exist"
 msgstr "Doména neexistuje"
 
-#: admin/forms/account.py:392
+#: forms/account.py:392
 msgid "Domain(s)"
 msgstr "Doména(y)"
 
-#: admin/forms/account.py:394
+#: forms/account.py:394
 msgid "Domain(s) that user administrates"
 msgstr "Doména(y) pod správou uživatele"
 
-#: admin/forms/account.py:440 admin/forms/account.py:525
-#: admin/forms/domain.py:283 admin/forms/domain.py:350
+#: forms/account.py:440 forms/account.py:525 forms/domain.py:283
+#: forms/domain.py:350
 msgid "General"
 msgstr "Obecné"
 
-#: admin/forms/account.py:445 admin/forms/account.py:531
+#: forms/account.py:445 forms/account.py:531
 msgid "Mail"
 msgstr "Mail"
 
-#: admin/forms/account.py:447
+#: forms/account.py:447
 msgid "Permissions"
 msgstr "Oprávnění"
 
-#: admin/forms/account.py:514
+#: forms/account.py:514
 msgid "Account updated"
 msgstr "Účet aktualizován"
 
-#: admin/forms/account.py:538
+#: forms/account.py:538
 msgid "New account"
 msgstr "Nový účet"
 
-#: admin/forms/account.py:550
+#: forms/account.py:550
 msgid "Account created"
 msgstr "Účet vytvořen"
 
-#: admin/forms/alias.py:24
+#: forms/alias.py:24
 #, fuzzy
 #| msgid "Invalid request"
 msgid "Random address"
 msgstr "Neplatný požadavek"
 
-#: admin/forms/alias.py:27
+#: forms/alias.py:27
 msgid "Email address"
 msgstr "Emailová adresa"
 
-#: admin/forms/alias.py:29
+#: forms/alias.py:29
 #, fuzzy
 #| msgid ""
 #| "The alias address (without the domain part). For a 'catch-all' address, "
@@ -289,11 +285,11 @@ msgstr ""
 "Alias adresy (bez části označující doménu). Pro vytvoření doménového koše "
 "vložte znak '*'."
 
-#: admin/forms/alias.py:35 admin/templates/admin/alias_detail.html.py:37
+#: forms/alias.py:35 templates/admin/alias_detail.html:37
 msgid "Recipients"
 msgstr "Příjemci"
 
-#: admin/forms/alias.py:37
+#: forms/alias.py:37
 #, fuzzy
 #| msgid ""
 #| "Mailbox(es) this alias will point to. Indicate only one address per "
@@ -306,30 +302,30 @@ msgstr ""
 "řádek pouze jednu adresu; pro vložení další adresy stiskněte po vložení "
 "ENTER."
 
-#: admin/forms/alias.py:47 admin/forms/domain.py:26 admin/models/domain.py:91
-#: admin/templates/admin/domain_statistics.html:49
+#: forms/alias.py:47 forms/domain.py:26 models/domain.py:92
+#: templates/admin/domain_statistics.html:49
 msgid "Domain"
 msgstr "Doména"
 
-#: admin/forms/alias.py:95
+#: forms/alias.py:95
 msgid "You don't have access to this domain"
 msgstr "Nemáte oprávnění k přístupu k této doméně"
 
-#: admin/forms/alias.py:112 admin/forms/alias.py:114
+#: forms/alias.py:112 forms/alias.py:114
 #, fuzzy
 #| msgid "A mailbox is required"
 msgid "This field is required"
 msgstr "Schránka je vyžadována"
 
-#: admin/forms/alias.py:118
+#: forms/alias.py:118
 msgid "No recipient defined"
 msgstr "Nebyl určen příjemce"
 
-#: admin/forms/domain.py:35 admin/templates/admin/domain_statistics.html.py:26
+#: forms/domain.py:35 templates/admin/domain_statistics.html:26
 msgid "Type"
 msgstr "Typ"
 
-#: admin/forms/domain.py:41
+#: forms/domain.py:41
 msgid ""
 "Default quota in MB applied to mailboxes. Leave empty to use the default "
 "value."
@@ -337,7 +333,7 @@ msgstr ""
 "Výchozí kvóta v MB pro schránky. Ponechejte prázdné pro výchozí nastavení "
 "kvóty."
 
-#: admin/forms/domain.py:49
+#: forms/domain.py:49
 msgid ""
 "Alias(es) of this domain. Indicate only one name per input, press ENTER to "
 "add a new input."
@@ -345,106 +341,104 @@ msgstr ""
 "Alias(y) této domény. Uveďte na řádek pouze jeden alias; pro vložení dalšího "
 "aliasu stiskněte po vložení ENTER."
 
-#: admin/forms/domain.py:103 admin/handlers.py:148
+#: forms/domain.py:103 handlers.py:155
 msgid "domain alias"
 msgstr "doménový alias"
 
-#: admin/forms/domain.py:106 admin/forms/domain.py:118
-#: admin/forms/domain.py:126
+#: forms/domain.py:106 forms/domain.py:118 forms/domain.py:126
 #, python-format
 msgid "A %s with this name already exists"
 msgstr "%s s tímto názvem již existuje"
 
-#: admin/forms/domain.py:118 admin/forms/domain.py:123
+#: forms/domain.py:118 forms/domain.py:123
 msgid "domain"
 msgstr "doména"
 
-#: admin/forms/domain.py:171
+#: forms/domain.py:171
 msgid "Create a domain administrator"
 msgstr "Vytvořit správce domény"
 
-#: admin/forms/domain.py:174
+#: forms/domain.py:174
 msgid "Automatically create an administrator for this domain"
 msgstr "Automaticky vytvořit správce této domény"
 
-#: admin/forms/domain.py:179 admin/templates/admin/domain_detail.html.py:72
-#: admin/templates/admin/domains.html:34
-#: admin/templates/admin/identity_headers.html:2
-#: admin/templates/admin/mx_domain_detail.html:9
+#: forms/domain.py:179 templates/admin/domain_detail.html:72
+#: templates/admin/domains.html:34 templates/admin/identity_headers.html:2
+#: templates/admin/mx_domain_detail.html:9
 msgid "Name"
 msgstr "Jméno"
 
-#: admin/forms/domain.py:182
+#: forms/domain.py:182
 msgid ""
 "The administrator's name. Don't include the domain's name here, it will be "
 "automatically appended."
 msgstr ""
 "Jméno správce. Nevkládejte sem název domény, název bude automaticky doplněn."
 
-#: admin/forms/domain.py:189
+#: forms/domain.py:189
 msgid "Create aliases"
 msgstr "Vytvořit aliasy"
 
-#: admin/forms/domain.py:192
+#: forms/domain.py:192
 msgid "Automatically create standard aliases for this domain"
 msgstr "Automaticky vytvořit běžné aliasy pro tuto doménu"
 
-#: admin/forms/domain.py:208
+#: forms/domain.py:208
 msgid "Invalid format"
 msgstr "Neplatný formát"
 
-#: admin/forms/domain.py:217 admin/forms/domain.py:220
+#: forms/domain.py:217 forms/domain.py:220
 #, fuzzy
 #| msgid "A mailbox is required"
 msgid "This field is required."
 msgstr "Schránka je vyžadována"
 
-#: admin/forms/domain.py:237
+#: forms/domain.py:237
 #, python-format
 msgid "User '%s' already exists"
 msgstr "Uživatel '%s' již existuje"
 
-#: admin/forms/domain.py:339
+#: forms/domain.py:339
 msgid "Domain modified"
 msgstr "Doména upravena"
 
-#: admin/forms/domain.py:360
+#: forms/domain.py:360
 msgid "Options"
 msgstr "Možnosti"
 
-#: admin/forms/domain.py:368
+#: forms/domain.py:368
 msgid "New domain"
 msgstr "Nová doména"
 
-#: admin/forms/domain.py:381
+#: forms/domain.py:381
 msgid "Domain created"
 msgstr "Doména vytvořena"
 
-#: admin/forms/export.py:7
+#: forms/export.py:7
 msgid "File name"
 msgstr "Název souboru"
 
-#: admin/forms/export.py:13 admin/forms/import_.py:13
+#: forms/export.py:13 forms/import_.py:13
 msgid "Separator"
 msgstr "Oddělovač"
 
-#: admin/forms/forward.py:14
+#: forms/forward.py:14
 msgid "Recipient(s)"
 msgstr "Příjemce(i)"
 
-#: admin/forms/forward.py:18
+#: forms/forward.py:18
 msgid "Indicate one or more recipients separated by a ','"
 msgstr "Uveďte jednoho nebo více příjemců oddělených pomocí ','"
 
-#: admin/forms/forward.py:21
+#: forms/forward.py:21
 msgid "Keep local copies"
 msgstr "Ponechat místní kopie"
 
-#: admin/forms/forward.py:24
+#: forms/forward.py:24
 msgid "Forward messages and store copies into your local mailbox"
 msgstr "Přeposílat zprávy a ukládat kopie do místní schránky"
 
-#: admin/forms/forward.py:42
+#: forms/forward.py:42
 msgid ""
 "You can't define a forward to a local destination. Please ask your "
 "administrator to create an alias instead."
@@ -452,464 +446,456 @@ msgstr ""
 "Nemůžete nastavit přeposílání na místní adresu. Požádejte správce o "
 "vytvoření aliasu."
 
-#: admin/forms/import_.py:11
+#: forms/import_.py:11
 msgid "Select a file"
 msgstr "Vybrat soubor"
 
-#: admin/forms/import_.py:19
+#: forms/import_.py:19
 msgid "Continue on error"
 msgstr "Při výskytu chyby pokračovat"
 
-#: admin/forms/import_.py:20
+#: forms/import_.py:20
 msgid "Don't treat duplicated objects as error"
 msgstr "Nepovažovat duplikáty objektů za chybu"
 
-#: admin/forms/import_.py:38
+#: forms/import_.py:38
 msgid "Crypt passwords"
 msgstr "Zašifrovat hesla"
 
-#: admin/forms/import_.py:40
+#: forms/import_.py:40
 msgid "Check this option if passwords contained in your file are not crypted"
 msgstr "Zatrhněte toto pole, pokud hesla ve vašem souboru nejsou zašifrována"
 
-#: admin/handlers.py:194
+#: handlers.py:201
 #, python-format
 msgid "Account import failed (%s): domain does not exist"
 msgstr "Import účtu nebyl úspěšný (%s): doména neexistuje"
 
-#: admin/handlers.py:207 admin/models/mailbox.py:320
+#: handlers.py:214 models/mailbox.py:320
 #, fuzzy
 #| msgid "Mailbox %s already exists"
 msgid "Mailbox {} already exists"
 msgstr "Schránka %s již existuje"
 
-#: admin/handlers.py:215
+#: handlers.py:222
 #, python-format
 msgid "Account import failed (%s): wrong quota value"
 msgstr "Import účtu selhal (%s): chybná hodnota kvóty"
 
-#: admin/handlers.py:255 admin/templates/admin/domain_statistics.html.py:36
-#: admin/templates/admin/domain_statistics.html:50
-#: admin/templates/admin/identities.html:5
+#: handlers.py:262 templates/admin/domain_statistics.html:36
+#: templates/admin/domain_statistics.html:50 templates/admin/identities.html:5
 msgid "Identities"
 msgstr "Identity"
 
-#: admin/handlers.py:271 admin/templates/admin/forward.html.py:2
+#: handlers.py:278 templates/admin/forward.html:2
 msgid "Forward"
 msgstr "Přeposlat"
 
-#: admin/lib.py:32
+#: lib.py:32
 msgid "A mailbox is required"
 msgstr "Schránka je vyžadována"
 
-#: admin/lib.py:122
+#: lib.py:122
 #, fuzzy
 #| msgid "You can't delete your own domain"
 msgid "You are not allowed to import domains"
 msgstr "Nemůžete smazat vlastní doménu"
 
-#: admin/lib.py:133
+#: lib.py:133
 msgid "You are not allowed to import domain aliases."
 msgstr ""
 
-#: admin/management/commands/subcommands/_mx.py:159
+#: management/commands/subcommands/_mx.py:159
 msgid "[modoboa] DNSBL issue(s) for domain {}"
 msgstr ""
 
-#: admin/management/commands/subcommands/_mx.py:180
+#: management/commands/subcommands/_mx.py:180
 msgid "Domain {} has no MX record"
 msgstr ""
 
-#: admin/management/commands/subcommands/_mx.py:191
+#: management/commands/subcommands/_mx.py:191
 #, python-brace-format
 msgid "MX record for domain {0} is invalid: {1}"
 msgstr ""
 
-#: admin/management/commands/subcommands/_mx.py:207
+#: management/commands/subcommands/_mx.py:207
 msgid "[modoboa] MX issue(s) for domain {}"
 msgstr ""
 
-#: admin/models/alias.py:31 admin/models/mailbox.py:80
+#: models/alias.py:31 models/mailbox.py:80
 msgid "address"
 msgstr "adresa"
 
-#: admin/models/alias.py:33
+#: models/alias.py:33
 #, fuzzy
 #| msgid "The alias name"
 msgid "The alias address."
 msgstr "Název aliasu"
 
-#: admin/models/alias.py:38 admin/models/domain.py:46
-#: admin/models/domain_alias.py:44
+#: models/alias.py:38 models/domain.py:47 models/domain_alias.py:44
 msgid "enabled"
 msgstr "povoleno"
 
-#: admin/models/alias.py:39 admin/models/domain_alias.py:45
+#: models/alias.py:39 models/domain_alias.py:45
 msgid "Check to activate this alias"
 msgstr "Zatrhněte pole pro povolení tohoto aliasu"
 
-#: admin/models/alias.py:44 admin/templates/admin/alias_detail.html.py:32
+#: models/alias.py:44 templates/admin/alias_detail.html:32
 msgid "Description"
 msgstr ""
 
-#: admin/models/alias.py:46 admin/templates/admin/alias_detail.html.py:29
+#: models/alias.py:46 templates/admin/alias_detail.html:29
 msgid "Expire at"
 msgstr ""
 
-#: admin/models/alias.py:89
+#: models/alias.py:89
 msgid "alias"
 msgstr "alias"
 
-#: admin/models/alias.py:121
+#: models/alias.py:121
 #, fuzzy
 #| msgid "Invalid request"
 msgid "Invalid address"
 msgstr "Neplatný požadavek"
 
-#: admin/models/alias.py:142
+#: models/alias.py:142
 #, fuzzy
 #| msgid "Local recipient %s not found"
 msgid "Local recipient {}@{} not found"
 msgstr "Místní příjemce %s nebyl nalezen"
 
-#: admin/models/alias.py:172
+#: models/alias.py:172
 #, python-format
 msgid "Invalid line: %s"
 msgstr "Neplatný řádek: %s"
 
-#: admin/models/alias.py:178
+#: models/alias.py:178
 #, python-format
 msgid "Domain '%s' does not exist"
 msgstr "Doména '%s' neexistuje"
 
-#: admin/models/domain.py:42 admin/models/domain_alias.py:37
+#: models/domain.py:43 models/domain_alias.py:37
 msgid "name"
 msgstr "název"
 
-#: admin/models/domain.py:43
+#: models/domain.py:44
 msgid "The domain name"
 msgstr "Doménové jméno"
 
-#: admin/models/domain.py:47
+#: models/domain.py:48
 msgid "Check to activate this domain"
 msgstr "Zatrhněte pole pro povolení této domény"
 
-#: admin/models/domain.py:208 admin/models/domain_alias.py:71
+#: models/domain.py:215 models/domain_alias.py:71
 msgid "Invalid line"
 msgstr "Neplatný řádek"
 
-#: admin/models/domain.py:216
+#: models/domain.py:223
 #, python-format
 msgid "Invalid quota value for domain '%s'"
 msgstr "Neplatná hodnota kvóty u domény '%s'"
 
-#: admin/models/domain_alias.py:38
+#: models/domain_alias.py:38
 msgid "The alias name"
 msgstr "Název aliasu"
 
-#: admin/models/domain_alias.py:40
+#: models/domain_alias.py:40
 msgid "target"
 msgstr "cíl"
 
-#: admin/models/domain_alias.py:41
+#: models/domain_alias.py:41
 msgid "The domain this alias points to"
 msgstr "Doména, na kterou tento alias odkazuje"
 
-#: admin/models/domain_alias.py:80
+#: models/domain_alias.py:80
 #, python-format
 msgid "Unknown domain %s"
 msgstr "Neznámá doména %s"
 
-#: admin/models/mailbox.py:82
+#: models/mailbox.py:82
 msgid "Mailbox address (without the @domain.tld part)"
 msgstr "Adresa schránky (bez části @doména.tld)"
 
-#: admin/models/mailbox.py:148
+#: models/mailbox.py:148
 #, python-format
 msgid "Failed to retrieve mailbox location (%s)"
 msgstr "Nebylo možné zjistit umístění schránky (%s)"
 
-#: admin/models/mailbox.py:238
+#: models/mailbox.py:238
 #, python-format
 msgid "Quota is greater than the allowed domain's limit (%dM)"
 msgstr "Zvolená kvóta je větší než povolené omezení domény (%dM)"
 
-#: admin/models/mailbox.py:244
+#: models/mailbox.py:244
 msgid "A quota is required"
 msgstr "Kvóta je vyžadována"
 
-#: admin/serializers.py:45 admin/serializers.py:228 admin/serializers.py:317
+#: serializers.py:45 serializers.py:228 serializers.py:317
 #, fuzzy
 #| msgid "Permissions"
 msgid "Permission denied."
 msgstr "Oprávnění"
 
-#: admin/serializers.py:83
+#: serializers.py:83
 msgid ""
 "List of administered domains (resellers and domain administrators only)."
 msgstr ""
 
-#: admin/serializers.py:193
+#: serializers.py:193
 msgid "Not allowed for this role."
 msgstr ""
 
-#: admin/serializers.py:203
+#: serializers.py:203
 msgid "Must be equal to mailbox full_address"
 msgstr ""
 
-#: admin/serializers.py:215
+#: serializers.py:215
 #, fuzzy
 #| msgid "Domain does not exist"
 msgid "Local domain {} does not exist"
 msgstr "Doména neexistuje"
 
-#: admin/serializers.py:315
+#: serializers.py:315
 #, fuzzy
 #| msgid "Domain modified"
 msgid "Domain not found."
 msgstr "Doména upravena"
 
-#: admin/templates/admin/account_detail.html:16
-#: admin/templates/admin/alias_detail.html:16
-#: admin/templates/admin/domain_detail.html:15
-#: admin/templates/admin/identities_table.html:7
+#: templates/admin/account_detail.html:16 templates/admin/alias_detail.html:16
+#: templates/admin/domain_detail.html:15
+#: templates/admin/identities_table.html:7
 #, fuzzy
 #| msgid "disabled"
 msgid "(disabled)"
 msgstr "zákázáno"
 
-#: admin/templates/admin/account_detail.html:22
-#: admin/templates/admin/alias_detail.html:22
-#: admin/templates/admin/domain_detail.html:21
+#: templates/admin/account_detail.html:22 templates/admin/alias_detail.html:22
+#: templates/admin/domain_detail.html:21
 msgid "Summary"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:26
+#: templates/admin/account_detail.html:26
 #, fuzzy
 #| msgid "File name"
 msgid "Full name"
 msgstr "Název souboru"
 
-#: admin/templates/admin/account_detail.html:32
-#: admin/templates/admin/alias_detail.html:26
+#: templates/admin/account_detail.html:32 templates/admin/alias_detail.html:26
 #, fuzzy
 #| msgid "Create"
 msgid "Created"
 msgstr "Vytvořit"
 
-#: admin/templates/admin/account_detail.html:35
+#: templates/admin/account_detail.html:35
 msgid "Last login"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:38
+#: templates/admin/account_detail.html:38
 msgid "Secondary email"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:38
-#: admin/templates/admin/account_detail.html:41
+#: templates/admin/account_detail.html:38
+#: templates/admin/account_detail.html:41
 #, fuzzy
 #| msgid "No recipient defined"
 msgid "Not defined"
 msgstr "Nebyl určen příjemce"
 
-#: admin/templates/admin/account_detail.html:41
+#: templates/admin/account_detail.html:41
 msgid "Phone number"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:55
+#: templates/admin/account_detail.html:55
 #, fuzzy
 #| msgid "Administration"
 msgid "Administered domains"
 msgstr "Správa"
 
-#: admin/templates/admin/account_detail.html:61
+#: templates/admin/account_detail.html:61
 #, fuzzy
 #| msgid "No recipient defined"
 msgid "No domain defined."
 msgstr "Nebyl určen příjemce"
 
-#: admin/templates/admin/account_detail.html:75
+#: templates/admin/account_detail.html:75
 #, fuzzy
 #| msgid "Alias(es)"
 msgid "Aliases"
 msgstr "Alias(y)"
 
-#: admin/templates/admin/account_detail.html:81
+#: templates/admin/account_detail.html:81
 #, fuzzy
 #| msgid "No recipient defined"
 msgid "No alias defined"
 msgstr "Nebyl určen příjemce"
 
-#: admin/templates/admin/account_detail.html:87
+#: templates/admin/account_detail.html:87
 msgid "Additional sender addresses"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:93
+#: templates/admin/account_detail.html:93
 msgid "No sender address defined"
 msgstr ""
 
-#: admin/templates/admin/account_general_form.html:11
-#: admin/templates/admin/aliasform.html:13
+#: templates/admin/account_general_form.html:11
+#: templates/admin/aliasform.html:13
 msgid "Domain is disabled"
 msgstr "Doména je zakázána"
 
-#: admin/templates/admin/alias_detail.html:16
-#: admin/templates/admin/identities.html:33
+#: templates/admin/alias_detail.html:16 templates/admin/identities.html:33
 #, fuzzy
 #| msgid "alias"
 msgid "Alias"
 msgstr "alias"
 
-#: admin/templates/admin/alias_detail.html:27
+#: templates/admin/alias_detail.html:27
 #, fuzzy
 #| msgid "Alias modified"
 msgid "Modified"
 msgstr "Alias upraven"
 
-#: admin/templates/admin/dnsbl_domain_detail.html:10
+#: templates/admin/dnsbl_domain_detail.html:10
 msgid "Provider"
 msgstr ""
 
-#: admin/templates/admin/dnsbl_domain_detail.html:11
-#: admin/templates/admin/mx_domain_detail.html:10
-#: admin/templates/admin/quota_headers.html:2
+#: templates/admin/dnsbl_domain_detail.html:11
+#: templates/admin/mx_domain_detail.html:10
+#: templates/admin/quota_headers.html:2
 msgid "Address"
 msgstr "Adresa"
 
-#: admin/templates/admin/dnsbl_domain_detail.html:12
+#: templates/admin/dnsbl_domain_detail.html:12
 #, fuzzy
 #| msgid "Statistics"
 msgid "Status"
 msgstr "Statistiky"
 
-#: admin/templates/admin/dnsbl_domain_detail.html:21
+#: templates/admin/dnsbl_domain_detail.html:21
 msgid "listed"
 msgstr ""
 
-#: admin/templates/admin/dnsbl_domain_detail.html:29
+#: templates/admin/dnsbl_domain_detail.html:29
 msgid "Everything is fine, this domain is not listed."
 msgstr ""
 
-#: admin/templates/admin/dnsbl_domain_detail.html:32
+#: templates/admin/dnsbl_domain_detail.html:32
 msgid "No information available for this domain."
 msgstr ""
 
-#: admin/templates/admin/domain_detail.html:26
-#: admin/templates/admin/domains.html:38
+#: templates/admin/domain_detail.html:26 templates/admin/domains.html:38
 #, fuzzy
 #| msgid "Statistics"
 msgid "DNS status"
 msgstr "Statistiky"
 
-#: admin/templates/admin/domain_detail.html:28
-#: admin/templates/admin/domains_table.html:12
+#: templates/admin/domain_detail.html:28 templates/admin/domains_table.html:14
 msgid "Awaiting checks"
 msgstr ""
 
-#: admin/templates/admin/domain_detail.html:40
+#: templates/admin/domain_detail.html:40
 msgid "Creation date"
 msgstr "Datum vytvoření"
 
-#: admin/templates/admin/domain_detail.html:42
+#: templates/admin/domain_detail.html:42
 msgid "Last modification date"
 msgstr "Datum poslední změny"
 
-#: admin/templates/admin/domain_detail.html:43
-#: admin/templates/admin/domain_detail.html:52
-#: admin/templates/admin/domain_statistics.html:33
+#: templates/admin/domain_detail.html:43 templates/admin/domain_detail.html:52
+#: templates/admin/domain_statistics.html:33
 msgid "Domain aliases"
 msgstr "Doménové aliasy"
 
-#: admin/templates/admin/domain_detail.html:45
+#: templates/admin/domain_detail.html:45
 msgid "Mailbox aliases"
 msgstr "Aliasy schránek"
 
-#: admin/templates/admin/domain_detail.html:69
+#: templates/admin/domain_detail.html:69
 msgid "Administrators"
 msgstr "Správci"
 
-#: admin/templates/admin/domain_detail.html:79
-#: admin/templatetags/admin_tags.py:259
+#: templates/admin/domain_detail.html:79 templatetags/admin_tags.py:259
 msgid "Remove this permission"
 msgstr "Odstranit toto oprávnění"
 
-#: admin/templates/admin/domain_detail.html:84
+#: templates/admin/domain_detail.html:84
 #, fuzzy
 #| msgid "No domain administrator defined"
 msgid "No domain administrator defined yet."
 msgstr " Nebyl určen správce domény"
 
-#: admin/templates/admin/domain_general_form.html:4
-#: admin/templates/admin/mailform.html:4
-#: admin/templates/admin/newdomainform.html:3
+#: templates/admin/domain_general_form.html:4 templates/admin/mailform.html:4
+#: templates/admin/newdomainform.html:3
 msgid "MB"
 msgstr "MB"
 
-#: admin/templates/admin/domain_options_form.html:7
+#: templates/admin/domain_options_form.html:7
 msgid "You can't create a new domain administrator"
 msgstr "Nemůžete vytvořit nového správce domény"
 
-#: admin/templates/admin/domain_statistics.html:15
-#: admin/templatetags/admin_tags.py:44
+#: templates/admin/domain_statistics.html:15 templatetags/admin_tags.py:44
 msgid "Statistics"
 msgstr "Statistiky"
 
-#: admin/templates/admin/domain_statistics.html:15
+#: templates/admin/domain_statistics.html:15
 msgid "Domains and identities"
 msgstr "Domény a identity"
 
-#: admin/templates/admin/domain_statistics.html:22
+#: templates/admin/domain_statistics.html:22
 msgid "Global counters"
 msgstr "Globální počitadla"
 
-#: admin/templates/admin/domain_statistics.html:27
+#: templates/admin/domain_statistics.html:27
 msgid "Quantity"
 msgstr "Počet"
 
-#: admin/templates/admin/domain_statistics.html:45
+#: templates/admin/domain_statistics.html:45
 msgid "Per-domain counters"
 msgstr "Počitadla dle domén"
 
-#: admin/templates/admin/domains.html:26
-#: admin/templates/admin/identities.html:29
+#: templates/admin/domains.html:26 templates/admin/identities.html:29
 #, fuzzy
 #| msgid "Address"
 msgid "Add"
 msgstr "Adresa"
 
-#: admin/templates/admin/domains.html:36
-#: admin/templates/admin/identity_headers.html:4
+#: templates/admin/domains.html:36 templates/admin/identity_headers.html:4
 msgid "Tags"
 msgstr "Značky"
 
-#: admin/templates/admin/domains.html:40
-#: admin/templates/admin/identity_headers.html:5
+#: templates/admin/domains.html:40 templates/admin/identity_headers.html:5
 msgid "Actions"
 msgstr "Akce"
 
-#: admin/templates/admin/domains_table.html:5
+#: templates/admin/domains_table.html:5
 msgid "disabled"
 msgstr "zákázáno"
 
-#: admin/templates/admin/forward.html:2
+#: templates/admin/domains_table.html:12
+#, fuzzy
+#| msgid "disabled"
+msgctxt "checks"
+msgid "Disabled"
+msgstr "zákázáno"
+
+#: templates/admin/forward.html:2
 msgid "Automatically forward emails to another address"
 msgstr "Automaticky přesměrovat emaily na jinou adresu"
 
-#: admin/templates/admin/forward.html:9 admin/views/alias.py:91
+#: templates/admin/forward.html:9 views/alias.py:91
 msgid "Update"
 msgstr "Aktualizovat"
 
-#: admin/templates/admin/identities.html:32
+#: templates/admin/identities.html:32
 #, fuzzy
 #| msgid "Add account"
 msgid "Account"
 msgstr "Přidat účet"
 
-#: admin/templates/admin/identity_headers.html:3
+#: templates/admin/identity_headers.html:3
 msgid "Fullname/Recipient"
 msgstr "Celé jméno/Příjemce"
 
-#: admin/templates/admin/import_domains_form.html:6
+#: templates/admin/import_domains_form.html:6
 #, fuzzy
 #| msgid ""
 #| "Provide a CSV file where lines respect one of the following formats:\n"
@@ -940,7 +926,7 @@ msgstr ""
 "předchozích hodnot.</p>\n"
 "<p>Můžete také použít jiný oddělovač hodnot.</p>\n"
 
-#: admin/templates/admin/import_identities_form.html:6
+#: templates/admin/import_identities_form.html:6
 #, fuzzy
 #| msgid ""
 #| "Provide a CSV file where lines respect one of the following formats:\n"
@@ -976,138 +962,138 @@ msgstr ""
 "předchozích hodnot.</p>\n"
 "<p>Můžete také použít jiný oddělovač hodnot.</p>\n"
 
-#: admin/templates/admin/importform.html:6
+#: templates/admin/importform.html:6
 msgid "Help"
 msgstr "Nápověda"
 
-#: admin/templates/admin/importform.html:13
+#: templates/admin/importform.html:13
 msgid "Importing..."
 msgstr "Importuji..."
 
-#: admin/templates/admin/mailboxes_raw.html:3
+#: templates/admin/mailboxes_raw.html:3
 msgid "Choose a value"
 msgstr "Zvolte hodnotu"
 
-#: admin/templates/admin/mailform.html:4
+#: templates/admin/mailform.html:4
 msgid "Use domain default value"
 msgstr "Použít výchozí hodnotu domény"
 
-#: admin/templates/admin/mx_domain_detail.html:11
+#: templates/admin/mx_domain_detail.html:11
 #, fuzzy
 #| msgid "Update"
 msgid "Updated"
 msgstr "Aktualizovat"
 
-#: admin/templates/admin/mx_domain_detail.html:23
+#: templates/admin/mx_domain_detail.html:23
 msgid "This IP does not match any of the valid MXs defined in parameters"
 msgstr ""
 
-#: admin/templates/admin/mx_domain_detail.html:36
+#: templates/admin/mx_domain_detail.html:36
 msgid "No MX record found for this domain."
 msgstr ""
 
-#: admin/templates/admin/notifications/domain_in_dnsbl.html:3
+#: templates/admin/notifications/domain_in_dnsbl.html:3
 #, python-format
 msgid ""
 "Modoboa detected that domain %(domain)s is listed by the following DNSBL "
 "providers:"
 msgstr ""
 
-#: admin/templates/admin/notifications/domain_in_dnsbl.html:11
+#: templates/admin/notifications/domain_in_dnsbl.html:11
 msgid ""
 "The domain's reputation will be affected and there is a chance that emails "
 "coming from it are considered as spam. You should contact those providers "
 "and ask them to unlist detected IP address(es)."
 msgstr ""
 
-#: admin/templates/admin/notifications/domain_invalid_mx.html:3
+#: templates/admin/notifications/domain_invalid_mx.html:3
 #, python-format
 msgid "Modoboa detected that domain %(domain)s has no valid MX record:"
 msgstr ""
 
-#: admin/templates/admin/quota_headers.html:3
+#: templates/admin/quota_headers.html:3
 msgid "Value"
 msgstr "Hodnota"
 
-#: admin/templates/admin/quota_headers.html:4
+#: templates/admin/quota_headers.html:4
 msgid "Limit"
 msgstr "Omezení"
 
-#: admin/templates/admin/quota_headers.html:5
+#: templates/admin/quota_headers.html:5
 #, python-format
 msgid "Usage (%%)"
 msgstr "Využití (%%)"
 
-#: admin/templates/admin/searchform.html:6
+#: templates/admin/searchform.html:6
 msgid "Search"
 msgstr "Hledat"
 
-#: admin/templatetags/admin_tags.py:18
+#: templatetags/admin_tags.py:18
 msgid "enabled_m"
 msgstr "Aktivovaný"
 
-#: admin/templatetags/admin_tags.py:18
+#: templatetags/admin_tags.py:18
 msgid "enabled_f"
 msgstr "Aktivovaná"
 
-#: admin/templatetags/admin_tags.py:39
+#: templatetags/admin_tags.py:39
 msgid "List domains"
 msgstr "Seznam domén"
 
-#: admin/templatetags/admin_tags.py:56 admin/templatetags/admin_tags.py:104
-#: admin/views/import_.py:87 admin/views/import_.py:109
+#: templatetags/admin_tags.py:56 templatetags/admin_tags.py:104
+#: views/import_.py:87 views/import_.py:109
 msgid "Import"
 msgstr "Import"
 
-#: admin/templatetags/admin_tags.py:62 admin/templatetags/admin_tags.py:110
-#: admin/views/export.py:41 admin/views/export.py:69
+#: templatetags/admin_tags.py:62 templatetags/admin_tags.py:110
+#: views/export.py:41 views/export.py:69
 msgid "Export"
 msgstr "Export"
 
-#: admin/templatetags/admin_tags.py:94
+#: templatetags/admin_tags.py:94
 msgid "List identities"
 msgstr "Seznam identit"
 
-#: admin/templatetags/admin_tags.py:99
+#: templatetags/admin_tags.py:99
 msgid "List quotas"
 msgstr "Seznam kvót"
 
-#: admin/templatetags/admin_tags.py:129
+#: templatetags/admin_tags.py:129
 msgid "View the domain's identities"
 msgstr "Zobrazit seznam identit domény"
 
-#: admin/templatetags/admin_tags.py:135 admin/templatetags/admin_tags.py:178
-#: admin/templatetags/admin_tags.py:191
+#: templatetags/admin_tags.py:135 templatetags/admin_tags.py:178
+#: templatetags/admin_tags.py:191
 msgid "Edit {}"
 msgstr ""
 
-#: admin/templatetags/admin_tags.py:145 admin/templatetags/admin_tags.py:182
-#: admin/templatetags/admin_tags.py:196
+#: templatetags/admin_tags.py:145 templatetags/admin_tags.py:182
+#: templatetags/admin_tags.py:196
 #, python-format
 msgid "Delete %s?"
 msgstr "Smazat %s?"
 
-#: admin/views/alias.py:33
+#: views/alias.py:33
 msgid "Alias with this name already exists"
 msgstr "Alias s tímto názvem již existuje"
 
-#: admin/views/alias.py:58
+#: views/alias.py:58
 msgid "Create"
 msgstr "Vytvořit"
 
-#: admin/views/alias.py:70
+#: views/alias.py:70
 msgid "New alias"
 msgstr "Nový alias"
 
-#: admin/views/alias.py:71
+#: views/alias.py:71
 msgid "Alias created"
 msgstr "Alias vytvořen"
 
-#: admin/views/alias.py:83
+#: views/alias.py:83
 msgid "Alias modified"
 msgstr "Alias upraven"
 
-#: admin/views/alias.py:107
+#: views/alias.py:107
 #, fuzzy
 #| msgid "Alias created"
 msgid "Alias deleted"
@@ -1116,64 +1102,63 @@ msgstr[0] "Alias vytvořen"
 msgstr[1] "Alias vytvořen"
 msgstr[2] "Alias vytvořen"
 
-#: admin/views/dns.py:30
+#: views/dns.py:30
 msgid "MX records of {}"
 msgstr ""
 
-#: admin/views/dns.py:53
+#: views/dns.py:53
 msgid "DNSBL summary for {}"
 msgstr ""
 
-#: admin/views/domain.py:152
+#: views/domain.py:152
 msgid "You can't delete your own domain"
 msgstr "Nemůžete smazat vlastní doménu"
 
-#: admin/views/domain.py:155
+#: views/domain.py:155
 msgid "Domain deleted"
 msgid_plural "Domains deleted"
 msgstr[0] "Doména smazána"
 msgstr[1] "Domény smazány"
 msgstr[2] "Domén smazáno"
 
-#: admin/views/export.py:40
+#: views/export.py:40
 msgid "Export identities"
 msgstr "Exportovat identity"
 
-#: admin/views/export.py:68
+#: views/export.py:68
 msgid "Export domains"
 msgstr "Exportovat domény"
 
-#: admin/views/identity.py:111 admin/views/identity.py:205
-#: admin/views/identity.py:210
+#: views/identity.py:111 views/identity.py:205 views/identity.py:210
 msgid "Invalid request"
 msgstr "Neplatný požadavek"
 
-#: admin/views/identity.py:195
+#: views/identity.py:195
 msgid "Account deleted"
 msgid_plural "Accounts deleted"
 msgstr[0] "Účet smazán"
 msgstr[1] "Účty smazány"
 msgstr[2] "Účtů smazáno"
 
-#: admin/views/import_.py:63
+#: views/import_.py:63
 #, python-format
 msgid "Object already exists: %s"
 msgstr "Objekt již existuje: %s"
 
-#: admin/views/import_.py:67
+#: views/import_.py:67
 #, python-format
 msgid "%d objects imported successfully"
 msgstr "%d objektů úspěšně importováno"
 
-#: admin/views/import_.py:86
+#: views/import_.py:86
 msgid "Import domains"
 msgstr "Importovat domény"
 
-#: admin/views/import_.py:108
+#: views/import_.py:108
 msgid "Import identities"
 msgstr "Importovat identity"
 
-#: admin/views/user.py:35
+#: views/user.py:35
 msgid "Forward updated"
 msgstr "Přeposílání aktualizováno"
 
diff --git a/modoboa/admin/locale/de/LC_MESSAGES/django.po b/modoboa/admin/locale/de/LC_MESSAGES/django.po
index 2a43388fc..5ac52f124 100644
--- a/modoboa/admin/locale/de/LC_MESSAGES/django.po
+++ b/modoboa/admin/locale/de/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Modoboa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-14 14:13+0100\n"
+"POT-Creation-Date: 2017-01-16 13:02+0100\n"
 "PO-Revision-Date: 2015-09-09 09:33+0000\n"
 "Last-Translator: controlc.de\n"
 "Language-Team: German (http://www.transifex.com/tonio/modoboa/language/de/)\n"
@@ -20,47 +20,46 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/app_settings.py:17 admin/handlers.py:245
-#: admin/templates/admin/domain_statistics.html:30
-#: admin/templates/admin/domains.html:4
+#: app_settings.py:17 handlers.py:252
+#: templates/admin/domain_statistics.html:30 templates/admin/domains.html:4
 msgid "Domains"
 msgstr "Domains"
 
-#: admin/app_settings.py:20
+#: app_settings.py:20
 msgid "Enable MX checks"
 msgstr ""
 
-#: admin/app_settings.py:23
+#: app_settings.py:23
 msgid "Check that every domain has a valid MX record"
 msgstr ""
 
-#: admin/app_settings.py:28
+#: app_settings.py:28
 msgid "Valid MXs"
 msgstr ""
 
-#: admin/app_settings.py:31
+#: app_settings.py:31
 msgid ""
-"IP(s) or network(s) of the MX that should match with domains' MX records. On "
-"per line."
+"A list of IP or network address every MX record should match. A warning will "
+"be sent if a record does not respect it."
 msgstr ""
 
-#: admin/app_settings.py:40
+#: app_settings.py:39
 msgid "Enable DNSBL checks"
 msgstr ""
 
-#: admin/app_settings.py:43
+#: app_settings.py:42
 msgid "Check every domain against major DNSBL providers"
 msgstr ""
 
-#: admin/app_settings.py:47 admin/templates/admin/domain_detail.html.py:44
+#: app_settings.py:46 templates/admin/domain_detail.html:44
 msgid "Mailboxes"
 msgstr "Postfächer"
 
-#: admin/app_settings.py:50
+#: app_settings.py:49
 msgid "Handle mailboxes on filesystem"
 msgstr "Postfächer im Dateisystem verwalten"
 
-#: admin/app_settings.py:53
+#: app_settings.py:52
 msgid ""
 "Rename or remove mailboxes on the filesystem when they get renamed or "
 "removed within Modoboa"
@@ -68,21 +67,21 @@ msgstr ""
 "Postfächer auch in Dateisystem umbenennen oder entfernen wenn sie in Modoboa "
 "umbenannt oder entfernt werden"
 
-#: admin/app_settings.py:59
+#: app_settings.py:58
 msgid "Mailboxes owner"
 msgstr "Postfach-Besitzer"
 
-#: admin/app_settings.py:62
+#: app_settings.py:61
 msgid "The UNIX account who owns mailboxes on the filesystem"
 msgstr ""
 "UID des virtuellen Benutzers, der Besitzer der Domains, Mailboxen und "
 "Nachrichten im Dateisystem ist."
 
-#: admin/app_settings.py:67
+#: app_settings.py:66
 msgid "Default domain quota"
 msgstr "Standard-Domainquota"
 
-#: admin/app_settings.py:70
+#: app_settings.py:69
 msgid ""
 "Default quota (in MB) applied to freshly created domains with no value "
 "specified. A value of 0 means no quota."
@@ -90,38 +89,37 @@ msgstr ""
 "Standardquota (in MB) für neu erstelle Domains ohne explizite Wertangabe. "
 "Der Wert 0 bedeutet „Kein Quota“"
 
-#: admin/app_settings.py:76
+#: app_settings.py:75
 msgid "Automatic account removal"
 msgstr "Automatische Konto-Entfernung"
 
-#: admin/app_settings.py:79
+#: app_settings.py:78
 msgid "When a mailbox is removed, also remove the associated account"
 msgstr "Beim Löschen des Postfachs auch das Konto entfernen."
 
-#: admin/app_settings.py:83
+#: app_settings.py:82
 msgid "Automatic domain/mailbox creation"
 msgstr "Automatische Domain- /Postfach-Erstellung"
 
-#: admin/app_settings.py:86
+#: app_settings.py:85
 msgid "Create a domain and a mailbox when an account is automatically created."
 msgstr ""
 "Erstelle eine Domain und ein Postfach, wenn ein Konto automatisch erstellt "
 "wurde."
 
-#: admin/app_settings.py:133 admin/forms/account.py:288
-#: admin/forms/domain.py:87
+#: app_settings.py:132 forms/account.py:288 forms/domain.py:87
 msgid "Must be a positive integer"
 msgstr "Muss eine positive Ganzzahl sein"
 
-#: admin/app_settings.py:143
+#: app_settings.py:142
 msgid "Administration"
 msgstr "Verwaltung"
 
-#: admin/forms/account.py:34 admin/templates/admin/domain_detail.html.py:72
+#: forms/account.py:34 templates/admin/domain_detail.html:72
 msgid "Username"
 msgstr "Benutzername"
 
-#: admin/forms/account.py:36
+#: forms/account.py:36
 msgid ""
 "The user's name. Must be a valid e-mail address for simple users or "
 "administrators with a mailbox."
@@ -129,56 +127,56 @@ msgstr ""
 "Der Benutzername. Muss eine gültige E-Mail-Adresse für 'Normale Benutzer' "
 "oder Administratoren mit einer Mailbox sein."
 
-#: admin/forms/account.py:41 admin/templates/admin/account_detail.html.py:29
+#: forms/account.py:41 templates/admin/account_detail.html:29
 msgid "Role"
 msgstr "Rolle"
 
-#: admin/forms/account.py:42
+#: forms/account.py:42
 msgid "Choose"
 msgstr "Auswählen"
 
-#: admin/forms/account.py:43
+#: forms/account.py:43
 msgid "What level of permission this user will have"
 msgstr "Rechte, die der Benutzer haben wird"
 
-#: admin/forms/account.py:46
+#: forms/account.py:46
 msgid "Password"
 msgstr "Passwort"
 
-#: admin/forms/account.py:50
+#: forms/account.py:50
 msgid "Confirmation"
 msgstr "Bestätigung"
 
-#: admin/forms/account.py:53
+#: forms/account.py:53
 msgid "Enter the same password as above, for verification."
 msgstr "Passwort bestätigen"
 
-#: admin/forms/account.py:64
+#: forms/account.py:64
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: admin/forms/account.py:156
+#: forms/account.py:156
 msgid "The two password fields didn't match."
 msgstr "Die angegebenen Passwörter stimmen nicht überein"
 
-#: admin/forms/account.py:171
+#: forms/account.py:171
 msgid "Only super administrators are allowed for this mode"
 msgstr "Nur Super-Administratoren dürfen diesen Modus benutzen."
 
-#: admin/forms/account.py:179
+#: forms/account.py:179
 msgid "You can't disable your own account"
 msgstr "Sie können Ihr eigenes Konto nicht deaktivieren"
 
-#: admin/forms/account.py:194
+#: forms/account.py:194
 msgid "E-mail"
 msgstr "E-Mail"
 
-#: admin/forms/account.py:196 admin/forms/domain.py:38
-#: admin/templates/admin/account_detail.html:45
+#: forms/account.py:196 forms/domain.py:38
+#: templates/admin/account_detail.html:45
 msgid "Quota"
 msgstr "Quota"
 
-#: admin/forms/account.py:198
+#: forms/account.py:198
 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 "
@@ -188,12 +186,11 @@ msgstr ""
 "nutzen Sie den Standardwert der Domain. Lassen Sie das Feld leer für "
 "unbegrenztes Quota (Domain-Administratoren ist dies nicht gestattet)."
 
-#: admin/forms/account.py:206 admin/forms/domain.py:46
-#: admin/templates/admin/domains.html:35
+#: forms/account.py:206 forms/domain.py:46 templates/admin/domains.html:35
 msgid "Alias(es)"
 msgstr "Alias(e)"
 
-#: admin/forms/account.py:209
+#: forms/account.py:209
 #, fuzzy
 #| msgid ""
 #| "Alias(es) of this mailbox. Indicate only one address per input, press "
@@ -208,13 +205,13 @@ msgstr ""
 "an. Bestätigen Sie die Eingabe mit ENTER. Geben Sie '*' an, um einen "
 "'catchall'-Alias (Bsp: *@example.com) zu erstellen."
 
-#: admin/forms/account.py:215
+#: forms/account.py:215
 #, fuzzy
 #| msgid "Invalid address"
 msgid "Sender addresses"
 msgstr "Ungültige Adresse"
 
-#: admin/forms/account.py:218
+#: forms/account.py:218
 #, fuzzy
 #| msgid ""
 #| "Addresses this alias will point to. Indicate only one address per input, "
@@ -227,61 +224,60 @@ msgstr ""
 "Adressen, auf die der Alias verweist. Geben Sie jeweils nur eine Adresse ein "
 "und bestätigen Sie mit ENTER."
 
-#: admin/forms/account.py:267 admin/forms/alias.py:92
-#: admin/models/mailbox.py:295
+#: forms/account.py:267 forms/alias.py:92 models/mailbox.py:295
 msgid "Domain does not exist"
 msgstr "Domain existiert nicht"
 
-#: admin/forms/account.py:297
+#: forms/account.py:297
 #, fuzzy
 #| msgid "Domain does not exist"
 msgid "Local domain does not exist"
 msgstr "Domain existiert nicht"
 
-#: admin/forms/account.py:392
+#: forms/account.py:392
 msgid "Domain(s)"
 msgstr "Domain(s)"
 
-#: admin/forms/account.py:394
+#: forms/account.py:394
 msgid "Domain(s) that user administrates"
 msgstr "Domain(s), die dieser Benutzer administriert"
 
-#: admin/forms/account.py:440 admin/forms/account.py:525
-#: admin/forms/domain.py:283 admin/forms/domain.py:350
+#: forms/account.py:440 forms/account.py:525 forms/domain.py:283
+#: forms/domain.py:350
 msgid "General"
 msgstr "Allgemein"
 
-#: admin/forms/account.py:445 admin/forms/account.py:531
+#: forms/account.py:445 forms/account.py:531
 msgid "Mail"
 msgstr "E-Mail"
 
-#: admin/forms/account.py:447
+#: forms/account.py:447
 msgid "Permissions"
 msgstr "Berechtigungen"
 
-#: admin/forms/account.py:514
+#: forms/account.py:514
 msgid "Account updated"
 msgstr "Konto aktualisiert"
 
-#: admin/forms/account.py:538
+#: forms/account.py:538
 msgid "New account"
 msgstr "Neues Konto"
 
-#: admin/forms/account.py:550
+#: forms/account.py:550
 msgid "Account created"
 msgstr "Konto erstellt"
 
-#: admin/forms/alias.py:24
+#: forms/alias.py:24
 #, fuzzy
 #| msgid "Invalid address"
 msgid "Random address"
 msgstr "Ungültige Adresse"
 
-#: admin/forms/alias.py:27
+#: forms/alias.py:27
 msgid "Email address"
 msgstr "E-Mail Adresse"
 
-#: admin/forms/alias.py:29
+#: forms/alias.py:29
 msgid ""
 "The alias address. To create a catchall alias, just enter the domain name "
 "(@domain.tld)."
@@ -289,11 +285,11 @@ msgstr ""
 "Die Alias-Adresse. Geben Sie nur den Domainnamen (@domain.tld) für eine "
 "'catch-all' Alias an."
 
-#: admin/forms/alias.py:35 admin/templates/admin/alias_detail.html.py:37
+#: forms/alias.py:35 templates/admin/alias_detail.html:37
 msgid "Recipients"
 msgstr "Empfänger"
 
-#: admin/forms/alias.py:37
+#: forms/alias.py:37
 msgid ""
 "Addresses this alias will point to. Indicate only one address per input, "
 "press ENTER to add a new input."
@@ -301,30 +297,30 @@ msgstr ""
 "Adressen, auf die der Alias verweist. Geben Sie jeweils nur eine Adresse ein "
 "und bestätigen Sie mit ENTER."
 
-#: admin/forms/alias.py:47 admin/forms/domain.py:26 admin/models/domain.py:91
-#: admin/templates/admin/domain_statistics.html:49
+#: forms/alias.py:47 forms/domain.py:26 models/domain.py:92
+#: templates/admin/domain_statistics.html:49
 msgid "Domain"
 msgstr "Domain"
 
-#: admin/forms/alias.py:95
+#: forms/alias.py:95
 msgid "You don't have access to this domain"
 msgstr "Der Zugriff auf diese Domain ist Ihnen nicht gestattet"
 
-#: admin/forms/alias.py:112 admin/forms/alias.py:114
+#: forms/alias.py:112 forms/alias.py:114
 #, fuzzy
 #| msgid "A mailbox is required"
 msgid "This field is required"
 msgstr "Ein Postfach ist erforderlich"
 
-#: admin/forms/alias.py:118
+#: forms/alias.py:118
 msgid "No recipient defined"
 msgstr "Keine Empfänger angegeben"
 
-#: admin/forms/domain.py:35 admin/templates/admin/domain_statistics.html.py:26
+#: forms/domain.py:35 templates/admin/domain_statistics.html:26
 msgid "Type"
 msgstr "Typ"
 
-#: admin/forms/domain.py:41
+#: forms/domain.py:41
 msgid ""
 "Default quota in MB applied to mailboxes. Leave empty to use the default "
 "value."
@@ -332,7 +328,7 @@ msgstr ""
 "Standardquota in MB für Mailboxen. Bei leerem Feld wird der Domain-Standard "
 "genutzt."
 
-#: admin/forms/domain.py:49
+#: forms/domain.py:49
 msgid ""
 "Alias(es) of this domain. Indicate only one name per input, press ENTER to "
 "add a new input."
@@ -341,36 +337,34 @@ msgstr ""
 "Eingabefeld an. Bestätigen Sie mit ENTER, um ein neues Eingabefeld zu "
 "erhalten."
 
-#: admin/forms/domain.py:103 admin/handlers.py:148
+#: forms/domain.py:103 handlers.py:155
 msgid "domain alias"
 msgstr "Domain-Alias"
 
-#: admin/forms/domain.py:106 admin/forms/domain.py:118
-#: admin/forms/domain.py:126
+#: forms/domain.py:106 forms/domain.py:118 forms/domain.py:126
 #, python-format
 msgid "A %s with this name already exists"
 msgstr "Ein %s mit diesem Namen existiert bereits"
 
-#: admin/forms/domain.py:118 admin/forms/domain.py:123
+#: forms/domain.py:118 forms/domain.py:123
 msgid "domain"
 msgstr "Domain"
 
-#: admin/forms/domain.py:171
+#: forms/domain.py:171
 msgid "Create a domain administrator"
 msgstr "Domain-Administrator erstellen"
 
-#: admin/forms/domain.py:174
+#: forms/domain.py:174
 msgid "Automatically create an administrator for this domain"
 msgstr "Automatisch Administrator für diese Domain anlegen"
 
-#: admin/forms/domain.py:179 admin/templates/admin/domain_detail.html.py:72
-#: admin/templates/admin/domains.html:34
-#: admin/templates/admin/identity_headers.html:2
-#: admin/templates/admin/mx_domain_detail.html:9
+#: forms/domain.py:179 templates/admin/domain_detail.html:72
+#: templates/admin/domains.html:34 templates/admin/identity_headers.html:2
+#: templates/admin/mx_domain_detail.html:9
 msgid "Name"
 msgstr "Name"
 
-#: admin/forms/domain.py:182
+#: forms/domain.py:182
 msgid ""
 "The administrator's name. Don't include the domain's name here, it will be "
 "automatically appended."
@@ -378,70 +372,70 @@ msgstr ""
 "Name des Administrators. Geben Sie nicht den Domainnamen mit an. Er wird "
 "automatisch angehängt."
 
-#: admin/forms/domain.py:189
+#: forms/domain.py:189
 msgid "Create aliases"
 msgstr "Aliase erstellen"
 
-#: admin/forms/domain.py:192
+#: forms/domain.py:192
 msgid "Automatically create standard aliases for this domain"
 msgstr "Automatisch Standard-Aliase für Domain anlegen"
 
-#: admin/forms/domain.py:208
+#: forms/domain.py:208
 msgid "Invalid format"
 msgstr "Ungültiges Format"
 
-#: admin/forms/domain.py:217 admin/forms/domain.py:220
+#: forms/domain.py:217 forms/domain.py:220
 #, fuzzy
 #| msgid "A mailbox is required"
 msgid "This field is required."
 msgstr "Ein Postfach ist erforderlich"
 
-#: admin/forms/domain.py:237
+#: forms/domain.py:237
 #, python-format
 msgid "User '%s' already exists"
 msgstr "Benutzer %s existiert bereits"
 
-#: admin/forms/domain.py:339
+#: forms/domain.py:339
 msgid "Domain modified"
 msgstr "Domain verändert"
 
-#: admin/forms/domain.py:360
+#: forms/domain.py:360
 msgid "Options"
 msgstr "Optionen"
 
-#: admin/forms/domain.py:368
+#: forms/domain.py:368
 msgid "New domain"
 msgstr "Neue Domain"
 
-#: admin/forms/domain.py:381
+#: forms/domain.py:381
 msgid "Domain created"
 msgstr "Domain erstellt."
 
-#: admin/forms/export.py:7
+#: forms/export.py:7
 msgid "File name"
 msgstr "Dateiname"
 
-#: admin/forms/export.py:13 admin/forms/import_.py:13
+#: forms/export.py:13 forms/import_.py:13
 msgid "Separator"
 msgstr "Separator"
 
-#: admin/forms/forward.py:14
+#: forms/forward.py:14
 msgid "Recipient(s)"
 msgstr "Empfänger"
 
-#: admin/forms/forward.py:18
+#: forms/forward.py:18
 msgid "Indicate one or more recipients separated by a ','"
 msgstr "Geben sie einen oder mehrere, durch ',' separierte Empfänger an"
 
-#: admin/forms/forward.py:21
+#: forms/forward.py:21
 msgid "Keep local copies"
 msgstr "Lokale Kopien behalten"
 
-#: admin/forms/forward.py:24
+#: forms/forward.py:24
 msgid "Forward messages and store copies into your local mailbox"
 msgstr "Nachricht weiterleiten und Kopie in Mailbox ablegen"
 
-#: admin/forms/forward.py:42
+#: forms/forward.py:42
 msgid ""
 "You can't define a forward to a local destination. Please ask your "
 "administrator to create an alias instead."
@@ -449,457 +443,449 @@ msgstr ""
 "Sie können keine Weiterleitung auf ein lokales Ziel anlegen. Bitten Sie "
 "Ihren Administrator stattdessen einen Alias anzulegen."
 
-#: admin/forms/import_.py:11
+#: forms/import_.py:11
 msgid "Select a file"
 msgstr "Wählen Sie eine Datei"
 
-#: admin/forms/import_.py:19
+#: forms/import_.py:19
 msgid "Continue on error"
 msgstr "Bei Fehler fortfahren"
 
-#: admin/forms/import_.py:20
+#: forms/import_.py:20
 msgid "Don't treat duplicated objects as error"
 msgstr "Doppelte Objekte nicht als Fehler behandeln"
 
-#: admin/forms/import_.py:38
+#: forms/import_.py:38
 msgid "Crypt passwords"
 msgstr "Passwörter verschlüsseln"
 
-#: admin/forms/import_.py:40
+#: forms/import_.py:40
 msgid "Check this option if passwords contained in your file are not crypted"
 msgstr "Auswählen, wenn Kennwörter in Datei nicht verschlüsselt sind"
 
-#: admin/handlers.py:194
+#: handlers.py:201
 #, python-format
 msgid "Account import failed (%s): domain does not exist"
 msgstr "Kann Konto nicht importieren (%s): Die Domain existiert nicht"
 
-#: admin/handlers.py:207 admin/models/mailbox.py:320
+#: handlers.py:214 models/mailbox.py:320
 #, fuzzy
 #| msgid "Mailbox %s already exists"
 msgid "Mailbox {} already exists"
 msgstr "Postfach %s existiert bereits"
 
-#: admin/handlers.py:215
+#: handlers.py:222
 #, python-format
 msgid "Account import failed (%s): wrong quota value"
 msgstr "Konto Import fehlgeschlagen (%s): ungültiger Quota-Wert"
 
-#: admin/handlers.py:255 admin/templates/admin/domain_statistics.html.py:36
-#: admin/templates/admin/domain_statistics.html:50
-#: admin/templates/admin/identities.html:5
+#: handlers.py:262 templates/admin/domain_statistics.html:36
+#: templates/admin/domain_statistics.html:50 templates/admin/identities.html:5
 msgid "Identities"
 msgstr "Identitäten"
 
-#: admin/handlers.py:271 admin/templates/admin/forward.html.py:2
+#: handlers.py:278 templates/admin/forward.html:2
 msgid "Forward"
 msgstr "Weiterleiten"
 
-#: admin/lib.py:32
+#: lib.py:32
 msgid "A mailbox is required"
 msgstr "Ein Postfach ist erforderlich"
 
-#: admin/lib.py:122
+#: lib.py:122
 msgid "You are not allowed to import domains"
 msgstr "Sie verfügen nicht über ausreichend Rechte, um Domains zu importieren."
 
-#: admin/lib.py:133
+#: lib.py:133
 msgid "You are not allowed to import domain aliases."
 msgstr ""
 "Sie verfügen nicht über ausreichend Rechte, um Domain Aliase zu importieren."
 
-#: admin/management/commands/subcommands/_mx.py:159
+#: management/commands/subcommands/_mx.py:159
 msgid "[modoboa] DNSBL issue(s) for domain {}"
 msgstr ""
 
-#: admin/management/commands/subcommands/_mx.py:180
+#: management/commands/subcommands/_mx.py:180
 msgid "Domain {} has no MX record"
 msgstr ""
 
-#: admin/management/commands/subcommands/_mx.py:191
+#: management/commands/subcommands/_mx.py:191
 #, python-brace-format
 msgid "MX record for domain {0} is invalid: {1}"
 msgstr ""
 
-#: admin/management/commands/subcommands/_mx.py:207
+#: management/commands/subcommands/_mx.py:207
 msgid "[modoboa] MX issue(s) for domain {}"
 msgstr ""
 
-#: admin/models/alias.py:31 admin/models/mailbox.py:80
+#: models/alias.py:31 models/mailbox.py:80
 msgid "address"
 msgstr "Adresse"
 
-#: admin/models/alias.py:33
+#: models/alias.py:33
 msgid "The alias address."
 msgstr "Die Alias-Adresse"
 
-#: admin/models/alias.py:38 admin/models/domain.py:46
-#: admin/models/domain_alias.py:44
+#: models/alias.py:38 models/domain.py:47 models/domain_alias.py:44
 msgid "enabled"
 msgstr "aktiviert"
 
-#: admin/models/alias.py:39 admin/models/domain_alias.py:45
+#: models/alias.py:39 models/domain_alias.py:45
 msgid "Check to activate this alias"
 msgstr "Auswählen, um den Alias zu aktivieren"
 
-#: admin/models/alias.py:44 admin/templates/admin/alias_detail.html.py:32
+#: models/alias.py:44 templates/admin/alias_detail.html:32
 msgid "Description"
 msgstr ""
 
-#: admin/models/alias.py:46 admin/templates/admin/alias_detail.html.py:29
+#: models/alias.py:46 templates/admin/alias_detail.html:29
 msgid "Expire at"
 msgstr ""
 
-#: admin/models/alias.py:89
+#: models/alias.py:89
 msgid "alias"
 msgstr "Alias"
 
-#: admin/models/alias.py:121
+#: models/alias.py:121
 msgid "Invalid address"
 msgstr "Ungültige Adresse"
 
-#: admin/models/alias.py:142
+#: models/alias.py:142
 msgid "Local recipient {}@{} not found"
 msgstr "Lokaler Empfänger {}@{} nicht gefunden"
 
-#: admin/models/alias.py:172
+#: models/alias.py:172
 #, python-format
 msgid "Invalid line: %s"
 msgstr "Ungültige Zeile: %s"
 
-#: admin/models/alias.py:178
+#: models/alias.py:178
 #, python-format
 msgid "Domain '%s' does not exist"
 msgstr "Domain '%s' existiert nicht"
 
-#: admin/models/domain.py:42 admin/models/domain_alias.py:37
+#: models/domain.py:43 models/domain_alias.py:37
 msgid "name"
 msgstr "Name"
 
-#: admin/models/domain.py:43
+#: models/domain.py:44
 msgid "The domain name"
 msgstr "Name der Domain"
 
-#: admin/models/domain.py:47
+#: models/domain.py:48
 msgid "Check to activate this domain"
 msgstr "Auswählen, um diese Domain zu aktivieren"
 
-#: admin/models/domain.py:208 admin/models/domain_alias.py:71
+#: models/domain.py:215 models/domain_alias.py:71
 msgid "Invalid line"
 msgstr "Ungültige Zeile"
 
-#: admin/models/domain.py:216
+#: models/domain.py:223
 #, python-format
 msgid "Invalid quota value for domain '%s'"
 msgstr "Ungültiger Quota-Wert für Domain '%s'"
 
-#: admin/models/domain_alias.py:38
+#: models/domain_alias.py:38
 msgid "The alias name"
 msgstr "Der Alias-Name"
 
-#: admin/models/domain_alias.py:40
+#: models/domain_alias.py:40
 msgid "target"
 msgstr "Ziel"
 
-#: admin/models/domain_alias.py:41
+#: models/domain_alias.py:41
 msgid "The domain this alias points to"
 msgstr "Domain, auf die dieser Alias verweist"
 
-#: admin/models/domain_alias.py:80
+#: models/domain_alias.py:80
 #, python-format
 msgid "Unknown domain %s"
 msgstr "Unbekannte Domain %s"
 
-#: admin/models/mailbox.py:82
+#: models/mailbox.py:82
 msgid "Mailbox address (without the @domain.tld part)"
 msgstr "Postfach-Adresse (ohne den '@domain.tld' Teil)"
 
-#: admin/models/mailbox.py:148
+#: models/mailbox.py:148
 #, python-format
 msgid "Failed to retrieve mailbox location (%s)"
 msgstr "Der Speicherort des Postfachs (%s) konnte nicht bestimmt werden"
 
-#: admin/models/mailbox.py:238
+#: models/mailbox.py:238
 #, python-format
 msgid "Quota is greater than the allowed domain's limit (%dM)"
 msgstr "Das Quota ist größer als das maximale Quota der Domain (%dM)"
 
-#: admin/models/mailbox.py:244
+#: models/mailbox.py:244
 msgid "A quota is required"
 msgstr "Ein Quota ist erforderlich"
 
-#: admin/serializers.py:45 admin/serializers.py:228 admin/serializers.py:317
+#: serializers.py:45 serializers.py:228 serializers.py:317
 #, fuzzy
 #| msgid "Permissions"
 msgid "Permission denied."
 msgstr "Berechtigungen"
 
-#: admin/serializers.py:83
+#: serializers.py:83
 msgid ""
 "List of administered domains (resellers and domain administrators only)."
 msgstr ""
 
-#: admin/serializers.py:193
+#: serializers.py:193
 msgid "Not allowed for this role."
 msgstr ""
 
-#: admin/serializers.py:203
+#: serializers.py:203
 msgid "Must be equal to mailbox full_address"
 msgstr ""
 
-#: admin/serializers.py:215
+#: serializers.py:215
 #, fuzzy
 #| msgid "Domain does not exist"
 msgid "Local domain {} does not exist"
 msgstr "Domain existiert nicht"
 
-#: admin/serializers.py:315
+#: serializers.py:315
 #, fuzzy
 #| msgid "Domain modified"
 msgid "Domain not found."
 msgstr "Domain verändert"
 
-#: admin/templates/admin/account_detail.html:16
-#: admin/templates/admin/alias_detail.html:16
-#: admin/templates/admin/domain_detail.html:15
-#: admin/templates/admin/identities_table.html:7
+#: templates/admin/account_detail.html:16 templates/admin/alias_detail.html:16
+#: templates/admin/domain_detail.html:15
+#: templates/admin/identities_table.html:7
 #, fuzzy
 #| msgid "disabled"
 msgid "(disabled)"
 msgstr "deaktiviert"
 
-#: admin/templates/admin/account_detail.html:22
-#: admin/templates/admin/alias_detail.html:22
-#: admin/templates/admin/domain_detail.html:21
+#: templates/admin/account_detail.html:22 templates/admin/alias_detail.html:22
+#: templates/admin/domain_detail.html:21
 msgid "Summary"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:26
+#: templates/admin/account_detail.html:26
 #, fuzzy
 #| msgid "File name"
 msgid "Full name"
 msgstr "Dateiname"
 
-#: admin/templates/admin/account_detail.html:32
-#: admin/templates/admin/alias_detail.html:26
+#: templates/admin/account_detail.html:32 templates/admin/alias_detail.html:26
 #, fuzzy
 #| msgid "Create"
 msgid "Created"
 msgstr "Erstellen"
 
-#: admin/templates/admin/account_detail.html:35
+#: templates/admin/account_detail.html:35
 msgid "Last login"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:38
+#: templates/admin/account_detail.html:38
 msgid "Secondary email"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:38
-#: admin/templates/admin/account_detail.html:41
+#: templates/admin/account_detail.html:38
+#: templates/admin/account_detail.html:41
 #, fuzzy
 #| msgid "No recipient defined"
 msgid "Not defined"
 msgstr "Keine Empfänger angegeben"
 
-#: admin/templates/admin/account_detail.html:41
+#: templates/admin/account_detail.html:41
 msgid "Phone number"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:55
+#: templates/admin/account_detail.html:55
 #, fuzzy
 #| msgid "Administration"
 msgid "Administered domains"
 msgstr "Verwaltung"
 
-#: admin/templates/admin/account_detail.html:61
+#: templates/admin/account_detail.html:61
 #, fuzzy
 #| msgid "No recipient defined"
 msgid "No domain defined."
 msgstr "Keine Empfänger angegeben"
 
-#: admin/templates/admin/account_detail.html:75
+#: templates/admin/account_detail.html:75
 #, fuzzy
 #| msgid "Alias(es)"
 msgid "Aliases"
 msgstr "Alias(e)"
 
-#: admin/templates/admin/account_detail.html:81
+#: templates/admin/account_detail.html:81
 #, fuzzy
 #| msgid "No recipient defined"
 msgid "No alias defined"
 msgstr "Keine Empfänger angegeben"
 
-#: admin/templates/admin/account_detail.html:87
+#: templates/admin/account_detail.html:87
 msgid "Additional sender addresses"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:93
+#: templates/admin/account_detail.html:93
 msgid "No sender address defined"
 msgstr ""
 
-#: admin/templates/admin/account_general_form.html:11
-#: admin/templates/admin/aliasform.html:13
+#: templates/admin/account_general_form.html:11
+#: templates/admin/aliasform.html:13
 msgid "Domain is disabled"
 msgstr "Domain ist deaktiviert"
 
-#: admin/templates/admin/alias_detail.html:16
-#: admin/templates/admin/identities.html:33
+#: templates/admin/alias_detail.html:16 templates/admin/identities.html:33
 #, fuzzy
 #| msgid "alias"
 msgid "Alias"
 msgstr "Alias"
 
-#: admin/templates/admin/alias_detail.html:27
+#: templates/admin/alias_detail.html:27
 #, fuzzy
 #| msgid "Alias modified"
 msgid "Modified"
 msgstr "Alias verändert"
 
-#: admin/templates/admin/dnsbl_domain_detail.html:10
+#: templates/admin/dnsbl_domain_detail.html:10
 msgid "Provider"
 msgstr ""
 
-#: admin/templates/admin/dnsbl_domain_detail.html:11
-#: admin/templates/admin/mx_domain_detail.html:10
-#: admin/templates/admin/quota_headers.html:2
+#: templates/admin/dnsbl_domain_detail.html:11
+#: templates/admin/mx_domain_detail.html:10
+#: templates/admin/quota_headers.html:2
 msgid "Address"
 msgstr "Adresse"
 
-#: admin/templates/admin/dnsbl_domain_detail.html:12
+#: templates/admin/dnsbl_domain_detail.html:12
 #, fuzzy
 #| msgid "Statistics"
 msgid "Status"
 msgstr "Statistiken"
 
-#: admin/templates/admin/dnsbl_domain_detail.html:21
+#: templates/admin/dnsbl_domain_detail.html:21
 msgid "listed"
 msgstr ""
 
-#: admin/templates/admin/dnsbl_domain_detail.html:29
+#: templates/admin/dnsbl_domain_detail.html:29
 msgid "Everything is fine, this domain is not listed."
 msgstr ""
 
-#: admin/templates/admin/dnsbl_domain_detail.html:32
+#: templates/admin/dnsbl_domain_detail.html:32
 msgid "No information available for this domain."
 msgstr ""
 
-#: admin/templates/admin/domain_detail.html:26
-#: admin/templates/admin/domains.html:38
+#: templates/admin/domain_detail.html:26 templates/admin/domains.html:38
 #, fuzzy
 #| msgid "Statistics"
 msgid "DNS status"
 msgstr "Statistiken"
 
-#: admin/templates/admin/domain_detail.html:28
-#: admin/templates/admin/domains_table.html:12
+#: templates/admin/domain_detail.html:28 templates/admin/domains_table.html:14
 msgid "Awaiting checks"
 msgstr ""
 
-#: admin/templates/admin/domain_detail.html:40
+#: templates/admin/domain_detail.html:40
 msgid "Creation date"
 msgstr "Erstellungsdatum"
 
-#: admin/templates/admin/domain_detail.html:42
+#: templates/admin/domain_detail.html:42
 msgid "Last modification date"
 msgstr "Datum der letzten Änderung"
 
-#: admin/templates/admin/domain_detail.html:43
-#: admin/templates/admin/domain_detail.html:52
-#: admin/templates/admin/domain_statistics.html:33
+#: templates/admin/domain_detail.html:43 templates/admin/domain_detail.html:52
+#: templates/admin/domain_statistics.html:33
 msgid "Domain aliases"
 msgstr "Domain-Aliase"
 
-#: admin/templates/admin/domain_detail.html:45
+#: templates/admin/domain_detail.html:45
 msgid "Mailbox aliases"
 msgstr "Postfach-Aliase"
 
-#: admin/templates/admin/domain_detail.html:69
+#: templates/admin/domain_detail.html:69
 msgid "Administrators"
 msgstr "Administratoren"
 
-#: admin/templates/admin/domain_detail.html:79
-#: admin/templatetags/admin_tags.py:259
+#: templates/admin/domain_detail.html:79 templatetags/admin_tags.py:259
 msgid "Remove this permission"
 msgstr "Diese Berechtigung entfernen"
 
-#: admin/templates/admin/domain_detail.html:84
+#: templates/admin/domain_detail.html:84
 #, fuzzy
 #| msgid "No domain administrator defined"
 msgid "No domain administrator defined yet."
 msgstr "Kein Domain-Administrator definiert"
 
-#: admin/templates/admin/domain_general_form.html:4
-#: admin/templates/admin/mailform.html:4
-#: admin/templates/admin/newdomainform.html:3
+#: templates/admin/domain_general_form.html:4 templates/admin/mailform.html:4
+#: templates/admin/newdomainform.html:3
 msgid "MB"
 msgstr "MB"
 
-#: admin/templates/admin/domain_options_form.html:7
+#: templates/admin/domain_options_form.html:7
 msgid "You can't create a new domain administrator"
 msgstr "Sie können keinen neuen Domain-Administrator erstellen"
 
-#: admin/templates/admin/domain_statistics.html:15
-#: admin/templatetags/admin_tags.py:44
+#: templates/admin/domain_statistics.html:15 templatetags/admin_tags.py:44
 msgid "Statistics"
 msgstr "Statistiken"
 
-#: admin/templates/admin/domain_statistics.html:15
+#: templates/admin/domain_statistics.html:15
 msgid "Domains and identities"
 msgstr "Domains und Identitäten"
 
-#: admin/templates/admin/domain_statistics.html:22
+#: templates/admin/domain_statistics.html:22
 msgid "Global counters"
 msgstr "Zentrale Zähler"
 
-#: admin/templates/admin/domain_statistics.html:27
+#: templates/admin/domain_statistics.html:27
 msgid "Quantity"
 msgstr "Anzahl"
 
-#: admin/templates/admin/domain_statistics.html:45
+#: templates/admin/domain_statistics.html:45
 msgid "Per-domain counters"
 msgstr "pro Domain"
 
-#: admin/templates/admin/domains.html:26
-#: admin/templates/admin/identities.html:29
+#: templates/admin/domains.html:26 templates/admin/identities.html:29
 #, fuzzy
 #| msgid "Address"
 msgid "Add"
 msgstr "Adresse"
 
-#: admin/templates/admin/domains.html:36
-#: admin/templates/admin/identity_headers.html:4
+#: templates/admin/domains.html:36 templates/admin/identity_headers.html:4
 msgid "Tags"
 msgstr "Tags"
 
-#: admin/templates/admin/domains.html:40
-#: admin/templates/admin/identity_headers.html:5
+#: templates/admin/domains.html:40 templates/admin/identity_headers.html:5
 msgid "Actions"
 msgstr "Aktionen"
 
-#: admin/templates/admin/domains_table.html:5
+#: templates/admin/domains_table.html:5
 msgid "disabled"
 msgstr "deaktiviert"
 
-#: admin/templates/admin/forward.html:2
+#: templates/admin/domains_table.html:12
+#, fuzzy
+#| msgid "disabled"
+msgctxt "checks"
+msgid "Disabled"
+msgstr "deaktiviert"
+
+#: templates/admin/forward.html:2
 msgid "Automatically forward emails to another address"
 msgstr "Nachrichten automatisch an andere Adresse weiterleiten"
 
-#: admin/templates/admin/forward.html:9 admin/views/alias.py:91
+#: templates/admin/forward.html:9 views/alias.py:91
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: admin/templates/admin/identities.html:32
+#: templates/admin/identities.html:32
 #, fuzzy
 #| msgid "Add account"
 msgid "Account"
 msgstr "Konto hinzufügen"
 
-#: admin/templates/admin/identity_headers.html:3
+#: templates/admin/identity_headers.html:3
 msgid "Fullname/Recipient"
 msgstr "Name/Empfänger"
 
-#: admin/templates/admin/import_domains_form.html:6
+#: templates/admin/import_domains_form.html:6
 #, fuzzy
 #| msgid ""
 #| "Provide a CSV file where lines respect one of the following formats:\n"
@@ -929,7 +915,7 @@ msgstr ""
 "vorhergehenden sein.</p>\n"
 "<p>Ein anderes Zeichen als Trenner ist gestattet.</p>\n"
 
-#: admin/templates/admin/import_identities_form.html:6
+#: templates/admin/import_identities_form.html:6
 #, fuzzy
 #| msgid ""
 #| "Provide a CSV file where lines respect one of the following formats:\n"
@@ -965,138 +951,138 @@ msgstr ""
 "\n"
 "<p>Ein anderes Zeichen als Separator ist gestattet.</p>\n"
 
-#: admin/templates/admin/importform.html:6
+#: templates/admin/importform.html:6
 msgid "Help"
 msgstr "Hilfe"
 
-#: admin/templates/admin/importform.html:13
+#: templates/admin/importform.html:13
 msgid "Importing..."
 msgstr "Importiere…"
 
-#: admin/templates/admin/mailboxes_raw.html:3
+#: templates/admin/mailboxes_raw.html:3
 msgid "Choose a value"
 msgstr "Wert auswählen"
 
-#: admin/templates/admin/mailform.html:4
+#: templates/admin/mailform.html:4
 msgid "Use domain default value"
 msgstr "Standardwert der Domain verwenden"
 
-#: admin/templates/admin/mx_domain_detail.html:11
+#: templates/admin/mx_domain_detail.html:11
 #, fuzzy
 #| msgid "Update"
 msgid "Updated"
 msgstr "Aktualisieren"
 
-#: admin/templates/admin/mx_domain_detail.html:23
+#: templates/admin/mx_domain_detail.html:23
 msgid "This IP does not match any of the valid MXs defined in parameters"
 msgstr ""
 
-#: admin/templates/admin/mx_domain_detail.html:36
+#: templates/admin/mx_domain_detail.html:36
 msgid "No MX record found for this domain."
 msgstr ""
 
-#: admin/templates/admin/notifications/domain_in_dnsbl.html:3
+#: templates/admin/notifications/domain_in_dnsbl.html:3
 #, python-format
 msgid ""
 "Modoboa detected that domain %(domain)s is listed by the following DNSBL "
 "providers:"
 msgstr ""
 
-#: admin/templates/admin/notifications/domain_in_dnsbl.html:11
+#: templates/admin/notifications/domain_in_dnsbl.html:11
 msgid ""
 "The domain's reputation will be affected and there is a chance that emails "
 "coming from it are considered as spam. You should contact those providers "
 "and ask them to unlist detected IP address(es)."
 msgstr ""
 
-#: admin/templates/admin/notifications/domain_invalid_mx.html:3
+#: templates/admin/notifications/domain_invalid_mx.html:3
 #, python-format
 msgid "Modoboa detected that domain %(domain)s has no valid MX record:"
 msgstr ""
 
-#: admin/templates/admin/quota_headers.html:3
+#: templates/admin/quota_headers.html:3
 msgid "Value"
 msgstr "Wert"
 
-#: admin/templates/admin/quota_headers.html:4
+#: templates/admin/quota_headers.html:4
 msgid "Limit"
 msgstr "Limit"
 
-#: admin/templates/admin/quota_headers.html:5
+#: templates/admin/quota_headers.html:5
 #, python-format
 msgid "Usage (%%)"
 msgstr "Verwendung (%%)"
 
-#: admin/templates/admin/searchform.html:6
+#: templates/admin/searchform.html:6
 msgid "Search"
 msgstr "Suchen"
 
-#: admin/templatetags/admin_tags.py:18
+#: templatetags/admin_tags.py:18
 msgid "enabled_m"
 msgstr "aktiviert_m"
 
-#: admin/templatetags/admin_tags.py:18
+#: templatetags/admin_tags.py:18
 msgid "enabled_f"
 msgstr "aktiviert_f"
 
-#: admin/templatetags/admin_tags.py:39
+#: templatetags/admin_tags.py:39
 msgid "List domains"
 msgstr "Domain-Liste"
 
-#: admin/templatetags/admin_tags.py:56 admin/templatetags/admin_tags.py:104
-#: admin/views/import_.py:87 admin/views/import_.py:109
+#: templatetags/admin_tags.py:56 templatetags/admin_tags.py:104
+#: views/import_.py:87 views/import_.py:109
 msgid "Import"
 msgstr "Import"
 
-#: admin/templatetags/admin_tags.py:62 admin/templatetags/admin_tags.py:110
-#: admin/views/export.py:41 admin/views/export.py:69
+#: templatetags/admin_tags.py:62 templatetags/admin_tags.py:110
+#: views/export.py:41 views/export.py:69
 msgid "Export"
 msgstr "Export"
 
-#: admin/templatetags/admin_tags.py:94
+#: templatetags/admin_tags.py:94
 msgid "List identities"
 msgstr "Identitäten-Liste"
 
-#: admin/templatetags/admin_tags.py:99
+#: templatetags/admin_tags.py:99
 msgid "List quotas"
 msgstr "Quota-Liste"
 
-#: admin/templatetags/admin_tags.py:129
+#: templatetags/admin_tags.py:129
 msgid "View the domain's identities"
 msgstr "Domain-Identitäten anzeigen"
 
-#: admin/templatetags/admin_tags.py:135 admin/templatetags/admin_tags.py:178
-#: admin/templatetags/admin_tags.py:191
+#: templatetags/admin_tags.py:135 templatetags/admin_tags.py:178
+#: templatetags/admin_tags.py:191
 msgid "Edit {}"
 msgstr ""
 
-#: admin/templatetags/admin_tags.py:145 admin/templatetags/admin_tags.py:182
-#: admin/templatetags/admin_tags.py:196
+#: templatetags/admin_tags.py:145 templatetags/admin_tags.py:182
+#: templatetags/admin_tags.py:196
 #, python-format
 msgid "Delete %s?"
 msgstr "%s löschen?"
 
-#: admin/views/alias.py:33
+#: views/alias.py:33
 msgid "Alias with this name already exists"
 msgstr "Ein Alias mit diesem Namen existiert bereits"
 
-#: admin/views/alias.py:58
+#: views/alias.py:58
 msgid "Create"
 msgstr "Erstellen"
 
-#: admin/views/alias.py:70
+#: views/alias.py:70
 msgid "New alias"
 msgstr "Neuer Alias"
 
-#: admin/views/alias.py:71
+#: views/alias.py:71
 msgid "Alias created"
 msgstr "Alias erstellt"
 
-#: admin/views/alias.py:83
+#: views/alias.py:83
 msgid "Alias modified"
 msgstr "Alias verändert"
 
-#: admin/views/alias.py:107
+#: views/alias.py:107
 #, fuzzy
 #| msgid "Alias created"
 msgid "Alias deleted"
@@ -1104,62 +1090,61 @@ msgid_plural "Aliases deleted"
 msgstr[0] "Alias erstellt"
 msgstr[1] "Alias erstellt"
 
-#: admin/views/dns.py:30
+#: views/dns.py:30
 msgid "MX records of {}"
 msgstr ""
 
-#: admin/views/dns.py:53
+#: views/dns.py:53
 msgid "DNSBL summary for {}"
 msgstr ""
 
-#: admin/views/domain.py:152
+#: views/domain.py:152
 msgid "You can't delete your own domain"
 msgstr "Sie können Ihre eigene Domain nicht löschen"
 
-#: admin/views/domain.py:155
+#: views/domain.py:155
 msgid "Domain deleted"
 msgid_plural "Domains deleted"
 msgstr[0] "Domain gelöscht"
 msgstr[1] "Domains gelöscht"
 
-#: admin/views/export.py:40
+#: views/export.py:40
 msgid "Export identities"
 msgstr "Identitäten exportieren"
 
-#: admin/views/export.py:68
+#: views/export.py:68
 msgid "Export domains"
 msgstr "Domains exportieren"
 
-#: admin/views/identity.py:111 admin/views/identity.py:205
-#: admin/views/identity.py:210
+#: views/identity.py:111 views/identity.py:205 views/identity.py:210
 msgid "Invalid request"
 msgstr "Ungültige Anfrage"
 
-#: admin/views/identity.py:195
+#: views/identity.py:195
 msgid "Account deleted"
 msgid_plural "Accounts deleted"
 msgstr[0] "Konto gelöscht"
 msgstr[1] "Konten gelöscht"
 
-#: admin/views/import_.py:63
+#: views/import_.py:63
 #, python-format
 msgid "Object already exists: %s"
 msgstr "Objekt existiert bereits: %s"
 
-#: admin/views/import_.py:67
+#: views/import_.py:67
 #, python-format
 msgid "%d objects imported successfully"
 msgstr "%d Objekte erfolgreich importiert"
 
-#: admin/views/import_.py:86
+#: views/import_.py:86
 msgid "Import domains"
 msgstr "Domains importieren"
 
-#: admin/views/import_.py:108
+#: views/import_.py:108
 msgid "Import identities"
 msgstr "Identitäten importieren"
 
-#: admin/views/user.py:35
+#: views/user.py:35
 msgid "Forward updated"
 msgstr "Weiterleitung aktualisiert"
 
diff --git a/modoboa/admin/locale/en/LC_MESSAGES/django.po b/modoboa/admin/locale/en/LC_MESSAGES/django.po
index a50e9af3e..480a4c1a7 100644
--- a/modoboa/admin/locale/en/LC_MESSAGES/django.po
+++ b/modoboa/admin/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: 2016-12-14 14:13+0100\n"
+"POT-Creation-Date: 2017-01-16 13:02+0100\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"
@@ -17,797 +17,781 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: admin/app_settings.py:17 admin/handlers.py:245
-#: admin/templates/admin/domain_statistics.html:30
-#: admin/templates/admin/domains.html:4
+#: app_settings.py:17 handlers.py:252
+#: templates/admin/domain_statistics.html:30 templates/admin/domains.html:4
 msgid "Domains"
 msgstr ""
 
-#: admin/app_settings.py:20
+#: app_settings.py:20
 msgid "Enable MX checks"
 msgstr ""
 
-#: admin/app_settings.py:23
+#: app_settings.py:23
 msgid "Check that every domain has a valid MX record"
 msgstr ""
 
-#: admin/app_settings.py:28
+#: app_settings.py:28
 msgid "Valid MXs"
 msgstr ""
 
-#: admin/app_settings.py:31
+#: app_settings.py:31
 msgid ""
-"IP(s) or network(s) of the MX that should match with domains' MX records. On "
-"per line."
+"A list of IP or network address every MX record should match. A warning will "
+"be sent if a record does not respect it."
 msgstr ""
 
-#: admin/app_settings.py:40
+#: app_settings.py:39
 msgid "Enable DNSBL checks"
 msgstr ""
 
-#: admin/app_settings.py:43
+#: app_settings.py:42
 msgid "Check every domain against major DNSBL providers"
 msgstr ""
 
-#: admin/app_settings.py:47 admin/templates/admin/domain_detail.html.py:44
+#: app_settings.py:46 templates/admin/domain_detail.html:44
 msgid "Mailboxes"
 msgstr ""
 
-#: admin/app_settings.py:50
+#: app_settings.py:49
 msgid "Handle mailboxes on filesystem"
 msgstr ""
 
-#: admin/app_settings.py:53
+#: app_settings.py:52
 msgid ""
 "Rename or remove mailboxes on the filesystem when they get renamed or "
 "removed within Modoboa"
 msgstr ""
 
-#: admin/app_settings.py:59
+#: app_settings.py:58
 msgid "Mailboxes owner"
 msgstr ""
 
-#: admin/app_settings.py:62
+#: app_settings.py:61
 msgid "The UNIX account who owns mailboxes on the filesystem"
 msgstr ""
 
-#: admin/app_settings.py:67
+#: app_settings.py:66
 msgid "Default domain quota"
 msgstr ""
 
-#: admin/app_settings.py:70
+#: app_settings.py:69
 msgid ""
 "Default quota (in MB) applied to freshly created domains with no value "
 "specified. A value of 0 means no quota."
 msgstr ""
 
-#: admin/app_settings.py:76
+#: app_settings.py:75
 msgid "Automatic account removal"
 msgstr ""
 
-#: admin/app_settings.py:79
+#: app_settings.py:78
 msgid "When a mailbox is removed, also remove the associated account"
 msgstr ""
 
-#: admin/app_settings.py:83
+#: app_settings.py:82
 msgid "Automatic domain/mailbox creation"
 msgstr ""
 
-#: admin/app_settings.py:86
+#: app_settings.py:85
 msgid "Create a domain and a mailbox when an account is automatically created."
 msgstr ""
 
-#: admin/app_settings.py:133 admin/forms/account.py:288
-#: admin/forms/domain.py:87
+#: app_settings.py:132 forms/account.py:288 forms/domain.py:87
 msgid "Must be a positive integer"
 msgstr ""
 
-#: admin/app_settings.py:143
+#: app_settings.py:142
 msgid "Administration"
 msgstr ""
 
-#: admin/forms/account.py:34 admin/templates/admin/domain_detail.html.py:72
+#: forms/account.py:34 templates/admin/domain_detail.html:72
 msgid "Username"
 msgstr ""
 
-#: admin/forms/account.py:36
+#: forms/account.py:36
 msgid ""
 "The user's name. Must be a valid e-mail address for simple users or "
 "administrators with a mailbox."
 msgstr ""
 
-#: admin/forms/account.py:41 admin/templates/admin/account_detail.html.py:29
+#: forms/account.py:41 templates/admin/account_detail.html:29
 msgid "Role"
 msgstr ""
 
-#: admin/forms/account.py:42
+#: forms/account.py:42
 msgid "Choose"
 msgstr ""
 
-#: admin/forms/account.py:43
+#: forms/account.py:43
 msgid "What level of permission this user will have"
 msgstr ""
 
-#: admin/forms/account.py:46
+#: forms/account.py:46
 msgid "Password"
 msgstr ""
 
-#: admin/forms/account.py:50
+#: forms/account.py:50
 msgid "Confirmation"
 msgstr ""
 
-#: admin/forms/account.py:53
+#: forms/account.py:53
 msgid "Enter the same password as above, for verification."
 msgstr ""
 
-#: admin/forms/account.py:64
+#: forms/account.py:64
 msgid "Enabled"
 msgstr ""
 
-#: admin/forms/account.py:156
+#: forms/account.py:156
 msgid "The two password fields didn't match."
 msgstr ""
 
-#: admin/forms/account.py:171
+#: forms/account.py:171
 msgid "Only super administrators are allowed for this mode"
 msgstr ""
 
-#: admin/forms/account.py:179
+#: forms/account.py:179
 msgid "You can't disable your own account"
 msgstr ""
 
-#: admin/forms/account.py:194
+#: forms/account.py:194
 msgid "E-mail"
 msgstr ""
 
-#: admin/forms/account.py:196 admin/forms/domain.py:38
-#: admin/templates/admin/account_detail.html:45
+#: forms/account.py:196 forms/domain.py:38
+#: templates/admin/account_detail.html:45
 msgid "Quota"
 msgstr ""
 
-#: admin/forms/account.py:198
+#: forms/account.py:198
 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 ""
 
-#: admin/forms/account.py:206 admin/forms/domain.py:46
-#: admin/templates/admin/domains.html:35
+#: forms/account.py:206 forms/domain.py:46 templates/admin/domains.html:35
 msgid "Alias(es)"
 msgstr ""
 
-#: admin/forms/account.py:209
+#: forms/account.py:209
 msgid ""
 "Alias(es) of this mailbox. Indicate only one address per input, press ENTER "
 "to add a new input. To create a catchall alias, just enter the domain name "
 "(@domain.tld)."
 msgstr ""
 
-#: admin/forms/account.py:215
+#: forms/account.py:215
 msgid "Sender addresses"
 msgstr ""
 
-#: admin/forms/account.py:218
+#: forms/account.py:218
 msgid ""
 "Additional sender address(es) for this account. The user will be allowed to "
 "send emails using this address, even if it does not exist locally. Indicate "
 "one address per input. Press ENTER to add a new input."
 msgstr ""
 
-#: admin/forms/account.py:267 admin/forms/alias.py:92
-#: admin/models/mailbox.py:295
+#: forms/account.py:267 forms/alias.py:92 models/mailbox.py:295
 msgid "Domain does not exist"
 msgstr ""
 
-#: admin/forms/account.py:297
+#: forms/account.py:297
 msgid "Local domain does not exist"
 msgstr ""
 
-#: admin/forms/account.py:392
+#: forms/account.py:392
 msgid "Domain(s)"
 msgstr ""
 
-#: admin/forms/account.py:394
+#: forms/account.py:394
 msgid "Domain(s) that user administrates"
 msgstr ""
 
-#: admin/forms/account.py:440 admin/forms/account.py:525
-#: admin/forms/domain.py:283 admin/forms/domain.py:350
+#: forms/account.py:440 forms/account.py:525 forms/domain.py:283
+#: forms/domain.py:350
 msgid "General"
 msgstr ""
 
-#: admin/forms/account.py:445 admin/forms/account.py:531
+#: forms/account.py:445 forms/account.py:531
 msgid "Mail"
 msgstr ""
 
-#: admin/forms/account.py:447
+#: forms/account.py:447
 msgid "Permissions"
 msgstr ""
 
-#: admin/forms/account.py:514
+#: forms/account.py:514
 msgid "Account updated"
 msgstr ""
 
-#: admin/forms/account.py:538
+#: forms/account.py:538
 msgid "New account"
 msgstr ""
 
-#: admin/forms/account.py:550
+#: forms/account.py:550
 msgid "Account created"
 msgstr ""
 
-#: admin/forms/alias.py:24
+#: forms/alias.py:24
 msgid "Random address"
 msgstr ""
 
-#: admin/forms/alias.py:27
+#: forms/alias.py:27
 msgid "Email address"
 msgstr ""
 
-#: admin/forms/alias.py:29
+#: forms/alias.py:29
 msgid ""
 "The alias address. To create a catchall alias, just enter the domain name "
 "(@domain.tld)."
 msgstr ""
 
-#: admin/forms/alias.py:35 admin/templates/admin/alias_detail.html.py:37
+#: forms/alias.py:35 templates/admin/alias_detail.html:37
 msgid "Recipients"
 msgstr ""
 
-#: admin/forms/alias.py:37
+#: forms/alias.py:37
 msgid ""
 "Addresses this alias will point to. Indicate only one address per input, "
 "press ENTER to add a new input."
 msgstr ""
 
-#: admin/forms/alias.py:47 admin/forms/domain.py:26 admin/models/domain.py:91
-#: admin/templates/admin/domain_statistics.html:49
+#: forms/alias.py:47 forms/domain.py:26 models/domain.py:92
+#: templates/admin/domain_statistics.html:49
 msgid "Domain"
 msgstr ""
 
-#: admin/forms/alias.py:95
+#: forms/alias.py:95
 msgid "You don't have access to this domain"
 msgstr ""
 
-#: admin/forms/alias.py:112 admin/forms/alias.py:114
+#: forms/alias.py:112 forms/alias.py:114
 msgid "This field is required"
 msgstr ""
 
-#: admin/forms/alias.py:118
+#: forms/alias.py:118
 msgid "No recipient defined"
 msgstr ""
 
-#: admin/forms/domain.py:35 admin/templates/admin/domain_statistics.html.py:26
+#: forms/domain.py:35 templates/admin/domain_statistics.html:26
 msgid "Type"
 msgstr ""
 
-#: admin/forms/domain.py:41
+#: forms/domain.py:41
 msgid ""
 "Default quota in MB applied to mailboxes. Leave empty to use the default "
 "value."
 msgstr ""
 
-#: admin/forms/domain.py:49
+#: forms/domain.py:49
 msgid ""
 "Alias(es) of this domain. Indicate only one name per input, press ENTER to "
 "add a new input."
 msgstr ""
 
-#: admin/forms/domain.py:103 admin/handlers.py:148
+#: forms/domain.py:103 handlers.py:155
 msgid "domain alias"
 msgstr ""
 
-#: admin/forms/domain.py:106 admin/forms/domain.py:118
-#: admin/forms/domain.py:126
+#: forms/domain.py:106 forms/domain.py:118 forms/domain.py:126
 #, python-format
 msgid "A %s with this name already exists"
 msgstr ""
 
-#: admin/forms/domain.py:118 admin/forms/domain.py:123
+#: forms/domain.py:118 forms/domain.py:123
 msgid "domain"
 msgstr ""
 
-#: admin/forms/domain.py:171
+#: forms/domain.py:171
 msgid "Create a domain administrator"
 msgstr ""
 
-#: admin/forms/domain.py:174
+#: forms/domain.py:174
 msgid "Automatically create an administrator for this domain"
 msgstr ""
 
-#: admin/forms/domain.py:179 admin/templates/admin/domain_detail.html.py:72
-#: admin/templates/admin/domains.html:34
-#: admin/templates/admin/identity_headers.html:2
-#: admin/templates/admin/mx_domain_detail.html:9
+#: forms/domain.py:179 templates/admin/domain_detail.html:72
+#: templates/admin/domains.html:34 templates/admin/identity_headers.html:2
+#: templates/admin/mx_domain_detail.html:9
 msgid "Name"
 msgstr ""
 
-#: admin/forms/domain.py:182
+#: forms/domain.py:182
 msgid ""
 "The administrator's name. Don't include the domain's name here, it will be "
 "automatically appended."
 msgstr ""
 
-#: admin/forms/domain.py:189
+#: forms/domain.py:189
 msgid "Create aliases"
 msgstr ""
 
-#: admin/forms/domain.py:192
+#: forms/domain.py:192
 msgid "Automatically create standard aliases for this domain"
 msgstr ""
 
-#: admin/forms/domain.py:208
+#: forms/domain.py:208
 msgid "Invalid format"
 msgstr ""
 
-#: admin/forms/domain.py:217 admin/forms/domain.py:220
+#: forms/domain.py:217 forms/domain.py:220
 msgid "This field is required."
 msgstr ""
 
-#: admin/forms/domain.py:237
+#: forms/domain.py:237
 #, python-format
 msgid "User '%s' already exists"
 msgstr ""
 
-#: admin/forms/domain.py:339
+#: forms/domain.py:339
 msgid "Domain modified"
 msgstr ""
 
-#: admin/forms/domain.py:360
+#: forms/domain.py:360
 msgid "Options"
 msgstr ""
 
-#: admin/forms/domain.py:368
+#: forms/domain.py:368
 msgid "New domain"
 msgstr ""
 
-#: admin/forms/domain.py:381
+#: forms/domain.py:381
 msgid "Domain created"
 msgstr ""
 
-#: admin/forms/export.py:7
+#: forms/export.py:7
 msgid "File name"
 msgstr ""
 
-#: admin/forms/export.py:13 admin/forms/import_.py:13
+#: forms/export.py:13 forms/import_.py:13
 msgid "Separator"
 msgstr ""
 
-#: admin/forms/forward.py:14
+#: forms/forward.py:14
 msgid "Recipient(s)"
 msgstr ""
 
-#: admin/forms/forward.py:18
+#: forms/forward.py:18
 msgid "Indicate one or more recipients separated by a ','"
 msgstr ""
 
-#: admin/forms/forward.py:21
+#: forms/forward.py:21
 msgid "Keep local copies"
 msgstr ""
 
-#: admin/forms/forward.py:24
+#: forms/forward.py:24
 msgid "Forward messages and store copies into your local mailbox"
 msgstr ""
 
-#: admin/forms/forward.py:42
+#: forms/forward.py:42
 msgid ""
 "You can't define a forward to a local destination. Please ask your "
 "administrator to create an alias instead."
 msgstr ""
 
-#: admin/forms/import_.py:11
+#: forms/import_.py:11
 msgid "Select a file"
 msgstr ""
 
-#: admin/forms/import_.py:19
+#: forms/import_.py:19
 msgid "Continue on error"
 msgstr ""
 
-#: admin/forms/import_.py:20
+#: forms/import_.py:20
 msgid "Don't treat duplicated objects as error"
 msgstr ""
 
-#: admin/forms/import_.py:38
+#: forms/import_.py:38
 msgid "Crypt passwords"
 msgstr ""
 
-#: admin/forms/import_.py:40
+#: forms/import_.py:40
 msgid "Check this option if passwords contained in your file are not crypted"
 msgstr ""
 
-#: admin/handlers.py:194
+#: handlers.py:201
 #, python-format
 msgid "Account import failed (%s): domain does not exist"
 msgstr ""
 
-#: admin/handlers.py:207 admin/models/mailbox.py:320
+#: handlers.py:214 models/mailbox.py:320
 msgid "Mailbox {} already exists"
 msgstr ""
 
-#: admin/handlers.py:215
+#: handlers.py:222
 #, python-format
 msgid "Account import failed (%s): wrong quota value"
 msgstr ""
 
-#: admin/handlers.py:255 admin/templates/admin/domain_statistics.html.py:36
-#: admin/templates/admin/domain_statistics.html:50
-#: admin/templates/admin/identities.html:5
+#: handlers.py:262 templates/admin/domain_statistics.html:36
+#: templates/admin/domain_statistics.html:50 templates/admin/identities.html:5
 msgid "Identities"
 msgstr ""
 
-#: admin/handlers.py:271 admin/templates/admin/forward.html.py:2
+#: handlers.py:278 templates/admin/forward.html:2
 msgid "Forward"
 msgstr ""
 
-#: admin/lib.py:32
+#: lib.py:32
 msgid "A mailbox is required"
 msgstr ""
 
-#: admin/lib.py:122
+#: lib.py:122
 msgid "You are not allowed to import domains"
 msgstr ""
 
-#: admin/lib.py:133
+#: lib.py:133
 msgid "You are not allowed to import domain aliases."
 msgstr ""
 
-#: admin/management/commands/subcommands/_mx.py:159
+#: management/commands/subcommands/_mx.py:159
 msgid "[modoboa] DNSBL issue(s) for domain {}"
 msgstr ""
 
-#: admin/management/commands/subcommands/_mx.py:180
+#: management/commands/subcommands/_mx.py:180
 msgid "Domain {} has no MX record"
 msgstr ""
 
-#: admin/management/commands/subcommands/_mx.py:191
+#: management/commands/subcommands/_mx.py:191
 #, python-brace-format
 msgid "MX record for domain {0} is invalid: {1}"
 msgstr ""
 
-#: admin/management/commands/subcommands/_mx.py:207
+#: management/commands/subcommands/_mx.py:207
 msgid "[modoboa] MX issue(s) for domain {}"
 msgstr ""
 
-#: admin/models/alias.py:31 admin/models/mailbox.py:80
+#: models/alias.py:31 models/mailbox.py:80
 msgid "address"
 msgstr ""
 
-#: admin/models/alias.py:33
+#: models/alias.py:33
 msgid "The alias address."
 msgstr ""
 
-#: admin/models/alias.py:38 admin/models/domain.py:46
-#: admin/models/domain_alias.py:44
+#: models/alias.py:38 models/domain.py:47 models/domain_alias.py:44
 msgid "enabled"
 msgstr ""
 
-#: admin/models/alias.py:39 admin/models/domain_alias.py:45
+#: models/alias.py:39 models/domain_alias.py:45
 msgid "Check to activate this alias"
 msgstr ""
 
-#: admin/models/alias.py:44 admin/templates/admin/alias_detail.html.py:32
+#: models/alias.py:44 templates/admin/alias_detail.html:32
 msgid "Description"
 msgstr ""
 
-#: admin/models/alias.py:46 admin/templates/admin/alias_detail.html.py:29
+#: models/alias.py:46 templates/admin/alias_detail.html:29
 msgid "Expire at"
 msgstr ""
 
-#: admin/models/alias.py:89
+#: models/alias.py:89
 msgid "alias"
 msgstr ""
 
-#: admin/models/alias.py:121
+#: models/alias.py:121
 msgid "Invalid address"
 msgstr ""
 
-#: admin/models/alias.py:142
+#: models/alias.py:142
 msgid "Local recipient {}@{} not found"
 msgstr ""
 
-#: admin/models/alias.py:172
+#: models/alias.py:172
 #, python-format
 msgid "Invalid line: %s"
 msgstr ""
 
-#: admin/models/alias.py:178
+#: models/alias.py:178
 #, python-format
 msgid "Domain '%s' does not exist"
 msgstr ""
 
-#: admin/models/domain.py:42 admin/models/domain_alias.py:37
+#: models/domain.py:43 models/domain_alias.py:37
 msgid "name"
 msgstr ""
 
-#: admin/models/domain.py:43
+#: models/domain.py:44
 msgid "The domain name"
 msgstr ""
 
-#: admin/models/domain.py:47
+#: models/domain.py:48
 msgid "Check to activate this domain"
 msgstr ""
 
-#: admin/models/domain.py:208 admin/models/domain_alias.py:71
+#: models/domain.py:215 models/domain_alias.py:71
 msgid "Invalid line"
 msgstr ""
 
-#: admin/models/domain.py:216
+#: models/domain.py:223
 #, python-format
 msgid "Invalid quota value for domain '%s'"
 msgstr ""
 
-#: admin/models/domain_alias.py:38
+#: models/domain_alias.py:38
 msgid "The alias name"
 msgstr ""
 
-#: admin/models/domain_alias.py:40
+#: models/domain_alias.py:40
 msgid "target"
 msgstr ""
 
-#: admin/models/domain_alias.py:41
+#: models/domain_alias.py:41
 msgid "The domain this alias points to"
 msgstr ""
 
-#: admin/models/domain_alias.py:80
+#: models/domain_alias.py:80
 #, python-format
 msgid "Unknown domain %s"
 msgstr ""
 
-#: admin/models/mailbox.py:82
+#: models/mailbox.py:82
 msgid "Mailbox address (without the @domain.tld part)"
 msgstr ""
 
-#: admin/models/mailbox.py:148
+#: models/mailbox.py:148
 #, python-format
 msgid "Failed to retrieve mailbox location (%s)"
 msgstr ""
 
-#: admin/models/mailbox.py:238
+#: models/mailbox.py:238
 #, python-format
 msgid "Quota is greater than the allowed domain's limit (%dM)"
 msgstr ""
 
-#: admin/models/mailbox.py:244
+#: models/mailbox.py:244
 msgid "A quota is required"
 msgstr ""
 
-#: admin/serializers.py:45 admin/serializers.py:228 admin/serializers.py:317
+#: serializers.py:45 serializers.py:228 serializers.py:317
 msgid "Permission denied."
 msgstr ""
 
-#: admin/serializers.py:83
+#: serializers.py:83
 msgid ""
 "List of administered domains (resellers and domain administrators only)."
 msgstr ""
 
-#: admin/serializers.py:193
+#: serializers.py:193
 msgid "Not allowed for this role."
 msgstr ""
 
-#: admin/serializers.py:203
+#: serializers.py:203
 msgid "Must be equal to mailbox full_address"
 msgstr ""
 
-#: admin/serializers.py:215
+#: serializers.py:215
 msgid "Local domain {} does not exist"
 msgstr ""
 
-#: admin/serializers.py:315
+#: serializers.py:315
 msgid "Domain not found."
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:16
-#: admin/templates/admin/alias_detail.html:16
-#: admin/templates/admin/domain_detail.html:15
-#: admin/templates/admin/identities_table.html:7
+#: templates/admin/account_detail.html:16 templates/admin/alias_detail.html:16
+#: templates/admin/domain_detail.html:15
+#: templates/admin/identities_table.html:7
 msgid "(disabled)"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:22
-#: admin/templates/admin/alias_detail.html:22
-#: admin/templates/admin/domain_detail.html:21
+#: templates/admin/account_detail.html:22 templates/admin/alias_detail.html:22
+#: templates/admin/domain_detail.html:21
 msgid "Summary"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:26
+#: templates/admin/account_detail.html:26
 msgid "Full name"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:32
-#: admin/templates/admin/alias_detail.html:26
+#: templates/admin/account_detail.html:32 templates/admin/alias_detail.html:26
 msgid "Created"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:35
+#: templates/admin/account_detail.html:35
 msgid "Last login"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:38
+#: templates/admin/account_detail.html:38
 msgid "Secondary email"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:38
-#: admin/templates/admin/account_detail.html:41
+#: templates/admin/account_detail.html:38
+#: templates/admin/account_detail.html:41
 msgid "Not defined"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:41
+#: templates/admin/account_detail.html:41
 msgid "Phone number"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:55
+#: templates/admin/account_detail.html:55
 msgid "Administered domains"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:61
+#: templates/admin/account_detail.html:61
 msgid "No domain defined."
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:75
+#: templates/admin/account_detail.html:75
 msgid "Aliases"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:81
+#: templates/admin/account_detail.html:81
 msgid "No alias defined"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:87
+#: templates/admin/account_detail.html:87
 msgid "Additional sender addresses"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:93
+#: templates/admin/account_detail.html:93
 msgid "No sender address defined"
 msgstr ""
 
-#: admin/templates/admin/account_general_form.html:11
-#: admin/templates/admin/aliasform.html:13
+#: templates/admin/account_general_form.html:11
+#: templates/admin/aliasform.html:13
 msgid "Domain is disabled"
 msgstr ""
 
-#: admin/templates/admin/alias_detail.html:16
-#: admin/templates/admin/identities.html:33
+#: templates/admin/alias_detail.html:16 templates/admin/identities.html:33
 msgid "Alias"
 msgstr ""
 
-#: admin/templates/admin/alias_detail.html:27
+#: templates/admin/alias_detail.html:27
 msgid "Modified"
 msgstr ""
 
-#: admin/templates/admin/dnsbl_domain_detail.html:10
+#: templates/admin/dnsbl_domain_detail.html:10
 msgid "Provider"
 msgstr ""
 
-#: admin/templates/admin/dnsbl_domain_detail.html:11
-#: admin/templates/admin/mx_domain_detail.html:10
-#: admin/templates/admin/quota_headers.html:2
+#: templates/admin/dnsbl_domain_detail.html:11
+#: templates/admin/mx_domain_detail.html:10
+#: templates/admin/quota_headers.html:2
 msgid "Address"
 msgstr ""
 
-#: admin/templates/admin/dnsbl_domain_detail.html:12
+#: templates/admin/dnsbl_domain_detail.html:12
 msgid "Status"
 msgstr ""
 
-#: admin/templates/admin/dnsbl_domain_detail.html:21
+#: templates/admin/dnsbl_domain_detail.html:21
 msgid "listed"
 msgstr ""
 
-#: admin/templates/admin/dnsbl_domain_detail.html:29
+#: templates/admin/dnsbl_domain_detail.html:29
 msgid "Everything is fine, this domain is not listed."
 msgstr ""
 
-#: admin/templates/admin/dnsbl_domain_detail.html:32
+#: templates/admin/dnsbl_domain_detail.html:32
 msgid "No information available for this domain."
 msgstr ""
 
-#: admin/templates/admin/domain_detail.html:26
-#: admin/templates/admin/domains.html:38
+#: templates/admin/domain_detail.html:26 templates/admin/domains.html:38
 msgid "DNS status"
 msgstr ""
 
-#: admin/templates/admin/domain_detail.html:28
-#: admin/templates/admin/domains_table.html:12
+#: templates/admin/domain_detail.html:28 templates/admin/domains_table.html:14
 msgid "Awaiting checks"
 msgstr ""
 
-#: admin/templates/admin/domain_detail.html:40
+#: templates/admin/domain_detail.html:40
 msgid "Creation date"
 msgstr ""
 
-#: admin/templates/admin/domain_detail.html:42
+#: templates/admin/domain_detail.html:42
 msgid "Last modification date"
 msgstr ""
 
-#: admin/templates/admin/domain_detail.html:43
-#: admin/templates/admin/domain_detail.html:52
-#: admin/templates/admin/domain_statistics.html:33
+#: templates/admin/domain_detail.html:43 templates/admin/domain_detail.html:52
+#: templates/admin/domain_statistics.html:33
 msgid "Domain aliases"
 msgstr ""
 
-#: admin/templates/admin/domain_detail.html:45
+#: templates/admin/domain_detail.html:45
 msgid "Mailbox aliases"
 msgstr ""
 
-#: admin/templates/admin/domain_detail.html:69
+#: templates/admin/domain_detail.html:69
 msgid "Administrators"
 msgstr ""
 
-#: admin/templates/admin/domain_detail.html:79
-#: admin/templatetags/admin_tags.py:259
+#: templates/admin/domain_detail.html:79 templatetags/admin_tags.py:259
 msgid "Remove this permission"
 msgstr ""
 
-#: admin/templates/admin/domain_detail.html:84
+#: templates/admin/domain_detail.html:84
 msgid "No domain administrator defined yet."
 msgstr ""
 
-#: admin/templates/admin/domain_general_form.html:4
-#: admin/templates/admin/mailform.html:4
-#: admin/templates/admin/newdomainform.html:3
+#: templates/admin/domain_general_form.html:4 templates/admin/mailform.html:4
+#: templates/admin/newdomainform.html:3
 msgid "MB"
 msgstr ""
 
-#: admin/templates/admin/domain_options_form.html:7
+#: templates/admin/domain_options_form.html:7
 msgid "You can't create a new domain administrator"
 msgstr ""
 
-#: admin/templates/admin/domain_statistics.html:15
-#: admin/templatetags/admin_tags.py:44
+#: templates/admin/domain_statistics.html:15 templatetags/admin_tags.py:44
 msgid "Statistics"
 msgstr ""
 
-#: admin/templates/admin/domain_statistics.html:15
+#: templates/admin/domain_statistics.html:15
 msgid "Domains and identities"
 msgstr ""
 
-#: admin/templates/admin/domain_statistics.html:22
+#: templates/admin/domain_statistics.html:22
 msgid "Global counters"
 msgstr ""
 
-#: admin/templates/admin/domain_statistics.html:27
+#: templates/admin/domain_statistics.html:27
 msgid "Quantity"
 msgstr ""
 
-#: admin/templates/admin/domain_statistics.html:45
+#: templates/admin/domain_statistics.html:45
 msgid "Per-domain counters"
 msgstr ""
 
-#: admin/templates/admin/domains.html:26
-#: admin/templates/admin/identities.html:29
+#: templates/admin/domains.html:26 templates/admin/identities.html:29
 msgid "Add"
 msgstr ""
 
-#: admin/templates/admin/domains.html:36
-#: admin/templates/admin/identity_headers.html:4
+#: templates/admin/domains.html:36 templates/admin/identity_headers.html:4
 msgid "Tags"
 msgstr ""
 
-#: admin/templates/admin/domains.html:40
-#: admin/templates/admin/identity_headers.html:5
+#: templates/admin/domains.html:40 templates/admin/identity_headers.html:5
 msgid "Actions"
 msgstr ""
 
-#: admin/templates/admin/domains_table.html:5
+#: templates/admin/domains_table.html:5
 msgid "disabled"
 msgstr ""
 
-#: admin/templates/admin/forward.html:2
+#: templates/admin/domains_table.html:12
+msgctxt "checks"
+msgid "Disabled"
+msgstr ""
+
+#: templates/admin/forward.html:2
 msgid "Automatically forward emails to another address"
 msgstr ""
 
-#: admin/templates/admin/forward.html:9 admin/views/alias.py:91
+#: templates/admin/forward.html:9 views/alias.py:91
 msgid "Update"
 msgstr ""
 
-#: admin/templates/admin/identities.html:32
+#: templates/admin/identities.html:32
 msgid "Account"
 msgstr ""
 
-#: admin/templates/admin/identity_headers.html:3
+#: templates/admin/identity_headers.html:3
 msgid "Fullname/Recipient"
 msgstr ""
 
-#: admin/templates/admin/import_domains_form.html:6
+#: templates/admin/import_domains_form.html:6
 msgid ""
 "Provide a CSV file where lines respect one of the following formats: <ul> "
 "<li><em>domain; name; quota; enabled</em></li> <li><em>domainalias; name; "
@@ -817,7 +801,7 @@ msgid ""
 "<p>You can use a different character as separator.</p>"
 msgstr ""
 
-#: admin/templates/admin/import_identities_form.html:6
+#: templates/admin/import_identities_form.html:6
 msgid ""
 "Provide a CSV file where lines respect one of the following formats: <ul> "
 "<li><em>account; loginname; password; first name; last name; enabled; group; "
@@ -827,196 +811,195 @@ msgid ""
 "use a different character as separator.</p>"
 msgstr ""
 
-#: admin/templates/admin/importform.html:6
+#: templates/admin/importform.html:6
 msgid "Help"
 msgstr ""
 
-#: admin/templates/admin/importform.html:13
+#: templates/admin/importform.html:13
 msgid "Importing..."
 msgstr ""
 
-#: admin/templates/admin/mailboxes_raw.html:3
+#: templates/admin/mailboxes_raw.html:3
 msgid "Choose a value"
 msgstr ""
 
-#: admin/templates/admin/mailform.html:4
+#: templates/admin/mailform.html:4
 msgid "Use domain default value"
 msgstr ""
 
-#: admin/templates/admin/mx_domain_detail.html:11
+#: templates/admin/mx_domain_detail.html:11
 msgid "Updated"
 msgstr ""
 
-#: admin/templates/admin/mx_domain_detail.html:23
+#: templates/admin/mx_domain_detail.html:23
 msgid "This IP does not match any of the valid MXs defined in parameters"
 msgstr ""
 
-#: admin/templates/admin/mx_domain_detail.html:36
+#: templates/admin/mx_domain_detail.html:36
 msgid "No MX record found for this domain."
 msgstr ""
 
-#: admin/templates/admin/notifications/domain_in_dnsbl.html:3
+#: templates/admin/notifications/domain_in_dnsbl.html:3
 #, python-format
 msgid ""
 "Modoboa detected that domain %(domain)s is listed by the following DNSBL "
 "providers:"
 msgstr ""
 
-#: admin/templates/admin/notifications/domain_in_dnsbl.html:11
+#: templates/admin/notifications/domain_in_dnsbl.html:11
 msgid ""
 "The domain's reputation will be affected and there is a chance that emails "
 "coming from it are considered as spam. You should contact those providers "
 "and ask them to unlist detected IP address(es)."
 msgstr ""
 
-#: admin/templates/admin/notifications/domain_invalid_mx.html:3
+#: templates/admin/notifications/domain_invalid_mx.html:3
 #, python-format
 msgid "Modoboa detected that domain %(domain)s has no valid MX record:"
 msgstr ""
 
-#: admin/templates/admin/quota_headers.html:3
+#: templates/admin/quota_headers.html:3
 msgid "Value"
 msgstr ""
 
-#: admin/templates/admin/quota_headers.html:4
+#: templates/admin/quota_headers.html:4
 msgid "Limit"
 msgstr ""
 
-#: admin/templates/admin/quota_headers.html:5
+#: templates/admin/quota_headers.html:5
 #, python-format
 msgid "Usage (%%)"
 msgstr ""
 
-#: admin/templates/admin/searchform.html:6
+#: templates/admin/searchform.html:6
 msgid "Search"
 msgstr ""
 
-#: admin/templatetags/admin_tags.py:18
+#: templatetags/admin_tags.py:18
 msgid "enabled_m"
 msgstr ""
 
-#: admin/templatetags/admin_tags.py:18
+#: templatetags/admin_tags.py:18
 msgid "enabled_f"
 msgstr ""
 
-#: admin/templatetags/admin_tags.py:39
+#: templatetags/admin_tags.py:39
 msgid "List domains"
 msgstr ""
 
-#: admin/templatetags/admin_tags.py:56 admin/templatetags/admin_tags.py:104
-#: admin/views/import_.py:87 admin/views/import_.py:109
+#: templatetags/admin_tags.py:56 templatetags/admin_tags.py:104
+#: views/import_.py:87 views/import_.py:109
 msgid "Import"
 msgstr ""
 
-#: admin/templatetags/admin_tags.py:62 admin/templatetags/admin_tags.py:110
-#: admin/views/export.py:41 admin/views/export.py:69
+#: templatetags/admin_tags.py:62 templatetags/admin_tags.py:110
+#: views/export.py:41 views/export.py:69
 msgid "Export"
 msgstr ""
 
-#: admin/templatetags/admin_tags.py:94
+#: templatetags/admin_tags.py:94
 msgid "List identities"
 msgstr ""
 
-#: admin/templatetags/admin_tags.py:99
+#: templatetags/admin_tags.py:99
 msgid "List quotas"
 msgstr ""
 
-#: admin/templatetags/admin_tags.py:129
+#: templatetags/admin_tags.py:129
 msgid "View the domain's identities"
 msgstr ""
 
-#: admin/templatetags/admin_tags.py:135 admin/templatetags/admin_tags.py:178
-#: admin/templatetags/admin_tags.py:191
+#: templatetags/admin_tags.py:135 templatetags/admin_tags.py:178
+#: templatetags/admin_tags.py:191
 msgid "Edit {}"
 msgstr ""
 
-#: admin/templatetags/admin_tags.py:145 admin/templatetags/admin_tags.py:182
-#: admin/templatetags/admin_tags.py:196
+#: templatetags/admin_tags.py:145 templatetags/admin_tags.py:182
+#: templatetags/admin_tags.py:196
 #, python-format
 msgid "Delete %s?"
 msgstr ""
 
-#: admin/views/alias.py:33
+#: views/alias.py:33
 msgid "Alias with this name already exists"
 msgstr ""
 
-#: admin/views/alias.py:58
+#: views/alias.py:58
 msgid "Create"
 msgstr ""
 
-#: admin/views/alias.py:70
+#: views/alias.py:70
 msgid "New alias"
 msgstr ""
 
-#: admin/views/alias.py:71
+#: views/alias.py:71
 msgid "Alias created"
 msgstr ""
 
-#: admin/views/alias.py:83
+#: views/alias.py:83
 msgid "Alias modified"
 msgstr ""
 
-#: admin/views/alias.py:107
+#: views/alias.py:107
 msgid "Alias deleted"
 msgid_plural "Aliases deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin/views/dns.py:30
+#: views/dns.py:30
 msgid "MX records of {}"
 msgstr ""
 
-#: admin/views/dns.py:53
+#: views/dns.py:53
 msgid "DNSBL summary for {}"
 msgstr ""
 
-#: admin/views/domain.py:152
+#: views/domain.py:152
 msgid "You can't delete your own domain"
 msgstr ""
 
-#: admin/views/domain.py:155
+#: views/domain.py:155
 msgid "Domain deleted"
 msgid_plural "Domains deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin/views/export.py:40
+#: views/export.py:40
 msgid "Export identities"
 msgstr ""
 
-#: admin/views/export.py:68
+#: views/export.py:68
 msgid "Export domains"
 msgstr ""
 
-#: admin/views/identity.py:111 admin/views/identity.py:205
-#: admin/views/identity.py:210
+#: views/identity.py:111 views/identity.py:205 views/identity.py:210
 msgid "Invalid request"
 msgstr ""
 
-#: admin/views/identity.py:195
+#: views/identity.py:195
 msgid "Account deleted"
 msgid_plural "Accounts deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin/views/import_.py:63
+#: views/import_.py:63
 #, python-format
 msgid "Object already exists: %s"
 msgstr ""
 
-#: admin/views/import_.py:67
+#: views/import_.py:67
 #, python-format
 msgid "%d objects imported successfully"
 msgstr ""
 
-#: admin/views/import_.py:86
+#: views/import_.py:86
 msgid "Import domains"
 msgstr ""
 
-#: admin/views/import_.py:108
+#: views/import_.py:108
 msgid "Import identities"
 msgstr ""
 
-#: admin/views/user.py:35
+#: views/user.py:35
 msgid "Forward updated"
 msgstr ""
diff --git a/modoboa/admin/locale/es/LC_MESSAGES/django.po b/modoboa/admin/locale/es/LC_MESSAGES/django.po
index b2fc8e84d..9067193c7 100644
--- a/modoboa/admin/locale/es/LC_MESSAGES/django.po
+++ b/modoboa/admin/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: 2016-12-14 14:13+0100\n"
+"POT-Creation-Date: 2017-01-16 13:02+0100\n"
 "PO-Revision-Date: 2013-10-01 09:56+0000\n"
 "Last-Translator: Pedro Gracia <lasarux@neuroomante.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/modoboa/language/"
@@ -20,47 +20,46 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/app_settings.py:17 admin/handlers.py:245
-#: admin/templates/admin/domain_statistics.html:30
-#: admin/templates/admin/domains.html:4
+#: app_settings.py:17 handlers.py:252
+#: templates/admin/domain_statistics.html:30 templates/admin/domains.html:4
 msgid "Domains"
 msgstr "Dominios"
 
-#: admin/app_settings.py:20
+#: app_settings.py:20
 msgid "Enable MX checks"
 msgstr ""
 
-#: admin/app_settings.py:23
+#: app_settings.py:23
 msgid "Check that every domain has a valid MX record"
 msgstr ""
 
-#: admin/app_settings.py:28
+#: app_settings.py:28
 msgid "Valid MXs"
 msgstr ""
 
-#: admin/app_settings.py:31
+#: app_settings.py:31
 msgid ""
-"IP(s) or network(s) of the MX that should match with domains' MX records. On "
-"per line."
+"A list of IP or network address every MX record should match. A warning will "
+"be sent if a record does not respect it."
 msgstr ""
 
-#: admin/app_settings.py:40
+#: app_settings.py:39
 msgid "Enable DNSBL checks"
 msgstr ""
 
-#: admin/app_settings.py:43
+#: app_settings.py:42
 msgid "Check every domain against major DNSBL providers"
 msgstr ""
 
-#: admin/app_settings.py:47 admin/templates/admin/domain_detail.html.py:44
+#: app_settings.py:46 templates/admin/domain_detail.html:44
 msgid "Mailboxes"
 msgstr "Mailboxes"
 
-#: admin/app_settings.py:50
+#: app_settings.py:49
 msgid "Handle mailboxes on filesystem"
 msgstr "Manejar mailboxes en el sistema de fichero"
 
-#: admin/app_settings.py:53
+#: app_settings.py:52
 #, fuzzy
 msgid ""
 "Rename or remove mailboxes on the filesystem when they get renamed or "
@@ -69,113 +68,112 @@ msgstr ""
 "Renombrar o eliminar mailboxes en el sistema de ficheros cuando sean "
 "renombrados o eliminados dentro de Modoboa"
 
-#: admin/app_settings.py:59
+#: app_settings.py:58
 msgid "Mailboxes owner"
 msgstr "Propietario de los mailboxes"
 
-#: admin/app_settings.py:62
+#: app_settings.py:61
 msgid "The UNIX account who owns mailboxes on the filesystem"
 msgstr "Cuenta de UNIX que posee los mailboxes en el sistema de ficheros"
 
-#: admin/app_settings.py:67
+#: app_settings.py:66
 #, fuzzy
 msgid "Default domain quota"
 msgstr "Límites por defecto"
 
-#: admin/app_settings.py:70
+#: app_settings.py:69
 msgid ""
 "Default quota (in MB) applied to freshly created domains with no value "
 "specified. A value of 0 means no quota."
 msgstr ""
 
-#: admin/app_settings.py:76
+#: app_settings.py:75
 msgid "Automatic account removal"
 msgstr "Elminar cuentas automáticamente"
 
-#: admin/app_settings.py:79
+#: app_settings.py:78
 msgid "When a mailbox is removed, also remove the associated account"
 msgstr "Cuando un mailbox es eliminado, también lo es su cuenta asociada."
 
-#: admin/app_settings.py:83
+#: app_settings.py:82
 #, fuzzy
 msgid "Automatic domain/mailbox creation"
 msgstr "Dominio creado"
 
-#: admin/app_settings.py:86
+#: app_settings.py:85
 msgid "Create a domain and a mailbox when an account is automatically created."
 msgstr ""
 
-#: admin/app_settings.py:133 admin/forms/account.py:288
-#: admin/forms/domain.py:87
+#: app_settings.py:132 forms/account.py:288 forms/domain.py:87
 msgid "Must be a positive integer"
 msgstr ""
 
-#: admin/app_settings.py:143
+#: app_settings.py:142
 #, fuzzy
 msgid "Administration"
 msgstr "Administradores"
 
-#: admin/forms/account.py:34 admin/templates/admin/domain_detail.html.py:72
+#: forms/account.py:34 templates/admin/domain_detail.html:72
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: admin/forms/account.py:36
+#: forms/account.py:36
 #, fuzzy
 msgid ""
 "The user's name. Must be a valid e-mail address for simple users or "
 "administrators with a mailbox."
 msgstr "El usuario normal '%s' debe tener una dirección de email válida"
 
-#: admin/forms/account.py:41 admin/templates/admin/account_detail.html.py:29
+#: forms/account.py:41 templates/admin/account_detail.html:29
 msgid "Role"
 msgstr "Rol"
 
-#: admin/forms/account.py:42
+#: forms/account.py:42
 msgid "Choose"
 msgstr "Elija"
 
-#: admin/forms/account.py:43
+#: forms/account.py:43
 msgid "What level of permission this user will have"
 msgstr "Qué nivel de permiso tendrá este usuario"
 
-#: admin/forms/account.py:46
+#: forms/account.py:46
 msgid "Password"
 msgstr "Contraseña"
 
-#: admin/forms/account.py:50
+#: forms/account.py:50
 msgid "Confirmation"
 msgstr "Confirmación"
 
-#: admin/forms/account.py:53
+#: forms/account.py:53
 msgid "Enter the same password as above, for verification."
 msgstr "Introduzca la misma contraseña que arriba, para verificación."
 
-#: admin/forms/account.py:64
+#: forms/account.py:64
 msgid "Enabled"
 msgstr "Activado"
 
-#: admin/forms/account.py:156
+#: forms/account.py:156
 msgid "The two password fields didn't match."
 msgstr "Las contraseñas no concuerdan"
 
-#: admin/forms/account.py:171
+#: forms/account.py:171
 msgid "Only super administrators are allowed for this mode"
 msgstr ""
 
-#: admin/forms/account.py:179
+#: forms/account.py:179
 msgid "You can't disable your own account"
 msgstr "No puede deshabilitar su propia cuenta"
 
-#: admin/forms/account.py:194
+#: forms/account.py:194
 msgid "E-mail"
 msgstr "Email"
 
-#: admin/forms/account.py:196 admin/forms/domain.py:38
-#: admin/templates/admin/account_detail.html:45
+#: forms/account.py:196 forms/domain.py:38
+#: templates/admin/account_detail.html:45
 msgid "Quota"
 msgstr "Cuota"
 
-#: admin/forms/account.py:198
+#: forms/account.py:198
 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 "
@@ -185,12 +183,11 @@ msgstr ""
 "dominio por defecto. Déjelo vacío para definir un valor ilimitado (no "
 "permitido para los administradores del dominio)"
 
-#: admin/forms/account.py:206 admin/forms/domain.py:46
-#: admin/templates/admin/domains.html:35
+#: forms/account.py:206 forms/domain.py:46 templates/admin/domains.html:35
 msgid "Alias(es)"
 msgstr "Alias"
 
-#: admin/forms/account.py:209
+#: forms/account.py:209
 #, fuzzy
 #| msgid ""
 #| "Alias(es) of this mailbox. Indicate only one address per input, press "
@@ -205,13 +202,13 @@ msgstr ""
 "ENTER para añadir una nueva entrada. Use el carácter '*' para crear una "
 "dirección 'catchall' (recogerlos todos, ej. *@domain.tld)"
 
-#: admin/forms/account.py:215
+#: forms/account.py:215
 #, fuzzy
 #| msgid "Invalid request"
 msgid "Sender addresses"
 msgstr "Petición inválida"
 
-#: admin/forms/account.py:218
+#: forms/account.py:218
 #, fuzzy
 #| msgid ""
 #| "Mailbox(es) this alias will point to. Indicate only one address per "
@@ -224,61 +221,60 @@ msgstr ""
 "Mailbox(es) a los que apuntará este alias. Indique únicamente una dirección "
 "por entrada, presione ENTER para añadir una nueva entrada."
 
-#: admin/forms/account.py:267 admin/forms/alias.py:92
-#: admin/models/mailbox.py:295
+#: forms/account.py:267 forms/alias.py:92 models/mailbox.py:295
 msgid "Domain does not exist"
 msgstr "El dominio no existe"
 
-#: admin/forms/account.py:297
+#: forms/account.py:297
 #, fuzzy
 #| msgid "Domain does not exist"
 msgid "Local domain does not exist"
 msgstr "El dominio no existe"
 
-#: admin/forms/account.py:392
+#: forms/account.py:392
 msgid "Domain(s)"
 msgstr "Dominio(s)"
 
-#: admin/forms/account.py:394
+#: forms/account.py:394
 msgid "Domain(s) that user administrates"
 msgstr "Dominio(s) que el usuario administra"
 
-#: admin/forms/account.py:440 admin/forms/account.py:525
-#: admin/forms/domain.py:283 admin/forms/domain.py:350
+#: forms/account.py:440 forms/account.py:525 forms/domain.py:283
+#: forms/domain.py:350
 msgid "General"
 msgstr "General"
 
-#: admin/forms/account.py:445 admin/forms/account.py:531
+#: forms/account.py:445 forms/account.py:531
 msgid "Mail"
 msgstr "Correo"
 
-#: admin/forms/account.py:447
+#: forms/account.py:447
 msgid "Permissions"
 msgstr "Permisos"
 
-#: admin/forms/account.py:514
+#: forms/account.py:514
 msgid "Account updated"
 msgstr "Cuenta actualizada"
 
-#: admin/forms/account.py:538
+#: forms/account.py:538
 msgid "New account"
 msgstr "Nueva cuenta"
 
-#: admin/forms/account.py:550
+#: forms/account.py:550
 msgid "Account created"
 msgstr "Cuenta creada"
 
-#: admin/forms/alias.py:24
+#: forms/alias.py:24
 #, fuzzy
 #| msgid "Invalid request"
 msgid "Random address"
 msgstr "Petición inválida"
 
-#: admin/forms/alias.py:27
+#: forms/alias.py:27
 msgid "Email address"
 msgstr "Dirección de email"
 
-#: admin/forms/alias.py:29
+#: forms/alias.py:29
 #, fuzzy
 #| msgid ""
 #| "The alias address (without the domain part). For a 'catch-all' address, "
@@ -290,11 +286,11 @@ msgstr ""
 "La dirección del alias (sin la parte del dominio). Para una dirección que lo "
 "recoja todo, ponga un asterisco (*)."
 
-#: admin/forms/alias.py:35 admin/templates/admin/alias_detail.html.py:37
+#: forms/alias.py:35 templates/admin/alias_detail.html:37
 msgid "Recipients"
 msgstr "Destinatarios"
 
-#: admin/forms/alias.py:37
+#: forms/alias.py:37
 #, fuzzy
 #| msgid ""
 #| "Mailbox(es) this alias will point to. Indicate only one address per "
@@ -306,37 +302,37 @@ msgstr ""
 "Mailbox(es) a los que apuntará este alias. Indique únicamente una dirección "
 "por entrada, presione ENTER para añadir una nueva entrada."
 
-#: admin/forms/alias.py:47 admin/forms/domain.py:26 admin/models/domain.py:91
-#: admin/templates/admin/domain_statistics.html:49
+#: forms/alias.py:47 forms/domain.py:26 models/domain.py:92
+#: templates/admin/domain_statistics.html:49
 #, fuzzy
 msgid "Domain"
 msgstr "Dominios"
 
-#: admin/forms/alias.py:95
+#: forms/alias.py:95
 msgid "You don't have access to this domain"
 msgstr "No tienes acceso a este dominio"
 
-#: admin/forms/alias.py:112 admin/forms/alias.py:114
+#: forms/alias.py:112 forms/alias.py:114
 #, fuzzy
 msgid "This field is required"
 msgstr "Una cuota es obligatoria"
 
-#: admin/forms/alias.py:118
+#: forms/alias.py:118
 msgid "No recipient defined"
 msgstr "No ha puesto destinatario"
 
-#: admin/forms/domain.py:35 admin/templates/admin/domain_statistics.html.py:26
+#: forms/domain.py:35 templates/admin/domain_statistics.html:26
 msgid "Type"
 msgstr ""
 
-#: admin/forms/domain.py:41
+#: forms/domain.py:41
 #, fuzzy
 msgid ""
 "Default quota in MB applied to mailboxes. Leave empty to use the default "
 "value."
 msgstr "Cuota por defecto en MB que se aplicará a los mailboxes"
 
-#: admin/forms/domain.py:49
+#: forms/domain.py:49
 msgid ""
 "Alias(es) of this domain. Indicate only one name per input, press ENTER to "
 "add a new input."
@@ -344,38 +340,36 @@ msgstr ""
 "Alia(s) de este dominio. Indique únicamente un nombre por entrada, presione "
 "ENTER para añadir una nueva entrada."
 
-#: admin/forms/domain.py:103 admin/handlers.py:148
+#: forms/domain.py:103 handlers.py:155
 #, fuzzy
 msgid "domain alias"
 msgstr "Alias del dominio"
 
-#: admin/forms/domain.py:106 admin/forms/domain.py:118
-#: admin/forms/domain.py:126
+#: forms/domain.py:106 forms/domain.py:118 forms/domain.py:126
 #, fuzzy, python-format
 msgid "A %s with this name already exists"
 msgstr "Ya existe un alias con este nombre"
 
-#: admin/forms/domain.py:118 admin/forms/domain.py:123
+#: forms/domain.py:118 forms/domain.py:123
 #, fuzzy
 msgid "domain"
 msgstr "Dominios"
 
-#: admin/forms/domain.py:171
+#: forms/domain.py:171
 msgid "Create a domain administrator"
 msgstr "Crear un administrador del dominio"
 
-#: admin/forms/domain.py:174
+#: forms/domain.py:174
 msgid "Automatically create an administrator for this domain"
 msgstr "Automáticamente crear una administrador para este dominio"
 
-#: admin/forms/domain.py:179 admin/templates/admin/domain_detail.html.py:72
-#: admin/templates/admin/domains.html:34
-#: admin/templates/admin/identity_headers.html:2
-#: admin/templates/admin/mx_domain_detail.html:9
+#: forms/domain.py:179 templates/admin/domain_detail.html:72
+#: templates/admin/domains.html:34 templates/admin/identity_headers.html:2
+#: templates/admin/mx_domain_detail.html:9
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/forms/domain.py:182
+#: forms/domain.py:182
 msgid ""
 "The administrator's name. Don't include the domain's name here, it will be "
 "automatically appended."
@@ -383,69 +377,69 @@ msgstr ""
 "El nombre del administrador. No incluya el nombre del dominio aquí, será "
 "añadido automáticamente."
 
-#: admin/forms/domain.py:189
+#: forms/domain.py:189
 msgid "Create aliases"
 msgstr "Crear alias"
 
-#: admin/forms/domain.py:192
+#: forms/domain.py:192
 msgid "Automatically create standard aliases for this domain"
 msgstr "Automáticamente crear alias estándar para este dominio"
 
-#: admin/forms/domain.py:208
+#: forms/domain.py:208
 msgid "Invalid format"
 msgstr "Formato inválido"
 
-#: admin/forms/domain.py:217 admin/forms/domain.py:220
+#: forms/domain.py:217 forms/domain.py:220
 #, fuzzy
 msgid "This field is required."
 msgstr "Una cuota es obligatoria"
 
-#: admin/forms/domain.py:237
+#: forms/domain.py:237
 #, python-format
 msgid "User '%s' already exists"
 msgstr "El usuario '%s' ya existe"
 
-#: admin/forms/domain.py:339
+#: forms/domain.py:339
 msgid "Domain modified"
 msgstr "Dominio modificado"
 
-#: admin/forms/domain.py:360
+#: forms/domain.py:360
 msgid "Options"
 msgstr "Opciones"
 
-#: admin/forms/domain.py:368
+#: forms/domain.py:368
 msgid "New domain"
 msgstr "Nuevo dominio"
 
-#: admin/forms/domain.py:381
+#: forms/domain.py:381
 msgid "Domain created"
 msgstr "Dominio creado"
 
-#: admin/forms/export.py:7
+#: forms/export.py:7
 msgid "File name"
 msgstr "Nombre del fichero"
 
-#: admin/forms/export.py:13 admin/forms/import_.py:13
+#: forms/export.py:13 forms/import_.py:13
 msgid "Separator"
 msgstr "Separador"
 
-#: admin/forms/forward.py:14
+#: forms/forward.py:14
 msgid "Recipient(s)"
 msgstr "Destinatario(s)"
 
-#: admin/forms/forward.py:18
+#: forms/forward.py:18
 msgid "Indicate one or more recipients separated by a ','"
 msgstr "Indique uno o más destinatarios separados por una ','"
 
-#: admin/forms/forward.py:21
+#: forms/forward.py:21
 msgid "Keep local copies"
 msgstr "Mantener copias locales"
 
-#: admin/forms/forward.py:24
+#: forms/forward.py:24
 msgid "Forward messages and store copies into your local mailbox"
 msgstr "Reenvía mensajes y guarda copias en su mailbox local"
 
-#: admin/forms/forward.py:42
+#: forms/forward.py:42
 msgid ""
 "You can't define a forward to a local destination. Please ask your "
 "administrator to create an alias instead."
@@ -453,470 +447,461 @@ msgstr ""
 "No puede definir un reenvío a un destino local. Por favor, pregunte a su "
 "administrador para crear un alias en su lugar."
 
-#: admin/forms/import_.py:11
+#: forms/import_.py:11
 msgid "Select a file"
 msgstr "Seleccione un fichero"
 
-#: admin/forms/import_.py:19
+#: forms/import_.py:19
 msgid "Continue on error"
 msgstr "Continúe en error."
 
-#: admin/forms/import_.py:20
+#: forms/import_.py:20
 msgid "Don't treat duplicated objects as error"
 msgstr "No tratar objetos duplicados como error"
 
-#: admin/forms/import_.py:38
+#: forms/import_.py:38
 msgid "Crypt passwords"
 msgstr "Contraseñas cifradas"
 
-#: admin/forms/import_.py:40
+#: forms/import_.py:40
 msgid "Check this option if passwords contained in your file are not crypted"
 msgstr ""
 "Marque esta opción si las contraseñas que contiene su fichero no están "
 "cifradas"
 
-#: admin/handlers.py:194
+#: handlers.py:201
 #, python-format
 msgid "Account import failed (%s): domain does not exist"
 msgstr "Falló la importación de la cuenta (%s): el dominio no existe"
 
-#: admin/handlers.py:207 admin/models/mailbox.py:320
+#: handlers.py:214 models/mailbox.py:320
 #, fuzzy
 #| msgid "Mailbox %s already exists"
 msgid "Mailbox {} already exists"
 msgstr "El mailbox %s ya existe"
 
-#: admin/handlers.py:215
+#: handlers.py:222
 #, fuzzy, python-format
 msgid "Account import failed (%s): wrong quota value"
 msgstr "Falló la importación de la cuenta (%s): el dominio no existe"
 
-#: admin/handlers.py:255 admin/templates/admin/domain_statistics.html.py:36
-#: admin/templates/admin/domain_statistics.html:50
-#: admin/templates/admin/identities.html:5
+#: handlers.py:262 templates/admin/domain_statistics.html:36
+#: templates/admin/domain_statistics.html:50 templates/admin/identities.html:5
 msgid "Identities"
 msgstr "Identidades"
 
-#: admin/handlers.py:271 admin/templates/admin/forward.html.py:2
+#: handlers.py:278 templates/admin/forward.html:2
 msgid "Forward"
 msgstr "Siguiente"
 
-#: admin/lib.py:32
+#: lib.py:32
 #, fuzzy
 msgid "A mailbox is required"
 msgstr "Una cuota es obligatoria"
 
-#: admin/lib.py:122
+#: lib.py:122
 #, fuzzy
 #| msgid "You can't delete your own domain"
 msgid "You are not allowed to import domains"
 msgstr "No puedo eliminar su propio dominio"
 
-#: admin/lib.py:133
+#: lib.py:133
 msgid "You are not allowed to import domain aliases."
 msgstr ""
 
-#: admin/management/commands/subcommands/_mx.py:159
+#: management/commands/subcommands/_mx.py:159
 msgid "[modoboa] DNSBL issue(s) for domain {}"
 msgstr ""
 
-#: admin/management/commands/subcommands/_mx.py:180
+#: management/commands/subcommands/_mx.py:180
 msgid "Domain {} has no MX record"
 msgstr ""
 
-#: admin/management/commands/subcommands/_mx.py:191
+#: management/commands/subcommands/_mx.py:191
 #, python-brace-format
 msgid "MX record for domain {0} is invalid: {1}"
 msgstr ""
 
-#: admin/management/commands/subcommands/_mx.py:207
+#: management/commands/subcommands/_mx.py:207
 msgid "[modoboa] MX issue(s) for domain {}"
 msgstr ""
 
-#: admin/models/alias.py:31 admin/models/mailbox.py:80
+#: models/alias.py:31 models/mailbox.py:80
 msgid "address"
 msgstr "dirección"
 
-#: admin/models/alias.py:33
+#: models/alias.py:33
 #, fuzzy
 #| msgid "The alias name"
 msgid "The alias address."
 msgstr "Nombre del alias"
 
-#: admin/models/alias.py:38 admin/models/domain.py:46
-#: admin/models/domain_alias.py:44
+#: models/alias.py:38 models/domain.py:47 models/domain_alias.py:44
 msgid "enabled"
 msgstr "activado"
 
-#: admin/models/alias.py:39 admin/models/domain_alias.py:45
+#: models/alias.py:39 models/domain_alias.py:45
 msgid "Check to activate this alias"
 msgstr "Marcar para activar este alias"
 
-#: admin/models/alias.py:44 admin/templates/admin/alias_detail.html.py:32
+#: models/alias.py:44 templates/admin/alias_detail.html:32
 msgid "Description"
 msgstr ""
 
-#: admin/models/alias.py:46 admin/templates/admin/alias_detail.html.py:29
+#: models/alias.py:46 templates/admin/alias_detail.html:29
 msgid "Expire at"
 msgstr ""
 
-#: admin/models/alias.py:89
+#: models/alias.py:89
 msgid "alias"
 msgstr "alias"
 
-#: admin/models/alias.py:121
+#: models/alias.py:121
 #, fuzzy
 #| msgid "Invalid request"
 msgid "Invalid address"
 msgstr "Petición inválida"
 
-#: admin/models/alias.py:142
+#: models/alias.py:142
 #, fuzzy
 #| msgid "Local recipient %s not found"
 msgid "Local recipient {}@{} not found"
 msgstr "Destinatario local %s no encontrado"
 
-#: admin/models/alias.py:172
+#: models/alias.py:172
 #, python-format
 msgid "Invalid line: %s"
 msgstr "Línea inválida: %s"
 
-#: admin/models/alias.py:178
+#: models/alias.py:178
 #, python-format
 msgid "Domain '%s' does not exist"
 msgstr "El dominio '%s' no existe"
 
-#: admin/models/domain.py:42 admin/models/domain_alias.py:37
+#: models/domain.py:43 models/domain_alias.py:37
 msgid "name"
 msgstr "nombre"
 
-#: admin/models/domain.py:43
+#: models/domain.py:44
 msgid "The domain name"
 msgstr "Nombre del dominio"
 
-#: admin/models/domain.py:47
+#: models/domain.py:48
 msgid "Check to activate this domain"
 msgstr "Marcar para activar este dominio"
 
-#: admin/models/domain.py:208 admin/models/domain_alias.py:71
+#: models/domain.py:215 models/domain_alias.py:71
 msgid "Invalid line"
 msgstr "Línea inválida"
 
-#: admin/models/domain.py:216
+#: models/domain.py:223
 #, python-format
 msgid "Invalid quota value for domain '%s'"
 msgstr ""
 
-#: admin/models/domain_alias.py:38
+#: models/domain_alias.py:38
 msgid "The alias name"
 msgstr "Nombre del alias"
 
-#: admin/models/domain_alias.py:40
+#: models/domain_alias.py:40
 msgid "target"
 msgstr "objetivo"
 
-#: admin/models/domain_alias.py:41
+#: models/domain_alias.py:41
 msgid "The domain this alias points to"
 msgstr "El dominio al que este alias apunta"
 
-#: admin/models/domain_alias.py:80
+#: models/domain_alias.py:80
 #, python-format
 msgid "Unknown domain %s"
 msgstr "Dominio desconocido %s"
 
-#: admin/models/mailbox.py:82
+#: models/mailbox.py:82
 msgid "Mailbox address (without the @domain.tld part)"
 msgstr "Dirección del mailbox (sin la parte @dominio.tld)"
 
-#: admin/models/mailbox.py:148
+#: models/mailbox.py:148
 #, python-format
 msgid "Failed to retrieve mailbox location (%s)"
 msgstr "Fallo al recuperar la localización del mailbox (%s)"
 
-#: admin/models/mailbox.py:238
+#: models/mailbox.py:238
 #, python-format
 msgid "Quota is greater than the allowed domain's limit (%dM)"
 msgstr "La cuota es mayor que el límite permitido para el dominio (%dM)"
 
-#: admin/models/mailbox.py:244
+#: models/mailbox.py:244
 msgid "A quota is required"
 msgstr "Una cuota es obligatoria"
 
-#: admin/serializers.py:45 admin/serializers.py:228 admin/serializers.py:317
+#: serializers.py:45 serializers.py:228 serializers.py:317
 #, fuzzy
 #| msgid "Permissions"
 msgid "Permission denied."
 msgstr "Permisos"
 
-#: admin/serializers.py:83
+#: serializers.py:83
 msgid ""
 "List of administered domains (resellers and domain administrators only)."
 msgstr ""
 
-#: admin/serializers.py:193
+#: serializers.py:193
 msgid "Not allowed for this role."
 msgstr ""
 
-#: admin/serializers.py:203
+#: serializers.py:203
 msgid "Must be equal to mailbox full_address"
 msgstr ""
 
-#: admin/serializers.py:215
+#: serializers.py:215
 #, fuzzy
 #| msgid "Domain does not exist"
 msgid "Local domain {} does not exist"
 msgstr "El dominio no existe"
 
-#: admin/serializers.py:315
+#: serializers.py:315
 #, fuzzy
 #| msgid "Domain modified"
 msgid "Domain not found."
 msgstr "Dominio modificado"
 
-#: admin/templates/admin/account_detail.html:16
-#: admin/templates/admin/alias_detail.html:16
-#: admin/templates/admin/domain_detail.html:15
-#: admin/templates/admin/identities_table.html:7
+#: templates/admin/account_detail.html:16 templates/admin/alias_detail.html:16
+#: templates/admin/domain_detail.html:15
+#: templates/admin/identities_table.html:7
 #, fuzzy
 msgid "(disabled)"
 msgstr "activado"
 
-#: admin/templates/admin/account_detail.html:22
-#: admin/templates/admin/alias_detail.html:22
-#: admin/templates/admin/domain_detail.html:21
+#: templates/admin/account_detail.html:22 templates/admin/alias_detail.html:22
+#: templates/admin/domain_detail.html:21
 msgid "Summary"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:26
+#: templates/admin/account_detail.html:26
 #, fuzzy
 #| msgid "File name"
 msgid "Full name"
 msgstr "Nombre del fichero"
 
-#: admin/templates/admin/account_detail.html:32
-#: admin/templates/admin/alias_detail.html:26
+#: templates/admin/account_detail.html:32 templates/admin/alias_detail.html:26
 #, fuzzy
 #| msgid "Create"
 msgid "Created"
 msgstr "Crear"
 
-#: admin/templates/admin/account_detail.html:35
+#: templates/admin/account_detail.html:35
 msgid "Last login"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:38
+#: templates/admin/account_detail.html:38
 msgid "Secondary email"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:38
-#: admin/templates/admin/account_detail.html:41
+#: templates/admin/account_detail.html:38
+#: templates/admin/account_detail.html:41
 #, fuzzy
 #| msgid "No recipient defined"
 msgid "Not defined"
 msgstr "No ha puesto destinatario"
 
-#: admin/templates/admin/account_detail.html:41
+#: templates/admin/account_detail.html:41
 msgid "Phone number"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:55
+#: templates/admin/account_detail.html:55
 #, fuzzy
 msgid "Administered domains"
 msgstr "Administradores"
 
-#: admin/templates/admin/account_detail.html:61
+#: templates/admin/account_detail.html:61
 #, fuzzy
 #| msgid "No recipient defined"
 msgid "No domain defined."
 msgstr "No ha puesto destinatario"
 
-#: admin/templates/admin/account_detail.html:75
+#: templates/admin/account_detail.html:75
 #, fuzzy
 #| msgid "Alias(es)"
 msgid "Aliases"
 msgstr "Alias"
 
-#: admin/templates/admin/account_detail.html:81
+#: templates/admin/account_detail.html:81
 #, fuzzy
 #| msgid "No recipient defined"
 msgid "No alias defined"
 msgstr "No ha puesto destinatario"
 
-#: admin/templates/admin/account_detail.html:87
+#: templates/admin/account_detail.html:87
 msgid "Additional sender addresses"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:93
+#: templates/admin/account_detail.html:93
 msgid "No sender address defined"
 msgstr ""
 
-#: admin/templates/admin/account_general_form.html:11
-#: admin/templates/admin/aliasform.html:13
+#: templates/admin/account_general_form.html:11
+#: templates/admin/aliasform.html:13
 #, fuzzy
 msgid "Domain is disabled"
 msgstr "Dominio eliminado"
 
-#: admin/templates/admin/alias_detail.html:16
-#: admin/templates/admin/identities.html:33
+#: templates/admin/alias_detail.html:16 templates/admin/identities.html:33
 #, fuzzy
 #| msgid "alias"
 msgid "Alias"
 msgstr "alias"
 
-#: admin/templates/admin/alias_detail.html:27
+#: templates/admin/alias_detail.html:27
 #, fuzzy
 #| msgid "Alias modified"
 msgid "Modified"
 msgstr "Alias modificado"
 
-#: admin/templates/admin/dnsbl_domain_detail.html:10
+#: templates/admin/dnsbl_domain_detail.html:10
 msgid "Provider"
 msgstr ""
 
-#: admin/templates/admin/dnsbl_domain_detail.html:11
-#: admin/templates/admin/mx_domain_detail.html:10
-#: admin/templates/admin/quota_headers.html:2
+#: templates/admin/dnsbl_domain_detail.html:11
+#: templates/admin/mx_domain_detail.html:10
+#: templates/admin/quota_headers.html:2
 msgid "Address"
 msgstr "Dirección"
 
-#: admin/templates/admin/dnsbl_domain_detail.html:12
+#: templates/admin/dnsbl_domain_detail.html:12
 #, fuzzy
 #| msgid "Statistics"
 msgid "Status"
 msgstr "Estadísticas"
 
-#: admin/templates/admin/dnsbl_domain_detail.html:21
+#: templates/admin/dnsbl_domain_detail.html:21
 msgid "listed"
 msgstr ""
 
-#: admin/templates/admin/dnsbl_domain_detail.html:29
+#: templates/admin/dnsbl_domain_detail.html:29
 msgid "Everything is fine, this domain is not listed."
 msgstr ""
 
-#: admin/templates/admin/dnsbl_domain_detail.html:32
+#: templates/admin/dnsbl_domain_detail.html:32
 msgid "No information available for this domain."
 msgstr ""
 
-#: admin/templates/admin/domain_detail.html:26
-#: admin/templates/admin/domains.html:38
+#: templates/admin/domain_detail.html:26 templates/admin/domains.html:38
 #, fuzzy
 #| msgid "Statistics"
 msgid "DNS status"
 msgstr "Estadísticas"
 
-#: admin/templates/admin/domain_detail.html:28
-#: admin/templates/admin/domains_table.html:12
+#: templates/admin/domain_detail.html:28 templates/admin/domains_table.html:14
 msgid "Awaiting checks"
 msgstr ""
 
-#: admin/templates/admin/domain_detail.html:40
+#: templates/admin/domain_detail.html:40
 msgid "Creation date"
 msgstr "Fecha de creación"
 
-#: admin/templates/admin/domain_detail.html:42
+#: templates/admin/domain_detail.html:42
 msgid "Last modification date"
 msgstr "Última fecha de modificación"
 
-#: admin/templates/admin/domain_detail.html:43
-#: admin/templates/admin/domain_detail.html:52
-#: admin/templates/admin/domain_statistics.html:33
+#: templates/admin/domain_detail.html:43 templates/admin/domain_detail.html:52
+#: templates/admin/domain_statistics.html:33
 msgid "Domain aliases"
 msgstr "Alias del dominio"
 
-#: admin/templates/admin/domain_detail.html:45
+#: templates/admin/domain_detail.html:45
 msgid "Mailbox aliases"
 msgstr "Alias del mailbox"
 
-#: admin/templates/admin/domain_detail.html:69
+#: templates/admin/domain_detail.html:69
 msgid "Administrators"
 msgstr "Administradores"
 
-#: admin/templates/admin/domain_detail.html:79
-#: admin/templatetags/admin_tags.py:259
+#: templates/admin/domain_detail.html:79 templatetags/admin_tags.py:259
 msgid "Remove this permission"
 msgstr "Eliminar este permiso"
 
-#: admin/templates/admin/domain_detail.html:84
+#: templates/admin/domain_detail.html:84
 #, fuzzy
 #| msgid "No domain administrator defined"
 msgid "No domain administrator defined yet."
 msgstr "No hay un dominio de administrador definido "
 
-#: admin/templates/admin/domain_general_form.html:4
-#: admin/templates/admin/mailform.html:4
-#: admin/templates/admin/newdomainform.html:3
+#: templates/admin/domain_general_form.html:4 templates/admin/mailform.html:4
+#: templates/admin/newdomainform.html:3
 msgid "MB"
 msgstr "MB"
 
-#: admin/templates/admin/domain_options_form.html:7
+#: templates/admin/domain_options_form.html:7
 #, fuzzy
 msgid "You can't create a new domain administrator"
 msgstr "Crear un administrador del dominio"
 
-#: admin/templates/admin/domain_statistics.html:15
-#: admin/templatetags/admin_tags.py:44
+#: templates/admin/domain_statistics.html:15 templatetags/admin_tags.py:44
 msgid "Statistics"
 msgstr "Estadísticas"
 
-#: admin/templates/admin/domain_statistics.html:15
+#: templates/admin/domain_statistics.html:15
 #, fuzzy
 msgid "Domains and identities"
 msgstr "Listar identidades"
 
-#: admin/templates/admin/domain_statistics.html:22
+#: templates/admin/domain_statistics.html:22
 msgid "Global counters"
 msgstr ""
 
-#: admin/templates/admin/domain_statistics.html:27
+#: templates/admin/domain_statistics.html:27
 #, fuzzy
 msgid "Quantity"
 msgstr "Cuarentena"
 
-#: admin/templates/admin/domain_statistics.html:45
+#: templates/admin/domain_statistics.html:45
 msgid "Per-domain counters"
 msgstr ""
 
-#: admin/templates/admin/domains.html:26
-#: admin/templates/admin/identities.html:29
+#: templates/admin/domains.html:26 templates/admin/identities.html:29
 #, fuzzy
 #| msgid "Address"
 msgid "Add"
 msgstr "Dirección"
 
-#: admin/templates/admin/domains.html:36
-#: admin/templates/admin/identity_headers.html:4
+#: templates/admin/domains.html:36 templates/admin/identity_headers.html:4
 msgid "Tags"
 msgstr "Tags"
 
-#: admin/templates/admin/domains.html:40
-#: admin/templates/admin/identity_headers.html:5
+#: templates/admin/domains.html:40 templates/admin/identity_headers.html:5
 msgid "Actions"
 msgstr "Acciones"
 
-#: admin/templates/admin/domains_table.html:5
+#: templates/admin/domains_table.html:5
 #, fuzzy
 msgid "disabled"
 msgstr "activado"
 
-#: admin/templates/admin/forward.html:2
+#: templates/admin/domains_table.html:12
+#, fuzzy
+msgctxt "checks"
+msgid "Disabled"
+msgstr "activado"
+
+#: templates/admin/forward.html:2
 msgid "Automatically forward emails to another address"
 msgstr "Reenvía automáticamente los correos a otra dirección"
 
-#: admin/templates/admin/forward.html:9 admin/views/alias.py:91
+#: templates/admin/forward.html:9 views/alias.py:91
 msgid "Update"
 msgstr "Actualizar"
 
-#: admin/templates/admin/identities.html:32
+#: templates/admin/identities.html:32
 #, fuzzy
 #| msgid "Add account"
 msgid "Account"
 msgstr "Añadir cuenta"
 
-#: admin/templates/admin/identity_headers.html:3
+#: templates/admin/identity_headers.html:3
 msgid "Fullname/Recipient"
 msgstr "Nombre completo/Destinatario"
 
-#: admin/templates/admin/import_domains_form.html:6
+#: templates/admin/import_domains_form.html:6
 #, fuzzy
 msgid ""
 "Provide a CSV file where lines respect one of the following formats: <ul> "
@@ -933,7 +918,7 @@ msgstr ""
 "uno de los valores anteriores.</p>⏎ <p>Puede usar un carácter diferente como "
 "separador.</p>⏎\n"
 
-#: admin/templates/admin/import_identities_form.html:6
+#: templates/admin/import_identities_form.html:6
 #, fuzzy
 msgid ""
 "Provide a CSV file where lines respect one of the following formats: <ul> "
@@ -957,139 +942,139 @@ msgstr ""
 "\n"
 "<p>Puede usar un carácter diferente como separador.</p>\n"
 
-#: admin/templates/admin/importform.html:6
+#: templates/admin/importform.html:6
 msgid "Help"
 msgstr "Ayuda"
 
-#: admin/templates/admin/importform.html:13
+#: templates/admin/importform.html:13
 msgid "Importing..."
 msgstr "Importando..."
 
-#: admin/templates/admin/mailboxes_raw.html:3
+#: templates/admin/mailboxes_raw.html:3
 msgid "Choose a value"
 msgstr "Elija un valor"
 
-#: admin/templates/admin/mailform.html:4
+#: templates/admin/mailform.html:4
 msgid "Use domain default value"
 msgstr "Usar el valor por defecto del dominio"
 
-#: admin/templates/admin/mx_domain_detail.html:11
+#: templates/admin/mx_domain_detail.html:11
 #, fuzzy
 #| msgid "Update"
 msgid "Updated"
 msgstr "Actualizar"
 
-#: admin/templates/admin/mx_domain_detail.html:23
+#: templates/admin/mx_domain_detail.html:23
 msgid "This IP does not match any of the valid MXs defined in parameters"
 msgstr ""
 
-#: admin/templates/admin/mx_domain_detail.html:36
+#: templates/admin/mx_domain_detail.html:36
 msgid "No MX record found for this domain."
 msgstr ""
 
-#: admin/templates/admin/notifications/domain_in_dnsbl.html:3
+#: templates/admin/notifications/domain_in_dnsbl.html:3
 #, python-format
 msgid ""
 "Modoboa detected that domain %(domain)s is listed by the following DNSBL "
 "providers:"
 msgstr ""
 
-#: admin/templates/admin/notifications/domain_in_dnsbl.html:11
+#: templates/admin/notifications/domain_in_dnsbl.html:11
 msgid ""
 "The domain's reputation will be affected and there is a chance that emails "
 "coming from it are considered as spam. You should contact those providers "
 "and ask them to unlist detected IP address(es)."
 msgstr ""
 
-#: admin/templates/admin/notifications/domain_invalid_mx.html:3
+#: templates/admin/notifications/domain_invalid_mx.html:3
 #, python-format
 msgid "Modoboa detected that domain %(domain)s has no valid MX record:"
 msgstr ""
 
-#: admin/templates/admin/quota_headers.html:3
+#: templates/admin/quota_headers.html:3
 msgid "Value"
 msgstr "Valor"
 
-#: admin/templates/admin/quota_headers.html:4
+#: templates/admin/quota_headers.html:4
 msgid "Limit"
 msgstr "Límite"
 
-#: admin/templates/admin/quota_headers.html:5
+#: templates/admin/quota_headers.html:5
 #, python-format
 msgid "Usage (%%)"
 msgstr "Uso (%%)"
 
-#: admin/templates/admin/searchform.html:6
+#: templates/admin/searchform.html:6
 msgid "Search"
 msgstr "Buscar"
 
-#: admin/templatetags/admin_tags.py:18
+#: templatetags/admin_tags.py:18
 msgid "enabled_m"
 msgstr "Activado"
 
-#: admin/templatetags/admin_tags.py:18
+#: templatetags/admin_tags.py:18
 msgid "enabled_f"
 msgstr "Activado"
 
-#: admin/templatetags/admin_tags.py:39
+#: templatetags/admin_tags.py:39
 #, fuzzy
 msgid "List domains"
 msgstr "Editar el dominio"
 
-#: admin/templatetags/admin_tags.py:56 admin/templatetags/admin_tags.py:104
-#: admin/views/import_.py:87 admin/views/import_.py:109
+#: templatetags/admin_tags.py:56 templatetags/admin_tags.py:104
+#: views/import_.py:87 views/import_.py:109
 msgid "Import"
 msgstr "Importar"
 
-#: admin/templatetags/admin_tags.py:62 admin/templatetags/admin_tags.py:110
-#: admin/views/export.py:41 admin/views/export.py:69
+#: templatetags/admin_tags.py:62 templatetags/admin_tags.py:110
+#: views/export.py:41 views/export.py:69
 msgid "Export"
 msgstr "Exportar"
 
-#: admin/templatetags/admin_tags.py:94
+#: templatetags/admin_tags.py:94
 msgid "List identities"
 msgstr "Listar identidades"
 
-#: admin/templatetags/admin_tags.py:99
+#: templatetags/admin_tags.py:99
 msgid "List quotas"
 msgstr "Listar cuotas"
 
-#: admin/templatetags/admin_tags.py:129
+#: templatetags/admin_tags.py:129
 msgid "View the domain's identities"
 msgstr "Ver las identidades del dominio"
 
-#: admin/templatetags/admin_tags.py:135 admin/templatetags/admin_tags.py:178
-#: admin/templatetags/admin_tags.py:191
+#: templatetags/admin_tags.py:135 templatetags/admin_tags.py:178
+#: templatetags/admin_tags.py:191
 msgid "Edit {}"
 msgstr ""
 
-#: admin/templatetags/admin_tags.py:145 admin/templatetags/admin_tags.py:182
-#: admin/templatetags/admin_tags.py:196
+#: templatetags/admin_tags.py:145 templatetags/admin_tags.py:182
+#: templatetags/admin_tags.py:196
 #, python-format
 msgid "Delete %s?"
 msgstr "¿Eliminar %s?"
 
-#: admin/views/alias.py:33
+#: views/alias.py:33
 msgid "Alias with this name already exists"
 msgstr "Ya existe un alias con este nombre"
 
-#: admin/views/alias.py:58
+#: views/alias.py:58
 msgid "Create"
 msgstr "Crear"
 
-#: admin/views/alias.py:70
+#: views/alias.py:70
 msgid "New alias"
 msgstr "Nuevo alias"
 
-#: admin/views/alias.py:71
+#: views/alias.py:71
 msgid "Alias created"
 msgstr "Alias creado"
 
-#: admin/views/alias.py:83
+#: views/alias.py:83
 msgid "Alias modified"
 msgstr "Alias modificado"
 
-#: admin/views/alias.py:107
+#: views/alias.py:107
 #, fuzzy
 #| msgid "Alias created"
 msgid "Alias deleted"
@@ -1097,62 +1082,61 @@ msgid_plural "Aliases deleted"
 msgstr[0] "Alias creado"
 msgstr[1] "Alias creado"
 
-#: admin/views/dns.py:30
+#: views/dns.py:30
 msgid "MX records of {}"
 msgstr ""
 
-#: admin/views/dns.py:53
+#: views/dns.py:53
 msgid "DNSBL summary for {}"
 msgstr ""
 
-#: admin/views/domain.py:152
+#: views/domain.py:152
 msgid "You can't delete your own domain"
 msgstr "No puedo eliminar su propio dominio"
 
-#: admin/views/domain.py:155
+#: views/domain.py:155
 msgid "Domain deleted"
 msgid_plural "Domains deleted"
 msgstr[0] "Dominio eliminado"
 msgstr[1] "Dominios eliminados"
 
-#: admin/views/export.py:40
+#: views/export.py:40
 msgid "Export identities"
 msgstr "Exportar identidades"
 
-#: admin/views/export.py:68
+#: views/export.py:68
 msgid "Export domains"
 msgstr "Exportar dominios"
 
-#: admin/views/identity.py:111 admin/views/identity.py:205
-#: admin/views/identity.py:210
+#: views/identity.py:111 views/identity.py:205 views/identity.py:210
 msgid "Invalid request"
 msgstr "Petición inválida"
 
-#: admin/views/identity.py:195
+#: views/identity.py:195
 msgid "Account deleted"
 msgid_plural "Accounts deleted"
 msgstr[0] "Cuenta eliminada"
 msgstr[1] "Cuentas eliminadas"
 
-#: admin/views/import_.py:63
+#: views/import_.py:63
 #, python-format
 msgid "Object already exists: %s"
 msgstr "El objeto ya existe: %s"
 
-#: admin/views/import_.py:67
+#: views/import_.py:67
 #, python-format
 msgid "%d objects imported successfully"
 msgstr "%d objetos importados con éxito"
 
-#: admin/views/import_.py:86
+#: views/import_.py:86
 msgid "Import domains"
 msgstr "Importar dominios"
 
-#: admin/views/import_.py:108
+#: views/import_.py:108
 msgid "Import identities"
 msgstr "Importar identidades"
 
-#: admin/views/user.py:35
+#: views/user.py:35
 msgid "Forward updated"
 msgstr "Reenvío actualizado"
 
diff --git a/modoboa/admin/locale/fr/LC_MESSAGES/django.po b/modoboa/admin/locale/fr/LC_MESSAGES/django.po
index 47215e5b7..eebd6dbb5 100644
--- a/modoboa/admin/locale/fr/LC_MESSAGES/django.po
+++ b/modoboa/admin/locale/fr/LC_MESSAGES/django.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Antoine Nguyen <tonio@ngyn.org>, 2015-2016
+# Antoine Nguyen <tonio@ngyn.org>, 2015-2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Modoboa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-14 14:13+0100\n"
-"PO-Revision-Date: 2016-12-14 13:19+0000\n"
+"POT-Creation-Date: 2017-01-16 13:02+0100\n"
+"PO-Revision-Date: 2017-01-16 12:05+0000\n"
 "Last-Translator: Antoine Nguyen <tonio@ngyn.org>\n"
 "Language-Team: French (http://www.transifex.com/tonio/modoboa/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -18,798 +18,782 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: admin/app_settings.py:17 admin/handlers.py:245
-#: admin/templates/admin/domain_statistics.html:30
-#: admin/templates/admin/domains.html:4
+#: app_settings.py:17 handlers.py:252
+#: templates/admin/domain_statistics.html:30 templates/admin/domains.html:4
 msgid "Domains"
 msgstr "Domaines"
 
-#: admin/app_settings.py:20
+#: app_settings.py:20
 msgid "Enable MX checks"
 msgstr "Activer la vérification des MX"
 
-#: admin/app_settings.py:23
+#: app_settings.py:23
 msgid "Check that every domain has a valid MX record"
 msgstr "Vérifie que chaque domaine a un enregistrement MX valide"
 
-#: admin/app_settings.py:28
+#: app_settings.py:28
 msgid "Valid MXs"
 msgstr "MX(s) valide(s)"
 
-#: admin/app_settings.py:31
+#: app_settings.py:31
 msgid ""
-"IP(s) or network(s) of the MX that should match with domains' MX records. On"
-" per line."
-msgstr "IP(s) ou réseau(x) avec lesquels les enregistrements MX des domaines doivent correspondre. Un par ligne."
+"A list of IP or network address every MX record should match. A warning will"
+" be sent if a record does not respect it."
+msgstr "Une liste d'adresses IP ou réseau que chaque enregistrement MX doit respecter. Un avertissement sera envoyé dès qu'un enregistrement ne la respecte pas."
 
-#: admin/app_settings.py:40
+#: app_settings.py:39
 msgid "Enable DNSBL checks"
 msgstr "Activer les vérifications DNSBL"
 
-#: admin/app_settings.py:43
+#: app_settings.py:42
 msgid "Check every domain against major DNSBL providers"
 msgstr "Vérifie chaque domaine auprès des fournisseurs de DNSBL"
 
-#: admin/app_settings.py:47 admin/templates/admin/domain_detail.html.py:44
+#: app_settings.py:46 templates/admin/domain_detail.html:44
 msgid "Mailboxes"
 msgstr "Boites"
 
-#: admin/app_settings.py:50
+#: app_settings.py:49
 msgid "Handle mailboxes on filesystem"
 msgstr "Gérer les boites sur le système de fichiers"
 
-#: admin/app_settings.py:53
+#: app_settings.py:52
 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"
 
-#: admin/app_settings.py:59
+#: app_settings.py:58
 msgid "Mailboxes owner"
 msgstr "Propriétaire des boites"
 
-#: admin/app_settings.py:62
+#: app_settings.py:61
 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"
 
-#: admin/app_settings.py:67
+#: app_settings.py:66
 msgid "Default domain quota"
 msgstr "Quota de domaine par défaut"
 
-#: admin/app_settings.py:70
+#: app_settings.py:69
 msgid ""
 "Default quota (in MB) applied to freshly created domains with no value "
 "specified. A value of 0 means no quota."
 msgstr "Quota par défaut (en Mo) appliqué aux domaines fraichement créés et ne spécifiant pas de valeur. 0 signifie qu'aucun quota ne sera appliqué."
 
-#: admin/app_settings.py:76
+#: app_settings.py:75
 msgid "Automatic account removal"
 msgstr "Suppression automatique de compte"
 
-#: admin/app_settings.py:79
+#: app_settings.py:78
 msgid "When a mailbox is removed, also remove the associated account"
 msgstr "Lorsqu'une boite aux lettres est supprimée, supprimer le compte associé en même temps"
 
-#: admin/app_settings.py:83
+#: app_settings.py:82
 msgid "Automatic domain/mailbox creation"
 msgstr "Création automatique de domaine/boite aux lettres"
 
-#: admin/app_settings.py:86
+#: app_settings.py:85
 msgid ""
 "Create a domain and a mailbox when an account is automatically created."
 msgstr "Créer un domaine et une boite aux lettres quand un compte est créé automatiquement."
 
-#: admin/app_settings.py:133 admin/forms/account.py:288
-#: admin/forms/domain.py:87
+#: app_settings.py:132 forms/account.py:288 forms/domain.py:87
 msgid "Must be a positive integer"
 msgstr "Doit être un entier positif"
 
-#: admin/app_settings.py:143
+#: app_settings.py:142
 msgid "Administration"
 msgstr "Administration"
 
-#: admin/forms/account.py:34 admin/templates/admin/domain_detail.html.py:72
+#: forms/account.py:34 templates/admin/domain_detail.html:72
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
-#: admin/forms/account.py:36
+#: forms/account.py:36
 msgid ""
 "The user's name. Must be a valid e-mail address for simple users or "
 "administrators with a mailbox."
 msgstr "Le nom de l'utilisateur. Doit être une adresse e-mail valide pour les utilisateurs simples ou les administrateurs avec une boite aux lettres."
 
-#: admin/forms/account.py:41 admin/templates/admin/account_detail.html.py:29
+#: forms/account.py:41 templates/admin/account_detail.html:29
 msgid "Role"
 msgstr "Rôle"
 
-#: admin/forms/account.py:42
+#: forms/account.py:42
 msgid "Choose"
 msgstr "Choisir"
 
-#: admin/forms/account.py:43
+#: forms/account.py:43
 msgid "What level of permission this user will have"
 msgstr "Quel niveau de permission cet utilisateur aura"
 
-#: admin/forms/account.py:46
+#: forms/account.py:46
 msgid "Password"
 msgstr "Mot de passe"
 
-#: admin/forms/account.py:50
+#: forms/account.py:50
 msgid "Confirmation"
 msgstr "Confirmation"
 
-#: admin/forms/account.py:53
+#: forms/account.py:53
 msgid "Enter the same password as above, for verification."
 msgstr "Entrer le même mot de passe, pour vérification."
 
-#: admin/forms/account.py:64
+#: forms/account.py:64
 msgid "Enabled"
 msgstr "Activé"
 
-#: admin/forms/account.py:156
+#: forms/account.py:156
 msgid "The two password fields didn't match."
 msgstr "Les deux mots de passe ne correspondent pas."
 
-#: admin/forms/account.py:171
+#: forms/account.py:171
 msgid "Only super administrators are allowed for this mode"
 msgstr "Seuls les super administrateurs sont autorisés pour ce mode"
 
-#: admin/forms/account.py:179
+#: forms/account.py:179
 msgid "You can't disable your own account"
 msgstr "Vous ne pouvez pas désactiver votre propre compte"
 
-#: admin/forms/account.py:194
+#: forms/account.py:194
 msgid "E-mail"
 msgstr "E-mail"
 
-#: admin/forms/account.py:196 admin/forms/domain.py:38
-#: admin/templates/admin/account_detail.html:45
+#: forms/account.py:196 forms/domain.py:38
+#: templates/admin/account_detail.html:45
 msgid "Quota"
 msgstr "Quota"
 
-#: admin/forms/account.py:198
+#: forms/account.py:198
 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 (interdit pour les admins. de domaine)."
 
-#: admin/forms/account.py:206 admin/forms/domain.py:46
-#: admin/templates/admin/domains.html:35
+#: forms/account.py:206 forms/domain.py:46 templates/admin/domains.html:35
 msgid "Alias(es)"
 msgstr "Alias"
 
-#: admin/forms/account.py:209
+#: forms/account.py:209
 msgid ""
 "Alias(es) of this mailbox. Indicate only one address per input, press ENTER "
 "to add a new input. To create a catchall alias, just enter the domain name "
 "(@domain.tld)."
 msgstr "Alias de cette boîte aux lettres. Indiquer une adresse par champ, appuyer sur ENTREE pour ajouter un nouveau champ. Pour créer un alias 'fourre-tout', entrer seulement le nom du domaine (@domain.tld)."
 
-#: admin/forms/account.py:215
+#: forms/account.py:215
 msgid "Sender addresses"
 msgstr "Adresses d'envoi"
 
-#: admin/forms/account.py:218
+#: forms/account.py:218
 msgid ""
 "Additional sender address(es) for this account. The user will be allowed to "
 "send emails using this address, even if it does not exist locally. Indicate "
 "one address per input. Press ENTER to add a new input."
 msgstr "Adresse(s) d'envoi supplémentaire(s) pour ce compte. L'utilisateur sera autorisé à envoyer des e-mails en utilisant la/les adresse(s) déclarée(s), même si elle(s) n'existe(nt) pas localement. Indiquer une adresse par champ. Appuyer sur ENTREE pour ajouter un nouveau champ."
 
-#: admin/forms/account.py:267 admin/forms/alias.py:92
-#: admin/models/mailbox.py:295
+#: forms/account.py:267 forms/alias.py:92 models/mailbox.py:295
 msgid "Domain does not exist"
 msgstr "Domaine inexistant"
 
-#: admin/forms/account.py:297
+#: forms/account.py:297
 msgid "Local domain does not exist"
 msgstr "Le domaine local n'existe pas"
 
-#: admin/forms/account.py:392
+#: forms/account.py:392
 msgid "Domain(s)"
 msgstr "Domaine(s)"
 
-#: admin/forms/account.py:394
+#: forms/account.py:394
 msgid "Domain(s) that user administrates"
 msgstr "Domaine(s) que cet utilisateur administre"
 
-#: admin/forms/account.py:440 admin/forms/account.py:525
-#: admin/forms/domain.py:283 admin/forms/domain.py:350
+#: forms/account.py:440 forms/account.py:525 forms/domain.py:283
+#: forms/domain.py:350
 msgid "General"
 msgstr "Général"
 
-#: admin/forms/account.py:445 admin/forms/account.py:531
+#: forms/account.py:445 forms/account.py:531
 msgid "Mail"
 msgstr "Courrier"
 
-#: admin/forms/account.py:447
+#: forms/account.py:447
 msgid "Permissions"
 msgstr "Permissions"
 
-#: admin/forms/account.py:514
+#: forms/account.py:514
 msgid "Account updated"
 msgstr "Compte mis à jour"
 
-#: admin/forms/account.py:538
+#: forms/account.py:538
 msgid "New account"
 msgstr "Nouveau compte"
 
-#: admin/forms/account.py:550
+#: forms/account.py:550
 msgid "Account created"
 msgstr "Compte créé"
 
-#: admin/forms/alias.py:24
+#: forms/alias.py:24
 msgid "Random address"
 msgstr "Adresse aléatoire"
 
-#: admin/forms/alias.py:27
+#: forms/alias.py:27
 msgid "Email address"
 msgstr "Adresse email"
 
-#: admin/forms/alias.py:29
+#: forms/alias.py:29
 msgid ""
 "The alias address. To create a catchall alias, just enter the domain name "
 "(@domain.tld)."
 msgstr "L'adresse de l'alias. Pour créer un alias \"fourre-tout\", saisissez uniquement le nom du domaine (@domain.tld)."
 
-#: admin/forms/alias.py:35 admin/templates/admin/alias_detail.html.py:37
+#: forms/alias.py:35 templates/admin/alias_detail.html:37
 msgid "Recipients"
 msgstr "Destinataires"
 
-#: admin/forms/alias.py:37
+#: forms/alias.py:37
 msgid ""
 "Addresses this alias will point to. Indicate only one address per input, "
 "press ENTER to add a new input."
 msgstr "Les adresses vers lesquelles cet alias pointera. Indiquer une adresse par champ, appuyer sur ENTREE pour ajouter un nouveau champ."
 
-#: admin/forms/alias.py:47 admin/forms/domain.py:26 admin/models/domain.py:91
-#: admin/templates/admin/domain_statistics.html:49
+#: forms/alias.py:47 forms/domain.py:26 models/domain.py:92
+#: templates/admin/domain_statistics.html:49
 msgid "Domain"
 msgstr "Domaine"
 
-#: admin/forms/alias.py:95
+#: forms/alias.py:95
 msgid "You don't have access to this domain"
 msgstr "Vous n'avez pas accès à ce domaine"
 
-#: admin/forms/alias.py:112 admin/forms/alias.py:114
+#: forms/alias.py:112 forms/alias.py:114
 msgid "This field is required"
 msgstr "Ce champ est requis."
 
-#: admin/forms/alias.py:118
+#: forms/alias.py:118
 msgid "No recipient defined"
 msgstr "Aucune destinataire défini"
 
-#: admin/forms/domain.py:35 admin/templates/admin/domain_statistics.html.py:26
+#: forms/domain.py:35 templates/admin/domain_statistics.html:26
 msgid "Type"
 msgstr "Type"
 
-#: admin/forms/domain.py:41
+#: forms/domain.py:41
 msgid ""
 "Default quota in MB applied to mailboxes. Leave empty to use the default "
 "value."
 msgstr "Quota par défaut en Mo appliqué aux boites aux lettres. Laisser vide pour utiliser la valeur par défaut."
 
-#: admin/forms/domain.py:49
+#: forms/domain.py:49
 msgid ""
 "Alias(es) of this domain. Indicate only one name per input, press ENTER to "
 "add a new input."
 msgstr "Alias de ce domaine. Indiquer seulement un nom par champ, appuyer sur ENTREE pour ajouter un nouveau champ."
 
-#: admin/forms/domain.py:103 admin/handlers.py:148
+#: forms/domain.py:103 handlers.py:155
 msgid "domain alias"
 msgstr "alias de domaine"
 
-#: admin/forms/domain.py:106 admin/forms/domain.py:118
-#: admin/forms/domain.py:126
+#: forms/domain.py:106 forms/domain.py:118 forms/domain.py:126
 #, python-format
 msgid "A %s with this name already exists"
 msgstr "Un %s de ce nom existe déjà"
 
-#: admin/forms/domain.py:118 admin/forms/domain.py:123
+#: forms/domain.py:118 forms/domain.py:123
 msgid "domain"
 msgstr "domaine"
 
-#: admin/forms/domain.py:171
+#: forms/domain.py:171
 msgid "Create a domain administrator"
 msgstr "Créer un administrateur de domaine"
 
-#: admin/forms/domain.py:174
+#: forms/domain.py:174
 msgid "Automatically create an administrator for this domain"
 msgstr "Créer automatiquement un administrateur pour ce domaine"
 
-#: admin/forms/domain.py:179 admin/templates/admin/domain_detail.html.py:72
-#: admin/templates/admin/domains.html:34
-#: admin/templates/admin/identity_headers.html:2
-#: admin/templates/admin/mx_domain_detail.html:9
+#: forms/domain.py:179 templates/admin/domain_detail.html:72
+#: templates/admin/domains.html:34 templates/admin/identity_headers.html:2
+#: templates/admin/mx_domain_detail.html:9
 msgid "Name"
 msgstr "Nom"
 
-#: admin/forms/domain.py:182
+#: forms/domain.py:182
 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."
 
-#: admin/forms/domain.py:189
+#: forms/domain.py:189
 msgid "Create aliases"
 msgstr "Créer des alias"
 
-#: admin/forms/domain.py:192
+#: forms/domain.py:192
 msgid "Automatically create standard aliases for this domain"
 msgstr "Créer automatiquement des alias standard pour ce domaine"
 
-#: admin/forms/domain.py:208
+#: forms/domain.py:208
 msgid "Invalid format"
 msgstr "Format invalide"
 
-#: admin/forms/domain.py:217 admin/forms/domain.py:220
+#: forms/domain.py:217 forms/domain.py:220
 msgid "This field is required."
 msgstr "Ce champ est requis."
 
-#: admin/forms/domain.py:237
+#: forms/domain.py:237
 #, python-format
 msgid "User '%s' already exists"
 msgstr "L'utilisateur '%s' existe déjà"
 
-#: admin/forms/domain.py:339
+#: forms/domain.py:339
 msgid "Domain modified"
 msgstr "Domaine modifié"
 
-#: admin/forms/domain.py:360
+#: forms/domain.py:360
 msgid "Options"
 msgstr "Options"
 
-#: admin/forms/domain.py:368
+#: forms/domain.py:368
 msgid "New domain"
 msgstr "Nouveau domaine"
 
-#: admin/forms/domain.py:381
+#: forms/domain.py:381
 msgid "Domain created"
 msgstr "Domaine créé"
 
-#: admin/forms/export.py:7
+#: forms/export.py:7
 msgid "File name"
 msgstr "Nom du fichier"
 
-#: admin/forms/export.py:13 admin/forms/import_.py:13
+#: forms/export.py:13 forms/import_.py:13
 msgid "Separator"
 msgstr "Séparateur"
 
-#: admin/forms/forward.py:14
+#: forms/forward.py:14
 msgid "Recipient(s)"
 msgstr "Destinataire(s)"
 
-#: admin/forms/forward.py:18
+#: forms/forward.py:18
 msgid "Indicate one or more recipients separated by a ','"
 msgstr "Indiquer un ou plusieurs destinataires séparés par une ','"
 
-#: admin/forms/forward.py:21
+#: forms/forward.py:21
 msgid "Keep local copies"
 msgstr "Conserver des copies locales"
 
-#: admin/forms/forward.py:24
+#: forms/forward.py:24
 msgid "Forward messages and store copies into your local mailbox"
 msgstr "Transférer les messages et conserver une copie dans votre boite locale"
 
-#: admin/forms/forward.py:42
+#: forms/forward.py:42
 msgid ""
 "You can't define a forward to a local destination. Please ask your "
 "administrator to create an alias instead."
 msgstr "Vous ne pouvez pas définir un transfert vers une destination locale. Veuillez plutôt demander à votre administrateur de créer un alias"
 
-#: admin/forms/import_.py:11
+#: forms/import_.py:11
 msgid "Select a file"
 msgstr "Sélectionner un fichier"
 
-#: admin/forms/import_.py:19
+#: forms/import_.py:19
 msgid "Continue on error"
 msgstr "Continuer en cas d'erreur"
 
-#: admin/forms/import_.py:20
+#: forms/import_.py:20
 msgid "Don't treat duplicated objects as error"
 msgstr "Ne pas traiter les objets dupliqués comme des erreurs"
 
-#: admin/forms/import_.py:38
+#: forms/import_.py:38
 msgid "Crypt passwords"
 msgstr "Chiffrer les mots de passe"
 
-#: admin/forms/import_.py:40
+#: forms/import_.py:40
 msgid "Check this option if passwords contained in your file are not crypted"
 msgstr "Cocher cette option si les mots de passe contenus dans votre fichier ne sont pas chiffrés"
 
-#: admin/handlers.py:194
+#: handlers.py:201
 #, python-format
 msgid "Account import failed (%s): domain does not exist"
 msgstr "L'import du compte a échoué (%s): le domaine n'existe pas"
 
-#: admin/handlers.py:207 admin/models/mailbox.py:320
+#: handlers.py:214 models/mailbox.py:320
 msgid "Mailbox {} already exists"
 msgstr "La boite {} existe déjà"
 
-#: admin/handlers.py:215
+#: handlers.py:222
 #, python-format
 msgid "Account import failed (%s): wrong quota value"
 msgstr "L'import du compte a échoué (%s): mauvais quota"
 
-#: admin/handlers.py:255 admin/templates/admin/domain_statistics.html.py:36
-#: admin/templates/admin/domain_statistics.html:50
-#: admin/templates/admin/identities.html:5
+#: handlers.py:262 templates/admin/domain_statistics.html:36
+#: templates/admin/domain_statistics.html:50 templates/admin/identities.html:5
 msgid "Identities"
 msgstr "Identités"
 
-#: admin/handlers.py:271 admin/templates/admin/forward.html.py:2
+#: handlers.py:278 templates/admin/forward.html:2
 msgid "Forward"
 msgstr "Transfert"
 
-#: admin/lib.py:32
+#: lib.py:32
 msgid "A mailbox is required"
 msgstr "Une boite aux lettres est requise"
 
-#: admin/lib.py:122
+#: lib.py:122
 msgid "You are not allowed to import domains"
 msgstr "Vous n'êtes pas autorisé à importer des domaines"
 
-#: admin/lib.py:133
+#: lib.py:133
 msgid "You are not allowed to import domain aliases."
 msgstr "Vous n'êtes pas autorisé à importer des alias de domaine."
 
-#: admin/management/commands/subcommands/_mx.py:159
+#: management/commands/subcommands/_mx.py:159
 msgid "[modoboa] DNSBL issue(s) for domain {}"
 msgstr "[modoboa] Problème(s) DNSBL pour le domaine {}"
 
-#: admin/management/commands/subcommands/_mx.py:180
+#: management/commands/subcommands/_mx.py:180
 msgid "Domain {} has no MX record"
 msgstr "Le domaine {} n'a pas d'enregistrement MX"
 
-#: admin/management/commands/subcommands/_mx.py:191
+#: management/commands/subcommands/_mx.py:191
 #, python-brace-format
 msgid "MX record for domain {0} is invalid: {1}"
 msgstr "Enregistrement MX invalide pour le domaine {0} : {1}"
 
-#: admin/management/commands/subcommands/_mx.py:207
+#: management/commands/subcommands/_mx.py:207
 msgid "[modoboa] MX issue(s) for domain {}"
 msgstr "[modoboa] problème(s) de MX pour le domaine {}"
 
-#: admin/models/alias.py:31 admin/models/mailbox.py:80
+#: models/alias.py:31 models/mailbox.py:80
 msgid "address"
 msgstr "Adresse"
 
-#: admin/models/alias.py:33
+#: models/alias.py:33
 msgid "The alias address."
 msgstr "L'adresse de l'alias"
 
-#: admin/models/alias.py:38 admin/models/domain.py:46
-#: admin/models/domain_alias.py:44
+#: models/alias.py:38 models/domain.py:47 models/domain_alias.py:44
 msgid "enabled"
 msgstr "Activé"
 
-#: admin/models/alias.py:39 admin/models/domain_alias.py:45
+#: models/alias.py:39 models/domain_alias.py:45
 msgid "Check to activate this alias"
 msgstr "Cocher pour activer cet alias"
 
-#: admin/models/alias.py:44 admin/templates/admin/alias_detail.html.py:32
+#: models/alias.py:44 templates/admin/alias_detail.html:32
 msgid "Description"
 msgstr "Description"
 
-#: admin/models/alias.py:46 admin/templates/admin/alias_detail.html.py:29
+#: models/alias.py:46 templates/admin/alias_detail.html:29
 msgid "Expire at"
 msgstr "Expire le"
 
-#: admin/models/alias.py:89
+#: models/alias.py:89
 msgid "alias"
 msgstr "alias"
 
-#: admin/models/alias.py:121
+#: models/alias.py:121
 msgid "Invalid address"
 msgstr "Adresse invalide"
 
-#: admin/models/alias.py:142
+#: models/alias.py:142
 msgid "Local recipient {}@{} not found"
 msgstr "Destinataire local {}@{} introuvable"
 
-#: admin/models/alias.py:172
+#: models/alias.py:172
 #, python-format
 msgid "Invalid line: %s"
 msgstr "Ligne invalide : %s"
 
-#: admin/models/alias.py:178
+#: models/alias.py:178
 #, python-format
 msgid "Domain '%s' does not exist"
 msgstr "Domaine '%s' inexistant"
 
-#: admin/models/domain.py:42 admin/models/domain_alias.py:37
+#: models/domain.py:43 models/domain_alias.py:37
 msgid "name"
 msgstr "Nom"
 
-#: admin/models/domain.py:43
+#: models/domain.py:44
 msgid "The domain name"
 msgstr "Le nom du domaine"
 
-#: admin/models/domain.py:47
+#: models/domain.py:48
 msgid "Check to activate this domain"
 msgstr "Cocher pour activer ce domaine"
 
-#: admin/models/domain.py:208 admin/models/domain_alias.py:71
+#: models/domain.py:215 models/domain_alias.py:71
 msgid "Invalid line"
 msgstr "Ligne invalide"
 
-#: admin/models/domain.py:216
+#: models/domain.py:223
 #, python-format
 msgid "Invalid quota value for domain '%s'"
 msgstr "Quota invalide pour le domaine '%s'"
 
-#: admin/models/domain_alias.py:38
+#: models/domain_alias.py:38
 msgid "The alias name"
 msgstr "Le nom de l'alias"
 
-#: admin/models/domain_alias.py:40
+#: models/domain_alias.py:40
 msgid "target"
 msgstr "cible"
 
-#: admin/models/domain_alias.py:41
+#: models/domain_alias.py:41
 msgid "The domain this alias points to"
 msgstr "Le domaine vers lequel cet alias pointe"
 
-#: admin/models/domain_alias.py:80
+#: models/domain_alias.py:80
 #, python-format
 msgid "Unknown domain %s"
 msgstr "Domaine %s inconnu"
 
-#: admin/models/mailbox.py:82
+#: models/mailbox.py:82
 msgid "Mailbox address (without the @domain.tld part)"
 msgstr "Adresse de la boite aux lettres (sans la partie @domain.tld)"
 
-#: admin/models/mailbox.py:148
+#: models/mailbox.py:148
 #, python-format
 msgid "Failed to retrieve mailbox location (%s)"
 msgstr "Impossible de récuperer l'emplacement de la boite (%s)"
 
-#: admin/models/mailbox.py:238
+#: models/mailbox.py:238
 #, python-format
 msgid "Quota is greater than the allowed domain's limit (%dM)"
 msgstr "Le quota est supérieur à la limité autorisée pour le domaine (%dM)"
 
-#: admin/models/mailbox.py:244
+#: models/mailbox.py:244
 msgid "A quota is required"
 msgstr "Un quota est requis"
 
-#: admin/serializers.py:45 admin/serializers.py:228 admin/serializers.py:317
+#: serializers.py:45 serializers.py:228 serializers.py:317
 msgid "Permission denied."
 msgstr "Permission refusée."
 
-#: admin/serializers.py:83
+#: serializers.py:83
 msgid ""
 "List of administered domains (resellers and domain administrators only)."
 msgstr "Liste des domaines administrés (revendeurs et administrateurs de domaine seulement)."
 
-#: admin/serializers.py:193
+#: serializers.py:193
 msgid "Not allowed for this role."
 msgstr "Non autorisé pour ce rôle."
 
-#: admin/serializers.py:203
+#: serializers.py:203
 msgid "Must be equal to mailbox full_address"
 msgstr "Doit être égale au champ full_address dans mailbox"
 
-#: admin/serializers.py:215
+#: serializers.py:215
 msgid "Local domain {} does not exist"
 msgstr "Le domaine local {} n'existe pas"
 
-#: admin/serializers.py:315
+#: serializers.py:315
 msgid "Domain not found."
 msgstr "Domaine introuvable."
 
-#: admin/templates/admin/account_detail.html:16
-#: admin/templates/admin/alias_detail.html:16
-#: admin/templates/admin/domain_detail.html:15
-#: admin/templates/admin/identities_table.html:7
+#: templates/admin/account_detail.html:16 templates/admin/alias_detail.html:16
+#: templates/admin/domain_detail.html:15
+#: templates/admin/identities_table.html:7
 msgid "(disabled)"
 msgstr "(désactivé)"
 
-#: admin/templates/admin/account_detail.html:22
-#: admin/templates/admin/alias_detail.html:22
-#: admin/templates/admin/domain_detail.html:21
+#: templates/admin/account_detail.html:22 templates/admin/alias_detail.html:22
+#: templates/admin/domain_detail.html:21
 msgid "Summary"
 msgstr "Résumé"
 
-#: admin/templates/admin/account_detail.html:26
+#: templates/admin/account_detail.html:26
 msgid "Full name"
 msgstr "Nom complet"
 
-#: admin/templates/admin/account_detail.html:32
-#: admin/templates/admin/alias_detail.html:26
+#: templates/admin/account_detail.html:32 templates/admin/alias_detail.html:26
 msgid "Created"
 msgstr "Créé"
 
-#: admin/templates/admin/account_detail.html:35
+#: templates/admin/account_detail.html:35
 msgid "Last login"
 msgstr "Dernière connexion"
 
-#: admin/templates/admin/account_detail.html:38
+#: templates/admin/account_detail.html:38
 msgid "Secondary email"
 msgstr "E-mail secondaire"
 
-#: admin/templates/admin/account_detail.html:38
-#: admin/templates/admin/account_detail.html:41
+#: templates/admin/account_detail.html:38
+#: templates/admin/account_detail.html:41
 msgid "Not defined"
 msgstr "Non défini"
 
-#: admin/templates/admin/account_detail.html:41
+#: templates/admin/account_detail.html:41
 msgid "Phone number"
 msgstr "Numéro de téléphone"
 
-#: admin/templates/admin/account_detail.html:55
+#: templates/admin/account_detail.html:55
 msgid "Administered domains"
 msgstr "Domaines gérés"
 
-#: admin/templates/admin/account_detail.html:61
+#: templates/admin/account_detail.html:61
 msgid "No domain defined."
 msgstr "Aucun domaine défini."
 
-#: admin/templates/admin/account_detail.html:75
+#: templates/admin/account_detail.html:75
 msgid "Aliases"
 msgstr "Alias"
 
-#: admin/templates/admin/account_detail.html:81
+#: templates/admin/account_detail.html:81
 msgid "No alias defined"
 msgstr "Aucun alias défini"
 
-#: admin/templates/admin/account_detail.html:87
+#: templates/admin/account_detail.html:87
 msgid "Additional sender addresses"
 msgstr "Adresses d'envoi supplémentaires"
 
-#: admin/templates/admin/account_detail.html:93
+#: templates/admin/account_detail.html:93
 msgid "No sender address defined"
 msgstr "Aucune adresse d'envoi déclarée"
 
-#: admin/templates/admin/account_general_form.html:11
-#: admin/templates/admin/aliasform.html:13
+#: templates/admin/account_general_form.html:11
+#: templates/admin/aliasform.html:13
 msgid "Domain is disabled"
 msgstr "Le domaine est désactivé"
 
-#: admin/templates/admin/alias_detail.html:16
-#: admin/templates/admin/identities.html:33
+#: templates/admin/alias_detail.html:16 templates/admin/identities.html:33
 msgid "Alias"
 msgstr "Alias"
 
-#: admin/templates/admin/alias_detail.html:27
+#: templates/admin/alias_detail.html:27
 msgid "Modified"
 msgstr "Modifié"
 
-#: admin/templates/admin/dnsbl_domain_detail.html:10
+#: templates/admin/dnsbl_domain_detail.html:10
 msgid "Provider"
 msgstr "Fournisseur"
 
-#: admin/templates/admin/dnsbl_domain_detail.html:11
-#: admin/templates/admin/mx_domain_detail.html:10
-#: admin/templates/admin/quota_headers.html:2
+#: templates/admin/dnsbl_domain_detail.html:11
+#: templates/admin/mx_domain_detail.html:10
+#: templates/admin/quota_headers.html:2
 msgid "Address"
 msgstr "Adresse"
 
-#: admin/templates/admin/dnsbl_domain_detail.html:12
+#: templates/admin/dnsbl_domain_detail.html:12
 msgid "Status"
 msgstr "Statut"
 
-#: admin/templates/admin/dnsbl_domain_detail.html:21
+#: templates/admin/dnsbl_domain_detail.html:21
 msgid "listed"
 msgstr "listé"
 
-#: admin/templates/admin/dnsbl_domain_detail.html:29
+#: templates/admin/dnsbl_domain_detail.html:29
 msgid "Everything is fine, this domain is not listed."
 msgstr "Tout va bien, ce domaine n'est pas listé."
 
-#: admin/templates/admin/dnsbl_domain_detail.html:32
+#: templates/admin/dnsbl_domain_detail.html:32
 msgid "No information available for this domain."
 msgstr "Aucune information disponible pour ce domaine."
 
-#: admin/templates/admin/domain_detail.html:26
-#: admin/templates/admin/domains.html:38
+#: templates/admin/domain_detail.html:26 templates/admin/domains.html:38
 msgid "DNS status"
 msgstr "Statut DNS"
 
-#: admin/templates/admin/domain_detail.html:28
-#: admin/templates/admin/domains_table.html:12
+#: templates/admin/domain_detail.html:28 templates/admin/domains_table.html:14
 msgid "Awaiting checks"
 msgstr "En attente de vérification"
 
-#: admin/templates/admin/domain_detail.html:40
+#: templates/admin/domain_detail.html:40
 msgid "Creation date"
 msgstr "Date de création"
 
-#: admin/templates/admin/domain_detail.html:42
+#: templates/admin/domain_detail.html:42
 msgid "Last modification date"
 msgstr "Date de dernière modification"
 
-#: admin/templates/admin/domain_detail.html:43
-#: admin/templates/admin/domain_detail.html:52
-#: admin/templates/admin/domain_statistics.html:33
+#: templates/admin/domain_detail.html:43 templates/admin/domain_detail.html:52
+#: templates/admin/domain_statistics.html:33
 msgid "Domain aliases"
 msgstr "Alias de domaine"
 
-#: admin/templates/admin/domain_detail.html:45
+#: templates/admin/domain_detail.html:45
 msgid "Mailbox aliases"
 msgstr "Alias de boite."
 
-#: admin/templates/admin/domain_detail.html:69
+#: templates/admin/domain_detail.html:69
 msgid "Administrators"
 msgstr "Administrateurs"
 
-#: admin/templates/admin/domain_detail.html:79
-#: admin/templatetags/admin_tags.py:259
+#: templates/admin/domain_detail.html:79 templatetags/admin_tags.py:259
 msgid "Remove this permission"
 msgstr "Supprimer cette permission"
 
-#: admin/templates/admin/domain_detail.html:84
+#: templates/admin/domain_detail.html:84
 msgid "No domain administrator defined yet."
 msgstr "Aucun administrateur de domaine défini."
 
-#: admin/templates/admin/domain_general_form.html:4
-#: admin/templates/admin/mailform.html:4
-#: admin/templates/admin/newdomainform.html:3
+#: templates/admin/domain_general_form.html:4 templates/admin/mailform.html:4
+#: templates/admin/newdomainform.html:3
 msgid "MB"
 msgstr "Mo"
 
-#: admin/templates/admin/domain_options_form.html:7
+#: templates/admin/domain_options_form.html:7
 msgid "You can't create a new domain administrator"
 msgstr "Vous ne pouvez pas créer de nouvel administrateur de domaine"
 
-#: admin/templates/admin/domain_statistics.html:15
-#: admin/templatetags/admin_tags.py:44
+#: templates/admin/domain_statistics.html:15 templatetags/admin_tags.py:44
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: admin/templates/admin/domain_statistics.html:15
+#: templates/admin/domain_statistics.html:15
 msgid "Domains and identities"
 msgstr "Domaines et identités"
 
-#: admin/templates/admin/domain_statistics.html:22
+#: templates/admin/domain_statistics.html:22
 msgid "Global counters"
 msgstr "Compteurs globaux"
 
-#: admin/templates/admin/domain_statistics.html:27
+#: templates/admin/domain_statistics.html:27
 msgid "Quantity"
 msgstr "Quantité"
 
-#: admin/templates/admin/domain_statistics.html:45
+#: templates/admin/domain_statistics.html:45
 msgid "Per-domain counters"
 msgstr "Compteurs par domaine"
 
-#: admin/templates/admin/domains.html:26
-#: admin/templates/admin/identities.html:29
+#: templates/admin/domains.html:26 templates/admin/identities.html:29
 msgid "Add"
 msgstr "Ajouter"
 
-#: admin/templates/admin/domains.html:36
-#: admin/templates/admin/identity_headers.html:4
+#: templates/admin/domains.html:36 templates/admin/identity_headers.html:4
 msgid "Tags"
 msgstr "Tags"
 
-#: admin/templates/admin/domains.html:40
-#: admin/templates/admin/identity_headers.html:5
+#: templates/admin/domains.html:40 templates/admin/identity_headers.html:5
 msgid "Actions"
 msgstr "Actions"
 
-#: admin/templates/admin/domains_table.html:5
+#: templates/admin/domains_table.html:5
 msgid "disabled"
 msgstr "Desactivé"
 
-#: admin/templates/admin/forward.html:2
+#: templates/admin/domains_table.html:12
+msgctxt "checks"
+msgid "Disabled"
+msgstr "Désactivés"
+
+#: templates/admin/forward.html:2
 msgid "Automatically forward emails to another address"
 msgstr "Transférer automatiquement les messages vers une autre adresse"
 
-#: admin/templates/admin/forward.html:9 admin/views/alias.py:91
+#: templates/admin/forward.html:9 views/alias.py:91
 msgid "Update"
 msgstr "Mettre à jour"
 
-#: admin/templates/admin/identities.html:32
+#: templates/admin/identities.html:32
 msgid "Account"
 msgstr "Compte"
 
-#: admin/templates/admin/identity_headers.html:3
+#: templates/admin/identity_headers.html:3
 msgid "Fullname/Recipient"
 msgstr "Nom complet/Destinataire"
 
-#: admin/templates/admin/import_domains_form.html:6
+#: templates/admin/import_domains_form.html:6
 msgid ""
 "Provide a CSV file where lines respect one of the following formats: <ul> "
 "<li><em>domain; name; quota; enabled</em></li> <li><em>domainalias; name; "
@@ -819,7 +803,7 @@ msgid ""
 "<p>You can use a different character as separator.</p>"
 msgstr "Fournissez un fichier CSV dans lequel les lignes respectent un des formats suivants : <ul> <li><em>domain; name; quota; enabled</em></li> <li><em>domainalias; name; targeted domain; enabled</em></li> <li><em>relaydomain; name; target host; service; enabled; verify recipients</em></li> </ul> <p>Le premier élément de chaque ligne est obligatoire et doit être égal à l'une des valeurs présentées.</p><p>Vous pouvez utiliser un caractère différent en tant que séparateur.</p>"
 
-#: admin/templates/admin/import_identities_form.html:6
+#: templates/admin/import_identities_form.html:6
 msgid ""
 "Provide a CSV file where lines respect one of the following formats: <ul> "
 "<li><em>account; loginname; password; first name; last name; enabled; group;"
@@ -829,196 +813,195 @@ msgid ""
 " use a different character as separator.</p>"
 msgstr "Fournissez un fichier CSV dans lequel les lignes respectent un des formats suivants : <ul> <li><em>account; loginname; password; first name; last name; enabled; group; address; quota; [, domain, ...]</em></li> <li><em>alias; address; enabled; recipient; recipient; ...</em></li> </ul> <p>Le premier élément de chaque ligne est obligatoire et doit être égal à l'une des valeurs présentées.</p><p>Vous pouvez utiliser un caractère différent en tant que séparateur.</p>"
 
-#: admin/templates/admin/importform.html:6
+#: templates/admin/importform.html:6
 msgid "Help"
 msgstr "Aide"
 
-#: admin/templates/admin/importform.html:13
+#: templates/admin/importform.html:13
 msgid "Importing..."
 msgstr "Import en cours..."
 
-#: admin/templates/admin/mailboxes_raw.html:3
+#: templates/admin/mailboxes_raw.html:3
 msgid "Choose a value"
 msgstr "Choisir une valeur"
 
-#: admin/templates/admin/mailform.html:4
+#: templates/admin/mailform.html:4
 msgid "Use domain default value"
 msgstr "Utiliser la valeur par défaut du domaine"
 
-#: admin/templates/admin/mx_domain_detail.html:11
+#: templates/admin/mx_domain_detail.html:11
 msgid "Updated"
 msgstr "Mis à jour"
 
-#: admin/templates/admin/mx_domain_detail.html:23
+#: templates/admin/mx_domain_detail.html:23
 msgid "This IP does not match any of the valid MXs defined in parameters"
 msgstr "Cette IP ne correspond à un aucun des MX valides déclarés dans les paramètres."
 
-#: admin/templates/admin/mx_domain_detail.html:36
+#: templates/admin/mx_domain_detail.html:36
 msgid "No MX record found for this domain."
 msgstr "Aucun enregistrement MX trouvé pour ce domaine."
 
-#: admin/templates/admin/notifications/domain_in_dnsbl.html:3
+#: templates/admin/notifications/domain_in_dnsbl.html:3
 #, python-format
 msgid ""
 "Modoboa detected that domain %(domain)s is listed by the following DNSBL "
 "providers:"
 msgstr "Modoboa a détecté que le domaine %(domain)s est listé par les fournisseurs de DNSBL suivants :"
 
-#: admin/templates/admin/notifications/domain_in_dnsbl.html:11
+#: templates/admin/notifications/domain_in_dnsbl.html:11
 msgid ""
 "The domain's reputation will be affected and there is a chance that emails "
 "coming from it are considered as spam. You should contact those providers "
 "and ask them to unlist detected IP address(es)."
 msgstr "La réputation de ce domaine sera affectée et il est probable que les emails venant de lui soient considérés comme du spam. Vous devriez contacter ces fournisseurs pour leur demander de délister la/les adresse(s) détectée(s)."
 
-#: admin/templates/admin/notifications/domain_invalid_mx.html:3
+#: templates/admin/notifications/domain_invalid_mx.html:3
 #, python-format
 msgid "Modoboa detected that domain %(domain)s has no valid MX record:"
 msgstr "Modoboa a détecté que le domain %(domain)s n'a aucun enregistrement MX valide :"
 
-#: admin/templates/admin/quota_headers.html:3
+#: templates/admin/quota_headers.html:3
 msgid "Value"
 msgstr "Valeur"
 
-#: admin/templates/admin/quota_headers.html:4
+#: templates/admin/quota_headers.html:4
 msgid "Limit"
 msgstr "Limite"
 
-#: admin/templates/admin/quota_headers.html:5
+#: templates/admin/quota_headers.html:5
 #, python-format
 msgid "Usage (%%)"
 msgstr "Utilisation (%%)"
 
-#: admin/templates/admin/searchform.html:6
+#: templates/admin/searchform.html:6
 msgid "Search"
 msgstr "Chercher"
 
-#: admin/templatetags/admin_tags.py:18
+#: templatetags/admin_tags.py:18
 msgid "enabled_m"
 msgstr "Activé"
 
-#: admin/templatetags/admin_tags.py:18
+#: templatetags/admin_tags.py:18
 msgid "enabled_f"
 msgstr "Activée"
 
-#: admin/templatetags/admin_tags.py:39
+#: templatetags/admin_tags.py:39
 msgid "List domains"
 msgstr "Lister les domaines"
 
-#: admin/templatetags/admin_tags.py:56 admin/templatetags/admin_tags.py:104
-#: admin/views/import_.py:87 admin/views/import_.py:109
+#: templatetags/admin_tags.py:56 templatetags/admin_tags.py:104
+#: views/import_.py:87 views/import_.py:109
 msgid "Import"
 msgstr "Importer"
 
-#: admin/templatetags/admin_tags.py:62 admin/templatetags/admin_tags.py:110
-#: admin/views/export.py:41 admin/views/export.py:69
+#: templatetags/admin_tags.py:62 templatetags/admin_tags.py:110
+#: views/export.py:41 views/export.py:69
 msgid "Export"
 msgstr "Exporter"
 
-#: admin/templatetags/admin_tags.py:94
+#: templatetags/admin_tags.py:94
 msgid "List identities"
 msgstr "Lister les identités"
 
-#: admin/templatetags/admin_tags.py:99
+#: templatetags/admin_tags.py:99
 msgid "List quotas"
 msgstr "Lister les quotas"
 
-#: admin/templatetags/admin_tags.py:129
+#: templatetags/admin_tags.py:129
 msgid "View the domain's identities"
 msgstr "Voir les identités du domaine"
 
-#: admin/templatetags/admin_tags.py:135 admin/templatetags/admin_tags.py:178
-#: admin/templatetags/admin_tags.py:191
+#: templatetags/admin_tags.py:135 templatetags/admin_tags.py:178
+#: templatetags/admin_tags.py:191
 msgid "Edit {}"
 msgstr "Modifier {}"
 
-#: admin/templatetags/admin_tags.py:145 admin/templatetags/admin_tags.py:182
-#: admin/templatetags/admin_tags.py:196
+#: templatetags/admin_tags.py:145 templatetags/admin_tags.py:182
+#: templatetags/admin_tags.py:196
 #, python-format
 msgid "Delete %s?"
 msgstr "Supprimer %s ?"
 
-#: admin/views/alias.py:33
+#: views/alias.py:33
 msgid "Alias with this name already exists"
 msgstr "Un alias de ce nom existe déjà"
 
-#: admin/views/alias.py:58
+#: views/alias.py:58
 msgid "Create"
 msgstr "Créer"
 
-#: admin/views/alias.py:70
+#: views/alias.py:70
 msgid "New alias"
 msgstr "Nouvel alias"
 
-#: admin/views/alias.py:71
+#: views/alias.py:71
 msgid "Alias created"
 msgstr "Alias créé"
 
-#: admin/views/alias.py:83
+#: views/alias.py:83
 msgid "Alias modified"
 msgstr "Alias modifié"
 
-#: admin/views/alias.py:107
+#: views/alias.py:107
 msgid "Alias deleted"
 msgid_plural "Aliases deleted"
 msgstr[0] "Alias supprimé"
 msgstr[1] "Alias supprimés"
 
-#: admin/views/dns.py:30
+#: views/dns.py:30
 msgid "MX records of {}"
 msgstr "Enregistrements MX de {}"
 
-#: admin/views/dns.py:53
+#: views/dns.py:53
 msgid "DNSBL summary for {}"
 msgstr "Résumé DNSBL pour {}"
 
-#: admin/views/domain.py:152
+#: views/domain.py:152
 msgid "You can't delete your own domain"
 msgstr "Vous ne pouvez pas supprimer votre propre domaine"
 
-#: admin/views/domain.py:155
+#: views/domain.py:155
 msgid "Domain deleted"
 msgid_plural "Domains deleted"
 msgstr[0] "Domaine supprimé"
 msgstr[1] "Domaines supprimés"
 
-#: admin/views/export.py:40
+#: views/export.py:40
 msgid "Export identities"
 msgstr "Export d'identités"
 
-#: admin/views/export.py:68
+#: views/export.py:68
 msgid "Export domains"
 msgstr "Export de domaines"
 
-#: admin/views/identity.py:111 admin/views/identity.py:205
-#: admin/views/identity.py:210
+#: views/identity.py:111 views/identity.py:205 views/identity.py:210
 msgid "Invalid request"
 msgstr "Requête invalide"
 
-#: admin/views/identity.py:195
+#: views/identity.py:195
 msgid "Account deleted"
 msgid_plural "Accounts deleted"
 msgstr[0] "Compte supprimé"
 msgstr[1] "Comptes supprimés"
 
-#: admin/views/import_.py:63
+#: views/import_.py:63
 #, python-format
 msgid "Object already exists: %s"
 msgstr "L'objet existe déjà : %s"
 
-#: admin/views/import_.py:67
+#: views/import_.py:67
 #, python-format
 msgid "%d objects imported successfully"
 msgstr "%d objets importés avec succès"
 
-#: admin/views/import_.py:86
+#: views/import_.py:86
 msgid "Import domains"
 msgstr "Importer des domaines"
 
-#: admin/views/import_.py:108
+#: views/import_.py:108
 msgid "Import identities"
 msgstr "Importer des identités"
 
-#: admin/views/user.py:35
+#: views/user.py:35
 msgid "Forward updated"
 msgstr "Transfert mis à jour"
diff --git a/modoboa/admin/locale/it/LC_MESSAGES/django.po b/modoboa/admin/locale/it/LC_MESSAGES/django.po
index a4462cf08..535cc6cb1 100644
--- a/modoboa/admin/locale/it/LC_MESSAGES/django.po
+++ b/modoboa/admin/locale/it/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Modoboa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-14 14:13+0100\n"
+"POT-Creation-Date: 2017-01-16 13:02+0100\n"
 "PO-Revision-Date: 2015-10-11 11:48+0000\n"
 "Last-Translator: Rocco <mors10@hotmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/tonio/modoboa/language/"
@@ -20,47 +20,46 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/app_settings.py:17 admin/handlers.py:245
-#: admin/templates/admin/domain_statistics.html:30
-#: admin/templates/admin/domains.html:4
+#: app_settings.py:17 handlers.py:252
+#: templates/admin/domain_statistics.html:30 templates/admin/domains.html:4
 msgid "Domains"
 msgstr "Domini"
 
-#: admin/app_settings.py:20
+#: app_settings.py:20
 msgid "Enable MX checks"
 msgstr ""
 
-#: admin/app_settings.py:23
+#: app_settings.py:23
 msgid "Check that every domain has a valid MX record"
 msgstr ""
 
-#: admin/app_settings.py:28
+#: app_settings.py:28
 msgid "Valid MXs"
 msgstr ""
 
-#: admin/app_settings.py:31
+#: app_settings.py:31
 msgid ""
-"IP(s) or network(s) of the MX that should match with domains' MX records. On "
-"per line."
+"A list of IP or network address every MX record should match. A warning will "
+"be sent if a record does not respect it."
 msgstr ""
 
-#: admin/app_settings.py:40
+#: app_settings.py:39
 msgid "Enable DNSBL checks"
 msgstr ""
 
-#: admin/app_settings.py:43
+#: app_settings.py:42
 msgid "Check every domain against major DNSBL providers"
 msgstr ""
 
-#: admin/app_settings.py:47 admin/templates/admin/domain_detail.html.py:44
+#: app_settings.py:46 templates/admin/domain_detail.html:44
 msgid "Mailboxes"
 msgstr "Caselle di posta"
 
-#: admin/app_settings.py:50
+#: app_settings.py:49
 msgid "Handle mailboxes on filesystem"
 msgstr "Gestione delle caselle di posta nel filsystem"
 
-#: admin/app_settings.py:53
+#: app_settings.py:52
 msgid ""
 "Rename or remove mailboxes on the filesystem when they get renamed or "
 "removed within Modoboa"
@@ -68,19 +67,19 @@ msgstr ""
 "Rinomina o rimuovi le caselle di posta nel filesystem quando vengono "
 "rinominate o cancellate in Modoboa "
 
-#: admin/app_settings.py:59
+#: app_settings.py:58
 msgid "Mailboxes owner"
 msgstr "Proprietario delle caselle postali"
 
-#: admin/app_settings.py:62
+#: app_settings.py:61
 msgid "The UNIX account who owns mailboxes on the filesystem"
 msgstr "L'account UNIX a cui appartengono le caselle postali nel filsystem"
 
-#: admin/app_settings.py:67
+#: app_settings.py:66
 msgid "Default domain quota"
 msgstr "Quota predefinita per il domini"
 
-#: admin/app_settings.py:70
+#: app_settings.py:69
 msgid ""
 "Default quota (in MB) applied to freshly created domains with no value "
 "specified. A value of 0 means no quota."
@@ -88,39 +87,38 @@ msgstr ""
 "Quota predefinita (in MB) applicata ai nuovi domini che non la specificano. "
 "Un valore 0 implica nessuna quota."
 
-#: admin/app_settings.py:76
+#: app_settings.py:75
 msgid "Automatic account removal"
 msgstr "Rimozione automatica dell'account"
 
-#: admin/app_settings.py:79
+#: app_settings.py:78
 msgid "When a mailbox is removed, also remove the associated account"
 msgstr ""
 "Quando una casella postale viene rimossa rimuovi anche l'account associato"
 
-#: admin/app_settings.py:83
+#: app_settings.py:82
 msgid "Automatic domain/mailbox creation"
 msgstr "Creazione automatica del domini/casella di posta elettronica"
 
-#: admin/app_settings.py:86
+#: app_settings.py:85
 msgid "Create a domain and a mailbox when an account is automatically created."
 msgstr ""
 "Crea un dominio ed una casella di posta elettronica quando si crea un "
 "account utente"
 
-#: admin/app_settings.py:133 admin/forms/account.py:288
-#: admin/forms/domain.py:87
+#: app_settings.py:132 forms/account.py:288 forms/domain.py:87
 msgid "Must be a positive integer"
 msgstr "Dev'essere un intero positivo"
 
-#: admin/app_settings.py:143
+#: app_settings.py:142
 msgid "Administration"
 msgstr "Amministrazione"
 
-#: admin/forms/account.py:34 admin/templates/admin/domain_detail.html.py:72
+#: forms/account.py:34 templates/admin/domain_detail.html:72
 msgid "Username"
 msgstr "Nome utente"
 
-#: admin/forms/account.py:36
+#: forms/account.py:36
 msgid ""
 "The user's name. Must be a valid e-mail address for simple users or "
 "administrators with a mailbox."
@@ -128,57 +126,57 @@ msgstr ""
 "Il nome dell'utente. Dev'essere un indirizzo e-mail per gli utenti semplici "
 "o gli amministratori che posseggono una casella"
 
-#: admin/forms/account.py:41 admin/templates/admin/account_detail.html.py:29
+#: forms/account.py:41 templates/admin/account_detail.html:29
 msgid "Role"
 msgstr "Ruolo"
 
-#: admin/forms/account.py:42
+#: forms/account.py:42
 msgid "Choose"
 msgstr "Scegli"
 
-#: admin/forms/account.py:43
+#: forms/account.py:43
 msgid "What level of permission this user will have"
 msgstr "Il livello di permessi che avrà questo utente"
 
-#: admin/forms/account.py:46
+#: forms/account.py:46
 msgid "Password"
 msgstr "Password"
 
-#: admin/forms/account.py:50
+#: forms/account.py:50
 msgid "Confirmation"
 msgstr "Conferma"
 
-#: admin/forms/account.py:53
+#: forms/account.py:53
 msgid "Enter the same password as above, for verification."
 msgstr ""
 "Inserisci la medesima password che hai inserito sopra, per la verifica."
 
-#: admin/forms/account.py:64
+#: forms/account.py:64
 msgid "Enabled"
 msgstr "Abilitato"
 
-#: admin/forms/account.py:156
+#: forms/account.py:156
 msgid "The two password fields didn't match."
 msgstr "Le password nei due campi non corrispondono"
 
-#: admin/forms/account.py:171
+#: forms/account.py:171
 msgid "Only super administrators are allowed for this mode"
 msgstr "Solo i super amministratori possono operare in questa modalità"
 
-#: admin/forms/account.py:179
+#: forms/account.py:179
 msgid "You can't disable your own account"
 msgstr "Tu non puoi disabilitare il tuo account"
 
-#: admin/forms/account.py:194
+#: forms/account.py:194
 msgid "E-mail"
 msgstr "E-mail"
 
-#: admin/forms/account.py:196 admin/forms/domain.py:38
-#: admin/templates/admin/account_detail.html:45
+#: forms/account.py:196 forms/domain.py:38
+#: templates/admin/account_detail.html:45
 msgid "Quota"
 msgstr "Quota"
 
-#: admin/forms/account.py:198
+#: forms/account.py:198
 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 "
@@ -188,12 +186,11 @@ msgstr ""
 "quello predefinito. Lasciare vuoto per non impostare limiti (non consentito "
 "per gli amministratori di dominio)."
 
-#: admin/forms/account.py:206 admin/forms/domain.py:46
-#: admin/templates/admin/domains.html:35
+#: forms/account.py:206 forms/domain.py:46 templates/admin/domains.html:35
 msgid "Alias(es)"
 msgstr "Alias"
 
-#: admin/forms/account.py:209
+#: forms/account.py:209
 #, fuzzy
 #| msgid ""
 #| "Alias(es) of this mailbox. Indicate only one address per input, press "
@@ -208,13 +205,13 @@ msgstr ""
 "premere INVIO per aggiungere un nuovo elemento. Utilizzare il carattere '*' "
 "per creare un alias 'prenditutto' (p.es.: *@dominio.org)."
 
-#: admin/forms/account.py:215
+#: forms/account.py:215
 #, fuzzy
 #| msgid "Invalid address"
 msgid "Sender addresses"
 msgstr "Indirizzo non valido"
 
-#: admin/forms/account.py:218
+#: forms/account.py:218
 #, fuzzy
 #| msgid ""
 #| "Addresses this alias will point to. Indicate only one address per input, "
@@ -227,61 +224,60 @@ msgstr ""
 "Indirizzi verso il quale questo alias punterà . Indicare un solo indirizzo "
 "per ogni ingresso , premere INVIO per aggiungere un nuovo input ."
 
-#: admin/forms/account.py:267 admin/forms/alias.py:92
-#: admin/models/mailbox.py:295
+#: forms/account.py:267 forms/alias.py:92 models/mailbox.py:295
 msgid "Domain does not exist"
 msgstr "Il dominio non esiste"
 
-#: admin/forms/account.py:297
+#: forms/account.py:297
 #, fuzzy
 #| msgid "Domain does not exist"
 msgid "Local domain does not exist"
 msgstr "Il dominio non esiste"
 
-#: admin/forms/account.py:392
+#: forms/account.py:392
 msgid "Domain(s)"
 msgstr "Dominio(i)"
 
-#: admin/forms/account.py:394
+#: forms/account.py:394
 msgid "Domain(s) that user administrates"
 msgstr "Dominio(i) amministrato(i) dall'utente"
 
-#: admin/forms/account.py:440 admin/forms/account.py:525
-#: admin/forms/domain.py:283 admin/forms/domain.py:350
+#: forms/account.py:440 forms/account.py:525 forms/domain.py:283
+#: forms/domain.py:350
 msgid "General"
 msgstr "Generale"
 
-#: admin/forms/account.py:445 admin/forms/account.py:531
+#: forms/account.py:445 forms/account.py:531
 msgid "Mail"
 msgstr "Posta"
 
-#: admin/forms/account.py:447
+#: forms/account.py:447
 msgid "Permissions"
 msgstr "Permessi"
 
-#: admin/forms/account.py:514
+#: forms/account.py:514
 msgid "Account updated"
 msgstr "Account aggiornato"
 
-#: admin/forms/account.py:538
+#: forms/account.py:538
 msgid "New account"
 msgstr "Nuovo account"
 
-#: admin/forms/account.py:550
+#: forms/account.py:550
 msgid "Account created"
 msgstr "Account creato"
 
-#: admin/forms/alias.py:24
+#: forms/alias.py:24
 #, fuzzy
 #| msgid "Invalid address"
 msgid "Random address"
 msgstr "Indirizzo non valido"
 
-#: admin/forms/alias.py:27
+#: forms/alias.py:27
 msgid "Email address"
 msgstr "Indirizzo email"
 
-#: admin/forms/alias.py:29
+#: forms/alias.py:29
 msgid ""
 "The alias address. To create a catchall alias, just enter the domain name "
 "(@domain.tld)."
@@ -289,11 +285,11 @@ msgstr ""
 "Indirizzi email alias. Per creare un alias catchall specifica il nome del "
 "dominio (@domain.tld)."
 
-#: admin/forms/alias.py:35 admin/templates/admin/alias_detail.html.py:37
+#: forms/alias.py:35 templates/admin/alias_detail.html:37
 msgid "Recipients"
 msgstr "Destinatari"
 
-#: admin/forms/alias.py:37
+#: forms/alias.py:37
 msgid ""
 "Addresses this alias will point to. Indicate only one address per input, "
 "press ENTER to add a new input."
@@ -301,30 +297,30 @@ msgstr ""
 "Indirizzi verso il quale questo alias punterà . Indicare un solo indirizzo "
 "per ogni ingresso , premere INVIO per aggiungere un nuovo input ."
 
-#: admin/forms/alias.py:47 admin/forms/domain.py:26 admin/models/domain.py:91
-#: admin/templates/admin/domain_statistics.html:49
+#: forms/alias.py:47 forms/domain.py:26 models/domain.py:92
+#: templates/admin/domain_statistics.html:49
 msgid "Domain"
 msgstr "Dominio"
 
-#: admin/forms/alias.py:95
+#: forms/alias.py:95
 msgid "You don't have access to this domain"
 msgstr "Non hai accesso a questo dominio"
 
-#: admin/forms/alias.py:112 admin/forms/alias.py:114
+#: forms/alias.py:112 forms/alias.py:114
 #, fuzzy
 #| msgid "A mailbox is required"
 msgid "This field is required"
 msgstr "É necessaria una casella"
 
-#: admin/forms/alias.py:118
+#: forms/alias.py:118
 msgid "No recipient defined"
 msgstr "Non è stato definito un destinatario"
 
-#: admin/forms/domain.py:35 admin/templates/admin/domain_statistics.html.py:26
+#: forms/domain.py:35 templates/admin/domain_statistics.html:26
 msgid "Type"
 msgstr "Tipo"
 
-#: admin/forms/domain.py:41
+#: forms/domain.py:41
 msgid ""
 "Default quota in MB applied to mailboxes. Leave empty to use the default "
 "value."
@@ -332,7 +328,7 @@ msgstr ""
 "Quota in MB predefinita applicata alle caselle di posta. Lascialo vuoto se "
 "vuoi applicare il valore predefinito."
 
-#: admin/forms/domain.py:49
+#: forms/domain.py:49
 msgid ""
 "Alias(es) of this domain. Indicate only one name per input, press ENTER to "
 "add a new input."
@@ -340,36 +336,34 @@ msgstr ""
 "Alias per questo dominio. Inserire un solo nome alla volta, premere INVIO "
 "per aggiungere un nuovo elemento"
 
-#: admin/forms/domain.py:103 admin/handlers.py:148
+#: forms/domain.py:103 handlers.py:155
 msgid "domain alias"
 msgstr "alias del dominio"
 
-#: admin/forms/domain.py:106 admin/forms/domain.py:118
-#: admin/forms/domain.py:126
+#: forms/domain.py:106 forms/domain.py:118 forms/domain.py:126
 #, python-format
 msgid "A %s with this name already exists"
 msgstr "Un %s con questo nome esiste già"
 
-#: admin/forms/domain.py:118 admin/forms/domain.py:123
+#: forms/domain.py:118 forms/domain.py:123
 msgid "domain"
 msgstr "dominio"
 
-#: admin/forms/domain.py:171
+#: forms/domain.py:171
 msgid "Create a domain administrator"
 msgstr "Crea un amministratore di dominio"
 
-#: admin/forms/domain.py:174
+#: forms/domain.py:174
 msgid "Automatically create an administrator for this domain"
 msgstr "Crea automaticamente un amministratore per questo dominio"
 
-#: admin/forms/domain.py:179 admin/templates/admin/domain_detail.html.py:72
-#: admin/templates/admin/domains.html:34
-#: admin/templates/admin/identity_headers.html:2
-#: admin/templates/admin/mx_domain_detail.html:9
+#: forms/domain.py:179 templates/admin/domain_detail.html:72
+#: templates/admin/domains.html:34 templates/admin/identity_headers.html:2
+#: templates/admin/mx_domain_detail.html:9
 msgid "Name"
 msgstr "Nome"
 
-#: admin/forms/domain.py:182
+#: forms/domain.py:182
 msgid ""
 "The administrator's name. Don't include the domain's name here, it will be "
 "automatically appended."
@@ -377,71 +371,71 @@ msgstr ""
 "Il nome dell'amministratore. Non includere il nome del dominio, verrà "
 "aggiunto automaticamente."
 
-#: admin/forms/domain.py:189
+#: forms/domain.py:189
 msgid "Create aliases"
 msgstr "Crea alias"
 
-#: admin/forms/domain.py:192
+#: forms/domain.py:192
 msgid "Automatically create standard aliases for this domain"
 msgstr "Crea automaticamente gli alias standard per questo dominio"
 
-#: admin/forms/domain.py:208
+#: forms/domain.py:208
 msgid "Invalid format"
 msgstr "Formato non valido"
 
-#: admin/forms/domain.py:217 admin/forms/domain.py:220
+#: forms/domain.py:217 forms/domain.py:220
 #, fuzzy
 #| msgid "A mailbox is required"
 msgid "This field is required."
 msgstr "É necessaria una casella"
 
-#: admin/forms/domain.py:237
+#: forms/domain.py:237
 #, python-format
 msgid "User '%s' already exists"
 msgstr "L'utente '%s' esiste già"
 
-#: admin/forms/domain.py:339
+#: forms/domain.py:339
 msgid "Domain modified"
 msgstr "Dominio modificato"
 
-#: admin/forms/domain.py:360
+#: forms/domain.py:360
 msgid "Options"
 msgstr "Opzioni"
 
-#: admin/forms/domain.py:368
+#: forms/domain.py:368
 msgid "New domain"
 msgstr "Nuovo dominio"
 
-#: admin/forms/domain.py:381
+#: forms/domain.py:381
 msgid "Domain created"
 msgstr "Dominio creato"
 
-#: admin/forms/export.py:7
+#: forms/export.py:7
 msgid "File name"
 msgstr "Nome del file"
 
-#: admin/forms/export.py:13 admin/forms/import_.py:13
+#: forms/export.py:13 forms/import_.py:13
 msgid "Separator"
 msgstr "Separatore"
 
-#: admin/forms/forward.py:14
+#: forms/forward.py:14
 msgid "Recipient(s)"
 msgstr "Destinatario(i)"
 
-#: admin/forms/forward.py:18
+#: forms/forward.py:18
 msgid "Indicate one or more recipients separated by a ','"
 msgstr "Indicare uno o più destinatari separati da ','"
 
-#: admin/forms/forward.py:21
+#: forms/forward.py:21
 msgid "Keep local copies"
 msgstr "Mantieni copie locali"
 
-#: admin/forms/forward.py:24
+#: forms/forward.py:24
 msgid "Forward messages and store copies into your local mailbox"
 msgstr ""
 "Inoltra i messaggi e memorizza le copie nella tua casella di posta locale"
 
-#: admin/forms/forward.py:42
+#: forms/forward.py:42
 msgid ""
 "You can't define a forward to a local destination. Please ask your "
 "administrator to create an alias instead."
@@ -449,457 +443,449 @@ msgstr ""
 "Non puoi definire l'inoltro con destinazione una cartella locale. Chiedi "
 "piuttosto all'amministratore di creare un alias."
 
-#: admin/forms/import_.py:11
+#: forms/import_.py:11
 msgid "Select a file"
 msgstr "Seleziona un file"
 
-#: admin/forms/import_.py:19
+#: forms/import_.py:19
 msgid "Continue on error"
 msgstr "Continuare in caso di errore"
 
-#: admin/forms/import_.py:20
+#: forms/import_.py:20
 msgid "Don't treat duplicated objects as error"
 msgstr "Non considerare errore gli oggetti duplicati"
 
-#: admin/forms/import_.py:38
+#: forms/import_.py:38
 msgid "Crypt passwords"
 msgstr "Cripta le password"
 
-#: admin/forms/import_.py:40
+#: forms/import_.py:40
 msgid "Check this option if passwords contained in your file are not crypted"
 msgstr ""
 "Seleziona questa opzione se le password contenute nel file non sono criptate"
 
-#: admin/handlers.py:194
+#: handlers.py:201
 #, python-format
 msgid "Account import failed (%s): domain does not exist"
 msgstr "Importazione dell'account fallito (%s): il dominio non esiste"
 
-#: admin/handlers.py:207 admin/models/mailbox.py:320
+#: handlers.py:214 models/mailbox.py:320
 #, fuzzy
 #| msgid "Mailbox %s already exists"
 msgid "Mailbox {} already exists"
 msgstr "La casella di posta %s esiste già"
 
-#: admin/handlers.py:215
+#: handlers.py:222
 #, python-format
 msgid "Account import failed (%s): wrong quota value"
 msgstr "Importazione account fallito(%s): valore della quota errato"
 
-#: admin/handlers.py:255 admin/templates/admin/domain_statistics.html.py:36
-#: admin/templates/admin/domain_statistics.html:50
-#: admin/templates/admin/identities.html:5
+#: handlers.py:262 templates/admin/domain_statistics.html:36
+#: templates/admin/domain_statistics.html:50 templates/admin/identities.html:5
 msgid "Identities"
 msgstr "Identità"
 
-#: admin/handlers.py:271 admin/templates/admin/forward.html.py:2
+#: handlers.py:278 templates/admin/forward.html:2
 msgid "Forward"
 msgstr "Inoltra"
 
-#: admin/lib.py:32
+#: lib.py:32
 msgid "A mailbox is required"
 msgstr "É necessaria una casella"
 
-#: admin/lib.py:122
+#: lib.py:122
 msgid "You are not allowed to import domains"
 msgstr "Non hai i permessi di importare domini"
 
-#: admin/lib.py:133
+#: lib.py:133
 msgid "You are not allowed to import domain aliases."
 msgstr "Non hai i permessi di importare gli alias dominio"
 
-#: admin/management/commands/subcommands/_mx.py:159
+#: management/commands/subcommands/_mx.py:159
 msgid "[modoboa] DNSBL issue(s) for domain {}"
 msgstr ""
 
-#: admin/management/commands/subcommands/_mx.py:180
+#: management/commands/subcommands/_mx.py:180
 msgid "Domain {} has no MX record"
 msgstr ""
 
-#: admin/management/commands/subcommands/_mx.py:191
+#: management/commands/subcommands/_mx.py:191
 #, python-brace-format
 msgid "MX record for domain {0} is invalid: {1}"
 msgstr ""
 
-#: admin/management/commands/subcommands/_mx.py:207
+#: management/commands/subcommands/_mx.py:207
 msgid "[modoboa] MX issue(s) for domain {}"
 msgstr ""
 
-#: admin/models/alias.py:31 admin/models/mailbox.py:80
+#: models/alias.py:31 models/mailbox.py:80
 msgid "address"
 msgstr "indirizzo"
 
-#: admin/models/alias.py:33
+#: models/alias.py:33
 msgid "The alias address."
 msgstr "Indirizzi Alias."
 
-#: admin/models/alias.py:38 admin/models/domain.py:46
-#: admin/models/domain_alias.py:44
+#: models/alias.py:38 models/domain.py:47 models/domain_alias.py:44
 msgid "enabled"
 msgstr "Attivato"
 
-#: admin/models/alias.py:39 admin/models/domain_alias.py:45
+#: models/alias.py:39 models/domain_alias.py:45
 msgid "Check to activate this alias"
 msgstr "Seleziona per attivare questo alias"
 
-#: admin/models/alias.py:44 admin/templates/admin/alias_detail.html.py:32
+#: models/alias.py:44 templates/admin/alias_detail.html:32
 msgid "Description"
 msgstr ""
 
-#: admin/models/alias.py:46 admin/templates/admin/alias_detail.html.py:29
+#: models/alias.py:46 templates/admin/alias_detail.html:29
 msgid "Expire at"
 msgstr ""
 
-#: admin/models/alias.py:89
+#: models/alias.py:89
 msgid "alias"
 msgstr "alias"
 
-#: admin/models/alias.py:121
+#: models/alias.py:121
 msgid "Invalid address"
 msgstr "Indirizzo non valido"
 
-#: admin/models/alias.py:142
+#: models/alias.py:142
 msgid "Local recipient {}@{} not found"
 msgstr "Destinatario locale  {}@{} non trovato"
 
-#: admin/models/alias.py:172
+#: models/alias.py:172
 #, python-format
 msgid "Invalid line: %s"
 msgstr "Riga non valida: %s"
 
-#: admin/models/alias.py:178
+#: models/alias.py:178
 #, python-format
 msgid "Domain '%s' does not exist"
 msgstr "Il dominio '%s' non esiste"
 
-#: admin/models/domain.py:42 admin/models/domain_alias.py:37
+#: models/domain.py:43 models/domain_alias.py:37
 msgid "name"
 msgstr "nome"
 
-#: admin/models/domain.py:43
+#: models/domain.py:44
 msgid "The domain name"
 msgstr "Il nome del dominio"
 
-#: admin/models/domain.py:47
+#: models/domain.py:48
 msgid "Check to activate this domain"
 msgstr "Seleziona per attivare questo dominio"
 
-#: admin/models/domain.py:208 admin/models/domain_alias.py:71
+#: models/domain.py:215 models/domain_alias.py:71
 msgid "Invalid line"
 msgstr "Riga non valida"
 
-#: admin/models/domain.py:216
+#: models/domain.py:223
 #, python-format
 msgid "Invalid quota value for domain '%s'"
 msgstr "Valore della quota non valido per il dominio '%s'"
 
-#: admin/models/domain_alias.py:38
+#: models/domain_alias.py:38
 msgid "The alias name"
 msgstr "Il nome dell'alias"
 
-#: admin/models/domain_alias.py:40
+#: models/domain_alias.py:40
 msgid "target"
 msgstr "destinazione"
 
-#: admin/models/domain_alias.py:41
+#: models/domain_alias.py:41
 msgid "The domain this alias points to"
 msgstr "Il dominio a cui punta questo alias"
 
-#: admin/models/domain_alias.py:80
+#: models/domain_alias.py:80
 #, python-format
 msgid "Unknown domain %s"
 msgstr "Dominio sconosciuto %s"
 
-#: admin/models/mailbox.py:82
+#: models/mailbox.py:82
 msgid "Mailbox address (without the @domain.tld part)"
 msgstr "Indirizzo della casella di posta (senza la parte @dominio.org)"
 
-#: admin/models/mailbox.py:148
+#: models/mailbox.py:148
 #, python-format
 msgid "Failed to retrieve mailbox location (%s)"
 msgstr "Impossibile recuperare la posizione della casella di posta (%s)"
 
-#: admin/models/mailbox.py:238
+#: models/mailbox.py:238
 #, python-format
 msgid "Quota is greater than the allowed domain's limit (%dM)"
 msgstr "La quota è maggiore del limite stabilito per il dominio (%dM)"
 
-#: admin/models/mailbox.py:244
+#: models/mailbox.py:244
 msgid "A quota is required"
 msgstr "È richiesta una quota"
 
-#: admin/serializers.py:45 admin/serializers.py:228 admin/serializers.py:317
+#: serializers.py:45 serializers.py:228 serializers.py:317
 #, fuzzy
 #| msgid "Permissions"
 msgid "Permission denied."
 msgstr "Permessi"
 
-#: admin/serializers.py:83
+#: serializers.py:83
 msgid ""
 "List of administered domains (resellers and domain administrators only)."
 msgstr ""
 
-#: admin/serializers.py:193
+#: serializers.py:193
 msgid "Not allowed for this role."
 msgstr ""
 
-#: admin/serializers.py:203
+#: serializers.py:203
 msgid "Must be equal to mailbox full_address"
 msgstr ""
 
-#: admin/serializers.py:215
+#: serializers.py:215
 #, fuzzy
 #| msgid "Domain does not exist"
 msgid "Local domain {} does not exist"
 msgstr "Il dominio non esiste"
 
-#: admin/serializers.py:315
+#: serializers.py:315
 #, fuzzy
 #| msgid "Domain modified"
 msgid "Domain not found."
 msgstr "Dominio modificato"
 
-#: admin/templates/admin/account_detail.html:16
-#: admin/templates/admin/alias_detail.html:16
-#: admin/templates/admin/domain_detail.html:15
-#: admin/templates/admin/identities_table.html:7
+#: templates/admin/account_detail.html:16 templates/admin/alias_detail.html:16
+#: templates/admin/domain_detail.html:15
+#: templates/admin/identities_table.html:7
 #, fuzzy
 #| msgid "disabled"
 msgid "(disabled)"
 msgstr "Disabilitato"
 
-#: admin/templates/admin/account_detail.html:22
-#: admin/templates/admin/alias_detail.html:22
-#: admin/templates/admin/domain_detail.html:21
+#: templates/admin/account_detail.html:22 templates/admin/alias_detail.html:22
+#: templates/admin/domain_detail.html:21
 msgid "Summary"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:26
+#: templates/admin/account_detail.html:26
 #, fuzzy
 #| msgid "File name"
 msgid "Full name"
 msgstr "Nome del file"
 
-#: admin/templates/admin/account_detail.html:32
-#: admin/templates/admin/alias_detail.html:26
+#: templates/admin/account_detail.html:32 templates/admin/alias_detail.html:26
 #, fuzzy
 #| msgid "Create"
 msgid "Created"
 msgstr "Crea"
 
-#: admin/templates/admin/account_detail.html:35
+#: templates/admin/account_detail.html:35
 msgid "Last login"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:38
+#: templates/admin/account_detail.html:38
 msgid "Secondary email"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:38
-#: admin/templates/admin/account_detail.html:41
+#: templates/admin/account_detail.html:38
+#: templates/admin/account_detail.html:41
 #, fuzzy
 #| msgid "No recipient defined"
 msgid "Not defined"
 msgstr "Non è stato definito un destinatario"
 
-#: admin/templates/admin/account_detail.html:41
+#: templates/admin/account_detail.html:41
 msgid "Phone number"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:55
+#: templates/admin/account_detail.html:55
 #, fuzzy
 #| msgid "Administration"
 msgid "Administered domains"
 msgstr "Amministrazione"
 
-#: admin/templates/admin/account_detail.html:61
+#: templates/admin/account_detail.html:61
 #, fuzzy
 #| msgid "No recipient defined"
 msgid "No domain defined."
 msgstr "Non è stato definito un destinatario"
 
-#: admin/templates/admin/account_detail.html:75
+#: templates/admin/account_detail.html:75
 #, fuzzy
 #| msgid "Alias(es)"
 msgid "Aliases"
 msgstr "Alias"
 
-#: admin/templates/admin/account_detail.html:81
+#: templates/admin/account_detail.html:81
 #, fuzzy
 #| msgid "No recipient defined"
 msgid "No alias defined"
 msgstr "Non è stato definito un destinatario"
 
-#: admin/templates/admin/account_detail.html:87
+#: templates/admin/account_detail.html:87
 msgid "Additional sender addresses"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:93
+#: templates/admin/account_detail.html:93
 msgid "No sender address defined"
 msgstr ""
 
-#: admin/templates/admin/account_general_form.html:11
-#: admin/templates/admin/aliasform.html:13
+#: templates/admin/account_general_form.html:11
+#: templates/admin/aliasform.html:13
 msgid "Domain is disabled"
 msgstr "il Dominio è disabilitato"
 
-#: admin/templates/admin/alias_detail.html:16
-#: admin/templates/admin/identities.html:33
+#: templates/admin/alias_detail.html:16 templates/admin/identities.html:33
 #, fuzzy
 #| msgid "alias"
 msgid "Alias"
 msgstr "alias"
 
-#: admin/templates/admin/alias_detail.html:27
+#: templates/admin/alias_detail.html:27
 #, fuzzy
 #| msgid "Alias modified"
 msgid "Modified"
 msgstr "Alias modificato"
 
-#: admin/templates/admin/dnsbl_domain_detail.html:10
+#: templates/admin/dnsbl_domain_detail.html:10
 msgid "Provider"
 msgstr ""
 
-#: admin/templates/admin/dnsbl_domain_detail.html:11
-#: admin/templates/admin/mx_domain_detail.html:10
-#: admin/templates/admin/quota_headers.html:2
+#: templates/admin/dnsbl_domain_detail.html:11
+#: templates/admin/mx_domain_detail.html:10
+#: templates/admin/quota_headers.html:2
 msgid "Address"
 msgstr "Indirizzo"
 
-#: admin/templates/admin/dnsbl_domain_detail.html:12
+#: templates/admin/dnsbl_domain_detail.html:12
 #, fuzzy
 #| msgid "Statistics"
 msgid "Status"
 msgstr "Statistiche"
 
-#: admin/templates/admin/dnsbl_domain_detail.html:21
+#: templates/admin/dnsbl_domain_detail.html:21
 msgid "listed"
 msgstr ""
 
-#: admin/templates/admin/dnsbl_domain_detail.html:29
+#: templates/admin/dnsbl_domain_detail.html:29
 msgid "Everything is fine, this domain is not listed."
 msgstr ""
 
-#: admin/templates/admin/dnsbl_domain_detail.html:32
+#: templates/admin/dnsbl_domain_detail.html:32
 msgid "No information available for this domain."
 msgstr ""
 
-#: admin/templates/admin/domain_detail.html:26
-#: admin/templates/admin/domains.html:38
+#: templates/admin/domain_detail.html:26 templates/admin/domains.html:38
 #, fuzzy
 #| msgid "Statistics"
 msgid "DNS status"
 msgstr "Statistiche"
 
-#: admin/templates/admin/domain_detail.html:28
-#: admin/templates/admin/domains_table.html:12
+#: templates/admin/domain_detail.html:28 templates/admin/domains_table.html:14
 msgid "Awaiting checks"
 msgstr ""
 
-#: admin/templates/admin/domain_detail.html:40
+#: templates/admin/domain_detail.html:40
 msgid "Creation date"
 msgstr "Data di creazione"
 
-#: admin/templates/admin/domain_detail.html:42
+#: templates/admin/domain_detail.html:42
 msgid "Last modification date"
 msgstr "Data dell'ultima modifica"
 
-#: admin/templates/admin/domain_detail.html:43
-#: admin/templates/admin/domain_detail.html:52
-#: admin/templates/admin/domain_statistics.html:33
+#: templates/admin/domain_detail.html:43 templates/admin/domain_detail.html:52
+#: templates/admin/domain_statistics.html:33
 msgid "Domain aliases"
 msgstr "Alias del dominio"
 
-#: admin/templates/admin/domain_detail.html:45
+#: templates/admin/domain_detail.html:45
 msgid "Mailbox aliases"
 msgstr "Alias delle caselle di posta"
 
-#: admin/templates/admin/domain_detail.html:69
+#: templates/admin/domain_detail.html:69
 msgid "Administrators"
 msgstr "Amministratori"
 
-#: admin/templates/admin/domain_detail.html:79
-#: admin/templatetags/admin_tags.py:259
+#: templates/admin/domain_detail.html:79 templatetags/admin_tags.py:259
 msgid "Remove this permission"
 msgstr "Rimuovi questo permesso"
 
-#: admin/templates/admin/domain_detail.html:84
+#: templates/admin/domain_detail.html:84
 #, fuzzy
 #| msgid "No domain administrator defined"
 msgid "No domain administrator defined yet."
 msgstr "Non è stato definito alcun amministratore di dominio"
 
-#: admin/templates/admin/domain_general_form.html:4
-#: admin/templates/admin/mailform.html:4
-#: admin/templates/admin/newdomainform.html:3
+#: templates/admin/domain_general_form.html:4 templates/admin/mailform.html:4
+#: templates/admin/newdomainform.html:3
 msgid "MB"
 msgstr "MB"
 
-#: admin/templates/admin/domain_options_form.html:7
+#: templates/admin/domain_options_form.html:7
 msgid "You can't create a new domain administrator"
 msgstr "Non ti è possibile creare un amministratore di dominio"
 
-#: admin/templates/admin/domain_statistics.html:15
-#: admin/templatetags/admin_tags.py:44
+#: templates/admin/domain_statistics.html:15 templatetags/admin_tags.py:44
 msgid "Statistics"
 msgstr "Statistiche"
 
-#: admin/templates/admin/domain_statistics.html:15
+#: templates/admin/domain_statistics.html:15
 msgid "Domains and identities"
 msgstr "Domini e identità"
 
-#: admin/templates/admin/domain_statistics.html:22
+#: templates/admin/domain_statistics.html:22
 msgid "Global counters"
 msgstr "Contatori globali"
 
-#: admin/templates/admin/domain_statistics.html:27
+#: templates/admin/domain_statistics.html:27
 msgid "Quantity"
 msgstr "Quantità"
 
-#: admin/templates/admin/domain_statistics.html:45
+#: templates/admin/domain_statistics.html:45
 msgid "Per-domain counters"
 msgstr "Contatore per dominio"
 
-#: admin/templates/admin/domains.html:26
-#: admin/templates/admin/identities.html:29
+#: templates/admin/domains.html:26 templates/admin/identities.html:29
 #, fuzzy
 #| msgid "Address"
 msgid "Add"
 msgstr "Indirizzo"
 
-#: admin/templates/admin/domains.html:36
-#: admin/templates/admin/identity_headers.html:4
+#: templates/admin/domains.html:36 templates/admin/identity_headers.html:4
 msgid "Tags"
 msgstr "Tag"
 
-#: admin/templates/admin/domains.html:40
-#: admin/templates/admin/identity_headers.html:5
+#: templates/admin/domains.html:40 templates/admin/identity_headers.html:5
 msgid "Actions"
 msgstr "Azioni"
 
-#: admin/templates/admin/domains_table.html:5
+#: templates/admin/domains_table.html:5
 msgid "disabled"
 msgstr "Disabilitato"
 
-#: admin/templates/admin/forward.html:2
+#: templates/admin/domains_table.html:12
+#, fuzzy
+#| msgid "disabled"
+msgctxt "checks"
+msgid "Disabled"
+msgstr "Disabilitato"
+
+#: templates/admin/forward.html:2
 msgid "Automatically forward emails to another address"
 msgstr "Inoltra automaticamente le e-mail ad un altro indirizzo"
 
-#: admin/templates/admin/forward.html:9 admin/views/alias.py:91
+#: templates/admin/forward.html:9 views/alias.py:91
 msgid "Update"
 msgstr "Aggiorna"
 
-#: admin/templates/admin/identities.html:32
+#: templates/admin/identities.html:32
 #, fuzzy
 #| msgid "Add account"
 msgid "Account"
 msgstr "Aggiungi account"
 
-#: admin/templates/admin/identity_headers.html:3
+#: templates/admin/identity_headers.html:3
 msgid "Fullname/Recipient"
 msgstr "Nome completo/Destinatario"
 
-#: admin/templates/admin/import_domains_form.html:6
+#: templates/admin/import_domains_form.html:6
 #, fuzzy
 #| msgid ""
 #| "Provide a CSV file where lines respect one of the following formats:\n"
@@ -930,7 +916,7 @@ msgstr ""
 "\n"
 "<p>Come separatore puoi utilizzare un carattere diverso.</p>\n"
 
-#: admin/templates/admin/import_identities_form.html:6
+#: templates/admin/import_identities_form.html:6
 #, fuzzy
 #| msgid ""
 #| "Provide a CSV file where lines respect one of the following formats:\n"
@@ -967,138 +953,138 @@ msgstr ""
 "\n"
 "<p>Come separatore puoi utilizzare un carattere diverso.</p>\n"
 
-#: admin/templates/admin/importform.html:6
+#: templates/admin/importform.html:6
 msgid "Help"
 msgstr "Aiuto"
 
-#: admin/templates/admin/importform.html:13
+#: templates/admin/importform.html:13
 msgid "Importing..."
 msgstr "Importazione..."
 
-#: admin/templates/admin/mailboxes_raw.html:3
+#: templates/admin/mailboxes_raw.html:3
 msgid "Choose a value"
 msgstr "Scegli un valore"
 
-#: admin/templates/admin/mailform.html:4
+#: templates/admin/mailform.html:4
 msgid "Use domain default value"
 msgstr "Usa il valore predefinito"
 
-#: admin/templates/admin/mx_domain_detail.html:11
+#: templates/admin/mx_domain_detail.html:11
 #, fuzzy
 #| msgid "Update"
 msgid "Updated"
 msgstr "Aggiorna"
 
-#: admin/templates/admin/mx_domain_detail.html:23
+#: templates/admin/mx_domain_detail.html:23
 msgid "This IP does not match any of the valid MXs defined in parameters"
 msgstr ""
 
-#: admin/templates/admin/mx_domain_detail.html:36
+#: templates/admin/mx_domain_detail.html:36
 msgid "No MX record found for this domain."
 msgstr ""
 
-#: admin/templates/admin/notifications/domain_in_dnsbl.html:3
+#: templates/admin/notifications/domain_in_dnsbl.html:3
 #, python-format
 msgid ""
 "Modoboa detected that domain %(domain)s is listed by the following DNSBL "
 "providers:"
 msgstr ""
 
-#: admin/templates/admin/notifications/domain_in_dnsbl.html:11
+#: templates/admin/notifications/domain_in_dnsbl.html:11
 msgid ""
 "The domain's reputation will be affected and there is a chance that emails "
 "coming from it are considered as spam. You should contact those providers "
 "and ask them to unlist detected IP address(es)."
 msgstr ""
 
-#: admin/templates/admin/notifications/domain_invalid_mx.html:3
+#: templates/admin/notifications/domain_invalid_mx.html:3
 #, python-format
 msgid "Modoboa detected that domain %(domain)s has no valid MX record:"
 msgstr ""
 
-#: admin/templates/admin/quota_headers.html:3
+#: templates/admin/quota_headers.html:3
 msgid "Value"
 msgstr "Valore"
 
-#: admin/templates/admin/quota_headers.html:4
+#: templates/admin/quota_headers.html:4
 msgid "Limit"
 msgstr "Limite"
 
-#: admin/templates/admin/quota_headers.html:5
+#: templates/admin/quota_headers.html:5
 #, python-format
 msgid "Usage (%%)"
 msgstr "Utilizzo (%%)"
 
-#: admin/templates/admin/searchform.html:6
+#: templates/admin/searchform.html:6
 msgid "Search"
 msgstr "Ricerca"
 
-#: admin/templatetags/admin_tags.py:18
+#: templatetags/admin_tags.py:18
 msgid "enabled_m"
 msgstr "Abilitato"
 
-#: admin/templatetags/admin_tags.py:18
+#: templatetags/admin_tags.py:18
 msgid "enabled_f"
 msgstr "Abilitata"
 
-#: admin/templatetags/admin_tags.py:39
+#: templatetags/admin_tags.py:39
 msgid "List domains"
 msgstr "Lista domini"
 
-#: admin/templatetags/admin_tags.py:56 admin/templatetags/admin_tags.py:104
-#: admin/views/import_.py:87 admin/views/import_.py:109
+#: templatetags/admin_tags.py:56 templatetags/admin_tags.py:104
+#: views/import_.py:87 views/import_.py:109
 msgid "Import"
 msgstr "Importa"
 
-#: admin/templatetags/admin_tags.py:62 admin/templatetags/admin_tags.py:110
-#: admin/views/export.py:41 admin/views/export.py:69
+#: templatetags/admin_tags.py:62 templatetags/admin_tags.py:110
+#: views/export.py:41 views/export.py:69
 msgid "Export"
 msgstr "Esporta"
 
-#: admin/templatetags/admin_tags.py:94
+#: templatetags/admin_tags.py:94
 msgid "List identities"
 msgstr "Elenco identità"
 
-#: admin/templatetags/admin_tags.py:99
+#: templatetags/admin_tags.py:99
 msgid "List quotas"
 msgstr "Elenco quote"
 
-#: admin/templatetags/admin_tags.py:129
+#: templatetags/admin_tags.py:129
 msgid "View the domain's identities"
 msgstr "Visualizza le identita del dominio"
 
-#: admin/templatetags/admin_tags.py:135 admin/templatetags/admin_tags.py:178
-#: admin/templatetags/admin_tags.py:191
+#: templatetags/admin_tags.py:135 templatetags/admin_tags.py:178
+#: templatetags/admin_tags.py:191
 msgid "Edit {}"
 msgstr ""
 
-#: admin/templatetags/admin_tags.py:145 admin/templatetags/admin_tags.py:182
-#: admin/templatetags/admin_tags.py:196
+#: templatetags/admin_tags.py:145 templatetags/admin_tags.py:182
+#: templatetags/admin_tags.py:196
 #, python-format
 msgid "Delete %s?"
 msgstr "Eliminare %s?"
 
-#: admin/views/alias.py:33
+#: views/alias.py:33
 msgid "Alias with this name already exists"
 msgstr "Un alias con questo nome esiste già"
 
-#: admin/views/alias.py:58
+#: views/alias.py:58
 msgid "Create"
 msgstr "Crea"
 
-#: admin/views/alias.py:70
+#: views/alias.py:70
 msgid "New alias"
 msgstr "Nuovo alias"
 
-#: admin/views/alias.py:71
+#: views/alias.py:71
 msgid "Alias created"
 msgstr "Alias creato"
 
-#: admin/views/alias.py:83
+#: views/alias.py:83
 msgid "Alias modified"
 msgstr "Alias modificato"
 
-#: admin/views/alias.py:107
+#: views/alias.py:107
 #, fuzzy
 #| msgid "Alias created"
 msgid "Alias deleted"
@@ -1106,62 +1092,61 @@ msgid_plural "Aliases deleted"
 msgstr[0] "Alias creato"
 msgstr[1] "Alias creato"
 
-#: admin/views/dns.py:30
+#: views/dns.py:30
 msgid "MX records of {}"
 msgstr ""
 
-#: admin/views/dns.py:53
+#: views/dns.py:53
 msgid "DNSBL summary for {}"
 msgstr ""
 
-#: admin/views/domain.py:152
+#: views/domain.py:152
 msgid "You can't delete your own domain"
 msgstr "Non puoi cancellare il tuo dominio"
 
-#: admin/views/domain.py:155
+#: views/domain.py:155
 msgid "Domain deleted"
 msgid_plural "Domains deleted"
 msgstr[0] "Dominio cancellato"
 msgstr[1] "Domini cancellati"
 
-#: admin/views/export.py:40
+#: views/export.py:40
 msgid "Export identities"
 msgstr "Identità di esportazione"
 
-#: admin/views/export.py:68
+#: views/export.py:68
 msgid "Export domains"
 msgstr "Esporta domini"
 
-#: admin/views/identity.py:111 admin/views/identity.py:205
-#: admin/views/identity.py:210
+#: views/identity.py:111 views/identity.py:205 views/identity.py:210
 msgid "Invalid request"
 msgstr "Richiesta non valida"
 
-#: admin/views/identity.py:195
+#: views/identity.py:195
 msgid "Account deleted"
 msgid_plural "Accounts deleted"
 msgstr[0] "Account cancellato"
 msgstr[1] "Account cancellati"
 
-#: admin/views/import_.py:63
+#: views/import_.py:63
 #, python-format
 msgid "Object already exists: %s"
 msgstr "L'oggetto esiste già: %s"
 
-#: admin/views/import_.py:67
+#: views/import_.py:67
 #, python-format
 msgid "%d objects imported successfully"
 msgstr "%d oggetti importati correttamente"
 
-#: admin/views/import_.py:86
+#: views/import_.py:86
 msgid "Import domains"
 msgstr "Importa domini"
 
-#: admin/views/import_.py:108
+#: views/import_.py:108
 msgid "Import identities"
 msgstr "Identità di importazione"
 
-#: admin/views/user.py:35
+#: views/user.py:35
 msgid "Forward updated"
 msgstr "Inoltro aggiornato"
 
diff --git a/modoboa/admin/locale/ja_JP/LC_MESSAGES/django.po b/modoboa/admin/locale/ja_JP/LC_MESSAGES/django.po
index fc8d0db84..737af971f 100644
--- a/modoboa/admin/locale/ja_JP/LC_MESSAGES/django.po
+++ b/modoboa/admin/locale/ja_JP/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Modoboa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-14 14:13+0100\n"
+"POT-Creation-Date: 2017-01-16 13:02+0100\n"
 "PO-Revision-Date: 2016-09-14 17:06+0000\n"
 "Last-Translator: Antoine Nguyen <tonio@ngyn.org>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/tonio/modoboa/"
@@ -19,47 +19,46 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/app_settings.py:17 admin/handlers.py:245
-#: admin/templates/admin/domain_statistics.html:30
-#: admin/templates/admin/domains.html:4
+#: app_settings.py:17 handlers.py:252
+#: templates/admin/domain_statistics.html:30 templates/admin/domains.html:4
 msgid "Domains"
 msgstr "ドメイン"
 
-#: admin/app_settings.py:20
+#: app_settings.py:20
 msgid "Enable MX checks"
 msgstr ""
 
-#: admin/app_settings.py:23
+#: app_settings.py:23
 msgid "Check that every domain has a valid MX record"
 msgstr ""
 
-#: admin/app_settings.py:28
+#: app_settings.py:28
 msgid "Valid MXs"
 msgstr ""
 
-#: admin/app_settings.py:31
+#: app_settings.py:31
 msgid ""
-"IP(s) or network(s) of the MX that should match with domains' MX records. On "
-"per line."
+"A list of IP or network address every MX record should match. A warning will "
+"be sent if a record does not respect it."
 msgstr ""
 
-#: admin/app_settings.py:40
+#: app_settings.py:39
 msgid "Enable DNSBL checks"
 msgstr "DNSBL チェックを有効にする"
 
-#: admin/app_settings.py:43
+#: app_settings.py:42
 msgid "Check every domain against major DNSBL providers"
 msgstr "すべてのドメインを 主な DNSBL プロバイダーでチェックする"
 
-#: admin/app_settings.py:47 admin/templates/admin/domain_detail.html.py:44
+#: app_settings.py:46 templates/admin/domain_detail.html:44
 msgid "Mailboxes"
 msgstr "メールボックス"
 
-#: admin/app_settings.py:50
+#: app_settings.py:49
 msgid "Handle mailboxes on filesystem"
 msgstr "ファイルシステムのメールボックスを操作する"
 
-#: admin/app_settings.py:53
+#: app_settings.py:52
 msgid ""
 "Rename or remove mailboxes on the filesystem when they get renamed or "
 "removed within Modoboa"
@@ -67,19 +66,19 @@ msgstr ""
 "Modoboa で、メールボックスの名前の変更もしくは、削除したとき、ファイルシステ"
 "ム上のメールボックスも、名前の変更もしくは削除する。"
 
-#: admin/app_settings.py:59
+#: app_settings.py:58
 msgid "Mailboxes owner"
 msgstr "メールボックス所有者"
 
-#: admin/app_settings.py:62
+#: app_settings.py:61
 msgid "The UNIX account who owns mailboxes on the filesystem"
 msgstr "ファイルシステム上のメールボックスを所有するUNIXアカウント"
 
-#: admin/app_settings.py:67
+#: app_settings.py:66
 msgid "Default domain quota"
 msgstr "デフォルトドメインクォータ"
 
-#: admin/app_settings.py:70
+#: app_settings.py:69
 msgid ""
 "Default quota (in MB) applied to freshly created domains with no value "
 "specified. A value of 0 means no quota."
@@ -88,37 +87,36 @@ msgstr ""
 "用されます。\n"
 "値が0の場合は、クォータ制限はありません。"
 
-#: admin/app_settings.py:76
+#: app_settings.py:75
 msgid "Automatic account removal"
 msgstr "アカウントの自動削除"
 
-#: admin/app_settings.py:79
+#: app_settings.py:78
 msgid "When a mailbox is removed, also remove the associated account"
 msgstr "メールボックスが削除されたとき、関連するアカウントも削除します"
 
-#: admin/app_settings.py:83
+#: app_settings.py:82
 msgid "Automatic domain/mailbox creation"
 msgstr "ドメインとメールボックスを自動作成"
 
-#: admin/app_settings.py:86
+#: app_settings.py:85
 msgid "Create a domain and a mailbox when an account is automatically created."
 msgstr ""
 "アカウントが自動的に作成されたとき、ドメインとメールボックを作成します。"
 
-#: admin/app_settings.py:133 admin/forms/account.py:288
-#: admin/forms/domain.py:87
+#: app_settings.py:132 forms/account.py:288 forms/domain.py:87
 msgid "Must be a positive integer"
 msgstr "正の整数でなければいけません"
 
-#: admin/app_settings.py:143
+#: app_settings.py:142
 msgid "Administration"
 msgstr "管理"
 
-#: admin/forms/account.py:34 admin/templates/admin/domain_detail.html.py:72
+#: forms/account.py:34 templates/admin/domain_detail.html:72
 msgid "Username"
 msgstr "ユーザー名"
 
-#: admin/forms/account.py:36
+#: forms/account.py:36
 msgid ""
 "The user's name. Must be a valid e-mail address for simple users or "
 "administrators with a mailbox."
@@ -127,56 +125,56 @@ msgstr ""
 "メールボックスを持つユーザーもしくは管理者の有効な電子メールアドレスでなけれ"
 "ばなりません。"
 
-#: admin/forms/account.py:41 admin/templates/admin/account_detail.html.py:29
+#: forms/account.py:41 templates/admin/account_detail.html:29
 msgid "Role"
 msgstr "ロール"
 
-#: admin/forms/account.py:42
+#: forms/account.py:42
 msgid "Choose"
 msgstr "選ぶ"
 
-#: admin/forms/account.py:43
+#: forms/account.py:43
 msgid "What level of permission this user will have"
 msgstr "このユーザーは、アクセス許可のレベルを持つことになります"
 
-#: admin/forms/account.py:46
+#: forms/account.py:46
 msgid "Password"
 msgstr "パスワード"
 
-#: admin/forms/account.py:50
+#: forms/account.py:50
 msgid "Confirmation"
 msgstr "確認"
 
-#: admin/forms/account.py:53
+#: forms/account.py:53
 msgid "Enter the same password as above, for verification."
 msgstr "確認のため、上記と同じパスワードを入力します。"
 
-#: admin/forms/account.py:64
+#: forms/account.py:64
 msgid "Enabled"
 msgstr "有効化"
 
-#: admin/forms/account.py:156
+#: forms/account.py:156
 msgid "The two password fields didn't match."
 msgstr "2つのパスワード項目が一致しません"
 
-#: admin/forms/account.py:171
+#: forms/account.py:171
 msgid "Only super administrators are allowed for this mode"
 msgstr "スーパー管理者だけが、このモードのために許可されています。"
 
-#: admin/forms/account.py:179
+#: forms/account.py:179
 msgid "You can't disable your own account"
 msgstr "あなた自身のアカウントは無効化できません"
 
-#: admin/forms/account.py:194
+#: forms/account.py:194
 msgid "E-mail"
 msgstr "電子メール"
 
-#: admin/forms/account.py:196 admin/forms/domain.py:38
-#: admin/templates/admin/account_detail.html:45
+#: forms/account.py:196 forms/domain.py:38
+#: templates/admin/account_detail.html:45
 msgid "Quota"
 msgstr "クォータ"
 
-#: admin/forms/account.py:198
+#: forms/account.py:198
 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 "
@@ -187,12 +185,11 @@ msgstr ""
 "無制限の値を定義する場合は空白のままにします\n"
 "（ドメイン管理者には許可されていません）"
 
-#: admin/forms/account.py:206 admin/forms/domain.py:46
-#: admin/templates/admin/domains.html:35
+#: forms/account.py:206 forms/domain.py:46 templates/admin/domains.html:35
 msgid "Alias(es)"
 msgstr "エイリアス"
 
-#: admin/forms/account.py:209
+#: forms/account.py:209
 #, fuzzy
 #| msgid ""
 #| "Alias(es) of this mailbox. Indicate only one address per input, press "
@@ -209,70 +206,69 @@ msgstr ""
 " 「キャッチオール」エイリアスを作成するには、 ' * '文字を使用してください  "
 "(例: *@domain.tld)"
 
-#: admin/forms/account.py:215
+#: forms/account.py:215
 msgid "Sender addresses"
 msgstr ""
 
-#: admin/forms/account.py:218
+#: forms/account.py:218
 msgid ""
 "Additional sender address(es) for this account. The user will be allowed to "
 "send emails using this address, even if it does not exist locally. Indicate "
 "one address per input. Press ENTER to add a new input."
 msgstr ""
 
-#: admin/forms/account.py:267 admin/forms/alias.py:92
-#: admin/models/mailbox.py:295
+#: forms/account.py:267 forms/alias.py:92 models/mailbox.py:295
 msgid "Domain does not exist"
 msgstr "ドメインは存在しません"
 
-#: admin/forms/account.py:297
+#: forms/account.py:297
 msgid "Local domain does not exist"
 msgstr "ローカルドメインは存在しません"
 
-#: admin/forms/account.py:392
+#: forms/account.py:392
 msgid "Domain(s)"
 msgstr "ドメイン"
 
-#: admin/forms/account.py:394
+#: forms/account.py:394
 msgid "Domain(s) that user administrates"
 msgstr "ユーザーに管理されたドメイン"
 
-#: admin/forms/account.py:440 admin/forms/account.py:525
-#: admin/forms/domain.py:283 admin/forms/domain.py:350
+#: forms/account.py:440 forms/account.py:525 forms/domain.py:283
+#: forms/domain.py:350
 msgid "General"
 msgstr "全般"
 
-#: admin/forms/account.py:445 admin/forms/account.py:531
+#: forms/account.py:445 forms/account.py:531
 msgid "Mail"
 msgstr "メール"
 
-#: admin/forms/account.py:447
+#: forms/account.py:447
 msgid "Permissions"
 msgstr "アクセス許可"
 
-#: admin/forms/account.py:514
+#: forms/account.py:514
 msgid "Account updated"
 msgstr "アカウントを更新しました"
 
-#: admin/forms/account.py:538
+#: forms/account.py:538
 msgid "New account"
 msgstr "新しいアカウト"
 
-#: admin/forms/account.py:550
+#: forms/account.py:550
 msgid "Account created"
 msgstr "アカウントを作成しました"
 
-#: admin/forms/alias.py:24
+#: forms/alias.py:24
 #, fuzzy
 #| msgid "Invalid address"
 msgid "Random address"
 msgstr "不正なアドレス"
 
-#: admin/forms/alias.py:27
+#: forms/alias.py:27
 msgid "Email address"
 msgstr "メールアドレス"
 
-#: admin/forms/alias.py:29
+#: forms/alias.py:29
 msgid ""
 "The alias address. To create a catchall alias, just enter the domain name "
 "(@domain.tld)."
@@ -281,11 +277,11 @@ msgstr ""
 "キャッチオールエイリアスを作成するためには、ドメイン名だけを入力します  "
 "(@domain.tld)"
 
-#: admin/forms/alias.py:35 admin/templates/admin/alias_detail.html.py:37
+#: forms/alias.py:35 templates/admin/alias_detail.html:37
 msgid "Recipients"
 msgstr "受信者"
 
-#: admin/forms/alias.py:37
+#: forms/alias.py:37
 msgid ""
 "Addresses this alias will point to. Indicate only one address per input, "
 "press ENTER to add a new input."
@@ -294,28 +290,28 @@ msgstr ""
 "input ごとに1つだけのアドレスを記入し、 ENTER キーを押して、新しい input を追"
 "加します"
 
-#: admin/forms/alias.py:47 admin/forms/domain.py:26 admin/models/domain.py:91
-#: admin/templates/admin/domain_statistics.html:49
+#: forms/alias.py:47 forms/domain.py:26 models/domain.py:92
+#: templates/admin/domain_statistics.html:49
 msgid "Domain"
 msgstr "ドメイン"
 
-#: admin/forms/alias.py:95
+#: forms/alias.py:95
 msgid "You don't have access to this domain"
 msgstr "このドメインにアクセスする権限がありません"
 
-#: admin/forms/alias.py:112 admin/forms/alias.py:114
+#: forms/alias.py:112 forms/alias.py:114
 msgid "This field is required"
 msgstr ""
 
-#: admin/forms/alias.py:118
+#: forms/alias.py:118
 msgid "No recipient defined"
 msgstr "受信者が定義されていません"
 
-#: admin/forms/domain.py:35 admin/templates/admin/domain_statistics.html.py:26
+#: forms/domain.py:35 templates/admin/domain_statistics.html:26
 msgid "Type"
 msgstr "タイプ"
 
-#: admin/forms/domain.py:41
+#: forms/domain.py:41
 msgid ""
 "Default quota in MB applied to mailboxes. Leave empty to use the default "
 "value."
@@ -323,7 +319,7 @@ msgstr ""
 "デフォルトクォータ (MB) は、メールボックスに適用されます。\n"
 "デフォルト値を使用する場合は空白のままにします。"
 
-#: admin/forms/domain.py:49
+#: forms/domain.py:49
 msgid ""
 "Alias(es) of this domain. Indicate only one name per input, press ENTER to "
 "add a new input."
@@ -332,36 +328,34 @@ msgstr ""
 "input ごとに1つの名前を入力して、 ENTER キーを押して、新しい input を追加しま"
 "す"
 
-#: admin/forms/domain.py:103 admin/handlers.py:148
+#: forms/domain.py:103 handlers.py:155
 msgid "domain alias"
 msgstr "ドメインエイリアス"
 
-#: admin/forms/domain.py:106 admin/forms/domain.py:118
-#: admin/forms/domain.py:126
+#: forms/domain.py:106 forms/domain.py:118 forms/domain.py:126
 #, python-format
 msgid "A %s with this name already exists"
 msgstr " %s という名前は、すでに存在しています"
 
-#: admin/forms/domain.py:118 admin/forms/domain.py:123
+#: forms/domain.py:118 forms/domain.py:123
 msgid "domain"
 msgstr "ドメイン"
 
-#: admin/forms/domain.py:171
+#: forms/domain.py:171
 msgid "Create a domain administrator"
 msgstr "ドメイン管理者を作成する"
 
-#: admin/forms/domain.py:174
+#: forms/domain.py:174
 msgid "Automatically create an administrator for this domain"
 msgstr "自動的にドメインの管理者を作成する"
 
-#: admin/forms/domain.py:179 admin/templates/admin/domain_detail.html.py:72
-#: admin/templates/admin/domains.html:34
-#: admin/templates/admin/identity_headers.html:2
-#: admin/templates/admin/mx_domain_detail.html:9
+#: forms/domain.py:179 templates/admin/domain_detail.html:72
+#: templates/admin/domains.html:34 templates/admin/identity_headers.html:2
+#: templates/admin/mx_domain_detail.html:9
 msgid "Name"
 msgstr "名前"
 
-#: admin/forms/domain.py:182
+#: forms/domain.py:182
 msgid ""
 "The administrator's name. Don't include the domain's name here, it will be "
 "automatically appended."
@@ -369,70 +363,70 @@ msgstr ""
 "管理者の名前\n"
 "ここでは、ドメイン名を含めないでください、それが自動的に付加されます。"
 
-#: admin/forms/domain.py:189
+#: forms/domain.py:189
 msgid "Create aliases"
 msgstr "エイリアスを作成"
 
-#: admin/forms/domain.py:192
+#: forms/domain.py:192
 msgid "Automatically create standard aliases for this domain"
 msgstr "自動的にドメインの標準的なエイリアスを作成する"
 
-#: admin/forms/domain.py:208
+#: forms/domain.py:208
 msgid "Invalid format"
 msgstr "不正なフォーマット"
 
-#: admin/forms/domain.py:217 admin/forms/domain.py:220
+#: forms/domain.py:217 forms/domain.py:220
 #, fuzzy
 #| msgid "A mailbox is required"
 msgid "This field is required."
 msgstr "メールボックスは必須です"
 
-#: admin/forms/domain.py:237
+#: forms/domain.py:237
 #, python-format
 msgid "User '%s' already exists"
 msgstr "ユーザー %s はすでに存在します"
 
-#: admin/forms/domain.py:339
+#: forms/domain.py:339
 msgid "Domain modified"
 msgstr "ドメインが修正されました"
 
-#: admin/forms/domain.py:360
+#: forms/domain.py:360
 msgid "Options"
 msgstr "オプション"
 
-#: admin/forms/domain.py:368
+#: forms/domain.py:368
 msgid "New domain"
 msgstr "新しいドメイン"
 
-#: admin/forms/domain.py:381
+#: forms/domain.py:381
 msgid "Domain created"
 msgstr "ドメインが作成されました"
 
-#: admin/forms/export.py:7
+#: forms/export.py:7
 msgid "File name"
 msgstr "ファイル名"
 
-#: admin/forms/export.py:13 admin/forms/import_.py:13
+#: forms/export.py:13 forms/import_.py:13
 msgid "Separator"
 msgstr "セパレーター"
 
-#: admin/forms/forward.py:14
+#: forms/forward.py:14
 msgid "Recipient(s)"
 msgstr "受信者"
 
-#: admin/forms/forward.py:18
+#: forms/forward.py:18
 msgid "Indicate one or more recipients separated by a ','"
 msgstr "\",\"で区切られた1つまたは複数の受信者を示します"
 
-#: admin/forms/forward.py:21
+#: forms/forward.py:21
 msgid "Keep local copies"
 msgstr "ローカルコピーを保持する"
 
-#: admin/forms/forward.py:24
+#: forms/forward.py:24
 msgid "Forward messages and store copies into your local mailbox"
 msgstr "メッセージを転送して、ローカルのメールボックスへコピーを格納します。"
 
-#: admin/forms/forward.py:42
+#: forms/forward.py:42
 msgid ""
 "You can't define a forward to a local destination. Please ask your "
 "administrator to create an alias instead."
@@ -440,422 +434,414 @@ msgstr ""
 "ローカルの宛先に転送先を定義することはできません。\n"
 "代わりにエイリアスを作成するには、管理者に依頼してください。"
 
-#: admin/forms/import_.py:11
+#: forms/import_.py:11
 msgid "Select a file"
 msgstr "ファイルを選択"
 
-#: admin/forms/import_.py:19
+#: forms/import_.py:19
 msgid "Continue on error"
 msgstr "エラーのときに続行する"
 
-#: admin/forms/import_.py:20
+#: forms/import_.py:20
 msgid "Don't treat duplicated objects as error"
 msgstr "重複したオブジェクトをエラーとして処理しない"
 
-#: admin/forms/import_.py:38
+#: forms/import_.py:38
 msgid "Crypt passwords"
 msgstr "パスワード暗号化"
 
-#: admin/forms/import_.py:40
+#: forms/import_.py:40
 msgid "Check this option if passwords contained in your file are not crypted"
 msgstr ""
 "ファイルに含まれるパスワードが暗号化されていない場合は、このオプションを"
 "チェックしてください"
 
-#: admin/handlers.py:194
+#: handlers.py:201
 #, python-format
 msgid "Account import failed (%s): domain does not exist"
 msgstr "アカウントのインポートに失敗しました  (%s):  ドメインが存在しません"
 
-#: admin/handlers.py:207 admin/models/mailbox.py:320
+#: handlers.py:214 models/mailbox.py:320
 msgid "Mailbox {} already exists"
 msgstr "メールボックス {} はすでに存在します"
 
-#: admin/handlers.py:215
+#: handlers.py:222
 #, python-format
 msgid "Account import failed (%s): wrong quota value"
 msgstr "アカウントのインポートに失敗しました  (%s):  不正なクォータの値"
 
-#: admin/handlers.py:255 admin/templates/admin/domain_statistics.html.py:36
-#: admin/templates/admin/domain_statistics.html:50
-#: admin/templates/admin/identities.html:5
+#: handlers.py:262 templates/admin/domain_statistics.html:36
+#: templates/admin/domain_statistics.html:50 templates/admin/identities.html:5
 msgid "Identities"
 msgstr "ID"
 
-#: admin/handlers.py:271 admin/templates/admin/forward.html.py:2
+#: handlers.py:278 templates/admin/forward.html:2
 msgid "Forward"
 msgstr "転送先"
 
-#: admin/lib.py:32
+#: lib.py:32
 msgid "A mailbox is required"
 msgstr "メールボックスは必須です"
 
-#: admin/lib.py:122
+#: lib.py:122
 msgid "You are not allowed to import domains"
 msgstr "ドメインのインポートは許可されていません"
 
-#: admin/lib.py:133
+#: lib.py:133
 msgid "You are not allowed to import domain aliases."
 msgstr "ドメインエイリアスのインポートは許可されていません"
 
-#: admin/management/commands/subcommands/_mx.py:159
+#: management/commands/subcommands/_mx.py:159
 msgid "[modoboa] DNSBL issue(s) for domain {}"
 msgstr "[modoboa] ドメイン {} の DNSBL結果"
 
-#: admin/management/commands/subcommands/_mx.py:180
+#: management/commands/subcommands/_mx.py:180
 msgid "Domain {} has no MX record"
 msgstr ""
 
-#: admin/management/commands/subcommands/_mx.py:191
+#: management/commands/subcommands/_mx.py:191
 #, python-brace-format
 msgid "MX record for domain {0} is invalid: {1}"
 msgstr ""
 
-#: admin/management/commands/subcommands/_mx.py:207
+#: management/commands/subcommands/_mx.py:207
 msgid "[modoboa] MX issue(s) for domain {}"
 msgstr ""
 
-#: admin/models/alias.py:31 admin/models/mailbox.py:80
+#: models/alias.py:31 models/mailbox.py:80
 msgid "address"
 msgstr "アドレス"
 
-#: admin/models/alias.py:33
+#: models/alias.py:33
 msgid "The alias address."
 msgstr "エイリアスアドレス"
 
-#: admin/models/alias.py:38 admin/models/domain.py:46
-#: admin/models/domain_alias.py:44
+#: models/alias.py:38 models/domain.py:47 models/domain_alias.py:44
 msgid "enabled"
 msgstr "有効"
 
-#: admin/models/alias.py:39 admin/models/domain_alias.py:45
+#: models/alias.py:39 models/domain_alias.py:45
 msgid "Check to activate this alias"
 msgstr "このエイリアスをアクティブにするために確認してください"
 
-#: admin/models/alias.py:44 admin/templates/admin/alias_detail.html.py:32
+#: models/alias.py:44 templates/admin/alias_detail.html:32
 msgid "Description"
 msgstr ""
 
-#: admin/models/alias.py:46 admin/templates/admin/alias_detail.html.py:29
+#: models/alias.py:46 templates/admin/alias_detail.html:29
 msgid "Expire at"
 msgstr ""
 
-#: admin/models/alias.py:89
+#: models/alias.py:89
 msgid "alias"
 msgstr "エイリアス"
 
-#: admin/models/alias.py:121
+#: models/alias.py:121
 msgid "Invalid address"
 msgstr "不正なアドレス"
 
-#: admin/models/alias.py:142
+#: models/alias.py:142
 msgid "Local recipient {}@{} not found"
 msgstr "ローカル受信者 {}@{} は見つかりません"
 
-#: admin/models/alias.py:172
+#: models/alias.py:172
 #, python-format
 msgid "Invalid line: %s"
 msgstr "不正な行: %s"
 
-#: admin/models/alias.py:178
+#: models/alias.py:178
 #, python-format
 msgid "Domain '%s' does not exist"
 msgstr "ドメイン %s は、存在しません"
 
-#: admin/models/domain.py:42 admin/models/domain_alias.py:37
+#: models/domain.py:43 models/domain_alias.py:37
 msgid "name"
 msgstr "名前"
 
-#: admin/models/domain.py:43
+#: models/domain.py:44
 msgid "The domain name"
 msgstr "ドメイン名"
 
-#: admin/models/domain.py:47
+#: models/domain.py:48
 msgid "Check to activate this domain"
 msgstr "このドメインをアクティブするために確認してください"
 
-#: admin/models/domain.py:208 admin/models/domain_alias.py:71
+#: models/domain.py:215 models/domain_alias.py:71
 msgid "Invalid line"
 msgstr "不正な行"
 
-#: admin/models/domain.py:216
+#: models/domain.py:223
 #, python-format
 msgid "Invalid quota value for domain '%s'"
 msgstr "不正なドメイン %s のクォータ値"
 
-#: admin/models/domain_alias.py:38
+#: models/domain_alias.py:38
 msgid "The alias name"
 msgstr "エイリアス名"
 
-#: admin/models/domain_alias.py:40
+#: models/domain_alias.py:40
 msgid "target"
 msgstr "ターゲット"
 
-#: admin/models/domain_alias.py:41
+#: models/domain_alias.py:41
 msgid "The domain this alias points to"
 msgstr "ドメインこのエイリアスポイントへ"
 
-#: admin/models/domain_alias.py:80
+#: models/domain_alias.py:80
 #, python-format
 msgid "Unknown domain %s"
 msgstr "不明なドメイン %s"
 
-#: admin/models/mailbox.py:82
+#: models/mailbox.py:82
 msgid "Mailbox address (without the @domain.tld part)"
 msgstr "メールボックスアドレス (@domain.tld 部分なし)"
 
-#: admin/models/mailbox.py:148
+#: models/mailbox.py:148
 #, python-format
 msgid "Failed to retrieve mailbox location (%s)"
 msgstr "メールボックスの場所の取得に失敗しました (%s)"
 
-#: admin/models/mailbox.py:238
+#: models/mailbox.py:238
 #, python-format
 msgid "Quota is greater than the allowed domain's limit (%dM)"
 msgstr "クォータが、ドメインに許可された制限  (%dM) より大きいです"
 
-#: admin/models/mailbox.py:244
+#: models/mailbox.py:244
 msgid "A quota is required"
 msgstr "クォータは必須です"
 
-#: admin/serializers.py:45 admin/serializers.py:228 admin/serializers.py:317
+#: serializers.py:45 serializers.py:228 serializers.py:317
 msgid "Permission denied."
 msgstr "アクセス拒否"
 
-#: admin/serializers.py:83
+#: serializers.py:83
 msgid ""
 "List of administered domains (resellers and domain administrators only)."
 msgstr "管理しているドメインのリスト (リセーラーとドメイン管理者のみ)"
 
-#: admin/serializers.py:193
+#: serializers.py:193
 msgid "Not allowed for this role."
 msgstr "このロールには許可されていません"
 
-#: admin/serializers.py:203
+#: serializers.py:203
 msgid "Must be equal to mailbox full_address"
 msgstr "メールボックス full_address に等しくなければなりません"
 
-#: admin/serializers.py:215
+#: serializers.py:215
 msgid "Local domain {} does not exist"
 msgstr "ローカルドメイン {}  は、存在しません"
 
-#: admin/serializers.py:315
+#: serializers.py:315
 msgid "Domain not found."
 msgstr "ドメインが見つかりません"
 
-#: admin/templates/admin/account_detail.html:16
-#: admin/templates/admin/alias_detail.html:16
-#: admin/templates/admin/domain_detail.html:15
-#: admin/templates/admin/identities_table.html:7
+#: templates/admin/account_detail.html:16 templates/admin/alias_detail.html:16
+#: templates/admin/domain_detail.html:15
+#: templates/admin/identities_table.html:7
 msgid "(disabled)"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:22
-#: admin/templates/admin/alias_detail.html:22
-#: admin/templates/admin/domain_detail.html:21
+#: templates/admin/account_detail.html:22 templates/admin/alias_detail.html:22
+#: templates/admin/domain_detail.html:21
 msgid "Summary"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:26
+#: templates/admin/account_detail.html:26
 msgid "Full name"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:32
-#: admin/templates/admin/alias_detail.html:26
+#: templates/admin/account_detail.html:32 templates/admin/alias_detail.html:26
 msgid "Created"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:35
+#: templates/admin/account_detail.html:35
 msgid "Last login"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:38
+#: templates/admin/account_detail.html:38
 msgid "Secondary email"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:38
-#: admin/templates/admin/account_detail.html:41
+#: templates/admin/account_detail.html:38
+#: templates/admin/account_detail.html:41
 msgid "Not defined"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:41
+#: templates/admin/account_detail.html:41
 msgid "Phone number"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:55
+#: templates/admin/account_detail.html:55
 msgid "Administered domains"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:61
+#: templates/admin/account_detail.html:61
 msgid "No domain defined."
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:75
+#: templates/admin/account_detail.html:75
 msgid "Aliases"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:81
+#: templates/admin/account_detail.html:81
 msgid "No alias defined"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:87
+#: templates/admin/account_detail.html:87
 msgid "Additional sender addresses"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:93
+#: templates/admin/account_detail.html:93
 msgid "No sender address defined"
 msgstr ""
 
-#: admin/templates/admin/account_general_form.html:11
-#: admin/templates/admin/aliasform.html:13
+#: templates/admin/account_general_form.html:11
+#: templates/admin/aliasform.html:13
 msgid "Domain is disabled"
 msgstr "ドメインが無効です"
 
-#: admin/templates/admin/alias_detail.html:16
-#: admin/templates/admin/identities.html:33
+#: templates/admin/alias_detail.html:16 templates/admin/identities.html:33
 msgid "Alias"
 msgstr ""
 
-#: admin/templates/admin/alias_detail.html:27
+#: templates/admin/alias_detail.html:27
 msgid "Modified"
 msgstr ""
 
-#: admin/templates/admin/dnsbl_domain_detail.html:10
+#: templates/admin/dnsbl_domain_detail.html:10
 msgid "Provider"
 msgstr "プロバイダー"
 
-#: admin/templates/admin/dnsbl_domain_detail.html:11
-#: admin/templates/admin/mx_domain_detail.html:10
-#: admin/templates/admin/quota_headers.html:2
+#: templates/admin/dnsbl_domain_detail.html:11
+#: templates/admin/mx_domain_detail.html:10
+#: templates/admin/quota_headers.html:2
 msgid "Address"
 msgstr "アドレス"
 
-#: admin/templates/admin/dnsbl_domain_detail.html:12
+#: templates/admin/dnsbl_domain_detail.html:12
 msgid "Status"
 msgstr "ステータス"
 
-#: admin/templates/admin/dnsbl_domain_detail.html:21
+#: templates/admin/dnsbl_domain_detail.html:21
 msgid "listed"
 msgstr "一覧"
 
-#: admin/templates/admin/dnsbl_domain_detail.html:29
+#: templates/admin/dnsbl_domain_detail.html:29
 msgid "Everything is fine, this domain is not listed."
 msgstr "すべて良好です。このドメインは載っていません。"
 
-#: admin/templates/admin/dnsbl_domain_detail.html:32
+#: templates/admin/dnsbl_domain_detail.html:32
 msgid "No information available for this domain."
 msgstr "このドメインに関する情報がありません。"
 
-#: admin/templates/admin/domain_detail.html:26
-#: admin/templates/admin/domains.html:38
+#: templates/admin/domain_detail.html:26 templates/admin/domains.html:38
 #, fuzzy
 #| msgid "Status"
 msgid "DNS status"
 msgstr "ステータス"
 
-#: admin/templates/admin/domain_detail.html:28
-#: admin/templates/admin/domains_table.html:12
+#: templates/admin/domain_detail.html:28 templates/admin/domains_table.html:14
 msgid "Awaiting checks"
 msgstr ""
 
-#: admin/templates/admin/domain_detail.html:40
+#: templates/admin/domain_detail.html:40
 msgid "Creation date"
 msgstr "作成日時"
 
-#: admin/templates/admin/domain_detail.html:42
+#: templates/admin/domain_detail.html:42
 msgid "Last modification date"
 msgstr "最終修正日時"
 
-#: admin/templates/admin/domain_detail.html:43
-#: admin/templates/admin/domain_detail.html:52
-#: admin/templates/admin/domain_statistics.html:33
+#: templates/admin/domain_detail.html:43 templates/admin/domain_detail.html:52
+#: templates/admin/domain_statistics.html:33
 msgid "Domain aliases"
 msgstr "ドメインエイリアス"
 
-#: admin/templates/admin/domain_detail.html:45
+#: templates/admin/domain_detail.html:45
 msgid "Mailbox aliases"
 msgstr "メールボックスエイリアス"
 
-#: admin/templates/admin/domain_detail.html:69
+#: templates/admin/domain_detail.html:69
 msgid "Administrators"
 msgstr "管理者"
 
-#: admin/templates/admin/domain_detail.html:79
-#: admin/templatetags/admin_tags.py:259
+#: templates/admin/domain_detail.html:79 templatetags/admin_tags.py:259
 msgid "Remove this permission"
 msgstr "このパーミッションを削除"
 
-#: admin/templates/admin/domain_detail.html:84
+#: templates/admin/domain_detail.html:84
 msgid "No domain administrator defined yet."
 msgstr "ドメイン管理者が指定されていません"
 
-#: admin/templates/admin/domain_general_form.html:4
-#: admin/templates/admin/mailform.html:4
-#: admin/templates/admin/newdomainform.html:3
+#: templates/admin/domain_general_form.html:4 templates/admin/mailform.html:4
+#: templates/admin/newdomainform.html:3
 msgid "MB"
 msgstr "MB"
 
-#: admin/templates/admin/domain_options_form.html:7
+#: templates/admin/domain_options_form.html:7
 msgid "You can't create a new domain administrator"
 msgstr "新しいドメイン管理者を作成できません"
 
-#: admin/templates/admin/domain_statistics.html:15
-#: admin/templatetags/admin_tags.py:44
+#: templates/admin/domain_statistics.html:15 templatetags/admin_tags.py:44
 msgid "Statistics"
 msgstr "統計情報"
 
-#: admin/templates/admin/domain_statistics.html:15
+#: templates/admin/domain_statistics.html:15
 msgid "Domains and identities"
 msgstr "ドメインと ID"
 
-#: admin/templates/admin/domain_statistics.html:22
+#: templates/admin/domain_statistics.html:22
 msgid "Global counters"
 msgstr "全体のカウンター"
 
-#: admin/templates/admin/domain_statistics.html:27
+#: templates/admin/domain_statistics.html:27
 msgid "Quantity"
 msgstr "数量"
 
-#: admin/templates/admin/domain_statistics.html:45
+#: templates/admin/domain_statistics.html:45
 msgid "Per-domain counters"
 msgstr "ドメインごとのカウンター"
 
-#: admin/templates/admin/domains.html:26
-#: admin/templates/admin/identities.html:29
+#: templates/admin/domains.html:26 templates/admin/identities.html:29
 msgid "Add"
 msgstr ""
 
-#: admin/templates/admin/domains.html:36
-#: admin/templates/admin/identity_headers.html:4
+#: templates/admin/domains.html:36 templates/admin/identity_headers.html:4
 msgid "Tags"
 msgstr "タグ"
 
-#: admin/templates/admin/domains.html:40
-#: admin/templates/admin/identity_headers.html:5
+#: templates/admin/domains.html:40 templates/admin/identity_headers.html:5
 msgid "Actions"
 msgstr "アション"
 
-#: admin/templates/admin/domains_table.html:5
+#: templates/admin/domains_table.html:5
 msgid "disabled"
 msgstr "無効化"
 
-#: admin/templates/admin/forward.html:2
+#: templates/admin/domains_table.html:12
+#, fuzzy
+#| msgid "disabled"
+msgctxt "checks"
+msgid "Disabled"
+msgstr "無効化"
+
+#: templates/admin/forward.html:2
 msgid "Automatically forward emails to another address"
 msgstr "電子メールをほかのアドレスへ自動的に転送します"
 
-#: admin/templates/admin/forward.html:9 admin/views/alias.py:91
+#: templates/admin/forward.html:9 views/alias.py:91
 msgid "Update"
 msgstr "更新"
 
-#: admin/templates/admin/identities.html:32
+#: templates/admin/identities.html:32
 msgid "Account"
 msgstr ""
 
-#: admin/templates/admin/identity_headers.html:3
+#: templates/admin/identity_headers.html:3
 msgid "Fullname/Recipient"
 msgstr "フルネーム / 受信者"
 
-#: admin/templates/admin/import_domains_form.html:6
+#: templates/admin/import_domains_form.html:6
 #, fuzzy
 #| msgid ""
 #| "Provide a CSV file where lines respect one of the following formats:\n"
@@ -884,7 +870,7 @@ msgstr ""
 "<p>各行の最初の要素は必須で、上の値に等しくなければなりません。</p>\n"
 "<p>セパレータとして別の文字を使用することができます。</p>\n"
 
-#: admin/templates/admin/import_identities_form.html:6
+#: templates/admin/import_identities_form.html:6
 #, fuzzy
 #| msgid ""
 #| "Provide a CSV file where lines respect one of the following formats:\n"
@@ -913,39 +899,39 @@ msgstr ""
 "<p>各行の最初の要素は必須で、上の値に等しくなければなりません。</p>\n"
 "<p>セパレータとして別の文字を使用することができます。</p>\n"
 
-#: admin/templates/admin/importform.html:6
+#: templates/admin/importform.html:6
 msgid "Help"
 msgstr "ヘルプ"
 
-#: admin/templates/admin/importform.html:13
+#: templates/admin/importform.html:13
 msgid "Importing..."
 msgstr "インポート中 ..."
 
-#: admin/templates/admin/mailboxes_raw.html:3
+#: templates/admin/mailboxes_raw.html:3
 msgid "Choose a value"
 msgstr "値を選択してください"
 
-#: admin/templates/admin/mailform.html:4
+#: templates/admin/mailform.html:4
 msgid "Use domain default value"
 msgstr "ドメインのデフォルト値を使う"
 
-#: admin/templates/admin/mx_domain_detail.html:11
+#: templates/admin/mx_domain_detail.html:11
 #, fuzzy
 #| msgid "Update"
 msgid "Updated"
 msgstr "更新"
 
-#: admin/templates/admin/mx_domain_detail.html:23
+#: templates/admin/mx_domain_detail.html:23
 msgid "This IP does not match any of the valid MXs defined in parameters"
 msgstr ""
 
-#: admin/templates/admin/mx_domain_detail.html:36
+#: templates/admin/mx_domain_detail.html:36
 #, fuzzy
 #| msgid "No information available for this domain."
 msgid "No MX record found for this domain."
 msgstr "このドメインに関する情報がありません。"
 
-#: admin/templates/admin/notifications/domain_in_dnsbl.html:3
+#: templates/admin/notifications/domain_in_dnsbl.html:3
 #, python-format
 msgid ""
 "Modoboa detected that domain %(domain)s is listed by the following DNSBL "
@@ -954,7 +940,7 @@ msgstr ""
 "Modoboa は、ドメイン %(domain)s が、以下の DNSBL プロバイダーに載っていること"
 "を検出しました："
 
-#: admin/templates/admin/notifications/domain_in_dnsbl.html:11
+#: templates/admin/notifications/domain_in_dnsbl.html:11
 msgid ""
 "The domain's reputation will be affected and there is a chance that emails "
 "coming from it are considered as spam. You should contact those providers "
@@ -964,152 +950,151 @@ msgstr ""
 "はスパムと見なされる可能性があります。あなたは、これらのプロバイダーに連絡し"
 "て、検出されたIPアドレスを登録解除してもらう必要があります。"
 
-#: admin/templates/admin/notifications/domain_invalid_mx.html:3
+#: templates/admin/notifications/domain_invalid_mx.html:3
 #, python-format
 msgid "Modoboa detected that domain %(domain)s has no valid MX record:"
 msgstr ""
 
-#: admin/templates/admin/quota_headers.html:3
+#: templates/admin/quota_headers.html:3
 msgid "Value"
 msgstr "値"
 
-#: admin/templates/admin/quota_headers.html:4
+#: templates/admin/quota_headers.html:4
 msgid "Limit"
 msgstr "制限"
 
-#: admin/templates/admin/quota_headers.html:5
+#: templates/admin/quota_headers.html:5
 #, python-format
 msgid "Usage (%%)"
 msgstr "使用量  (%%)"
 
-#: admin/templates/admin/searchform.html:6
+#: templates/admin/searchform.html:6
 msgid "Search"
 msgstr "検索"
 
-#: admin/templatetags/admin_tags.py:18
+#: templatetags/admin_tags.py:18
 msgid "enabled_m"
 msgstr "enabled_m"
 
-#: admin/templatetags/admin_tags.py:18
+#: templatetags/admin_tags.py:18
 msgid "enabled_f"
 msgstr "enabled_f"
 
-#: admin/templatetags/admin_tags.py:39
+#: templatetags/admin_tags.py:39
 msgid "List domains"
 msgstr "ドメイン一覧を表示"
 
-#: admin/templatetags/admin_tags.py:56 admin/templatetags/admin_tags.py:104
-#: admin/views/import_.py:87 admin/views/import_.py:109
+#: templatetags/admin_tags.py:56 templatetags/admin_tags.py:104
+#: views/import_.py:87 views/import_.py:109
 msgid "Import"
 msgstr "インポート"
 
-#: admin/templatetags/admin_tags.py:62 admin/templatetags/admin_tags.py:110
-#: admin/views/export.py:41 admin/views/export.py:69
+#: templatetags/admin_tags.py:62 templatetags/admin_tags.py:110
+#: views/export.py:41 views/export.py:69
 msgid "Export"
 msgstr "エクスポート"
 
-#: admin/templatetags/admin_tags.py:94
+#: templatetags/admin_tags.py:94
 msgid "List identities"
 msgstr "ID 一覧を表示"
 
-#: admin/templatetags/admin_tags.py:99
+#: templatetags/admin_tags.py:99
 msgid "List quotas"
 msgstr "クォータ一覧を表示"
 
-#: admin/templatetags/admin_tags.py:129
+#: templatetags/admin_tags.py:129
 msgid "View the domain's identities"
 msgstr "ドメインの ID を表示"
 
-#: admin/templatetags/admin_tags.py:135 admin/templatetags/admin_tags.py:178
-#: admin/templatetags/admin_tags.py:191
+#: templatetags/admin_tags.py:135 templatetags/admin_tags.py:178
+#: templatetags/admin_tags.py:191
 msgid "Edit {}"
 msgstr "{} を編集"
 
-#: admin/templatetags/admin_tags.py:145 admin/templatetags/admin_tags.py:182
-#: admin/templatetags/admin_tags.py:196
+#: templatetags/admin_tags.py:145 templatetags/admin_tags.py:182
+#: templatetags/admin_tags.py:196
 #, python-format
 msgid "Delete %s?"
 msgstr "%s を削除しますか？"
 
-#: admin/views/alias.py:33
+#: views/alias.py:33
 msgid "Alias with this name already exists"
 msgstr "このエイリアス名がすでに存在しています"
 
-#: admin/views/alias.py:58
+#: views/alias.py:58
 msgid "Create"
 msgstr "作成"
 
-#: admin/views/alias.py:70
+#: views/alias.py:70
 msgid "New alias"
 msgstr "新しいエイリアス"
 
-#: admin/views/alias.py:71
+#: views/alias.py:71
 msgid "Alias created"
 msgstr "エイリアスが作成されました"
 
-#: admin/views/alias.py:83
+#: views/alias.py:83
 msgid "Alias modified"
 msgstr "エイリアスは修正されました"
 
-#: admin/views/alias.py:107
+#: views/alias.py:107
 msgid "Alias deleted"
 msgid_plural "Aliases deleted"
 msgstr[0] ""
 
-#: admin/views/dns.py:30
+#: views/dns.py:30
 msgid "MX records of {}"
 msgstr ""
 
-#: admin/views/dns.py:53
+#: views/dns.py:53
 msgid "DNSBL summary for {}"
 msgstr "{} のDNSBL 要約"
 
-#: admin/views/domain.py:152
+#: views/domain.py:152
 msgid "You can't delete your own domain"
 msgstr "あなた自身のドメインは削除できません"
 
-#: admin/views/domain.py:155
+#: views/domain.py:155
 msgid "Domain deleted"
 msgid_plural "Domains deleted"
 msgstr[0] "ドメインを削除しました"
 
-#: admin/views/export.py:40
+#: views/export.py:40
 msgid "Export identities"
 msgstr "ID をエクスポート"
 
-#: admin/views/export.py:68
+#: views/export.py:68
 msgid "Export domains"
 msgstr "ドメインをエクスポート"
 
-#: admin/views/identity.py:111 admin/views/identity.py:205
-#: admin/views/identity.py:210
+#: views/identity.py:111 views/identity.py:205 views/identity.py:210
 msgid "Invalid request"
 msgstr "不正なリクエスト"
 
-#: admin/views/identity.py:195
+#: views/identity.py:195
 msgid "Account deleted"
 msgid_plural "Accounts deleted"
 msgstr[0] "アカウントを削除しました"
 
-#: admin/views/import_.py:63
+#: views/import_.py:63
 #, python-format
 msgid "Object already exists: %s"
 msgstr "オブジェクトはすでに存在します: %s"
 
-#: admin/views/import_.py:67
+#: views/import_.py:67
 #, python-format
 msgid "%d objects imported successfully"
 msgstr "%d オブジェクトのインポートに成功しました"
 
-#: admin/views/import_.py:86
+#: views/import_.py:86
 msgid "Import domains"
 msgstr "ドメインをインポート"
 
-#: admin/views/import_.py:108
+#: views/import_.py:108
 msgid "Import identities"
 msgstr "ID をインポート"
 
-#: admin/views/user.py:35
+#: views/user.py:35
 msgid "Forward updated"
 msgstr "転送先が更新されました"
 
diff --git a/modoboa/admin/locale/nl_NL/LC_MESSAGES/django.po b/modoboa/admin/locale/nl_NL/LC_MESSAGES/django.po
index a5dcce7b3..8abb9125f 100644
--- a/modoboa/admin/locale/nl_NL/LC_MESSAGES/django.po
+++ b/modoboa/admin/locale/nl_NL/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Modoboa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-14 14:13+0100\n"
+"POT-Creation-Date: 2017-01-16 13:02+0100\n"
 "PO-Revision-Date: 2014-12-31 11:37+0000\n"
 "Last-Translator: TuxBrother <vrijwilligerswerk@wij.rs>\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/projects/p/"
@@ -20,47 +20,46 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/app_settings.py:17 admin/handlers.py:245
-#: admin/templates/admin/domain_statistics.html:30
-#: admin/templates/admin/domains.html:4
+#: app_settings.py:17 handlers.py:252
+#: templates/admin/domain_statistics.html:30 templates/admin/domains.html:4
 msgid "Domains"
 msgstr "Domeinen"
 
-#: admin/app_settings.py:20
+#: app_settings.py:20
 msgid "Enable MX checks"
 msgstr ""
 
-#: admin/app_settings.py:23
+#: app_settings.py:23
 msgid "Check that every domain has a valid MX record"
 msgstr ""
 
-#: admin/app_settings.py:28
+#: app_settings.py:28
 msgid "Valid MXs"
 msgstr ""
 
-#: admin/app_settings.py:31
+#: app_settings.py:31
 msgid ""
-"IP(s) or network(s) of the MX that should match with domains' MX records. On "
-"per line."
+"A list of IP or network address every MX record should match. A warning will "
+"be sent if a record does not respect it."
 msgstr ""
 
-#: admin/app_settings.py:40
+#: app_settings.py:39
 msgid "Enable DNSBL checks"
 msgstr ""
 
-#: admin/app_settings.py:43
+#: app_settings.py:42
 msgid "Check every domain against major DNSBL providers"
 msgstr ""
 
-#: admin/app_settings.py:47 admin/templates/admin/domain_detail.html.py:44
+#: app_settings.py:46 templates/admin/domain_detail.html:44
 msgid "Mailboxes"
 msgstr "Mailboxen"
 
-#: admin/app_settings.py:50
+#: app_settings.py:49
 msgid "Handle mailboxes on filesystem"
 msgstr "Pas mailboxen op het bestandssysteem aan"
 
-#: admin/app_settings.py:53
+#: app_settings.py:52
 msgid ""
 "Rename or remove mailboxes on the filesystem when they get renamed or "
 "removed within Modoboa"
@@ -68,20 +67,20 @@ msgstr ""
 "Hernoem of verwijder mailboxen op het bestandssysteem wanner ze hernoemd of "
 "verwijderd worden in Modoboa."
 
-#: admin/app_settings.py:59
+#: app_settings.py:58
 msgid "Mailboxes owner"
 msgstr "Eigenaar van de mailboxen"
 
-#: admin/app_settings.py:62
+#: app_settings.py:61
 msgid "The UNIX account who owns mailboxes on the filesystem"
 msgstr ""
 "De UNIX account die de rechten heeft tot de mailboxen op het bestandssysteem"
 
-#: admin/app_settings.py:67
+#: app_settings.py:66
 msgid "Default domain quota"
 msgstr "Standaard domein quota"
 
-#: admin/app_settings.py:70
+#: app_settings.py:69
 msgid ""
 "Default quota (in MB) applied to freshly created domains with no value "
 "specified. A value of 0 means no quota."
@@ -89,38 +88,37 @@ msgstr ""
 "Standaard quota (in MB) om op nieuw aangemaakte domeinen zonder waarde toe "
 "te passen. Een waarde van 0 betekend geen quota."
 
-#: admin/app_settings.py:76
+#: app_settings.py:75
 msgid "Automatic account removal"
 msgstr "Automatish een account verwijderen"
 
-#: admin/app_settings.py:79
+#: app_settings.py:78
 msgid "When a mailbox is removed, also remove the associated account"
 msgstr ""
 "Als een mailbox word verwijderd, verwijder dan ook de bijbehorende account"
 
-#: admin/app_settings.py:83
+#: app_settings.py:82
 msgid "Automatic domain/mailbox creation"
 msgstr "Domein en mailbox automatisch aanmaken"
 
-#: admin/app_settings.py:86
+#: app_settings.py:85
 msgid "Create a domain and a mailbox when an account is automatically created."
 msgstr ""
 "Maak een domein en mailbox aan wanneer een account automatisch is aangemaakt."
 
-#: admin/app_settings.py:133 admin/forms/account.py:288
-#: admin/forms/domain.py:87
+#: app_settings.py:132 forms/account.py:288 forms/domain.py:87
 msgid "Must be a positive integer"
 msgstr "Dit moet een positive integer zijn."
 
-#: admin/app_settings.py:143
+#: app_settings.py:142
 msgid "Administration"
 msgstr "Administratie"
 
-#: admin/forms/account.py:34 admin/templates/admin/domain_detail.html.py:72
+#: forms/account.py:34 templates/admin/domain_detail.html:72
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: admin/forms/account.py:36
+#: forms/account.py:36
 msgid ""
 "The user's name. Must be a valid e-mail address for simple users or "
 "administrators with a mailbox."
@@ -128,56 +126,56 @@ msgstr ""
 "De naam van de gebruiker. Moet een geldig e-mail adres zijn voor gebruikers "
 "of administrators met een mailbox."
 
-#: admin/forms/account.py:41 admin/templates/admin/account_detail.html.py:29
+#: forms/account.py:41 templates/admin/account_detail.html:29
 msgid "Role"
 msgstr "Regel"
 
-#: admin/forms/account.py:42
+#: forms/account.py:42
 msgid "Choose"
 msgstr "Kiezen"
 
-#: admin/forms/account.py:43
+#: forms/account.py:43
 msgid "What level of permission this user will have"
 msgstr "Welk niveau van rechten deze gebruiker zal hebben"
 
-#: admin/forms/account.py:46
+#: forms/account.py:46
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: admin/forms/account.py:50
+#: forms/account.py:50
 msgid "Confirmation"
 msgstr "Bevestiging"
 
-#: admin/forms/account.py:53
+#: forms/account.py:53
 msgid "Enter the same password as above, for verification."
 msgstr "Herhaal wachtwoord (voor verificatie)"
 
-#: admin/forms/account.py:64
+#: forms/account.py:64
 msgid "Enabled"
 msgstr "Actief"
 
-#: admin/forms/account.py:156
+#: forms/account.py:156
 msgid "The two password fields didn't match."
 msgstr "De wachtwoorden komen niet overeen."
 
-#: admin/forms/account.py:171
+#: forms/account.py:171
 msgid "Only super administrators are allowed for this mode"
 msgstr ""
 
-#: admin/forms/account.py:179
+#: forms/account.py:179
 msgid "You can't disable your own account"
 msgstr "U kunt uw eigen account niet uitschakelen"
 
-#: admin/forms/account.py:194
+#: forms/account.py:194
 msgid "E-mail"
 msgstr "E-mail"
 
-#: admin/forms/account.py:196 admin/forms/domain.py:38
-#: admin/templates/admin/account_detail.html:45
+#: forms/account.py:196 forms/domain.py:38
+#: templates/admin/account_detail.html:45
 msgid "Quota"
 msgstr "Quota"
 
-#: admin/forms/account.py:198
+#: forms/account.py:198
 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 "
@@ -187,12 +185,11 @@ msgstr ""
 "stanaard waarde van het domein. Laat leeg om een ongelimiteerde waarde te "
 "definieren (niet toegestaan voor domein administrators)."
 
-#: admin/forms/account.py:206 admin/forms/domain.py:46
-#: admin/templates/admin/domains.html:35
+#: forms/account.py:206 forms/domain.py:46 templates/admin/domains.html:35
 msgid "Alias(es)"
 msgstr "Alias(sen)"
 
-#: admin/forms/account.py:209
+#: forms/account.py:209
 #, fuzzy
 #| msgid ""
 #| "Alias(es) of this mailbox. Indicate only one address per input, press "
@@ -207,13 +204,13 @@ msgstr ""
 "ENTER om een nieuwe regel te krijgen. Gebruik een wildcard '*' om een 'catch-"
 "all' adres te maken (bijvoorbeeld: *@domein.tld)."
 
-#: admin/forms/account.py:215
+#: forms/account.py:215
 #, fuzzy
 #| msgid "Invalid request"
 msgid "Sender addresses"
 msgstr "Ongeldig verzoek"
 
-#: admin/forms/account.py:218
+#: forms/account.py:218
 #, fuzzy
 #| msgid ""
 #| "Mailbox(es) this alias will point to. Indicate only one address per "
@@ -226,61 +223,60 @@ msgstr ""
 "Mailbox(en) waarnaar deze alias zal verwijzen. Geef slechts een adres per "
 "regel op, en toets ENTER om een nieuwe regel te krijgen."
 
-#: admin/forms/account.py:267 admin/forms/alias.py:92
-#: admin/models/mailbox.py:295
+#: forms/account.py:267 forms/alias.py:92 models/mailbox.py:295
 msgid "Domain does not exist"
 msgstr "Domein bestaat niet"
 
-#: admin/forms/account.py:297
+#: forms/account.py:297
 #, fuzzy
 #| msgid "Domain does not exist"
 msgid "Local domain does not exist"
 msgstr "Domein bestaat niet"
 
-#: admin/forms/account.py:392
+#: forms/account.py:392
 msgid "Domain(s)"
 msgstr "Domein(en)"
 
-#: admin/forms/account.py:394
+#: forms/account.py:394
 msgid "Domain(s) that user administrates"
 msgstr "Domein(en) die gebruiker mag beheren"
 
-#: admin/forms/account.py:440 admin/forms/account.py:525
-#: admin/forms/domain.py:283 admin/forms/domain.py:350
+#: forms/account.py:440 forms/account.py:525 forms/domain.py:283
+#: forms/domain.py:350
 msgid "General"
 msgstr "Algemeen"
 
-#: admin/forms/account.py:445 admin/forms/account.py:531
+#: forms/account.py:445 forms/account.py:531
 msgid "Mail"
 msgstr "Mail"
 
-#: admin/forms/account.py:447
+#: forms/account.py:447
 msgid "Permissions"
 msgstr "Rechten"
 
-#: admin/forms/account.py:514
+#: forms/account.py:514
 msgid "Account updated"
 msgstr "Account aangepast"
 
-#: admin/forms/account.py:538
+#: forms/account.py:538
 msgid "New account"
 msgstr "Nieuwe account"
 
-#: admin/forms/account.py:550
+#: forms/account.py:550
 msgid "Account created"
 msgstr "Account aangemaakt"
 
-#: admin/forms/alias.py:24
+#: forms/alias.py:24
 #, fuzzy
 #| msgid "Invalid request"
 msgid "Random address"
 msgstr "Ongeldig verzoek"
 
-#: admin/forms/alias.py:27
+#: forms/alias.py:27
 msgid "Email address"
 msgstr "Email adres"
 
-#: admin/forms/alias.py:29
+#: forms/alias.py:29
 #, fuzzy
 #| msgid ""
 #| "The alias address (without the domain part). For a 'catch-all' address, "
@@ -292,11 +288,11 @@ msgstr ""
 "Het alias adres (zonder het domein deel). Voor een 'catch-all' adres, vul "
 "een * in."
 
-#: admin/forms/alias.py:35 admin/templates/admin/alias_detail.html.py:37
+#: forms/alias.py:35 templates/admin/alias_detail.html:37
 msgid "Recipients"
 msgstr "Ontvangers"
 
-#: admin/forms/alias.py:37
+#: forms/alias.py:37
 #, fuzzy
 #| msgid ""
 #| "Mailbox(es) this alias will point to. Indicate only one address per "
@@ -308,30 +304,30 @@ msgstr ""
 "Mailbox(en) waarnaar deze alias zal verwijzen. Geef slechts een adres per "
 "regel op, en toets ENTER om een nieuwe regel te krijgen."
 
-#: admin/forms/alias.py:47 admin/forms/domain.py:26 admin/models/domain.py:91
-#: admin/templates/admin/domain_statistics.html:49
+#: forms/alias.py:47 forms/domain.py:26 models/domain.py:92
+#: templates/admin/domain_statistics.html:49
 msgid "Domain"
 msgstr "Domein"
 
-#: admin/forms/alias.py:95
+#: forms/alias.py:95
 msgid "You don't have access to this domain"
 msgstr "U heeft geen toegang tot dit domein"
 
-#: admin/forms/alias.py:112 admin/forms/alias.py:114
+#: forms/alias.py:112 forms/alias.py:114
 #, fuzzy
 #| msgid "A mailbox is required"
 msgid "This field is required"
 msgstr "Een mailbox is benodigd"
 
-#: admin/forms/alias.py:118
+#: forms/alias.py:118
 msgid "No recipient defined"
 msgstr "Geen ontvanger opgegeven"
 
-#: admin/forms/domain.py:35 admin/templates/admin/domain_statistics.html.py:26
+#: forms/domain.py:35 templates/admin/domain_statistics.html:26
 msgid "Type"
 msgstr "Type"
 
-#: admin/forms/domain.py:41
+#: forms/domain.py:41
 msgid ""
 "Default quota in MB applied to mailboxes. Leave empty to use the default "
 "value."
@@ -339,7 +335,7 @@ msgstr ""
 "Standaard quota in MB toegepast op mailboxen. Laat leeg om de standaard "
 "waarde te gebruiken."
 
-#: admin/forms/domain.py:49
+#: forms/domain.py:49
 msgid ""
 "Alias(es) of this domain. Indicate only one name per input, press ENTER to "
 "add a new input."
@@ -347,106 +343,104 @@ msgstr ""
 "Alias(sen) van dit domein. Geef slechts een adres per regel op, en toets "
 "ENTER om een nieuwe regel te krijgen."
 
-#: admin/forms/domain.py:103 admin/handlers.py:148
+#: forms/domain.py:103 handlers.py:155
 msgid "domain alias"
 msgstr "domein alias"
 
-#: admin/forms/domain.py:106 admin/forms/domain.py:118
-#: admin/forms/domain.py:126
+#: forms/domain.py:106 forms/domain.py:118 forms/domain.py:126
 #, python-format
 msgid "A %s with this name already exists"
 msgstr "Een %s met deze naam bestaat al"
 
-#: admin/forms/domain.py:118 admin/forms/domain.py:123
+#: forms/domain.py:118 forms/domain.py:123
 msgid "domain"
 msgstr "domein"
 
-#: admin/forms/domain.py:171
+#: forms/domain.py:171
 msgid "Create a domain administrator"
 msgstr "Maak een domein administrator aan"
 
-#: admin/forms/domain.py:174
+#: forms/domain.py:174
 msgid "Automatically create an administrator for this domain"
 msgstr "Automatisch een administrator aanmaken voor dit domein"
 
-#: admin/forms/domain.py:179 admin/templates/admin/domain_detail.html.py:72
-#: admin/templates/admin/domains.html:34
-#: admin/templates/admin/identity_headers.html:2
-#: admin/templates/admin/mx_domain_detail.html:9
+#: forms/domain.py:179 templates/admin/domain_detail.html:72
+#: templates/admin/domains.html:34 templates/admin/identity_headers.html:2
+#: templates/admin/mx_domain_detail.html:9
 msgid "Name"
 msgstr "Naam"
 
-#: admin/forms/domain.py:182
+#: forms/domain.py:182
 msgid ""
 "The administrator's name. Don't include the domain's name here, it will be "
 "automatically appended."
 msgstr ""
 "De naam van de administrator. De domeinnaam word automatisch toegevoegd."
 
-#: admin/forms/domain.py:189
+#: forms/domain.py:189
 msgid "Create aliases"
 msgstr "Aliassen aanmaken"
 
-#: admin/forms/domain.py:192
+#: forms/domain.py:192
 msgid "Automatically create standard aliases for this domain"
 msgstr "Automatisch een standaard alias voor dit domein aanmaken"
 
-#: admin/forms/domain.py:208
+#: forms/domain.py:208
 msgid "Invalid format"
 msgstr "Verkeerd formaat"
 
-#: admin/forms/domain.py:217 admin/forms/domain.py:220
+#: forms/domain.py:217 forms/domain.py:220
 #, fuzzy
 #| msgid "A mailbox is required"
 msgid "This field is required."
 msgstr "Een mailbox is benodigd"
 
-#: admin/forms/domain.py:237
+#: forms/domain.py:237
 #, python-format
 msgid "User '%s' already exists"
 msgstr "Gebruiker '%s' bestaat al"
 
-#: admin/forms/domain.py:339
+#: forms/domain.py:339
 msgid "Domain modified"
 msgstr "Domein gewijzigd"
 
-#: admin/forms/domain.py:360
+#: forms/domain.py:360
 msgid "Options"
 msgstr "Opties"
 
-#: admin/forms/domain.py:368
+#: forms/domain.py:368
 msgid "New domain"
 msgstr "Nieuw domein"
 
-#: admin/forms/domain.py:381
+#: forms/domain.py:381
 msgid "Domain created"
 msgstr "Domein aangemaakt"
 
-#: admin/forms/export.py:7
+#: forms/export.py:7
 msgid "File name"
 msgstr "Bestandsnaam"
 
-#: admin/forms/export.py:13 admin/forms/import_.py:13
+#: forms/export.py:13 forms/import_.py:13
 msgid "Separator"
 msgstr "Scheidingsteken"
 
-#: admin/forms/forward.py:14
+#: forms/forward.py:14
 msgid "Recipient(s)"
 msgstr "Ontvanger(s)"
 
-#: admin/forms/forward.py:18
+#: forms/forward.py:18
 msgid "Indicate one or more recipients separated by a ','"
 msgstr "Geef een of meer ontvangers op, gescheiden door een komma"
 
-#: admin/forms/forward.py:21
+#: forms/forward.py:21
 msgid "Keep local copies"
 msgstr "Lokale kopie behouden"
 
-#: admin/forms/forward.py:24
+#: forms/forward.py:24
 msgid "Forward messages and store copies into your local mailbox"
 msgstr "Stuur berichten door en sla een kopie op in uw mailbox"
 
-#: admin/forms/forward.py:42
+#: forms/forward.py:42
 msgid ""
 "You can't define a forward to a local destination. Please ask your "
 "administrator to create an alias instead."
@@ -454,465 +448,457 @@ msgstr ""
 "U kunt mail niet doorsturen naar een lokaal adres. Vraag uw systeembeheerder "
 "om een alias voor u aan te maken."
 
-#: admin/forms/import_.py:11
+#: forms/import_.py:11
 msgid "Select a file"
 msgstr "Bestand selecteren"
 
-#: admin/forms/import_.py:19
+#: forms/import_.py:19
 msgid "Continue on error"
 msgstr "Doorgaan als er een fout optreed"
 
-#: admin/forms/import_.py:20
+#: forms/import_.py:20
 msgid "Don't treat duplicated objects as error"
 msgstr "Zie duplicaten niet als fout"
 
-#: admin/forms/import_.py:38
+#: forms/import_.py:38
 msgid "Crypt passwords"
 msgstr "Versleutel wachtwoorden"
 
-#: admin/forms/import_.py:40
+#: forms/import_.py:40
 msgid "Check this option if passwords contained in your file are not crypted"
 msgstr ""
 "Vink deze optie aan als wachtwoorden in uw bestand niet versleuteld zijn"
 
-#: admin/handlers.py:194
+#: handlers.py:201
 #, python-format
 msgid "Account import failed (%s): domain does not exist"
 msgstr "Accounts importeren mislukt (%s): domein bestaat niet"
 
-#: admin/handlers.py:207 admin/models/mailbox.py:320
+#: handlers.py:214 models/mailbox.py:320
 #, fuzzy
 #| msgid "Mailbox %s already exists"
 msgid "Mailbox {} already exists"
 msgstr "Mailbox %s bestaat al"
 
-#: admin/handlers.py:215
+#: handlers.py:222
 #, python-format
 msgid "Account import failed (%s): wrong quota value"
 msgstr "Account import is mislukt (%s): verkeerd quotum waarde"
 
-#: admin/handlers.py:255 admin/templates/admin/domain_statistics.html.py:36
-#: admin/templates/admin/domain_statistics.html:50
-#: admin/templates/admin/identities.html:5
+#: handlers.py:262 templates/admin/domain_statistics.html:36
+#: templates/admin/domain_statistics.html:50 templates/admin/identities.html:5
 msgid "Identities"
 msgstr "Identiteiten"
 
-#: admin/handlers.py:271 admin/templates/admin/forward.html.py:2
+#: handlers.py:278 templates/admin/forward.html:2
 msgid "Forward"
 msgstr "Doorsturen"
 
-#: admin/lib.py:32
+#: lib.py:32
 msgid "A mailbox is required"
 msgstr "Een mailbox is benodigd"
 
-#: admin/lib.py:122
+#: lib.py:122
 #, fuzzy
 #| msgid "You can't delete your own domain"
 msgid "You are not allowed to import domains"
 msgstr "U kunt uw eigen domein niet verwijderen"
 
-#: admin/lib.py:133
+#: lib.py:133
 msgid "You are not allowed to import domain aliases."
 msgstr ""
 
-#: admin/management/commands/subcommands/_mx.py:159
+#: management/commands/subcommands/_mx.py:159
 msgid "[modoboa] DNSBL issue(s) for domain {}"
 msgstr ""
 
-#: admin/management/commands/subcommands/_mx.py:180
+#: management/commands/subcommands/_mx.py:180
 msgid "Domain {} has no MX record"
 msgstr ""
 
-#: admin/management/commands/subcommands/_mx.py:191
+#: management/commands/subcommands/_mx.py:191
 #, python-brace-format
 msgid "MX record for domain {0} is invalid: {1}"
 msgstr ""
 
-#: admin/management/commands/subcommands/_mx.py:207
+#: management/commands/subcommands/_mx.py:207
 msgid "[modoboa] MX issue(s) for domain {}"
 msgstr ""
 
-#: admin/models/alias.py:31 admin/models/mailbox.py:80
+#: models/alias.py:31 models/mailbox.py:80
 msgid "address"
 msgstr "adres"
 
-#: admin/models/alias.py:33
+#: models/alias.py:33
 #, fuzzy
 #| msgid "The alias name"
 msgid "The alias address."
 msgstr "De alias naam"
 
-#: admin/models/alias.py:38 admin/models/domain.py:46
-#: admin/models/domain_alias.py:44
+#: models/alias.py:38 models/domain.py:47 models/domain_alias.py:44
 msgid "enabled"
 msgstr "actief"
 
-#: admin/models/alias.py:39 admin/models/domain_alias.py:45
+#: models/alias.py:39 models/domain_alias.py:45
 msgid "Check to activate this alias"
 msgstr "Aanvinken om deze alias te activeren"
 
-#: admin/models/alias.py:44 admin/templates/admin/alias_detail.html.py:32
+#: models/alias.py:44 templates/admin/alias_detail.html:32
 msgid "Description"
 msgstr ""
 
-#: admin/models/alias.py:46 admin/templates/admin/alias_detail.html.py:29
+#: models/alias.py:46 templates/admin/alias_detail.html:29
 msgid "Expire at"
 msgstr ""
 
-#: admin/models/alias.py:89
+#: models/alias.py:89
 msgid "alias"
 msgstr "alias"
 
-#: admin/models/alias.py:121
+#: models/alias.py:121
 #, fuzzy
 #| msgid "Invalid request"
 msgid "Invalid address"
 msgstr "Ongeldig verzoek"
 
-#: admin/models/alias.py:142
+#: models/alias.py:142
 #, fuzzy
 #| msgid "Local recipient %s not found"
 msgid "Local recipient {}@{} not found"
 msgstr "Lokale ontvanger %s niet gevonden"
 
-#: admin/models/alias.py:172
+#: models/alias.py:172
 #, python-format
 msgid "Invalid line: %s"
 msgstr "Ongeldige regel: %s"
 
-#: admin/models/alias.py:178
+#: models/alias.py:178
 #, python-format
 msgid "Domain '%s' does not exist"
 msgstr "Domein '%s' bestaat niet"
 
-#: admin/models/domain.py:42 admin/models/domain_alias.py:37
+#: models/domain.py:43 models/domain_alias.py:37
 msgid "name"
 msgstr "naam"
 
-#: admin/models/domain.py:43
+#: models/domain.py:44
 msgid "The domain name"
 msgstr "De domeinnaam"
 
-#: admin/models/domain.py:47
+#: models/domain.py:48
 msgid "Check to activate this domain"
 msgstr "Aanvinken om dit domein te activeren"
 
-#: admin/models/domain.py:208 admin/models/domain_alias.py:71
+#: models/domain.py:215 models/domain_alias.py:71
 msgid "Invalid line"
 msgstr "Verkeerde regel"
 
-#: admin/models/domain.py:216
+#: models/domain.py:223
 #, python-format
 msgid "Invalid quota value for domain '%s'"
 msgstr "Verkeerde quota waarde voor domein '%s'"
 
-#: admin/models/domain_alias.py:38
+#: models/domain_alias.py:38
 msgid "The alias name"
 msgstr "De alias naam"
 
-#: admin/models/domain_alias.py:40
+#: models/domain_alias.py:40
 msgid "target"
 msgstr "doel"
 
-#: admin/models/domain_alias.py:41
+#: models/domain_alias.py:41
 msgid "The domain this alias points to"
 msgstr "De domein alias verwijst naar"
 
-#: admin/models/domain_alias.py:80
+#: models/domain_alias.py:80
 #, python-format
 msgid "Unknown domain %s"
 msgstr "Onbekend domein %s"
 
-#: admin/models/mailbox.py:82
+#: models/mailbox.py:82
 msgid "Mailbox address (without the @domain.tld part)"
 msgstr "Mailbox adres (zonder het @domein.naam deel)"
 
-#: admin/models/mailbox.py:148
+#: models/mailbox.py:148
 #, python-format
 msgid "Failed to retrieve mailbox location (%s)"
 msgstr "Mislukt om de mailbox locatie te verkijgen (%s)"
 
-#: admin/models/mailbox.py:238
+#: models/mailbox.py:238
 #, python-format
 msgid "Quota is greater than the allowed domain's limit (%dM)"
 msgstr "Quota is groter dan de maximaal toegestane domein limiet (%dM)"
 
-#: admin/models/mailbox.py:244
+#: models/mailbox.py:244
 msgid "A quota is required"
 msgstr "Een quota is vereist"
 
-#: admin/serializers.py:45 admin/serializers.py:228 admin/serializers.py:317
+#: serializers.py:45 serializers.py:228 serializers.py:317
 #, fuzzy
 #| msgid "Permissions"
 msgid "Permission denied."
 msgstr "Rechten"
 
-#: admin/serializers.py:83
+#: serializers.py:83
 msgid ""
 "List of administered domains (resellers and domain administrators only)."
 msgstr ""
 
-#: admin/serializers.py:193
+#: serializers.py:193
 msgid "Not allowed for this role."
 msgstr ""
 
-#: admin/serializers.py:203
+#: serializers.py:203
 msgid "Must be equal to mailbox full_address"
 msgstr ""
 
-#: admin/serializers.py:215
+#: serializers.py:215
 #, fuzzy
 #| msgid "Domain does not exist"
 msgid "Local domain {} does not exist"
 msgstr "Domein bestaat niet"
 
-#: admin/serializers.py:315
+#: serializers.py:315
 #, fuzzy
 #| msgid "Domain modified"
 msgid "Domain not found."
 msgstr "Domein gewijzigd"
 
-#: admin/templates/admin/account_detail.html:16
-#: admin/templates/admin/alias_detail.html:16
-#: admin/templates/admin/domain_detail.html:15
-#: admin/templates/admin/identities_table.html:7
+#: templates/admin/account_detail.html:16 templates/admin/alias_detail.html:16
+#: templates/admin/domain_detail.html:15
+#: templates/admin/identities_table.html:7
 #, fuzzy
 #| msgid "disabled"
 msgid "(disabled)"
 msgstr "uitgeschakeld"
 
-#: admin/templates/admin/account_detail.html:22
-#: admin/templates/admin/alias_detail.html:22
-#: admin/templates/admin/domain_detail.html:21
+#: templates/admin/account_detail.html:22 templates/admin/alias_detail.html:22
+#: templates/admin/domain_detail.html:21
 msgid "Summary"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:26
+#: templates/admin/account_detail.html:26
 #, fuzzy
 #| msgid "File name"
 msgid "Full name"
 msgstr "Bestandsnaam"
 
-#: admin/templates/admin/account_detail.html:32
-#: admin/templates/admin/alias_detail.html:26
+#: templates/admin/account_detail.html:32 templates/admin/alias_detail.html:26
 #, fuzzy
 #| msgid "Create"
 msgid "Created"
 msgstr "Aanmaken"
 
-#: admin/templates/admin/account_detail.html:35
+#: templates/admin/account_detail.html:35
 msgid "Last login"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:38
+#: templates/admin/account_detail.html:38
 msgid "Secondary email"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:38
-#: admin/templates/admin/account_detail.html:41
+#: templates/admin/account_detail.html:38
+#: templates/admin/account_detail.html:41
 #, fuzzy
 #| msgid "No recipient defined"
 msgid "Not defined"
 msgstr "Geen ontvanger opgegeven"
 
-#: admin/templates/admin/account_detail.html:41
+#: templates/admin/account_detail.html:41
 msgid "Phone number"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:55
+#: templates/admin/account_detail.html:55
 #, fuzzy
 #| msgid "Administration"
 msgid "Administered domains"
 msgstr "Administratie"
 
-#: admin/templates/admin/account_detail.html:61
+#: templates/admin/account_detail.html:61
 #, fuzzy
 #| msgid "No recipient defined"
 msgid "No domain defined."
 msgstr "Geen ontvanger opgegeven"
 
-#: admin/templates/admin/account_detail.html:75
+#: templates/admin/account_detail.html:75
 #, fuzzy
 #| msgid "Alias(es)"
 msgid "Aliases"
 msgstr "Alias(sen)"
 
-#: admin/templates/admin/account_detail.html:81
+#: templates/admin/account_detail.html:81
 #, fuzzy
 #| msgid "No recipient defined"
 msgid "No alias defined"
 msgstr "Geen ontvanger opgegeven"
 
-#: admin/templates/admin/account_detail.html:87
+#: templates/admin/account_detail.html:87
 msgid "Additional sender addresses"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:93
+#: templates/admin/account_detail.html:93
 msgid "No sender address defined"
 msgstr ""
 
-#: admin/templates/admin/account_general_form.html:11
-#: admin/templates/admin/aliasform.html:13
+#: templates/admin/account_general_form.html:11
+#: templates/admin/aliasform.html:13
 msgid "Domain is disabled"
 msgstr "Domein is gedeactiveerd"
 
-#: admin/templates/admin/alias_detail.html:16
-#: admin/templates/admin/identities.html:33
+#: templates/admin/alias_detail.html:16 templates/admin/identities.html:33
 #, fuzzy
 #| msgid "alias"
 msgid "Alias"
 msgstr "alias"
 
-#: admin/templates/admin/alias_detail.html:27
+#: templates/admin/alias_detail.html:27
 #, fuzzy
 #| msgid "Alias modified"
 msgid "Modified"
 msgstr "Alias aangepast"
 
-#: admin/templates/admin/dnsbl_domain_detail.html:10
+#: templates/admin/dnsbl_domain_detail.html:10
 msgid "Provider"
 msgstr ""
 
-#: admin/templates/admin/dnsbl_domain_detail.html:11
-#: admin/templates/admin/mx_domain_detail.html:10
-#: admin/templates/admin/quota_headers.html:2
+#: templates/admin/dnsbl_domain_detail.html:11
+#: templates/admin/mx_domain_detail.html:10
+#: templates/admin/quota_headers.html:2
 msgid "Address"
 msgstr "Adres"
 
-#: admin/templates/admin/dnsbl_domain_detail.html:12
+#: templates/admin/dnsbl_domain_detail.html:12
 #, fuzzy
 #| msgid "Statistics"
 msgid "Status"
 msgstr "Statistieken"
 
-#: admin/templates/admin/dnsbl_domain_detail.html:21
+#: templates/admin/dnsbl_domain_detail.html:21
 msgid "listed"
 msgstr ""
 
-#: admin/templates/admin/dnsbl_domain_detail.html:29
+#: templates/admin/dnsbl_domain_detail.html:29
 msgid "Everything is fine, this domain is not listed."
 msgstr ""
 
-#: admin/templates/admin/dnsbl_domain_detail.html:32
+#: templates/admin/dnsbl_domain_detail.html:32
 msgid "No information available for this domain."
 msgstr ""
 
-#: admin/templates/admin/domain_detail.html:26
-#: admin/templates/admin/domains.html:38
+#: templates/admin/domain_detail.html:26 templates/admin/domains.html:38
 #, fuzzy
 #| msgid "Statistics"
 msgid "DNS status"
 msgstr "Statistieken"
 
-#: admin/templates/admin/domain_detail.html:28
-#: admin/templates/admin/domains_table.html:12
+#: templates/admin/domain_detail.html:28 templates/admin/domains_table.html:14
 msgid "Awaiting checks"
 msgstr ""
 
-#: admin/templates/admin/domain_detail.html:40
+#: templates/admin/domain_detail.html:40
 msgid "Creation date"
 msgstr "Datum van aanmaken"
 
-#: admin/templates/admin/domain_detail.html:42
+#: templates/admin/domain_detail.html:42
 msgid "Last modification date"
 msgstr "Laatst gewijzigd"
 
-#: admin/templates/admin/domain_detail.html:43
-#: admin/templates/admin/domain_detail.html:52
-#: admin/templates/admin/domain_statistics.html:33
+#: templates/admin/domain_detail.html:43 templates/admin/domain_detail.html:52
+#: templates/admin/domain_statistics.html:33
 msgid "Domain aliases"
 msgstr "Domein aliassen"
 
-#: admin/templates/admin/domain_detail.html:45
+#: templates/admin/domain_detail.html:45
 msgid "Mailbox aliases"
 msgstr "Mailbox aliassen"
 
-#: admin/templates/admin/domain_detail.html:69
+#: templates/admin/domain_detail.html:69
 msgid "Administrators"
 msgstr "Administrators"
 
-#: admin/templates/admin/domain_detail.html:79
-#: admin/templatetags/admin_tags.py:259
+#: templates/admin/domain_detail.html:79 templatetags/admin_tags.py:259
 msgid "Remove this permission"
 msgstr "Deze bevoegdheid verwijderen"
 
-#: admin/templates/admin/domain_detail.html:84
+#: templates/admin/domain_detail.html:84
 #, fuzzy
 #| msgid "No domain administrator defined"
 msgid "No domain administrator defined yet."
 msgstr "Geen domein administrator toegewezen"
 
-#: admin/templates/admin/domain_general_form.html:4
-#: admin/templates/admin/mailform.html:4
-#: admin/templates/admin/newdomainform.html:3
+#: templates/admin/domain_general_form.html:4 templates/admin/mailform.html:4
+#: templates/admin/newdomainform.html:3
 msgid "MB"
 msgstr "MB"
 
-#: admin/templates/admin/domain_options_form.html:7
+#: templates/admin/domain_options_form.html:7
 msgid "You can't create a new domain administrator"
 msgstr "U kunt geen nieuwe domein administrator aanmaken"
 
-#: admin/templates/admin/domain_statistics.html:15
-#: admin/templatetags/admin_tags.py:44
+#: templates/admin/domain_statistics.html:15 templatetags/admin_tags.py:44
 msgid "Statistics"
 msgstr "Statistieken"
 
-#: admin/templates/admin/domain_statistics.html:15
+#: templates/admin/domain_statistics.html:15
 msgid "Domains and identities"
 msgstr "Domeinen en identiteiten"
 
-#: admin/templates/admin/domain_statistics.html:22
+#: templates/admin/domain_statistics.html:22
 msgid "Global counters"
 msgstr "Globale statistieken"
 
-#: admin/templates/admin/domain_statistics.html:27
+#: templates/admin/domain_statistics.html:27
 msgid "Quantity"
 msgstr "Hoeveelheid"
 
-#: admin/templates/admin/domain_statistics.html:45
+#: templates/admin/domain_statistics.html:45
 msgid "Per-domain counters"
 msgstr "Statistieken per domein"
 
-#: admin/templates/admin/domains.html:26
-#: admin/templates/admin/identities.html:29
+#: templates/admin/domains.html:26 templates/admin/identities.html:29
 #, fuzzy
 #| msgid "Address"
 msgid "Add"
 msgstr "Adres"
 
-#: admin/templates/admin/domains.html:36
-#: admin/templates/admin/identity_headers.html:4
+#: templates/admin/domains.html:36 templates/admin/identity_headers.html:4
 msgid "Tags"
 msgstr "Labels"
 
-#: admin/templates/admin/domains.html:40
-#: admin/templates/admin/identity_headers.html:5
+#: templates/admin/domains.html:40 templates/admin/identity_headers.html:5
 msgid "Actions"
 msgstr "Acties"
 
-#: admin/templates/admin/domains_table.html:5
+#: templates/admin/domains_table.html:5
 msgid "disabled"
 msgstr "uitgeschakeld"
 
-#: admin/templates/admin/forward.html:2
+#: templates/admin/domains_table.html:12
+#, fuzzy
+#| msgid "disabled"
+msgctxt "checks"
+msgid "Disabled"
+msgstr "uitgeschakeld"
+
+#: templates/admin/forward.html:2
 msgid "Automatically forward emails to another address"
 msgstr "Automatisch mails doorsturen naar een ander adres"
 
-#: admin/templates/admin/forward.html:9 admin/views/alias.py:91
+#: templates/admin/forward.html:9 views/alias.py:91
 msgid "Update"
 msgstr "Toepassen"
 
-#: admin/templates/admin/identities.html:32
+#: templates/admin/identities.html:32
 #, fuzzy
 #| msgid "Add account"
 msgid "Account"
 msgstr "Account aanmaken"
 
-#: admin/templates/admin/identity_headers.html:3
+#: templates/admin/identity_headers.html:3
 msgid "Fullname/Recipient"
 msgstr "Volledige naam/Ontvanger"
 
-#: admin/templates/admin/import_domains_form.html:6
+#: templates/admin/import_domains_form.html:6
 #, fuzzy
 #| msgid ""
 #| "Provide a CSV file where lines respect one of the following formats:\n"
@@ -946,7 +932,7 @@ msgstr ""
 "importeren mis</p>\n"
 "\n"
 
-#: admin/templates/admin/import_identities_form.html:6
+#: templates/admin/import_identities_form.html:6
 #, fuzzy
 #| msgid ""
 #| "Provide a CSV file where lines respect one of the following formats:\n"
@@ -984,138 +970,138 @@ msgstr ""
 "<p>Let op! Zorg dat het 'line-encoding format' Unix is - anders gaat het "
 "importeren mis</p>\n"
 
-#: admin/templates/admin/importform.html:6
+#: templates/admin/importform.html:6
 msgid "Help"
 msgstr "Help"
 
-#: admin/templates/admin/importform.html:13
+#: templates/admin/importform.html:13
 msgid "Importing..."
 msgstr "Importeren..."
 
-#: admin/templates/admin/mailboxes_raw.html:3
+#: templates/admin/mailboxes_raw.html:3
 msgid "Choose a value"
 msgstr "Kies een waarde"
 
-#: admin/templates/admin/mailform.html:4
+#: templates/admin/mailform.html:4
 msgid "Use domain default value"
 msgstr "Gebruik de standaard waarde van dit domein"
 
-#: admin/templates/admin/mx_domain_detail.html:11
+#: templates/admin/mx_domain_detail.html:11
 #, fuzzy
 #| msgid "Update"
 msgid "Updated"
 msgstr "Toepassen"
 
-#: admin/templates/admin/mx_domain_detail.html:23
+#: templates/admin/mx_domain_detail.html:23
 msgid "This IP does not match any of the valid MXs defined in parameters"
 msgstr ""
 
-#: admin/templates/admin/mx_domain_detail.html:36
+#: templates/admin/mx_domain_detail.html:36
 msgid "No MX record found for this domain."
 msgstr ""
 
-#: admin/templates/admin/notifications/domain_in_dnsbl.html:3
+#: templates/admin/notifications/domain_in_dnsbl.html:3
 #, python-format
 msgid ""
 "Modoboa detected that domain %(domain)s is listed by the following DNSBL "
 "providers:"
 msgstr ""
 
-#: admin/templates/admin/notifications/domain_in_dnsbl.html:11
+#: templates/admin/notifications/domain_in_dnsbl.html:11
 msgid ""
 "The domain's reputation will be affected and there is a chance that emails "
 "coming from it are considered as spam. You should contact those providers "
 "and ask them to unlist detected IP address(es)."
 msgstr ""
 
-#: admin/templates/admin/notifications/domain_invalid_mx.html:3
+#: templates/admin/notifications/domain_invalid_mx.html:3
 #, python-format
 msgid "Modoboa detected that domain %(domain)s has no valid MX record:"
 msgstr ""
 
-#: admin/templates/admin/quota_headers.html:3
+#: templates/admin/quota_headers.html:3
 msgid "Value"
 msgstr "Waarde"
 
-#: admin/templates/admin/quota_headers.html:4
+#: templates/admin/quota_headers.html:4
 msgid "Limit"
 msgstr "Limiet"
 
-#: admin/templates/admin/quota_headers.html:5
+#: templates/admin/quota_headers.html:5
 #, python-format
 msgid "Usage (%%)"
 msgstr "Gebruik (%%)"
 
-#: admin/templates/admin/searchform.html:6
+#: templates/admin/searchform.html:6
 msgid "Search"
 msgstr "Zoeken"
 
-#: admin/templatetags/admin_tags.py:18
+#: templatetags/admin_tags.py:18
 msgid "enabled_m"
 msgstr "geactiveerd_m"
 
-#: admin/templatetags/admin_tags.py:18
+#: templatetags/admin_tags.py:18
 msgid "enabled_f"
 msgstr "geactiveerd_f"
 
-#: admin/templatetags/admin_tags.py:39
+#: templatetags/admin_tags.py:39
 msgid "List domains"
 msgstr "Weergeef domeinen"
 
-#: admin/templatetags/admin_tags.py:56 admin/templatetags/admin_tags.py:104
-#: admin/views/import_.py:87 admin/views/import_.py:109
+#: templatetags/admin_tags.py:56 templatetags/admin_tags.py:104
+#: views/import_.py:87 views/import_.py:109
 msgid "Import"
 msgstr "Importeren"
 
-#: admin/templatetags/admin_tags.py:62 admin/templatetags/admin_tags.py:110
-#: admin/views/export.py:41 admin/views/export.py:69
+#: templatetags/admin_tags.py:62 templatetags/admin_tags.py:110
+#: views/export.py:41 views/export.py:69
 msgid "Export"
 msgstr "Exporteren"
 
-#: admin/templatetags/admin_tags.py:94
+#: templatetags/admin_tags.py:94
 msgid "List identities"
 msgstr "Weergeef identiteiten"
 
-#: admin/templatetags/admin_tags.py:99
+#: templatetags/admin_tags.py:99
 msgid "List quotas"
 msgstr "Weergeef quota's"
 
-#: admin/templatetags/admin_tags.py:129
+#: templatetags/admin_tags.py:129
 msgid "View the domain's identities"
 msgstr "Weergeef de identiteiten van dit domein"
 
-#: admin/templatetags/admin_tags.py:135 admin/templatetags/admin_tags.py:178
-#: admin/templatetags/admin_tags.py:191
+#: templatetags/admin_tags.py:135 templatetags/admin_tags.py:178
+#: templatetags/admin_tags.py:191
 msgid "Edit {}"
 msgstr ""
 
-#: admin/templatetags/admin_tags.py:145 admin/templatetags/admin_tags.py:182
-#: admin/templatetags/admin_tags.py:196
+#: templatetags/admin_tags.py:145 templatetags/admin_tags.py:182
+#: templatetags/admin_tags.py:196
 #, python-format
 msgid "Delete %s?"
 msgstr "Verwijder %s?"
 
-#: admin/views/alias.py:33
+#: views/alias.py:33
 msgid "Alias with this name already exists"
 msgstr "Een alias met deze naam bestaat al"
 
-#: admin/views/alias.py:58
+#: views/alias.py:58
 msgid "Create"
 msgstr "Aanmaken"
 
-#: admin/views/alias.py:70
+#: views/alias.py:70
 msgid "New alias"
 msgstr "Nieuwe alias"
 
-#: admin/views/alias.py:71
+#: views/alias.py:71
 msgid "Alias created"
 msgstr "Alias aangemaakt"
 
-#: admin/views/alias.py:83
+#: views/alias.py:83
 msgid "Alias modified"
 msgstr "Alias aangepast"
 
-#: admin/views/alias.py:107
+#: views/alias.py:107
 #, fuzzy
 #| msgid "Alias created"
 msgid "Alias deleted"
@@ -1123,62 +1109,61 @@ msgid_plural "Aliases deleted"
 msgstr[0] "Alias aangemaakt"
 msgstr[1] "Alias aangemaakt"
 
-#: admin/views/dns.py:30
+#: views/dns.py:30
 msgid "MX records of {}"
 msgstr ""
 
-#: admin/views/dns.py:53
+#: views/dns.py:53
 msgid "DNSBL summary for {}"
 msgstr ""
 
-#: admin/views/domain.py:152
+#: views/domain.py:152
 msgid "You can't delete your own domain"
 msgstr "U kunt uw eigen domein niet verwijderen"
 
-#: admin/views/domain.py:155
+#: views/domain.py:155
 msgid "Domain deleted"
 msgid_plural "Domains deleted"
 msgstr[0] "Domeinen verwijderd"
 msgstr[1] "Domeinen verwijderd"
 
-#: admin/views/export.py:40
+#: views/export.py:40
 msgid "Export identities"
 msgstr "Identiteiten exporteren"
 
-#: admin/views/export.py:68
+#: views/export.py:68
 msgid "Export domains"
 msgstr "Exporteer domeinen"
 
-#: admin/views/identity.py:111 admin/views/identity.py:205
-#: admin/views/identity.py:210
+#: views/identity.py:111 views/identity.py:205 views/identity.py:210
 msgid "Invalid request"
 msgstr "Ongeldig verzoek"
 
-#: admin/views/identity.py:195
+#: views/identity.py:195
 msgid "Account deleted"
 msgid_plural "Accounts deleted"
 msgstr[0] "Account verwijderd"
 msgstr[1] "Accounts verwijderd"
 
-#: admin/views/import_.py:63
+#: views/import_.py:63
 #, python-format
 msgid "Object already exists: %s"
 msgstr "Object bestaat al: %s"
 
-#: admin/views/import_.py:67
+#: views/import_.py:67
 #, python-format
 msgid "%d objects imported successfully"
 msgstr "%d objecten successvol geimporteerd"
 
-#: admin/views/import_.py:86
+#: views/import_.py:86
 msgid "Import domains"
 msgstr "Importeer domeinen"
 
-#: admin/views/import_.py:108
+#: views/import_.py:108
 msgid "Import identities"
 msgstr "Identiteiten importeren"
 
-#: admin/views/user.py:35
+#: views/user.py:35
 msgid "Forward updated"
 msgstr "Doorstuuradres aangepast"
 
diff --git a/modoboa/admin/locale/pt_BR/LC_MESSAGES/django.po b/modoboa/admin/locale/pt_BR/LC_MESSAGES/django.po
index d4295ba84..37fa3a1bd 100644
--- a/modoboa/admin/locale/pt_BR/LC_MESSAGES/django.po
+++ b/modoboa/admin/locale/pt_BR/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Modoboa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-14 14:13+0100\n"
+"POT-Creation-Date: 2017-01-16 13:02+0100\n"
 "PO-Revision-Date: 2016-05-17 12:28+0000\n"
 "Last-Translator: Jose Marcos Araujo <jmaraujo@avancetec.com.br>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/tonio/modoboa/"
@@ -22,47 +22,46 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: admin/app_settings.py:17 admin/handlers.py:245
-#: admin/templates/admin/domain_statistics.html:30
-#: admin/templates/admin/domains.html:4
+#: app_settings.py:17 handlers.py:252
+#: templates/admin/domain_statistics.html:30 templates/admin/domains.html:4
 msgid "Domains"
 msgstr "Domínios"
 
-#: admin/app_settings.py:20
+#: app_settings.py:20
 msgid "Enable MX checks"
 msgstr ""
 
-#: admin/app_settings.py:23
+#: app_settings.py:23
 msgid "Check that every domain has a valid MX record"
 msgstr ""
 
-#: admin/app_settings.py:28
+#: app_settings.py:28
 msgid "Valid MXs"
 msgstr ""
 
-#: admin/app_settings.py:31
+#: app_settings.py:31
 msgid ""
-"IP(s) or network(s) of the MX that should match with domains' MX records. On "
-"per line."
+"A list of IP or network address every MX record should match. A warning will "
+"be sent if a record does not respect it."
 msgstr ""
 
-#: admin/app_settings.py:40
+#: app_settings.py:39
 msgid "Enable DNSBL checks"
 msgstr ""
 
-#: admin/app_settings.py:43
+#: app_settings.py:42
 msgid "Check every domain against major DNSBL providers"
 msgstr ""
 
-#: admin/app_settings.py:47 admin/templates/admin/domain_detail.html.py:44
+#: app_settings.py:46 templates/admin/domain_detail.html:44
 msgid "Mailboxes"
 msgstr "Caixas de correios"
 
-#: admin/app_settings.py:50
+#: app_settings.py:49
 msgid "Handle mailboxes on filesystem"
 msgstr "Tratar caixas de mensagens no sistema de arquivos."
 
-#: admin/app_settings.py:53
+#: app_settings.py:52
 msgid ""
 "Rename or remove mailboxes on the filesystem when they get renamed or "
 "removed within Modoboa"
@@ -70,19 +69,19 @@ msgstr ""
 "Renomeia ou remove caixas de mensagens do sistema de arquivos quando elas "
 "são renomeadas ou removidas dentro do Modoboa"
 
-#: admin/app_settings.py:59
+#: app_settings.py:58
 msgid "Mailboxes owner"
 msgstr "Proprietário de caixas de mensagens"
 
-#: admin/app_settings.py:62
+#: app_settings.py:61
 msgid "The UNIX account who owns mailboxes on the filesystem"
 msgstr "A conta UNIX que possui caixas de mensagens no sistema de arquivos"
 
-#: admin/app_settings.py:67
+#: app_settings.py:66
 msgid "Default domain quota"
 msgstr "Cota padrão do domínio"
 
-#: admin/app_settings.py:70
+#: app_settings.py:69
 msgid ""
 "Default quota (in MB) applied to freshly created domains with no value "
 "specified. A value of 0 means no quota."
@@ -90,39 +89,38 @@ msgstr ""
 "Cota padrão (em MB) aplicada para novos domínios sem nenhum valor "
 "especificado. Um valor de 0 indica que não existe cota."
 
-#: admin/app_settings.py:76
+#: app_settings.py:75
 msgid "Automatic account removal"
 msgstr "Remoção automática da conta"
 
-#: admin/app_settings.py:79
+#: app_settings.py:78
 msgid "When a mailbox is removed, also remove the associated account"
 msgstr ""
 "Quando uma caixa de correio é removida, também remove a conta associada"
 
-#: admin/app_settings.py:83
+#: app_settings.py:82
 msgid "Automatic domain/mailbox creation"
 msgstr "Criação automática de domínio/caixa de correio"
 
-#: admin/app_settings.py:86
+#: app_settings.py:85
 msgid "Create a domain and a mailbox when an account is automatically created."
 msgstr ""
 "Criar um domínio e uma caixa de correio quando uma conta é automaticamente "
 "criada."
 
-#: admin/app_settings.py:133 admin/forms/account.py:288
-#: admin/forms/domain.py:87
+#: app_settings.py:132 forms/account.py:288 forms/domain.py:87
 msgid "Must be a positive integer"
 msgstr "Deve ser um inteiro positivo"
 
-#: admin/app_settings.py:143
+#: app_settings.py:142
 msgid "Administration"
 msgstr "Administração"
 
-#: admin/forms/account.py:34 admin/templates/admin/domain_detail.html.py:72
+#: forms/account.py:34 templates/admin/domain_detail.html:72
 msgid "Username"
 msgstr "Nome de usuário"
 
-#: admin/forms/account.py:36
+#: forms/account.py:36
 msgid ""
 "The user's name. Must be a valid e-mail address for simple users or "
 "administrators with a mailbox."
@@ -130,56 +128,56 @@ msgstr ""
 "O nome de usuário. Deve ser um endereço de e-mail válido para usuários "
 "simples ou administradores com uma caixa de mensagens."
 
-#: admin/forms/account.py:41 admin/templates/admin/account_detail.html.py:29
+#: forms/account.py:41 templates/admin/account_detail.html:29
 msgid "Role"
 msgstr "Papel"
 
-#: admin/forms/account.py:42
+#: forms/account.py:42
 msgid "Choose"
 msgstr "Escolher"
 
-#: admin/forms/account.py:43
+#: forms/account.py:43
 msgid "What level of permission this user will have"
 msgstr "Qual nível de permissão terá esse usuário"
 
-#: admin/forms/account.py:46
+#: forms/account.py:46
 msgid "Password"
 msgstr "Senha"
 
-#: admin/forms/account.py:50
+#: forms/account.py:50
 msgid "Confirmation"
 msgstr "Confirmação"
 
-#: admin/forms/account.py:53
+#: forms/account.py:53
 msgid "Enter the same password as above, for verification."
 msgstr "Para verificação, digite a mesma senha que a anterior."
 
-#: admin/forms/account.py:64
+#: forms/account.py:64
 msgid "Enabled"
 msgstr "Ativado"
 
-#: admin/forms/account.py:156
+#: forms/account.py:156
 msgid "The two password fields didn't match."
 msgstr "Os dois campos de senha não coincidiram."
 
-#: admin/forms/account.py:171
+#: forms/account.py:171
 msgid "Only super administrators are allowed for this mode"
 msgstr "Apenas super administradores estão liberados para este modo"
 
-#: admin/forms/account.py:179
+#: forms/account.py:179
 msgid "You can't disable your own account"
 msgstr "Você não pode desabilitar seu própria conta"
 
-#: admin/forms/account.py:194
+#: forms/account.py:194
 msgid "E-mail"
 msgstr "E-mail"
 
-#: admin/forms/account.py:196 admin/forms/domain.py:38
-#: admin/templates/admin/account_detail.html:45
+#: forms/account.py:196 forms/domain.py:38
+#: templates/admin/account_detail.html:45
 msgid "Quota"
 msgstr "Cota"
 
-#: admin/forms/account.py:198
+#: forms/account.py:198
 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 "
@@ -189,12 +187,11 @@ msgstr ""
 "o padrão do domínio. Deixe em branco para definir um valor ilimitado (não "
 "permitido para administradores de domínios)."
 
-#: admin/forms/account.py:206 admin/forms/domain.py:46
-#: admin/templates/admin/domains.html:35
+#: forms/account.py:206 forms/domain.py:46 templates/admin/domains.html:35
 msgid "Alias(es)"
 msgstr "Alias(es)"
 
-#: admin/forms/account.py:209
+#: forms/account.py:209
 #, fuzzy
 #| msgid ""
 #| "Alias(es) of this mailbox. Indicate only one address per input, press "
@@ -209,13 +206,13 @@ msgstr ""
 "entrada, pressione ENTER para adicionar uma nova entrada. Use o caractere "
 "'*' para criar um alias 'pega-todos' (ex: *@exemplo.com)."
 
-#: admin/forms/account.py:215
+#: forms/account.py:215
 #, fuzzy
 #| msgid "Invalid address"
 msgid "Sender addresses"
 msgstr "Endereço inválido"
 
-#: admin/forms/account.py:218
+#: forms/account.py:218
 #, fuzzy
 #| msgid ""
 #| "Addresses this alias will point to. Indicate only one address per input, "
@@ -228,59 +225,58 @@ msgstr ""
 "Endereços que este alias vai apontar. Indique apenas um endereço por "
 "entrada, pressione ENTER para adicionar uma nova entrada."
 
-#: admin/forms/account.py:267 admin/forms/alias.py:92
-#: admin/models/mailbox.py:295
+#: forms/account.py:267 forms/alias.py:92 models/mailbox.py:295
 msgid "Domain does not exist"
 msgstr "Domínio não existe"
 
-#: admin/forms/account.py:297
+#: forms/account.py:297
 msgid "Local domain does not exist"
 msgstr "Domínio local não existe"
 
-#: admin/forms/account.py:392
+#: forms/account.py:392
 msgid "Domain(s)"
 msgstr "Domínio(s)"
 
-#: admin/forms/account.py:394
+#: forms/account.py:394
 msgid "Domain(s) that user administrates"
 msgstr "Domínio(s) que o usuário administra"
 
-#: admin/forms/account.py:440 admin/forms/account.py:525
-#: admin/forms/domain.py:283 admin/forms/domain.py:350
+#: forms/account.py:440 forms/account.py:525 forms/domain.py:283
+#: forms/domain.py:350
 msgid "General"
 msgstr "Geral"
 
-#: admin/forms/account.py:445 admin/forms/account.py:531
+#: forms/account.py:445 forms/account.py:531
 msgid "Mail"
 msgstr "Correio"
 
-#: admin/forms/account.py:447
+#: forms/account.py:447
 msgid "Permissions"
 msgstr "Permissões"
 
-#: admin/forms/account.py:514
+#: forms/account.py:514
 msgid "Account updated"
 msgstr "Conta atualizada"
 
-#: admin/forms/account.py:538
+#: forms/account.py:538
 msgid "New account"
 msgstr "Nova conta"
 
-#: admin/forms/account.py:550
+#: forms/account.py:550
 msgid "Account created"
 msgstr "Conta criada"
 
-#: admin/forms/alias.py:24
+#: forms/alias.py:24
 #, fuzzy
 #| msgid "Invalid address"
 msgid "Random address"
 msgstr "Endereço inválido"
 
-#: admin/forms/alias.py:27
+#: forms/alias.py:27
 msgid "Email address"
 msgstr "Endereço de e-mail"
 
-#: admin/forms/alias.py:29
+#: forms/alias.py:29
 msgid ""
 "The alias address. To create a catchall alias, just enter the domain name "
 "(@domain.tld)."
@@ -288,11 +284,11 @@ msgstr ""
 "O endereço alias. Para criar um alias de captura, basta digitar o nome de "
 "domínio (@domain.tld)."
 
-#: admin/forms/alias.py:35 admin/templates/admin/alias_detail.html.py:37
+#: forms/alias.py:35 templates/admin/alias_detail.html:37
 msgid "Recipients"
 msgstr "Destinatários"
 
-#: admin/forms/alias.py:37
+#: forms/alias.py:37
 msgid ""
 "Addresses this alias will point to. Indicate only one address per input, "
 "press ENTER to add a new input."
@@ -300,30 +296,30 @@ msgstr ""
 "Endereços que este alias vai apontar. Indique apenas um endereço por "
 "entrada, pressione ENTER para adicionar uma nova entrada."
 
-#: admin/forms/alias.py:47 admin/forms/domain.py:26 admin/models/domain.py:91
-#: admin/templates/admin/domain_statistics.html:49
+#: forms/alias.py:47 forms/domain.py:26 models/domain.py:92
+#: templates/admin/domain_statistics.html:49
 msgid "Domain"
 msgstr "Domínio"
 
-#: admin/forms/alias.py:95
+#: forms/alias.py:95
 msgid "You don't have access to this domain"
 msgstr "Você não tem acesso a esse domínio"
 
-#: admin/forms/alias.py:112 admin/forms/alias.py:114
+#: forms/alias.py:112 forms/alias.py:114
 #, fuzzy
 #| msgid "A mailbox is required"
 msgid "This field is required"
 msgstr "Um caixa de mensagens é obrigatória"
 
-#: admin/forms/alias.py:118
+#: forms/alias.py:118
 msgid "No recipient defined"
 msgstr "Nenhum destinatário definido"
 
-#: admin/forms/domain.py:35 admin/templates/admin/domain_statistics.html.py:26
+#: forms/domain.py:35 templates/admin/domain_statistics.html:26
 msgid "Type"
 msgstr "Tipo"
 
-#: admin/forms/domain.py:41
+#: forms/domain.py:41
 msgid ""
 "Default quota in MB applied to mailboxes. Leave empty to use the default "
 "value."
@@ -331,7 +327,7 @@ msgstr ""
 "Cota padrão em MB aplicada para caixas de mensagens. Deixe em branco para "
 "usar o valor padrão."
 
-#: admin/forms/domain.py:49
+#: forms/domain.py:49
 msgid ""
 "Alias(es) of this domain. Indicate only one name per input, press ENTER to "
 "add a new input."
@@ -339,36 +335,34 @@ msgstr ""
 "Alias(es) para esse domínio. Indique apenas um nome por entrada, pressione "
 "ENTER para adicionar uma nova entrada."
 
-#: admin/forms/domain.py:103 admin/handlers.py:148
+#: forms/domain.py:103 handlers.py:155
 msgid "domain alias"
 msgstr "alias de domínio"
 
-#: admin/forms/domain.py:106 admin/forms/domain.py:118
-#: admin/forms/domain.py:126
+#: forms/domain.py:106 forms/domain.py:118 forms/domain.py:126
 #, python-format
 msgid "A %s with this name already exists"
 msgstr "Já existe um %s com este nome"
 
-#: admin/forms/domain.py:118 admin/forms/domain.py:123
+#: forms/domain.py:118 forms/domain.py:123
 msgid "domain"
 msgstr "domínio"
 
-#: admin/forms/domain.py:171
+#: forms/domain.py:171
 msgid "Create a domain administrator"
 msgstr "Criar um administrador de domínio"
 
-#: admin/forms/domain.py:174
+#: forms/domain.py:174
 msgid "Automatically create an administrator for this domain"
 msgstr "Criar automaticamente um administrador para este domínio"
 
-#: admin/forms/domain.py:179 admin/templates/admin/domain_detail.html.py:72
-#: admin/templates/admin/domains.html:34
-#: admin/templates/admin/identity_headers.html:2
-#: admin/templates/admin/mx_domain_detail.html:9
+#: forms/domain.py:179 templates/admin/domain_detail.html:72
+#: templates/admin/domains.html:34 templates/admin/identity_headers.html:2
+#: templates/admin/mx_domain_detail.html:9
 msgid "Name"
 msgstr "Nome"
 
-#: admin/forms/domain.py:182
+#: forms/domain.py:182
 msgid ""
 "The administrator's name. Don't include the domain's name here, it will be "
 "automatically appended."
@@ -376,70 +370,70 @@ msgstr ""
 "O nome de administrador. Não inclua aqui o nome de domínio. Ele será "
 "automaticamente adicionado."
 
-#: admin/forms/domain.py:189
+#: forms/domain.py:189
 msgid "Create aliases"
 msgstr "Criar alias"
 
-#: admin/forms/domain.py:192
+#: forms/domain.py:192
 msgid "Automatically create standard aliases for this domain"
 msgstr "Criar automaticamente aliases padrão para este domínio"
 
-#: admin/forms/domain.py:208
+#: forms/domain.py:208
 msgid "Invalid format"
 msgstr "Formato inválido"
 
-#: admin/forms/domain.py:217 admin/forms/domain.py:220
+#: forms/domain.py:217 forms/domain.py:220
 #, fuzzy
 #| msgid "A mailbox is required"
 msgid "This field is required."
 msgstr "Um caixa de mensagens é obrigatória"
 
-#: admin/forms/domain.py:237
+#: forms/domain.py:237
 #, python-format
 msgid "User '%s' already exists"
 msgstr "O usuário '%s' já existe"
 
-#: admin/forms/domain.py:339
+#: forms/domain.py:339
 msgid "Domain modified"
 msgstr "Domínio alterado"
 
-#: admin/forms/domain.py:360
+#: forms/domain.py:360
 msgid "Options"
 msgstr "Opções"
 
-#: admin/forms/domain.py:368
+#: forms/domain.py:368
 msgid "New domain"
 msgstr "Novo domínio"
 
-#: admin/forms/domain.py:381
+#: forms/domain.py:381
 msgid "Domain created"
 msgstr "Domínio criado"
 
-#: admin/forms/export.py:7
+#: forms/export.py:7
 msgid "File name"
 msgstr "Nome do arquivo"
 
-#: admin/forms/export.py:13 admin/forms/import_.py:13
+#: forms/export.py:13 forms/import_.py:13
 msgid "Separator"
 msgstr "Separador"
 
-#: admin/forms/forward.py:14
+#: forms/forward.py:14
 msgid "Recipient(s)"
 msgstr "Destinatário(s)"
 
-#: admin/forms/forward.py:18
+#: forms/forward.py:18
 msgid "Indicate one or more recipients separated by a ','"
 msgstr "Indique um ou mais destinatários separados por uma ','"
 
-#: admin/forms/forward.py:21
+#: forms/forward.py:21
 msgid "Keep local copies"
 msgstr "Manter cópias locais"
 
-#: admin/forms/forward.py:24
+#: forms/forward.py:24
 msgid "Forward messages and store copies into your local mailbox"
 msgstr "Encaminhar mensagens e armazenar cópias em sua caixa de correio local"
 
-#: admin/forms/forward.py:42
+#: forms/forward.py:42
 msgid ""
 "You can't define a forward to a local destination. Please ask your "
 "administrator to create an alias instead."
@@ -447,451 +441,443 @@ msgstr ""
 "Você não pode definir um encaminhamento para um local de destino. Por favor, "
 "ao invés peça ao seu administrador para criar um alias."
 
-#: admin/forms/import_.py:11
+#: forms/import_.py:11
 msgid "Select a file"
 msgstr "Selecione um arquivo"
 
-#: admin/forms/import_.py:19
+#: forms/import_.py:19
 msgid "Continue on error"
 msgstr "Continuar em caso de erro"
 
-#: admin/forms/import_.py:20
+#: forms/import_.py:20
 msgid "Don't treat duplicated objects as error"
 msgstr "Não tratar como erro objetos duplicados"
 
-#: admin/forms/import_.py:38
+#: forms/import_.py:38
 msgid "Crypt passwords"
 msgstr "Criptografar senhas"
 
-#: admin/forms/import_.py:40
+#: forms/import_.py:40
 msgid "Check this option if passwords contained in your file are not crypted"
 msgstr ""
 "Marcar essa opção se as senhas contidas no seu arquivo estão criptografadas"
 
-#: admin/handlers.py:194
+#: handlers.py:201
 #, python-format
 msgid "Account import failed (%s): domain does not exist"
 msgstr "Falha ao importar a conta (%s): domínio não existe"
 
-#: admin/handlers.py:207 admin/models/mailbox.py:320
+#: handlers.py:214 models/mailbox.py:320
 msgid "Mailbox {} already exists"
 msgstr "Caixa {} já existente"
 
-#: admin/handlers.py:215
+#: handlers.py:222
 #, python-format
 msgid "Account import failed (%s): wrong quota value"
 msgstr "Falha na importação de conta (%s): valor de cota errado"
 
-#: admin/handlers.py:255 admin/templates/admin/domain_statistics.html.py:36
-#: admin/templates/admin/domain_statistics.html:50
-#: admin/templates/admin/identities.html:5
+#: handlers.py:262 templates/admin/domain_statistics.html:36
+#: templates/admin/domain_statistics.html:50 templates/admin/identities.html:5
 msgid "Identities"
 msgstr "Identidades"
 
-#: admin/handlers.py:271 admin/templates/admin/forward.html.py:2
+#: handlers.py:278 templates/admin/forward.html:2
 msgid "Forward"
 msgstr "Encaminhar"
 
-#: admin/lib.py:32
+#: lib.py:32
 msgid "A mailbox is required"
 msgstr "Um caixa de mensagens é obrigatória"
 
-#: admin/lib.py:122
+#: lib.py:122
 msgid "You are not allowed to import domains"
 msgstr "Você não tem permissão para importar domínios"
 
-#: admin/lib.py:133
+#: lib.py:133
 msgid "You are not allowed to import domain aliases."
 msgstr "Você não tem permissão para importar aliases de domínio."
 
-#: admin/management/commands/subcommands/_mx.py:159
+#: management/commands/subcommands/_mx.py:159
 msgid "[modoboa] DNSBL issue(s) for domain {}"
 msgstr ""
 
-#: admin/management/commands/subcommands/_mx.py:180
+#: management/commands/subcommands/_mx.py:180
 msgid "Domain {} has no MX record"
 msgstr ""
 
-#: admin/management/commands/subcommands/_mx.py:191
+#: management/commands/subcommands/_mx.py:191
 #, python-brace-format
 msgid "MX record for domain {0} is invalid: {1}"
 msgstr ""
 
-#: admin/management/commands/subcommands/_mx.py:207
+#: management/commands/subcommands/_mx.py:207
 msgid "[modoboa] MX issue(s) for domain {}"
 msgstr ""
 
-#: admin/models/alias.py:31 admin/models/mailbox.py:80
+#: models/alias.py:31 models/mailbox.py:80
 msgid "address"
 msgstr "endereço"
 
-#: admin/models/alias.py:33
+#: models/alias.py:33
 msgid "The alias address."
 msgstr "O endereço alias."
 
-#: admin/models/alias.py:38 admin/models/domain.py:46
-#: admin/models/domain_alias.py:44
+#: models/alias.py:38 models/domain.py:47 models/domain_alias.py:44
 msgid "enabled"
 msgstr "ativado"
 
-#: admin/models/alias.py:39 admin/models/domain_alias.py:45
+#: models/alias.py:39 models/domain_alias.py:45
 msgid "Check to activate this alias"
 msgstr "Verificar para ativar o alias"
 
-#: admin/models/alias.py:44 admin/templates/admin/alias_detail.html.py:32
+#: models/alias.py:44 templates/admin/alias_detail.html:32
 msgid "Description"
 msgstr ""
 
-#: admin/models/alias.py:46 admin/templates/admin/alias_detail.html.py:29
+#: models/alias.py:46 templates/admin/alias_detail.html:29
 msgid "Expire at"
 msgstr ""
 
-#: admin/models/alias.py:89
+#: models/alias.py:89
 msgid "alias"
 msgstr "alias"
 
-#: admin/models/alias.py:121
+#: models/alias.py:121
 msgid "Invalid address"
 msgstr "Endereço inválido"
 
-#: admin/models/alias.py:142
+#: models/alias.py:142
 msgid "Local recipient {}@{} not found"
 msgstr "Destinatário local {}@{} não encontrado"
 
-#: admin/models/alias.py:172
+#: models/alias.py:172
 #, python-format
 msgid "Invalid line: %s"
 msgstr "Linha inválida: %s"
 
-#: admin/models/alias.py:178
+#: models/alias.py:178
 #, python-format
 msgid "Domain '%s' does not exist"
 msgstr "O domínio '%s' não existe"
 
-#: admin/models/domain.py:42 admin/models/domain_alias.py:37
+#: models/domain.py:43 models/domain_alias.py:37
 msgid "name"
 msgstr "nome"
 
-#: admin/models/domain.py:43
+#: models/domain.py:44
 msgid "The domain name"
 msgstr "Nome do domínio"
 
-#: admin/models/domain.py:47
+#: models/domain.py:48
 msgid "Check to activate this domain"
 msgstr "Marque para ativar esse domínio"
 
-#: admin/models/domain.py:208 admin/models/domain_alias.py:71
+#: models/domain.py:215 models/domain_alias.py:71
 msgid "Invalid line"
 msgstr "Linha inválida"
 
-#: admin/models/domain.py:216
+#: models/domain.py:223
 #, python-format
 msgid "Invalid quota value for domain '%s'"
 msgstr "Valor de cota inválido para o domínio '%s'"
 
-#: admin/models/domain_alias.py:38
+#: models/domain_alias.py:38
 msgid "The alias name"
 msgstr "Nome de alias"
 
-#: admin/models/domain_alias.py:40
+#: models/domain_alias.py:40
 msgid "target"
 msgstr "alvo"
 
-#: admin/models/domain_alias.py:41
+#: models/domain_alias.py:41
 msgid "The domain this alias points to"
 msgstr "Esse alias aponta para o domínio"
 
-#: admin/models/domain_alias.py:80
+#: models/domain_alias.py:80
 #, python-format
 msgid "Unknown domain %s"
 msgstr "Domínio desconhecido %s"
 
-#: admin/models/mailbox.py:82
+#: models/mailbox.py:82
 msgid "Mailbox address (without the @domain.tld part)"
 msgstr "Endereço da caixa de correio (sem a parte @meu.dominio)"
 
-#: admin/models/mailbox.py:148
+#: models/mailbox.py:148
 #, python-format
 msgid "Failed to retrieve mailbox location (%s)"
 msgstr "Falha ao recuperar a localização da caixa de mensagens (%s)"
 
-#: admin/models/mailbox.py:238
+#: models/mailbox.py:238
 #, python-format
 msgid "Quota is greater than the allowed domain's limit (%dM)"
 msgstr "A cota é maior que o permitido pelo limite do domínio (%dM)"
 
-#: admin/models/mailbox.py:244
+#: models/mailbox.py:244
 msgid "A quota is required"
 msgstr "Uma cota é requerida"
 
-#: admin/serializers.py:45 admin/serializers.py:228 admin/serializers.py:317
+#: serializers.py:45 serializers.py:228 serializers.py:317
 msgid "Permission denied."
 msgstr "Permissão negada"
 
-#: admin/serializers.py:83
+#: serializers.py:83
 msgid ""
 "List of administered domains (resellers and domain administrators only)."
 msgstr ""
 "Lista dos domínios administrados (somente revendedores e administradores de "
 "domínio)"
 
-#: admin/serializers.py:193
+#: serializers.py:193
 msgid "Not allowed for this role."
 msgstr "Não permitido para este perfil (role)"
 
-#: admin/serializers.py:203
+#: serializers.py:203
 msgid "Must be equal to mailbox full_address"
 msgstr "Deve ser igual ao endereço completo da conta"
 
-#: admin/serializers.py:215
+#: serializers.py:215
 msgid "Local domain {} does not exist"
 msgstr "Domínio local {} não existe"
 
-#: admin/serializers.py:315
+#: serializers.py:315
 msgid "Domain not found."
 msgstr "Domínio não encontrado"
 
-#: admin/templates/admin/account_detail.html:16
-#: admin/templates/admin/alias_detail.html:16
-#: admin/templates/admin/domain_detail.html:15
-#: admin/templates/admin/identities_table.html:7
+#: templates/admin/account_detail.html:16 templates/admin/alias_detail.html:16
+#: templates/admin/domain_detail.html:15
+#: templates/admin/identities_table.html:7
 #, fuzzy
 #| msgid "disabled"
 msgid "(disabled)"
 msgstr "desabilitado"
 
-#: admin/templates/admin/account_detail.html:22
-#: admin/templates/admin/alias_detail.html:22
-#: admin/templates/admin/domain_detail.html:21
+#: templates/admin/account_detail.html:22 templates/admin/alias_detail.html:22
+#: templates/admin/domain_detail.html:21
 msgid "Summary"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:26
+#: templates/admin/account_detail.html:26
 #, fuzzy
 #| msgid "File name"
 msgid "Full name"
 msgstr "Nome do arquivo"
 
-#: admin/templates/admin/account_detail.html:32
-#: admin/templates/admin/alias_detail.html:26
+#: templates/admin/account_detail.html:32 templates/admin/alias_detail.html:26
 #, fuzzy
 #| msgid "Create"
 msgid "Created"
 msgstr "Criar"
 
-#: admin/templates/admin/account_detail.html:35
+#: templates/admin/account_detail.html:35
 msgid "Last login"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:38
+#: templates/admin/account_detail.html:38
 msgid "Secondary email"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:38
-#: admin/templates/admin/account_detail.html:41
+#: templates/admin/account_detail.html:38
+#: templates/admin/account_detail.html:41
 #, fuzzy
 #| msgid "No recipient defined"
 msgid "Not defined"
 msgstr "Nenhum destinatário definido"
 
-#: admin/templates/admin/account_detail.html:41
+#: templates/admin/account_detail.html:41
 msgid "Phone number"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:55
+#: templates/admin/account_detail.html:55
 #, fuzzy
 #| msgid "Administration"
 msgid "Administered domains"
 msgstr "Administração"
 
-#: admin/templates/admin/account_detail.html:61
+#: templates/admin/account_detail.html:61
 #, fuzzy
 #| msgid "No recipient defined"
 msgid "No domain defined."
 msgstr "Nenhum destinatário definido"
 
-#: admin/templates/admin/account_detail.html:75
+#: templates/admin/account_detail.html:75
 #, fuzzy
 #| msgid "Alias(es)"
 msgid "Aliases"
 msgstr "Alias(es)"
 
-#: admin/templates/admin/account_detail.html:81
+#: templates/admin/account_detail.html:81
 #, fuzzy
 #| msgid "No recipient defined"
 msgid "No alias defined"
 msgstr "Nenhum destinatário definido"
 
-#: admin/templates/admin/account_detail.html:87
+#: templates/admin/account_detail.html:87
 msgid "Additional sender addresses"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:93
+#: templates/admin/account_detail.html:93
 msgid "No sender address defined"
 msgstr ""
 
-#: admin/templates/admin/account_general_form.html:11
-#: admin/templates/admin/aliasform.html:13
+#: templates/admin/account_general_form.html:11
+#: templates/admin/aliasform.html:13
 msgid "Domain is disabled"
 msgstr "Domínio está desabilitado"
 
-#: admin/templates/admin/alias_detail.html:16
-#: admin/templates/admin/identities.html:33
+#: templates/admin/alias_detail.html:16 templates/admin/identities.html:33
 #, fuzzy
 #| msgid "alias"
 msgid "Alias"
 msgstr "alias"
 
-#: admin/templates/admin/alias_detail.html:27
+#: templates/admin/alias_detail.html:27
 #, fuzzy
 #| msgid "Alias modified"
 msgid "Modified"
 msgstr "Alias modificado"
 
-#: admin/templates/admin/dnsbl_domain_detail.html:10
+#: templates/admin/dnsbl_domain_detail.html:10
 msgid "Provider"
 msgstr ""
 
-#: admin/templates/admin/dnsbl_domain_detail.html:11
-#: admin/templates/admin/mx_domain_detail.html:10
-#: admin/templates/admin/quota_headers.html:2
+#: templates/admin/dnsbl_domain_detail.html:11
+#: templates/admin/mx_domain_detail.html:10
+#: templates/admin/quota_headers.html:2
 msgid "Address"
 msgstr "Endereço"
 
-#: admin/templates/admin/dnsbl_domain_detail.html:12
+#: templates/admin/dnsbl_domain_detail.html:12
 #, fuzzy
 #| msgid "Statistics"
 msgid "Status"
 msgstr "Estatísticas"
 
-#: admin/templates/admin/dnsbl_domain_detail.html:21
+#: templates/admin/dnsbl_domain_detail.html:21
 msgid "listed"
 msgstr ""
 
-#: admin/templates/admin/dnsbl_domain_detail.html:29
+#: templates/admin/dnsbl_domain_detail.html:29
 msgid "Everything is fine, this domain is not listed."
 msgstr ""
 
-#: admin/templates/admin/dnsbl_domain_detail.html:32
+#: templates/admin/dnsbl_domain_detail.html:32
 msgid "No information available for this domain."
 msgstr ""
 
-#: admin/templates/admin/domain_detail.html:26
-#: admin/templates/admin/domains.html:38
+#: templates/admin/domain_detail.html:26 templates/admin/domains.html:38
 #, fuzzy
 #| msgid "Statistics"
 msgid "DNS status"
 msgstr "Estatísticas"
 
-#: admin/templates/admin/domain_detail.html:28
-#: admin/templates/admin/domains_table.html:12
+#: templates/admin/domain_detail.html:28 templates/admin/domains_table.html:14
 msgid "Awaiting checks"
 msgstr ""
 
-#: admin/templates/admin/domain_detail.html:40
+#: templates/admin/domain_detail.html:40
 msgid "Creation date"
 msgstr "Data de criação"
 
-#: admin/templates/admin/domain_detail.html:42
+#: templates/admin/domain_detail.html:42
 msgid "Last modification date"
 msgstr "Data da última modificação"
 
-#: admin/templates/admin/domain_detail.html:43
-#: admin/templates/admin/domain_detail.html:52
-#: admin/templates/admin/domain_statistics.html:33
+#: templates/admin/domain_detail.html:43 templates/admin/domain_detail.html:52
+#: templates/admin/domain_statistics.html:33
 msgid "Domain aliases"
 msgstr "Alias de domínios"
 
-#: admin/templates/admin/domain_detail.html:45
+#: templates/admin/domain_detail.html:45
 msgid "Mailbox aliases"
 msgstr "Alias de caixas de correio"
 
-#: admin/templates/admin/domain_detail.html:69
+#: templates/admin/domain_detail.html:69
 msgid "Administrators"
 msgstr "Administradores"
 
-#: admin/templates/admin/domain_detail.html:79
-#: admin/templatetags/admin_tags.py:259
+#: templates/admin/domain_detail.html:79 templatetags/admin_tags.py:259
 msgid "Remove this permission"
 msgstr "Remover essa persmissão"
 
-#: admin/templates/admin/domain_detail.html:84
+#: templates/admin/domain_detail.html:84
 #, fuzzy
 #| msgid "No domain administrator defined"
 msgid "No domain administrator defined yet."
 msgstr "Nenhum administrador de domínio definido"
 
-#: admin/templates/admin/domain_general_form.html:4
-#: admin/templates/admin/mailform.html:4
-#: admin/templates/admin/newdomainform.html:3
+#: templates/admin/domain_general_form.html:4 templates/admin/mailform.html:4
+#: templates/admin/newdomainform.html:3
 msgid "MB"
 msgstr "MB"
 
-#: admin/templates/admin/domain_options_form.html:7
+#: templates/admin/domain_options_form.html:7
 msgid "You can't create a new domain administrator"
 msgstr "Você não pode criar um novo administrador de domínio"
 
-#: admin/templates/admin/domain_statistics.html:15
-#: admin/templatetags/admin_tags.py:44
+#: templates/admin/domain_statistics.html:15 templatetags/admin_tags.py:44
 msgid "Statistics"
 msgstr "Estatísticas"
 
-#: admin/templates/admin/domain_statistics.html:15
+#: templates/admin/domain_statistics.html:15
 msgid "Domains and identities"
 msgstr "Domínios e identidades"
 
-#: admin/templates/admin/domain_statistics.html:22
+#: templates/admin/domain_statistics.html:22
 msgid "Global counters"
 msgstr "Contadores globais"
 
-#: admin/templates/admin/domain_statistics.html:27
+#: templates/admin/domain_statistics.html:27
 msgid "Quantity"
 msgstr "Quantidade"
 
-#: admin/templates/admin/domain_statistics.html:45
+#: templates/admin/domain_statistics.html:45
 msgid "Per-domain counters"
 msgstr "Contadores por domínios"
 
-#: admin/templates/admin/domains.html:26
-#: admin/templates/admin/identities.html:29
+#: templates/admin/domains.html:26 templates/admin/identities.html:29
 #, fuzzy
 #| msgid "Address"
 msgid "Add"
 msgstr "Endereço"
 
-#: admin/templates/admin/domains.html:36
-#: admin/templates/admin/identity_headers.html:4
+#: templates/admin/domains.html:36 templates/admin/identity_headers.html:4
 msgid "Tags"
 msgstr "Tags"
 
-#: admin/templates/admin/domains.html:40
-#: admin/templates/admin/identity_headers.html:5
+#: templates/admin/domains.html:40 templates/admin/identity_headers.html:5
 msgid "Actions"
 msgstr "Ações"
 
-#: admin/templates/admin/domains_table.html:5
+#: templates/admin/domains_table.html:5
 msgid "disabled"
 msgstr "desabilitado"
 
-#: admin/templates/admin/forward.html:2
+#: templates/admin/domains_table.html:12
+#, fuzzy
+#| msgid "disabled"
+msgctxt "checks"
+msgid "Disabled"
+msgstr "desabilitado"
+
+#: templates/admin/forward.html:2
 msgid "Automatically forward emails to another address"
 msgstr "Encaminhar e-mails automaticamente para outro endereço"
 
-#: admin/templates/admin/forward.html:9 admin/views/alias.py:91
+#: templates/admin/forward.html:9 views/alias.py:91
 msgid "Update"
 msgstr "Atualizar"
 
-#: admin/templates/admin/identities.html:32
+#: templates/admin/identities.html:32
 #, fuzzy
 #| msgid "Add account"
 msgid "Account"
 msgstr "Adicionar conta"
 
-#: admin/templates/admin/identity_headers.html:3
+#: templates/admin/identity_headers.html:3
 msgid "Fullname/Recipient"
 msgstr "Nome completo/Destinatário"
 
-#: admin/templates/admin/import_domains_form.html:6
+#: templates/admin/import_domains_form.html:6
 #, fuzzy
 #| msgid ""
 #| "Provide a CSV file where lines respect one of the following formats:\n"
@@ -921,7 +907,7 @@ msgstr ""
 "valores indicados.</p>\n"
 "<p>Você pode usar um caractere diferente como separador.</p>\n"
 
-#: admin/templates/admin/import_identities_form.html:6
+#: templates/admin/import_identities_form.html:6
 #, fuzzy
 #| msgid ""
 #| "Provide a CSV file where lines respect one of the following formats:\n"
@@ -957,138 +943,138 @@ msgstr ""
 "\n"
 "<p>Você pode usar um caractere diferente como separador.</p>\n"
 
-#: admin/templates/admin/importform.html:6
+#: templates/admin/importform.html:6
 msgid "Help"
 msgstr "Ajuda"
 
-#: admin/templates/admin/importform.html:13
+#: templates/admin/importform.html:13
 msgid "Importing..."
 msgstr "Importando..."
 
-#: admin/templates/admin/mailboxes_raw.html:3
+#: templates/admin/mailboxes_raw.html:3
 msgid "Choose a value"
 msgstr "Escolher um valor"
 
-#: admin/templates/admin/mailform.html:4
+#: templates/admin/mailform.html:4
 msgid "Use domain default value"
 msgstr "Usar valor padrão do domínio"
 
-#: admin/templates/admin/mx_domain_detail.html:11
+#: templates/admin/mx_domain_detail.html:11
 #, fuzzy
 #| msgid "Update"
 msgid "Updated"
 msgstr "Atualizar"
 
-#: admin/templates/admin/mx_domain_detail.html:23
+#: templates/admin/mx_domain_detail.html:23
 msgid "This IP does not match any of the valid MXs defined in parameters"
 msgstr ""
 
-#: admin/templates/admin/mx_domain_detail.html:36
+#: templates/admin/mx_domain_detail.html:36
 msgid "No MX record found for this domain."
 msgstr ""
 
-#: admin/templates/admin/notifications/domain_in_dnsbl.html:3
+#: templates/admin/notifications/domain_in_dnsbl.html:3
 #, python-format
 msgid ""
 "Modoboa detected that domain %(domain)s is listed by the following DNSBL "
 "providers:"
 msgstr ""
 
-#: admin/templates/admin/notifications/domain_in_dnsbl.html:11
+#: templates/admin/notifications/domain_in_dnsbl.html:11
 msgid ""
 "The domain's reputation will be affected and there is a chance that emails "
 "coming from it are considered as spam. You should contact those providers "
 "and ask them to unlist detected IP address(es)."
 msgstr ""
 
-#: admin/templates/admin/notifications/domain_invalid_mx.html:3
+#: templates/admin/notifications/domain_invalid_mx.html:3
 #, python-format
 msgid "Modoboa detected that domain %(domain)s has no valid MX record:"
 msgstr ""
 
-#: admin/templates/admin/quota_headers.html:3
+#: templates/admin/quota_headers.html:3
 msgid "Value"
 msgstr "Valor"
 
-#: admin/templates/admin/quota_headers.html:4
+#: templates/admin/quota_headers.html:4
 msgid "Limit"
 msgstr "Limite"
 
-#: admin/templates/admin/quota_headers.html:5
+#: templates/admin/quota_headers.html:5
 #, python-format
 msgid "Usage (%%)"
 msgstr "Uso (%%)"
 
-#: admin/templates/admin/searchform.html:6
+#: templates/admin/searchform.html:6
 msgid "Search"
 msgstr "Busca"
 
-#: admin/templatetags/admin_tags.py:18
+#: templatetags/admin_tags.py:18
 msgid "enabled_m"
 msgstr "Ativado"
 
-#: admin/templatetags/admin_tags.py:18
+#: templatetags/admin_tags.py:18
 msgid "enabled_f"
 msgstr "Ativada"
 
-#: admin/templatetags/admin_tags.py:39
+#: templatetags/admin_tags.py:39
 msgid "List domains"
 msgstr "Listardomínios"
 
-#: admin/templatetags/admin_tags.py:56 admin/templatetags/admin_tags.py:104
-#: admin/views/import_.py:87 admin/views/import_.py:109
+#: templatetags/admin_tags.py:56 templatetags/admin_tags.py:104
+#: views/import_.py:87 views/import_.py:109
 msgid "Import"
 msgstr "Importar"
 
-#: admin/templatetags/admin_tags.py:62 admin/templatetags/admin_tags.py:110
-#: admin/views/export.py:41 admin/views/export.py:69
+#: templatetags/admin_tags.py:62 templatetags/admin_tags.py:110
+#: views/export.py:41 views/export.py:69
 msgid "Export"
 msgstr "Exportar"
 
-#: admin/templatetags/admin_tags.py:94
+#: templatetags/admin_tags.py:94
 msgid "List identities"
 msgstr "Listar identidades"
 
-#: admin/templatetags/admin_tags.py:99
+#: templatetags/admin_tags.py:99
 msgid "List quotas"
 msgstr "Listar quotas"
 
-#: admin/templatetags/admin_tags.py:129
+#: templatetags/admin_tags.py:129
 msgid "View the domain's identities"
 msgstr "Ver as identidades de domínios"
 
-#: admin/templatetags/admin_tags.py:135 admin/templatetags/admin_tags.py:178
-#: admin/templatetags/admin_tags.py:191
+#: templatetags/admin_tags.py:135 templatetags/admin_tags.py:178
+#: templatetags/admin_tags.py:191
 msgid "Edit {}"
 msgstr ""
 
-#: admin/templatetags/admin_tags.py:145 admin/templatetags/admin_tags.py:182
-#: admin/templatetags/admin_tags.py:196
+#: templatetags/admin_tags.py:145 templatetags/admin_tags.py:182
+#: templatetags/admin_tags.py:196
 #, python-format
 msgid "Delete %s?"
 msgstr "Remover %s?"
 
-#: admin/views/alias.py:33
+#: views/alias.py:33
 msgid "Alias with this name already exists"
 msgstr "Um alias para esse nome já existe"
 
-#: admin/views/alias.py:58
+#: views/alias.py:58
 msgid "Create"
 msgstr "Criar"
 
-#: admin/views/alias.py:70
+#: views/alias.py:70
 msgid "New alias"
 msgstr "Novo alias"
 
-#: admin/views/alias.py:71
+#: views/alias.py:71
 msgid "Alias created"
 msgstr "Alias criado"
 
-#: admin/views/alias.py:83
+#: views/alias.py:83
 msgid "Alias modified"
 msgstr "Alias modificado"
 
-#: admin/views/alias.py:107
+#: views/alias.py:107
 #, fuzzy
 #| msgid "Alias created"
 msgid "Alias deleted"
@@ -1096,62 +1082,61 @@ msgid_plural "Aliases deleted"
 msgstr[0] "Alias criado"
 msgstr[1] "Alias criado"
 
-#: admin/views/dns.py:30
+#: views/dns.py:30
 msgid "MX records of {}"
 msgstr ""
 
-#: admin/views/dns.py:53
+#: views/dns.py:53
 msgid "DNSBL summary for {}"
 msgstr ""
 
-#: admin/views/domain.py:152
+#: views/domain.py:152
 msgid "You can't delete your own domain"
 msgstr "Você não pode deletar seu próprio domínio"
 
-#: admin/views/domain.py:155
+#: views/domain.py:155
 msgid "Domain deleted"
 msgid_plural "Domains deleted"
 msgstr[0] "Domínio deletado"
 msgstr[1] "Domínios deletados"
 
-#: admin/views/export.py:40
+#: views/export.py:40
 msgid "Export identities"
 msgstr "Exportar identidades"
 
-#: admin/views/export.py:68
+#: views/export.py:68
 msgid "Export domains"
 msgstr "Exportar domínios"
 
-#: admin/views/identity.py:111 admin/views/identity.py:205
-#: admin/views/identity.py:210
+#: views/identity.py:111 views/identity.py:205 views/identity.py:210
 msgid "Invalid request"
 msgstr "Solicitação inválida"
 
-#: admin/views/identity.py:195
+#: views/identity.py:195
 msgid "Account deleted"
 msgid_plural "Accounts deleted"
 msgstr[0] "Conta deletada"
 msgstr[1] "Contas deletadas"
 
-#: admin/views/import_.py:63
+#: views/import_.py:63
 #, python-format
 msgid "Object already exists: %s"
 msgstr "O objeto já existe: %s"
 
-#: admin/views/import_.py:67
+#: views/import_.py:67
 #, python-format
 msgid "%d objects imported successfully"
 msgstr "%d objetos importados com sucesso"
 
-#: admin/views/import_.py:86
+#: views/import_.py:86
 msgid "Import domains"
 msgstr "Importar domínios"
 
-#: admin/views/import_.py:108
+#: views/import_.py:108
 msgid "Import identities"
 msgstr "Importar identidades"
 
-#: admin/views/user.py:35
+#: views/user.py:35
 msgid "Forward updated"
 msgstr "Encaminhamento atualizado"
 
diff --git a/modoboa/admin/locale/pt_PT/LC_MESSAGES/django.po b/modoboa/admin/locale/pt_PT/LC_MESSAGES/django.po
index 230807f0c..20fc02d45 100644
--- a/modoboa/admin/locale/pt_PT/LC_MESSAGES/django.po
+++ b/modoboa/admin/locale/pt_PT/LC_MESSAGES/django.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Modoboa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-14 14:13+0100\n"
+"POT-Creation-Date: 2017-01-16 13:02+0100\n"
 "PO-Revision-Date: 2014-12-29 12:51+0000\n"
 "Last-Translator: Mike C. <miguelmclara@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/"
@@ -24,47 +24,46 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/app_settings.py:17 admin/handlers.py:245
-#: admin/templates/admin/domain_statistics.html:30
-#: admin/templates/admin/domains.html:4
+#: app_settings.py:17 handlers.py:252
+#: templates/admin/domain_statistics.html:30 templates/admin/domains.html:4
 msgid "Domains"
 msgstr "Domínios"
 
-#: admin/app_settings.py:20
+#: app_settings.py:20
 msgid "Enable MX checks"
 msgstr ""
 
-#: admin/app_settings.py:23
+#: app_settings.py:23
 msgid "Check that every domain has a valid MX record"
 msgstr ""
 
-#: admin/app_settings.py:28
+#: app_settings.py:28
 msgid "Valid MXs"
 msgstr ""
 
-#: admin/app_settings.py:31
+#: app_settings.py:31
 msgid ""
-"IP(s) or network(s) of the MX that should match with domains' MX records. On "
-"per line."
+"A list of IP or network address every MX record should match. A warning will "
+"be sent if a record does not respect it."
 msgstr ""
 
-#: admin/app_settings.py:40
+#: app_settings.py:39
 msgid "Enable DNSBL checks"
 msgstr ""
 
-#: admin/app_settings.py:43
+#: app_settings.py:42
 msgid "Check every domain against major DNSBL providers"
 msgstr ""
 
-#: admin/app_settings.py:47 admin/templates/admin/domain_detail.html.py:44
+#: app_settings.py:46 templates/admin/domain_detail.html:44
 msgid "Mailboxes"
 msgstr "Caixas de Correio"
 
-#: admin/app_settings.py:50
+#: app_settings.py:49
 msgid "Handle mailboxes on filesystem"
 msgstr "Lidar com caixas de correio no sistema de ficheiros"
 
-#: admin/app_settings.py:53
+#: app_settings.py:52
 msgid ""
 "Rename or remove mailboxes on the filesystem when they get renamed or "
 "removed within Modoboa"
@@ -72,19 +71,19 @@ msgstr ""
 "Renomear ou remover as caixas de correio no sistema de ficheiros quando "
 "estas são renomeadas no Modoboa"
 
-#: admin/app_settings.py:59
+#: app_settings.py:58
 msgid "Mailboxes owner"
 msgstr "Dono das caixas de correio"
 
-#: admin/app_settings.py:62
+#: app_settings.py:61
 msgid "The UNIX account who owns mailboxes on the filesystem"
 msgstr "A conta UNIX que detém as caixas de correio no sistema de ficheiros"
 
-#: admin/app_settings.py:67
+#: app_settings.py:66
 msgid "Default domain quota"
 msgstr "Quota pré-definida para o domínio"
 
-#: admin/app_settings.py:70
+#: app_settings.py:69
 msgid ""
 "Default quota (in MB) applied to freshly created domains with no value "
 "specified. A value of 0 means no quota."
@@ -92,94 +91,93 @@ msgstr ""
 "Quota (em MB) a aplicar a domínios recentemente criados sem valor "
 "especificado. Um valor de 0 implica sem quota."
 
-#: admin/app_settings.py:76
+#: app_settings.py:75
 msgid "Automatic account removal"
 msgstr "Remoção automática de conta"
 
-#: admin/app_settings.py:79
+#: app_settings.py:78
 msgid "When a mailbox is removed, also remove the associated account"
 msgstr ""
 "Ao remover uma caixa de correio estará também a remover a conta associada"
 
-#: admin/app_settings.py:83
+#: app_settings.py:82
 msgid "Automatic domain/mailbox creation"
 msgstr "Criação automatica de domino/caixa de correio"
 
-#: admin/app_settings.py:86
+#: app_settings.py:85
 msgid "Create a domain and a mailbox when an account is automatically created."
 msgstr ""
 "Criar um dominio e uma caixa de correio quando uma conta é criada "
 "automátiamente."
 
-#: admin/app_settings.py:133 admin/forms/account.py:288
-#: admin/forms/domain.py:87
+#: app_settings.py:132 forms/account.py:288 forms/domain.py:87
 msgid "Must be a positive integer"
 msgstr "Tem de ser um inteiro, positivo"
 
-#: admin/app_settings.py:143
+#: app_settings.py:142
 msgid "Administration"
 msgstr "Administração"
 
-#: admin/forms/account.py:34 admin/templates/admin/domain_detail.html.py:72
+#: forms/account.py:34 templates/admin/domain_detail.html:72
 msgid "Username"
 msgstr "Nome de Utilizador"
 
-#: admin/forms/account.py:36
+#: forms/account.py:36
 msgid ""
 "The user's name. Must be a valid e-mail address for simple users or "
 "administrators with a mailbox."
 msgstr ""
 
-#: admin/forms/account.py:41 admin/templates/admin/account_detail.html.py:29
+#: forms/account.py:41 templates/admin/account_detail.html:29
 msgid "Role"
 msgstr "Papel"
 
-#: admin/forms/account.py:42
+#: forms/account.py:42
 msgid "Choose"
 msgstr "Escolher"
 
-#: admin/forms/account.py:43
+#: forms/account.py:43
 msgid "What level of permission this user will have"
 msgstr "Que nível de permissões terá o utilizador"
 
-#: admin/forms/account.py:46
+#: forms/account.py:46
 msgid "Password"
 msgstr "Password"
 
-#: admin/forms/account.py:50
+#: forms/account.py:50
 msgid "Confirmation"
 msgstr "Confirmação"
 
-#: admin/forms/account.py:53
+#: forms/account.py:53
 msgid "Enter the same password as above, for verification."
 msgstr "Repita a password acima, para verificação."
 
-#: admin/forms/account.py:64
+#: forms/account.py:64
 msgid "Enabled"
 msgstr "Ativo"
 
-#: admin/forms/account.py:156
+#: forms/account.py:156
 msgid "The two password fields didn't match."
 msgstr "Os dois campos de password não são idênticos."
 
-#: admin/forms/account.py:171
+#: forms/account.py:171
 msgid "Only super administrators are allowed for this mode"
 msgstr ""
 
-#: admin/forms/account.py:179
+#: forms/account.py:179
 msgid "You can't disable your own account"
 msgstr "Não pode desativar a sua própria conta"
 
-#: admin/forms/account.py:194
+#: forms/account.py:194
 msgid "E-mail"
 msgstr "E-mail"
 
-#: admin/forms/account.py:196 admin/forms/domain.py:38
-#: admin/templates/admin/account_detail.html:45
+#: forms/account.py:196 forms/domain.py:38
+#: templates/admin/account_detail.html:45
 msgid "Quota"
 msgstr "Quota"
 
-#: admin/forms/account.py:198
+#: forms/account.py:198
 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 "
@@ -189,12 +187,11 @@ msgstr ""
 "usar o valor predefinido pelo domínio. Deixar em branco para definir uma "
 "valor ilimitado (não permitido para administradores do domínio)."
 
-#: admin/forms/account.py:206 admin/forms/domain.py:46
-#: admin/templates/admin/domains.html:35
+#: forms/account.py:206 forms/domain.py:46 templates/admin/domains.html:35
 msgid "Alias(es)"
 msgstr "Alias(es)"
 
-#: admin/forms/account.py:209
+#: forms/account.py:209
 #, fuzzy
 #| msgid ""
 #| "Alias(es) of this mailbox. Indicate only one address per input, press "
@@ -209,13 +206,13 @@ msgstr ""
 "clique ENTER para adicionar uma nova entrada. Use o '*' para criar um alias "
 "'catchall' (ex: *@domain.tld)."
 
-#: admin/forms/account.py:215
+#: forms/account.py:215
 #, fuzzy
 #| msgid "Invalid request"
 msgid "Sender addresses"
 msgstr "Pedido inválido"
 
-#: admin/forms/account.py:218
+#: forms/account.py:218
 #, fuzzy
 #| msgid ""
 #| "Mailbox(es) this alias will point to. Indicate only one address per "
@@ -228,61 +225,60 @@ msgstr ""
 "Caixa(s) de correio para o qual este 'alias' aponta. Indicar apenas um "
 "endereço por entrada, pressionar ENTER para acrescentar uma nova entrada."
 
-#: admin/forms/account.py:267 admin/forms/alias.py:92
-#: admin/models/mailbox.py:295
+#: forms/account.py:267 forms/alias.py:92 models/mailbox.py:295
 msgid "Domain does not exist"
 msgstr "O domínio não existe"
 
-#: admin/forms/account.py:297
+#: forms/account.py:297
 #, fuzzy
 #| msgid "Domain does not exist"
 msgid "Local domain does not exist"
 msgstr "O domínio não existe"
 
-#: admin/forms/account.py:392
+#: forms/account.py:392
 msgid "Domain(s)"
 msgstr "Domínio(s)"
 
-#: admin/forms/account.py:394
+#: forms/account.py:394
 msgid "Domain(s) that user administrates"
 msgstr "Domínio(s) administrado pelo utilizador"
 
-#: admin/forms/account.py:440 admin/forms/account.py:525
-#: admin/forms/domain.py:283 admin/forms/domain.py:350
+#: forms/account.py:440 forms/account.py:525 forms/domain.py:283
+#: forms/domain.py:350
 msgid "General"
 msgstr "Geral"
 
-#: admin/forms/account.py:445 admin/forms/account.py:531
+#: forms/account.py:445 forms/account.py:531
 msgid "Mail"
 msgstr "Correio"
 
-#: admin/forms/account.py:447
+#: forms/account.py:447
 msgid "Permissions"
 msgstr "Permissões"
 
-#: admin/forms/account.py:514
+#: forms/account.py:514
 msgid "Account updated"
 msgstr "Conta actualizada"
 
-#: admin/forms/account.py:538
+#: forms/account.py:538
 msgid "New account"
 msgstr "Nova conta"
 
-#: admin/forms/account.py:550
+#: forms/account.py:550
 msgid "Account created"
 msgstr "Conta criada"
 
-#: admin/forms/alias.py:24
+#: forms/alias.py:24
 #, fuzzy
 #| msgid "Invalid request"
 msgid "Random address"
 msgstr "Pedido inválido"
 
-#: admin/forms/alias.py:27
+#: forms/alias.py:27
 msgid "Email address"
 msgstr "Endereço de e-mail"
 
-#: admin/forms/alias.py:29
+#: forms/alias.py:29
 #, fuzzy
 #| msgid ""
 #| "The alias address (without the domain part). For a 'catch-all' address, "
@@ -294,11 +290,11 @@ msgstr ""
 "O endereço do alias (sem a parte do domínio). Para um endereço 'cath-all', "
 "digite apenas o caractere *"
 
-#: admin/forms/alias.py:35 admin/templates/admin/alias_detail.html.py:37
+#: forms/alias.py:35 templates/admin/alias_detail.html:37
 msgid "Recipients"
 msgstr "Destinatários"
 
-#: admin/forms/alias.py:37
+#: forms/alias.py:37
 #, fuzzy
 #| msgid ""
 #| "Mailbox(es) this alias will point to. Indicate only one address per "
@@ -310,30 +306,30 @@ msgstr ""
 "Caixa(s) de correio para o qual este 'alias' aponta. Indicar apenas um "
 "endereço por entrada, pressionar ENTER para acrescentar uma nova entrada."
 
-#: admin/forms/alias.py:47 admin/forms/domain.py:26 admin/models/domain.py:91
-#: admin/templates/admin/domain_statistics.html:49
+#: forms/alias.py:47 forms/domain.py:26 models/domain.py:92
+#: templates/admin/domain_statistics.html:49
 msgid "Domain"
 msgstr "Domínio"
 
-#: admin/forms/alias.py:95
+#: forms/alias.py:95
 msgid "You don't have access to this domain"
 msgstr "Não tem acesso a este domínio"
 
-#: admin/forms/alias.py:112 admin/forms/alias.py:114
+#: forms/alias.py:112 forms/alias.py:114
 #, fuzzy
 #| msgid "A mailbox is required"
 msgid "This field is required"
 msgstr "É necessária uma caixa de correio"
 
-#: admin/forms/alias.py:118
+#: forms/alias.py:118
 msgid "No recipient defined"
 msgstr "Sem destinatário definido"
 
-#: admin/forms/domain.py:35 admin/templates/admin/domain_statistics.html.py:26
+#: forms/domain.py:35 templates/admin/domain_statistics.html:26
 msgid "Type"
 msgstr "Tipo"
 
-#: admin/forms/domain.py:41
+#: forms/domain.py:41
 msgid ""
 "Default quota in MB applied to mailboxes. Leave empty to use the default "
 "value."
@@ -341,7 +337,7 @@ msgstr ""
 "Quota (em MB) aplicada às caixas de correio. Deixe em branco para manter o "
 "valor pré-definido."
 
-#: admin/forms/domain.py:49
+#: forms/domain.py:49
 msgid ""
 "Alias(es) of this domain. Indicate only one name per input, press ENTER to "
 "add a new input."
@@ -349,36 +345,34 @@ msgstr ""
 "Alias(es) deste domínio. Indicar apenas um nome por entrada, pressionar "
 "ENTER para acrescentar uma nova entrada."
 
-#: admin/forms/domain.py:103 admin/handlers.py:148
+#: forms/domain.py:103 handlers.py:155
 msgid "domain alias"
 msgstr "'Alias' de domínio"
 
-#: admin/forms/domain.py:106 admin/forms/domain.py:118
-#: admin/forms/domain.py:126
+#: forms/domain.py:106 forms/domain.py:118 forms/domain.py:126
 #, python-format
 msgid "A %s with this name already exists"
 msgstr "Já existe um(a) %s com este nome. "
 
-#: admin/forms/domain.py:118 admin/forms/domain.py:123
+#: forms/domain.py:118 forms/domain.py:123
 msgid "domain"
 msgstr "domínio"
 
-#: admin/forms/domain.py:171
+#: forms/domain.py:171
 msgid "Create a domain administrator"
 msgstr "Criar um administrador de domínio"
 
-#: admin/forms/domain.py:174
+#: forms/domain.py:174
 msgid "Automatically create an administrator for this domain"
 msgstr "Criar automaticamente um administrador para este domínio"
 
-#: admin/forms/domain.py:179 admin/templates/admin/domain_detail.html.py:72
-#: admin/templates/admin/domains.html:34
-#: admin/templates/admin/identity_headers.html:2
-#: admin/templates/admin/mx_domain_detail.html:9
+#: forms/domain.py:179 templates/admin/domain_detail.html:72
+#: templates/admin/domains.html:34 templates/admin/identity_headers.html:2
+#: templates/admin/mx_domain_detail.html:9
 msgid "Name"
 msgstr "Nome"
 
-#: admin/forms/domain.py:182
+#: forms/domain.py:182
 msgid ""
 "The administrator's name. Don't include the domain's name here, it will be "
 "automatically appended."
@@ -386,71 +380,71 @@ msgstr ""
 "O nome do administrador. Não inclua o nome do domínio já que este será "
 "automaticamente anexado."
 
-#: admin/forms/domain.py:189
+#: forms/domain.py:189
 msgid "Create aliases"
 msgstr " Criar aliases"
 
-#: admin/forms/domain.py:192
+#: forms/domain.py:192
 msgid "Automatically create standard aliases for this domain"
 msgstr "Criar automaticamente aliases para este domínio"
 
-#: admin/forms/domain.py:208
+#: forms/domain.py:208
 msgid "Invalid format"
 msgstr "Formato inválido"
 
-#: admin/forms/domain.py:217 admin/forms/domain.py:220
+#: forms/domain.py:217 forms/domain.py:220
 #, fuzzy
 #| msgid "A mailbox is required"
 msgid "This field is required."
 msgstr "É necessária uma caixa de correio"
 
-#: admin/forms/domain.py:237
+#: forms/domain.py:237
 #, python-format
 msgid "User '%s' already exists"
 msgstr "O utilizador '%s' já existe"
 
-#: admin/forms/domain.py:339
+#: forms/domain.py:339
 msgid "Domain modified"
 msgstr "Domínio alterado"
 
-#: admin/forms/domain.py:360
+#: forms/domain.py:360
 msgid "Options"
 msgstr "Opções"
 
-#: admin/forms/domain.py:368
+#: forms/domain.py:368
 msgid "New domain"
 msgstr "Novo domínio"
 
-#: admin/forms/domain.py:381
+#: forms/domain.py:381
 msgid "Domain created"
 msgstr "Domínio criado"
 
-#: admin/forms/export.py:7
+#: forms/export.py:7
 msgid "File name"
 msgstr "Nome do ficheiro"
 
-#: admin/forms/export.py:13 admin/forms/import_.py:13
+#: forms/export.py:13 forms/import_.py:13
 msgid "Separator"
 msgstr "Separador"
 
-#: admin/forms/forward.py:14
+#: forms/forward.py:14
 msgid "Recipient(s)"
 msgstr "Destinatário(s)"
 
-#: admin/forms/forward.py:18
+#: forms/forward.py:18
 msgid "Indicate one or more recipients separated by a ','"
 msgstr "Indicar um ou mais destinatários separados por ','"
 
-#: admin/forms/forward.py:21
+#: forms/forward.py:21
 msgid "Keep local copies"
 msgstr "Conservar cópias locais"
 
-#: admin/forms/forward.py:24
+#: forms/forward.py:24
 msgid "Forward messages and store copies into your local mailbox"
 msgstr ""
 "Reencaminhar mensagens e armazenar cópias na sua caixa de correio local"
 
-#: admin/forms/forward.py:42
+#: forms/forward.py:42
 msgid ""
 "You can't define a forward to a local destination. Please ask your "
 "administrator to create an alias instead."
@@ -458,464 +452,456 @@ msgstr ""
 "Não é possível definir um reencaminhamento para um destino local. Por favor "
 "informe-se junto de um administrador para criar um alias."
 
-#: admin/forms/import_.py:11
+#: forms/import_.py:11
 msgid "Select a file"
 msgstr "Escolha um ficheiro"
 
-#: admin/forms/import_.py:19
+#: forms/import_.py:19
 msgid "Continue on error"
 msgstr "Continua com erro"
 
-#: admin/forms/import_.py:20
+#: forms/import_.py:20
 msgid "Don't treat duplicated objects as error"
 msgstr "Não tratar objetos duplicados como erro"
 
-#: admin/forms/import_.py:38
+#: forms/import_.py:38
 msgid "Crypt passwords"
 msgstr "Passwords encriptadas"
 
-#: admin/forms/import_.py:40
+#: forms/import_.py:40
 msgid "Check this option if passwords contained in your file are not crypted"
 msgstr "Marque esta opção se as senhas contidas no arquivo não são encriptadas"
 
-#: admin/handlers.py:194
+#: handlers.py:201
 #, python-format
 msgid "Account import failed (%s): domain does not exist"
 msgstr "Importação da conta falhou (%s): domínio não existe"
 
-#: admin/handlers.py:207 admin/models/mailbox.py:320
+#: handlers.py:214 models/mailbox.py:320
 #, fuzzy
 #| msgid "Mailbox %s already exists"
 msgid "Mailbox {} already exists"
 msgstr "Caixa de correio %s já existe"
 
-#: admin/handlers.py:215
+#: handlers.py:222
 #, python-format
 msgid "Account import failed (%s): wrong quota value"
 msgstr "Importação da conta falhou (%s): valor para quota inválido"
 
-#: admin/handlers.py:255 admin/templates/admin/domain_statistics.html.py:36
-#: admin/templates/admin/domain_statistics.html:50
-#: admin/templates/admin/identities.html:5
+#: handlers.py:262 templates/admin/domain_statistics.html:36
+#: templates/admin/domain_statistics.html:50 templates/admin/identities.html:5
 msgid "Identities"
 msgstr "Identidades"
 
-#: admin/handlers.py:271 admin/templates/admin/forward.html.py:2
+#: handlers.py:278 templates/admin/forward.html:2
 msgid "Forward"
 msgstr "Reencaminhar"
 
-#: admin/lib.py:32
+#: lib.py:32
 msgid "A mailbox is required"
 msgstr "É necessária uma caixa de correio"
 
-#: admin/lib.py:122
+#: lib.py:122
 #, fuzzy
 #| msgid "You can't delete your own domain"
 msgid "You are not allowed to import domains"
 msgstr "Não é possível eliminar o seu próprio domínio"
 
-#: admin/lib.py:133
+#: lib.py:133
 msgid "You are not allowed to import domain aliases."
 msgstr ""
 
-#: admin/management/commands/subcommands/_mx.py:159
+#: management/commands/subcommands/_mx.py:159
 msgid "[modoboa] DNSBL issue(s) for domain {}"
 msgstr ""
 
-#: admin/management/commands/subcommands/_mx.py:180
+#: management/commands/subcommands/_mx.py:180
 msgid "Domain {} has no MX record"
 msgstr ""
 
-#: admin/management/commands/subcommands/_mx.py:191
+#: management/commands/subcommands/_mx.py:191
 #, python-brace-format
 msgid "MX record for domain {0} is invalid: {1}"
 msgstr ""
 
-#: admin/management/commands/subcommands/_mx.py:207
+#: management/commands/subcommands/_mx.py:207
 msgid "[modoboa] MX issue(s) for domain {}"
 msgstr ""
 
-#: admin/models/alias.py:31 admin/models/mailbox.py:80
+#: models/alias.py:31 models/mailbox.py:80
 msgid "address"
 msgstr "endereços"
 
-#: admin/models/alias.py:33
+#: models/alias.py:33
 #, fuzzy
 #| msgid "The alias name"
 msgid "The alias address."
 msgstr "O nome do 'alias'"
 
-#: admin/models/alias.py:38 admin/models/domain.py:46
-#: admin/models/domain_alias.py:44
+#: models/alias.py:38 models/domain.py:47 models/domain_alias.py:44
 msgid "enabled"
 msgstr "ativo"
 
-#: admin/models/alias.py:39 admin/models/domain_alias.py:45
+#: models/alias.py:39 models/domain_alias.py:45
 msgid "Check to activate this alias"
 msgstr "Marcar para ativar este alias"
 
-#: admin/models/alias.py:44 admin/templates/admin/alias_detail.html.py:32
+#: models/alias.py:44 templates/admin/alias_detail.html:32
 msgid "Description"
 msgstr ""
 
-#: admin/models/alias.py:46 admin/templates/admin/alias_detail.html.py:29
+#: models/alias.py:46 templates/admin/alias_detail.html:29
 msgid "Expire at"
 msgstr ""
 
-#: admin/models/alias.py:89
+#: models/alias.py:89
 msgid "alias"
 msgstr "alias"
 
-#: admin/models/alias.py:121
+#: models/alias.py:121
 #, fuzzy
 #| msgid "Invalid request"
 msgid "Invalid address"
 msgstr "Pedido inválido"
 
-#: admin/models/alias.py:142
+#: models/alias.py:142
 #, fuzzy
 #| msgid "Local recipient %s not found"
 msgid "Local recipient {}@{} not found"
 msgstr "O destinatário local %s não foi encontrado"
 
-#: admin/models/alias.py:172
+#: models/alias.py:172
 #, python-format
 msgid "Invalid line: %s"
 msgstr "Linha inválida: %s"
 
-#: admin/models/alias.py:178
+#: models/alias.py:178
 #, python-format
 msgid "Domain '%s' does not exist"
 msgstr "O domínio '%s' não existe"
 
-#: admin/models/domain.py:42 admin/models/domain_alias.py:37
+#: models/domain.py:43 models/domain_alias.py:37
 msgid "name"
 msgstr "nome"
 
-#: admin/models/domain.py:43
+#: models/domain.py:44
 msgid "The domain name"
 msgstr "O nome do domínio"
 
-#: admin/models/domain.py:47
+#: models/domain.py:48
 msgid "Check to activate this domain"
 msgstr "Marcar para ativar este domínio"
 
-#: admin/models/domain.py:208 admin/models/domain_alias.py:71
+#: models/domain.py:215 models/domain_alias.py:71
 msgid "Invalid line"
 msgstr "Linha inválida"
 
-#: admin/models/domain.py:216
+#: models/domain.py:223
 #, python-format
 msgid "Invalid quota value for domain '%s'"
 msgstr "Valor de quota inválido para o dominio '%s'"
 
-#: admin/models/domain_alias.py:38
+#: models/domain_alias.py:38
 msgid "The alias name"
 msgstr "O nome do 'alias'"
 
-#: admin/models/domain_alias.py:40
+#: models/domain_alias.py:40
 msgid "target"
 msgstr "alvo"
 
-#: admin/models/domain_alias.py:41
+#: models/domain_alias.py:41
 msgid "The domain this alias points to"
 msgstr "O domínio para o qual este alias irá apontar"
 
-#: admin/models/domain_alias.py:80
+#: models/domain_alias.py:80
 #, python-format
 msgid "Unknown domain %s"
 msgstr "Domínio desconhecido: %s"
 
-#: admin/models/mailbox.py:82
+#: models/mailbox.py:82
 msgid "Mailbox address (without the @domain.tld part)"
 msgstr "Endereços das caixas de correio (sem a parte @domain.tld)"
 
-#: admin/models/mailbox.py:148
+#: models/mailbox.py:148
 #, python-format
 msgid "Failed to retrieve mailbox location (%s)"
 msgstr "Falha ao recuperar a localização da caixa de correio (%s)"
 
-#: admin/models/mailbox.py:238
+#: models/mailbox.py:238
 #, python-format
 msgid "Quota is greater than the allowed domain's limit (%dM)"
 msgstr "A quota excede o limite permitido pelo domínio (%dM)"
 
-#: admin/models/mailbox.py:244
+#: models/mailbox.py:244
 msgid "A quota is required"
 msgstr "É necessário uma quota"
 
-#: admin/serializers.py:45 admin/serializers.py:228 admin/serializers.py:317
+#: serializers.py:45 serializers.py:228 serializers.py:317
 #, fuzzy
 #| msgid "Permissions"
 msgid "Permission denied."
 msgstr "Permissões"
 
-#: admin/serializers.py:83
+#: serializers.py:83
 msgid ""
 "List of administered domains (resellers and domain administrators only)."
 msgstr ""
 
-#: admin/serializers.py:193
+#: serializers.py:193
 msgid "Not allowed for this role."
 msgstr ""
 
-#: admin/serializers.py:203
+#: serializers.py:203
 msgid "Must be equal to mailbox full_address"
 msgstr ""
 
-#: admin/serializers.py:215
+#: serializers.py:215
 #, fuzzy
 #| msgid "Domain does not exist"
 msgid "Local domain {} does not exist"
 msgstr "O domínio não existe"
 
-#: admin/serializers.py:315
+#: serializers.py:315
 #, fuzzy
 #| msgid "Domain modified"
 msgid "Domain not found."
 msgstr "Domínio alterado"
 
-#: admin/templates/admin/account_detail.html:16
-#: admin/templates/admin/alias_detail.html:16
-#: admin/templates/admin/domain_detail.html:15
-#: admin/templates/admin/identities_table.html:7
+#: templates/admin/account_detail.html:16 templates/admin/alias_detail.html:16
+#: templates/admin/domain_detail.html:15
+#: templates/admin/identities_table.html:7
 #, fuzzy
 #| msgid "disabled"
 msgid "(disabled)"
 msgstr "inativo"
 
-#: admin/templates/admin/account_detail.html:22
-#: admin/templates/admin/alias_detail.html:22
-#: admin/templates/admin/domain_detail.html:21
+#: templates/admin/account_detail.html:22 templates/admin/alias_detail.html:22
+#: templates/admin/domain_detail.html:21
 msgid "Summary"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:26
+#: templates/admin/account_detail.html:26
 #, fuzzy
 #| msgid "File name"
 msgid "Full name"
 msgstr "Nome do ficheiro"
 
-#: admin/templates/admin/account_detail.html:32
-#: admin/templates/admin/alias_detail.html:26
+#: templates/admin/account_detail.html:32 templates/admin/alias_detail.html:26
 #, fuzzy
 #| msgid "Create"
 msgid "Created"
 msgstr "Criar"
 
-#: admin/templates/admin/account_detail.html:35
+#: templates/admin/account_detail.html:35
 msgid "Last login"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:38
+#: templates/admin/account_detail.html:38
 msgid "Secondary email"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:38
-#: admin/templates/admin/account_detail.html:41
+#: templates/admin/account_detail.html:38
+#: templates/admin/account_detail.html:41
 #, fuzzy
 #| msgid "No recipient defined"
 msgid "Not defined"
 msgstr "Sem destinatário definido"
 
-#: admin/templates/admin/account_detail.html:41
+#: templates/admin/account_detail.html:41
 msgid "Phone number"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:55
+#: templates/admin/account_detail.html:55
 #, fuzzy
 #| msgid "Administration"
 msgid "Administered domains"
 msgstr "Administração"
 
-#: admin/templates/admin/account_detail.html:61
+#: templates/admin/account_detail.html:61
 #, fuzzy
 #| msgid "No recipient defined"
 msgid "No domain defined."
 msgstr "Sem destinatário definido"
 
-#: admin/templates/admin/account_detail.html:75
+#: templates/admin/account_detail.html:75
 #, fuzzy
 #| msgid "Alias(es)"
 msgid "Aliases"
 msgstr "Alias(es)"
 
-#: admin/templates/admin/account_detail.html:81
+#: templates/admin/account_detail.html:81
 #, fuzzy
 #| msgid "No recipient defined"
 msgid "No alias defined"
 msgstr "Sem destinatário definido"
 
-#: admin/templates/admin/account_detail.html:87
+#: templates/admin/account_detail.html:87
 msgid "Additional sender addresses"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:93
+#: templates/admin/account_detail.html:93
 msgid "No sender address defined"
 msgstr ""
 
-#: admin/templates/admin/account_general_form.html:11
-#: admin/templates/admin/aliasform.html:13
+#: templates/admin/account_general_form.html:11
+#: templates/admin/aliasform.html:13
 msgid "Domain is disabled"
 msgstr "O dominio está inativo"
 
-#: admin/templates/admin/alias_detail.html:16
-#: admin/templates/admin/identities.html:33
+#: templates/admin/alias_detail.html:16 templates/admin/identities.html:33
 #, fuzzy
 #| msgid "alias"
 msgid "Alias"
 msgstr "alias"
 
-#: admin/templates/admin/alias_detail.html:27
+#: templates/admin/alias_detail.html:27
 #, fuzzy
 #| msgid "Alias modified"
 msgid "Modified"
 msgstr "'Alias' modificado"
 
-#: admin/templates/admin/dnsbl_domain_detail.html:10
+#: templates/admin/dnsbl_domain_detail.html:10
 msgid "Provider"
 msgstr ""
 
-#: admin/templates/admin/dnsbl_domain_detail.html:11
-#: admin/templates/admin/mx_domain_detail.html:10
-#: admin/templates/admin/quota_headers.html:2
+#: templates/admin/dnsbl_domain_detail.html:11
+#: templates/admin/mx_domain_detail.html:10
+#: templates/admin/quota_headers.html:2
 msgid "Address"
 msgstr "Endereço"
 
-#: admin/templates/admin/dnsbl_domain_detail.html:12
+#: templates/admin/dnsbl_domain_detail.html:12
 #, fuzzy
 #| msgid "Statistics"
 msgid "Status"
 msgstr "Estatísticas"
 
-#: admin/templates/admin/dnsbl_domain_detail.html:21
+#: templates/admin/dnsbl_domain_detail.html:21
 msgid "listed"
 msgstr ""
 
-#: admin/templates/admin/dnsbl_domain_detail.html:29
+#: templates/admin/dnsbl_domain_detail.html:29
 msgid "Everything is fine, this domain is not listed."
 msgstr ""
 
-#: admin/templates/admin/dnsbl_domain_detail.html:32
+#: templates/admin/dnsbl_domain_detail.html:32
 msgid "No information available for this domain."
 msgstr ""
 
-#: admin/templates/admin/domain_detail.html:26
-#: admin/templates/admin/domains.html:38
+#: templates/admin/domain_detail.html:26 templates/admin/domains.html:38
 #, fuzzy
 #| msgid "Statistics"
 msgid "DNS status"
 msgstr "Estatísticas"
 
-#: admin/templates/admin/domain_detail.html:28
-#: admin/templates/admin/domains_table.html:12
+#: templates/admin/domain_detail.html:28 templates/admin/domains_table.html:14
 msgid "Awaiting checks"
 msgstr ""
 
-#: admin/templates/admin/domain_detail.html:40
+#: templates/admin/domain_detail.html:40
 msgid "Creation date"
 msgstr "Data de criação"
 
-#: admin/templates/admin/domain_detail.html:42
+#: templates/admin/domain_detail.html:42
 msgid "Last modification date"
 msgstr "Data da última modificação"
 
-#: admin/templates/admin/domain_detail.html:43
-#: admin/templates/admin/domain_detail.html:52
-#: admin/templates/admin/domain_statistics.html:33
+#: templates/admin/domain_detail.html:43 templates/admin/domain_detail.html:52
+#: templates/admin/domain_statistics.html:33
 msgid "Domain aliases"
 msgstr "Aliases de domínio"
 
-#: admin/templates/admin/domain_detail.html:45
+#: templates/admin/domain_detail.html:45
 msgid "Mailbox aliases"
 msgstr "Aliases para caixas de correio"
 
-#: admin/templates/admin/domain_detail.html:69
+#: templates/admin/domain_detail.html:69
 msgid "Administrators"
 msgstr "Administradores"
 
-#: admin/templates/admin/domain_detail.html:79
-#: admin/templatetags/admin_tags.py:259
+#: templates/admin/domain_detail.html:79 templatetags/admin_tags.py:259
 msgid "Remove this permission"
 msgstr "Remover esta permissão"
 
-#: admin/templates/admin/domain_detail.html:84
+#: templates/admin/domain_detail.html:84
 #, fuzzy
 #| msgid "No domain administrator defined"
 msgid "No domain administrator defined yet."
 msgstr "Nenhum administrador de domínio definido"
 
-#: admin/templates/admin/domain_general_form.html:4
-#: admin/templates/admin/mailform.html:4
-#: admin/templates/admin/newdomainform.html:3
+#: templates/admin/domain_general_form.html:4 templates/admin/mailform.html:4
+#: templates/admin/newdomainform.html:3
 msgid "MB"
 msgstr "MB"
 
-#: admin/templates/admin/domain_options_form.html:7
+#: templates/admin/domain_options_form.html:7
 msgid "You can't create a new domain administrator"
 msgstr "Não pode criar administradores de domínio"
 
-#: admin/templates/admin/domain_statistics.html:15
-#: admin/templatetags/admin_tags.py:44
+#: templates/admin/domain_statistics.html:15 templatetags/admin_tags.py:44
 msgid "Statistics"
 msgstr "Estatísticas"
 
-#: admin/templates/admin/domain_statistics.html:15
+#: templates/admin/domain_statistics.html:15
 msgid "Domains and identities"
 msgstr "Domínios e identidades"
 
-#: admin/templates/admin/domain_statistics.html:22
+#: templates/admin/domain_statistics.html:22
 msgid "Global counters"
 msgstr "Contadores globais"
 
-#: admin/templates/admin/domain_statistics.html:27
+#: templates/admin/domain_statistics.html:27
 msgid "Quantity"
 msgstr "Quantidade"
 
-#: admin/templates/admin/domain_statistics.html:45
+#: templates/admin/domain_statistics.html:45
 msgid "Per-domain counters"
 msgstr "Contadores por-domínio"
 
-#: admin/templates/admin/domains.html:26
-#: admin/templates/admin/identities.html:29
+#: templates/admin/domains.html:26 templates/admin/identities.html:29
 #, fuzzy
 #| msgid "Address"
 msgid "Add"
 msgstr "Endereço"
 
-#: admin/templates/admin/domains.html:36
-#: admin/templates/admin/identity_headers.html:4
+#: templates/admin/domains.html:36 templates/admin/identity_headers.html:4
 msgid "Tags"
 msgstr "Tags"
 
-#: admin/templates/admin/domains.html:40
-#: admin/templates/admin/identity_headers.html:5
+#: templates/admin/domains.html:40 templates/admin/identity_headers.html:5
 msgid "Actions"
 msgstr "Ações"
 
-#: admin/templates/admin/domains_table.html:5
+#: templates/admin/domains_table.html:5
 msgid "disabled"
 msgstr "inativo"
 
-#: admin/templates/admin/forward.html:2
+#: templates/admin/domains_table.html:12
+#, fuzzy
+#| msgid "disabled"
+msgctxt "checks"
+msgid "Disabled"
+msgstr "inativo"
+
+#: templates/admin/forward.html:2
 msgid "Automatically forward emails to another address"
 msgstr "Reenviar automaticamente e-mails para outro endereço"
 
-#: admin/templates/admin/forward.html:9 admin/views/alias.py:91
+#: templates/admin/forward.html:9 views/alias.py:91
 msgid "Update"
 msgstr "Actualizar"
 
-#: admin/templates/admin/identities.html:32
+#: templates/admin/identities.html:32
 #, fuzzy
 #| msgid "Add account"
 msgid "Account"
 msgstr "Adicionar conta"
 
-#: admin/templates/admin/identity_headers.html:3
+#: templates/admin/identity_headers.html:3
 msgid "Fullname/Recipient"
 msgstr "Nome Completo / Destinatário"
 
-#: admin/templates/admin/import_domains_form.html:6
+#: templates/admin/import_domains_form.html:6
 msgid ""
 "Provide a CSV file where lines respect one of the following formats: <ul> "
 "<li><em>domain; name; quota; enabled</em></li> <li><em>domainalias; name; "
@@ -925,7 +911,7 @@ msgid ""
 "<p>You can use a different character as separator.</p>"
 msgstr ""
 
-#: admin/templates/admin/import_identities_form.html:6
+#: templates/admin/import_identities_form.html:6
 msgid ""
 "Provide a CSV file where lines respect one of the following formats: <ul> "
 "<li><em>account; loginname; password; first name; last name; enabled; group; "
@@ -935,138 +921,138 @@ msgid ""
 "use a different character as separator.</p>"
 msgstr ""
 
-#: admin/templates/admin/importform.html:6
+#: templates/admin/importform.html:6
 msgid "Help"
 msgstr "Ajuda"
 
-#: admin/templates/admin/importform.html:13
+#: templates/admin/importform.html:13
 msgid "Importing..."
 msgstr "A importar..."
 
-#: admin/templates/admin/mailboxes_raw.html:3
+#: templates/admin/mailboxes_raw.html:3
 msgid "Choose a value"
 msgstr "Escolha um valor"
 
-#: admin/templates/admin/mailform.html:4
+#: templates/admin/mailform.html:4
 msgid "Use domain default value"
 msgstr "Usar um valor padrão de domínio"
 
-#: admin/templates/admin/mx_domain_detail.html:11
+#: templates/admin/mx_domain_detail.html:11
 #, fuzzy
 #| msgid "Update"
 msgid "Updated"
 msgstr "Actualizar"
 
-#: admin/templates/admin/mx_domain_detail.html:23
+#: templates/admin/mx_domain_detail.html:23
 msgid "This IP does not match any of the valid MXs defined in parameters"
 msgstr ""
 
-#: admin/templates/admin/mx_domain_detail.html:36
+#: templates/admin/mx_domain_detail.html:36
 msgid "No MX record found for this domain."
 msgstr ""
 
-#: admin/templates/admin/notifications/domain_in_dnsbl.html:3
+#: templates/admin/notifications/domain_in_dnsbl.html:3
 #, python-format
 msgid ""
 "Modoboa detected that domain %(domain)s is listed by the following DNSBL "
 "providers:"
 msgstr ""
 
-#: admin/templates/admin/notifications/domain_in_dnsbl.html:11
+#: templates/admin/notifications/domain_in_dnsbl.html:11
 msgid ""
 "The domain's reputation will be affected and there is a chance that emails "
 "coming from it are considered as spam. You should contact those providers "
 "and ask them to unlist detected IP address(es)."
 msgstr ""
 
-#: admin/templates/admin/notifications/domain_invalid_mx.html:3
+#: templates/admin/notifications/domain_invalid_mx.html:3
 #, python-format
 msgid "Modoboa detected that domain %(domain)s has no valid MX record:"
 msgstr ""
 
-#: admin/templates/admin/quota_headers.html:3
+#: templates/admin/quota_headers.html:3
 msgid "Value"
 msgstr "Valor"
 
-#: admin/templates/admin/quota_headers.html:4
+#: templates/admin/quota_headers.html:4
 msgid "Limit"
 msgstr "Limite"
 
-#: admin/templates/admin/quota_headers.html:5
+#: templates/admin/quota_headers.html:5
 #, python-format
 msgid "Usage (%%)"
 msgstr "Utilização (%%)"
 
-#: admin/templates/admin/searchform.html:6
+#: templates/admin/searchform.html:6
 msgid "Search"
 msgstr "Procurar"
 
-#: admin/templatetags/admin_tags.py:18
+#: templatetags/admin_tags.py:18
 msgid "enabled_m"
 msgstr "enabled_m"
 
-#: admin/templatetags/admin_tags.py:18
+#: templatetags/admin_tags.py:18
 msgid "enabled_f"
 msgstr "enabled_f"
 
-#: admin/templatetags/admin_tags.py:39
+#: templatetags/admin_tags.py:39
 msgid "List domains"
 msgstr "Listar domínios"
 
-#: admin/templatetags/admin_tags.py:56 admin/templatetags/admin_tags.py:104
-#: admin/views/import_.py:87 admin/views/import_.py:109
+#: templatetags/admin_tags.py:56 templatetags/admin_tags.py:104
+#: views/import_.py:87 views/import_.py:109
 msgid "Import"
 msgstr "Importar"
 
-#: admin/templatetags/admin_tags.py:62 admin/templatetags/admin_tags.py:110
-#: admin/views/export.py:41 admin/views/export.py:69
+#: templatetags/admin_tags.py:62 templatetags/admin_tags.py:110
+#: views/export.py:41 views/export.py:69
 msgid "Export"
 msgstr "Exportar"
 
-#: admin/templatetags/admin_tags.py:94
+#: templatetags/admin_tags.py:94
 msgid "List identities"
 msgstr "Listar identidades"
 
-#: admin/templatetags/admin_tags.py:99
+#: templatetags/admin_tags.py:99
 msgid "List quotas"
 msgstr "Listar as quotas"
 
-#: admin/templatetags/admin_tags.py:129
+#: templatetags/admin_tags.py:129
 msgid "View the domain's identities"
 msgstr "Visualizar as identidades do domínio"
 
-#: admin/templatetags/admin_tags.py:135 admin/templatetags/admin_tags.py:178
-#: admin/templatetags/admin_tags.py:191
+#: templatetags/admin_tags.py:135 templatetags/admin_tags.py:178
+#: templatetags/admin_tags.py:191
 msgid "Edit {}"
 msgstr ""
 
-#: admin/templatetags/admin_tags.py:145 admin/templatetags/admin_tags.py:182
-#: admin/templatetags/admin_tags.py:196
+#: templatetags/admin_tags.py:145 templatetags/admin_tags.py:182
+#: templatetags/admin_tags.py:196
 #, python-format
 msgid "Delete %s?"
 msgstr "Eliminar %s?"
 
-#: admin/views/alias.py:33
+#: views/alias.py:33
 msgid "Alias with this name already exists"
 msgstr "Já existe um 'alias' com este nome"
 
-#: admin/views/alias.py:58
+#: views/alias.py:58
 msgid "Create"
 msgstr "Criar"
 
-#: admin/views/alias.py:70
+#: views/alias.py:70
 msgid "New alias"
 msgstr "Novo 'alias'"
 
-#: admin/views/alias.py:71
+#: views/alias.py:71
 msgid "Alias created"
 msgstr "Alias criado"
 
-#: admin/views/alias.py:83
+#: views/alias.py:83
 msgid "Alias modified"
 msgstr "'Alias' modificado"
 
-#: admin/views/alias.py:107
+#: views/alias.py:107
 #, fuzzy
 #| msgid "Alias created"
 msgid "Alias deleted"
@@ -1074,62 +1060,61 @@ msgid_plural "Aliases deleted"
 msgstr[0] "Alias criado"
 msgstr[1] "Alias criado"
 
-#: admin/views/dns.py:30
+#: views/dns.py:30
 msgid "MX records of {}"
 msgstr ""
 
-#: admin/views/dns.py:53
+#: views/dns.py:53
 msgid "DNSBL summary for {}"
 msgstr ""
 
-#: admin/views/domain.py:152
+#: views/domain.py:152
 msgid "You can't delete your own domain"
 msgstr "Não é possível eliminar o seu próprio domínio"
 
-#: admin/views/domain.py:155
+#: views/domain.py:155
 msgid "Domain deleted"
 msgid_plural "Domains deleted"
 msgstr[0] "Domínio criado"
 msgstr[1] "Domínios eliminados"
 
-#: admin/views/export.py:40
+#: views/export.py:40
 msgid "Export identities"
 msgstr "Exportar identidades"
 
-#: admin/views/export.py:68
+#: views/export.py:68
 msgid "Export domains"
 msgstr "Exportar domínios"
 
-#: admin/views/identity.py:111 admin/views/identity.py:205
-#: admin/views/identity.py:210
+#: views/identity.py:111 views/identity.py:205 views/identity.py:210
 msgid "Invalid request"
 msgstr "Pedido inválido"
 
-#: admin/views/identity.py:195
+#: views/identity.py:195
 msgid "Account deleted"
 msgid_plural "Accounts deleted"
 msgstr[0] "Conta eliminada"
 msgstr[1] "Contas eliminadas"
 
-#: admin/views/import_.py:63
+#: views/import_.py:63
 #, python-format
 msgid "Object already exists: %s"
 msgstr "Este objeto já existe: %s"
 
-#: admin/views/import_.py:67
+#: views/import_.py:67
 #, python-format
 msgid "%d objects imported successfully"
 msgstr "%d objetos importados com sucesso"
 
-#: admin/views/import_.py:86
+#: views/import_.py:86
 msgid "Import domains"
 msgstr "Importar domínios"
 
-#: admin/views/import_.py:108
+#: views/import_.py:108
 msgid "Import identities"
 msgstr "Importar identidades"
 
-#: admin/views/user.py:35
+#: views/user.py:35
 msgid "Forward updated"
 msgstr "Reencaminhamento atualizado"
 
diff --git a/modoboa/admin/locale/ru/LC_MESSAGES/django.po b/modoboa/admin/locale/ru/LC_MESSAGES/django.po
index 951aa93e6..3b6ccb2ec 100644
--- a/modoboa/admin/locale/ru/LC_MESSAGES/django.po
+++ b/modoboa/admin/locale/ru/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Modoboa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-14 14:13+0100\n"
+"POT-Creation-Date: 2017-01-16 13:02+0100\n"
 "PO-Revision-Date: 2013-12-03 09:35+0000\n"
 "Last-Translator: Antoine Nguyen <tonio@ngyn.org>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/modoboa/language/"
@@ -19,47 +19,46 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: admin/app_settings.py:17 admin/handlers.py:245
-#: admin/templates/admin/domain_statistics.html:30
-#: admin/templates/admin/domains.html:4
+#: app_settings.py:17 handlers.py:252
+#: templates/admin/domain_statistics.html:30 templates/admin/domains.html:4
 msgid "Domains"
 msgstr "Домены"
 
-#: admin/app_settings.py:20
+#: app_settings.py:20
 msgid "Enable MX checks"
 msgstr ""
 
-#: admin/app_settings.py:23
+#: app_settings.py:23
 msgid "Check that every domain has a valid MX record"
 msgstr ""
 
-#: admin/app_settings.py:28
+#: app_settings.py:28
 msgid "Valid MXs"
 msgstr ""
 
-#: admin/app_settings.py:31
+#: app_settings.py:31
 msgid ""
-"IP(s) or network(s) of the MX that should match with domains' MX records. On "
-"per line."
+"A list of IP or network address every MX record should match. A warning will "
+"be sent if a record does not respect it."
 msgstr ""
 
-#: admin/app_settings.py:40
+#: app_settings.py:39
 msgid "Enable DNSBL checks"
 msgstr ""
 
-#: admin/app_settings.py:43
+#: app_settings.py:42
 msgid "Check every domain against major DNSBL providers"
 msgstr ""
 
-#: admin/app_settings.py:47 admin/templates/admin/domain_detail.html.py:44
+#: app_settings.py:46 templates/admin/domain_detail.html:44
 msgid "Mailboxes"
 msgstr "Почтовые ящики"
 
-#: admin/app_settings.py:50
+#: app_settings.py:49
 msgid "Handle mailboxes on filesystem"
 msgstr "Обрабатывать почтовые ящики на диске"
 
-#: admin/app_settings.py:53
+#: app_settings.py:52
 #, fuzzy
 msgid ""
 "Rename or remove mailboxes on the filesystem when they get renamed or "
@@ -68,110 +67,109 @@ msgstr ""
 "Удалять или переименовывать почтовые ящики на диске, если они удалены или "
 "переименованы в Modoboa"
 
-#: admin/app_settings.py:59
+#: app_settings.py:58
 msgid "Mailboxes owner"
 msgstr "Почтовые ящики закончились"
 
-#: admin/app_settings.py:62
+#: app_settings.py:61
 msgid "The UNIX account who owns mailboxes on the filesystem"
 msgstr "UNIX аккаунт владельца почтового ящика на диске"
 
-#: admin/app_settings.py:67
+#: app_settings.py:66
 msgid "Default domain quota"
 msgstr ""
 
-#: admin/app_settings.py:70
+#: app_settings.py:69
 msgid ""
 "Default quota (in MB) applied to freshly created domains with no value "
 "specified. A value of 0 means no quota."
 msgstr ""
 
-#: admin/app_settings.py:76
+#: app_settings.py:75
 msgid "Automatic account removal"
 msgstr "Автоматическое удаление аккаунта"
 
-#: admin/app_settings.py:79
+#: app_settings.py:78
 msgid "When a mailbox is removed, also remove the associated account"
 msgstr "При удалении почтового ящика, так же удалять и аккаунт владельца"
 
-#: admin/app_settings.py:83
+#: app_settings.py:82
 #, fuzzy
 msgid "Automatic domain/mailbox creation"
 msgstr "Домен создан"
 
-#: admin/app_settings.py:86
+#: app_settings.py:85
 msgid "Create a domain and a mailbox when an account is automatically created."
 msgstr ""
 
-#: admin/app_settings.py:133 admin/forms/account.py:288
-#: admin/forms/domain.py:87
+#: app_settings.py:132 forms/account.py:288 forms/domain.py:87
 msgid "Must be a positive integer"
 msgstr ""
 
-#: admin/app_settings.py:143
+#: app_settings.py:142
 msgid "Administration"
 msgstr ""
 
-#: admin/forms/account.py:34 admin/templates/admin/domain_detail.html.py:72
+#: forms/account.py:34 templates/admin/domain_detail.html:72
 msgid "Username"
 msgstr "Логин пользователя"
 
-#: admin/forms/account.py:36
+#: forms/account.py:36
 msgid ""
 "The user's name. Must be a valid e-mail address for simple users or "
 "administrators with a mailbox."
 msgstr ""
 
-#: admin/forms/account.py:41 admin/templates/admin/account_detail.html.py:29
+#: forms/account.py:41 templates/admin/account_detail.html:29
 msgid "Role"
 msgstr "Роль"
 
-#: admin/forms/account.py:42
+#: forms/account.py:42
 msgid "Choose"
 msgstr "Выбрать"
 
-#: admin/forms/account.py:43
+#: forms/account.py:43
 msgid "What level of permission this user will have"
 msgstr "Разрешения для этого пользователя"
 
-#: admin/forms/account.py:46
+#: forms/account.py:46
 msgid "Password"
 msgstr "Пароль"
 
-#: admin/forms/account.py:50
+#: forms/account.py:50
 msgid "Confirmation"
 msgstr "Подтверждение"
 
-#: admin/forms/account.py:53
+#: forms/account.py:53
 msgid "Enter the same password as above, for verification."
 msgstr "Введите такой же пароль как выше. Для проверки."
 
-#: admin/forms/account.py:64
+#: forms/account.py:64
 msgid "Enabled"
 msgstr "Разрешено"
 
-#: admin/forms/account.py:156
+#: forms/account.py:156
 msgid "The two password fields didn't match."
 msgstr "Пароли не совпадают"
 
-#: admin/forms/account.py:171
+#: forms/account.py:171
 msgid "Only super administrators are allowed for this mode"
 msgstr ""
 
-#: admin/forms/account.py:179
+#: forms/account.py:179
 msgid "You can't disable your own account"
 msgstr "Вы не можете запретить собственный аккаунт"
 
-#: admin/forms/account.py:194
+#: forms/account.py:194
 msgid "E-mail"
 msgstr "Е-майл"
 
-#: admin/forms/account.py:196 admin/forms/domain.py:38
-#: admin/templates/admin/account_detail.html:45
+#: forms/account.py:196 forms/domain.py:38
+#: templates/admin/account_detail.html:45
 msgid "Quota"
 msgstr "Квота"
 
-#: admin/forms/account.py:198
+#: forms/account.py:198
 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 "
@@ -182,12 +180,11 @@ msgstr ""
 "Оставьте пустым для неограниченного значения.  (Не разрешено администраторам "
 "домена)"
 
-#: admin/forms/account.py:206 admin/forms/domain.py:46
-#: admin/templates/admin/domains.html:35
+#: forms/account.py:206 forms/domain.py:46 templates/admin/domains.html:35
 msgid "Alias(es)"
 msgstr "Синоним(ы)"
 
-#: admin/forms/account.py:209
+#: forms/account.py:209
 #, fuzzy
 #| msgid ""
 #| "Alias(es) of this mailbox. Indicate only one address per input, press "
@@ -201,13 +198,13 @@ msgstr ""
 "Синонимы этого почтового ящика. Вводите один адрес за раз. Нажмите ENTER для "
 "добавления. Используйте '*' для создания синонима 'для всех' (*@domain.tld)"
 
-#: admin/forms/account.py:215
+#: forms/account.py:215
 #, fuzzy
 #| msgid "Invalid request"
 msgid "Sender addresses"
 msgstr "Ошибочный запрос"
 
-#: admin/forms/account.py:218
+#: forms/account.py:218
 #, fuzzy
 #| msgid ""
 #| "Mailbox(es) this alias will point to. Indicate only one address per "
@@ -220,61 +217,60 @@ msgstr ""
 "Этот синоним почтового ящика. Вводите один адрес за раз. Нажмите ENTER для "
 "добавления."
 
-#: admin/forms/account.py:267 admin/forms/alias.py:92
-#: admin/models/mailbox.py:295
+#: forms/account.py:267 forms/alias.py:92 models/mailbox.py:295
 msgid "Domain does not exist"
 msgstr "Домен не существует"
 
-#: admin/forms/account.py:297
+#: forms/account.py:297
 #, fuzzy
 #| msgid "Domain does not exist"
 msgid "Local domain does not exist"
 msgstr "Домен не существует"
 
-#: admin/forms/account.py:392
+#: forms/account.py:392
 msgid "Domain(s)"
 msgstr "Домен(ы)"
 
-#: admin/forms/account.py:394
+#: forms/account.py:394
 msgid "Domain(s) that user administrates"
 msgstr "Домен(ы) администрируемые пользователем"
 
-#: admin/forms/account.py:440 admin/forms/account.py:525
-#: admin/forms/domain.py:283 admin/forms/domain.py:350
+#: forms/account.py:440 forms/account.py:525 forms/domain.py:283
+#: forms/domain.py:350
 msgid "General"
 msgstr "Основные"
 
-#: admin/forms/account.py:445 admin/forms/account.py:531
+#: forms/account.py:445 forms/account.py:531
 msgid "Mail"
 msgstr "Почта"
 
-#: admin/forms/account.py:447
+#: forms/account.py:447
 msgid "Permissions"
 msgstr "Права"
 
-#: admin/forms/account.py:514
+#: forms/account.py:514
 msgid "Account updated"
 msgstr "аккаунт изменен"
 
-#: admin/forms/account.py:538
+#: forms/account.py:538
 msgid "New account"
 msgstr "Новый аккаунт"
 
-#: admin/forms/account.py:550
+#: forms/account.py:550
 msgid "Account created"
 msgstr "Аккаунт создан"
 
-#: admin/forms/alias.py:24
+#: forms/alias.py:24
 #, fuzzy
 #| msgid "Invalid request"
 msgid "Random address"
 msgstr "Ошибочный запрос"
 
-#: admin/forms/alias.py:27
+#: forms/alias.py:27
 msgid "Email address"
 msgstr "Е-майл адрес"
 
-#: admin/forms/alias.py:29
+#: forms/alias.py:29
 #, fuzzy
 #| msgid ""
 #| "The alias address (without the domain part). For a 'catch-all' address, "
@@ -286,11 +282,11 @@ msgstr ""
 "Адреса синонимов (без доменной части). Для указания адреса 'для всех' "
 "введите символ *"
 
-#: admin/forms/alias.py:35 admin/templates/admin/alias_detail.html.py:37
+#: forms/alias.py:35 templates/admin/alias_detail.html:37
 msgid "Recipients"
 msgstr "Получатели"
 
-#: admin/forms/alias.py:37
+#: forms/alias.py:37
 #, fuzzy
 #| msgid ""
 #| "Mailbox(es) this alias will point to. Indicate only one address per "
@@ -302,36 +298,36 @@ msgstr ""
 "Этот синоним почтового ящика. Вводите один адрес за раз. Нажмите ENTER для "
 "добавления."
 
-#: admin/forms/alias.py:47 admin/forms/domain.py:26 admin/models/domain.py:91
-#: admin/templates/admin/domain_statistics.html:49
+#: forms/alias.py:47 forms/domain.py:26 models/domain.py:92
+#: templates/admin/domain_statistics.html:49
 msgid "Domain"
 msgstr ""
 
-#: admin/forms/alias.py:95
+#: forms/alias.py:95
 msgid "You don't have access to this domain"
 msgstr "Вы не имеете права доступа к этому домену"
 
-#: admin/forms/alias.py:112 admin/forms/alias.py:114
+#: forms/alias.py:112 forms/alias.py:114
 #, fuzzy
 #| msgid "A quota is required"
 msgid "This field is required"
 msgstr "Требуется квота"
 
-#: admin/forms/alias.py:118
+#: forms/alias.py:118
 msgid "No recipient defined"
 msgstr "Получатель не определен"
 
-#: admin/forms/domain.py:35 admin/templates/admin/domain_statistics.html.py:26
+#: forms/domain.py:35 templates/admin/domain_statistics.html:26
 msgid "Type"
 msgstr ""
 
-#: admin/forms/domain.py:41
+#: forms/domain.py:41
 msgid ""
 "Default quota in MB applied to mailboxes. Leave empty to use the default "
 "value."
 msgstr ""
 
-#: admin/forms/domain.py:49
+#: forms/domain.py:49
 msgid ""
 "Alias(es) of this domain. Indicate only one name per input, press ENTER to "
 "add a new input."
@@ -339,36 +335,34 @@ msgstr ""
 "Синоним(ы) этого домена. Вводите одно имя за раз. Нажмите ENTER для "
 "добавления."
 
-#: admin/forms/domain.py:103 admin/handlers.py:148
+#: forms/domain.py:103 handlers.py:155
 msgid "domain alias"
 msgstr ""
 
-#: admin/forms/domain.py:106 admin/forms/domain.py:118
-#: admin/forms/domain.py:126
+#: forms/domain.py:106 forms/domain.py:118 forms/domain.py:126
 #, python-format
 msgid "A %s with this name already exists"
 msgstr ""
 
-#: admin/forms/domain.py:118 admin/forms/domain.py:123
+#: forms/domain.py:118 forms/domain.py:123
 msgid "domain"
 msgstr ""
 
-#: admin/forms/domain.py:171
+#: forms/domain.py:171
 msgid "Create a domain administrator"
 msgstr "Создание администратора домена"
 
-#: admin/forms/domain.py:174
+#: forms/domain.py:174
 msgid "Automatically create an administrator for this domain"
 msgstr "Автоматически создаст администратора для этого домена"
 
-#: admin/forms/domain.py:179 admin/templates/admin/domain_detail.html.py:72
-#: admin/templates/admin/domains.html:34
-#: admin/templates/admin/identity_headers.html:2
-#: admin/templates/admin/mx_domain_detail.html:9
+#: forms/domain.py:179 templates/admin/domain_detail.html:72
+#: templates/admin/domains.html:34 templates/admin/identity_headers.html:2
+#: templates/admin/mx_domain_detail.html:9
 msgid "Name"
 msgstr "Логин"
 
-#: admin/forms/domain.py:182
+#: forms/domain.py:182
 msgid ""
 "The administrator's name. Don't include the domain's name here, it will be "
 "automatically appended."
@@ -376,72 +370,72 @@ msgstr ""
 "Имя администратора. Не включайте имя домена оно будет добавлено "
 "автоматически."
 
-#: admin/forms/domain.py:189
+#: forms/domain.py:189
 msgid "Create aliases"
 msgstr "Создание синонимов"
 
-#: admin/forms/domain.py:192
+#: forms/domain.py:192
 msgid "Automatically create standard aliases for this domain"
 msgstr "Автоматически создает стандартные синонимы для этого домена"
 
-#: admin/forms/domain.py:208
+#: forms/domain.py:208
 msgid "Invalid format"
 msgstr "Неверный формат"
 
-#: admin/forms/domain.py:217 admin/forms/domain.py:220
+#: forms/domain.py:217 forms/domain.py:220
 #, fuzzy
 #| msgid "A quota is required"
 msgid "This field is required."
 msgstr "Требуется квота"
 
-#: admin/forms/domain.py:237
+#: forms/domain.py:237
 #, python-format
 msgid "User '%s' already exists"
 msgstr "Пользователь  '%s' уже существует"
 
-#: admin/forms/domain.py:339
+#: forms/domain.py:339
 msgid "Domain modified"
 msgstr "Домен изменен"
 
-#: admin/forms/domain.py:360
+#: forms/domain.py:360
 msgid "Options"
 msgstr "Опции"
 
-#: admin/forms/domain.py:368
+#: forms/domain.py:368
 msgid "New domain"
 msgstr "Новый домен"
 
-#: admin/forms/domain.py:381
+#: forms/domain.py:381
 msgid "Domain created"
 msgstr "Домен создан"
 
-#: admin/forms/export.py:7
+#: forms/export.py:7
 msgid "File name"
 msgstr "Имя файла"
 
-#: admin/forms/export.py:13 admin/forms/import_.py:13
+#: forms/export.py:13 forms/import_.py:13
 msgid "Separator"
 msgstr "Разделитель"
 
-#: admin/forms/forward.py:14
+#: forms/forward.py:14
 msgid "Recipient(s)"
 msgstr "Получатели"
 
-#: admin/forms/forward.py:18
+#: forms/forward.py:18
 msgid "Indicate one or more recipients separated by a ','"
 msgstr "Укажите одного или нескольких получателей, разделенных запятой ','"
 
-#: admin/forms/forward.py:21
+#: forms/forward.py:21
 msgid "Keep local copies"
 msgstr "Сохранить локальную копию"
 
-#: admin/forms/forward.py:24
+#: forms/forward.py:24
 msgid "Forward messages and store copies into your local mailbox"
 msgstr ""
 "Перенаправление сообщения, и сохранение копии в вашем локальном почтовом "
 "ящике"
 
-#: admin/forms/forward.py:42
+#: forms/forward.py:42
 msgid ""
 "You can't define a forward to a local destination. Please ask your "
 "administrator to create an alias instead."
@@ -449,466 +443,457 @@ msgstr ""
 "Вы не можете определить перенаправление на локальный адрес. Пожалуйста, "
 "попросите администратора создать синоним"
 
-#: admin/forms/import_.py:11
+#: forms/import_.py:11
 msgid "Select a file"
 msgstr "Выберите файл"
 
-#: admin/forms/import_.py:19
+#: forms/import_.py:19
 msgid "Continue on error"
 msgstr "Продолжать при ошибке"
 
-#: admin/forms/import_.py:20
+#: forms/import_.py:20
 msgid "Don't treat duplicated objects as error"
 msgstr "Не исправлять дублирующийся объект при ошибке"
 
-#: admin/forms/import_.py:38
+#: forms/import_.py:38
 msgid "Crypt passwords"
 msgstr "Шифровать пароль"
 
-#: admin/forms/import_.py:40
+#: forms/import_.py:40
 msgid "Check this option if passwords contained in your file are not crypted"
 msgstr "Выберите эту опцию если пароль в вашем файле не зашифрован "
 
-#: admin/handlers.py:194
+#: handlers.py:201
 #, python-format
 msgid "Account import failed (%s): domain does not exist"
 msgstr "Ошибка импорта аккаунта (%s): домен должен существовать "
 
-#: admin/handlers.py:207 admin/models/mailbox.py:320
+#: handlers.py:214 models/mailbox.py:320
 #, fuzzy
 #| msgid "Mailbox %s already exists"
 msgid "Mailbox {} already exists"
 msgstr "Почтовый ящик %s существует"
 
-#: admin/handlers.py:215
+#: handlers.py:222
 #, fuzzy, python-format
 msgid "Account import failed (%s): wrong quota value"
 msgstr "Ошибка импорта аккаунта (%s): домен должен существовать "
 
-#: admin/handlers.py:255 admin/templates/admin/domain_statistics.html.py:36
-#: admin/templates/admin/domain_statistics.html:50
-#: admin/templates/admin/identities.html:5
+#: handlers.py:262 templates/admin/domain_statistics.html:36
+#: templates/admin/domain_statistics.html:50 templates/admin/identities.html:5
 msgid "Identities"
 msgstr "Пользователи"
 
-#: admin/handlers.py:271 admin/templates/admin/forward.html.py:2
+#: handlers.py:278 templates/admin/forward.html:2
 msgid "Forward"
 msgstr "Перенаправленые"
 
-#: admin/lib.py:32
+#: lib.py:32
 msgid "A mailbox is required"
 msgstr ""
 
-#: admin/lib.py:122
+#: lib.py:122
 #, fuzzy
 #| msgid "You can't delete your own domain"
 msgid "You are not allowed to import domains"
 msgstr "Вы не можете удалить собственный домен"
 
-#: admin/lib.py:133
+#: lib.py:133
 msgid "You are not allowed to import domain aliases."
 msgstr ""
 
-#: admin/management/commands/subcommands/_mx.py:159
+#: management/commands/subcommands/_mx.py:159
 msgid "[modoboa] DNSBL issue(s) for domain {}"
 msgstr ""
 
-#: admin/management/commands/subcommands/_mx.py:180
+#: management/commands/subcommands/_mx.py:180
 msgid "Domain {} has no MX record"
 msgstr ""
 
-#: admin/management/commands/subcommands/_mx.py:191
+#: management/commands/subcommands/_mx.py:191
 #, python-brace-format
 msgid "MX record for domain {0} is invalid: {1}"
 msgstr ""
 
-#: admin/management/commands/subcommands/_mx.py:207
+#: management/commands/subcommands/_mx.py:207
 msgid "[modoboa] MX issue(s) for domain {}"
 msgstr ""
 
-#: admin/models/alias.py:31 admin/models/mailbox.py:80
+#: models/alias.py:31 models/mailbox.py:80
 msgid "address"
 msgstr "адрес"
 
-#: admin/models/alias.py:33
+#: models/alias.py:33
 #, fuzzy
 #| msgid "The alias name"
 msgid "The alias address."
 msgstr "Имя синонима"
 
-#: admin/models/alias.py:38 admin/models/domain.py:46
-#: admin/models/domain_alias.py:44
+#: models/alias.py:38 models/domain.py:47 models/domain_alias.py:44
 msgid "enabled"
 msgstr "Разрешен"
 
-#: admin/models/alias.py:39 admin/models/domain_alias.py:45
+#: models/alias.py:39 models/domain_alias.py:45
 msgid "Check to activate this alias"
 msgstr "Отметить для активации синонима"
 
-#: admin/models/alias.py:44 admin/templates/admin/alias_detail.html.py:32
+#: models/alias.py:44 templates/admin/alias_detail.html:32
 msgid "Description"
 msgstr ""
 
-#: admin/models/alias.py:46 admin/templates/admin/alias_detail.html.py:29
+#: models/alias.py:46 templates/admin/alias_detail.html:29
 msgid "Expire at"
 msgstr ""
 
-#: admin/models/alias.py:89
+#: models/alias.py:89
 msgid "alias"
 msgstr "Синоним"
 
-#: admin/models/alias.py:121
+#: models/alias.py:121
 #, fuzzy
 #| msgid "Invalid request"
 msgid "Invalid address"
 msgstr "Ошибочный запрос"
 
-#: admin/models/alias.py:142
+#: models/alias.py:142
 #, fuzzy
 #| msgid "Local recipient %s not found"
 msgid "Local recipient {}@{} not found"
 msgstr "Локальный получатель  %s не найден"
 
-#: admin/models/alias.py:172
+#: models/alias.py:172
 #, python-format
 msgid "Invalid line: %s"
 msgstr "Неверная строка %s"
 
-#: admin/models/alias.py:178
+#: models/alias.py:178
 #, python-format
 msgid "Domain '%s' does not exist"
 msgstr "Домен '%s' не существует"
 
-#: admin/models/domain.py:42 admin/models/domain_alias.py:37
+#: models/domain.py:43 models/domain_alias.py:37
 msgid "name"
 msgstr "имя"
 
-#: admin/models/domain.py:43
+#: models/domain.py:44
 msgid "The domain name"
 msgstr "Имя домена"
 
-#: admin/models/domain.py:47
+#: models/domain.py:48
 msgid "Check to activate this domain"
 msgstr "Отметить для активации этого домена"
 
-#: admin/models/domain.py:208 admin/models/domain_alias.py:71
+#: models/domain.py:215 models/domain_alias.py:71
 msgid "Invalid line"
 msgstr "Ошибочная строка"
 
-#: admin/models/domain.py:216
+#: models/domain.py:223
 #, python-format
 msgid "Invalid quota value for domain '%s'"
 msgstr ""
 
-#: admin/models/domain_alias.py:38
+#: models/domain_alias.py:38
 msgid "The alias name"
 msgstr "Имя синонима"
 
-#: admin/models/domain_alias.py:40
+#: models/domain_alias.py:40
 msgid "target"
 msgstr "адресат"
 
-#: admin/models/domain_alias.py:41
+#: models/domain_alias.py:41
 msgid "The domain this alias points to"
 msgstr "Домен этого синонима указывает на"
 
-#: admin/models/domain_alias.py:80
+#: models/domain_alias.py:80
 #, python-format
 msgid "Unknown domain %s"
 msgstr "Неизвестный домен %s"
 
-#: admin/models/mailbox.py:82
+#: models/mailbox.py:82
 msgid "Mailbox address (without the @domain.tld part)"
 msgstr "Адрес почтового ящика  (без @domain.tld)"
 
-#: admin/models/mailbox.py:148
+#: models/mailbox.py:148
 #, python-format
 msgid "Failed to retrieve mailbox location (%s)"
 msgstr "Ошибка получения места находжения почтового ящика (%s)"
 
-#: admin/models/mailbox.py:238
+#: models/mailbox.py:238
 #, python-format
 msgid "Quota is greater than the allowed domain's limit (%dM)"
 msgstr "Квота больше чем разрешено на уровне домена (%dM)"
 
-#: admin/models/mailbox.py:244
+#: models/mailbox.py:244
 msgid "A quota is required"
 msgstr "Требуется квота"
 
-#: admin/serializers.py:45 admin/serializers.py:228 admin/serializers.py:317
+#: serializers.py:45 serializers.py:228 serializers.py:317
 #, fuzzy
 #| msgid "Permissions"
 msgid "Permission denied."
 msgstr "Права"
 
-#: admin/serializers.py:83
+#: serializers.py:83
 msgid ""
 "List of administered domains (resellers and domain administrators only)."
 msgstr ""
 
-#: admin/serializers.py:193
+#: serializers.py:193
 msgid "Not allowed for this role."
 msgstr ""
 
-#: admin/serializers.py:203
+#: serializers.py:203
 msgid "Must be equal to mailbox full_address"
 msgstr ""
 
-#: admin/serializers.py:215
+#: serializers.py:215
 #, fuzzy
 #| msgid "Domain does not exist"
 msgid "Local domain {} does not exist"
 msgstr "Домен не существует"
 
-#: admin/serializers.py:315
+#: serializers.py:315
 #, fuzzy
 #| msgid "Domain modified"
 msgid "Domain not found."
 msgstr "Домен изменен"
 
-#: admin/templates/admin/account_detail.html:16
-#: admin/templates/admin/alias_detail.html:16
-#: admin/templates/admin/domain_detail.html:15
-#: admin/templates/admin/identities_table.html:7
+#: templates/admin/account_detail.html:16 templates/admin/alias_detail.html:16
+#: templates/admin/domain_detail.html:15
+#: templates/admin/identities_table.html:7
 #, fuzzy
 msgid "(disabled)"
 msgstr "Разрешен"
 
-#: admin/templates/admin/account_detail.html:22
-#: admin/templates/admin/alias_detail.html:22
-#: admin/templates/admin/domain_detail.html:21
+#: templates/admin/account_detail.html:22 templates/admin/alias_detail.html:22
+#: templates/admin/domain_detail.html:21
 msgid "Summary"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:26
+#: templates/admin/account_detail.html:26
 #, fuzzy
 #| msgid "File name"
 msgid "Full name"
 msgstr "Имя файла"
 
-#: admin/templates/admin/account_detail.html:32
-#: admin/templates/admin/alias_detail.html:26
+#: templates/admin/account_detail.html:32 templates/admin/alias_detail.html:26
 #, fuzzy
 #| msgid "Create"
 msgid "Created"
 msgstr "Создать"
 
-#: admin/templates/admin/account_detail.html:35
+#: templates/admin/account_detail.html:35
 msgid "Last login"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:38
+#: templates/admin/account_detail.html:38
 msgid "Secondary email"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:38
-#: admin/templates/admin/account_detail.html:41
+#: templates/admin/account_detail.html:38
+#: templates/admin/account_detail.html:41
 #, fuzzy
 #| msgid "No recipient defined"
 msgid "Not defined"
 msgstr "Получатель не определен"
 
-#: admin/templates/admin/account_detail.html:41
+#: templates/admin/account_detail.html:41
 msgid "Phone number"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:55
+#: templates/admin/account_detail.html:55
 #, fuzzy
 msgid "Administered domains"
 msgstr "Список квот"
 
-#: admin/templates/admin/account_detail.html:61
+#: templates/admin/account_detail.html:61
 #, fuzzy
 #| msgid "No recipient defined"
 msgid "No domain defined."
 msgstr "Получатель не определен"
 
-#: admin/templates/admin/account_detail.html:75
+#: templates/admin/account_detail.html:75
 #, fuzzy
 #| msgid "Alias(es)"
 msgid "Aliases"
 msgstr "Синоним(ы)"
 
-#: admin/templates/admin/account_detail.html:81
+#: templates/admin/account_detail.html:81
 #, fuzzy
 #| msgid "No recipient defined"
 msgid "No alias defined"
 msgstr "Получатель не определен"
 
-#: admin/templates/admin/account_detail.html:87
+#: templates/admin/account_detail.html:87
 msgid "Additional sender addresses"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:93
+#: templates/admin/account_detail.html:93
 msgid "No sender address defined"
 msgstr ""
 
-#: admin/templates/admin/account_general_form.html:11
-#: admin/templates/admin/aliasform.html:13
+#: templates/admin/account_general_form.html:11
+#: templates/admin/aliasform.html:13
 #, fuzzy
 msgid "Domain is disabled"
 msgstr "Домен удален"
 
-#: admin/templates/admin/alias_detail.html:16
-#: admin/templates/admin/identities.html:33
+#: templates/admin/alias_detail.html:16 templates/admin/identities.html:33
 #, fuzzy
 #| msgid "alias"
 msgid "Alias"
 msgstr "Синоним"
 
-#: admin/templates/admin/alias_detail.html:27
+#: templates/admin/alias_detail.html:27
 #, fuzzy
 #| msgid "Alias modified"
 msgid "Modified"
 msgstr "Синоним изменен"
 
-#: admin/templates/admin/dnsbl_domain_detail.html:10
+#: templates/admin/dnsbl_domain_detail.html:10
 msgid "Provider"
 msgstr ""
 
-#: admin/templates/admin/dnsbl_domain_detail.html:11
-#: admin/templates/admin/mx_domain_detail.html:10
-#: admin/templates/admin/quota_headers.html:2
+#: templates/admin/dnsbl_domain_detail.html:11
+#: templates/admin/mx_domain_detail.html:10
+#: templates/admin/quota_headers.html:2
 msgid "Address"
 msgstr "Адрес"
 
-#: admin/templates/admin/dnsbl_domain_detail.html:12
+#: templates/admin/dnsbl_domain_detail.html:12
 #, fuzzy
 #| msgid "Statistics"
 msgid "Status"
 msgstr "Статистика"
 
-#: admin/templates/admin/dnsbl_domain_detail.html:21
+#: templates/admin/dnsbl_domain_detail.html:21
 msgid "listed"
 msgstr ""
 
-#: admin/templates/admin/dnsbl_domain_detail.html:29
+#: templates/admin/dnsbl_domain_detail.html:29
 msgid "Everything is fine, this domain is not listed."
 msgstr ""
 
-#: admin/templates/admin/dnsbl_domain_detail.html:32
+#: templates/admin/dnsbl_domain_detail.html:32
 msgid "No information available for this domain."
 msgstr ""
 
-#: admin/templates/admin/domain_detail.html:26
-#: admin/templates/admin/domains.html:38
+#: templates/admin/domain_detail.html:26 templates/admin/domains.html:38
 #, fuzzy
 #| msgid "Statistics"
 msgid "DNS status"
 msgstr "Статистика"
 
-#: admin/templates/admin/domain_detail.html:28
-#: admin/templates/admin/domains_table.html:12
+#: templates/admin/domain_detail.html:28 templates/admin/domains_table.html:14
 msgid "Awaiting checks"
 msgstr ""
 
-#: admin/templates/admin/domain_detail.html:40
+#: templates/admin/domain_detail.html:40
 msgid "Creation date"
 msgstr "Дата создания"
 
-#: admin/templates/admin/domain_detail.html:42
+#: templates/admin/domain_detail.html:42
 msgid "Last modification date"
 msgstr "Дата последней модификации"
 
-#: admin/templates/admin/domain_detail.html:43
-#: admin/templates/admin/domain_detail.html:52
-#: admin/templates/admin/domain_statistics.html:33
+#: templates/admin/domain_detail.html:43 templates/admin/domain_detail.html:52
+#: templates/admin/domain_statistics.html:33
 msgid "Domain aliases"
 msgstr "Синонимы доменов"
 
-#: admin/templates/admin/domain_detail.html:45
+#: templates/admin/domain_detail.html:45
 msgid "Mailbox aliases"
 msgstr "Синонимы почтового ящика"
 
-#: admin/templates/admin/domain_detail.html:69
+#: templates/admin/domain_detail.html:69
 msgid "Administrators"
 msgstr "Администраторы"
 
-#: admin/templates/admin/domain_detail.html:79
-#: admin/templatetags/admin_tags.py:259
+#: templates/admin/domain_detail.html:79 templatetags/admin_tags.py:259
 msgid "Remove this permission"
 msgstr "Удалить это разрешение"
 
-#: admin/templates/admin/domain_detail.html:84
+#: templates/admin/domain_detail.html:84
 #, fuzzy
 #| msgid "No domain administrator defined"
 msgid "No domain administrator defined yet."
 msgstr "Администратор домена не определен"
 
-#: admin/templates/admin/domain_general_form.html:4
-#: admin/templates/admin/mailform.html:4
-#: admin/templates/admin/newdomainform.html:3
+#: templates/admin/domain_general_form.html:4 templates/admin/mailform.html:4
+#: templates/admin/newdomainform.html:3
 msgid "MB"
 msgstr "Мб"
 
-#: admin/templates/admin/domain_options_form.html:7
+#: templates/admin/domain_options_form.html:7
 msgid "You can't create a new domain administrator"
 msgstr ""
 
-#: admin/templates/admin/domain_statistics.html:15
-#: admin/templatetags/admin_tags.py:44
+#: templates/admin/domain_statistics.html:15 templatetags/admin_tags.py:44
 msgid "Statistics"
 msgstr "Статистика"
 
-#: admin/templates/admin/domain_statistics.html:15
+#: templates/admin/domain_statistics.html:15
 #, fuzzy
 msgid "Domains and identities"
 msgstr "Список пользователей"
 
-#: admin/templates/admin/domain_statistics.html:22
+#: templates/admin/domain_statistics.html:22
 msgid "Global counters"
 msgstr ""
 
-#: admin/templates/admin/domain_statistics.html:27
+#: templates/admin/domain_statistics.html:27
 #, fuzzy
 msgid "Quantity"
 msgstr "Карантин"
 
-#: admin/templates/admin/domain_statistics.html:45
+#: templates/admin/domain_statistics.html:45
 msgid "Per-domain counters"
 msgstr ""
 
-#: admin/templates/admin/domains.html:26
-#: admin/templates/admin/identities.html:29
+#: templates/admin/domains.html:26 templates/admin/identities.html:29
 #, fuzzy
 #| msgid "Address"
 msgid "Add"
 msgstr "Адрес"
 
-#: admin/templates/admin/domains.html:36
-#: admin/templates/admin/identity_headers.html:4
+#: templates/admin/domains.html:36 templates/admin/identity_headers.html:4
 msgid "Tags"
 msgstr "Теги"
 
-#: admin/templates/admin/domains.html:40
-#: admin/templates/admin/identity_headers.html:5
+#: templates/admin/domains.html:40 templates/admin/identity_headers.html:5
 msgid "Actions"
 msgstr "Действие"
 
-#: admin/templates/admin/domains_table.html:5
+#: templates/admin/domains_table.html:5
 #, fuzzy
 msgid "disabled"
 msgstr "Разрешен"
 
-#: admin/templates/admin/forward.html:2
+#: templates/admin/domains_table.html:12
+#, fuzzy
+msgctxt "checks"
+msgid "Disabled"
+msgstr "Разрешен"
+
+#: templates/admin/forward.html:2
 msgid "Automatically forward emails to another address"
 msgstr "Автоматически перенаправлять письма на другой адрес"
 
-#: admin/templates/admin/forward.html:9 admin/views/alias.py:91
+#: templates/admin/forward.html:9 views/alias.py:91
 msgid "Update"
 msgstr "Обновление"
 
-#: admin/templates/admin/identities.html:32
+#: templates/admin/identities.html:32
 #, fuzzy
 #| msgid "Add account"
 msgid "Account"
 msgstr "Добавить аккаунт"
 
-#: admin/templates/admin/identity_headers.html:3
+#: templates/admin/identity_headers.html:3
 msgid "Fullname/Recipient"
 msgstr "Полное имя/получатель"
 
-#: admin/templates/admin/import_domains_form.html:6
+#: templates/admin/import_domains_form.html:6
 msgid ""
 "Provide a CSV file where lines respect one of the following formats: <ul> "
 "<li><em>domain; name; quota; enabled</em></li> <li><em>domainalias; name; "
@@ -918,7 +903,7 @@ msgid ""
 "<p>You can use a different character as separator.</p>"
 msgstr ""
 
-#: admin/templates/admin/import_identities_form.html:6
+#: templates/admin/import_identities_form.html:6
 msgid ""
 "Provide a CSV file where lines respect one of the following formats: <ul> "
 "<li><em>account; loginname; password; first name; last name; enabled; group; "
@@ -928,139 +913,139 @@ msgid ""
 "use a different character as separator.</p>"
 msgstr ""
 
-#: admin/templates/admin/importform.html:6
+#: templates/admin/importform.html:6
 msgid "Help"
 msgstr "Подсказка"
 
-#: admin/templates/admin/importform.html:13
+#: templates/admin/importform.html:13
 msgid "Importing..."
 msgstr "Импорт..."
 
-#: admin/templates/admin/mailboxes_raw.html:3
+#: templates/admin/mailboxes_raw.html:3
 msgid "Choose a value"
 msgstr "Выбрать значение"
 
-#: admin/templates/admin/mailform.html:4
+#: templates/admin/mailform.html:4
 msgid "Use domain default value"
 msgstr "Используются значения домена по умолчанию "
 
-#: admin/templates/admin/mx_domain_detail.html:11
+#: templates/admin/mx_domain_detail.html:11
 #, fuzzy
 #| msgid "Update"
 msgid "Updated"
 msgstr "Обновление"
 
-#: admin/templates/admin/mx_domain_detail.html:23
+#: templates/admin/mx_domain_detail.html:23
 msgid "This IP does not match any of the valid MXs defined in parameters"
 msgstr ""
 
-#: admin/templates/admin/mx_domain_detail.html:36
+#: templates/admin/mx_domain_detail.html:36
 msgid "No MX record found for this domain."
 msgstr ""
 
-#: admin/templates/admin/notifications/domain_in_dnsbl.html:3
+#: templates/admin/notifications/domain_in_dnsbl.html:3
 #, python-format
 msgid ""
 "Modoboa detected that domain %(domain)s is listed by the following DNSBL "
 "providers:"
 msgstr ""
 
-#: admin/templates/admin/notifications/domain_in_dnsbl.html:11
+#: templates/admin/notifications/domain_in_dnsbl.html:11
 msgid ""
 "The domain's reputation will be affected and there is a chance that emails "
 "coming from it are considered as spam. You should contact those providers "
 "and ask them to unlist detected IP address(es)."
 msgstr ""
 
-#: admin/templates/admin/notifications/domain_invalid_mx.html:3
+#: templates/admin/notifications/domain_invalid_mx.html:3
 #, python-format
 msgid "Modoboa detected that domain %(domain)s has no valid MX record:"
 msgstr ""
 
-#: admin/templates/admin/quota_headers.html:3
+#: templates/admin/quota_headers.html:3
 msgid "Value"
 msgstr "Значение"
 
-#: admin/templates/admin/quota_headers.html:4
+#: templates/admin/quota_headers.html:4
 msgid "Limit"
 msgstr "Лимит"
 
-#: admin/templates/admin/quota_headers.html:5
+#: templates/admin/quota_headers.html:5
 #, python-format
 msgid "Usage (%%)"
 msgstr "использование (%%)"
 
-#: admin/templates/admin/searchform.html:6
+#: templates/admin/searchform.html:6
 msgid "Search"
 msgstr "Поиск"
 
-#: admin/templatetags/admin_tags.py:18
+#: templatetags/admin_tags.py:18
 msgid "enabled_m"
 msgstr "enabled_m"
 
-#: admin/templatetags/admin_tags.py:18
+#: templatetags/admin_tags.py:18
 msgid "enabled_f"
 msgstr "enabled_f"
 
-#: admin/templatetags/admin_tags.py:39
+#: templatetags/admin_tags.py:39
 #, fuzzy
 msgid "List domains"
 msgstr "Список квот"
 
-#: admin/templatetags/admin_tags.py:56 admin/templatetags/admin_tags.py:104
-#: admin/views/import_.py:87 admin/views/import_.py:109
+#: templatetags/admin_tags.py:56 templatetags/admin_tags.py:104
+#: views/import_.py:87 views/import_.py:109
 msgid "Import"
 msgstr "Импорт"
 
-#: admin/templatetags/admin_tags.py:62 admin/templatetags/admin_tags.py:110
-#: admin/views/export.py:41 admin/views/export.py:69
+#: templatetags/admin_tags.py:62 templatetags/admin_tags.py:110
+#: views/export.py:41 views/export.py:69
 msgid "Export"
 msgstr "Экспорт"
 
-#: admin/templatetags/admin_tags.py:94
+#: templatetags/admin_tags.py:94
 msgid "List identities"
 msgstr "Список пользователей"
 
-#: admin/templatetags/admin_tags.py:99
+#: templatetags/admin_tags.py:99
 msgid "List quotas"
 msgstr "Список квот"
 
-#: admin/templatetags/admin_tags.py:129
+#: templatetags/admin_tags.py:129
 msgid "View the domain's identities"
 msgstr "Информация о домене"
 
-#: admin/templatetags/admin_tags.py:135 admin/templatetags/admin_tags.py:178
-#: admin/templatetags/admin_tags.py:191
+#: templatetags/admin_tags.py:135 templatetags/admin_tags.py:178
+#: templatetags/admin_tags.py:191
 msgid "Edit {}"
 msgstr ""
 
-#: admin/templatetags/admin_tags.py:145 admin/templatetags/admin_tags.py:182
-#: admin/templatetags/admin_tags.py:196
+#: templatetags/admin_tags.py:145 templatetags/admin_tags.py:182
+#: templatetags/admin_tags.py:196
 #, python-format
 msgid "Delete %s?"
 msgstr "Удалить %s?"
 
-#: admin/views/alias.py:33
+#: views/alias.py:33
 msgid "Alias with this name already exists"
 msgstr "Синоним с таким именем уже есть"
 
-#: admin/views/alias.py:58
+#: views/alias.py:58
 msgid "Create"
 msgstr "Создать"
 
-#: admin/views/alias.py:70
+#: views/alias.py:70
 msgid "New alias"
 msgstr "Новый синоним"
 
-#: admin/views/alias.py:71
+#: views/alias.py:71
 msgid "Alias created"
 msgstr "Синоним создан"
 
-#: admin/views/alias.py:83
+#: views/alias.py:83
 msgid "Alias modified"
 msgstr "Синоним изменен"
 
-#: admin/views/alias.py:107
+#: views/alias.py:107
 #, fuzzy
 #| msgid "Alias created"
 msgid "Alias deleted"
@@ -1069,64 +1054,63 @@ msgstr[0] "Синоним создан"
 msgstr[1] "Синоним создан"
 msgstr[2] "Синоним создан"
 
-#: admin/views/dns.py:30
+#: views/dns.py:30
 msgid "MX records of {}"
 msgstr ""
 
-#: admin/views/dns.py:53
+#: views/dns.py:53
 msgid "DNSBL summary for {}"
 msgstr ""
 
-#: admin/views/domain.py:152
+#: views/domain.py:152
 msgid "You can't delete your own domain"
 msgstr "Вы не можете удалить собственный домен"
 
-#: admin/views/domain.py:155
+#: views/domain.py:155
 msgid "Domain deleted"
 msgid_plural "Domains deleted"
 msgstr[0] "Домен удален"
 msgstr[1] "Домена удалено"
 msgstr[2] "Доменов удалено"
 
-#: admin/views/export.py:40
+#: views/export.py:40
 msgid "Export identities"
 msgstr "Экспорт пользователя"
 
-#: admin/views/export.py:68
+#: views/export.py:68
 msgid "Export domains"
 msgstr "Экспорт доменов"
 
-#: admin/views/identity.py:111 admin/views/identity.py:205
-#: admin/views/identity.py:210
+#: views/identity.py:111 views/identity.py:205 views/identity.py:210
 msgid "Invalid request"
 msgstr "Ошибочный запрос"
 
-#: admin/views/identity.py:195
+#: views/identity.py:195
 msgid "Account deleted"
 msgid_plural "Accounts deleted"
 msgstr[0] "Аккаунт удален"
 msgstr[1] "Аккаунта удалено"
 msgstr[2] "Аккаунтов удалено"
 
-#: admin/views/import_.py:63
+#: views/import_.py:63
 #, python-format
 msgid "Object already exists: %s"
 msgstr "Объект уже существует: %s"
 
-#: admin/views/import_.py:67
+#: views/import_.py:67
 #, python-format
 msgid "%d objects imported successfully"
 msgstr "%d объектов импортировано"
 
-#: admin/views/import_.py:86
+#: views/import_.py:86
 msgid "Import domains"
 msgstr "Импорт доменов"
 
-#: admin/views/import_.py:108
+#: views/import_.py:108
 msgid "Import identities"
 msgstr "Импорт информации о пользователях"
 
-#: admin/views/user.py:35
+#: views/user.py:35
 msgid "Forward updated"
 msgstr "Перенаправление обновлено"
 
diff --git a/modoboa/admin/locale/sv/LC_MESSAGES/django.po b/modoboa/admin/locale/sv/LC_MESSAGES/django.po
index bcc3b4efa..215b1d490 100644
--- a/modoboa/admin/locale/sv/LC_MESSAGES/django.po
+++ b/modoboa/admin/locale/sv/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Modoboa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-14 14:13+0100\n"
+"POT-Creation-Date: 2017-01-16 13:02+0100\n"
 "PO-Revision-Date: 2016-05-30 18:05+0000\n"
 "Last-Translator: Olle Gustafsson <olle@dalnix.se>\n"
 "Language-Team: Swedish (http://www.transifex.com/tonio/modoboa/language/"
@@ -20,47 +20,46 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/app_settings.py:17 admin/handlers.py:245
-#: admin/templates/admin/domain_statistics.html:30
-#: admin/templates/admin/domains.html:4
+#: app_settings.py:17 handlers.py:252
+#: templates/admin/domain_statistics.html:30 templates/admin/domains.html:4
 msgid "Domains"
 msgstr "Domäner"
 
-#: admin/app_settings.py:20
+#: app_settings.py:20
 msgid "Enable MX checks"
 msgstr ""
 
-#: admin/app_settings.py:23
+#: app_settings.py:23
 msgid "Check that every domain has a valid MX record"
 msgstr ""
 
-#: admin/app_settings.py:28
+#: app_settings.py:28
 msgid "Valid MXs"
 msgstr ""
 
-#: admin/app_settings.py:31
+#: app_settings.py:31
 msgid ""
-"IP(s) or network(s) of the MX that should match with domains' MX records. On "
-"per line."
+"A list of IP or network address every MX record should match. A warning will "
+"be sent if a record does not respect it."
 msgstr ""
 
-#: admin/app_settings.py:40
+#: app_settings.py:39
 msgid "Enable DNSBL checks"
 msgstr ""
 
-#: admin/app_settings.py:43
+#: app_settings.py:42
 msgid "Check every domain against major DNSBL providers"
 msgstr ""
 
-#: admin/app_settings.py:47 admin/templates/admin/domain_detail.html.py:44
+#: app_settings.py:46 templates/admin/domain_detail.html:44
 msgid "Mailboxes"
 msgstr "Brevlådor"
 
-#: admin/app_settings.py:50
+#: app_settings.py:49
 msgid "Handle mailboxes on filesystem"
 msgstr "Hantera brevlådor på filsystem"
 
-#: admin/app_settings.py:53
+#: app_settings.py:52
 msgid ""
 "Rename or remove mailboxes on the filesystem when they get renamed or "
 "removed within Modoboa"
@@ -68,19 +67,19 @@ msgstr ""
 "Byt namn på eller ta bort brevlådor på filsystemet när de kommer byta namn "
 "eller tas bort inom Modoboa"
 
-#: admin/app_settings.py:59
+#: app_settings.py:58
 msgid "Mailboxes owner"
 msgstr "Brevlådans ägare"
 
-#: admin/app_settings.py:62
+#: app_settings.py:61
 msgid "The UNIX account who owns mailboxes on the filesystem"
 msgstr "Den UNIX-konto som äger brevlådor på filsystemet"
 
-#: admin/app_settings.py:67
+#: app_settings.py:66
 msgid "Default domain quota"
 msgstr "Standard domän kvota"
 
-#: admin/app_settings.py:70
+#: app_settings.py:69
 msgid ""
 "Default quota (in MB) applied to freshly created domains with no value "
 "specified. A value of 0 means no quota."
@@ -88,36 +87,35 @@ msgstr ""
 "Standard kvota (i MB) applicerad på nyskapade domäner som inte har något "
 "värde specificerat. Ett värde på 0 betyder ingen kvota."
 
-#: admin/app_settings.py:76
+#: app_settings.py:75
 msgid "Automatic account removal"
 msgstr "Automatisk konto borttagning"
 
-#: admin/app_settings.py:79
+#: app_settings.py:78
 msgid "When a mailbox is removed, also remove the associated account"
 msgstr "När en brevlåda raderas, radera också tillhörande konto"
 
-#: admin/app_settings.py:83
+#: app_settings.py:82
 msgid "Automatic domain/mailbox creation"
 msgstr "Automatisk skapande av domän/brevlåda"
 
-#: admin/app_settings.py:86
+#: app_settings.py:85
 msgid "Create a domain and a mailbox when an account is automatically created."
 msgstr "Skapa en domän och en brevlåda när ett konto skapas automatiskt."
 
-#: admin/app_settings.py:133 admin/forms/account.py:288
-#: admin/forms/domain.py:87
+#: app_settings.py:132 forms/account.py:288 forms/domain.py:87
 msgid "Must be a positive integer"
 msgstr "Måste vara ett positivt heltal"
 
-#: admin/app_settings.py:143
+#: app_settings.py:142
 msgid "Administration"
 msgstr "Administration"
 
-#: admin/forms/account.py:34 admin/templates/admin/domain_detail.html.py:72
+#: forms/account.py:34 templates/admin/domain_detail.html:72
 msgid "Username"
 msgstr "Användarnamn"
 
-#: admin/forms/account.py:36
+#: forms/account.py:36
 msgid ""
 "The user's name. Must be a valid e-mail address for simple users or "
 "administrators with a mailbox."
@@ -125,56 +123,56 @@ msgstr ""
 "Användarens namn. Måste vara en giltig e-postadress för vanliga användare "
 "eller för administratörer med brevlåda."
 
-#: admin/forms/account.py:41 admin/templates/admin/account_detail.html.py:29
+#: forms/account.py:41 templates/admin/account_detail.html:29
 msgid "Role"
 msgstr "Roll"
 
-#: admin/forms/account.py:42
+#: forms/account.py:42
 msgid "Choose"
 msgstr "Välj"
 
-#: admin/forms/account.py:43
+#: forms/account.py:43
 msgid "What level of permission this user will have"
 msgstr "Vilken nivå av behörighet den här användaren har"
 
-#: admin/forms/account.py:46
+#: forms/account.py:46
 msgid "Password"
 msgstr "Lösenord"
 
-#: admin/forms/account.py:50
+#: forms/account.py:50
 msgid "Confirmation"
 msgstr "Bekräftelse"
 
-#: admin/forms/account.py:53
+#: forms/account.py:53
 msgid "Enter the same password as above, for verification."
 msgstr "Ange samma lösenord som ovan för verifiering."
 
-#: admin/forms/account.py:64
+#: forms/account.py:64
 msgid "Enabled"
 msgstr "Aktiverad"
 
-#: admin/forms/account.py:156
+#: forms/account.py:156
 msgid "The two password fields didn't match."
 msgstr "Dessa två lösnordsfält matchar inte."
 
-#: admin/forms/account.py:171
+#: forms/account.py:171
 msgid "Only super administrators are allowed for this mode"
 msgstr "Endast superadmininstratörer tillåts åtkomst till det här läget"
 
-#: admin/forms/account.py:179
+#: forms/account.py:179
 msgid "You can't disable your own account"
 msgstr "Du kan inte inaktivera ditt eget konto"
 
-#: admin/forms/account.py:194
+#: forms/account.py:194
 msgid "E-mail"
 msgstr "E-post"
 
-#: admin/forms/account.py:196 admin/forms/domain.py:38
-#: admin/templates/admin/account_detail.html:45
+#: forms/account.py:196 forms/domain.py:38
+#: templates/admin/account_detail.html:45
 msgid "Quota"
 msgstr "Kvot"
 
-#: admin/forms/account.py:198
+#: forms/account.py:198
 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 "
@@ -184,12 +182,11 @@ msgstr ""
 "domänens förvalda. Lämna tomt för att definiera ett obegränsat värde (ej "
 "tillåtet för domänadministratörer)."
 
-#: admin/forms/account.py:206 admin/forms/domain.py:46
-#: admin/templates/admin/domains.html:35
+#: forms/account.py:206 forms/domain.py:46 templates/admin/domains.html:35
 msgid "Alias(es)"
 msgstr "Alias"
 
-#: admin/forms/account.py:209
+#: forms/account.py:209
 #, fuzzy
 #| msgid ""
 #| "Alias(es) of this mailbox. Indicate only one address per input, press "
@@ -204,13 +201,13 @@ msgstr ""
 "lägga till ny rad. Använd '*' för att skapa ett 'catchall' alias (ex: "
 "*@domain.tld)."
 
-#: admin/forms/account.py:215
+#: forms/account.py:215
 #, fuzzy
 #| msgid "Invalid address"
 msgid "Sender addresses"
 msgstr "Ogiltigt adress"
 
-#: admin/forms/account.py:218
+#: forms/account.py:218
 #, fuzzy
 #| msgid ""
 #| "Addresses this alias will point to. Indicate only one address per input, "
@@ -223,70 +220,69 @@ msgstr ""
 "Adresser detta alias kommer peka på. Ange bara en adress per fält, tryck "
 "RETUR för att lägga till ytterligare."
 
-#: admin/forms/account.py:267 admin/forms/alias.py:92
-#: admin/models/mailbox.py:295
+#: forms/account.py:267 forms/alias.py:92 models/mailbox.py:295
 msgid "Domain does not exist"
 msgstr "Domän existerar inte"
 
-#: admin/forms/account.py:297
+#: forms/account.py:297
 msgid "Local domain does not exist"
 msgstr "Lokal domän existerar inte"
 
-#: admin/forms/account.py:392
+#: forms/account.py:392
 msgid "Domain(s)"
 msgstr "Domän(er)"
 
-#: admin/forms/account.py:394
+#: forms/account.py:394
 msgid "Domain(s) that user administrates"
 msgstr "Domän(er) användaren administrerar"
 
-#: admin/forms/account.py:440 admin/forms/account.py:525
-#: admin/forms/domain.py:283 admin/forms/domain.py:350
+#: forms/account.py:440 forms/account.py:525 forms/domain.py:283
+#: forms/domain.py:350
 msgid "General"
 msgstr "Generellt"
 
-#: admin/forms/account.py:445 admin/forms/account.py:531
+#: forms/account.py:445 forms/account.py:531
 msgid "Mail"
 msgstr "Post"
 
-#: admin/forms/account.py:447
+#: forms/account.py:447
 msgid "Permissions"
 msgstr "Rättigheter"
 
-#: admin/forms/account.py:514
+#: forms/account.py:514
 msgid "Account updated"
 msgstr "Konto uppdaterat"
 
-#: admin/forms/account.py:538
+#: forms/account.py:538
 msgid "New account"
 msgstr "Nytt konto"
 
-#: admin/forms/account.py:550
+#: forms/account.py:550
 msgid "Account created"
 msgstr "Konto skapat"
 
-#: admin/forms/alias.py:24
+#: forms/alias.py:24
 #, fuzzy
 #| msgid "Invalid address"
 msgid "Random address"
 msgstr "Ogiltigt adress"
 
-#: admin/forms/alias.py:27
+#: forms/alias.py:27
 msgid "Email address"
 msgstr "E-post adress"
 
-#: admin/forms/alias.py:29
+#: forms/alias.py:29
 msgid ""
 "The alias address. To create a catchall alias, just enter the domain name "
 "(@domain.tld)."
 msgstr ""
 "Alias adress. För en \"catch-all\"-alias, ange bara domännamnet (@domän.tld)."
 
-#: admin/forms/alias.py:35 admin/templates/admin/alias_detail.html.py:37
+#: forms/alias.py:35 templates/admin/alias_detail.html:37
 msgid "Recipients"
 msgstr "Mottagare"
 
-#: admin/forms/alias.py:37
+#: forms/alias.py:37
 msgid ""
 "Addresses this alias will point to. Indicate only one address per input, "
 "press ENTER to add a new input."
@@ -294,30 +290,30 @@ msgstr ""
 "Adresser detta alias kommer peka på. Ange bara en adress per fält, tryck "
 "RETUR för att lägga till ytterligare."
 
-#: admin/forms/alias.py:47 admin/forms/domain.py:26 admin/models/domain.py:91
-#: admin/templates/admin/domain_statistics.html:49
+#: forms/alias.py:47 forms/domain.py:26 models/domain.py:92
+#: templates/admin/domain_statistics.html:49
 msgid "Domain"
 msgstr "Domän"
 
-#: admin/forms/alias.py:95
+#: forms/alias.py:95
 msgid "You don't have access to this domain"
 msgstr "Du har inte åtkomst till denna domän"
 
-#: admin/forms/alias.py:112 admin/forms/alias.py:114
+#: forms/alias.py:112 forms/alias.py:114
 #, fuzzy
 #| msgid "A mailbox is required"
 msgid "This field is required"
 msgstr "En brevlåda krävs"
 
-#: admin/forms/alias.py:118
+#: forms/alias.py:118
 msgid "No recipient defined"
 msgstr "Ingen mottagare definierad"
 
-#: admin/forms/domain.py:35 admin/templates/admin/domain_statistics.html.py:26
+#: forms/domain.py:35 templates/admin/domain_statistics.html:26
 msgid "Type"
 msgstr "Typ"
 
-#: admin/forms/domain.py:41
+#: forms/domain.py:41
 msgid ""
 "Default quota in MB applied to mailboxes. Leave empty to use the default "
 "value."
@@ -325,7 +321,7 @@ msgstr ""
 "Standard kvota i MB tillämpad på nya brevlådor. Lämna tomt för att använda "
 "standardvärdet."
 
-#: admin/forms/domain.py:49
+#: forms/domain.py:49
 msgid ""
 "Alias(es) of this domain. Indicate only one name per input, press ENTER to "
 "add a new input."
@@ -333,36 +329,34 @@ msgstr ""
 "Alias för denna domän. Ange endast ett namn per rad, tryck ENTER för att "
 "lägga till en rad."
 
-#: admin/forms/domain.py:103 admin/handlers.py:148
+#: forms/domain.py:103 handlers.py:155
 msgid "domain alias"
 msgstr "domän alias"
 
-#: admin/forms/domain.py:106 admin/forms/domain.py:118
-#: admin/forms/domain.py:126
+#: forms/domain.py:106 forms/domain.py:118 forms/domain.py:126
 #, python-format
 msgid "A %s with this name already exists"
 msgstr "En %s med detta namn finns redan"
 
-#: admin/forms/domain.py:118 admin/forms/domain.py:123
+#: forms/domain.py:118 forms/domain.py:123
 msgid "domain"
 msgstr "domän"
 
-#: admin/forms/domain.py:171
+#: forms/domain.py:171
 msgid "Create a domain administrator"
 msgstr "Skapa en domän administratör"
 
-#: admin/forms/domain.py:174
+#: forms/domain.py:174
 msgid "Automatically create an administrator for this domain"
 msgstr "Skapa en domän administratör automatiskt för denna domän"
 
-#: admin/forms/domain.py:179 admin/templates/admin/domain_detail.html.py:72
-#: admin/templates/admin/domains.html:34
-#: admin/templates/admin/identity_headers.html:2
-#: admin/templates/admin/mx_domain_detail.html:9
+#: forms/domain.py:179 templates/admin/domain_detail.html:72
+#: templates/admin/domains.html:34 templates/admin/identity_headers.html:2
+#: templates/admin/mx_domain_detail.html:9
 msgid "Name"
 msgstr "Namn"
 
-#: admin/forms/domain.py:182
+#: forms/domain.py:182
 msgid ""
 "The administrator's name. Don't include the domain's name here, it will be "
 "automatically appended."
@@ -370,70 +364,70 @@ msgstr ""
 "Administratörens namn. Inkludera inte domänens namn här, den kommer att "
 "läggas till automatiskt."
 
-#: admin/forms/domain.py:189
+#: forms/domain.py:189
 msgid "Create aliases"
 msgstr "Skapa alias."
 
-#: admin/forms/domain.py:192
+#: forms/domain.py:192
 msgid "Automatically create standard aliases for this domain"
 msgstr "Skapa automatiskt standard alias för den här domänen"
 
-#: admin/forms/domain.py:208
+#: forms/domain.py:208
 msgid "Invalid format"
 msgstr "Ogiltigt format"
 
-#: admin/forms/domain.py:217 admin/forms/domain.py:220
+#: forms/domain.py:217 forms/domain.py:220
 #, fuzzy
 #| msgid "A mailbox is required"
 msgid "This field is required."
 msgstr "En brevlåda krävs"
 
-#: admin/forms/domain.py:237
+#: forms/domain.py:237
 #, python-format
 msgid "User '%s' already exists"
 msgstr "Användare '%s' finns redan"
 
-#: admin/forms/domain.py:339
+#: forms/domain.py:339
 msgid "Domain modified"
 msgstr "Domän ändrad"
 
-#: admin/forms/domain.py:360
+#: forms/domain.py:360
 msgid "Options"
 msgstr "Inställningar"
 
-#: admin/forms/domain.py:368
+#: forms/domain.py:368
 msgid "New domain"
 msgstr "Ny domän"
 
-#: admin/forms/domain.py:381
+#: forms/domain.py:381
 msgid "Domain created"
 msgstr "Domän skapad"
 
-#: admin/forms/export.py:7
+#: forms/export.py:7
 msgid "File name"
 msgstr "Filnamn"
 
-#: admin/forms/export.py:13 admin/forms/import_.py:13
+#: forms/export.py:13 forms/import_.py:13
 msgid "Separator"
 msgstr "Separator"
 
-#: admin/forms/forward.py:14
+#: forms/forward.py:14
 msgid "Recipient(s)"
 msgstr "Mottagare"
 
-#: admin/forms/forward.py:18
+#: forms/forward.py:18
 msgid "Indicate one or more recipients separated by a ','"
 msgstr "Ange en eller flera mottagare separerade med ett ','"
 
-#: admin/forms/forward.py:21
+#: forms/forward.py:21
 msgid "Keep local copies"
 msgstr "Behåll lokal kopia"
 
-#: admin/forms/forward.py:24
+#: forms/forward.py:24
 msgid "Forward messages and store copies into your local mailbox"
 msgstr "Vidarebefordra meddelande och spara kopia i din lokala brevlåda"
 
-#: admin/forms/forward.py:42
+#: forms/forward.py:42
 msgid ""
 "You can't define a forward to a local destination. Please ask your "
 "administrator to create an alias instead."
@@ -441,450 +435,442 @@ msgstr ""
 "Du kan inte definiera en vidarebefordring till en lokal destination. Be din "
 "administratör att skapa ett alias istället."
 
-#: admin/forms/import_.py:11
+#: forms/import_.py:11
 msgid "Select a file"
 msgstr "Välj en fil"
 
-#: admin/forms/import_.py:19
+#: forms/import_.py:19
 msgid "Continue on error"
 msgstr "Fortsätt vid fel"
 
-#: admin/forms/import_.py:20
+#: forms/import_.py:20
 msgid "Don't treat duplicated objects as error"
 msgstr "Behandla inte dubletter som fel"
 
-#: admin/forms/import_.py:38
+#: forms/import_.py:38
 msgid "Crypt passwords"
 msgstr "Krypterade lösenord"
 
-#: admin/forms/import_.py:40
+#: forms/import_.py:40
 msgid "Check this option if passwords contained in your file are not crypted"
 msgstr "Markera det här alternativet om lösenord i filen inte är krypterad"
 
-#: admin/handlers.py:194
+#: handlers.py:201
 #, python-format
 msgid "Account import failed (%s): domain does not exist"
 msgstr "Konto import misslyckades (%s): domänen existerar inte"
 
-#: admin/handlers.py:207 admin/models/mailbox.py:320
+#: handlers.py:214 models/mailbox.py:320
 msgid "Mailbox {} already exists"
 msgstr "Brevlåda {} finns redan"
 
-#: admin/handlers.py:215
+#: handlers.py:222
 #, python-format
 msgid "Account import failed (%s): wrong quota value"
 msgstr "Importering av konto misslyckades (%s): Fel kvota värde"
 
-#: admin/handlers.py:255 admin/templates/admin/domain_statistics.html.py:36
-#: admin/templates/admin/domain_statistics.html:50
-#: admin/templates/admin/identities.html:5
+#: handlers.py:262 templates/admin/domain_statistics.html:36
+#: templates/admin/domain_statistics.html:50 templates/admin/identities.html:5
 msgid "Identities"
 msgstr "Konton"
 
-#: admin/handlers.py:271 admin/templates/admin/forward.html.py:2
+#: handlers.py:278 templates/admin/forward.html:2
 msgid "Forward"
 msgstr "Vidarebefordra"
 
-#: admin/lib.py:32
+#: lib.py:32
 msgid "A mailbox is required"
 msgstr "En brevlåda krävs"
 
-#: admin/lib.py:122
+#: lib.py:122
 msgid "You are not allowed to import domains"
 msgstr "Du tillåts inte att importera domäner"
 
-#: admin/lib.py:133
+#: lib.py:133
 msgid "You are not allowed to import domain aliases."
 msgstr "Du tillåts inte att importera domän alias."
 
-#: admin/management/commands/subcommands/_mx.py:159
+#: management/commands/subcommands/_mx.py:159
 msgid "[modoboa] DNSBL issue(s) for domain {}"
 msgstr ""
 
-#: admin/management/commands/subcommands/_mx.py:180
+#: management/commands/subcommands/_mx.py:180
 msgid "Domain {} has no MX record"
 msgstr ""
 
-#: admin/management/commands/subcommands/_mx.py:191
+#: management/commands/subcommands/_mx.py:191
 #, python-brace-format
 msgid "MX record for domain {0} is invalid: {1}"
 msgstr ""
 
-#: admin/management/commands/subcommands/_mx.py:207
+#: management/commands/subcommands/_mx.py:207
 msgid "[modoboa] MX issue(s) for domain {}"
 msgstr ""
 
-#: admin/models/alias.py:31 admin/models/mailbox.py:80
+#: models/alias.py:31 models/mailbox.py:80
 msgid "address"
 msgstr "adress"
 
-#: admin/models/alias.py:33
+#: models/alias.py:33
 msgid "The alias address."
 msgstr "Alias adressen."
 
-#: admin/models/alias.py:38 admin/models/domain.py:46
-#: admin/models/domain_alias.py:44
+#: models/alias.py:38 models/domain.py:47 models/domain_alias.py:44
 msgid "enabled"
 msgstr "aktiverad"
 
-#: admin/models/alias.py:39 admin/models/domain_alias.py:45
+#: models/alias.py:39 models/domain_alias.py:45
 msgid "Check to activate this alias"
 msgstr "Markera för aktivera detta alias"
 
-#: admin/models/alias.py:44 admin/templates/admin/alias_detail.html.py:32
+#: models/alias.py:44 templates/admin/alias_detail.html:32
 msgid "Description"
 msgstr ""
 
-#: admin/models/alias.py:46 admin/templates/admin/alias_detail.html.py:29
+#: models/alias.py:46 templates/admin/alias_detail.html:29
 msgid "Expire at"
 msgstr ""
 
-#: admin/models/alias.py:89
+#: models/alias.py:89
 msgid "alias"
 msgstr "alias"
 
-#: admin/models/alias.py:121
+#: models/alias.py:121
 msgid "Invalid address"
 msgstr "Ogiltigt adress"
 
-#: admin/models/alias.py:142
+#: models/alias.py:142
 msgid "Local recipient {}@{} not found"
 msgstr "Lokal mottagare {}@{} kunde inte hittas."
 
-#: admin/models/alias.py:172
+#: models/alias.py:172
 #, python-format
 msgid "Invalid line: %s"
 msgstr "Ogiltig rad: %s"
 
-#: admin/models/alias.py:178
+#: models/alias.py:178
 #, python-format
 msgid "Domain '%s' does not exist"
 msgstr "Domänen '%s' existerar inte"
 
-#: admin/models/domain.py:42 admin/models/domain_alias.py:37
+#: models/domain.py:43 models/domain_alias.py:37
 msgid "name"
 msgstr "namn"
 
-#: admin/models/domain.py:43
+#: models/domain.py:44
 msgid "The domain name"
 msgstr "Domännamnet"
 
-#: admin/models/domain.py:47
+#: models/domain.py:48
 msgid "Check to activate this domain"
 msgstr "Markera för att aktivera denna domän"
 
-#: admin/models/domain.py:208 admin/models/domain_alias.py:71
+#: models/domain.py:215 models/domain_alias.py:71
 msgid "Invalid line"
 msgstr "Ogiltig rad"
 
-#: admin/models/domain.py:216
+#: models/domain.py:223
 #, python-format
 msgid "Invalid quota value for domain '%s'"
 msgstr "Ogiltig kvota värde för domänen '%s'"
 
-#: admin/models/domain_alias.py:38
+#: models/domain_alias.py:38
 msgid "The alias name"
 msgstr "Alias namn"
 
-#: admin/models/domain_alias.py:40
+#: models/domain_alias.py:40
 msgid "target"
 msgstr "mål"
 
-#: admin/models/domain_alias.py:41
+#: models/domain_alias.py:41
 msgid "The domain this alias points to"
 msgstr "Domän dit detta alias pekar mot"
 
-#: admin/models/domain_alias.py:80
+#: models/domain_alias.py:80
 #, python-format
 msgid "Unknown domain %s"
 msgstr "Okänt kommando %s"
 
-#: admin/models/mailbox.py:82
+#: models/mailbox.py:82
 msgid "Mailbox address (without the @domain.tld part)"
 msgstr "Brevlåde adress (utan @domain.tld)"
 
-#: admin/models/mailbox.py:148
+#: models/mailbox.py:148
 #, python-format
 msgid "Failed to retrieve mailbox location (%s)"
 msgstr "Kunde inte hitta brevlådans sökväg (%s)"
 
-#: admin/models/mailbox.py:238
+#: models/mailbox.py:238
 #, python-format
 msgid "Quota is greater than the allowed domain's limit (%dM)"
 msgstr "Kvotan är större än domänens gräns (%dM)"
 
-#: admin/models/mailbox.py:244
+#: models/mailbox.py:244
 msgid "A quota is required"
 msgstr "En kvota krävs"
 
-#: admin/serializers.py:45 admin/serializers.py:228 admin/serializers.py:317
+#: serializers.py:45 serializers.py:228 serializers.py:317
 msgid "Permission denied."
 msgstr "Åtskomst nekad."
 
-#: admin/serializers.py:83
+#: serializers.py:83
 msgid ""
 "List of administered domains (resellers and domain administrators only)."
 msgstr ""
 "Lista över administrerade domäner (endast återförsäljare och "
 "domänadministratörer)."
 
-#: admin/serializers.py:193
+#: serializers.py:193
 msgid "Not allowed for this role."
 msgstr "Inte tillåtet för denna roll."
 
-#: admin/serializers.py:203
+#: serializers.py:203
 msgid "Must be equal to mailbox full_address"
 msgstr "Måste vara lika med brevlådans full_address"
 
-#: admin/serializers.py:215
+#: serializers.py:215
 msgid "Local domain {} does not exist"
 msgstr "Lokal domän {} finns inte"
 
-#: admin/serializers.py:315
+#: serializers.py:315
 msgid "Domain not found."
 msgstr "Domän kunde ej hittas."
 
-#: admin/templates/admin/account_detail.html:16
-#: admin/templates/admin/alias_detail.html:16
-#: admin/templates/admin/domain_detail.html:15
-#: admin/templates/admin/identities_table.html:7
+#: templates/admin/account_detail.html:16 templates/admin/alias_detail.html:16
+#: templates/admin/domain_detail.html:15
+#: templates/admin/identities_table.html:7
 #, fuzzy
 #| msgid "disabled"
 msgid "(disabled)"
 msgstr "inaktiverad"
 
-#: admin/templates/admin/account_detail.html:22
-#: admin/templates/admin/alias_detail.html:22
-#: admin/templates/admin/domain_detail.html:21
+#: templates/admin/account_detail.html:22 templates/admin/alias_detail.html:22
+#: templates/admin/domain_detail.html:21
 msgid "Summary"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:26
+#: templates/admin/account_detail.html:26
 #, fuzzy
 #| msgid "File name"
 msgid "Full name"
 msgstr "Filnamn"
 
-#: admin/templates/admin/account_detail.html:32
-#: admin/templates/admin/alias_detail.html:26
+#: templates/admin/account_detail.html:32 templates/admin/alias_detail.html:26
 #, fuzzy
 #| msgid "Create"
 msgid "Created"
 msgstr "Skapa"
 
-#: admin/templates/admin/account_detail.html:35
+#: templates/admin/account_detail.html:35
 msgid "Last login"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:38
+#: templates/admin/account_detail.html:38
 msgid "Secondary email"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:38
-#: admin/templates/admin/account_detail.html:41
+#: templates/admin/account_detail.html:38
+#: templates/admin/account_detail.html:41
 #, fuzzy
 #| msgid "No recipient defined"
 msgid "Not defined"
 msgstr "Ingen mottagare definierad"
 
-#: admin/templates/admin/account_detail.html:41
+#: templates/admin/account_detail.html:41
 msgid "Phone number"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:55
+#: templates/admin/account_detail.html:55
 #, fuzzy
 #| msgid "Administration"
 msgid "Administered domains"
 msgstr "Administration"
 
-#: admin/templates/admin/account_detail.html:61
+#: templates/admin/account_detail.html:61
 #, fuzzy
 #| msgid "No recipient defined"
 msgid "No domain defined."
 msgstr "Ingen mottagare definierad"
 
-#: admin/templates/admin/account_detail.html:75
+#: templates/admin/account_detail.html:75
 #, fuzzy
 #| msgid "Alias(es)"
 msgid "Aliases"
 msgstr "Alias"
 
-#: admin/templates/admin/account_detail.html:81
+#: templates/admin/account_detail.html:81
 #, fuzzy
 #| msgid "No recipient defined"
 msgid "No alias defined"
 msgstr "Ingen mottagare definierad"
 
-#: admin/templates/admin/account_detail.html:87
+#: templates/admin/account_detail.html:87
 msgid "Additional sender addresses"
 msgstr ""
 
-#: admin/templates/admin/account_detail.html:93
+#: templates/admin/account_detail.html:93
 msgid "No sender address defined"
 msgstr ""
 
-#: admin/templates/admin/account_general_form.html:11
-#: admin/templates/admin/aliasform.html:13
+#: templates/admin/account_general_form.html:11
+#: templates/admin/aliasform.html:13
 msgid "Domain is disabled"
 msgstr "Domänen är inaktiverad"
 
-#: admin/templates/admin/alias_detail.html:16
-#: admin/templates/admin/identities.html:33
+#: templates/admin/alias_detail.html:16 templates/admin/identities.html:33
 #, fuzzy
 #| msgid "alias"
 msgid "Alias"
 msgstr "alias"
 
-#: admin/templates/admin/alias_detail.html:27
+#: templates/admin/alias_detail.html:27
 #, fuzzy
 #| msgid "Alias modified"
 msgid "Modified"
 msgstr "Alias ändrat"
 
-#: admin/templates/admin/dnsbl_domain_detail.html:10
+#: templates/admin/dnsbl_domain_detail.html:10
 msgid "Provider"
 msgstr ""
 
-#: admin/templates/admin/dnsbl_domain_detail.html:11
-#: admin/templates/admin/mx_domain_detail.html:10
-#: admin/templates/admin/quota_headers.html:2
+#: templates/admin/dnsbl_domain_detail.html:11
+#: templates/admin/mx_domain_detail.html:10
+#: templates/admin/quota_headers.html:2
 msgid "Address"
 msgstr "Adress"
 
-#: admin/templates/admin/dnsbl_domain_detail.html:12
+#: templates/admin/dnsbl_domain_detail.html:12
 #, fuzzy
 #| msgid "Statistics"
 msgid "Status"
 msgstr "Statistik"
 
-#: admin/templates/admin/dnsbl_domain_detail.html:21
+#: templates/admin/dnsbl_domain_detail.html:21
 msgid "listed"
 msgstr ""
 
-#: admin/templates/admin/dnsbl_domain_detail.html:29
+#: templates/admin/dnsbl_domain_detail.html:29
 msgid "Everything is fine, this domain is not listed."
 msgstr ""
 
-#: admin/templates/admin/dnsbl_domain_detail.html:32
+#: templates/admin/dnsbl_domain_detail.html:32
 msgid "No information available for this domain."
 msgstr ""
 
-#: admin/templates/admin/domain_detail.html:26
-#: admin/templates/admin/domains.html:38
+#: templates/admin/domain_detail.html:26 templates/admin/domains.html:38
 #, fuzzy
 #| msgid "Statistics"
 msgid "DNS status"
 msgstr "Statistik"
 
-#: admin/templates/admin/domain_detail.html:28
-#: admin/templates/admin/domains_table.html:12
+#: templates/admin/domain_detail.html:28 templates/admin/domains_table.html:14
 msgid "Awaiting checks"
 msgstr ""
 
-#: admin/templates/admin/domain_detail.html:40
+#: templates/admin/domain_detail.html:40
 msgid "Creation date"
 msgstr "Skapelsedatum"
 
-#: admin/templates/admin/domain_detail.html:42
+#: templates/admin/domain_detail.html:42
 msgid "Last modification date"
 msgstr "Senast ändrad"
 
-#: admin/templates/admin/domain_detail.html:43
-#: admin/templates/admin/domain_detail.html:52
-#: admin/templates/admin/domain_statistics.html:33
+#: templates/admin/domain_detail.html:43 templates/admin/domain_detail.html:52
+#: templates/admin/domain_statistics.html:33
 msgid "Domain aliases"
 msgstr "Domän alias"
 
-#: admin/templates/admin/domain_detail.html:45
+#: templates/admin/domain_detail.html:45
 msgid "Mailbox aliases"
 msgstr "Brevlåde alias"
 
-#: admin/templates/admin/domain_detail.html:69
+#: templates/admin/domain_detail.html:69
 msgid "Administrators"
 msgstr "Administratörer"
 
-#: admin/templates/admin/domain_detail.html:79
-#: admin/templatetags/admin_tags.py:259
+#: templates/admin/domain_detail.html:79 templatetags/admin_tags.py:259
 msgid "Remove this permission"
 msgstr "Radera detta tillstånd"
 
-#: admin/templates/admin/domain_detail.html:84
+#: templates/admin/domain_detail.html:84
 #, fuzzy
 #| msgid "No domain administrator defined"
 msgid "No domain administrator defined yet."
 msgstr "Ingen domän administratör definierad"
 
-#: admin/templates/admin/domain_general_form.html:4
-#: admin/templates/admin/mailform.html:4
-#: admin/templates/admin/newdomainform.html:3
+#: templates/admin/domain_general_form.html:4 templates/admin/mailform.html:4
+#: templates/admin/newdomainform.html:3
 msgid "MB"
 msgstr "MB"
 
-#: admin/templates/admin/domain_options_form.html:7
+#: templates/admin/domain_options_form.html:7
 msgid "You can't create a new domain administrator"
 msgstr "Du kan inte skapa en ny domänadministratör"
 
-#: admin/templates/admin/domain_statistics.html:15
-#: admin/templatetags/admin_tags.py:44
+#: templates/admin/domain_statistics.html:15 templatetags/admin_tags.py:44
 msgid "Statistics"
 msgstr "Statistik"
 
-#: admin/templates/admin/domain_statistics.html:15
+#: templates/admin/domain_statistics.html:15
 msgid "Domains and identities"
 msgstr "Domäner och konton"
 
-#: admin/templates/admin/domain_statistics.html:22
+#: templates/admin/domain_statistics.html:22
 msgid "Global counters"
 msgstr "Globala räknare"
 
-#: admin/templates/admin/domain_statistics.html:27
+#: templates/admin/domain_statistics.html:27
 msgid "Quantity"
 msgstr "Mängd"
 
-#: admin/templates/admin/domain_statistics.html:45
+#: templates/admin/domain_statistics.html:45
 msgid "Per-domain counters"
 msgstr "Per domän räknare"
 
-#: admin/templates/admin/domains.html:26
-#: admin/templates/admin/identities.html:29
+#: templates/admin/domains.html:26 templates/admin/identities.html:29
 #, fuzzy
 #| msgid "Address"
 msgid "Add"
 msgstr "Adress"
 
-#: admin/templates/admin/domains.html:36
-#: admin/templates/admin/identity_headers.html:4
+#: templates/admin/domains.html:36 templates/admin/identity_headers.html:4
 msgid "Tags"
 msgstr "Tagg"
 
-#: admin/templates/admin/domains.html:40
-#: admin/templates/admin/identity_headers.html:5
+#: templates/admin/domains.html:40 templates/admin/identity_headers.html:5
 msgid "Actions"
 msgstr "Åtgärder"
 
-#: admin/templates/admin/domains_table.html:5
+#: templates/admin/domains_table.html:5
 msgid "disabled"
 msgstr "inaktiverad"
 
-#: admin/templates/admin/forward.html:2
+#: templates/admin/domains_table.html:12
+#, fuzzy
+#| msgid "disabled"
+msgctxt "checks"
+msgid "Disabled"
+msgstr "inaktiverad"
+
+#: templates/admin/forward.html:2
 msgid "Automatically forward emails to another address"
 msgstr "Vidarebefordra automatiskt e-post till en annan adress"
 
-#: admin/templates/admin/forward.html:9 admin/views/alias.py:91
+#: templates/admin/forward.html:9 views/alias.py:91
 msgid "Update"
 msgstr "Uppdatera"
 
-#: admin/templates/admin/identities.html:32
+#: templates/admin/identities.html:32
 #, fuzzy
 #| msgid "Add account"
 msgid "Account"
 msgstr "Lägg till konto"
 
-#: admin/templates/admin/identity_headers.html:3
+#: templates/admin/identity_headers.html:3
 msgid "Fullname/Recipient"
 msgstr "Fullständigt namn/Mottagare"
 
-#: admin/templates/admin/import_domains_form.html:6
+#: templates/admin/import_domains_form.html:6
 #, fuzzy
 #| msgid ""
 #| "Provide a CSV file where lines respect one of the following formats:\n"
@@ -914,7 +900,7 @@ msgstr ""
 "en av de tidigare värdena.</ p>\n"
 "<p>Du kan använda ett annat tecken som separator.</ p>\n"
 
-#: admin/templates/admin/import_identities_form.html:6
+#: templates/admin/import_identities_form.html:6
 #, fuzzy
 #| msgid ""
 #| "Provide a CSV file where lines respect one of the following formats:\n"
@@ -950,138 +936,138 @@ msgstr ""
 "\n"
 "<p>Du kan använda ett annat tecken separator.</p>\n"
 
-#: admin/templates/admin/importform.html:6
+#: templates/admin/importform.html:6
 msgid "Help"
 msgstr "Hjälp"
 
-#: admin/templates/admin/importform.html:13
+#: templates/admin/importform.html:13
 msgid "Importing..."
 msgstr "Importerar..."
 
-#: admin/templates/admin/mailboxes_raw.html:3
+#: templates/admin/mailboxes_raw.html:3
 msgid "Choose a value"
 msgstr "Välj ett värde"
 
-#: admin/templates/admin/mailform.html:4
+#: templates/admin/mailform.html:4
 msgid "Use domain default value"
 msgstr "Använd domänens standardvärde"
 
-#: admin/templates/admin/mx_domain_detail.html:11
+#: templates/admin/mx_domain_detail.html:11
 #, fuzzy
 #| msgid "Update"
 msgid "Updated"
 msgstr "Uppdatera"
 
-#: admin/templates/admin/mx_domain_detail.html:23
+#: templates/admin/mx_domain_detail.html:23
 msgid "This IP does not match any of the valid MXs defined in parameters"
 msgstr ""
 
-#: admin/templates/admin/mx_domain_detail.html:36
+#: templates/admin/mx_domain_detail.html:36
 msgid "No MX record found for this domain."
 msgstr ""
 
-#: admin/templates/admin/notifications/domain_in_dnsbl.html:3
+#: templates/admin/notifications/domain_in_dnsbl.html:3
 #, python-format
 msgid ""
 "Modoboa detected that domain %(domain)s is listed by the following DNSBL "
 "providers:"
 msgstr ""
 
-#: admin/templates/admin/notifications/domain_in_dnsbl.html:11
+#: templates/admin/notifications/domain_in_dnsbl.html:11
 msgid ""
 "The domain's reputation will be affected and there is a chance that emails "
 "coming from it are considered as spam. You should contact those providers "
 "and ask them to unlist detected IP address(es)."
 msgstr ""
 
-#: admin/templates/admin/notifications/domain_invalid_mx.html:3
+#: templates/admin/notifications/domain_invalid_mx.html:3
 #, python-format
 msgid "Modoboa detected that domain %(domain)s has no valid MX record:"
 msgstr ""
 
-#: admin/templates/admin/quota_headers.html:3
+#: templates/admin/quota_headers.html:3
 msgid "Value"
 msgstr "Värde"
 
-#: admin/templates/admin/quota_headers.html:4
+#: templates/admin/quota_headers.html:4
 msgid "Limit"
 msgstr "Gräns"
 
-#: admin/templates/admin/quota_headers.html:5
+#: templates/admin/quota_headers.html:5
 #, python-format
 msgid "Usage (%%)"
 msgstr "Användning (%%)"
 
-#: admin/templates/admin/searchform.html:6
+#: templates/admin/searchform.html:6
 msgid "Search"
 msgstr "Sök"
 
-#: admin/templatetags/admin_tags.py:18
+#: templatetags/admin_tags.py:18
 msgid "enabled_m"
 msgstr "enabled_m"
 
-#: admin/templatetags/admin_tags.py:18
+#: templatetags/admin_tags.py:18
 msgid "enabled_f"
 msgstr "enabled_f"
 
-#: admin/templatetags/admin_tags.py:39
+#: templatetags/admin_tags.py:39
 msgid "List domains"
 msgstr "Lista domäner"
 
-#: admin/templatetags/admin_tags.py:56 admin/templatetags/admin_tags.py:104
-#: admin/views/import_.py:87 admin/views/import_.py:109
+#: templatetags/admin_tags.py:56 templatetags/admin_tags.py:104
+#: views/import_.py:87 views/import_.py:109
 msgid "Import"
 msgstr "Importera"
 
-#: admin/templatetags/admin_tags.py:62 admin/templatetags/admin_tags.py:110
-#: admin/views/export.py:41 admin/views/export.py:69
+#: templatetags/admin_tags.py:62 templatetags/admin_tags.py:110
+#: views/export.py:41 views/export.py:69
 msgid "Export"
 msgstr "Exportera"
 
-#: admin/templatetags/admin_tags.py:94
+#: templatetags/admin_tags.py:94
 msgid "List identities"
 msgstr "Lista konton"
 
-#: admin/templatetags/admin_tags.py:99
+#: templatetags/admin_tags.py:99
 msgid "List quotas"
 msgstr "Lista kvoter"
 
-#: admin/templatetags/admin_tags.py:129
+#: templatetags/admin_tags.py:129
 msgid "View the domain's identities"
 msgstr "Visa domänens konton"
 
-#: admin/templatetags/admin_tags.py:135 admin/templatetags/admin_tags.py:178
-#: admin/templatetags/admin_tags.py:191
+#: templatetags/admin_tags.py:135 templatetags/admin_tags.py:178
+#: templatetags/admin_tags.py:191
 msgid "Edit {}"
 msgstr ""
 
-#: admin/templatetags/admin_tags.py:145 admin/templatetags/admin_tags.py:182
-#: admin/templatetags/admin_tags.py:196
+#: templatetags/admin_tags.py:145 templatetags/admin_tags.py:182
+#: templatetags/admin_tags.py:196
 #, python-format
 msgid "Delete %s?"
 msgstr "Radera %s?"
 
-#: admin/views/alias.py:33
+#: views/alias.py:33
 msgid "Alias with this name already exists"
 msgstr "Alias med detta namn existerar redan"
 
-#: admin/views/alias.py:58
+#: views/alias.py:58
 msgid "Create"
 msgstr "Skapa"
 
-#: admin/views/alias.py:70
+#: views/alias.py:70
 msgid "New alias"
 msgstr "Nytt alias"
 
-#: admin/views/alias.py:71
+#: views/alias.py:71
 msgid "Alias created"
 msgstr "Alias skapat"
 
-#: admin/views/alias.py:83
+#: views/alias.py:83
 msgid "Alias modified"
 msgstr "Alias ändrat"
 
-#: admin/views/alias.py:107
+#: views/alias.py:107
 #, fuzzy
 #| msgid "Alias created"
 msgid "Alias deleted"
@@ -1089,62 +1075,61 @@ msgid_plural "Aliases deleted"
 msgstr[0] "Alias skapat"
 msgstr[1] "Alias skapat"
 
-#: admin/views/dns.py:30
+#: views/dns.py:30
 msgid "MX records of {}"
 msgstr ""
 
-#: admin/views/dns.py:53
+#: views/dns.py:53
 msgid "DNSBL summary for {}"
 msgstr ""
 
-#: admin/views/domain.py:152
+#: views/domain.py:152
 msgid "You can't delete your own domain"
 msgstr "Du kan inte radera din egen domän"
 
-#: admin/views/domain.py:155
+#: views/domain.py:155
 msgid "Domain deleted"
 msgid_plural "Domains deleted"
 msgstr[0] "Domän raderad"
 msgstr[1] "Domäner raderade"
 
-#: admin/views/export.py:40
+#: views/export.py:40
 msgid "Export identities"
 msgstr "Exportera konton"
 
-#: admin/views/export.py:68
+#: views/export.py:68
 msgid "Export domains"
 msgstr "Exportera domäner"
 
-#: admin/views/identity.py:111 admin/views/identity.py:205
-#: admin/views/identity.py:210
+#: views/identity.py:111 views/identity.py:205 views/identity.py:210
 msgid "Invalid request"
 msgstr "Ogiltig förfrågan"
 
-#: admin/views/identity.py:195
+#: views/identity.py:195
 msgid "Account deleted"
 msgid_plural "Accounts deleted"
 msgstr[0] "Konto raderat"
 msgstr[1] "Konton raderade"
 
-#: admin/views/import_.py:63
+#: views/import_.py:63
 #, python-format
 msgid "Object already exists: %s"
 msgstr "Objektet existerar redan: %s"
 
-#: admin/views/import_.py:67
+#: views/import_.py:67
 #, python-format
 msgid "%d objects imported successfully"
 msgstr "%d objekt importerade"
 
-#: admin/views/import_.py:86
+#: views/import_.py:86
 msgid "Import domains"
 msgstr "Importera domäner"
 
-#: admin/views/import_.py:108
+#: views/import_.py:108
 msgid "Import identities"
 msgstr "Importera konton"
 
-#: admin/views/user.py:35
+#: views/user.py:35
 msgid "Forward updated"
 msgstr "Vidarebefordring uppdaterad"