diff --git a/admin/mailu/admin/templates/user/create.html b/admin/mailu/admin/templates/user/create.html
index 177bb148..d0907ed1 100644
--- a/admin/mailu/admin/templates/user/create.html
+++ b/admin/mailu/admin/templates/user/create.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block title %}
-New user
+{% trans %}New user{% endtrans %}
 {% endblock %}
 
 {% block subtitle %}
@@ -17,7 +17,7 @@ New user
       prepend='<span class="input-group-addon"><span id="quota">'+(form.quota_bytes.data//1000000000).__str__()+'</span> GiB</span>',
       oninput='$("#quota").text(this.value/1000000000);') }}
   {{ macros.form_field(form.enable_imap) }}
-  {{ macros.form_field(form.enable_pop) }}  
+  {{ macros.form_field(form.enable_pop) }}
   {{ macros.form_field(form.comment) }}
   {{ macros.form_field(form.submit) }}
 </form>
diff --git a/admin/mailu/admin/templates/user/edit.html b/admin/mailu/admin/templates/user/edit.html
index 7c4eaa1e..25da5486 100644
--- a/admin/mailu/admin/templates/user/edit.html
+++ b/admin/mailu/admin/templates/user/edit.html
@@ -1,7 +1,7 @@
 {% extends "user/create.html" %}
 
 {% block title %}
-Edit user
+{% trans %}Edit user{% endtrans %}
 {% endblock %}
 
 {% block subtitle %}
diff --git a/admin/mailu/admin/templates/user/forward.html b/admin/mailu/admin/templates/user/forward.html
index ecb327b0..fb98f3d6 100644
--- a/admin/mailu/admin/templates/user/forward.html
+++ b/admin/mailu/admin/templates/user/forward.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block title %}
-Forward emails
+{% trans %}Forward emails{% endtrans %}
 {% endblock %}
 
 {% block subtitle %}
diff --git a/admin/mailu/admin/templates/user/list.html b/admin/mailu/admin/templates/user/list.html
index e0c13ec8..a3ee52b1 100644
--- a/admin/mailu/admin/templates/user/list.html
+++ b/admin/mailu/admin/templates/user/list.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block title %}
-User list
+{% trans %}User list{% endtrans %}
 {% endblock %}
 
 {% block subtitle %}
@@ -9,33 +9,33 @@ User list
 {% endblock %}
 
 {% block main_action %}
-<a class="btn btn-primary" href="{{ url_for('.user_create', domain_name=domain.name) }}">Add user</a>
+<a class="btn btn-primary" href="{{ url_for('.user_create', domain_name=domain.name) }}">{% trans %}Add user{% endtrans %}</a>
 {% endblock %}
 
 {% block box %}
 <table class="table table-bordered">
   <tbody>
     <tr>
-      <th>Actions</th>
-      <th>User settings</th>
-      <th>Email</th>
-      <th>Features</th>
-      <th>Quota</th>
-      <th>Comment</th>
-      <th>Created</th>
-      <th>Last edit</th>
+      <th>{% trans %}Actions{% endtrans %}</th>
+      <th>{% trans %}User settings{% endtrans %}</th>
+      <th>{% trans %}Email{% endtrans %}</th>
+      <th>{% trans %}Features{% endtrans %}</th>
+      <th>{% trans %}Quota{% endtrans %}</th>
+      <th>{% trans %}Comment{% endtrans %}</th>
+      <th>{% trans %}Created{% endtrans %}</th>
+      <th>{% trans %}Last edit{% endtrans %}</th>
     </tr>
     {% for user in domain.users %}
     <tr>
       <td>
-        <a href="{{ url_for('.user_edit', user_email=user.email) }}" title="Edit"><i class="fa fa-pencil"></i></a>&nbsp;
-        <a href="{{ url_for('.user_delete', user_email=user.email) }}" title="Delete"><i class="fa fa-trash"></i></a>
+        <a href="{{ url_for('.user_edit', user_email=user.email) }}" title="{% trans %}Edit{% endtrans %}"><i class="fa fa-pencil"></i></a>&nbsp;
+        <a href="{{ url_for('.user_delete', user_email=user.email) }}" title="{% trans %}Delete{% endtrans %}"><i class="fa fa-trash"></i></a>
       </td>
       <td>
-        <a href="{{ url_for('.user_settings', user_email=user.email) }}" title="Settings"><i class="fa fa-wrench"></i></a>&nbsp;
-        <a href="{{ url_for('.user_forward', user_email=user.email) }}" title="Auto-forward"><i class="fa fa-share"></i></a>&nbsp;
-        <a href="{{ url_for('.user_reply', user_email=user.email) }}" title="Auto-reply"><i class="fa fa-plane"></i></a>&nbsp;
-        <a href="{{ url_for('.fetch_list', user_email=user.email) }}" title="Fetched accounts"><i class="fa fa-download"></i></a>&nbsp;
+        <a href="{{ url_for('.user_settings', user_email=user.email) }}" title="{% trans %}Settings{% endtrans %}"><i class="fa fa-wrench"></i></a>&nbsp;
+        <a href="{{ url_for('.user_forward', user_email=user.email) }}" title="{% trans %}Auto-forward{% endtrans %}"><i class="fa fa-share"></i></a>&nbsp;
+        <a href="{{ url_for('.user_reply', user_email=user.email) }}" title="{% trans %}Auto-reply{% endtrans %}"><i class="fa fa-plane"></i></a>&nbsp;
+        <a href="{{ url_for('.fetch_list', user_email=user.email) }}" title="{% trans %}Fetched accounts{% endtrans %}"><i class="fa fa-download"></i></a>&nbsp;
       </td>
       <td>{{ user }}</td>
       <td>
diff --git a/admin/mailu/admin/templates/user/password.html b/admin/mailu/admin/templates/user/password.html
index 4b6c1516..0ccf8fe3 100644
--- a/admin/mailu/admin/templates/user/password.html
+++ b/admin/mailu/admin/templates/user/password.html
@@ -1,7 +1,7 @@
 {% extends "form.html" %}
 
 {% block title %}
-Password update
+{% trans %}Password update{% endtrans %}
 {% endblock %}
 
 {% block subtitle %}
diff --git a/admin/mailu/admin/templates/user/reply.html b/admin/mailu/admin/templates/user/reply.html
index 9a080c8d..a80520bf 100644
--- a/admin/mailu/admin/templates/user/reply.html
+++ b/admin/mailu/admin/templates/user/reply.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block title %}
-Automatic reply
+{% trans %}Automatic reply{% endtrans %}
 {% endblock %}
 
 {% block subtitle %}
diff --git a/admin/mailu/admin/templates/user/settings.html b/admin/mailu/admin/templates/user/settings.html
index 3a36df1e..62cdbace 100644
--- a/admin/mailu/admin/templates/user/settings.html
+++ b/admin/mailu/admin/templates/user/settings.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block title %}
-User settings
+{% trans %}User settings{% endtrans %}
 {% endblock %}
 
 {% block subtitle %}
diff --git a/admin/mailu/translations/de/LC_MESSAGES/messages.po b/admin/mailu/translations/de/LC_MESSAGES/messages.po
index 06bbec48..b06467ea 100644
--- a/admin/mailu/translations/de/LC_MESSAGES/messages.po
+++ b/admin/mailu/translations/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: stefan.auditor@erdfisch.de\n"
-"POT-Creation-Date: 2016-11-10 10:47+0100\n"
+"POT-Creation-Date: 2016-11-10 10:52+0100\n"
 "PO-Revision-Date: 2016-11-09 21:43+0100\n"
 "Last-Translator: Stefan Auditor <stefan.auditor@erdfisch.de>\n"
 "Language: de\n"
@@ -56,6 +56,7 @@ msgstr "Maximale Anzahl Aliase"
 #: mailu/admin/forms.py:49 mailu/admin/forms.py:60 mailu/admin/forms.py:98
 #: mailu/admin/templates/alias/list.html:22
 #: mailu/admin/templates/domain/list.html:22
+#: mailu/admin/templates/user/list.html:24
 msgid "Comment"
 msgstr "Kommentar"
 
@@ -67,7 +68,7 @@ msgstr "Erstellen"
 msgid "Confirm password"
 msgstr "Passwort bestätigen"
 
-#: mailu/admin/forms.py:57
+#: mailu/admin/forms.py:57 mailu/admin/templates/user/list.html:23
 msgid "Quota"
 msgstr "Quota"
 
@@ -252,20 +253,23 @@ msgstr "Letztes Update"
 msgid "My account"
 msgstr "Mein Konto"
 
-#: mailu/admin/templates/sidebar.html:8
+#: mailu/admin/templates/sidebar.html:8 mailu/admin/templates/user/list.html:35
 msgid "Settings"
 msgstr "Einstellungen"
 
 #: mailu/admin/templates/sidebar.html:18
+#: mailu/admin/templates/user/list.html:36
 msgid "Auto-forward"
 msgstr "Auot-Weiterleitung"
 
 #: mailu/admin/templates/sidebar.html:23
+#: mailu/admin/templates/user/list.html:37
 msgid "Auto-reply"
 msgstr "Auto-Antwort"
 
 #: mailu/admin/templates/fetch/list.html:4
 #: mailu/admin/templates/sidebar.html:28
+#: mailu/admin/templates/user/list.html:38
 msgid "Fetched accounts"
 msgstr "Abgerufene Konten"
 
@@ -314,12 +318,14 @@ msgstr "Administrator hinzufügen"
 #: mailu/admin/templates/domain/list.html:17
 #: mailu/admin/templates/fetch/list.html:19
 #: mailu/admin/templates/manager/list.html:19
+#: mailu/admin/templates/user/list.html:19
 msgid "Actions"
 msgstr "Aktionen"
 
 #: mailu/admin/templates/admin/list.html:18
 #: mailu/admin/templates/alias/list.html:20
 #: mailu/admin/templates/manager/list.html:20
+#: mailu/admin/templates/user/list.html:21
 msgid "Email"
 msgstr "E-Mail"
 
@@ -328,6 +334,7 @@ msgstr "E-Mail"
 #: mailu/admin/templates/domain/list.html:32
 #: mailu/admin/templates/fetch/list.html:31
 #: mailu/admin/templates/manager/list.html:25
+#: mailu/admin/templates/user/list.html:32
 msgid "Delete"
 msgstr "Löschen"
 
@@ -350,18 +357,21 @@ msgstr "Alias hinzufügen"
 #: mailu/admin/templates/alias/list.html:23
 #: mailu/admin/templates/domain/list.html:23
 #: mailu/admin/templates/fetch/list.html:24
+#: mailu/admin/templates/user/list.html:25
 msgid "Created"
 msgstr "Erstellt"
 
 #: mailu/admin/templates/alias/list.html:24
 #: mailu/admin/templates/domain/list.html:24
 #: mailu/admin/templates/fetch/list.html:25
+#: mailu/admin/templates/user/list.html:26
 msgid "Last edit"
 msgstr "Zuletzt bearbeitet"
 
 #: mailu/admin/templates/alias/list.html:29
 #: mailu/admin/templates/domain/list.html:31
 #: mailu/admin/templates/fetch/list.html:30
+#: mailu/admin/templates/user/list.html:31
 msgid "Edit"
 msgstr "Bearbeiten"
 
@@ -466,3 +476,40 @@ msgstr "Manager Liste"
 msgid "Add manager"
 msgstr "Manager hinzufügen"
 
