diff --git a/public/email/translations/account-check_cs.txt b/emails/translations/account-check_cs.txt
similarity index 100%
rename from public/email/translations/account-check_cs.txt
rename to emails/translations/account-check_cs.txt
diff --git a/public/email/translations/account-check_de.html b/emails/translations/account-check_de.html
similarity index 82%
rename from public/email/translations/account-check_de.html
rename to emails/translations/account-check_de.html
index 8d6386f5..f4a47314 100644
--- a/public/email/translations/account-check_de.html
+++ b/emails/translations/account-check_de.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Email Verification
-
+ [[[SERVERNAME]]] - E-Mail-Überprüfung
+
diff --git a/public/email/translations/account-check_de.txt b/emails/translations/account-check_de.txt
similarity index 100%
rename from public/email/translations/account-check_de.txt
rename to emails/translations/account-check_de.txt
diff --git a/public/email/translations/account-check_es.html b/emails/translations/account-check_es.html
similarity index 81%
rename from public/email/translations/account-check_es.html
rename to emails/translations/account-check_es.html
index ca938c0d..3b9b08f4 100644
--- a/public/email/translations/account-check_es.html
+++ b/emails/translations/account-check_es.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Email Verification
-
+ [[[SERVERNAME]]] - Email Verification
+
diff --git a/public/email/translations/account-check_es.txt b/emails/translations/account-check_es.txt
similarity index 100%
rename from public/email/translations/account-check_es.txt
rename to emails/translations/account-check_es.txt
diff --git a/public/email/translations/account-check_fr.html b/emails/translations/account-check_fr.html
similarity index 82%
rename from public/email/translations/account-check_fr.html
rename to emails/translations/account-check_fr.html
index aeb6934f..25d6da9a 100644
--- a/public/email/translations/account-check_fr.html
+++ b/emails/translations/account-check_fr.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Email Verification
-
+ [[[SERVERNAME]]] - Vérification E-mail
+
diff --git a/public/email/translations/account-check_fr.txt b/emails/translations/account-check_fr.txt
similarity index 83%
rename from public/email/translations/account-check_fr.txt
rename to emails/translations/account-check_fr.txt
index f060a757..ec4f641e 100644
--- a/public/email/translations/account-check_fr.txt
+++ b/emails/translations/account-check_fr.txt
@@ -1,4 +1,4 @@
-[[[SERVERNAME]]] - Vérification des e-mails
+[[[SERVERNAME]]] - Vérification E-mail
Bonjour [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) effectue une vérification par e-mail. Accédez au lien suivant pour terminer le processus:
~
~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
diff --git a/public/email/translations/account-check_hi.html b/emails/translations/account-check_hi.html
similarity index 81%
rename from public/email/translations/account-check_hi.html
rename to emails/translations/account-check_hi.html
index ca938c0d..3b9b08f4 100644
--- a/public/email/translations/account-check_hi.html
+++ b/emails/translations/account-check_hi.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Email Verification
-
+ [[[SERVERNAME]]] - Email Verification
+
diff --git a/public/email/translations/account-check_hi.txt b/emails/translations/account-check_hi.txt
similarity index 100%
rename from public/email/translations/account-check_hi.txt
rename to emails/translations/account-check_hi.txt
diff --git a/public/email/translations/account-check_ja.html b/emails/translations/account-check_ja.html
similarity index 84%
rename from public/email/translations/account-check_ja.html
rename to emails/translations/account-check_ja.html
index 11142fd8..ac37269f 100644
--- a/public/email/translations/account-check_ja.html
+++ b/emails/translations/account-check_ja.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Email Verification
-
+ [[[SERVERNAME]]]-メールの確認
+
diff --git a/public/email/translations/account-check_ja.txt b/emails/translations/account-check_ja.txt
similarity index 100%
rename from public/email/translations/account-check_ja.txt
rename to emails/translations/account-check_ja.txt
diff --git a/public/email/translations/account-check_ko.html b/emails/translations/account-check_ko.html
similarity index 81%
rename from public/email/translations/account-check_ko.html
rename to emails/translations/account-check_ko.html
index ca938c0d..3b9b08f4 100644
--- a/public/email/translations/account-check_ko.html
+++ b/emails/translations/account-check_ko.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Email Verification
-
+ [[[SERVERNAME]]] - Email Verification
+
diff --git a/public/email/translations/account-check_ko.txt b/emails/translations/account-check_ko.txt
similarity index 100%
rename from public/email/translations/account-check_ko.txt
rename to emails/translations/account-check_ko.txt
diff --git a/public/email/translations/account-check_nl.html b/emails/translations/account-check_nl.html
similarity index 81%
rename from public/email/translations/account-check_nl.html
rename to emails/translations/account-check_nl.html
index a443c118..a30affb1 100644
--- a/public/email/translations/account-check_nl.html
+++ b/emails/translations/account-check_nl.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Email Verification
-
+ [[[SERVERNAME]]] - Email Verification
+
diff --git a/public/email/translations/account-check_nl.txt b/emails/translations/account-check_nl.txt
similarity index 100%
rename from public/email/translations/account-check_nl.txt
rename to emails/translations/account-check_nl.txt
diff --git a/public/email/translations/account-check_pt.html b/emails/translations/account-check_pt.html
similarity index 81%
rename from public/email/translations/account-check_pt.html
rename to emails/translations/account-check_pt.html
index ca938c0d..3b9b08f4 100644
--- a/public/email/translations/account-check_pt.html
+++ b/emails/translations/account-check_pt.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Email Verification
-
+ [[[SERVERNAME]]] - Email Verification
+
diff --git a/public/email/translations/account-check_pt.txt b/emails/translations/account-check_pt.txt
similarity index 100%
rename from public/email/translations/account-check_pt.txt
rename to emails/translations/account-check_pt.txt
diff --git a/public/email/translations/account-check_ru.html b/emails/translations/account-check_ru.html
similarity index 82%
rename from public/email/translations/account-check_ru.html
rename to emails/translations/account-check_ru.html
index d27d13fa..37fdac4d 100644
--- a/public/email/translations/account-check_ru.html
+++ b/emails/translations/account-check_ru.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Email Verification
-
+ [[[SERVERNAME]]] - подтверждение по электронной почте
+
diff --git a/public/email/translations/account-check_ru.txt b/emails/translations/account-check_ru.txt
similarity index 100%
rename from public/email/translations/account-check_ru.txt
rename to emails/translations/account-check_ru.txt
diff --git a/public/email/translations/account-check_zh-chs.html b/emails/translations/account-check_zh-chs.html
similarity index 81%
rename from public/email/translations/account-check_zh-chs.html
rename to emails/translations/account-check_zh-chs.html
index cc16021f..32239c1a 100644
--- a/public/email/translations/account-check_zh-chs.html
+++ b/emails/translations/account-check_zh-chs.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Email Verification
-
+ [[[SERVERNAME]]]-电子邮件验证
+
diff --git a/public/email/translations/account-check_zh-chs.txt b/emails/translations/account-check_zh-chs.txt
similarity index 100%
rename from public/email/translations/account-check_zh-chs.txt
rename to emails/translations/account-check_zh-chs.txt
diff --git a/public/email/translations/account-invite_cs.html b/emails/translations/account-invite_cs.html
similarity index 81%
rename from public/email/translations/account-invite_cs.html
rename to emails/translations/account-invite_cs.html
index e01045f6..f889e5c3 100644
--- a/public/email/translations/account-invite_cs.html
+++ b/emails/translations/account-invite_cs.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Account Invitation
-
+ [[[SERVERNAME]]] - Pozvánka na účet
+
diff --git a/emails/translations/account-invite_cs.txt b/emails/translations/account-invite_cs.txt
new file mode 100644
index 00000000..4845c415
--- /dev/null
+++ b/emails/translations/account-invite_cs.txt
@@ -0,0 +1,5 @@
+[[[SERVERNAME]]] - Pozvánka na účet
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
+~
+S pozdravem,
+~[[[USERNAME]]]
\ No newline at end of file
diff --git a/public/email/translations/account-invite_de.html b/emails/translations/account-invite_de.html
similarity index 81%
rename from public/email/translations/account-invite_de.html
rename to emails/translations/account-invite_de.html
index 081e56e0..5556e1d0 100644
--- a/public/email/translations/account-invite_de.html
+++ b/emails/translations/account-invite_de.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Account Invitation
-
+ [[[SERVERNAME]]] - Kontoeinladung
+
diff --git a/emails/translations/account-invite_de.txt b/emails/translations/account-invite_de.txt
new file mode 100644
index 00000000..d0a0b658
--- /dev/null
+++ b/emails/translations/account-invite_de.txt
@@ -0,0 +1,5 @@
+[[[SERVERNAME]]] - Kontoeinladung
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
+~
+Freundliche Grüße,
+~[[[USERNAME]]]
\ No newline at end of file
diff --git a/public/email/translations/account-invite_es.html b/emails/translations/account-invite_es.html
similarity index 81%
rename from public/email/translations/account-invite_es.html
rename to emails/translations/account-invite_es.html
index ebd18a8a..3ff64009 100644
--- a/public/email/translations/account-invite_es.html
+++ b/emails/translations/account-invite_es.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Account Invitation
-
+ [[[SERVERNAME]]] - Account Invitation
+
diff --git a/emails/translations/account-invite_es.txt b/emails/translations/account-invite_es.txt
new file mode 100644
index 00000000..3061a670
--- /dev/null
+++ b/emails/translations/account-invite_es.txt
@@ -0,0 +1,5 @@
+[[[SERVERNAME]]] - Account Invitation
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
+~
+Best regards,
+~[[[USERNAME]]]
\ No newline at end of file
diff --git a/public/email/translations/account-invite_fr.html b/emails/translations/account-invite_fr.html
similarity index 82%
rename from public/email/translations/account-invite_fr.html
rename to emails/translations/account-invite_fr.html
index 07bb8204..8f4061de 100644
--- a/public/email/translations/account-invite_fr.html
+++ b/emails/translations/account-invite_fr.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Account Invitation
-
+ [[[SERVERNAME]]] - Invitation au compte
+
diff --git a/emails/translations/account-invite_fr.txt b/emails/translations/account-invite_fr.txt
new file mode 100644
index 00000000..97e43db8
--- /dev/null
+++ b/emails/translations/account-invite_fr.txt
@@ -0,0 +1,5 @@
+[[[SERVERNAME]]] - Invitation au compte
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
+~
+Meilleures salutations,
+~[[[USERNAME]]]
\ No newline at end of file
diff --git a/public/email/translations/account-invite_hi.html b/emails/translations/account-invite_hi.html
similarity index 82%
rename from public/email/translations/account-invite_hi.html
rename to emails/translations/account-invite_hi.html
index 49bf5010..103da1ea 100644
--- a/public/email/translations/account-invite_hi.html
+++ b/emails/translations/account-invite_hi.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Account Invitation
-
+ [[[SERVERNAME]]] - Account Invitation
+
diff --git a/emails/translations/account-invite_hi.txt b/emails/translations/account-invite_hi.txt
new file mode 100644
index 00000000..3061a670
--- /dev/null
+++ b/emails/translations/account-invite_hi.txt
@@ -0,0 +1,5 @@
+[[[SERVERNAME]]] - Account Invitation
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
+~
+Best regards,
+~[[[USERNAME]]]
\ No newline at end of file
diff --git a/public/email/translations/account-invite_ja.html b/emails/translations/account-invite_ja.html
similarity index 83%
rename from public/email/translations/account-invite_ja.html
rename to emails/translations/account-invite_ja.html
index a163f565..d2025f33 100644
--- a/public/email/translations/account-invite_ja.html
+++ b/emails/translations/account-invite_ja.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Account Invitation
-
+ [[[SERVERNAME]]]-アカウントの招待
+
diff --git a/emails/translations/account-invite_ja.txt b/emails/translations/account-invite_ja.txt
new file mode 100644
index 00000000..c6bc941a
--- /dev/null
+++ b/emails/translations/account-invite_ja.txt
@@ -0,0 +1,5 @@
+[[[SERVERNAME]]]-アカウントの招待
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
+~
+宜しくお願いします、
+~[[[USERNAME]]]
\ No newline at end of file
diff --git a/public/email/translations/account-invite_ko.html b/emails/translations/account-invite_ko.html
similarity index 81%
rename from public/email/translations/account-invite_ko.html
rename to emails/translations/account-invite_ko.html
index b4182413..6c1b0af5 100644
--- a/public/email/translations/account-invite_ko.html
+++ b/emails/translations/account-invite_ko.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Account Invitation
-
+ [[[SERVERNAME]]] - Account Invitation
+
diff --git a/emails/translations/account-invite_ko.txt b/emails/translations/account-invite_ko.txt
new file mode 100644
index 00000000..3061a670
--- /dev/null
+++ b/emails/translations/account-invite_ko.txt
@@ -0,0 +1,5 @@
+[[[SERVERNAME]]] - Account Invitation
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
+~
+Best regards,
+~[[[USERNAME]]]
\ No newline at end of file
diff --git a/public/email/translations/account-invite_nl.html b/emails/translations/account-invite_nl.html
similarity index 82%
rename from public/email/translations/account-invite_nl.html
rename to emails/translations/account-invite_nl.html
index 47558cb5..37310ef7 100644
--- a/public/email/translations/account-invite_nl.html
+++ b/emails/translations/account-invite_nl.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Account Invitation
-
+ [[[SERVERNAME]]] - Account uitnodiging
+
diff --git a/public/email/translations/account-invite_nl.txt b/emails/translations/account-invite_nl.txt
similarity index 51%
rename from public/email/translations/account-invite_nl.txt
rename to emails/translations/account-invite_nl.txt
index 92a258c6..06493f17 100644
--- a/public/email/translations/account-invite_nl.txt
+++ b/emails/translations/account-invite_nl.txt
@@ -1,5 +1,5 @@
[[[SERVERNAME]]] - Account uitnodiging
-An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/), you can access it now with username \"[[[ACCOUNTNAME]]]\" and password \"[[[PASSWORD]]]\".
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
~
Vriendelijke groeten,
~[[[USERNAME]]]
\ No newline at end of file
diff --git a/public/email/translations/account-invite_pt.html b/emails/translations/account-invite_pt.html
similarity index 81%
rename from public/email/translations/account-invite_pt.html
rename to emails/translations/account-invite_pt.html
index 430771d6..d94a9aab 100644
--- a/public/email/translations/account-invite_pt.html
+++ b/emails/translations/account-invite_pt.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Account Invitation
-
+ [[[SERVERNAME]]] - Account Invitation
+
diff --git a/emails/translations/account-invite_pt.txt b/emails/translations/account-invite_pt.txt
new file mode 100644
index 00000000..3061a670
--- /dev/null
+++ b/emails/translations/account-invite_pt.txt
@@ -0,0 +1,5 @@
+[[[SERVERNAME]]] - Account Invitation
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
+~
+Best regards,
+~[[[USERNAME]]]
\ No newline at end of file
diff --git a/public/email/translations/account-invite_ru.html b/emails/translations/account-invite_ru.html
similarity index 82%
rename from public/email/translations/account-invite_ru.html
rename to emails/translations/account-invite_ru.html
index 7ddca0ed..a80d351d 100644
--- a/public/email/translations/account-invite_ru.html
+++ b/emails/translations/account-invite_ru.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Account Invitation
-
+ [[[SERVERNAME]]] - приглашение в аккаунт
+
diff --git a/emails/translations/account-invite_ru.txt b/emails/translations/account-invite_ru.txt
new file mode 100644
index 00000000..7a95ce12
--- /dev/null
+++ b/emails/translations/account-invite_ru.txt
@@ -0,0 +1,5 @@
+[[[SERVERNAME]]] - приглашение в аккаунт
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
+~
+С уважением,
+~[[[USERNAME]]]
\ No newline at end of file
diff --git a/public/email/translations/account-invite_zh-chs.html b/emails/translations/account-invite_zh-chs.html
similarity index 82%
rename from public/email/translations/account-invite_zh-chs.html
rename to emails/translations/account-invite_zh-chs.html
index 730250f6..46b4d0ae 100644
--- a/public/email/translations/account-invite_zh-chs.html
+++ b/emails/translations/account-invite_zh-chs.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Account Invitation
-
+ [[[SERVERNAME]]]-帐户邀请
+
diff --git a/emails/translations/account-invite_zh-chs.txt b/emails/translations/account-invite_zh-chs.txt
new file mode 100644
index 00000000..598973ba
--- /dev/null
+++ b/emails/translations/account-invite_zh-chs.txt
@@ -0,0 +1,5 @@
+[[[SERVERNAME]]]-帐户邀请
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
+~
+最好的祝福,
+~[[[USERNAME]]]
\ No newline at end of file
diff --git a/public/email/translations/account-login_cs.html b/emails/translations/account-login_cs.html
similarity index 74%
rename from public/email/translations/account-login_cs.html
rename to emails/translations/account-login_cs.html
index eea9880e..00c8f5e4 100644
--- a/public/email/translations/account-login_cs.html
+++ b/emails/translations/account-login_cs.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Account Login
-
+ [[[SERVERNAME]]] - Přihlášení k účtu
+
diff --git a/public/email/translations/account-login_cs.txt b/emails/translations/account-login_cs.txt
similarity index 100%
rename from public/email/translations/account-login_cs.txt
rename to emails/translations/account-login_cs.txt
diff --git a/public/email/translations/account-login_de.html b/emails/translations/account-login_de.html
similarity index 74%
rename from public/email/translations/account-login_de.html
rename to emails/translations/account-login_de.html
index d33a5d51..da766021 100644
--- a/public/email/translations/account-login_de.html
+++ b/emails/translations/account-login_de.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Account Login
-
+ [[[SERVERNAME]]] - Konto-Login
+
diff --git a/public/email/translations/account-login_de.txt b/emails/translations/account-login_de.txt
similarity index 100%
rename from public/email/translations/account-login_de.txt
rename to emails/translations/account-login_de.txt
diff --git a/public/email/translations/account-login_es.html b/emails/translations/account-login_es.html
similarity index 73%
rename from public/email/translations/account-login_es.html
rename to emails/translations/account-login_es.html
index 7b031f2d..a218cade 100644
--- a/public/email/translations/account-login_es.html
+++ b/emails/translations/account-login_es.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Account Login
-
+ [[[SERVERNAME]]] - Account Login
+
diff --git a/public/email/translations/account-login_es.txt b/emails/translations/account-login_es.txt
similarity index 100%
rename from public/email/translations/account-login_es.txt
rename to emails/translations/account-login_es.txt
diff --git a/public/email/translations/account-login_fr.html b/emails/translations/account-login_fr.html
similarity index 75%
rename from public/email/translations/account-login_fr.html
rename to emails/translations/account-login_fr.html
index cb0741c0..16c14f7d 100644
--- a/public/email/translations/account-login_fr.html
+++ b/emails/translations/account-login_fr.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Account Login
-
+ [[[SERVERNAME]]] - Connexion au compte
+
diff --git a/public/email/translations/account-login_fr.txt b/emails/translations/account-login_fr.txt
similarity index 100%
rename from public/email/translations/account-login_fr.txt
rename to emails/translations/account-login_fr.txt
diff --git a/public/email/translations/account-login_hi.html b/emails/translations/account-login_hi.html
similarity index 73%
rename from public/email/translations/account-login_hi.html
rename to emails/translations/account-login_hi.html
index 7b031f2d..a218cade 100644
--- a/public/email/translations/account-login_hi.html
+++ b/emails/translations/account-login_hi.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Account Login
-
+ [[[SERVERNAME]]] - Account Login
+
diff --git a/public/email/translations/account-login_hi.txt b/emails/translations/account-login_hi.txt
similarity index 100%
rename from public/email/translations/account-login_hi.txt
rename to emails/translations/account-login_hi.txt
diff --git a/public/email/translations/account-login_ja.html b/emails/translations/account-login_ja.html
similarity index 75%
rename from public/email/translations/account-login_ja.html
rename to emails/translations/account-login_ja.html
index c3f9c4f3..eced7bc8 100644
--- a/public/email/translations/account-login_ja.html
+++ b/emails/translations/account-login_ja.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Account Login
-
+ [[[SERVERNAME]]]-アカウントログイン
+
diff --git a/public/email/translations/account-login_ja.txt b/emails/translations/account-login_ja.txt
similarity index 100%
rename from public/email/translations/account-login_ja.txt
rename to emails/translations/account-login_ja.txt
diff --git a/public/email/translations/account-login_ko.html b/emails/translations/account-login_ko.html
similarity index 73%
rename from public/email/translations/account-login_ko.html
rename to emails/translations/account-login_ko.html
index 7b031f2d..a218cade 100644
--- a/public/email/translations/account-login_ko.html
+++ b/emails/translations/account-login_ko.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Account Login
-
+ [[[SERVERNAME]]] - Account Login
+
diff --git a/public/email/translations/account-login_ko.txt b/emails/translations/account-login_ko.txt
similarity index 100%
rename from public/email/translations/account-login_ko.txt
rename to emails/translations/account-login_ko.txt
diff --git a/public/email/translations/account-login_nl.html b/emails/translations/account-login_nl.html
similarity index 74%
rename from public/email/translations/account-login_nl.html
rename to emails/translations/account-login_nl.html
index ada61d06..bc5d7e2a 100644
--- a/public/email/translations/account-login_nl.html
+++ b/emails/translations/account-login_nl.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Account Login
-
+ [[[SERVERNAME]]] - Inloggen account
+
diff --git a/public/email/translations/account-login_nl.txt b/emails/translations/account-login_nl.txt
similarity index 100%
rename from public/email/translations/account-login_nl.txt
rename to emails/translations/account-login_nl.txt
diff --git a/public/email/translations/account-login_pt.html b/emails/translations/account-login_pt.html
similarity index 73%
rename from public/email/translations/account-login_pt.html
rename to emails/translations/account-login_pt.html
index 7b031f2d..a218cade 100644
--- a/public/email/translations/account-login_pt.html
+++ b/emails/translations/account-login_pt.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Account Login
-
+ [[[SERVERNAME]]] - Account Login
+
diff --git a/public/email/translations/account-login_pt.txt b/emails/translations/account-login_pt.txt
similarity index 100%
rename from public/email/translations/account-login_pt.txt
rename to emails/translations/account-login_pt.txt
diff --git a/public/email/translations/account-login_ru.html b/emails/translations/account-login_ru.html
similarity index 77%
rename from public/email/translations/account-login_ru.html
rename to emails/translations/account-login_ru.html
index 5c32e25f..c1b2dd46 100644
--- a/public/email/translations/account-login_ru.html
+++ b/emails/translations/account-login_ru.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Account Login
-
+ [[[SERVERNAME]]] - Вход в аккаунт
+
diff --git a/public/email/translations/account-login_ru.txt b/emails/translations/account-login_ru.txt
similarity index 100%
rename from public/email/translations/account-login_ru.txt
rename to emails/translations/account-login_ru.txt
diff --git a/public/email/translations/account-login_zh-chs.html b/emails/translations/account-login_zh-chs.html
similarity index 73%
rename from public/email/translations/account-login_zh-chs.html
rename to emails/translations/account-login_zh-chs.html
index ae3093c9..6a2e08a5 100644
--- a/public/email/translations/account-login_zh-chs.html
+++ b/emails/translations/account-login_zh-chs.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Account Login
-
+ [[[SERVERNAME]]]-帐户登录
+
diff --git a/public/email/translations/account-login_zh-chs.txt b/emails/translations/account-login_zh-chs.txt
similarity index 100%
rename from public/email/translations/account-login_zh-chs.txt
rename to emails/translations/account-login_zh-chs.txt
diff --git a/public/email/translations/account-reset_cs.html b/emails/translations/account-reset_cs.html
similarity index 82%
rename from public/email/translations/account-reset_cs.html
rename to emails/translations/account-reset_cs.html
index fafc1cc5..43caea34 100644
--- a/public/email/translations/account-reset_cs.html
+++ b/emails/translations/account-reset_cs.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Account Reset
-
+ [[[SERVERNAME]]] - Reset účtu
+
diff --git a/public/email/translations/account-reset_cs.txt b/emails/translations/account-reset_cs.txt
similarity index 100%
rename from public/email/translations/account-reset_cs.txt
rename to emails/translations/account-reset_cs.txt
diff --git a/public/email/translations/account-reset_de.html b/emails/translations/account-reset_de.html
similarity index 82%
rename from public/email/translations/account-reset_de.html
rename to emails/translations/account-reset_de.html
index 0550fef8..e9085ab4 100644
--- a/public/email/translations/account-reset_de.html
+++ b/emails/translations/account-reset_de.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Account Reset
-
+ [[[SERVERNAME]]] - Zurücksetzen des Kontos
+
diff --git a/public/email/translations/account-reset_de.txt b/emails/translations/account-reset_de.txt
similarity index 100%
rename from public/email/translations/account-reset_de.txt
rename to emails/translations/account-reset_de.txt
diff --git a/public/email/translations/account-reset_es.html b/emails/translations/account-reset_es.html
similarity index 82%
rename from public/email/translations/account-reset_es.html
rename to emails/translations/account-reset_es.html
index 731b0431..dd09c6bd 100644
--- a/public/email/translations/account-reset_es.html
+++ b/emails/translations/account-reset_es.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Account Reset
-
+ [[[SERVERNAME]]] - Account Reset
+
diff --git a/public/email/translations/account-reset_es.txt b/emails/translations/account-reset_es.txt
similarity index 100%
rename from public/email/translations/account-reset_es.txt
rename to emails/translations/account-reset_es.txt
diff --git a/public/email/translations/account-reset_fr.html b/emails/translations/account-reset_fr.html
similarity index 82%
rename from public/email/translations/account-reset_fr.html
rename to emails/translations/account-reset_fr.html
index b8918d17..c8c30208 100644
--- a/public/email/translations/account-reset_fr.html
+++ b/emails/translations/account-reset_fr.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Account Reset
-
+ [[[SERVERNAME]]] - Réinitialisation du compte
+
diff --git a/public/email/translations/account-reset_fr.txt b/emails/translations/account-reset_fr.txt
similarity index 100%
rename from public/email/translations/account-reset_fr.txt
rename to emails/translations/account-reset_fr.txt
diff --git a/public/email/translations/account-reset_hi.html b/emails/translations/account-reset_hi.html
similarity index 82%
rename from public/email/translations/account-reset_hi.html
rename to emails/translations/account-reset_hi.html
index 731b0431..dd09c6bd 100644
--- a/public/email/translations/account-reset_hi.html
+++ b/emails/translations/account-reset_hi.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Account Reset
-
+ [[[SERVERNAME]]] - Account Reset
+
diff --git a/public/email/translations/account-reset_hi.txt b/emails/translations/account-reset_hi.txt
similarity index 100%
rename from public/email/translations/account-reset_hi.txt
rename to emails/translations/account-reset_hi.txt
diff --git a/public/email/translations/account-reset_ja.html b/emails/translations/account-reset_ja.html
similarity index 83%
rename from public/email/translations/account-reset_ja.html
rename to emails/translations/account-reset_ja.html
index 4eee8f28..284e79a8 100644
--- a/public/email/translations/account-reset_ja.html
+++ b/emails/translations/account-reset_ja.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Account Reset
-
+ [[[SERVERNAME]]]-アカウントのリセット
+
diff --git a/public/email/translations/account-reset_ja.txt b/emails/translations/account-reset_ja.txt
similarity index 100%
rename from public/email/translations/account-reset_ja.txt
rename to emails/translations/account-reset_ja.txt
diff --git a/public/email/translations/account-reset_ko.html b/emails/translations/account-reset_ko.html
similarity index 82%
rename from public/email/translations/account-reset_ko.html
rename to emails/translations/account-reset_ko.html
index 731b0431..dd09c6bd 100644
--- a/public/email/translations/account-reset_ko.html
+++ b/emails/translations/account-reset_ko.html
@@ -1,5 +1,5 @@
-[[[SERVERNAME]]] - Account Reset
-
+ [[[SERVERNAME]]] - Account Reset
+
diff --git a/public/email/translations/account-reset_ko.txt b/emails/translations/account-reset_ko.txt
similarity index 100%
rename from public/email/translations/account-reset_ko.txt
rename to emails/translations/account-reset_ko.txt
diff --git a/public/email/translations/account-reset_nl.html b/emails/translations/account-reset_nl.html
similarity index 83%
rename from public/email/translations/account-reset_nl.html
rename to emails/translations/account-reset_nl.html
index 8bb817af..8faf6eab 100644
--- a/public/email/translations/account-reset_nl.html
+++ b/emails/translations/account-reset_nl.html
@@ -1,5 +1,5 @@
- | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |