diff --git a/core/admin/mailu/translations/fr/LC_MESSAGES/messages.po b/core/admin/mailu/translations/fr/LC_MESSAGES/messages.po
index fbe1770c..389d0114 100644
--- a/core/admin/mailu/translations/fr/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/fr/LC_MESSAGES/messages.po
@@ -1,18 +1,11 @@
-
 msgid ""
 msgstr ""
-"Project-Id-Version:  Mailu\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2018-04-22 12:10+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language: fr\n"
-"Language-Team: fr <LL@li.org>\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.5.3\n"
+"X-Generator: POEditor.com\n"
+"Project-Id-Version: Mailu\n"
+"Language: fr\n"
 
 #: mailu/ui/forms.py:32
 msgid "Invalid email address."
@@ -51,14 +44,6 @@ msgstr "Nombre maximum d'utilisateurs"
 msgid "Maximum alias count"
 msgstr "Nombre maximum d'alias"
 
-#: mailu/ui/forms.py:49
-msgid "Maximum user quota"
-msgstr "Quota maximum par utilisateur"
-
-#: mailu/ui/forms.py:50
-msgid "Enable sign-up"
-msgstr ""
-
 #: mailu/ui/forms.py:51 mailu/ui/forms.py:72 mailu/ui/forms.py:83
 #: mailu/ui/forms.py:128 mailu/ui/forms.py:140
 #: mailu/ui/templates/alias/list.html:21 mailu/ui/templates/domain/list.html:21
@@ -72,30 +57,10 @@ msgstr "Commentaire"
 msgid "Create"
 msgstr "Créer"
 
-#: mailu/ui/forms.py:57
-msgid "Initial admin"
-msgstr ""
-
-#: mailu/ui/forms.py:58
-msgid "Admin password"
-msgstr ""
-
 #: mailu/ui/forms.py:59 mailu/ui/forms.py:79 mailu/ui/forms.py:91
 msgid "Confirm password"
 msgstr "Confirmer le mot de passe"
 
-#: mailu/ui/forms.py:65
-msgid "Alternative name"
-msgstr "Nom alternatif"
-
-#: mailu/ui/forms.py:70
-msgid "Relayed domain name"
-msgstr "Nom du domaine relayé"
-
-#: mailu/ui/forms.py:71 mailu/ui/templates/relay/list.html:18
-msgid "Remote host"
-msgstr "Hôte distant"
-
 #: mailu/ui/forms.py:80 mailu/ui/templates/user/list.html:22
 #: mailu/ui/templates/user/signup_domain.html:16
 msgid "Quota"
@@ -109,24 +74,10 @@ msgstr "Autoriser l'accès IMAP"
 msgid "Allow POP3 access"
 msgstr "Autoriser l'accès POP3"
 
-#: mailu/ui/forms.py:84
-msgid "Enabled"
-msgstr ""
-
 #: mailu/ui/forms.py:85
 msgid "Save"
 msgstr "Enregistrer"
 
-#: mailu/ui/forms.py:89
-msgid "Email address"
-msgstr ""
-
-#: mailu/ui/forms.py:93 mailu/ui/templates/sidebar.html:117
-#: mailu/ui/templates/user/signup.html:4
-#: mailu/ui/templates/user/signup_domain.html:4
-msgid "Sign up"
-msgstr ""
-
 #: mailu/ui/forms.py:97
 msgid "Displayed name"
 msgstr "Nom affiché"
@@ -135,22 +86,9 @@ msgstr "Nom affiché"
 msgid "Enable spam filter"
 msgstr "Activer le filtre anti-spam"
 
-#: mailu/ui/forms.py:99
-msgid "Spam filter tolerance"
-msgstr "Tolérance du filtre antispam"
-
-#: mailu/ui/forms.py:100
-msgid "Enable forwarding"
-msgstr "Activer la redirection"
-
-#: mailu/ui/forms.py:101
-msgid "Keep a copy of the emails"
-msgstr "Conserver une copie des messages"
-
-#: mailu/ui/forms.py:103 mailu/ui/forms.py:139
-#: mailu/ui/templates/alias/list.html:20
-msgid "Destination"
-msgstr "Destination"
+#: mailu/ui/forms.py:80
+msgid "Spam filter threshold"
+msgstr "Seuil du filtre anti-spam"
 
 #: mailu/ui/forms.py:105
 msgid "Save settings"
@@ -164,6 +102,19 @@ msgstr "Vérifier le mot de passe"
 msgid "Update password"
 msgstr "Changer de mot de passe"
 
+#: mailu/ui/forms.py:100
+msgid "Enable forwarding"
+msgstr "Activer la redirection"
+
+#: mailu/ui/forms.py:103 mailu/ui/forms.py:139
+#: mailu/ui/templates/alias/list.html:20
+msgid "Destination"
+msgstr "Destination"
+
+#: mailu/ui/forms.py:120
+msgid "Update"
+msgstr "Mettre à jour"
+
 #: mailu/ui/forms.py:115
 msgid "Enable automatic reply"
 msgstr "Activer les réponses automatique"
@@ -176,22 +127,6 @@ msgstr "Sujet du message"
 msgid "Reply body"
 msgstr "Corps de la réponse"
 
-#: mailu/ui/forms.py:119
-msgid "End of vacation"
-msgstr ""
-
-#: mailu/ui/forms.py:120
-msgid "Update"
-msgstr "Mettre à jour"
-
-#: mailu/ui/forms.py:125
-msgid "Your token (write it down, as it will never be displayed again)"
-msgstr "Votre jeton (à conserver, il ne sera plus affiché par la suite)"
-
-#: mailu/ui/forms.py:130 mailu/ui/templates/token/list.html:20
-msgid "Authorized IP"
-msgstr "Adresse IP autorisée"
-
 #: mailu/ui/forms.py:136
 msgid "Alias"
 msgstr "Alias"
@@ -234,44 +169,11 @@ msgstr "Activer TLS"
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
-#: mailu/ui/forms.py:163
-msgid "Keep emails on the server"
-msgstr "Conserver les messages sur le serveur"
-
-#: mailu/ui/forms.py:168
-msgid "Announcement subject"
-msgstr "Sujet de l'annonce"
-
-#: mailu/ui/forms.py:170
-msgid "Announcement body"
-msgstr "Corps de l'annonce"
-
-#: mailu/ui/forms.py:172
-msgid "Send"
-msgstr "Envoyer"
-
-#: mailu/ui/templates/announcement.html:4
-msgid "Public announcement"
-msgstr "Annonce globale"
-
-#: mailu/ui/templates/client.html:4 mailu/ui/templates/sidebar.html:82
-msgid "Client setup"
-msgstr ""
-
-#: mailu/ui/templates/client.html:16 mailu/ui/templates/client.html:43
-msgid "Mail protocol"
-msgstr ""
-
-#: mailu/ui/templates/client.html:24 mailu/ui/templates/client.html:51
-msgid "Server name"
-msgstr ""
-
 #: mailu/ui/templates/confirm.html:4
 msgid "Confirm action"
 msgstr "Confirmer"
 
 #: mailu/ui/templates/confirm.html:13
-#, python-format
 msgid "You are about to %(action)s. Please confirm your action."
 msgstr "Vous allez %(action)s. Merci de confirmer votre action."
 
@@ -283,6 +185,10 @@ msgstr "Erreur Docker"
 msgid "An error occurred while talking to the Docker server."
 msgstr "Une erreur s'est produite en communiquant avec le serveur Docker."
 
+#: mailu/admin/templates/login.html:6
+msgid "Your account"
+msgstr "Votre compte"
+
 #: mailu/ui/templates/login.html:8
 msgid "to access the administration tools"
 msgstr "pour accéder aux outils d'administration"
@@ -323,6 +229,10 @@ msgstr "Mon compte"
 msgid "Settings"
 msgstr "Préférences"
 
+#: mailu/ui/templates/user/settings.html:22
+msgid "Auto-forward"
+msgstr "Redirection"
+
 #: mailu/ui/templates/sidebar.html:21 mailu/ui/templates/user/list.html:35
 msgid "Auto-reply"
 msgstr "Réponse automatique"
@@ -332,58 +242,26 @@ msgstr "Réponse automatique"
 msgid "Fetched accounts"
 msgstr "Comptes externes"
 
-#: mailu/ui/templates/sidebar.html:31 mailu/ui/templates/token/list.html:4
-msgid "Authentication tokens"
-msgstr "Jetons d'authentification"
+#: mailu/ui/templates/sidebar.html:105
+msgid "Sign out"
+msgstr "Déconnexion"
 
 #: mailu/ui/templates/sidebar.html:35
 msgid "Administration"
 msgstr "Administration"
 
-#: mailu/ui/templates/sidebar.html:44
-msgid "Announcement"
-msgstr "Annonce"
-
 #: mailu/ui/templates/sidebar.html:49
 msgid "Administrators"
 msgstr "Administrateurs"
 