+#: mailu/admin/templates/user/create.html:4
+msgid "New user"
+msgstr ""
+
+#: mailu/admin/templates/user/edit.html:4
+msgid "Edit user"
+msgstr ""
+
+#: mailu/admin/templates/user/forward.html:4
+msgid "Forward emails"
+msgstr ""
+
+#: mailu/admin/templates/user/list.html:4
+msgid "User list"
+msgstr ""
+
+#: mailu/admin/templates/user/list.html:12
+msgid "Add user"
+msgstr ""
+
+#: mailu/admin/templates/user/list.html:20
+#: mailu/admin/templates/user/settings.html:4
+msgid "User settings"
+msgstr ""
+
+#: mailu/admin/templates/user/list.html:22
+msgid "Features"
+msgstr ""
+
+#: mailu/admin/templates/user/password.html:4
+msgid "Password update"
+msgstr ""
+
+#: mailu/admin/templates/user/reply.html:4
+msgid "Automatic reply"
+msgstr ""
+
diff --git a/admin/mailu/translations/en/LC_MESSAGES/messages.po b/admin/mailu/translations/en/LC_MESSAGES/messages.po
index 7aaf7e03..d96ef9b0 100644
--- a/admin/mailu/translations/en/LC_MESSAGES/messages.po
+++ b/admin/mailu/translations/en/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-11-10 10:47+0100\n"
+"POT-Creation-Date: 2016-11-10 10:52+0100\n"
 "PO-Revision-Date: 2016-10-02 15:02+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
@@ -56,6 +56,7 @@ msgstr ""
 #: mailu/admin/forms.py:49 mailu/admin/forms.py:60 mailu/admin/forms.py:98
 #: mailu/admin/templates/alias/list.html:22
 #: mailu/admin/templates/domain/list.html:22
+#: mailu/admin/templates/user/list.html:24
 msgid "Comment"
 msgstr ""
 
@@ -67,7 +68,7 @@ msgstr ""
 msgid "Confirm password"
 msgstr ""
 
-#: mailu/admin/forms.py:57
+#: mailu/admin/forms.py:57 mailu/admin/templates/user/list.html:23
 msgid "Quota"
 msgstr ""
 
@@ -250,20 +251,23 @@ msgstr ""
 msgid "My account"
 msgstr ""
 
-#: mailu/admin/templates/sidebar.html:8
+#: mailu/admin/templates/sidebar.html:8 mailu/admin/templates/user/list.html:35
 msgid "Settings"
 msgstr ""
 
 #: mailu/admin/templates/sidebar.html:18
+#: mailu/admin/templates/user/list.html:36
 msgid "Auto-forward"
 msgstr ""
 
 #: mailu/admin/templates/sidebar.html:23
+#: mailu/admin/templates/user/list.html:37
 msgid "Auto-reply"
 msgstr ""
 
 #: mailu/admin/templates/fetch/list.html:4
 #: mailu/admin/templates/sidebar.html:28
+#: mailu/admin/templates/user/list.html:38
 msgid "Fetched accounts"
 msgstr ""
 
@@ -312,12 +316,14 @@ msgstr ""
 #: mailu/admin/templates/domain/list.html:17
 #: mailu/admin/templates/fetch/list.html:19
 #: mailu/admin/templates/manager/list.html:19
+#: mailu/admin/templates/user/list.html:19
 msgid "Actions"
 msgstr ""
 
 #: mailu/admin/templates/admin/list.html:18
 #: mailu/admin/templates/alias/list.html:20
 #: mailu/admin/templates/manager/list.html:20
+#: mailu/admin/templates/user/list.html:21
 msgid "Email"
 msgstr ""
 
@@ -326,6 +332,7 @@ msgstr ""
 #: mailu/admin/templates/domain/list.html:32
 #: mailu/admin/templates/fetch/list.html:31
 #: mailu/admin/templates/manager/list.html:25
+#: mailu/admin/templates/user/list.html:32
 msgid "Delete"
 msgstr ""
 
@@ -348,18 +355,21 @@ msgstr ""
 #: mailu/admin/templates/alias/list.html:23
 #: mailu/admin/templates/domain/list.html:23
 #: mailu/admin/templates/fetch/list.html:24
+#: mailu/admin/templates/user/list.html:25
 msgid "Created"
 msgstr ""
 
 #: mailu/admin/templates/alias/list.html:24
 #: mailu/admin/templates/domain/list.html:24
 #: mailu/admin/templates/fetch/list.html:25
+#: mailu/admin/templates/user/list.html:26
 msgid "Last edit"
 msgstr ""
 
 #: mailu/admin/templates/alias/list.html:29
 #: mailu/admin/templates/domain/list.html:31
 #: mailu/admin/templates/fetch/list.html:30
+#: mailu/admin/templates/user/list.html:31
 msgid "Edit"
 msgstr ""
 
