Merge branch 'master' into feature-xforwarded-prefix

7 years ago · 971e839201
parent 5c45aa6b38 1d75cd8a33
commit 971e839201
8 changed files with 619 additions and 297 deletions
--- a/README.md
+++ b/README.md
@ -1,3 +1,16 @@
+ :warning: Warning
+==================
+
+**Be very careful when using `master`**, especially if you are currently running
+`1.4`, development of version `1.5` includes refactoring the frontend and
+authentication mechanisms. At best your server will stop working, at worst you
+could expose your data to malicious attackers!
+
+**Do not start using `traefik`** as a frontend server. Traefik was first tested
+to replace nginx because certificate generation was a nightmare. As we are in the
+process of completely rewriting the frontend and authentication interface, it will
+probably be deprecated before `1.5` is out.
+
 ![Logo](logo.png)

 [Join us and chat about the project.](https://riot.im/app/#/room/#mailu:tedomum.net)
--- a/admin/Dockerfile
+++ b/admin/Dockerfile
@ -4,9 +4,10 @@ RUN mkdir -p /app
 WORKDIR /app

 COPY requirements-prod.txt requirements.txt
-RUN apk --update add --virtual build-dep openssl-dev libffi-dev python-dev build-base openssl \
-	&& pip install -r requirements.txt \
-	&& apk del build-dep
+RUN apk --update add --virtual build-dep openssl-dev libffi-dev python-dev build-base \
+ && apk add openssl \
+ && pip install -r requirements.txt \
+ && apk del build-dep

 COPY mailu ./mailu
 COPY migrations ./migrations
--- 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: 2017-09-03 15:30+0200\n"
+"POT-Creation-Date: 2017-09-17 16:26+0200\n"
 "PO-Revision-Date: 2016-11-09 21:43+0100\n"
 "Last-Translator: Stefan Auditor <stefan.auditor@erdfisch.de>\n"
 "Language: de\n"
@ -26,12 +26,12 @@ msgstr "Ungültige E-Mail-Adresse."
 msgid "Confirm"
 msgstr "Bestätigen"

-#: mailu/admin/forms.py:40 mailu/admin/forms.py:55
+#: mailu/admin/forms.py:40 mailu/admin/forms.py:67
 msgid "E-mail"
 msgstr "E-Mail"

-#: mailu/admin/forms.py:41 mailu/admin/forms.py:56 mailu/admin/forms.py:73
-#: mailu/admin/forms.py:122
+#: mailu/admin/forms.py:41 mailu/admin/forms.py:68 mailu/admin/forms.py:85
+#: mailu/admin/forms.py:134
 msgid "Password"
 msgstr "Passwort"

@ -42,6 +42,7 @@ msgstr "Anmelden"

 #: mailu/admin/forms.py:46 mailu/admin/templates/domain/details.html:21
 #: mailu/admin/templates/domain/list.html:19
+#: mailu/admin/templates/relay/list.html:18
 msgid "Domain name"
 msgstr "Domain-Name"

@ -57,143 +58,157 @@ msgstr "Maximale Anzahl Aliase"
 msgid "Maximum user quota"
 msgstr ""

-#: mailu/admin/forms.py:50 mailu/admin/forms.py:61 mailu/admin/forms.py:100
-#: mailu/admin/templates/alias/list.html:22
+#: mailu/admin/forms.py:50 mailu/admin/forms.py:62 mailu/admin/forms.py:73
+#: mailu/admin/forms.py:112 mailu/admin/templates/alias/list.html:22
 #: mailu/admin/templates/domain/list.html:22
+#: mailu/admin/templates/relay/list.html:20
 #: mailu/admin/templates/user/list.html:24
 msgid "Comment"
 msgstr "Kommentar"

-#: mailu/admin/forms.py:51 mailu/admin/forms.py:101
+#: mailu/admin/forms.py:51 mailu/admin/forms.py:56 mailu/admin/forms.py:63
+#: mailu/admin/forms.py:113
 msgid "Create"
 msgstr "Erstellen"

-#: mailu/admin/forms.py:57
+#: mailu/admin/forms.py:55
+msgid "Alternative name"
+msgstr ""
+
+#: mailu/admin/forms.py:60
+msgid "Relayed domain name"
+msgstr ""
+
+#: mailu/admin/forms.py:61 mailu/admin/templates/relay/list.html:19
+msgid "Remote host"
+msgstr ""
+
+#: mailu/admin/forms.py:69
 msgid "Confirm password"
 msgstr "Passwort bestätigen"

-#: mailu/admin/forms.py:58 mailu/admin/templates/user/list.html:23
+#: mailu/admin/forms.py:70 mailu/admin/templates/user/list.html:23
 msgid "Quota"
 msgstr "Quota"

-#: mailu/admin/forms.py:59
+#: mailu/admin/forms.py:71
 msgid "Allow IMAP access"
 msgstr "Zugriff via IMAP erlauben"

-#: mailu/admin/forms.py:60
+#: mailu/admin/forms.py:72
 msgid "Allow POP3 access"
 msgstr "Zugriff via POP3 erlauben"

-#: mailu/admin/forms.py:62
+#: mailu/admin/forms.py:74
 msgid "Save"
 msgstr "Speichern"

-#: mailu/admin/forms.py:66
+#: mailu/admin/forms.py:78
 msgid "Displayed name"
 msgstr "Angezeigter Name"

-#: mailu/admin/forms.py:67
+#: mailu/admin/forms.py:79
 msgid "Enable spam filter"
 msgstr "Spam-Filter aktivieren"

-#: mailu/admin/forms.py:68
+#: mailu/admin/forms.py:80
 msgid "Spam filter threshold"
 msgstr "Spam-Filter Schwellenwert"

-#: mailu/admin/forms.py:69
+#: mailu/admin/forms.py:81
 msgid "Save settings"
 msgstr "Einstellungen speichern"

-#: mailu/admin/forms.py:74
+#: mailu/admin/forms.py:86
 msgid "Password check"
 msgstr "Passwort prüfen"

-#: mailu/admin/forms.py:75 mailu/admin/templates/sidebar.html:13
+#: mailu/admin/forms.py:87 mailu/admin/templates/sidebar.html:13
 msgid "Update password"
 msgstr "Passwort aktualisieren"

-#: mailu/admin/forms.py:79
+#: mailu/admin/forms.py:91
 msgid "Enable forwarding"
 msgstr "Weiterleitung aktivieren"

-#: mailu/admin/forms.py:80
+#: mailu/admin/forms.py:92
 msgid "Keep a copy of the emails"
 msgstr ""

-#: mailu/admin/forms.py:82 mailu/admin/forms.py:99
+#: mailu/admin/forms.py:94 mailu/admin/forms.py:111
 #: mailu/admin/templates/alias/list.html:21
 msgid "Destination"
 msgstr "Ziel"

-#: mailu/admin/forms.py:84 mailu/admin/forms.py:92
+#: mailu/admin/forms.py:96 mailu/admin/forms.py:104
 msgid "Update"
 msgstr "Aktualisieren"

-#: mailu/admin/forms.py:88
+#: mailu/admin/forms.py:100
 msgid "Enable automatic reply"
 msgstr "Automatische Antwort aktivieren"

-#: mailu/admin/forms.py:89
+#: mailu/admin/forms.py:101
 msgid "Reply subject"
 msgstr "Antwort Betreff"

-#: mailu/admin/forms.py:90
+#: mailu/admin/forms.py:102
 msgid "Reply body"
 msgstr "Antwort Text"

-#: mailu/admin/forms.py:96
+#: mailu/admin/forms.py:108
 msgid "Alias"
 msgstr "Alias"

-#: mailu/admin/forms.py:98
+#: mailu/admin/forms.py:110
 msgid "Use SQL LIKE Syntax (e.g. for catch-all aliases)"
 msgstr "SQL LIKE Syntax nutzen (z.B. für Catch-All Aliase)"

-#: mailu/admin/forms.py:105
+#: mailu/admin/forms.py:117
 msgid "Admin email"
 msgstr "Administrator E-Mail"

-#: mailu/admin/forms.py:106 mailu/admin/forms.py:111 mailu/admin/forms.py:124
+#: mailu/admin/forms.py:118 mailu/admin/forms.py:123 mailu/admin/forms.py:136
 msgid "Submit"
 msgstr "Absenden"

-#: mailu/admin/forms.py:110
+#: mailu/admin/forms.py:122
 msgid "Manager email"
 msgstr "Manager E-Mail"

-#: mailu/admin/forms.py:115
+#: mailu/admin/forms.py:127
 msgid "Protocol"
 msgstr "Protokoll"

-#: mailu/admin/forms.py:118
+#: mailu/admin/forms.py:130
 msgid "Hostname or IP"
 msgstr "Hostname oder IP"

-#: mailu/admin/forms.py:119
+#: mailu/admin/forms.py:131
 msgid "TCP port"
 msgstr "Port"

-#: mailu/admin/forms.py:120
+#: mailu/admin/forms.py:132
 msgid "Enable TLS"
 msgstr "Verschlüsselung aktivieren"

-#: mailu/admin/forms.py:121 mailu/admin/templates/fetch/list.html:21
+#: mailu/admin/forms.py:133 mailu/admin/templates/fetch/list.html:21
 msgid "Username"
 msgstr "Benutzername"

-#: mailu/admin/forms.py:123
+#: mailu/admin/forms.py:135
 msgid "Keep emails on the server"
 msgstr ""

-#: mailu/admin/forms.py:128
+#: mailu/admin/forms.py:140
 msgid "Announcement subject"
 msgstr "Bekanntmachung Betreff"

-#: mailu/admin/forms.py:130
+#: mailu/admin/forms.py:142
 msgid "Announcement body"
 msgstr "Bekanntmachung Text"

-#: mailu/admin/forms.py:132
+#: mailu/admin/forms.py:144
 msgid "Send"
 msgstr "Absenden"

@ -301,11 +316,15 @@ msgstr "Bekanntmachung"
 msgid "Administrators"
 msgstr "Administratoren"

-#: mailu/admin/templates/sidebar.html:57
+#: mailu/admin/templates/sidebar.html:55
+msgid "Relayed domains"
+msgstr ""
+
+#: mailu/admin/templates/sidebar.html:62
 msgid "Mail domains"
 msgstr "E-Mail-Domains"

-#: mailu/admin/templates/sidebar.html:64
+#: mailu/admin/templates/sidebar.html:69
 msgid "Help"
 msgstr "Hilfe"

@ -327,9 +346,11 @@ msgstr "Administrator hinzufügen"

 #: mailu/admin/templates/admin/list.html:17
 #: mailu/admin/templates/alias/list.html:19
+#: mailu/admin/templates/alternative/list.html:19
 #: mailu/admin/templates/domain/list.html:17
 #: mailu/admin/templates/fetch/list.html:19
 #: mailu/admin/templates/manager/list.html:19
+#: mailu/admin/templates/relay/list.html:17
 #: mailu/admin/templates/user/list.html:19
 msgid "Actions"
 msgstr "Aktionen"
@ -343,9 +364,11 @@ msgstr "E-Mail"

 #: mailu/admin/templates/admin/list.html:23
 #: mailu/admin/templates/alias/list.html:30
+#: mailu/admin/templates/alternative/list.html:26
 #: mailu/admin/templates/domain/list.html:32
 #: mailu/admin/templates/fetch/list.html:32
 #: mailu/admin/templates/manager/list.html:25
+#: mailu/admin/templates/relay/list.html:28
 #: mailu/admin/templates/user/list.html:32
 msgid "Delete"
 msgstr "Löschen"
@ -367,8 +390,10 @@ msgid "Add alias"
 msgstr "Alias hinzufügen"

 #: mailu/admin/templates/alias/list.html:23
+#: mailu/admin/templates/alternative/list.html:21
 #: mailu/admin/templates/domain/list.html:23
 #: mailu/admin/templates/fetch/list.html:25
+#: mailu/admin/templates/relay/list.html:21
 #: mailu/admin/templates/user/list.html:25
 msgid "Created"
 msgstr "Erstellt"
@ -376,6 +401,7 @@ msgstr "Erstellt"
 #: mailu/admin/templates/alias/list.html:24
 #: mailu/admin/templates/domain/list.html:24
 #: mailu/admin/templates/fetch/list.html:26
+#: mailu/admin/templates/relay/list.html:22
 #: mailu/admin/templates/user/list.html:26
 msgid "Last edit"
 msgstr "Zuletzt bearbeitet"
@ -383,10 +409,27 @@ msgstr "Zuletzt bearbeitet"
 #: mailu/admin/templates/alias/list.html:29
 #: mailu/admin/templates/domain/list.html:31
 #: mailu/admin/templates/fetch/list.html:31
+#: mailu/admin/templates/relay/list.html:27
 #: mailu/admin/templates/user/list.html:31
 msgid "Edit"
 msgstr "Bearbeiten"

+#: mailu/admin/templates/alternative/create.html:4
+msgid "Create alternative domain"
+msgstr ""
+
+#: mailu/admin/templates/alternative/list.html:4
+msgid "Alternative domain list"
+msgstr ""
+
+#: mailu/admin/templates/alternative/list.html:12
+msgid "Add alternative"
+msgstr ""
+
+#: mailu/admin/templates/alternative/list.html:20
+msgid "Name"
+msgstr ""
+
 #: mailu/admin/templates/domain/create.html:4
 #: mailu/admin/templates/domain/list.html:9
 msgid "New domain"
@ -456,6 +499,10 @@ msgstr "Aliase"
 msgid "Managers"
 msgstr "Manager"

+#: mailu/admin/templates/domain/list.html:40
+msgid "Alternatives"
+msgstr ""
+
 #: mailu/admin/templates/fetch/create.html:4
 msgid "Add a fetched account"
 msgstr "Externes Konto hinzufügen"
@ -500,6 +547,22 @@ msgstr "Manager Liste"
 msgid "Add manager"
 msgstr "Manager hinzufügen"

+#: mailu/admin/templates/relay/create.html:4
+msgid "New relay domain"
+msgstr ""
+
+#: mailu/admin/templates/relay/edit.html:4
+msgid "Edit relayd domain"
+msgstr ""
+
+#: mailu/admin/templates/relay/list.html:4
+msgid "Relayed domain list"
+msgstr ""
+
+#: mailu/admin/templates/relay/list.html:9
+msgid "New relayed domain"
+msgstr ""
+
 #: mailu/admin/templates/user/create.html:4
 msgid "New user"
 msgstr "Neuer Benutzer"
--- 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: 2017-09-03 15:30+0200\n"
+"POT-Creation-Date: 2017-09-17 16:26+0200\n"
 "PO-Revision-Date: 2016-10-02 15:02+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
@ -26,12 +26,12 @@ msgstr ""
 msgid "Confirm"
 msgstr ""

-#: mailu/admin/forms.py:40 mailu/admin/forms.py:55
+#: mailu/admin/forms.py:40 mailu/admin/forms.py:67
 msgid "E-mail"
 msgstr ""

-#: mailu/admin/forms.py:41 mailu/admin/forms.py:56 mailu/admin/forms.py:73
-#: mailu/admin/forms.py:122
+#: mailu/admin/forms.py:41 mailu/admin/forms.py:68 mailu/admin/forms.py:85
+#: mailu/admin/forms.py:134
 msgid "Password"
 msgstr ""

@ -42,6 +42,7 @@ msgstr ""

 #: mailu/admin/forms.py:46 mailu/admin/templates/domain/details.html:21
 #: mailu/admin/templates/domain/list.html:19
+#: mailu/admin/templates/relay/list.html:18
 msgid "Domain name"
 msgstr ""

@ -57,143 +58,157 @@ msgstr ""
 msgid "Maximum user quota"
 msgstr ""

-#: mailu/admin/forms.py:50 mailu/admin/forms.py:61 mailu/admin/forms.py:100
-#: mailu/admin/templates/alias/list.html:22
+#: mailu/admin/forms.py:50 mailu/admin/forms.py:62 mailu/admin/forms.py:73
+#: mailu/admin/forms.py:112 mailu/admin/templates/alias/list.html:22
 #: mailu/admin/templates/domain/list.html:22
+#: mailu/admin/templates/relay/list.html:20
 #: mailu/admin/templates/user/list.html:24
 msgid "Comment"
 msgstr ""

-#: mailu/admin/forms.py:51 mailu/admin/forms.py:101
+#: mailu/admin/forms.py:51 mailu/admin/forms.py:56 mailu/admin/forms.py:63
+#: mailu/admin/forms.py:113
 msgid "Create"
 msgstr ""

-#: mailu/admin/forms.py:57
-msgid "Confirm password"
-msgstr ""
-
-#: mailu/admin/forms.py:58 mailu/admin/templates/user/list.html:23
-msgid "Quota"
-msgstr ""
-
-#: mailu/admin/forms.py:59
-msgid "Allow IMAP access"
+#: mailu/admin/forms.py:55
+msgid "Alternative name"
 msgstr ""

 #: mailu/admin/forms.py:60
-msgid "Allow POP3 access"
+msgid "Relayed domain name"
 msgstr ""

-#: mailu/admin/forms.py:62
-msgid "Save"
-msgstr ""
-
-#: mailu/admin/forms.py:66
-msgid "Displayed name"
-msgstr ""
-
-#: mailu/admin/forms.py:67
-msgid "Enable spam filter"
-msgstr ""
-
-#: mailu/admin/forms.py:68
-msgid "Spam filter threshold"
+#: mailu/admin/forms.py:61 mailu/admin/templates/relay/list.html:19
+msgid "Remote host"
 msgstr ""

 #: mailu/admin/forms.py:69
-msgid "Save settings"
+msgid "Confirm password"
+msgstr ""
+
+#: mailu/admin/forms.py:70 mailu/admin/templates/user/list.html:23
+msgid "Quota"
+msgstr ""
+
+#: mailu/admin/forms.py:71
+msgid "Allow IMAP access"
+msgstr ""
+
+#: mailu/admin/forms.py:72
+msgid "Allow POP3 access"
 msgstr ""

 #: mailu/admin/forms.py:74
-msgid "Password check"
+msgid "Save"
 msgstr ""

-#: mailu/admin/forms.py:75 mailu/admin/templates/sidebar.html:13
-msgid "Update password"
+#: mailu/admin/forms.py:78
+msgid "Displayed name"
 msgstr ""

 #: mailu/admin/forms.py:79
-msgid "Enable forwarding"
+msgid "Enable spam filter"
 msgstr ""

 #: mailu/admin/forms.py:80
+msgid "Spam filter threshold"
+msgstr ""
+
+#: mailu/admin/forms.py:81
+msgid "Save settings"
+msgstr ""
+
+#: mailu/admin/forms.py:86
+msgid "Password check"
+msgstr ""
+
+#: mailu/admin/forms.py:87 mailu/admin/templates/sidebar.html:13
+msgid "Update password"
+msgstr ""
+
+#: mailu/admin/forms.py:91
+msgid "Enable forwarding"
+msgstr ""
+
+#: mailu/admin/forms.py:92
 msgid "Keep a copy of the emails"
 msgstr ""

-#: mailu/admin/forms.py:82 mailu/admin/forms.py:99
+#: mailu/admin/forms.py:94 mailu/admin/forms.py:111
 #: mailu/admin/templates/alias/list.html:21
 msgid "Destination"
 msgstr ""

-#: mailu/admin/forms.py:84 mailu/admin/forms.py:92
+#: mailu/admin/forms.py:96 mailu/admin/forms.py:104
 msgid "Update"
 msgstr ""

-#: mailu/admin/forms.py:88
+#: mailu/admin/forms.py:100
 msgid "Enable automatic reply"
 msgstr ""

-#: mailu/admin/forms.py:89
+#: mailu/admin/forms.py:101
 msgid "Reply subject"
 msgstr ""

-#: mailu/admin/forms.py:90
+#: mailu/admin/forms.py:102
 msgid "Reply body"
 msgstr ""

-#: mailu/admin/forms.py:96
+#: mailu/admin/forms.py:108
 msgid "Alias"
 msgstr ""

-#: mailu/admin/forms.py:98
+#: mailu/admin/forms.py:110
 msgid "Use SQL LIKE Syntax (e.g. for catch-all aliases)"
 msgstr ""

-#: mailu/admin/forms.py:105
+#: mailu/admin/forms.py:117
 msgid "Admin email"
 msgstr ""

-#: mailu/admin/forms.py:106 mailu/admin/forms.py:111 mailu/admin/forms.py:124
+#: mailu/admin/forms.py:118 mailu/admin/forms.py:123 mailu/admin/forms.py:136
 msgid "Submit"
 msgstr ""

-#: mailu/admin/forms.py:110
+#: mailu/admin/forms.py:122
 msgid "Manager email"
 msgstr ""

-#: mailu/admin/forms.py:115
+#: mailu/admin/forms.py:127
 msgid "Protocol"
 msgstr ""

-#: mailu/admin/forms.py:118
+#: mailu/admin/forms.py:130
 msgid "Hostname or IP"
 msgstr ""

-#: mailu/admin/forms.py:119
+#: mailu/admin/forms.py:131
 msgid "TCP port"
 msgstr ""

-#: mailu/admin/forms.py:120
+#: mailu/admin/forms.py:132
 msgid "Enable TLS"
 msgstr ""

-#: mailu/admin/forms.py:121 mailu/admin/templates/fetch/list.html:21
+#: mailu/admin/forms.py:133 mailu/admin/templates/fetch/list.html:21
 msgid "Username"
 msgstr ""

-#: mailu/admin/forms.py:123
+#: mailu/admin/forms.py:135
 msgid "Keep emails on the server"
 msgstr ""

-#: mailu/admin/forms.py:128
+#: mailu/admin/forms.py:140
 msgid "Announcement subject"
 msgstr ""

-#: mailu/admin/forms.py:130
+#: mailu/admin/forms.py:142
 msgid "Announcement body"
 msgstr ""

-#: mailu/admin/forms.py:132
+#: mailu/admin/forms.py:144
 msgid "Send"
 msgstr ""

@ -299,11 +314,15 @@ msgstr ""
 msgid "Administrators"
 msgstr ""

-#: mailu/admin/templates/sidebar.html:57
+#: mailu/admin/templates/sidebar.html:55
+msgid "Relayed domains"
+msgstr ""
+
+#: mailu/admin/templates/sidebar.html:62
 msgid "Mail domains"
 msgstr ""

-#: mailu/admin/templates/sidebar.html:64
+#: mailu/admin/templates/sidebar.html:69
 msgid "Help"
 msgstr ""

@ -325,9 +344,11 @@ msgstr ""

 #: mailu/admin/templates/admin/list.html:17
 #: mailu/admin/templates/alias/list.html:19
+#: mailu/admin/templates/alternative/list.html:19
 #: mailu/admin/templates/domain/list.html:17
 #: mailu/admin/templates/fetch/list.html:19
 #: mailu/admin/templates/manager/list.html:19
+#: mailu/admin/templates/relay/list.html:17
 #: mailu/admin/templates/user/list.html:19
 msgid "Actions"
 msgstr ""
@ -341,9 +362,11 @@ msgstr ""

 #: mailu/admin/templates/admin/list.html:23
 #: mailu/admin/templates/alias/list.html:30
+#: mailu/admin/templates/alternative/list.html:26
 #: mailu/admin/templates/domain/list.html:32
 #: mailu/admin/templates/fetch/list.html:32
 #: mailu/admin/templates/manager/list.html:25
+#: mailu/admin/templates/relay/list.html:28
 #: mailu/admin/templates/user/list.html:32
 msgid "Delete"
 msgstr ""
@ -365,8 +388,10 @@ msgid "Add alias"
 msgstr ""

 #: mailu/admin/templates/alias/list.html:23
+#: mailu/admin/templates/alternative/list.html:21
 #: mailu/admin/templates/domain/list.html:23
 #: mailu/admin/templates/fetch/list.html:25
+#: mailu/admin/templates/relay/list.html:21
 #: mailu/admin/templates/user/list.html:25
 msgid "Created"
 msgstr ""
@ -374,6 +399,7 @@ msgstr ""
 #: mailu/admin/templates/alias/list.html:24
 #: mailu/admin/templates/domain/list.html:24
 #: mailu/admin/templates/fetch/list.html:26
+#: mailu/admin/templates/relay/list.html:22
 #: mailu/admin/templates/user/list.html:26
 msgid "Last edit"
 msgstr ""
@ -381,10 +407,27 @@ msgstr ""
 #: mailu/admin/templates/alias/list.html:29
 #: mailu/admin/templates/domain/list.html:31
 #: mailu/admin/templates/fetch/list.html:31
+#: mailu/admin/templates/relay/list.html:27
 #: mailu/admin/templates/user/list.html:31
 msgid "Edit"
 msgstr ""

+#: mailu/admin/templates/alternative/create.html:4
+msgid "Create alternative domain"
+msgstr ""
+
+#: mailu/admin/templates/alternative/list.html:4
+msgid "Alternative domain list"
+msgstr ""
+
+#: mailu/admin/templates/alternative/list.html:12
+msgid "Add alternative"
+msgstr ""
+
+#: mailu/admin/templates/alternative/list.html:20
+msgid "Name"
+msgstr ""
+
 #: mailu/admin/templates/domain/create.html:4
 #: mailu/admin/templates/domain/list.html:9
 msgid "New domain"
@ -454,6 +497,10 @@ msgstr ""
 msgid "Managers"
 msgstr ""

+#: mailu/admin/templates/domain/list.html:40
+msgid "Alternatives"
+msgstr ""
+
 #: mailu/admin/templates/fetch/create.html:4
 msgid "Add a fetched account"
 msgstr ""
@ -498,6 +545,22 @@ msgstr ""
 msgid "Add manager"
 msgstr ""

+#: mailu/admin/templates/relay/create.html:4
+msgid "New relay domain"
+msgstr ""
+
+#: mailu/admin/templates/relay/edit.html:4
+msgid "Edit relayd domain"
+msgstr ""
+
+#: mailu/admin/templates/relay/list.html:4
+msgid "Relayed domain list"
+msgstr ""
+
+#: mailu/admin/templates/relay/list.html:9
+msgid "New relayed domain"
+msgstr ""
+
 #: mailu/admin/templates/user/create.html:4
 msgid "New user"
 msgstr ""
--- a/admin/mailu/translations/fr/LC_MESSAGES/messages.po
+++ b/admin/mailu/translations/fr/LC_MESSAGES/messages.po
@ -1,18 +1,12 @@
-
 msgid ""
 msgstr ""
-"Project-Id-Version:  Mailu\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-09-03 15:30+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.1\n"
+"X-Generator: POEditor.com\n"
+"Project-Id-Version: Mailu\n"
+"Language: fr\n"

 #: mailu/admin/forms.py:32
 msgid "Invalid email address."
@ -22,12 +16,12 @@ msgstr "Adresse e-mail invalide"
 msgid "Confirm"
 msgstr "Confirmer"

-#: mailu/admin/forms.py:40 mailu/admin/forms.py:55
+#: mailu/admin/forms.py:40 mailu/admin/forms.py:67
 msgid "E-mail"
 msgstr "E-mail"

-#: mailu/admin/forms.py:41 mailu/admin/forms.py:56 mailu/admin/forms.py:73
-#: mailu/admin/forms.py:122
+#: mailu/admin/forms.py:41 mailu/admin/forms.py:68 mailu/admin/forms.py:85
+#: mailu/admin/forms.py:134
 msgid "Password"
 msgstr "Mot de passe"

@ -38,6 +32,7 @@ msgstr "Se connecter"

 #: mailu/admin/forms.py:46 mailu/admin/templates/domain/details.html:21
 #: mailu/admin/templates/domain/list.html:19
+#: mailu/admin/templates/relay/list.html:18
 msgid "Domain name"
 msgstr "Nom de domaine"

@ -49,164 +44,133 @@ msgstr "Nombre maximum d'utilisateurs"
 msgid "Maximum alias count"
 msgstr "Nombre maximum d'alias"

-#: mailu/admin/forms.py:49
-msgid "Maximum user quota"
-msgstr ""
-
-#: mailu/admin/forms.py:50 mailu/admin/forms.py:61 mailu/admin/forms.py:100
-#: mailu/admin/templates/alias/list.html:22
+#: mailu/admin/forms.py:50 mailu/admin/forms.py:62 mailu/admin/forms.py:73
+#: mailu/admin/forms.py:112 mailu/admin/templates/alias/list.html:22
 #: mailu/admin/templates/domain/list.html:22
+#: mailu/admin/templates/relay/list.html:20
 #: mailu/admin/templates/user/list.html:24
 msgid "Comment"
 msgstr "Commentaire"

-#: mailu/admin/forms.py:51 mailu/admin/forms.py:101
+#: mailu/admin/forms.py:51 mailu/admin/forms.py:56 mailu/admin/forms.py:63
+#: mailu/admin/forms.py:113
 msgid "Create"
 msgstr "Créer"

-#: mailu/admin/forms.py:57
+#: mailu/admin/forms.py:69
 msgid "Confirm password"
 msgstr "Confirmer le mot de passe"

-#: mailu/admin/forms.py:58 mailu/admin/templates/user/list.html:23
+#: mailu/admin/forms.py:70 mailu/admin/templates/user/list.html:23
 msgid "Quota"
 msgstr "Quota"

-#: mailu/admin/forms.py:59
+#: mailu/admin/forms.py:71
 msgid "Allow IMAP access"
 msgstr "Autoriser l'accès IMAP"

-#: mailu/admin/forms.py:60
+#: mailu/admin/forms.py:72
 msgid "Allow POP3 access"
 msgstr "Autoriser l'accès POP3"

-#: mailu/admin/forms.py:62
+#: mailu/admin/forms.py:74
 msgid "Save"
 msgstr "Enregistrer"

-#: mailu/admin/forms.py:66
+#: mailu/admin/forms.py:78
 msgid "Displayed name"
 msgstr "Nom affiché"

-#: mailu/admin/forms.py:67
+#: mailu/admin/forms.py:79
 msgid "Enable spam filter"
 msgstr "Activer le filtre anti-spam"

-#: mailu/admin/forms.py:68
+#: mailu/admin/forms.py:80
 msgid "Spam filter threshold"
 msgstr "Seuil du filtre anti-spam"

-#: mailu/admin/forms.py:69
+#: mailu/admin/forms.py:81
 msgid "Save settings"
 msgstr "Enregistrer les préférences"

-#: mailu/admin/forms.py:74
+#: mailu/admin/forms.py:86
 msgid "Password check"
 msgstr "Vérifier le mot de passe"

-#: mailu/admin/forms.py:75 mailu/admin/templates/sidebar.html:13
+#: mailu/admin/forms.py:87 mailu/admin/templates/sidebar.html:13
 msgid "Update password"
 msgstr "Changer de mot de passe"

-#: mailu/admin/forms.py:79
+#: mailu/admin/forms.py:91
 msgid "Enable forwarding"
 msgstr "Activer la redirection"

-#: mailu/admin/forms.py:80
-msgid "Keep a copy of the emails"
-msgstr ""
-
-#: mailu/admin/forms.py:82 mailu/admin/forms.py:99
+#: mailu/admin/forms.py:94 mailu/admin/forms.py:111
 #: mailu/admin/templates/alias/list.html:21
 msgid "Destination"
 msgstr "Destination"

-#: mailu/admin/forms.py:84 mailu/admin/forms.py:92
+#: mailu/admin/forms.py:96 mailu/admin/forms.py:104
 msgid "Update"
 msgstr "Mettre à jour"

-#: mailu/admin/forms.py:88
+#: mailu/admin/forms.py:100
 msgid "Enable automatic reply"
 msgstr "Activer les réponses automatique"

-#: mailu/admin/forms.py:89
+#: mailu/admin/forms.py:101
 msgid "Reply subject"
 msgstr "Sujet du message"

-#: mailu/admin/forms.py:90
+#: mailu/admin/forms.py:102
 msgid "Reply body"
 msgstr "Corps de la réponse"

-#: mailu/admin/forms.py:96
+#: mailu/admin/forms.py:108
 msgid "Alias"
 msgstr "Alias"

-#: mailu/admin/forms.py:98
+#: mailu/admin/forms.py:110
 msgid "Use SQL LIKE Syntax (e.g. for catch-all aliases)"
 msgstr "Utiliser la syntaxe SQL LIKE (par exemple pour les alias catch-all)"

-#: mailu/admin/forms.py:105
+#: mailu/admin/forms.py:117
 msgid "Admin email"
 msgstr "Email de l'administrateur"

-#: mailu/admin/forms.py:106 mailu/admin/forms.py:111 mailu/admin/forms.py:124
+#: mailu/admin/forms.py:118 mailu/admin/forms.py:123 mailu/admin/forms.py:136
 msgid "Submit"
 msgstr "Valider"

-#: mailu/admin/forms.py:110
+#: mailu/admin/forms.py:122
 msgid "Manager email"
 msgstr "E-mail du gérant"

-#: mailu/admin/forms.py:115
+#: mailu/admin/forms.py:127
 msgid "Protocol"
 msgstr "Protocole"

-#: mailu/admin/forms.py:118
+#: mailu/admin/forms.py:130
 msgid "Hostname or IP"
 msgstr "Nom d'hôte ou adresse IP"

-#: mailu/admin/forms.py:119
+#: mailu/admin/forms.py:131
 msgid "TCP port"
 msgstr "Port TCP"

-#: mailu/admin/forms.py:120
+#: mailu/admin/forms.py:132
 msgid "Enable TLS"
 msgstr "Activer TLS"

-#: mailu/admin/forms.py:121 mailu/admin/templates/fetch/list.html:21
+#: mailu/admin/forms.py:133 mailu/admin/templates/fetch/list.html:21
 msgid "Username"
 msgstr "Nom d'utilisateur"

-#: mailu/admin/forms.py:123
-msgid "Keep emails on the server"
-msgstr ""
-
-#: mailu/admin/forms.py:128
-msgid "Announcement subject"
-msgstr "Sujet de l'annonce"
-
-#: mailu/admin/forms.py:130
-msgid "Announcement body"
-msgstr "Corps de l'annonce"
-
-#: mailu/admin/forms.py:132
-msgid "Send"
-msgstr "Envoyer"
-
-#: mailu/admin/templates/announcement.html:4
-msgid "Public announcement"
-msgstr "Annonce globale"
-
-#: mailu/admin/templates/announcement.html:8
-msgid "from"
-msgstr "de"
-
 #: mailu/admin/templates/confirm.html:4
 msgid "Confirm action"
 msgstr "Confirmer"

 #: mailu/admin/templates/confirm.html:12
-#, python-format
 msgid "You are about to %(action)s. Please confirm your action."
 msgstr "Vous allez %(action)s. Merci de confirmer votre action."

@ -287,19 +251,15 @@ msgstr "Déconnexion"
 msgid "Administration"
 msgstr "Administration"

-#: mailu/admin/templates/sidebar.html:45
-msgid "Announcement"
-msgstr "Annonce"
-
 #: mailu/admin/templates/sidebar.html:50
 msgid "Administrators"
 msgstr "Administrateurs"

-#: mailu/admin/templates/sidebar.html:57
+#: mailu/admin/templates/sidebar.html:62
 msgid "Mail domains"
 msgstr "Domaines"

-#: mailu/admin/templates/sidebar.html:64
+#: mailu/admin/templates/sidebar.html:69
 msgid "Help"
 msgstr "Aide"

@ -321,9 +281,11 @@ msgstr "Ajouter un administrateur"

 #: mailu/admin/templates/admin/list.html:17
 #: mailu/admin/templates/alias/list.html:19
+#: mailu/admin/templates/alternative/list.html:19
 #: mailu/admin/templates/domain/list.html:17
 #: mailu/admin/templates/fetch/list.html:19
 #: mailu/admin/templates/manager/list.html:19
+#: mailu/admin/templates/relay/list.html:17
 #: mailu/admin/templates/user/list.html:19
 msgid "Actions"
 msgstr "Actions"
@ -337,9 +299,11 @@ msgstr "E-mail"

 #: mailu/admin/templates/admin/list.html:23
 #: mailu/admin/templates/alias/list.html:30
+#: mailu/admin/templates/alternative/list.html:26
 #: mailu/admin/templates/domain/list.html:32
 #: mailu/admin/templates/fetch/list.html:32
 #: mailu/admin/templates/manager/list.html:25
+#: mailu/admin/templates/relay/list.html:28
 #: mailu/admin/templates/user/list.html:32
 msgid "Delete"
 msgstr "Supprimer"
@ -361,8 +325,10 @@ msgid "Add alias"
 msgstr "Ajouter un alias"

 #: mailu/admin/templates/alias/list.html:23
+#: mailu/admin/templates/alternative/list.html:21
 #: mailu/admin/templates/domain/list.html:23
 #: mailu/admin/templates/fetch/list.html:25
+#: mailu/admin/templates/relay/list.html:21
 #: mailu/admin/templates/user/list.html:25
 msgid "Created"
 msgstr "Création"
@ -370,6 +336,7 @@ msgstr "Création"
 #: mailu/admin/templates/alias/list.html:24
 #: mailu/admin/templates/domain/list.html:24
 #: mailu/admin/templates/fetch/list.html:26
+#: mailu/admin/templates/relay/list.html:22
 #: mailu/admin/templates/user/list.html:26
 msgid "Last edit"
 msgstr "Dernière modification"
@ -377,6 +344,7 @@ msgstr "Dernière modification"
 #: mailu/admin/templates/alias/list.html:29
 #: mailu/admin/templates/domain/list.html:31
 #: mailu/admin/templates/fetch/list.html:31
+#: mailu/admin/templates/relay/list.html:27
 #: mailu/admin/templates/user/list.html:31
 msgid "Edit"
 msgstr "Modifier"
@ -466,22 +434,10 @@ msgstr "Ajouter un compte"
 msgid "Endpoint"
 msgstr "Source"

-#: mailu/admin/templates/fetch/list.html:22
-msgid "Keep emails"
-msgstr ""
-
 #: mailu/admin/templates/fetch/list.html:23
 msgid "Last check"
 msgstr "Dernier relevé"

-#: mailu/admin/templates/fetch/list.html:36
-msgid "yes"
-msgstr ""
-
-#: mailu/admin/templates/fetch/list.html:36
-msgid "no"
-msgstr ""
-
 #: mailu/admin/templates/manager/create.html:4
 msgid "Add a manager"
 msgstr "Ajouter un gérant"
@ -494,6 +450,30 @@ msgstr "Liste des gérants"
 msgid "Add manager"
 msgstr "Ajouter le gérant"

+#: mailu/admin/forms.py:140
+msgid "Announcement subject"
+msgstr "Sujet de l'annonce"
+
+#: mailu/admin/forms.py:142
+msgid "Announcement body"
+msgstr "Corps de l'annonce"
+
+#: mailu/admin/forms.py:144
+msgid "Send"
+msgstr "Envoyer"
+
+#: mailu/admin/templates/announcement.html:4
+msgid "Public announcement"
+msgstr "Annonce globale"
+
+#: mailu/admin/templates/announcement.html:8
+msgid "from"
+msgstr "de"
+
+#: mailu/admin/templates/sidebar.html:45
+msgid "Announcement"
+msgstr "Annonce"
+
 #: mailu/admin/templates/user/create.html:4
 msgid "New user"
 msgstr "Nouvel utilisateur"
@ -531,3 +511,79 @@ msgstr "Modifier le mot de passe"
 msgid "Automatic reply"
 msgstr "Réponse automatique"

+#: mailu/admin/forms.py:49
+msgid "Maximum user quota"
+msgstr "Quota maximum par utilisateur"
+
+#: mailu/admin/forms.py:92
+msgid "Keep a copy of the emails"
+msgstr "Conserver une copie des messages"
+
+#: mailu/admin/forms.py:135
+msgid "Keep emails on the server"
+msgstr "Conserver les messages sur le serveur"
+
+#: mailu/admin/templates/fetch/list.html:22
+msgid "Keep emails"
+msgstr "Conserver les messages"
+
+#: mailu/admin/templates/fetch/list.html:36
+msgid "yes"
+msgstr "oui"
+
+#: mailu/admin/templates/fetch/list.html:36
+msgid "no"
+msgstr "non"
+
+#: mailu/admin/forms.py:55
+msgid "Alternative name"
+msgstr "Nom alternatif"
+
+#: mailu/admin/forms.py:60
+msgid "Relayed domain name"
+msgstr "Nom du domaine relayé"
+
+#: mailu/admin/forms.py:61 mailu/admin/templates/relay/list.html:19
+msgid "Remote host"
+msgstr "Hôte distant"
+
+#: mailu/admin/templates/sidebar.html:55
+msgid "Relayed domains"
+msgstr "Domaines relayé"
+
+#: mailu/admin/templates/alternative/create.html:4
+msgid "Create alternative domain"
+msgstr "Nouveau domaine alternatif"
+
+#: mailu/admin/templates/alternative/list.html:4
+msgid "Alternative domain list"
+msgstr "Liste des domaines alternatifs"
+
+#: mailu/admin/templates/alternative/list.html:12
+msgid "Add alternative"
+msgstr "Ajouter une alternative"
+
+#: mailu/admin/templates/alternative/list.html:20
+msgid "Name"
+msgstr "Nom"
+
+#: mailu/admin/templates/domain/list.html:40
+msgid "Alternatives"
+msgstr "Alternatives"
+
+#: mailu/admin/templates/relay/create.html:4
+msgid "New relay domain"
+msgstr "Nouveau domaine relayé"
+
+#: mailu/admin/templates/relay/edit.html:4
+msgid "Edit relayd domain"
+msgstr "Modifier le domaine relayé"
+
+#: mailu/admin/templates/relay/list.html:4
+msgid "Relayed domain list"
+msgstr "Liste des domaines relayés"
+
+#: mailu/admin/templates/relay/list.html:9
+msgid "New relayed domain"
+msgstr "Nouveau domaine relayé"
+
--- a/admin/mailu/translations/pt/LC_MESSAGES/messages.po
+++ b/admin/mailu/translations/pt/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: 2017-09-03 15:30+0200\n"
+"POT-Creation-Date: 2017-09-17 16:26+0200\n"
 "PO-Revision-Date: 2017-03-27 11:43-0300\n"
 "Last-Translator: \n"
 "Language: pt_BR\n"
@ -26,12 +26,12 @@ msgstr "Endereço de e-mail inválido"
 msgid "Confirm"
 msgstr "Confirmar"

-#: mailu/admin/forms.py:40 mailu/admin/forms.py:55
+#: mailu/admin/forms.py:40 mailu/admin/forms.py:67
 msgid "E-mail"
 msgstr "E-mail"

-#: mailu/admin/forms.py:41 mailu/admin/forms.py:56 mailu/admin/forms.py:73
-#: mailu/admin/forms.py:122
+#: mailu/admin/forms.py:41 mailu/admin/forms.py:68 mailu/admin/forms.py:85
+#: mailu/admin/forms.py:134
 msgid "Password"
 msgstr "Senha"

@ -42,6 +42,7 @@ msgstr "Entrar"

 #: mailu/admin/forms.py:46 mailu/admin/templates/domain/details.html:21
 #: mailu/admin/templates/domain/list.html:19
+#: mailu/admin/templates/relay/list.html:18
 msgid "Domain name"
 msgstr "Domínio"

@ -57,143 +58,157 @@ msgstr "Quantidade máxima de alias"
 msgid "Maximum user quota"
 msgstr ""

-#: mailu/admin/forms.py:50 mailu/admin/forms.py:61 mailu/admin/forms.py:100
-#: mailu/admin/templates/alias/list.html:22
+#: mailu/admin/forms.py:50 mailu/admin/forms.py:62 mailu/admin/forms.py:73
+#: mailu/admin/forms.py:112 mailu/admin/templates/alias/list.html:22
 #: mailu/admin/templates/domain/list.html:22
+#: mailu/admin/templates/relay/list.html:20
 #: mailu/admin/templates/user/list.html:24
 msgid "Comment"
 msgstr "Comentário"

-#: mailu/admin/forms.py:51 mailu/admin/forms.py:101
+#: mailu/admin/forms.py:51 mailu/admin/forms.py:56 mailu/admin/forms.py:63
+#: mailu/admin/forms.py:113
 msgid "Create"
 msgstr "Criar"

-#: mailu/admin/forms.py:57
+#: mailu/admin/forms.py:55
+msgid "Alternative name"
+msgstr ""
+
+#: mailu/admin/forms.py:60
+msgid "Relayed domain name"
+msgstr ""
+
+#: mailu/admin/forms.py:61 mailu/admin/templates/relay/list.html:19
+msgid "Remote host"
+msgstr ""
+
+#: mailu/admin/forms.py:69
 msgid "Confirm password"
 msgstr "Confirmar senha"

-#: mailu/admin/forms.py:58 mailu/admin/templates/user/list.html:23
+#: mailu/admin/forms.py:70 mailu/admin/templates/user/list.html:23
 msgid "Quota"
 msgstr "Quota"

-#: mailu/admin/forms.py:59
+#: mailu/admin/forms.py:71
 msgid "Allow IMAP access"
 msgstr "Permitir acesso IMAP"

-#: mailu/admin/forms.py:60
+#: mailu/admin/forms.py:72
 msgid "Allow POP3 access"
 msgstr "Permitir acesso POP3"

-#: mailu/admin/forms.py:62
+#: mailu/admin/forms.py:74
 msgid "Save"
 msgstr "Salvar"

-#: mailu/admin/forms.py:66
+#: mailu/admin/forms.py:78
 msgid "Displayed name"
 msgstr "Nome de exibição"

-#: mailu/admin/forms.py:67
+#: mailu/admin/forms.py:79
 msgid "Enable spam filter"
 msgstr "Habilitar filtro de spam"

-#: mailu/admin/forms.py:68
+#: mailu/admin/forms.py:80
 msgid "Spam filter threshold"
 msgstr "Limite de filtro de spam"

-#: mailu/admin/forms.py:69
+#: mailu/admin/forms.py:81
 msgid "Save settings"
 msgstr "Salvar configurações"

-#: mailu/admin/forms.py:74
+#: mailu/admin/forms.py:86
 msgid "Password check"
 msgstr "Confirmação de senha"

-#: mailu/admin/forms.py:75 mailu/admin/templates/sidebar.html:13
+#: mailu/admin/forms.py:87 mailu/admin/templates/sidebar.html:13
 msgid "Update password"
 msgstr "Alterar senha"

-#: mailu/admin/forms.py:79
+#: mailu/admin/forms.py:91
 msgid "Enable forwarding"
 msgstr "Habilitar encaminhamento"

-#: mailu/admin/forms.py:80
+#: mailu/admin/forms.py:92
 msgid "Keep a copy of the emails"
 msgstr ""

-#: mailu/admin/forms.py:82 mailu/admin/forms.py:99
+#: mailu/admin/forms.py:94 mailu/admin/forms.py:111
 #: mailu/admin/templates/alias/list.html:21
 msgid "Destination"
 msgstr "Destinatário"

-#: mailu/admin/forms.py:84 mailu/admin/forms.py:92
+#: mailu/admin/forms.py:96 mailu/admin/forms.py:104
 msgid "Update"
 msgstr "Atualizar"

-#: mailu/admin/forms.py:88
+#: mailu/admin/forms.py:100
 msgid "Enable automatic reply"
 msgstr "Habilitar resposta automática"

-#: mailu/admin/forms.py:89
+#: mailu/admin/forms.py:101
 msgid "Reply subject"
 msgstr "Assunto da resposta"

-#: mailu/admin/forms.py:90
+#: mailu/admin/forms.py:102
 msgid "Reply body"
 msgstr "Corpo da resposta"

-#: mailu/admin/forms.py:96
+#: mailu/admin/forms.py:108
 msgid "Alias"
 msgstr "Alias"

-#: mailu/admin/forms.py:98
+#: mailu/admin/forms.py:110
 msgid "Use SQL LIKE Syntax (e.g. for catch-all aliases)"
 msgstr "Usar sintaxe estilo SQL(ex: for catch-all aliases)"

-#: mailu/admin/forms.py:105
+#: mailu/admin/forms.py:117
 msgid "Admin email"
 msgstr "E-mail do administrador"

-#: mailu/admin/forms.py:106 mailu/admin/forms.py:111 mailu/admin/forms.py:124
+#: mailu/admin/forms.py:118 mailu/admin/forms.py:123 mailu/admin/forms.py:136
 msgid "Submit"
 msgstr "Enviar"

-#: mailu/admin/forms.py:110
+#: mailu/admin/forms.py:122
 msgid "Manager email"
 msgstr "E-mail do gerente"

-#: mailu/admin/forms.py:115
+#: mailu/admin/forms.py:127
 msgid "Protocol"
 msgstr "Protocolo"

-#: mailu/admin/forms.py:118
+#: mailu/admin/forms.py:130
 msgid "Hostname or IP"
 msgstr "Hostname ou IP"

-#: mailu/admin/forms.py:119
+#: mailu/admin/forms.py:131
 msgid "TCP port"
 msgstr "Porta TCP"

-#: mailu/admin/forms.py:120
+#: mailu/admin/forms.py:132
 msgid "Enable TLS"
 msgstr "Habilitar TLS"

-#: mailu/admin/forms.py:121 mailu/admin/templates/fetch/list.html:21
+#: mailu/admin/forms.py:133 mailu/admin/templates/fetch/list.html:21
 msgid "Username"
 msgstr "Usuário"

-#: mailu/admin/forms.py:123
+#: mailu/admin/forms.py:135
 msgid "Keep emails on the server"
 msgstr "Manter os e-mails no servidor"

-#: mailu/admin/forms.py:128
+#: mailu/admin/forms.py:140
 msgid "Announcement subject"
 msgstr "Título do comunicado"

-#: mailu/admin/forms.py:130
+#: mailu/admin/forms.py:142
 msgid "Announcement body"
 msgstr "Corpo do comunicado"

-#: mailu/admin/forms.py:132
+#: mailu/admin/forms.py:144
 msgid "Send"
 msgstr "Enviar"

@ -299,11 +314,15 @@ msgstr "Comunicado"
 msgid "Administrators"
 msgstr "Administradores"

-#: mailu/admin/templates/sidebar.html:57
+#: mailu/admin/templates/sidebar.html:55
+msgid "Relayed domains"
+msgstr ""
+
+#: mailu/admin/templates/sidebar.html:62
 msgid "Mail domains"
 msgstr "Domínios de e-mail"

-#: mailu/admin/templates/sidebar.html:64
+#: mailu/admin/templates/sidebar.html:69
 msgid "Help"
 msgstr "Ajuda"

@ -325,9 +344,11 @@ msgstr "Adicionar administrador"

 #: mailu/admin/templates/admin/list.html:17
 #: mailu/admin/templates/alias/list.html:19
+#: mailu/admin/templates/alternative/list.html:19
 #: mailu/admin/templates/domain/list.html:17
 #: mailu/admin/templates/fetch/list.html:19
 #: mailu/admin/templates/manager/list.html:19
+#: mailu/admin/templates/relay/list.html:17
 #: mailu/admin/templates/user/list.html:19
 msgid "Actions"
 msgstr "Ações"
@ -341,9 +362,11 @@ msgstr "Email"

 #: mailu/admin/templates/admin/list.html:23
 #: mailu/admin/templates/alias/list.html:30
+#: mailu/admin/templates/alternative/list.html:26
 #: mailu/admin/templates/domain/list.html:32
 #: mailu/admin/templates/fetch/list.html:32
 #: mailu/admin/templates/manager/list.html:25
+#: mailu/admin/templates/relay/list.html:28
 #: mailu/admin/templates/user/list.html:32
 msgid "Delete"
 msgstr "Deletar"
@ -365,8 +388,10 @@ msgid "Add alias"
 msgstr "Adicionar alias"

 #: mailu/admin/templates/alias/list.html:23
+#: mailu/admin/templates/alternative/list.html:21
 #: mailu/admin/templates/domain/list.html:23
 #: mailu/admin/templates/fetch/list.html:25
+#: mailu/admin/templates/relay/list.html:21
 #: mailu/admin/templates/user/list.html:25
 msgid "Created"
 msgstr "Criado"
@ -374,6 +399,7 @@ msgstr "Criado"
 #: mailu/admin/templates/alias/list.html:24
 #: mailu/admin/templates/domain/list.html:24
 #: mailu/admin/templates/fetch/list.html:26
+#: mailu/admin/templates/relay/list.html:22
 #: mailu/admin/templates/user/list.html:26
 msgid "Last edit"
 msgstr "Última edição"
@ -381,10 +407,27 @@ msgstr "Última edição"
 #: mailu/admin/templates/alias/list.html:29
 #: mailu/admin/templates/domain/list.html:31
 #: mailu/admin/templates/fetch/list.html:31
+#: mailu/admin/templates/relay/list.html:27
 #: mailu/admin/templates/user/list.html:31
 msgid "Edit"
 msgstr "Editar"

+#: mailu/admin/templates/alternative/create.html:4
+msgid "Create alternative domain"
+msgstr ""
+
+#: mailu/admin/templates/alternative/list.html:4
+msgid "Alternative domain list"
+msgstr ""
+
+#: mailu/admin/templates/alternative/list.html:12
+msgid "Add alternative"
+msgstr ""
+
+#: mailu/admin/templates/alternative/list.html:20
+msgid "Name"
+msgstr ""
+
 #: mailu/admin/templates/domain/create.html:4
 #: mailu/admin/templates/domain/list.html:9
 msgid "New domain"
@ -454,6 +497,10 @@ msgstr "Aliases"
 msgid "Managers"
 msgstr "Gerentes"

+#: mailu/admin/templates/domain/list.html:40
+msgid "Alternatives"
+msgstr ""
+
 #: mailu/admin/templates/fetch/create.html:4
 msgid "Add a fetched account"
 msgstr "Adicionar conta a importar"
@ -498,6 +545,22 @@ msgstr "Lista de gerentes"
 msgid "Add manager"
 msgstr "Adicionar gerente"

+#: mailu/admin/templates/relay/create.html:4
+msgid "New relay domain"
+msgstr ""
+
+#: mailu/admin/templates/relay/edit.html:4
+msgid "Edit relayd domain"
+msgstr ""
+
+#: mailu/admin/templates/relay/list.html:4
+msgid "Relayed domain list"
+msgstr ""
+
+#: mailu/admin/templates/relay/list.html:9
+msgid "New relayed domain"
+msgstr ""
+
 #: mailu/admin/templates/user/create.html:4
 msgid "New user"
 msgstr "Novo usuário"
--- a/admin/messages.pot
+++ b/admin/messages.pot
@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-09-03 15:30+0200\n"
+"POT-Creation-Date: 2017-09-17 16:26+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.5.0\n"
+"Generated-By: Babel 2.5.1\n"

 #: mailu/admin/forms.py:32
 msgid "Invalid email address."
@ -25,12 +25,12 @@ msgstr ""
 msgid "Confirm"
 msgstr ""

-#: mailu/admin/forms.py:40 mailu/admin/forms.py:55
+#: mailu/admin/forms.py:40 mailu/admin/forms.py:67
 msgid "E-mail"
 msgstr ""

-#: mailu/admin/forms.py:41 mailu/admin/forms.py:56 mailu/admin/forms.py:73
-#: mailu/admin/forms.py:122
+#: mailu/admin/forms.py:41 mailu/admin/forms.py:68 mailu/admin/forms.py:85
+#: mailu/admin/forms.py:134
 msgid "Password"
 msgstr ""

@ -41,6 +41,7 @@ msgstr ""

 #: mailu/admin/forms.py:46 mailu/admin/templates/domain/details.html:21
 #: mailu/admin/templates/domain/list.html:19
+#: mailu/admin/templates/relay/list.html:18
 msgid "Domain name"
 msgstr ""

@ -56,143 +57,157 @@ msgstr ""
 msgid "Maximum user quota"
 msgstr ""

-#: mailu/admin/forms.py:50 mailu/admin/forms.py:61 mailu/admin/forms.py:100
-#: mailu/admin/templates/alias/list.html:22
+#: mailu/admin/forms.py:50 mailu/admin/forms.py:62 mailu/admin/forms.py:73
+#: mailu/admin/forms.py:112 mailu/admin/templates/alias/list.html:22
 #: mailu/admin/templates/domain/list.html:22
+#: mailu/admin/templates/relay/list.html:20
 #: mailu/admin/templates/user/list.html:24
 msgid "Comment"
 msgstr ""

-#: mailu/admin/forms.py:51 mailu/admin/forms.py:101
+#: mailu/admin/forms.py:51 mailu/admin/forms.py:56 mailu/admin/forms.py:63
+#: mailu/admin/forms.py:113
 msgid "Create"
 msgstr ""

-#: mailu/admin/forms.py:57
-msgid "Confirm password"
-msgstr ""
-
-#: mailu/admin/forms.py:58 mailu/admin/templates/user/list.html:23
-msgid "Quota"
-msgstr ""
-
-#: mailu/admin/forms.py:59
-msgid "Allow IMAP access"
+#: mailu/admin/forms.py:55
+msgid "Alternative name"
 msgstr ""

 #: mailu/admin/forms.py:60
-msgid "Allow POP3 access"
+msgid "Relayed domain name"
 msgstr ""

-#: mailu/admin/forms.py:62
-msgid "Save"
-msgstr ""
-
-#: mailu/admin/forms.py:66
-msgid "Displayed name"
-msgstr ""
-
-#: mailu/admin/forms.py:67
-msgid "Enable spam filter"
-msgstr ""
-
-#: mailu/admin/forms.py:68
-msgid "Spam filter threshold"
+#: mailu/admin/forms.py:61 mailu/admin/templates/relay/list.html:19
+msgid "Remote host"
 msgstr ""

 #: mailu/admin/forms.py:69
-msgid "Save settings"
+msgid "Confirm password"
+msgstr ""
+
+#: mailu/admin/forms.py:70 mailu/admin/templates/user/list.html:23
+msgid "Quota"
+msgstr ""
+
+#: mailu/admin/forms.py:71
+msgid "Allow IMAP access"
+msgstr ""
+
+#: mailu/admin/forms.py:72
+msgid "Allow POP3 access"
 msgstr ""

 #: mailu/admin/forms.py:74
-msgid "Password check"
+msgid "Save"
 msgstr ""

-#: mailu/admin/forms.py:75 mailu/admin/templates/sidebar.html:13
-msgid "Update password"
+#: mailu/admin/forms.py:78
+msgid "Displayed name"
 msgstr ""

 #: mailu/admin/forms.py:79
-msgid "Enable forwarding"
+msgid "Enable spam filter"
 msgstr ""

 #: mailu/admin/forms.py:80
+msgid "Spam filter threshold"
+msgstr ""
+
+#: mailu/admin/forms.py:81
+msgid "Save settings"
+msgstr ""
+
+#: mailu/admin/forms.py:86
+msgid "Password check"
+msgstr ""
+
+#: mailu/admin/forms.py:87 mailu/admin/templates/sidebar.html:13
+msgid "Update password"
+msgstr ""
+
+#: mailu/admin/forms.py:91
+msgid "Enable forwarding"
+msgstr ""
+
+#: mailu/admin/forms.py:92
 msgid "Keep a copy of the emails"
 msgstr ""

-#: mailu/admin/forms.py:82 mailu/admin/forms.py:99
+#: mailu/admin/forms.py:94 mailu/admin/forms.py:111
 #: mailu/admin/templates/alias/list.html:21
 msgid "Destination"
 msgstr ""

-#: mailu/admin/forms.py:84 mailu/admin/forms.py:92
+#: mailu/admin/forms.py:96 mailu/admin/forms.py:104
 msgid "Update"
 msgstr ""

-#: mailu/admin/forms.py:88
+#: mailu/admin/forms.py:100
 msgid "Enable automatic reply"
 msgstr ""

-#: mailu/admin/forms.py:89
+#: mailu/admin/forms.py:101
 msgid "Reply subject"
 msgstr ""

-#: mailu/admin/forms.py:90
+#: mailu/admin/forms.py:102
 msgid "Reply body"
 msgstr ""

-#: mailu/admin/forms.py:96
+#: mailu/admin/forms.py:108
 msgid "Alias"
 msgstr ""

-#: mailu/admin/forms.py:98
+#: mailu/admin/forms.py:110
 msgid "Use SQL LIKE Syntax (e.g. for catch-all aliases)"
 msgstr ""

-#: mailu/admin/forms.py:105
+#: mailu/admin/forms.py:117
 msgid "Admin email"
 msgstr ""

-#: mailu/admin/forms.py:106 mailu/admin/forms.py:111 mailu/admin/forms.py:124
+#: mailu/admin/forms.py:118 mailu/admin/forms.py:123 mailu/admin/forms.py:136
 msgid "Submit"
 msgstr ""

-#: mailu/admin/forms.py:110
+#: mailu/admin/forms.py:122
 msgid "Manager email"
 msgstr ""

-#: mailu/admin/forms.py:115
+#: mailu/admin/forms.py:127
 msgid "Protocol"
 msgstr ""

-#: mailu/admin/forms.py:118
+#: mailu/admin/forms.py:130
 msgid "Hostname or IP"
 msgstr ""

-#: mailu/admin/forms.py:119
+#: mailu/admin/forms.py:131
 msgid "TCP port"
 msgstr ""

-#: mailu/admin/forms.py:120
+#: mailu/admin/forms.py:132
 msgid "Enable TLS"
 msgstr ""

-#: mailu/admin/forms.py:121 mailu/admin/templates/fetch/list.html:21
+#: mailu/admin/forms.py:133 mailu/admin/templates/fetch/list.html:21
 msgid "Username"
 msgstr ""

-#: mailu/admin/forms.py:123
+#: mailu/admin/forms.py:135
 msgid "Keep emails on the server"
 msgstr ""

-#: mailu/admin/forms.py:128
+#: mailu/admin/forms.py:140
 msgid "Announcement subject"
 msgstr ""

-#: mailu/admin/forms.py:130
+#: mailu/admin/forms.py:142
 msgid "Announcement body"
 msgstr ""

-#: mailu/admin/forms.py:132
+#: mailu/admin/forms.py:144
 msgid "Send"
 msgstr ""

@ -298,11 +313,15 @@ msgstr ""
 msgid "Administrators"
 msgstr ""

-#: mailu/admin/templates/sidebar.html:57
+#: mailu/admin/templates/sidebar.html:55
+msgid "Relayed domains"
+msgstr ""
+
+#: mailu/admin/templates/sidebar.html:62
 msgid "Mail domains"
 msgstr ""

-#: mailu/admin/templates/sidebar.html:64
+#: mailu/admin/templates/sidebar.html:69
 msgid "Help"
 msgstr ""

@ -324,9 +343,11 @@ msgstr ""

 #: mailu/admin/templates/admin/list.html:17
 #: mailu/admin/templates/alias/list.html:19
+#: mailu/admin/templates/alternative/list.html:19
 #: mailu/admin/templates/domain/list.html:17
 #: mailu/admin/templates/fetch/list.html:19
 #: mailu/admin/templates/manager/list.html:19
+#: mailu/admin/templates/relay/list.html:17
 #: mailu/admin/templates/user/list.html:19
 msgid "Actions"
 msgstr ""
@ -340,9 +361,11 @@ msgstr ""

 #: mailu/admin/templates/admin/list.html:23
 #: mailu/admin/templates/alias/list.html:30
+#: mailu/admin/templates/alternative/list.html:26
 #: mailu/admin/templates/domain/list.html:32
 #: mailu/admin/templates/fetch/list.html:32
 #: mailu/admin/templates/manager/list.html:25
+#: mailu/admin/templates/relay/list.html:28
 #: mailu/admin/templates/user/list.html:32
 msgid "Delete"
 msgstr ""
@ -364,8 +387,10 @@ msgid "Add alias"
 msgstr ""

 #: mailu/admin/templates/alias/list.html:23
+#: mailu/admin/templates/alternative/list.html:21
 #: mailu/admin/templates/domain/list.html:23
 #: mailu/admin/templates/fetch/list.html:25
+#: mailu/admin/templates/relay/list.html:21
 #: mailu/admin/templates/user/list.html:25
 msgid "Created"
 msgstr ""
@ -373,6 +398,7 @@ msgstr ""
 #: mailu/admin/templates/alias/list.html:24
 #: mailu/admin/templates/domain/list.html:24
 #: mailu/admin/templates/fetch/list.html:26
+#: mailu/admin/templates/relay/list.html:22
 #: mailu/admin/templates/user/list.html:26
 msgid "Last edit"
 msgstr ""
@ -380,10 +406,27 @@ msgstr ""
 #: mailu/admin/templates/alias/list.html:29
 #: mailu/admin/templates/domain/list.html:31
 #: mailu/admin/templates/fetch/list.html:31
+#: mailu/admin/templates/relay/list.html:27
 #: mailu/admin/templates/user/list.html:31
 msgid "Edit"
 msgstr ""

+#: mailu/admin/templates/alternative/create.html:4
+msgid "Create alternative domain"
+msgstr ""
+
+#: mailu/admin/templates/alternative/list.html:4
+msgid "Alternative domain list"
+msgstr ""
+
+#: mailu/admin/templates/alternative/list.html:12
+msgid "Add alternative"
+msgstr ""
+
+#: mailu/admin/templates/alternative/list.html:20
+msgid "Name"
+msgstr ""
+
 #: mailu/admin/templates/domain/create.html:4
 #: mailu/admin/templates/domain/list.html:9
 msgid "New domain"
@ -453,6 +496,10 @@ msgstr ""
 msgid "Managers"
 msgstr ""

+#: mailu/admin/templates/domain/list.html:40
+msgid "Alternatives"
+msgstr ""
+
 #: mailu/admin/templates/fetch/create.html:4
 msgid "Add a fetched account"
 msgstr ""
@ -497,6 +544,22 @@ msgstr ""
 msgid "Add manager"
 msgstr ""

+#: mailu/admin/templates/relay/create.html:4
+msgid "New relay domain"
+msgstr ""
+
+#: mailu/admin/templates/relay/edit.html:4
+msgid "Edit relayd domain"
+msgstr ""
+
+#: mailu/admin/templates/relay/list.html:4
+msgid "Relayed domain list"
+msgstr ""
+
+#: mailu/admin/templates/relay/list.html:9
+msgid "New relayed domain"
+msgstr ""
+
 #: mailu/admin/templates/user/create.html:4
 msgid "New user"
 msgstr ""
--- a/rainloop/Dockerfile
+++ b/rainloop/Dockerfile
@ -3,7 +3,7 @@ FROM php:5-apache
 RUN apt-get update && apt-get install -y \
      unzip

-ENV RAINLOOP_URL https://github.com/RainLoop/rainloop-webmail/releases/download/v1.10.3.151/rainloop-community-1.10.3.151-aa8d0c41baec166a35bb9855ee3d07b9.zip
+ENV RAINLOOP_URL https://github.com/RainLoop/rainloop-webmail/releases/download/v1.11.1/rainloop-community-1.11.1.zip

 RUN rm -rf /var/www/html/ \
 && mkdir /var/www/html \