-#: mailu/ui/templates/sidebar.html:54
-msgid "Relayed domains"
-msgstr "Domaines relayé"
-
-#: mailu/ui/templates/sidebar.html:59 mailu/ui/templates/user/settings.html:15
-msgid "Antispam"
-msgstr "Antispam"
-
 #: mailu/ui/templates/sidebar.html:66
 msgid "Mail domains"
 msgstr "Domaines"
 
-#: mailu/ui/templates/sidebar.html:72
-msgid "Go to"
-msgstr "Navigation"
-
-#: mailu/ui/templates/sidebar.html:76
-msgid "Webmail"
-msgstr "Webmail"
-
-#: mailu/ui/templates/sidebar.html:87
-msgid "Website"
-msgstr "Site web"
-
 #: mailu/ui/templates/sidebar.html:92
 msgid "Help"
 msgstr "Aide"
 
-#: mailu/ui/templates/domain/signup.html:4 mailu/ui/templates/sidebar.html:98
-msgid "Register a domain"
-msgstr ""
-
-#: mailu/ui/templates/sidebar.html:105
-msgid "Sign out"
-msgstr "Déconnexion"
-
 #: mailu/ui/templates/working.html:4
 msgid "We are still working on this feature!"
 msgstr "Cette fonctionnalité est en cours de développement !"
@@ -459,22 +337,6 @@ msgstr "Dernière modification"
 msgid "Edit"
 msgstr "Modifier"
 
-#: mailu/ui/templates/alternative/create.html:4
-msgid "Create alternative domain"
-msgstr "Nouveau domaine alternatif"
-
-#: mailu/ui/templates/alternative/list.html:4
-msgid "Alternative domain list"
-msgstr "Liste des domaines alternatifs"
-
-#: mailu/ui/templates/alternative/list.html:12
-msgid "Add alternative"
-msgstr "Ajouter une alternative"
-
-#: mailu/ui/templates/alternative/list.html:19
-msgid "Name"
-msgstr "Nom"
-
 #: mailu/ui/templates/domain/create.html:4
 #: mailu/ui/templates/domain/list.html:9
 msgid "New domain"
@@ -488,10 +350,6 @@ msgstr "Détails du domaine"
 msgid "Regenerate keys"
 msgstr "Regénérer les clés"
 
-#: mailu/ui/templates/domain/details.html:17
-msgid "Generate keys"
-msgstr ""
-
 #: mailu/ui/templates/domain/details.html:31
 msgid "DNS MX entry"
 msgstr "Entrée DNS MX"
@@ -548,27 +406,6 @@ msgstr "Alias"
 msgid "Managers"
 msgstr "Gérants"
 
-#: mailu/ui/templates/domain/list.html:39
-msgid "Alternatives"
-msgstr "Alternatives"
-
-#: mailu/ui/templates/domain/signup.html:13
-msgid ""
-"In order to register a new domain, you must first setup the\n"
-"    domain zone so that the domain <code>MX</code> points to this server"
-msgstr ""
-
-#: mailu/ui/templates/domain/signup.html:18
-msgid ""
-"If you do not know how to setup an <code>MX</code> record for your DNS "
-"zone,\n"
-"    please contact your DNS provider or administrator. Also, please wait "
-"a\n"
-"    couple minutes after the <code>MX</code> is set so the local server "
-"cache\n"
-"    expires."
-msgstr ""
-
 #: mailu/ui/templates/fetch/create.html:4
 msgid "Add a fetched account"
 msgstr "Ajouter un compte externe"
@@ -585,22 +422,10 @@ msgstr "Ajouter un compte"
 msgid "Endpoint"
 msgstr "Source"
 
-#: mailu/ui/templates/fetch/list.html:21
-msgid "Keep emails"
-msgstr "Conserver les messages"
-
 #: mailu/ui/templates/fetch/list.html:22
 msgid "Last check"
 msgstr "Dernier relevé"
 
-#: mailu/ui/templates/fetch/list.html:35
-msgid "yes"
-msgstr "oui"
-
-#: mailu/ui/templates/fetch/list.html:35
-msgid "no"
-msgstr "non"
-
 #: mailu/ui/templates/manager/create.html:4
 msgid "Add a manager"
 msgstr "Ajouter un gérant"
@@ -613,42 +438,34 @@ msgstr "Liste des gérants"
 msgid "Add manager"
 msgstr "Ajouter le gérant"
 
-#: mailu/ui/templates/relay/create.html:4
-msgid "New relay domain"
-msgstr "Nouveau domaine relayé"
+#: mailu/ui/forms.py:168
+msgid "Announcement subject"
+msgstr "Sujet de l'annonce"
 