@@ -464,3 +474,40 @@ msgstr ""
 msgid "Add manager"
 msgstr ""
 
+#: mailu/admin/templates/user/create.html:4
+msgid "New user"
+msgstr ""
+
+#: mailu/admin/templates/user/edit.html:4
+msgid "Edit user"
+msgstr ""
+
+#: mailu/admin/templates/user/forward.html:4
+msgid "Forward emails"
+msgstr ""
+
+#: mailu/admin/templates/user/list.html:4
+msgid "User list"
+msgstr ""
+
+#: mailu/admin/templates/user/list.html:12
+msgid "Add user"
+msgstr ""
+
+#: mailu/admin/templates/user/list.html:20
+#: mailu/admin/templates/user/settings.html:4
+msgid "User settings"
+msgstr ""
+
+#: mailu/admin/templates/user/list.html:22
+msgid "Features"
+msgstr ""
+
+#: mailu/admin/templates/user/password.html:4
+msgid "Password update"
+msgstr ""
+
+#: mailu/admin/templates/user/reply.html:4
+msgid "Automatic reply"
+msgstr ""
+
diff --git a/admin/mailu/translations/fr/LC_MESSAGES/messages.po b/admin/mailu/translations/fr/LC_MESSAGES/messages.po
index 178fcdf9..c1e8f697 100644
--- a/admin/mailu/translations/fr/LC_MESSAGES/messages.po
+++ b/admin/mailu/translations/fr/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Mailu\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-11-10 10:47+0100\n"
+"POT-Creation-Date: 2016-11-10 10:52+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: fr\n"
@@ -52,6 +52,7 @@ msgstr "Nombre maximum d'alias"
 #: mailu/admin/forms.py:49 mailu/admin/forms.py:60 mailu/admin/forms.py:98
 #: mailu/admin/templates/alias/list.html:22
 #: mailu/admin/templates/domain/list.html:22
+#: mailu/admin/templates/user/list.html:24
 msgid "Comment"
 msgstr "Commentaire"
 
@@ -63,7 +64,7 @@ msgstr "Créer"
 msgid "Confirm password"
 msgstr "Confirmer le mot de passe"
 
-#: mailu/admin/forms.py:57
+#: mailu/admin/forms.py:57 mailu/admin/templates/user/list.html:23
 msgid "Quota"
 msgstr "Quota"
 
@@ -246,20 +247,23 @@ msgstr "Dernière mise à jour"
 msgid "My account"
 msgstr "Mon compte"
 
-#: mailu/admin/templates/sidebar.html:8
+#: mailu/admin/templates/sidebar.html:8 mailu/admin/templates/user/list.html:35
 msgid "Settings"
 msgstr "Préférences"
 
 #: mailu/admin/templates/sidebar.html:18
+#: mailu/admin/templates/user/list.html:36
 msgid "Auto-forward"
 msgstr "Redirection"
 
 #: mailu/admin/templates/sidebar.html:23
+#: mailu/admin/templates/user/list.html:37
 msgid "Auto-reply"
 msgstr "Réponse automatique"
 
 #: mailu/admin/templates/fetch/list.html:4
 #: mailu/admin/templates/sidebar.html:28
+#: mailu/admin/templates/user/list.html:38
 msgid "Fetched accounts"
 msgstr "Comptes externes"
 
@@ -308,12 +312,14 @@ msgstr "Ajouter un administrateur"
 #: mailu/admin/templates/domain/list.html:17
 #: mailu/admin/templates/fetch/list.html:19
 #: mailu/admin/templates/manager/list.html:19
+#: mailu/admin/templates/user/list.html:19
 msgid "Actions"
 msgstr "Actions"
 
 #: mailu/admin/templates/admin/list.html:18
 #: mailu/admin/templates/alias/list.html:20
 #: mailu/admin/templates/manager/list.html:20
+#: mailu/admin/templates/user/list.html:21
 msgid "Email"
 msgstr "E-mail"
 
@@ -322,6 +328,7 @@ msgstr "E-mail"
 #: mailu/admin/templates/domain/list.html:32
 #: mailu/admin/templates/fetch/list.html:31
 #: mailu/admin/templates/manager/list.html:25
+#: mailu/admin/templates/user/list.html:32
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -344,18 +351,21 @@ msgstr "Ajouter un alias"
 #: mailu/admin/templates/alias/list.html:23
 #: mailu/admin/templates/domain/list.html:23
 #: mailu/admin/templates/fetch/list.html:24
+#: mailu/admin/templates/user/list.html:25
 msgid "Created"
 msgstr "Création"
 
 #: mailu/admin/templates/alias/list.html:24
 #: mailu/admin/templates/domain/list.html:24
 #: mailu/admin/templates/fetch/list.html:25
+#: mailu/admin/templates/user/list.html:26
 msgid "Last edit"
 msgstr "Dernière modification"
 
 #: mailu/admin/templates/alias/list.html:29
 #: mailu/admin/templates/domain/list.html:31
 #: mailu/admin/templates/fetch/list.html:30
+#: mailu/admin/templates/user/list.html:31
 msgid "Edit"
 msgstr "Modifier"
 
@@ -460,3 +470,40 @@ msgstr "Liste des gérants"
 msgid "Add manager"
 msgstr "Ajouter le gérant"
 
+#: mailu/admin/templates/user/create.html:4
+msgid "New user"
+msgstr ""
+
+#: mailu/admin/templates/user/edit.html:4
+msgid "Edit user"
+msgstr ""
+
+#: mailu/admin/templates/user/forward.html:4
+msgid "Forward emails"
+msgstr ""
+
+#: mailu/admin/templates/user/list.html:4
+msgid "User list"
+msgstr ""
+
+#: mailu/admin/templates/user/list.html:12
+msgid "Add user"
+msgstr ""
+
+#: mailu/admin/templates/user/list.html:20
+#: mailu/admin/templates/user/settings.html:4
+msgid "User settings"
+msgstr ""
+
+#: mailu/admin/templates/user/list.html:22
+msgid "Features"
+msgstr ""
+
+#: mailu/admin/templates/user/password.html:4
+msgid "Password update"
+msgstr ""
+
+#: mailu/admin/templates/user/reply.html:4
+msgid "Automatic reply"
+msgstr ""
+
diff --git a/admin/messages.pot b/admin/messages.pot
index 4cd8f247..83eb1e61 100644
--- a/admin/messages.pot
+++ b/admin/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-10-29 13:37+0200\n"
+"POT-Creation-Date: 2016-11-10 10:52+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"
@@ -55,6 +55,7 @@ msgstr ""
 #: mailu/admin/forms.py:49 mailu/admin/forms.py:60 mailu/admin/forms.py:98
 #: mailu/admin/templates/alias/list.html:22
 #: mailu/admin/templates/domain/list.html:22
+#: mailu/admin/templates/user/list.html:24
 msgid "Comment"
 msgstr ""
 
@@ -66,7 +67,7 @@ msgstr ""
 msgid "Confirm password"
 msgstr ""
 
-#: mailu/admin/forms.py:57
+#: mailu/admin/forms.py:57 mailu/admin/templates/user/list.html:23
 msgid "Quota"
 msgstr ""
 
@@ -171,6 +172,26 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
+#: mailu/admin/forms.py:125
+msgid "Announcement subject"
+msgstr ""
+
+#: mailu/admin/forms.py:127
+msgid "Announcement body"
+msgstr ""
+
+#: mailu/admin/forms.py:129
+msgid "Send"
+msgstr ""
+
+#: mailu/admin/templates/announcement.html:4
+msgid "Public announcement"
+msgstr ""
+
+#: mailu/admin/templates/announcement.html:8
+msgid "from"
+msgstr ""
+
 #: mailu/admin/templates/confirm.html:4
 msgid "Confirm action"
 msgstr ""
@@ -229,20 +250,23 @@ msgstr ""
 msgid "My account"
 msgstr ""
 
-#: mailu/admin/templates/sidebar.html:8
+#: mailu/admin/templates/sidebar.html:8 mailu/admin/templates/user/list.html:35
 msgid "Settings"
 msgstr ""
 
 #: mailu/admin/templates/sidebar.html:18