-#: mailu/ui/templates/relay/edit.html:4
-msgid "Edit relayd domain"
-msgstr "Modifier le domaine relayé"
+#: mailu/ui/forms.py:170
+msgid "Announcement body"
+msgstr "Corps de l'annonce"
 
-#: mailu/ui/templates/relay/list.html:4
-msgid "Relayed domain list"
-msgstr "Liste des domaines relayés"
+#: mailu/ui/forms.py:172
+msgid "Send"
+msgstr "Envoyer"
 
-#: mailu/ui/templates/relay/list.html:9
-msgid "New relayed domain"
-msgstr "Nouveau domaine relayé"
+#: mailu/ui/templates/announcement.html:4
+msgid "Public announcement"
+msgstr "Annonce globale"
 
-#: mailu/ui/templates/token/create.html:4
-msgid "Create an authentication token"
-msgstr "Créer un jeton d'authentification"
+#: mailu/ui/templates/announcement.html:8
+msgid "from"
+msgstr "de"
 
-#: mailu/ui/templates/token/list.html:12
-msgid "New token"
-msgstr "Nouveau jeton"
+#: mailu/ui/templates/sidebar.html:44
+msgid "Announcement"
+msgstr "Annonce"
 
 #: mailu/ui/templates/user/create.html:4
 msgid "New user"
 msgstr "Nouvel utilisateur"
 
-#: mailu/ui/templates/user/create.html:15
-msgid "General"
-msgstr "Général"
-
-#: mailu/ui/templates/user/create.html:22
-msgid "Features and quotas"
-msgstr "Fonctionnalités et quotas"
-
 #: mailu/ui/templates/user/edit.html:4
 msgid "Edit user"
 msgstr "Modifier l'utilisateur"
@@ -681,9 +498,195 @@ msgstr "Modifier le mot de passe"
 msgid "Automatic reply"
 msgstr "Réponse automatique"
 
-#: mailu/ui/templates/user/settings.html:22
-msgid "Auto-forward"
-msgstr "Redirection"
+#: mailu/ui/forms.py:49
+msgid "Maximum user quota"
+msgstr "Quota maximum par utilisateur"
+
+#: mailu/ui/forms.py:101
+msgid "Keep a copy of the emails"
+msgstr "Conserver une copie des messages"
+
+#: mailu/ui/forms.py:163
+msgid "Keep emails on the server"
+msgstr "Conserver les messages sur le serveur"
+
+#: mailu/ui/templates/fetch/list.html:21
+msgid "Keep emails"
+msgstr "Conserver les messages"
+
+#: mailu/ui/templates/fetch/list.html:35
+msgid "yes"
+msgstr "oui"
+
+#: mailu/ui/templates/fetch/list.html:35
+msgid "no"
+msgstr "non"
+
+#: mailu/ui/forms.py:65
+msgid "Alternative name"
+msgstr "Nom alternatif"
+
+#: mailu/ui/forms.py:70
+msgid "Relayed domain name"
+msgstr "Nom du domaine relayé"
+
+#: mailu/ui/forms.py:71 mailu/ui/templates/relay/list.html:18
+msgid "Remote host"
+msgstr "Hôte distant"
+
+#: mailu/ui/templates/sidebar.html:54
+msgid "Relayed domains"
+msgstr "Domaines relayé"
+
+#: mailu/ui/templates/alternative/create.html:4
+msgid "Create alternative domain"
+msgstr "Nouveau domaine alternatif"
+
+#: mailu/ui/templates/alternative/list.html:4
+msgid "Alternative domain list"
+msgstr "Liste des domaines alternatifs"
+
+#: mailu/ui/templates/alternative/list.html:12
+msgid "Add alternative"
+msgstr "Ajouter une alternative"
+
+#: mailu/ui/templates/alternative/list.html:19
+msgid "Name"
+msgstr "Nom"
+
+#: mailu/ui/templates/domain/list.html:39
+msgid "Alternatives"
+msgstr "Alternatives"
+
+#: mailu/ui/templates/relay/create.html:4
+msgid "New relay domain"
+msgstr "Nouveau domaine relayé"
+
+#: mailu/ui/templates/relay/edit.html:4
+msgid "Edit relayd domain"
+msgstr "Modifier le domaine relayé"
+
+#: mailu/ui/templates/relay/list.html:4
+msgid "Relayed domain list"
+msgstr "Liste des domaines relayés"
+
+#: mailu/ui/templates/relay/list.html:9
+msgid "New relayed domain"
+msgstr "Nouveau domaine relayé"
+
+#: mailu/ui/forms.py:125
+msgid "Your token (write it down, as it will never be displayed again)"
+msgstr "Votre jeton (à conserver, il ne sera plus affiché par la suite)"
+
+#: mailu/ui/forms.py:130 mailu/ui/templates/token/list.html:20
+msgid "Authorized IP"
+msgstr "Adresse IP autorisée"
+
+#: mailu/ui/templates/sidebar.html:31 mailu/ui/templates/token/list.html:4
+msgid "Authentication tokens"
+msgstr "Jetons d'authentification"
+
+#: mailu/ui/templates/sidebar.html:72
+msgid "Go to"
+msgstr "Navigation"
+
+#: mailu/ui/templates/sidebar.html:76
+msgid "Webmail"
+msgstr "Webmail"
+
+#: mailu/ui/templates/sidebar.html:87
+msgid "Website"
+msgstr "Site web"
+
+#: mailu/ui/templates/token/create.html:4
+msgid "Create an authentication token"
+msgstr "Créer un jeton d'authentification"
+
+#: mailu/ui/templates/token/list.html:12
+msgid "New token"
+msgstr "Nouveau jeton"
+
+#: mailu/ui/templates/user/create.html:15
+msgid "General"
+msgstr "Général"
+
+#: mailu/ui/templates/user/create.html:22
+msgid "Features and quotas"
+msgstr "Fonctionnalités et quotas"
+
+#: mailu/ui/templates/user/settings.html:14
+msgid "General settings"
+msgstr "Général"
+
+#: mailu/ui/templates/sidebar.html:59 mailu/ui/templates/user/settings.html:15
+msgid "Antispam"
+msgstr "Antispam"
+
+#: mailu/ui/forms.py:99
+msgid "Spam filter tolerance"
+msgstr "Tolérance du filtre antispam"
+
+#: mailu/ui/forms.py:50
+msgid "Enable sign-up"
+msgstr ""
+
+#: mailu/ui/forms.py:57
+msgid "Initial admin"
+msgstr ""
+
+#: mailu/ui/forms.py:58
+msgid "Admin password"
+msgstr ""
+
+#: mailu/ui/forms.py:84
+msgid "Enabled"
+msgstr ""
+
+#: mailu/ui/forms.py:89
+msgid "Email address"
+msgstr ""
+
+#: mailu/ui/forms.py:93 mailu/ui/templates/sidebar.html:117
+#: mailu/ui/templates/user/signup.html:4
+#: mailu/ui/templates/user/signup_domain.html:4
+msgid "Sign up"
+msgstr ""
+
+#: mailu/ui/forms.py:119
+msgid "End of vacation"
+msgstr ""
+
+#: mailu/ui/templates/client.html:4 mailu/ui/templates/sidebar.html:82
+msgid "Client setup"
+msgstr ""
+
+#: mailu/ui/templates/client.html:16 mailu/ui/templates/client.html:43
+msgid "Mail protocol"
+msgstr ""
+
+#: mailu/ui/templates/client.html:24 mailu/ui/templates/client.html:51
+msgid "Server name"
+msgstr ""
+
+#: mailu/ui/templates/domain/signup.html:4 mailu/ui/templates/sidebar.html:98
+msgid "Register a domain"
+msgstr ""
+
+#: mailu/ui/templates/domain/details.html:17
+msgid "Generate keys"
+msgstr ""
+
+#: mailu/ui/templates/domain/signup.html:13
+msgid "In order to register a new domain, you must first setup the\n"
+"    domain zone so that the domain <code>MX</code> points to this server"
+msgstr ""
+
+#: mailu/ui/templates/domain/signup.html:18
+msgid "If you do not know how to setup an <code>MX</code> record for your DNS zone,\n"
+"    please contact your DNS provider or administrator. Also, please wait a\n"
+"    couple minutes after the <code>MX</code> is set so the local server cache\n"
+"    expires."
+msgstr ""
 
 #: mailu/ui/templates/user/signup_domain.html:8
 msgid "pick a domain for the new account"
@@ -697,15 +700,3 @@ msgstr ""
 msgid "Available slots"
 msgstr ""
 
-#~ msgid "Spam filter threshold"
-#~ msgstr "Seuil du filtre anti-spam"
-
-#~ msgid "Your account"
-#~ msgstr "Votre compte"
-
-#~ msgid "from"
-#~ msgstr "de"
-
-#~ msgid "General settings"
-#~ msgstr "Général"
-