+#: mailu/admin/templates/user/list.html:36
 msgid "Auto-forward"
 msgstr ""
 
 #: mailu/admin/templates/sidebar.html:23
+#: mailu/admin/templates/user/list.html:37
 msgid "Auto-reply"
 msgstr ""
 
 #: mailu/admin/templates/fetch/list.html:4
 #: mailu/admin/templates/sidebar.html:28
+#: mailu/admin/templates/user/list.html:38
 msgid "Fetched accounts"
 msgstr ""
 
@@ -255,14 +279,18 @@ msgid "Administration"
 msgstr ""
 
 #: mailu/admin/templates/sidebar.html:45
+msgid "Announcement"
+msgstr ""
+
+#: mailu/admin/templates/sidebar.html:50
 msgid "Administrators"
 msgstr ""
 
-#: mailu/admin/templates/sidebar.html:52
+#: mailu/admin/templates/sidebar.html:57
 msgid "Mail domains"
 msgstr ""
 
-#: mailu/admin/templates/sidebar.html:59
+#: mailu/admin/templates/sidebar.html:64
 msgid "Help"
 msgstr ""
 
@@ -287,12 +315,14 @@ msgstr ""
 #: mailu/admin/templates/domain/list.html:17
 #: mailu/admin/templates/fetch/list.html:19
 #: mailu/admin/templates/manager/list.html:19
+#: mailu/admin/templates/user/list.html:19
 msgid "Actions"
 msgstr ""
 
 #: mailu/admin/templates/admin/list.html:18
 #: mailu/admin/templates/alias/list.html:20
 #: mailu/admin/templates/manager/list.html:20
+#: mailu/admin/templates/user/list.html:21
 msgid "Email"
 msgstr ""
 
@@ -301,6 +331,7 @@ msgstr ""
 #: mailu/admin/templates/domain/list.html:32
 #: mailu/admin/templates/fetch/list.html:31
 #: mailu/admin/templates/manager/list.html:25
+#: mailu/admin/templates/user/list.html:32
 msgid "Delete"
 msgstr ""
 
@@ -323,18 +354,21 @@ msgstr ""
 #: mailu/admin/templates/alias/list.html:23
 #: mailu/admin/templates/domain/list.html:23
 #: mailu/admin/templates/fetch/list.html:24
+#: mailu/admin/templates/user/list.html:25
 msgid "Created"
 msgstr ""
 
 #: mailu/admin/templates/alias/list.html:24
 #: mailu/admin/templates/domain/list.html:24
 #: mailu/admin/templates/fetch/list.html:25
+#: mailu/admin/templates/user/list.html:26
 msgid "Last edit"
 msgstr ""
 
 #: mailu/admin/templates/alias/list.html:29
 #: mailu/admin/templates/domain/list.html:31
 #: mailu/admin/templates/fetch/list.html:30
+#: mailu/admin/templates/user/list.html:31
 msgid "Edit"
 msgstr ""
 
@@ -439,3 +473,40 @@ msgstr ""
 msgid "Add manager"
 msgstr ""
 
+#: mailu/admin/templates/user/create.html:4
+msgid "New user"
+msgstr ""
+
+#: mailu/admin/templates/user/edit.html:4
+msgid "Edit user"
+msgstr ""
+
+#: mailu/admin/templates/user/forward.html:4
+msgid "Forward emails"
+msgstr ""
+
+#: mailu/admin/templates/user/list.html:4
+msgid "User list"
+msgstr ""
+
+#: mailu/admin/templates/user/list.html:12
+msgid "Add user"
+msgstr ""
+
+#: mailu/admin/templates/user/list.html:20
+#: mailu/admin/templates/user/settings.html:4
+msgid "User settings"
+msgstr ""
+
+#: mailu/admin/templates/user/list.html:22
+msgid "Features"
+msgstr ""
+
+#: mailu/admin/templates/user/password.html:4
+msgid "Password update"
+msgstr ""
+
+#: mailu/admin/templates/user/reply.html:4
+msgid "Automatic reply"
+msgstr ""
+