[tx-robot] updated from transifex

64 files changed, 416 insertions, 670 deletions

diff --git a/l10n/ast.js b/l10n/ast.js
index ef3e569c5..c74209698 100644
--- a/l10n/ast.js
+++ b/l10n/ast.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Mail" : "Corréu",
     "Error while loading the accounts." : "Fallu mientres se cargaben les cuentes",
-    "you" : "tu",
     "Error while loading the selected account." : "Fallu cargando la cuenta esbillada",
     "Error while loading messages." : "Fallu cargando mensaxes",
     "Choose a folder to store the attachment in" : "Escueyi una carpeta pa guardar l'axuntu",
@@ -16,17 +15,17 @@ OC.L10N.register(
     "Unknown error" : "Fallu desconocíu",
     "Error while creating an account: " : "Fallu creando la cuenta",
     "Connect" : "Coneutar",
-    "Sending …" : "Unviando...",
-    "Reply" : "Rempuesta",
-    "Error sending the reply." : "Fallu unviando la rempuesta.",
     "Error while deleting account." : "Fallu desaniciando la cuenta",
     "Choose a file to add as attachment" : "Escueyi un ficheru p'amestalu como axuntu",
+    "Reply" : "Rempuesta",
+    "Send" : "Unviar",
+    "Sending …" : "Unviando...",
+    "you" : "tu",
     "Message could not be starred. Please try again." : "El mensaxe nun se puede marcar como favoritu. Inténtalo más tarde.",
     "Error while deleting message." : "Fallu desaniciando'l mensaxe",
     "Checking mail …" : "Comprobando'l corréu...",
     "Loading …" : "Cargando ...",
     "Load more …" : "Cargar más …",
-    "Send" : "Unviar",
     "Inbox" : "Bandexa d'entrada",
     "Sent" : "Unvíos",
     "Drafts" : "Borradores",
@@ -45,16 +44,13 @@ OC.L10N.register(
     "bcc" : "cct",
     "Subject" : "Asuntu",
     "Message …" : "Mensaxe ...",
-    "Add attachment from Files" : "Amestar axuntos dende Ficheros",
     "Open Mail App" : "Open Mail App",
     "Back to website" : "Tornar al sitiu web",
+    "Add attachment from Files" : "Amestar axuntos dende Ficheros",
     "Error loading message" : "Fallu cargando mensaxe",
     "Download attachment" : "Descargar axuntu",
     "Save to Files" : "Guardar en Ficheros",
     "Save all to Files" : "Guardar too en Ficheros",
-    "+ cc" : "+ cc",
-    "Reply …" : "Responder...",
-    "Forward" : "Reunviar",
     "Delete" : "Desaniciar",
     "No messages in this folder!" : "¡Nun hai mensaxes nesta carpeta!",
     "Connect your mail account" : "Coneuta la to cuenta de corréu",
diff --git a/l10n/ast.json b/l10n/ast.json
index b29ab0e71..13594ffba 100644
--- a/l10n/ast.json
+++ b/l10n/ast.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Mail" : "Corréu",
     "Error while loading the accounts." : "Fallu mientres se cargaben les cuentes",
-    "you" : "tu",
     "Error while loading the selected account." : "Fallu cargando la cuenta esbillada",
     "Error while loading messages." : "Fallu cargando mensaxes",
     "Choose a folder to store the attachment in" : "Escueyi una carpeta pa guardar l'axuntu",
@@ -14,17 +13,17 @@
     "Unknown error" : "Fallu desconocíu",
     "Error while creating an account: " : "Fallu creando la cuenta",
     "Connect" : "Coneutar",
-    "Sending …" : "Unviando...",
-    "Reply" : "Rempuesta",
-    "Error sending the reply." : "Fallu unviando la rempuesta.",
     "Error while deleting account." : "Fallu desaniciando la cuenta",
     "Choose a file to add as attachment" : "Escueyi un ficheru p'amestalu como axuntu",
+    "Reply" : "Rempuesta",
+    "Send" : "Unviar",
+    "Sending …" : "Unviando...",
+    "you" : "tu",
     "Message could not be starred. Please try again." : "El mensaxe nun se puede marcar como favoritu. Inténtalo más tarde.",
     "Error while deleting message." : "Fallu desaniciando'l mensaxe",
     "Checking mail …" : "Comprobando'l corréu...",
     "Loading …" : "Cargando ...",
     "Load more …" : "Cargar más …",
-    "Send" : "Unviar",
     "Inbox" : "Bandexa d'entrada",
     "Sent" : "Unvíos",
     "Drafts" : "Borradores",
@@ -43,16 +42,13 @@
     "bcc" : "cct",
     "Subject" : "Asuntu",
     "Message …" : "Mensaxe ...",
-    "Add attachment from Files" : "Amestar axuntos dende Ficheros",
     "Open Mail App" : "Open Mail App",
     "Back to website" : "Tornar al sitiu web",
+    "Add attachment from Files" : "Amestar axuntos dende Ficheros",
     "Error loading message" : "Fallu cargando mensaxe",
     "Download attachment" : "Descargar axuntu",
     "Save to Files" : "Guardar en Ficheros",
     "Save all to Files" : "Guardar too en Ficheros",
-    "+ cc" : "+ cc",
-    "Reply …" : "Responder...",
-    "Forward" : "Reunviar",
     "Delete" : "Desaniciar",
     "No messages in this folder!" : "¡Nun hai mensaxes nesta carpeta!",
     "Connect your mail account" : "Coneuta la to cuenta de corréu",
diff --git a/l10n/az.js b/l10n/az.js
index 72e830ba2..c441a8199 100644
--- a/l10n/az.js
+++ b/l10n/az.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Mail" : "Məktub",
     "Error while loading the accounts." : "Hesabların yüklənməsi müddətində səhv baş verdi",
-    "you" : "siz",
     "Error while loading the selected account." : "Seçilmiş hesabın yüklənməsində səhv baş verdi",
     "Error while loading messages." : "Mesajların yüklənməsi müddətində səhv baş verdi.",
     "Choose a folder to store the attachment in" : "Əlavələrin saxlanılması üçün qovluğu seçin",
@@ -16,17 +15,17 @@ OC.L10N.register(
     "Unknown error" : "Bəlli olmayan səhv baş verdi",
     "Error while creating an account: " : "Hesabın yaraılması müddətində səhv baş verdi: ",
     "Connect" : "Qoşul",
-    "Sending …" : "Göndərilir...",
-    "Reply" : "Cavab",
-    "Error sending the reply." : "Cavabın göndərilməsində səhv baş verdi.",
     "Error while deleting account." : "Hesabın silinməsində səhv baş verdi.",
     "Choose a file to add as attachment" : "Əlavə ediləcək faylı seçin",
+    "Reply" : "Cavab",
+    "Send" : "Göndər",
+    "Sending …" : "Göndərilir...",
+    "you" : "siz",
     "Message could not be starred. Please try again." : "Mesaj götürülə bilmir. Xahiş olunur yenidən təkrar edəsiniz.",
     "Error while deleting message." : "Mesajın silinməsində səhv baş verdi.",
     "Checking mail …" : "Mail yoxlanılır ...",
     "Loading …" : "Yüklənir...",
     "Load more …" : "Çoxlu yüklə ...",
-    "Send" : "Göndər",
     "Inbox" : "Gələn qutusu",
     "Sent" : "Göndərildi",
     "Drafts" : "Qaralamalar",
@@ -45,16 +44,13 @@ OC.L10N.register(
     "bcc" : "bcc",
     "Subject" : "Mövzu",
     "Message …" : "Mesaj ...",
-    "Add attachment from Files" : "Fayllardan əlavəni et",
     "Open Mail App" : "Mail proqramını aç",
     "Back to website" : "website-a qayıt",
+    "Add attachment from Files" : "Fayllardan əlavəni et",
     "Error loading message" : "Mesajın yüklənməsində səhv baş verdi",
     "Download attachment" : "Əlavəni endir",
     "Save to Files" : "Fayllarda saxla",
     "Save all to Files" : "Hər şeyi fayllarda saxla",
-    "+ cc" : "+ cc",
-    "Reply …" : "Cavab ...",
-    "Forward" : "Yönləndir",
     "Delete" : "Sil",
     "No messages in this folder!" : "Bu qovluqda heç bir mesaj yoxdur!",
     "Connect your mail account" : "Mail hesabınızı qoşun",
diff --git a/l10n/az.json b/l10n/az.json
index 4f18cd9b6..cd1bf973a 100644
--- a/l10n/az.json
+++ b/l10n/az.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Mail" : "Məktub",
     "Error while loading the accounts." : "Hesabların yüklənməsi müddətində səhv baş verdi",
-    "you" : "siz",
     "Error while loading the selected account." : "Seçilmiş hesabın yüklənməsində səhv baş verdi",
     "Error while loading messages." : "Mesajların yüklənməsi müddətində səhv baş verdi.",
     "Choose a folder to store the attachment in" : "Əlavələrin saxlanılması üçün qovluğu seçin",
@@ -14,17 +13,17 @@
     "Unknown error" : "Bəlli olmayan səhv baş verdi",
     "Error while creating an account: " : "Hesabın yaraılması müddətində səhv baş verdi: ",
     "Connect" : "Qoşul",
-    "Sending …" : "Göndərilir...",
-    "Reply" : "Cavab",
-    "Error sending the reply." : "Cavabın göndərilməsində səhv baş verdi.",
     "Error while deleting account." : "Hesabın silinməsində səhv baş verdi.",
     "Choose a file to add as attachment" : "Əlavə ediləcək faylı seçin",
+    "Reply" : "Cavab",
+    "Send" : "Göndər",
+    "Sending …" : "Göndərilir...",
+    "you" : "siz",
     "Message could not be starred. Please try again." : "Mesaj götürülə bilmir. Xahiş olunur yenidən təkrar edəsiniz.",
     "Error while deleting message." : "Mesajın silinməsində səhv baş verdi.",
     "Checking mail …" : "Mail yoxlanılır ...",
     "Loading …" : "Yüklənir...",
     "Load more …" : "Çoxlu yüklə ...",
-    "Send" : "Göndər",
     "Inbox" : "Gələn qutusu",
     "Sent" : "Göndərildi",
     "Drafts" : "Qaralamalar",
@@ -43,16 +42,13 @@
     "bcc" : "bcc",
     "Subject" : "Mövzu",
     "Message …" : "Mesaj ...",
-    "Add attachment from Files" : "Fayllardan əlavəni et",
     "Open Mail App" : "Mail proqramını aç",
     "Back to website" : "website-a qayıt",
+    "Add attachment from Files" : "Fayllardan əlavəni et",
     "Error loading message" : "Mesajın yüklənməsində səhv baş verdi",
     "Download attachment" : "Əlavəni endir",
     "Save to Files" : "Fayllarda saxla",
     "Save all to Files" : "Hər şeyi fayllarda saxla",
-    "+ cc" : "+ cc",
-    "Reply …" : "Cavab ...",
-    "Forward" : "Yönləndir",
     "Delete" : "Sil",
     "No messages in this folder!" : "Bu qovluqda heç bir mesaj yoxdur!",
     "Connect your mail account" : "Mail hesabınızı qoşun",
diff --git a/l10n/bg_BG.js b/l10n/bg_BG.js
index 059a9d6f0..bb62b64ea 100644
--- a/l10n/bg_BG.js
+++ b/l10n/bg_BG.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Mail" : "Поща",
     "Error while loading the accounts." : "Грешка при зареждането на профилите.",
-    "you" : "ти",
     "Error while loading the selected account." : "Грешка при зареждането на избрания профил.",
     "Error while loading messages." : "Грешка при зареждане на съобщенията.",
     "Choose a folder to store the attachment in" : "Избери папка, където да бъде запазен прикаченият файл",
@@ -16,17 +15,17 @@ OC.L10N.register(
     "Unknown error" : "Непозната грешка",
     "Error while creating an account: " : "Грешка при създаване на профил:",
     "Connect" : "Свържи",
-    "Sending …" : "Изпращане...",
-    "Reply" : "Отговори",
-    "Error sending the reply." : "Грешка при изпращането на отговор.",
     "Error while deleting account." : "Грешка при изтриването на профил.",
     "Choose a file to add as attachment" : "Избери файл за прикачване",
+    "Reply" : "Отговори",
+    "Send" : "Изпрати",
+    "Sending …" : "Изпращане...",
+    "you" : "ти",
     "Message could not be starred. Please try again." : "Неуспешно маркиране на съобщението като любимо. Моля, опитай отново.",
     "Error while deleting message." : "Грешка при изтриването на съобщение.",
     "Checking mail …" : "Проверка за имейли...",
     "Loading …" : "Зареждане ...",
     "Load more …" : "Зареди повече ...",
-    "Send" : "Изпрати",
     "Inbox" : "Входяши",
     "Sent" : "Изпратени",
     "Drafts" : "Чернови",
@@ -45,16 +44,13 @@ OC.L10N.register(
     "bcc" : "bcc",
     "Subject" : "Относно",
     "Message …" : "Съобщение...",
-    "Add attachment from Files" : "Добави прикачен файл от Файлове",
     "Open Mail App" : "Отвори Програмата за Съобщения",
     "Back to website" : "Обратно към сайта",
+    "Add attachment from Files" : "Добави прикачен файл от Файлове",
     "Error loading message" : "Грешка при зареждане съобщението",
     "Download attachment" : "Изтегли прикачения файл",
     "Save to Files" : "Запази във Файлове",
     "Save all to Files" : "Запази всички във Файлове",
-    "+ cc" : "+ cc",
-    "Reply …" : "Отговори...",
-    "Forward" : "Препрати",
     "Delete" : "Изтриване",
     "No messages in this folder!" : "Няма съобщение в тази папка!",
     "New message" : "Ново Съобщение",
diff --git a/l10n/bg_BG.json b/l10n/bg_BG.json
index 82e05877c..d2d2e8527 100644
--- a/l10n/bg_BG.json
+++ b/l10n/bg_BG.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Mail" : "Поща",
     "Error while loading the accounts." : "Грешка при зареждането на профилите.",
-    "you" : "ти",
     "Error while loading the selected account." : "Грешка при зареждането на избрания профил.",
     "Error while loading messages." : "Грешка при зареждане на съобщенията.",
     "Choose a folder to store the attachment in" : "Избери папка, където да бъде запазен прикаченият файл",
@@ -14,17 +13,17 @@
     "Unknown error" : "Непозната грешка",
     "Error while creating an account: " : "Грешка при създаване на профил:",
     "Connect" : "Свържи",
-    "Sending …" : "Изпращане...",
-    "Reply" : "Отговори",
-    "Error sending the reply." : "Грешка при изпращането на отговор.",
     "Error while deleting account." : "Грешка при изтриването на профил.",
     "Choose a file to add as attachment" : "Избери файл за прикачване",
+    "Reply" : "Отговори",
+    "Send" : "Изпрати",
+    "Sending …" : "Изпращане...",
+    "you" : "ти",
     "Message could not be starred. Please try again." : "Неуспешно маркиране на съобщението като любимо. Моля, опитай отново.",
     "Error while deleting message." : "Грешка при изтриването на съобщение.",
     "Checking mail …" : "Проверка за имейли...",
     "Loading …" : "Зареждане ...",
     "Load more …" : "Зареди повече ...",
-    "Send" : "Изпрати",
     "Inbox" : "Входяши",
     "Sent" : "Изпратени",
     "Drafts" : "Чернови",
@@ -43,16 +42,13 @@
     "bcc" : "bcc",
     "Subject" : "Относно",
     "Message …" : "Съобщение...",
-    "Add attachment from Files" : "Добави прикачен файл от Файлове",
     "Open Mail App" : "Отвори Програмата за Съобщения",
     "Back to website" : "Обратно към сайта",
+    "Add attachment from Files" : "Добави прикачен файл от Файлове",
     "Error loading message" : "Грешка при зареждане съобщението",
     "Download attachment" : "Изтегли прикачения файл",
     "Save to Files" : "Запази във Файлове",
     "Save all to Files" : "Запази всички във Файлове",
-    "+ cc" : "+ cc",
-    "Reply …" : "Отговори...",
-    "Forward" : "Препрати",
     "Delete" : "Изтриване",
     "No messages in this folder!" : "Няма съобщение в тази папка!",
     "New message" : "Ново Съобщение",
diff --git a/l10n/cs_CZ.js b/l10n/cs_CZ.js
index a05cd83ec..bd475e3b3 100644
--- a/l10n/cs_CZ.js
+++ b/l10n/cs_CZ.js
@@ -5,8 +5,6 @@ OC.L10N.register(
     "Error while loading the accounts." : "Chyba při načítání účtů.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n nová zpráva v {folderName} \nod {from}","%n nové zprávy v {folderName} \nod {from}","%n nových zpráv v {folderName} \nod {from}"],
-    "you" : "vy",
-    "Send message to {email}" : "Poslat email na {email}",
     "Error while loading the selected account." : "Chyba během načítání vybraného účtu.",
     "Error while loading messages." : "Chyba během načítání zpráv.",
     "Choose a folder to store the attachment in" : "Vyber adresář pro uložení přílohy",
@@ -21,19 +19,20 @@ OC.L10N.register(
     "Unknown error" : "Neznámá chyba",
     "Error while creating an account: " : "Chyba při vytváření účtu:",
     "Connect" : "Připojit",
-    "Sending …" : "Odesílám ...",
-    "Reply" : "Odpověď",
-    "Message sent!" : "Zpráva odeslána!",
-    "Error sending the reply." : "Chyba při odesílání odpovědi.",
     "Error while deleting account." : "Chyba při mazání účtu.",
     "Choose a file to add as attachment" : "Vyberte soubor k přiložení",
+    "Reply" : "Odpověď",
+    "Send" : "Odeslat",
+    "Sending …" : "Odesílám ...",
+    "Message sent!" : "Zpráva odeslána!",
+    "you" : "vy",
+    "Send message to {email}" : "Poslat email na {email}",
     "Message could not be starred. Please try again." : "Zpráva nemohla být označena hvězdičkou. Zkuste to prosím znovu.",
     "Error while deleting message." : "Chyba při mazání zprávy.",
     "Checking mail …" : "Kontroluji email ...",
     "Loading …" : "Načítání ...",
     "Load more …" : "Načíst další ...",
     "Check messages …" : "Zkontrolovat zprávy ...",
-    "Send" : "Odeslat",
     "Inbox" : "Doručená",
     "Sent" : "Odeslaná",
     "Drafts" : "Koncepty",
@@ -54,16 +53,13 @@ OC.L10N.register(
     "bcc" : "bcc",
     "Subject" : "Předmět",
     "Message …" : "Zpráva ...",
-    "Add attachment from Files" : "Připojit přílohu ze Souborů",
     "Open Mail App" : "Otevřít Email",
     "Back to website" : "Zpět na webovou stránku",
+    "Add attachment from Files" : "Připojit přílohu ze Souborů",
     "Error loading message" : "Chyba načtení zprávy",
     "Download attachment" : "Stáhnout přílohu",
     "Save to Files" : "Uložit do Souborů",
     "Save all to Files" : "Uložit vše do Souborů",
-    "+ cc" : "+ cc",
-    "Reply …" : "Odpověď ...",
-    "Forward" : "Přeposlat",
     "Delete" : "Smazat",
     "Add mail account" : "Přidat emailový účet",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Chcete šifrovat svoje emaily? Nainstalujte rozšíření prohlížeče <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope</a>!",
diff --git a/l10n/cs_CZ.json b/l10n/cs_CZ.json
index b2a6603fe..6a7d95e67 100644
--- a/l10n/cs_CZ.json
+++ b/l10n/cs_CZ.json
@@ -3,8 +3,6 @@
     "Error while loading the accounts." : "Chyba při načítání účtů.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n nová zpráva v {folderName} \nod {from}","%n nové zprávy v {folderName} \nod {from}","%n nových zpráv v {folderName} \nod {from}"],
-    "you" : "vy",
-    "Send message to {email}" : "Poslat email na {email}",
     "Error while loading the selected account." : "Chyba během načítání vybraného účtu.",
     "Error while loading messages." : "Chyba během načítání zpráv.",
     "Choose a folder to store the attachment in" : "Vyber adresář pro uložení přílohy",
@@ -19,19 +17,20 @@
     "Unknown error" : "Neznámá chyba",
     "Error while creating an account: " : "Chyba při vytváření účtu:",
     "Connect" : "Připojit",
-    "Sending …" : "Odesílám ...",
-    "Reply" : "Odpověď",
-    "Message sent!" : "Zpráva odeslána!",
-    "Error sending the reply." : "Chyba při odesílání odpovědi.",
     "Error while deleting account." : "Chyba při mazání účtu.",
     "Choose a file to add as attachment" : "Vyberte soubor k přiložení",
+    "Reply" : "Odpověď",
+    "Send" : "Odeslat",
+    "Sending …" : "Odesílám ...",
+    "Message sent!" : "Zpráva odeslána!",
+    "you" : "vy",
+    "Send message to {email}" : "Poslat email na {email}",
     "Message could not be starred. Please try again." : "Zpráva nemohla být označena hvězdičkou. Zkuste to prosím znovu.",
     "Error while deleting message." : "Chyba při mazání zprávy.",
     "Checking mail …" : "Kontroluji email ...",
     "Loading …" : "Načítání ...",
     "Load more …" : "Načíst další ...",
     "Check messages …" : "Zkontrolovat zprávy ...",
-    "Send" : "Odeslat",
     "Inbox" : "Doručená",
     "Sent" : "Odeslaná",
     "Drafts" : "Koncepty",
@@ -52,16 +51,13 @@
     "bcc" : "bcc",
     "Subject" : "Předmět",
     "Message …" : "Zpráva ...",
-    "Add attachment from Files" : "Připojit přílohu ze Souborů",
     "Open Mail App" : "Otevřít Email",
     "Back to website" : "Zpět na webovou stránku",
+    "Add attachment from Files" : "Připojit přílohu ze Souborů",
     "Error loading message" : "Chyba načtení zprávy",
     "Download attachment" : "Stáhnout přílohu",
     "Save to Files" : "Uložit do Souborů",
     "Save all to Files" : "Uložit vše do Souborů",
-    "+ cc" : "+ cc",
-    "Reply …" : "Odpověď ...",
-    "Forward" : "Přeposlat",
     "Delete" : "Smazat",
     "Add mail account" : "Přidat emailový účet",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Chcete šifrovat svoje emaily? Nainstalujte rozšíření prohlížeče <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope</a>!",
diff --git a/l10n/da.js b/l10n/da.js
index 9fafa0286..cbfc88a17 100644
--- a/l10n/da.js
+++ b/l10n/da.js
@@ -5,8 +5,6 @@ OC.L10N.register(
     "Error while loading the accounts." : "Fejl under indlæsning af konti.",
     "{from}\n{subject}" : "{fra}\n{emne}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n ny besked i {folderName}\nfra {from}","%n nye beskeder i {folderName}\nfra {from}"],
-    "you" : "dig",
-    "Send message to {email}" : "Send besked til {email}",
     "Error while loading the selected account." : "Der opstod en fejl under læsningen af den valgte konto.",
     "Error while loading messages." : "Fejl under indlæsning af beskeder.",
     "Choose a folder to store the attachment in" : "Vælg den mappe, hvor vedhæftningen skal gemmes i",
@@ -21,19 +19,20 @@ OC.L10N.register(
     "Unknown error" : "Ukendt fejl",
     "Error while creating an account: " : "Fejl under oprettelse af kontoen:",
     "Connect" : "Tilslut",
-    "Sending …" : "Sender ...",
-    "Reply" : "Besvar",
-    "Message sent!" : "Beskeden blev sendt!",
-    "Error sending the reply." : "Fejl ved afsendelse af svaret.",
     "Error while deleting account." : "Fejl under sletning af kontoen.",
     "Choose a file to add as attachment" : "Vælg en fil, der skal tilføjes som vedhæftning",
+    "Reply" : "Besvar",
+    "Send" : "Send",
+    "Sending …" : "Sender ...",
+    "Message sent!" : "Beskeden blev sendt!",
+    "you" : "dig",
+    "Send message to {email}" : "Send besked til {email}",
     "Message could not be starred. Please try again." : "Beskeden kunne ikke sternemarkeres. Forsøg venligst igen.",
     "Error while deleting message." : "Fejl under sletning af besked.",
     "Checking mail …" : "Tjekker post ...",
     "Loading …" : "Indlæser...",
     "Load more …" : "Indlæs flere ...",
     "Check messages …" : "Tjek efter beskeder...",
-    "Send" : "Send",
     "Inbox" : "Indbakke",
     "Sent" : "Sent",
     "Drafts" : "Udkast",
@@ -54,16 +53,13 @@ OC.L10N.register(
     "bcc" : "bcc",
     "Subject" : "Emne",
     "Message …" : "Besked ...",
-    "Add attachment from Files" : "Tilføj vedhæftning fra Filer",
     "Open Mail App" : "Åbn mail-app",
     "Back to website" : "Tilbage til websted",
+    "Add attachment from Files" : "Tilføj vedhæftning fra Filer",
     "Error loading message" : "Fejl under indlæsning af besked",
     "Download attachment" : "Hent vedhæftning",
     "Save to Files" : "Gem til Filer",
     "Save all to Files" : "Gem alle til Filer",
-    "+ cc" : "+ cc",
-    "Reply …" : "Besvar ...",
-    "Forward" : "Videresend",
     "Delete" : "Slet",
     "Add mail account" : "Tilføj postkonto",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Vil du gerne kryptere dine e-mails? Installér browserudvidelsen <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope</a>!",
diff --git a/l10n/da.json b/l10n/da.json
index dc35937c2..011a9a9c2 100644
--- a/l10n/da.json
+++ b/l10n/da.json
@@ -3,8 +3,6 @@
     "Error while loading the accounts." : "Fejl under indlæsning af konti.",
     "{from}\n{subject}" : "{fra}\n{emne}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n ny besked i {folderName}\nfra {from}","%n nye beskeder i {folderName}\nfra {from}"],
-    "you" : "dig",
-    "Send message to {email}" : "Send besked til {email}",
     "Error while loading the selected account." : "Der opstod en fejl under læsningen af den valgte konto.",
     "Error while loading messages." : "Fejl under indlæsning af beskeder.",
     "Choose a folder to store the attachment in" : "Vælg den mappe, hvor vedhæftningen skal gemmes i",
@@ -19,19 +17,20 @@
     "Unknown error" : "Ukendt fejl",
     "Error while creating an account: " : "Fejl under oprettelse af kontoen:",
     "Connect" : "Tilslut",
-    "Sending …" : "Sender ...",
-    "Reply" : "Besvar",
-    "Message sent!" : "Beskeden blev sendt!",
-    "Error sending the reply." : "Fejl ved afsendelse af svaret.",
     "Error while deleting account." : "Fejl under sletning af kontoen.",
     "Choose a file to add as attachment" : "Vælg en fil, der skal tilføjes som vedhæftning",
+    "Reply" : "Besvar",
+    "Send" : "Send",
+    "Sending …" : "Sender ...",
+    "Message sent!" : "Beskeden blev sendt!",
+    "you" : "dig",
+    "Send message to {email}" : "Send besked til {email}",
     "Message could not be starred. Please try again." : "Beskeden kunne ikke sternemarkeres. Forsøg venligst igen.",
     "Error while deleting message." : "Fejl under sletning af besked.",
     "Checking mail …" : "Tjekker post ...",
     "Loading …" : "Indlæser...",
     "Load more …" : "Indlæs flere ...",
     "Check messages …" : "Tjek efter beskeder...",
-    "Send" : "Send",
     "Inbox" : "Indbakke",
     "Sent" : "Sent",
     "Drafts" : "Udkast",
@@ -52,16 +51,13 @@
     "bcc" : "bcc",
     "Subject" : "Emne",
     "Message …" : "Besked ...",
-    "Add attachment from Files" : "Tilføj vedhæftning fra Filer",
     "Open Mail App" : "Åbn mail-app",
     "Back to website" : "Tilbage til websted",
+    "Add attachment from Files" : "Tilføj vedhæftning fra Filer",
     "Error loading message" : "Fejl under indlæsning af besked",
     "Download attachment" : "Hent vedhæftning",
     "Save to Files" : "Gem til Filer",
     "Save all to Files" : "Gem alle til Filer",
-    "+ cc" : "+ cc",
-    "Reply …" : "Besvar ...",
-    "Forward" : "Videresend",
     "Delete" : "Slet",
     "Add mail account" : "Tilføj postkonto",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Vil du gerne kryptere dine e-mails? Installér browserudvidelsen <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope</a>!",
diff --git a/l10n/de.js b/l10n/de.js
index 67856f1eb..dd5f4b0f4 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -4,8 +4,6 @@ OC.L10N.register(
     "Mail" : "Mail",
     "Error while loading the accounts." : "Fehler beim Laden der Konten.",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n neue Nachricht in {folderName} \nvon {from}","%n neue Nachrichten in {folderName} \nvon {from}"],
-    "you" : "Du",
-    "Send message to {email}" : "Nachricht an {email} senden",
     "Error while loading the selected account." : "Fehler beim Laden des ausgewählten Kontos.",
     "Error while loading messages." : "Fehler beim Laden der Nachrichten.",
     "Choose a folder to store the attachment in" : "Ordner zum Anhang speichern auswählen",
@@ -20,19 +18,20 @@ OC.L10N.register(
     "Unknown error" : "Unbekannter Fehler",
     "Error while creating an account: " : "Fehler beim Erstellen eines Kontos:",
     "Connect" : "Verbinden",
-    "Sending …" : "Senden…",
-    "Reply" : "Antwort",
-    "Message sent!" : "Nachricht versandt!",
-    "Error sending the reply." : "Fehler beim Senden der Antwort.",
     "Error while deleting account." : "Fehler beim Löschen des Kontos.",
     "Choose a file to add as attachment" : "Wähle eine Datei, die als Anhang angefügt werden soll",
+    "Reply" : "Antwort",
+    "Send" : "Senden",
+    "Sending …" : "Senden…",
+    "Message sent!" : "Nachricht versandt!",
+    "you" : "Du",
+    "Send message to {email}" : "Nachricht an {email} senden",
     "Message could not be starred. Please try again." : "Nachricht konnte nicht als Favorit markiert werden. Bitte noch einmal versuchen.",
     "Error while deleting message." : "Fehler beim Löschen der Nachricht.",
     "Checking mail …" : "E-Mails abrufen…",
     "Loading …" : "Laden…",
     "Load more …" : "Weitere laden…",
     "Check messages …" : "Nachrichten überprüfen…",
-    "Send" : "Senden",
     "Inbox" : "Posteingang",
     "Sent" : "Gesendet",
     "Drafts" : "Entwürfe",
@@ -52,16 +51,13 @@ OC.L10N.register(
     "bcc" : "BCC",
     "Subject" : "Betreff",
     "Message …" : "Nachricht…",
-    "Add attachment from Files" : "Anhang aus Dateien hinzufügen",
     "Open Mail App" : "Mail-App öffnen",
     "Back to website" : "Zurück zur Webseite",
+    "Add attachment from Files" : "Anhang aus Dateien hinzufügen",
     "Error loading message" : "Fehler beim Laden der Nachricht",
     "Download attachment" : "Anhang herunterladen",
     "Save to Files" : "Unter Dateien speichern",
     "Save all to Files" : "Alles unter Dateien speichern",
-    "+ cc" : "+ CC",
-    "Reply …" : "Antwort…",
-    "Forward" : "Weiterleiten",
     "Delete" : "Löschen",
     "Add mail account" : "E-Mail-Konto hinzufügen",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Suchst Du nach einer Möglichkeit, Deine E-Mails zu verschlüsseln? Installiere die <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope Browser-Erweiterung</a>!",
diff --git a/l10n/de.json b/l10n/de.json
index b7380a68a..a79c68f2f 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -2,8 +2,6 @@
     "Mail" : "Mail",
     "Error while loading the accounts." : "Fehler beim Laden der Konten.",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n neue Nachricht in {folderName} \nvon {from}","%n neue Nachrichten in {folderName} \nvon {from}"],
-    "you" : "Du",
-    "Send message to {email}" : "Nachricht an {email} senden",
     "Error while loading the selected account." : "Fehler beim Laden des ausgewählten Kontos.",
     "Error while loading messages." : "Fehler beim Laden der Nachrichten.",
     "Choose a folder to store the attachment in" : "Ordner zum Anhang speichern auswählen",
@@ -18,19 +16,20 @@
     "Unknown error" : "Unbekannter Fehler",
     "Error while creating an account: " : "Fehler beim Erstellen eines Kontos:",
     "Connect" : "Verbinden",
-    "Sending …" : "Senden…",
-    "Reply" : "Antwort",
-    "Message sent!" : "Nachricht versandt!",
-    "Error sending the reply." : "Fehler beim Senden der Antwort.",
     "Error while deleting account." : "Fehler beim Löschen des Kontos.",
     "Choose a file to add as attachment" : "Wähle eine Datei, die als Anhang angefügt werden soll",
+    "Reply" : "Antwort",
+    "Send" : "Senden",
+    "Sending …" : "Senden…",
+    "Message sent!" : "Nachricht versandt!",
+    "you" : "Du",
+    "Send message to {email}" : "Nachricht an {email} senden",
     "Message could not be starred. Please try again." : "Nachricht konnte nicht als Favorit markiert werden. Bitte noch einmal versuchen.",
     "Error while deleting message." : "Fehler beim Löschen der Nachricht.",
     "Checking mail …" : "E-Mails abrufen…",
     "Loading …" : "Laden…",
     "Load more …" : "Weitere laden…",
     "Check messages …" : "Nachrichten überprüfen…",
-    "Send" : "Senden",
     "Inbox" : "Posteingang",
     "Sent" : "Gesendet",
     "Drafts" : "Entwürfe",
@@ -50,16 +49,13 @@
     "bcc" : "BCC",
     "Subject" : "Betreff",
     "Message …" : "Nachricht…",
-    "Add attachment from Files" : "Anhang aus Dateien hinzufügen",
     "Open Mail App" : "Mail-App öffnen",
     "Back to website" : "Zurück zur Webseite",
+    "Add attachment from Files" : "Anhang aus Dateien hinzufügen",
     "Error loading message" : "Fehler beim Laden der Nachricht",
     "Download attachment" : "Anhang herunterladen",
     "Save to Files" : "Unter Dateien speichern",
     "Save all to Files" : "Alles unter Dateien speichern",
-    "+ cc" : "+ CC",
-    "Reply …" : "Antwort…",
-    "Forward" : "Weiterleiten",
     "Delete" : "Löschen",
     "Add mail account" : "E-Mail-Konto hinzufügen",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Suchst Du nach einer Möglichkeit, Deine E-Mails zu verschlüsseln? Installiere die <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope Browser-Erweiterung</a>!",
diff --git a/l10n/de_DE.js b/l10n/de_DE.js
index d6f86a3bd..7ab11a690 100644
--- a/l10n/de_DE.js
+++ b/l10n/de_DE.js
@@ -4,8 +4,6 @@ OC.L10N.register(
     "Mail" : "Mail",
     "Error while loading the accounts." : "Fehler beim Laden der Konten.",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n neue Nachricht in {folderName} \nvon {from}","%n neue Nachrichten in {folderName} \nvon {from}"],
-    "you" : "Sie",
-    "Send message to {email}" : "Nachricht an {email} senden",
     "Error while loading the selected account." : "Fehler beim Laden des ausgewählten Kontos.",
     "Error while loading messages." : "Fehler beim Laden der Nachrichten.",
     "Choose a folder to store the attachment in" : "Ordner zum Speichern des Anhangs auswählen",
@@ -20,19 +18,20 @@ OC.L10N.register(
     "Unknown error" : "Unbekannter Fehler",
     "Error while creating an account: " : "Fehler beim Erstellen eines Kontos:",
     "Connect" : "Verbinden",
-    "Sending …" : "Senden…",
-    "Reply" : "Antwort",
-    "Message sent!" : "Nachricht versandt!",
-    "Error sending the reply." : "Fehler beim Senden der Antwort.",
     "Error while deleting account." : "Fehler beim Löschen des Kontos.",
     "Choose a file to add as attachment" : "Wählen Sie eine Datei, die als Anhang angefügt werden soll",
+    "Reply" : "Antwort",
+    "Send" : "Senden",
+    "Sending …" : "Senden…",
+    "Message sent!" : "Nachricht versandt!",
+    "you" : "Sie",
+    "Send message to {email}" : "Nachricht an {email} senden",
     "Message could not be starred. Please try again." : "Nachricht konnte nicht als Favorit markiert werden. Bitte noch einmal versuchen.",
     "Error while deleting message." : "Fehler beim Löschen der Nachricht.",
     "Checking mail …" : "E-Mails abrufen…",
     "Loading …" : "Laden…",
     "Load more …" : "Weitere laden…",
     "Check messages …" : "Nachrichten überprüfen…",
-    "Send" : "Senden",
     "Inbox" : "Posteingang",
     "Sent" : "Gesendet",
     "Drafts" : "Entwürfe",
@@ -52,16 +51,13 @@ OC.L10N.register(
     "bcc" : "BCC",
     "Subject" : "Betreff",
     "Message …" : "Nachricht…",
-    "Add attachment from Files" : "Anhang aus Dateien hinzufügen",
     "Open Mail App" : "Mail-App öffnen",
     "Back to website" : "Zurück zur Webseite",
+    "Add attachment from Files" : "Anhang aus Dateien hinzufügen",
     "Error loading message" : "Fehler beim Laden der Nachricht",
     "Download attachment" : "Anhang herunterladen",
     "Save to Files" : "In Dateien speichern",
     "Save all to Files" : "Alles in Dateien speichern",
-    "+ cc" : "+ CC",
-    "Reply …" : "Antworten…",
-    "Forward" : "Weiterleiten",
     "Delete" : "Löschen",
     "Add mail account" : "E-Mail-Konto hinzufügen",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Suchen Sie nach einer Möglichkeit, Ihre E-Mails zu verschlüsseln? Installieren Sie die <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope Browser-Erweiterung</a>!",
diff --git a/l10n/de_DE.json b/l10n/de_DE.json
index aedbb427c..c90c61143 100644
--- a/l10n/de_DE.json
+++ b/l10n/de_DE.json
@@ -2,8 +2,6 @@
     "Mail" : "Mail",
     "Error while loading the accounts." : "Fehler beim Laden der Konten.",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n neue Nachricht in {folderName} \nvon {from}","%n neue Nachrichten in {folderName} \nvon {from}"],
-    "you" : "Sie",
-    "Send message to {email}" : "Nachricht an {email} senden",
     "Error while loading the selected account." : "Fehler beim Laden des ausgewählten Kontos.",
     "Error while loading messages." : "Fehler beim Laden der Nachrichten.",
     "Choose a folder to store the attachment in" : "Ordner zum Speichern des Anhangs auswählen",
@@ -18,19 +16,20 @@
     "Unknown error" : "Unbekannter Fehler",
     "Error while creating an account: " : "Fehler beim Erstellen eines Kontos:",
     "Connect" : "Verbinden",
-    "Sending …" : "Senden…",
-    "Reply" : "Antwort",
-    "Message sent!" : "Nachricht versandt!",
-    "Error sending the reply." : "Fehler beim Senden der Antwort.",
     "Error while deleting account." : "Fehler beim Löschen des Kontos.",
     "Choose a file to add as attachment" : "Wählen Sie eine Datei, die als Anhang angefügt werden soll",
+    "Reply" : "Antwort",
+    "Send" : "Senden",
+    "Sending …" : "Senden…",
+    "Message sent!" : "Nachricht versandt!",
+    "you" : "Sie",
+    "Send message to {email}" : "Nachricht an {email} senden",
     "Message could not be starred. Please try again." : "Nachricht konnte nicht als Favorit markiert werden. Bitte noch einmal versuchen.",
     "Error while deleting message." : "Fehler beim Löschen der Nachricht.",
     "Checking mail …" : "E-Mails abrufen…",
     "Loading …" : "Laden…",
     "Load more …" : "Weitere laden…",
     "Check messages …" : "Nachrichten überprüfen…",
-    "Send" : "Senden",
     "Inbox" : "Posteingang",
     "Sent" : "Gesendet",
     "Drafts" : "Entwürfe",
@@ -50,16 +49,13 @@
     "bcc" : "BCC",
     "Subject" : "Betreff",
     "Message …" : "Nachricht…",
-    "Add attachment from Files" : "Anhang aus Dateien hinzufügen",
     "Open Mail App" : "Mail-App öffnen",
     "Back to website" : "Zurück zur Webseite",
+    "Add attachment from Files" : "Anhang aus Dateien hinzufügen",
     "Error loading message" : "Fehler beim Laden der Nachricht",
     "Download attachment" : "Anhang herunterladen",
     "Save to Files" : "In Dateien speichern",
     "Save all to Files" : "Alles in Dateien speichern",
-    "+ cc" : "+ CC",
-    "Reply …" : "Antworten…",
-    "Forward" : "Weiterleiten",
     "Delete" : "Löschen",
     "Add mail account" : "E-Mail-Konto hinzufügen",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Suchen Sie nach einer Möglichkeit, Ihre E-Mails zu verschlüsseln? Installieren Sie die <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope Browser-Erweiterung</a>!",
diff --git a/l10n/el.js b/l10n/el.js
index 172625f52..8c101c567 100644
--- a/l10n/el.js
+++ b/l10n/el.js
@@ -5,8 +5,6 @@ OC.L10N.register(
     "Error while loading the accounts." : "Σφάλμα κατά τη φόρτωση των λογαριασμών.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n νέο μήνυμα σε {folderName}\nαπό {from}","%n νέα μηνύματα σε {folderName}\nαπό {from}"],
-    "you" : "εσείς",
-    "Send message to {email}" : "Αποστολή μηνύματος σε {email}",
     "Error while loading the selected account." : "Σφάλμα κατά τη φόρτωση του επιλεγμένου λογαριασμού.",
     "Error while loading messages." : "Σφάλμα κατά τη φόρτωση μηνυμάτων.",
     "Choose a folder to store the attachment in" : "Επιλέξτε ένα φάκελο για να αποθηκεύσετε τα συννημένα",
@@ -21,19 +19,20 @@ OC.L10N.register(
     "Unknown error" : "Άγνωστο σφάλμα",
     "Error while creating an account: " : "Σφάλμα κατά τη δημιουργία λογαριασμού:",
     "Connect" : "Σύνδεση",
-    "Sending …" : "Αποστολή...",
-    "Reply" : "Απάντηση",
-    "Message sent!" : "Μήνυμα εστάλη!",
-    "Error sending the reply." : "Σφάλμα κατά την αποστολή απάντησης.",
     "Error while deleting account." : "Σφάλμα κατά τη διαγραφή λογαριασμού.",
     "Choose a file to add as attachment" : "Επιλέξτε έναν φάκελο για να προσθέσετε σαν συνημμένο",
+    "Reply" : "Απάντηση",
+    "Send" : "Αποστολή",
+    "Sending …" : "Αποστολή...",
+    "Message sent!" : "Μήνυμα εστάλη!",
+    "you" : "εσείς",
+    "Send message to {email}" : "Αποστολή μηνύματος σε {email}",
     "Message could not be starred. Please try again." : "Το μήνυμα δεν ήταν εφικτό να επισημανθεί με αστέρι. Παρακαλώ προσπαθήστε ξανά.",
     "Error while deleting message." : "Σφάλμα κατά τη διαγραφή του μηνύματος",
     "Checking mail …" : "Έλεγχος ταχυδρομείου...",
     "Loading …" : "Φόρτωση ...",
     "Load more …" : "Φόρτωση περισσότερων...",
     "Check messages …" : "Έλεγχος μηνυμάτων ...",
-    "Send" : "Αποστολή",
     "Inbox" : "Εισερχόμενα",
     "Sent" : "Απεστάλη",
     "Drafts" : "Πρόχειρα",
@@ -54,16 +53,13 @@ OC.L10N.register(
     "bcc" : "bcc",
     "Subject" : "Θέμα",
     "Message …" : "Μήνυμα ...",
-    "Add attachment from Files" : "Προσθέστε συνημένο αρχείο απο τα έγραφα",
     "Open Mail App" : "Άνοιγμα εφαρμογής Mail",
     "Back to website" : "Πίσω στην ιστοσελίδα",
+    "Add attachment from Files" : "Προσθέστε συνημένο αρχείο απο τα έγραφα",
     "Error loading message" : "Μήνυμα σφάλματος φόρτωσης",
     "Download attachment" : "Κατεβάστε το συνημμένο",
     "Save to Files" : "Αποθήκευση στα Έγγραφα",
     "Save all to Files" : "Αποθήκευση όλων στα Έγγραφα",
-    "+ cc" : "+ cc",
-    "Reply …" : "Απάντηση ...",
-    "Forward" : "Προώθηση",
     "Delete" : "Διαγραφή",
     "Add mail account" : "Προσθήκη λογαριασμού αλληλογραφίας",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Θέλετε να κρυπτογραφήσετε τα emails σας; Εγκαταστήστε το <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!",
diff --git a/l10n/el.json b/l10n/el.json
index 71350efab..21d988ca9 100644
--- a/l10n/el.json
+++ b/l10n/el.json
@@ -3,8 +3,6 @@
     "Error while loading the accounts." : "Σφάλμα κατά τη φόρτωση των λογαριασμών.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n νέο μήνυμα σε {folderName}\nαπό {from}","%n νέα μηνύματα σε {folderName}\nαπό {from}"],
-    "you" : "εσείς",
-    "Send message to {email}" : "Αποστολή μηνύματος σε {email}",
     "Error while loading the selected account." : "Σφάλμα κατά τη φόρτωση του επιλεγμένου λογαριασμού.",
     "Error while loading messages." : "Σφάλμα κατά τη φόρτωση μηνυμάτων.",
     "Choose a folder to store the attachment in" : "Επιλέξτε ένα φάκελο για να αποθηκεύσετε τα συννημένα",
@@ -19,19 +17,20 @@
     "Unknown error" : "Άγνωστο σφάλμα",
     "Error while creating an account: " : "Σφάλμα κατά τη δημιουργία λογαριασμού:",
     "Connect" : "Σύνδεση",
-    "Sending …" : "Αποστολή...",
-    "Reply" : "Απάντηση",
-    "Message sent!" : "Μήνυμα εστάλη!",
-    "Error sending the reply." : "Σφάλμα κατά την αποστολή απάντησης.",
     "Error while deleting account." : "Σφάλμα κατά τη διαγραφή λογαριασμού.",
     "Choose a file to add as attachment" : "Επιλέξτε έναν φάκελο για να προσθέσετε σαν συνημμένο",
+    "Reply" : "Απάντηση",
+    "Send" : "Αποστολή",
+    "Sending …" : "Αποστολή...",
+    "Message sent!" : "Μήνυμα εστάλη!",
+    "you" : "εσείς",
+    "Send message to {email}" : "Αποστολή μηνύματος σε {email}",
     "Message could not be starred. Please try again." : "Το μήνυμα δεν ήταν εφικτό να επισημανθεί με αστέρι. Παρακαλώ προσπαθήστε ξανά.",
     "Error while deleting message." : "Σφάλμα κατά τη διαγραφή του μηνύματος",
     "Checking mail …" : "Έλεγχος ταχυδρομείου...",
     "Loading …" : "Φόρτωση ...",
     "Load more …" : "Φόρτωση περισσότερων...",
     "Check messages …" : "Έλεγχος μηνυμάτων ...",
-    "Send" : "Αποστολή",
     "Inbox" : "Εισερχόμενα",
     "Sent" : "Απεστάλη",
     "Drafts" : "Πρόχειρα",
@@ -52,16 +51,13 @@
     "bcc" : "bcc",
     "Subject" : "Θέμα",
     "Message …" : "Μήνυμα ...",
-    "Add attachment from Files" : "Προσθέστε συνημένο αρχείο απο τα έγραφα",
     "Open Mail App" : "Άνοιγμα εφαρμογής Mail",
     "Back to website" : "Πίσω στην ιστοσελίδα",
+    "Add attachment from Files" : "Προσθέστε συνημένο αρχείο απο τα έγραφα",
     "Error loading message" : "Μήνυμα σφάλματος φόρτωσης",
     "Download attachment" : "Κατεβάστε το συνημμένο",
     "Save to Files" : "Αποθήκευση στα Έγγραφα",
     "Save all to Files" : "Αποθήκευση όλων στα Έγγραφα",
-    "+ cc" : "+ cc",
-    "Reply …" : "Απάντηση ...",
-    "Forward" : "Προώθηση",
     "Delete" : "Διαγραφή",
     "Add mail account" : "Προσθήκη λογαριασμού αλληλογραφίας",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Θέλετε να κρυπτογραφήσετε τα emails σας; Εγκαταστήστε το <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!",
diff --git a/l10n/en_GB.js b/l10n/en_GB.js
index f4512d363..3611d8090 100644
--- a/l10n/en_GB.js
+++ b/l10n/en_GB.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Mail" : "Mail",
     "Error while loading the accounts." : "Error whilst loading the accounts.",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n new message in {folderName} \nfrom {from}","%n new messages in {folderName} \nfrom {from}"],
-    "you" : "you",
     "Error while loading the selected account." : "Error whilst loading the selected account.",
     "Error while loading messages." : "Error whilst loading messages.",
     "Choose a folder to store the attachment in" : "Choose a folder to store the attachment in",
@@ -19,19 +18,19 @@ OC.L10N.register(
     "Unknown error" : "Unknown error",
     "Error while creating an account: " : "Error whilst creating an account: ",
     "Connect" : "Connect",
-    "Sending …" : "Sending…",
-    "Reply" : "Reply",
-    "Message sent!" : "Message sent!",
-    "Error sending the reply." : "Error sending the reply.",
     "Error while deleting account." : "Error whilst deleting account.",
     "Choose a file to add as attachment" : "Choose a file to add as attachment",
+    "Reply" : "Reply",
+    "Send" : "Send",
+    "Sending …" : "Sending…",
+    "Message sent!" : "Message sent!",
+    "you" : "you",
     "Message could not be starred. Please try again." : "Message could not be starred. Please try again.",
     "Error while deleting message." : "Error whilst deleting message.",
     "Checking mail …" : "Checking mail…",
     "Loading …" : "Loading…",
     "Load more …" : "Load more…",
     "Check messages …" : "Check messages …",
-    "Send" : "Send",
     "Inbox" : "Inbox",
     "Sent" : "Sent",
     "Drafts" : "Drafts",
@@ -51,16 +50,13 @@ OC.L10N.register(
     "bcc" : "bcc",
     "Subject" : "Subject",
     "Message …" : "Message…",
-    "Add attachment from Files" : "Add attachment from Files",
     "Open Mail App" : "Open Mail App",
     "Back to website" : "Back to website",
+    "Add attachment from Files" : "Add attachment from Files",
     "Error loading message" : "Error loading message",
     "Download attachment" : "Download attachment",
     "Save to Files" : "Save to Files",
     "Save all to Files" : "Save all to Files",
-    "+ cc" : "+ cc",
-    "Reply …" : "Reply…",
-    "Forward" : "Forward",
     "Delete" : "Delete",
     "Add mail account" : "Add mail account",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!",
diff --git a/l10n/en_GB.json b/l10n/en_GB.json
index 32b8458f7..a3819be8d 100644
--- a/l10n/en_GB.json
+++ b/l10n/en_GB.json
@@ -2,7 +2,6 @@
     "Mail" : "Mail",
     "Error while loading the accounts." : "Error whilst loading the accounts.",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n new message in {folderName} \nfrom {from}","%n new messages in {folderName} \nfrom {from}"],
-    "you" : "you",
     "Error while loading the selected account." : "Error whilst loading the selected account.",
     "Error while loading messages." : "Error whilst loading messages.",
     "Choose a folder to store the attachment in" : "Choose a folder to store the attachment in",
@@ -17,19 +16,19 @@
     "Unknown error" : "Unknown error",
     "Error while creating an account: " : "Error whilst creating an account: ",
     "Connect" : "Connect",
-    "Sending …" : "Sending…",
-    "Reply" : "Reply",
-    "Message sent!" : "Message sent!",
-    "Error sending the reply." : "Error sending the reply.",
     "Error while deleting account." : "Error whilst deleting account.",
     "Choose a file to add as attachment" : "Choose a file to add as attachment",
+    "Reply" : "Reply",
+    "Send" : "Send",
+    "Sending …" : "Sending…",
+    "Message sent!" : "Message sent!",
+    "you" : "you",
     "Message could not be starred. Please try again." : "Message could not be starred. Please try again.",
     "Error while deleting message." : "Error whilst deleting message.",
     "Checking mail …" : "Checking mail…",
     "Loading …" : "Loading…",
     "Load more …" : "Load more…",
     "Check messages …" : "Check messages …",
-    "Send" : "Send",
     "Inbox" : "Inbox",
     "Sent" : "Sent",
     "Drafts" : "Drafts",
@@ -49,16 +48,13 @@
     "bcc" : "bcc",
     "Subject" : "Subject",
     "Message …" : "Message…",
-    "Add attachment from Files" : "Add attachment from Files",
     "Open Mail App" : "Open Mail App",
     "Back to website" : "Back to website",
+    "Add attachment from Files" : "Add attachment from Files",
     "Error loading message" : "Error loading message",
     "Download attachment" : "Download attachment",
     "Save to Files" : "Save to Files",
     "Save all to Files" : "Save all to Files",
-    "+ cc" : "+ cc",
-    "Reply …" : "Reply…",
-    "Forward" : "Forward",
     "Delete" : "Delete",
     "Add mail account" : "Add mail account",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!",
diff --git a/l10n/es.js b/l10n/es.js
index a02dedaac..7ae4682bf 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -5,8 +5,6 @@ OC.L10N.register(
     "Error while loading the accounts." : "Error al cargar las cuentas.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n mensaje nuevo en {folderName} \nde {from}","%n mensajes nuevos en {folderName} \nde {from}"],
-    "you" : "usted",
-    "Send message to {email}" : "Enviar mensaje a {email}",
     "Error while loading the selected account." : "Error al cargar la cuenta seleccionada.",
     "Error while loading messages." : "Error al cargar los mensajes.",
     "Choose a folder to store the attachment in" : "Escoja una carpeta para guardar el adjunto",
@@ -21,19 +19,20 @@ OC.L10N.register(
     "Unknown error" : "Error desconocido",
     "Error while creating an account: " : "Error al crear una cuenta:",
     "Connect" : "Conectar",
-    "Sending …" : "Enviando...",
-    "Reply" : "Responder",
-    "Message sent!" : "¡Mensaje enviado!",
-    "Error sending the reply." : "Error al enviar la respuesta.",
     "Error while deleting account." : "Error al eliminar la cuenta.",
     "Choose a file to add as attachment" : "Escoja un archivo para adjuntar",
+    "Reply" : "Responder",
+    "Send" : "Enviar",
+    "Sending …" : "Enviando...",
+    "Message sent!" : "¡Mensaje enviado!",
+    "you" : "usted",
+    "Send message to {email}" : "Enviar mensaje a {email}",
     "Message could not be starred. Please try again." : "El mensaje no se pudo marcar como favorito. Vuelva a intentarlo.",
     "Error while deleting message." : "Error al eliminar el mensaje.",
     "Checking mail …" : "Revisando correo electrónico...",
     "Loading …" : "Cargando...",
     "Load more …" : "Cargar más...",
     "Check messages …" : "Comprobar mensajes...",
-    "Send" : "Enviar",
     "Inbox" : "Recibidos",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -54,16 +53,13 @@ OC.L10N.register(
     "bcc" : "bcc",
     "Subject" : "Asunto",
     "Message …" : "Mensaje...",
-    "Add attachment from Files" : "Agregar adjunto desde Archivos",
     "Open Mail App" : "Abrir la aplicación de correo electrónico",
     "Back to website" : "Volver al sitio de internet",
+    "Add attachment from Files" : "Agregar adjunto desde Archivos",
     "Error loading message" : "Error al cargar el mensaje",
     "Download attachment" : "Descargar adjunto",
     "Save to Files" : "Guardar en Archivos",
     "Save all to Files" : "Guardar todo en Archivos",
-    "+ cc" : "+ cc",
-    "Reply …" : "Responder…",
-    "Forward" : "Reenviar",
     "Delete" : "Borrar",
     "Add mail account" : "Agregar cuenta de correo",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "¿Quieres cifrar tus correos electrónicos? ¡Instala la <a href=\"https://www.mailvelope.com/\" target=\"_blank\">extensión de navegador Mailvelope</a>!",
diff --git a/l10n/es.json b/l10n/es.json
index a9c8c2b93..796734796 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -3,8 +3,6 @@
     "Error while loading the accounts." : "Error al cargar las cuentas.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n mensaje nuevo en {folderName} \nde {from}","%n mensajes nuevos en {folderName} \nde {from}"],
-    "you" : "usted",
-    "Send message to {email}" : "Enviar mensaje a {email}",
     "Error while loading the selected account." : "Error al cargar la cuenta seleccionada.",
     "Error while loading messages." : "Error al cargar los mensajes.",
     "Choose a folder to store the attachment in" : "Escoja una carpeta para guardar el adjunto",
@@ -19,19 +17,20 @@
     "Unknown error" : "Error desconocido",
     "Error while creating an account: " : "Error al crear una cuenta:",
     "Connect" : "Conectar",
-    "Sending …" : "Enviando...",
-    "Reply" : "Responder",
-    "Message sent!" : "¡Mensaje enviado!",
-    "Error sending the reply." : "Error al enviar la respuesta.",
     "Error while deleting account." : "Error al eliminar la cuenta.",
     "Choose a file to add as attachment" : "Escoja un archivo para adjuntar",
+    "Reply" : "Responder",
+    "Send" : "Enviar",
+    "Sending …" : "Enviando...",
+    "Message sent!" : "¡Mensaje enviado!",
+    "you" : "usted",
+    "Send message to {email}" : "Enviar mensaje a {email}",
     "Message could not be starred. Please try again." : "El mensaje no se pudo marcar como favorito. Vuelva a intentarlo.",
     "Error while deleting message." : "Error al eliminar el mensaje.",
     "Checking mail …" : "Revisando correo electrónico...",
     "Loading …" : "Cargando...",
     "Load more …" : "Cargar más...",
     "Check messages …" : "Comprobar mensajes...",
-    "Send" : "Enviar",
     "Inbox" : "Recibidos",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -52,16 +51,13 @@
     "bcc" : "bcc",
     "Subject" : "Asunto",
     "Message …" : "Mensaje...",
-    "Add attachment from Files" : "Agregar adjunto desde Archivos",
     "Open Mail App" : "Abrir la aplicación de correo electrónico",
     "Back to website" : "Volver al sitio de internet",
+    "Add attachment from Files" : "Agregar adjunto desde Archivos",
     "Error loading message" : "Error al cargar el mensaje",
     "Download attachment" : "Descargar adjunto",
     "Save to Files" : "Guardar en Archivos",
     "Save all to Files" : "Guardar todo en Archivos",
-    "+ cc" : "+ cc",
-    "Reply …" : "Responder…",
-    "Forward" : "Reenviar",
     "Delete" : "Borrar",
     "Add mail account" : "Agregar cuenta de correo",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "¿Quieres cifrar tus correos electrónicos? ¡Instala la <a href=\"https://www.mailvelope.com/\" target=\"_blank\">extensión de navegador Mailvelope</a>!",
diff --git a/l10n/et_EE.js b/l10n/et_EE.js
index 7f4a5565d..0633a75e9 100644
--- a/l10n/et_EE.js
+++ b/l10n/et_EE.js
@@ -5,8 +5,6 @@ OC.L10N.register(
     "Error while loading the accounts." : "Viga kontode laadimisel",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n uus sõnum kaustas {folderName} \nsaatja: {from}","%n uut sõnumit kaustas {folderName} \nsaatja: {from}"],
-    "you" : "sina",
-    "Send message to {email}" : "Saada kiri aadressile {email}",
     "Error while loading the selected account." : "Viga valitud konto laadimisel.",
     "Error while loading messages." : "Tõrge sõnumite laadimisel.",
     "Choose a folder to store the attachment in" : "Vali kaust, kuhu manus salvestada",
@@ -21,19 +19,20 @@ OC.L10N.register(
     "Unknown error" : "Tundmatu viga",
     "Error while creating an account: " : "Tõrge konto loomisel:",
     "Connect" : "Ühenda",
-    "Sending …" : "Saadan ...",
-    "Reply" : "Vasta",
-    "Message sent!" : "Sõnum on saadetud!",
-    "Error sending the reply." : "Tõrge vastuse saatmisel.",
     "Error while deleting account." : "Tõrge konto kustutamisel.",
     "Choose a file to add as attachment" : "Vali fail, mida manustada",
+    "Reply" : "Vasta",
+    "Send" : "Saada",
+    "Sending …" : "Saadan ...",
+    "Message sent!" : "Sõnum on saadetud!",
+    "you" : "sina",
+    "Send message to {email}" : "Saada kiri aadressile {email}",
     "Message could not be starred. Please try again." : "Sõnumit ei õnnestunud tärniga märkida. Palun proovi uuesti.",
     "Error while deleting message." : "Tõrge sõnumi kustutamisel.",
     "Checking mail …" : "Uute kirjade kontrollimine ...",
     "Loading …" : "Laadimine ...",
     "Load more …" : "Laadi rohkem ...",
     "Check messages …" : "Kontrolli sõnumeid ...",
-    "Send" : "Saada",
     "Inbox" : "Saaabuvad",
     "Sent" : "Saadetud",
     "Drafts" : "Mustandid",
@@ -54,16 +53,13 @@ OC.L10N.register(
     "bcc" : "bcc",
     "Subject" : "Teema",
     "Message …" : "Sõnum ...",
-    "Add attachment from Files" : "Lisa manus failidest",
     "Open Mail App" : "Ava meilirakendus",
     "Back to website" : "Tagasi veebilehele",
+    "Add attachment from Files" : "Lisa manus failidest",
     "Error loading message" : "Tõrge kirja laadimisel",
     "Download attachment" : "Lae manus alla",
     "Save to Files" : "Salvesta failidesse",
     "Save all to Files" : "Salvesta kõik failidesse",
-    "+ cc" : "+ cc",
-    "Reply …" : "Vasta ...",
-    "Forward" : "Edasta",
     "Delete" : "Kustuta",
     "Add mail account" : "Lisa meilikonto",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Otsid oma krüpteeritud kirju? Paigalda <a href=\"https://www.mailvelope.com/\" target=\"_blank\">brauseri lisaprogramm Mailvelope</a>!",
diff --git a/l10n/et_EE.json b/l10n/et_EE.json
index b6a3470ba..3c95b9318 100644
--- a/l10n/et_EE.json
+++ b/l10n/et_EE.json
@@ -3,8 +3,6 @@
     "Error while loading the accounts." : "Viga kontode laadimisel",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n uus sõnum kaustas {folderName} \nsaatja: {from}","%n uut sõnumit kaustas {folderName} \nsaatja: {from}"],
-    "you" : "sina",
-    "Send message to {email}" : "Saada kiri aadressile {email}",
     "Error while loading the selected account." : "Viga valitud konto laadimisel.",
     "Error while loading messages." : "Tõrge sõnumite laadimisel.",
     "Choose a folder to store the attachment in" : "Vali kaust, kuhu manus salvestada",
@@ -19,19 +17,20 @@
     "Unknown error" : "Tundmatu viga",
     "Error while creating an account: " : "Tõrge konto loomisel:",
     "Connect" : "Ühenda",
-    "Sending …" : "Saadan ...",
-    "Reply" : "Vasta",
-    "Message sent!" : "Sõnum on saadetud!",
-    "Error sending the reply." : "Tõrge vastuse saatmisel.",
     "Error while deleting account." : "Tõrge konto kustutamisel.",
     "Choose a file to add as attachment" : "Vali fail, mida manustada",
+    "Reply" : "Vasta",
+    "Send" : "Saada",
+    "Sending …" : "Saadan ...",
+    "Message sent!" : "Sõnum on saadetud!",
+    "you" : "sina",
+    "Send message to {email}" : "Saada kiri aadressile {email}",
     "Message could not be starred. Please try again." : "Sõnumit ei õnnestunud tärniga märkida. Palun proovi uuesti.",
     "Error while deleting message." : "Tõrge sõnumi kustutamisel.",
     "Checking mail …" : "Uute kirjade kontrollimine ...",
     "Loading …" : "Laadimine ...",
     "Load more …" : "Laadi rohkem ...",
     "Check messages …" : "Kontrolli sõnumeid ...",
-    "Send" : "Saada",
     "Inbox" : "Saaabuvad",
     "Sent" : "Saadetud",
     "Drafts" : "Mustandid",
@@ -52,16 +51,13 @@
     "bcc" : "bcc",
     "Subject" : "Teema",
     "Message …" : "Sõnum ...",
-    "Add attachment from Files" : "Lisa manus failidest",
     "Open Mail App" : "Ava meilirakendus",
     "Back to website" : "Tagasi veebilehele",
+    "Add attachment from Files" : "Lisa manus failidest",
     "Error loading message" : "Tõrge kirja laadimisel",
     "Download attachment" : "Lae manus alla",
     "Save to Files" : "Salvesta failidesse",
     "Save all to Files" : "Salvesta kõik failidesse",
-    "+ cc" : "+ cc",
-    "Reply …" : "Vasta ...",
-    "Forward" : "Edasta",
     "Delete" : "Kustuta",
     "Add mail account" : "Lisa meilikonto",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Otsid oma krüpteeritud kirju? Paigalda <a href=\"https://www.mailvelope.com/\" target=\"_blank\">brauseri lisaprogramm Mailvelope</a>!",
diff --git a/l10n/eu.js b/l10n/eu.js
index dd3bf119d..75e7c75b0 100644
--- a/l10n/eu.js
+++ b/l10n/eu.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Mail" : "Posta",
     "Error while loading the accounts." : "Errorea kontuak kargatzean.",
-    "you" : "zu",
     "Error while loading the selected account." : "Errorea hautatutako kontua kargatzean.",
     "Error while loading messages." : "Errorea mezuak kargatzean.",
     "Choose a folder to store the attachment in" : "Hautatu karpeta bat eranskina gordetzeko",
@@ -16,16 +15,16 @@ OC.L10N.register(
     "Unknown error" : "Errore ezezaguna",
     "Error while creating an account: " : "Errorea kontu bat sortzean:",
     "Connect" : "Konektatu",
-    "Sending …" : "Bidaltzen...",
-    "Reply" : "Erantzun",
-    "Error sending the reply." : "Errorea erantzuna bidaltzean.",
     "Error while deleting account." : "Errorea kontua ezabatzean.",
     "Choose a file to add as attachment" : "Hautatu fitxategia gehitzeko eranskin gisa",
+    "Reply" : "Erantzun",
+    "Send" : "Bidali",
+    "Sending …" : "Bidaltzen...",
+    "you" : "zu",
     "Error while deleting message." : "Errorea mezua ezabatzean.",
     "Checking mail …" : "Postari dagoen begiratzen ...",
     "Loading …" : "Kargatzen ...",
     "Load more …" : "Kargatu gehiago...",
-    "Send" : "Bidali",
     "Inbox" : "Sarrera ontzia",
     "Sent" : "Bidalia",
     "Drafts" : "Zirriborroak",
@@ -44,16 +43,13 @@ OC.L10N.register(
     "bcc" : "bcc",
     "Subject" : "Gaia",
     "Message …" : "Mezua...",
-    "Add attachment from Files" : "Gehitu eranskina Fitxategiak-etik",
     "Open Mail App" : "Ireki Posta aplikazioa",
     "Back to website" : "Itzuli webgunera",
+    "Add attachment from Files" : "Gehitu eranskina Fitxategiak-etik",
     "Error loading message" : "Errorea mezua kargatzean",
     "Download attachment" : "Deskargatu eranskina",
     "Save to Files" : "Gorde Fitxategiak-en",
     "Save all to Files" : "Gorde dena Fitxategiak-en",
-    "+ cc" : "+ cc",
-    "Reply …" : "Erantzun...",
-    "Forward" : "Birbidali",
     "Delete" : "Ezabatu",
     "No messages in this folder!" : "Ez dago mezurik karpeta honetan!",
     "Connect your mail account" : "Zure posta kontua konektatu",
diff --git a/l10n/eu.json b/l10n/eu.json
index 7f99241b5..12e9dddd1 100644
--- a/l10n/eu.json
+++ b/l10n/eu.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Mail" : "Posta",
     "Error while loading the accounts." : "Errorea kontuak kargatzean.",
-    "you" : "zu",
     "Error while loading the selected account." : "Errorea hautatutako kontua kargatzean.",
     "Error while loading messages." : "Errorea mezuak kargatzean.",
     "Choose a folder to store the attachment in" : "Hautatu karpeta bat eranskina gordetzeko",
@@ -14,16 +13,16 @@
     "Unknown error" : "Errore ezezaguna",
     "Error while creating an account: " : "Errorea kontu bat sortzean:",
     "Connect" : "Konektatu",
-    "Sending …" : "Bidaltzen...",
-    "Reply" : "Erantzun",
-    "Error sending the reply." : "Errorea erantzuna bidaltzean.",
     "Error while deleting account." : "Errorea kontua ezabatzean.",
     "Choose a file to add as attachment" : "Hautatu fitxategia gehitzeko eranskin gisa",
+    "Reply" : "Erantzun",
+    "Send" : "Bidali",
+    "Sending …" : "Bidaltzen...",
+    "you" : "zu",
     "Error while deleting message." : "Errorea mezua ezabatzean.",
     "Checking mail …" : "Postari dagoen begiratzen ...",
     "Loading …" : "Kargatzen ...",
     "Load more …" : "Kargatu gehiago...",
-    "Send" : "Bidali",
     "Inbox" : "Sarrera ontzia",
     "Sent" : "Bidalia",
     "Drafts" : "Zirriborroak",
@@ -42,16 +41,13 @@
     "bcc" : "bcc",
     "Subject" : "Gaia",
     "Message …" : "Mezua...",
-    "Add attachment from Files" : "Gehitu eranskina Fitxategiak-etik",
     "Open Mail App" : "Ireki Posta aplikazioa",
     "Back to website" : "Itzuli webgunera",
+    "Add attachment from Files" : "Gehitu eranskina Fitxategiak-etik",
     "Error loading message" : "Errorea mezua kargatzean",
     "Download attachment" : "Deskargatu eranskina",
     "Save to Files" : "Gorde Fitxategiak-en",
     "Save all to Files" : "Gorde dena Fitxategiak-en",
-    "+ cc" : "+ cc",
-    "Reply …" : "Erantzun...",
-    "Forward" : "Birbidali",
     "Delete" : "Ezabatu",
     "No messages in this folder!" : "Ez dago mezurik karpeta honetan!",
     "Connect your mail account" : "Zure posta kontua konektatu",
diff --git a/l10n/fi_FI.js b/l10n/fi_FI.js
index 01a1b0dad..5e6d33a07 100644
--- a/l10n/fi_FI.js
+++ b/l10n/fi_FI.js
@@ -4,8 +4,6 @@ OC.L10N.register(
     "Mail" : "Sähköposti",
     "Error while loading the accounts." : "Virhe tilejä ladatessa.",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n uusi viesti kansiossa {folderName},\nlähettäjä {from}","%n uutta viestiä kansiossa {folderName},\nlähettäjä {from}"],
-    "you" : "sinä",
-    "Send message to {email}" : "Lähetä viesti osoitteeseen {email}",
     "Error while loading the selected account." : "Virhe ladatessa valittua tiliä.",
     "Error while loading messages." : "Virhe viestejä ladatessa.",
     "Choose a folder to store the attachment in" : "Valitse kansio liitetiedoston tallentamiselle",
@@ -20,19 +18,20 @@ OC.L10N.register(
     "Unknown error" : "Tuntematon virhe",
     "Error while creating an account: " : "Virhe tiliä luotaessa:",
     "Connect" : "Yhdistä",
-    "Sending …" : "Lähetetään…",
-    "Reply" : "Vastaa",
-    "Message sent!" : "Viesti lähetetty!",
-    "Error sending the reply." : "Virhe vastausta lähettäessä.",
     "Error while deleting account." : "Virhe tiliä poistaessa.",
     "Choose a file to add as attachment" : "Valitse liitteeksi lisättävä tiedosto",
+    "Reply" : "Vastaa",
+    "Send" : "Lähetä",
+    "Sending …" : "Lähetetään…",
+    "Message sent!" : "Viesti lähetetty!",
+    "you" : "sinä",
+    "Send message to {email}" : "Lähetä viesti osoitteeseen {email}",
     "Message could not be starred. Please try again." : "Tähden lisääminen viestille epäonnistui. Yritä uudelleen.",
     "Error while deleting message." : "Virhe viestiä poistaessa.",
     "Checking mail …" : "Tarkistetaan viestejä…",
     "Loading …" : "Ladataan…",
     "Load more …" : "Lataa lisää…",
     "Check messages …" : "Tarkista viestit…",
-    "Send" : "Lähetä",
     "Inbox" : "Saapuneet",
     "Sent" : "Lähetetty",
     "Drafts" : "Luonnokset",
@@ -50,15 +49,13 @@ OC.L10N.register(
     "to" : "- ",
     "Subject" : "Aihe",
     "Message …" : "Viesti…",
-    "Add attachment from Files" : "Lisää liite tiedostosovelluksesta",
     "Open Mail App" : "Avaa sähköpostisovellus",
     "Back to website" : "Takaisin verkkosivustolle",
+    "Add attachment from Files" : "Lisää liite tiedostosovelluksesta",
     "Error loading message" : "Virhe viestiä ladatessa",
     "Download attachment" : "Lataa liite",
     "Save to Files" : "Tallenna tiedostosovellukseen",
     "Save all to Files" : "Tallenna kaikki tiedostosovellukseen",
-    "Reply …" : "Vastaa…",
-    "Forward" : "Välitä",
     "Delete" : "Poista",
     "Add mail account" : "Lisää sähköpostitili",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Aiotko salata sähköpostisi? Asenna <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope-selainlaajennus</a>!",
diff --git a/l10n/fi_FI.json b/l10n/fi_FI.json
index ba6f9702f..93752f737 100644
--- a/l10n/fi_FI.json
+++ b/l10n/fi_FI.json
@@ -2,8 +2,6 @@
     "Mail" : "Sähköposti",
     "Error while loading the accounts." : "Virhe tilejä ladatessa.",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n uusi viesti kansiossa {folderName},\nlähettäjä {from}","%n uutta viestiä kansiossa {folderName},\nlähettäjä {from}"],
-    "you" : "sinä",
-    "Send message to {email}" : "Lähetä viesti osoitteeseen {email}",
     "Error while loading the selected account." : "Virhe ladatessa valittua tiliä.",
     "Error while loading messages." : "Virhe viestejä ladatessa.",
     "Choose a folder to store the attachment in" : "Valitse kansio liitetiedoston tallentamiselle",
@@ -18,19 +16,20 @@
     "Unknown error" : "Tuntematon virhe",
     "Error while creating an account: " : "Virhe tiliä luotaessa:",
     "Connect" : "Yhdistä",
-    "Sending …" : "Lähetetään…",
-    "Reply" : "Vastaa",
-    "Message sent!" : "Viesti lähetetty!",
-    "Error sending the reply." : "Virhe vastausta lähettäessä.",
     "Error while deleting account." : "Virhe tiliä poistaessa.",
     "Choose a file to add as attachment" : "Valitse liitteeksi lisättävä tiedosto",
+    "Reply" : "Vastaa",
+    "Send" : "Lähetä",
+    "Sending …" : "Lähetetään…",
+    "Message sent!" : "Viesti lähetetty!",
+    "you" : "sinä",
+    "Send message to {email}" : "Lähetä viesti osoitteeseen {email}",
     "Message could not be starred. Please try again." : "Tähden lisääminen viestille epäonnistui. Yritä uudelleen.",
     "Error while deleting message." : "Virhe viestiä poistaessa.",
     "Checking mail …" : "Tarkistetaan viestejä…",
     "Loading …" : "Ladataan…",
     "Load more …" : "Lataa lisää…",
     "Check messages …" : "Tarkista viestit…",
-    "Send" : "Lähetä",
     "Inbox" : "Saapuneet",
     "Sent" : "Lähetetty",
     "Drafts" : "Luonnokset",
@@ -48,15 +47,13 @@
     "to" : "- ",
     "Subject" : "Aihe",
     "Message …" : "Viesti…",
-    "Add attachment from Files" : "Lisää liite tiedostosovelluksesta",
     "Open Mail App" : "Avaa sähköpostisovellus",
     "Back to website" : "Takaisin verkkosivustolle",
+    "Add attachment from Files" : "Lisää liite tiedostosovelluksesta",
     "Error loading message" : "Virhe viestiä ladatessa",
     "Download attachment" : "Lataa liite",
     "Save to Files" : "Tallenna tiedostosovellukseen",
     "Save all to Files" : "Tallenna kaikki tiedostosovellukseen",
-    "Reply …" : "Vastaa…",
-    "Forward" : "Välitä",
     "Delete" : "Poista",
     "Add mail account" : "Lisää sähköpostitili",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Aiotko salata sähköpostisi? Asenna <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope-selainlaajennus</a>!",
diff --git a/l10n/fr.js b/l10n/fr.js
index b85d3d768..558b16f43 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -5,8 +5,6 @@ OC.L10N.register(
     "Error while loading the accounts." : "Erreur lors du chargement des comptes.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n nouveau message dans {folderName}\nde {from}","%n nouveaux messages dans {folderName}\nde {from}"],
-    "you" : "vous",
-    "Send message to {email}" : "Envoyer un mail à {email}",
     "Error while loading the selected account." : "Erreur lors du chargement du compte sélectionné.",
     "Error while loading messages." : "Erreur lors du chargement des messages.",
     "Choose a folder to store the attachment in" : "Choisissez le dossier dans lequel enregistrer la pièce jointe",
@@ -21,19 +19,20 @@ OC.L10N.register(
     "Unknown error" : "Erreur inconnue",
     "Error while creating an account: " : "Erreur lors de la création du compte :",
     "Connect" : "Connecter",
-    "Sending …" : "Envoi ...",
-    "Reply" : "Répondre",
-    "Message sent!" : "Message envoyé !",
-    "Error sending the reply." : "Erreur lors de l'envoi de la réponse.",
     "Error while deleting account." : "Erreur lors de la suppression du compte.",
     "Choose a file to add as attachment" : "Choisissez un fichier à joindre au message",
+    "Reply" : "Répondre",
+    "Send" : "Envoyer",
+    "Sending …" : "Envoi ...",
+    "Message sent!" : "Message envoyé !",
+    "you" : "vous",
+    "Send message to {email}" : "Envoyer un mail à {email}",
     "Message could not be starred. Please try again." : "Le message n'a pu être placé parmi les favoris. Veuillez essayer à nouveau.",
     "Error while deleting message." : "Erreur lors de la suppression du message.",
     "Checking mail …" : "Relève du courrier ...",
     "Loading …" : "Chargement ...",
     "Load more …" : "Charger plus ...",
     "Check messages …" : "Relever le courrier",
-    "Send" : "Envoyer",
     "Inbox" : "Boîte de réception",
     "Sent" : "Envoyés",
     "Drafts" : "Brouillons",
@@ -54,16 +53,13 @@ OC.L10N.register(
     "bcc" : "cci",
     "Subject" : "Sujet",
     "Message …" : "Message ...",
-    "Add attachment from Files" : "Ajouter une pièce jointe depuis les Fichiers",
     "Open Mail App" : "Ouvrir l'application Mail",
     "Back to website" : "Retour au site web",
+    "Add attachment from Files" : "Ajouter une pièce jointe depuis les Fichiers",
     "Error loading message" : "Erreur lors du chargement du message",
     "Download attachment" : "Télécharger la pièce jointe",
     "Save to Files" : "Enregistrer dans les Fichiers",
     "Save all to Files" : "Tout enregistrer dans les Fichiers",
-    "+ cc" : "+ cc",
-    "Reply …" : "Réponse ...",
-    "Forward" : "Transférer",
     "Delete" : "Supprimer",
     "Add mail account" : "Ajouter un compte email",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Désirez-vous chiffrer vos messages ? Installez <a href=\"https://www.mailvelope.com/\" target=\"_blank\">le module complémentaire Mailvelope</a> dans votre navigateur !",
diff --git a/l10n/fr.json b/l10n/fr.json
index fa235badc..7fc54b52a 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -3,8 +3,6 @@
     "Error while loading the accounts." : "Erreur lors du chargement des comptes.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n nouveau message dans {folderName}\nde {from}","%n nouveaux messages dans {folderName}\nde {from}"],
-    "you" : "vous",
-    "Send message to {email}" : "Envoyer un mail à {email}",
     "Error while loading the selected account." : "Erreur lors du chargement du compte sélectionné.",
     "Error while loading messages." : "Erreur lors du chargement des messages.",
     "Choose a folder to store the attachment in" : "Choisissez le dossier dans lequel enregistrer la pièce jointe",
@@ -19,19 +17,20 @@
     "Unknown error" : "Erreur inconnue",
     "Error while creating an account: " : "Erreur lors de la création du compte :",
     "Connect" : "Connecter",
-    "Sending …" : "Envoi ...",
-    "Reply" : "Répondre",
-    "Message sent!" : "Message envoyé !",
-    "Error sending the reply." : "Erreur lors de l'envoi de la réponse.",
     "Error while deleting account." : "Erreur lors de la suppression du compte.",
     "Choose a file to add as attachment" : "Choisissez un fichier à joindre au message",
+    "Reply" : "Répondre",
+    "Send" : "Envoyer",
+    "Sending …" : "Envoi ...",
+    "Message sent!" : "Message envoyé !",
+    "you" : "vous",
+    "Send message to {email}" : "Envoyer un mail à {email}",
     "Message could not be starred. Please try again." : "Le message n'a pu être placé parmi les favoris. Veuillez essayer à nouveau.",
     "Error while deleting message." : "Erreur lors de la suppression du message.",
     "Checking mail …" : "Relève du courrier ...",
     "Loading …" : "Chargement ...",
     "Load more …" : "Charger plus ...",
     "Check messages …" : "Relever le courrier",
-    "Send" : "Envoyer",
     "Inbox" : "Boîte de réception",
     "Sent" : "Envoyés",
     "Drafts" : "Brouillons",
@@ -52,16 +51,13 @@
     "bcc" : "cci",
     "Subject" : "Sujet",
     "Message …" : "Message ...",
-    "Add attachment from Files" : "Ajouter une pièce jointe depuis les Fichiers",
     "Open Mail App" : "Ouvrir l'application Mail",
     "Back to website" : "Retour au site web",
+    "Add attachment from Files" : "Ajouter une pièce jointe depuis les Fichiers",
     "Error loading message" : "Erreur lors du chargement du message",
     "Download attachment" : "Télécharger la pièce jointe",
     "Save to Files" : "Enregistrer dans les Fichiers",
     "Save all to Files" : "Tout enregistrer dans les Fichiers",
-    "+ cc" : "+ cc",
-    "Reply …" : "Réponse ...",
-    "Forward" : "Transférer",
     "Delete" : "Supprimer",
     "Add mail account" : "Ajouter un compte email",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Désirez-vous chiffrer vos messages ? Installez <a href=\"https://www.mailvelope.com/\" target=\"_blank\">le module complémentaire Mailvelope</a> dans votre navigateur !",
diff --git a/l10n/gl.js b/l10n/gl.js
index 8040a2878..0b42bd213 100644
--- a/l10n/gl.js
+++ b/l10n/gl.js
@@ -5,8 +5,6 @@ OC.L10N.register(
     "Error while loading the accounts." : "Produciuse un erro mentres cargaba as contas.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n mensaxe nova en {folderName} \nde {from}","%n mensaxes novas en {folderName} \nde {from}"],
-    "you" : "vostede",
-    "Send message to {email}" : "Enviar mensaxe a {email}",
     "Error while loading the selected account." : "Produciuse un erro ao cargar a conta seleccionada.",
     "Error while loading messages." : "Produciuse un erro mentres cargaba as mensaxes.",
     "Choose a folder to store the attachment in" : "Escolla un cartafol no que gardar o anexo de entrada",
@@ -21,19 +19,20 @@ OC.L10N.register(
     "Unknown error" : "Produciuse un erro descoñecido",
     "Error while creating an account: " : "produciuse un erro mentres creaba unha conta:",
     "Connect" : "Conectar",
-    "Sending …" : "Enviando ...",
-    "Reply" : "Responder",
-    "Message sent!" : "Mensaxe enviada!",
-    "Error sending the reply." : "Produciuse un erro ao enviar a resposta.",
     "Error while deleting account." : "Produciuse un erro ao eliminar a conta.",
     "Choose a file to add as attachment" : "Escolla un ficheiro para engadir como anexo",
+    "Reply" : "Responder",
+    "Send" : "Enviar",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "Mensaxe enviada!",
+    "you" : "vostede",
+    "Send message to {email}" : "Enviar mensaxe a {email}",
     "Message could not be starred. Please try again." : "A mensaxe non foi destacada. Ténteo de novo.",
     "Error while deleting message." : "Produciuse un erro ao eliminar a mensaxe.",
     "Checking mail …" : "Comprobando o correo ...",
     "Loading …" : "Cargando ...",
     "Load more …" : "Cargar máis ...",
     "Check messages …" : "Comprobar mensaxes ...",
-    "Send" : "Enviar",
     "Inbox" : "Bandexa de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -54,16 +53,13 @@ OC.L10N.register(
     "bcc" : "cco",
     "Subject" : "Asunto",
     "Message …" : "Mensaxe ...",
-    "Add attachment from Files" : "Engadir anexo(s) desde Ficheiros",
     "Open Mail App" : "Open Mail App",
     "Back to website" : "Volver ao sitio web",
+    "Add attachment from Files" : "Engadir anexo(s) desde Ficheiros",
     "Error loading message" : "Produciuse un erro ao cargar a mensaxe",
     "Download attachment" : "Descargar o anexo",
     "Save to Files" : "Gardar en Ficheiros",
     "Save all to Files" : "Gardar todo en Ficheiros",
-    "+ cc" : "+ cc",
-    "Reply …" : "Responder ...",
-    "Forward" : "Reenviar",
     "Delete" : "Eliminar",
     "Add mail account" : "Engadir unha conta de correo",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Vendo a posibilidade de cifrar os seus correos? Instale a <a href=\"https://www.mailvelope.com/\" target=\"_blank\">extensión do navegador Mailvelope</a>!",
diff --git a/l10n/gl.json b/l10n/gl.json
index 86deb79a1..f7c4d2a44 100644
--- a/l10n/gl.json
+++ b/l10n/gl.json
@@ -3,8 +3,6 @@
     "Error while loading the accounts." : "Produciuse un erro mentres cargaba as contas.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n mensaxe nova en {folderName} \nde {from}","%n mensaxes novas en {folderName} \nde {from}"],
-    "you" : "vostede",
-    "Send message to {email}" : "Enviar mensaxe a {email}",
     "Error while loading the selected account." : "Produciuse un erro ao cargar a conta seleccionada.",
     "Error while loading messages." : "Produciuse un erro mentres cargaba as mensaxes.",
     "Choose a folder to store the attachment in" : "Escolla un cartafol no que gardar o anexo de entrada",
@@ -19,19 +17,20 @@
     "Unknown error" : "Produciuse un erro descoñecido",
     "Error while creating an account: " : "produciuse un erro mentres creaba unha conta:",
     "Connect" : "Conectar",
-    "Sending …" : "Enviando ...",
-    "Reply" : "Responder",
-    "Message sent!" : "Mensaxe enviada!",
-    "Error sending the reply." : "Produciuse un erro ao enviar a resposta.",
     "Error while deleting account." : "Produciuse un erro ao eliminar a conta.",
     "Choose a file to add as attachment" : "Escolla un ficheiro para engadir como anexo",
+    "Reply" : "Responder",
+    "Send" : "Enviar",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "Mensaxe enviada!",
+    "you" : "vostede",
+    "Send message to {email}" : "Enviar mensaxe a {email}",
     "Message could not be starred. Please try again." : "A mensaxe non foi destacada. Ténteo de novo.",
     "Error while deleting message." : "Produciuse un erro ao eliminar a mensaxe.",
     "Checking mail …" : "Comprobando o correo ...",
     "Loading …" : "Cargando ...",
     "Load more …" : "Cargar máis ...",
     "Check messages …" : "Comprobar mensaxes ...",
-    "Send" : "Enviar",
     "Inbox" : "Bandexa de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -52,16 +51,13 @@
     "bcc" : "cco",
     "Subject" : "Asunto",
     "Message …" : "Mensaxe ...",
-    "Add attachment from Files" : "Engadir anexo(s) desde Ficheiros",
     "Open Mail App" : "Open Mail App",
     "Back to website" : "Volver ao sitio web",
+    "Add attachment from Files" : "Engadir anexo(s) desde Ficheiros",
     "Error loading message" : "Produciuse un erro ao cargar a mensaxe",
     "Download attachment" : "Descargar o anexo",
     "Save to Files" : "Gardar en Ficheiros",
     "Save all to Files" : "Gardar todo en Ficheiros",
-    "+ cc" : "+ cc",
-    "Reply …" : "Responder ...",
-    "Forward" : "Reenviar",
     "Delete" : "Eliminar",
     "Add mail account" : "Engadir unha conta de correo",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Vendo a posibilidade de cifrar os seus correos? Instale a <a href=\"https://www.mailvelope.com/\" target=\"_blank\">extensión do navegador Mailvelope</a>!",
diff --git a/l10n/id.js b/l10n/id.js
index fc05249bf..11f8d9b0a 100644
--- a/l10n/id.js
+++ b/l10n/id.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Mail" : "Email",
     "Error while loading the accounts." : "Terjadi kesalahan saat memuat akun.",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n pesan baru di {folderName} \ndari {from}"],
-    "you" : "Anda",
     "Error while loading the selected account." : "Terjadi kesalahan saat memuat akun terpilih.",
     "Error while loading messages." : "Terjadi kesalahan saat memuat pesan.",
     "Choose a folder to store the attachment in" : "Pilih folder untuk menyimpan lampiran didalamnya",
@@ -19,19 +18,19 @@ OC.L10N.register(
     "Unknown error" : "Kesalahan tidak diketahui",
     "Error while creating an account: " : "Terjadi kesalahan saat memuat sebuah akun:",
     "Connect" : "Sambungkan",
-    "Sending …" : "Mengirim ...",
-    "Reply" : "Balas",
-    "Message sent!" : "Kirim pesan!",
-    "Error sending the reply." : "Terjadi kesalahan mengirim balasan.",
     "Error while deleting account." : "Terjadi kesalahan saat menghapus akun.",
     "Choose a file to add as attachment" : "Pilih berkas untuk ditambahkan sebagai lampiran",
+    "Reply" : "Balas",
+    "Send" : "Kirim",
+    "Sending …" : "Mengirim ...",
+    "Message sent!" : "Kirim pesan!",
+    "you" : "Anda",
     "Message could not be starred. Please try again." : "Pesan tidak dapat dibintangi. Silakan coba lagi.",
     "Error while deleting message." : "Terjadi kesalahan saat menghapus pesan.",
     "Checking mail …" : "Memeriksa email ...",
     "Loading …" : "Memuat ...",
     "Load more …" : "Muat lebih banyak ...",
     "Check messages …" : "Periksa pesan ...",
-    "Send" : "Kirim",
     "Inbox" : "Kotak masuk",
     "Sent" : "Kirim",
     "Drafts" : "Konsep",
@@ -51,16 +50,13 @@ OC.L10N.register(
     "bcc" : "bcc",
     "Subject" : "Judul",
     "Message …" : "Pesan ...",
-    "Add attachment from Files" : "Tambahkan lampiran dari Berkas",
     "Open Mail App" : "Buka Apl Email",
     "Back to website" : "Kembali ke situs web",
+    "Add attachment from Files" : "Tambahkan lampiran dari Berkas",
     "Error loading message" : "Terjadi kesalahan saat memuat pesan",
     "Download attachment" : "Unduh lampiran",
     "Save to Files" : "Simpan ke Berkas",
     "Save all to Files" : "Simpan semua ke Berkas",
-    "+ cc" : "+ cc",
-    "Reply …" : "Balas …",
-    "Forward" : "Teruskan",
     "Delete" : "Hapus",
     "Add mail account" : "Tambah akun email",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Ingin mengenkripsi email Anda? Instal <a href=\"https://www.mailvelope.com/\" target=\"_blank\">ekstensi peramban Mailvelope</a>!",
diff --git a/l10n/id.json b/l10n/id.json
index 5efa5e954..33e25a7f7 100644
--- a/l10n/id.json
+++ b/l10n/id.json
@@ -2,7 +2,6 @@
     "Mail" : "Email",
     "Error while loading the accounts." : "Terjadi kesalahan saat memuat akun.",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n pesan baru di {folderName} \ndari {from}"],
-    "you" : "Anda",
     "Error while loading the selected account." : "Terjadi kesalahan saat memuat akun terpilih.",
     "Error while loading messages." : "Terjadi kesalahan saat memuat pesan.",
     "Choose a folder to store the attachment in" : "Pilih folder untuk menyimpan lampiran didalamnya",
@@ -17,19 +16,19 @@
     "Unknown error" : "Kesalahan tidak diketahui",
     "Error while creating an account: " : "Terjadi kesalahan saat memuat sebuah akun:",
     "Connect" : "Sambungkan",
-    "Sending …" : "Mengirim ...",
-    "Reply" : "Balas",
-    "Message sent!" : "Kirim pesan!",
-    "Error sending the reply." : "Terjadi kesalahan mengirim balasan.",
     "Error while deleting account." : "Terjadi kesalahan saat menghapus akun.",
     "Choose a file to add as attachment" : "Pilih berkas untuk ditambahkan sebagai lampiran",
+    "Reply" : "Balas",
+    "Send" : "Kirim",
+    "Sending …" : "Mengirim ...",
+    "Message sent!" : "Kirim pesan!",
+    "you" : "Anda",
     "Message could not be starred. Please try again." : "Pesan tidak dapat dibintangi. Silakan coba lagi.",
     "Error while deleting message." : "Terjadi kesalahan saat menghapus pesan.",
     "Checking mail …" : "Memeriksa email ...",
     "Loading …" : "Memuat ...",
     "Load more …" : "Muat lebih banyak ...",
     "Check messages …" : "Periksa pesan ...",
-    "Send" : "Kirim",
     "Inbox" : "Kotak masuk",
     "Sent" : "Kirim",
     "Drafts" : "Konsep",
@@ -49,16 +48,13 @@
     "bcc" : "bcc",
     "Subject" : "Judul",
     "Message …" : "Pesan ...",
-    "Add attachment from Files" : "Tambahkan lampiran dari Berkas",
     "Open Mail App" : "Buka Apl Email",
     "Back to website" : "Kembali ke situs web",
+    "Add attachment from Files" : "Tambahkan lampiran dari Berkas",
     "Error loading message" : "Terjadi kesalahan saat memuat pesan",
     "Download attachment" : "Unduh lampiran",
     "Save to Files" : "Simpan ke Berkas",
     "Save all to Files" : "Simpan semua ke Berkas",
-    "+ cc" : "+ cc",
-    "Reply …" : "Balas …",
-    "Forward" : "Teruskan",
     "Delete" : "Hapus",
     "Add mail account" : "Tambah akun email",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Ingin mengenkripsi email Anda? Instal <a href=\"https://www.mailvelope.com/\" target=\"_blank\">ekstensi peramban Mailvelope</a>!",
diff --git a/l10n/it.js b/l10n/it.js
index f09501a3d..bd4b7717a 100644
--- a/l10n/it.js
+++ b/l10n/it.js
@@ -5,8 +5,6 @@ OC.L10N.register(
     "Error while loading the accounts." : "Errore durante il caricamento degli account.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n nuovo messaggio in {folderName} \nda {from}","%n nuovi messaggi in {folderName} \nda {from}"],
-    "you" : "tu",
-    "Send message to {email}" : "Invia messaggio a {email}",
     "Error while loading the selected account." : "Errore durante il caricamento dell'account selezionato.",
     "Error while loading messages." : "Errore durante il caricamento dei messaggi.",
     "Choose a folder to store the attachment in" : "Scegli una cartella dove salvare l'allegato",
@@ -21,19 +19,20 @@ OC.L10N.register(
     "Unknown error" : "Errore sconosciuto",
     "Error while creating an account: " : "Errore durante la creazione di un account:",
     "Connect" : "Connetti",
-    "Sending …" : "Invio in corso...",
-    "Reply" : "Rispondi",
-    "Message sent!" : "Messaggio inviato!",
-    "Error sending the reply." : "Errore durante l'invio della risposta.",
     "Error while deleting account." : "Errore durante l'eliminazione dell'account.",
     "Choose a file to add as attachment" : "Scegli un file da aggiungere come allegato",
+    "Reply" : "Rispondi",
+    "Send" : "Invia",
+    "Sending …" : "Invio in corso...",
+    "Message sent!" : "Messaggio inviato!",
+    "you" : "tu",
+    "Send message to {email}" : "Invia messaggio a {email}",
     "Message could not be starred. Please try again." : "Il messaggio non può essere aggiunto ai preferiti. Prova ancora.",
     "Error while deleting message." : "Errore durante l'eliminazione del messaggio.",
     "Checking mail …" : "Controllo della posta in corso...",
     "Loading …" : "Caricamento in corso...",
     "Load more …" : "Carica altro...",
     "Check messages …" : "Controlla i messaggi...",
-    "Send" : "Invia",
     "Inbox" : "Posta in arrivo",
     "Sent" : "Posta inviata",
     "Drafts" : "Bozze",
@@ -54,16 +53,13 @@ OC.L10N.register(
     "bcc" : "ccn",
     "Subject" : "Oggetto",
     "Message …" : "Messaggio…",
-    "Add attachment from Files" : "Aggiungi allegato da File",
     "Open Mail App" : "Apri applicazione Posta",
     "Back to website" : "Ritorna al sito web",
+    "Add attachment from Files" : "Aggiungi allegato da File",
     "Error loading message" : "Errore durante il caricamento del messaggio",
     "Download attachment" : "Scarica allegato",
     "Save to Files" : "Salva in File",
     "Save all to Files" : "Salva tutto in File",
-    "+ cc" : "+ cc",
-    "Reply …" : "Rispondi...",
-    "Forward" : "Inoltra",
     "Delete" : "Elimina",
     "Add mail account" : "Aggiungi account di posta",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Intendi cifrare i tuoi messaggi di posta? Installa l'<a href=\"https://www.mailvelope.com/\" target=\"_blank\">estensione del browser Mailvelope</a>!",
diff --git a/l10n/it.json b/l10n/it.json
index 557542574..a34305479 100644
--- a/l10n/it.json
+++ b/l10n/it.json
@@ -3,8 +3,6 @@
     "Error while loading the accounts." : "Errore durante il caricamento degli account.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n nuovo messaggio in {folderName} \nda {from}","%n nuovi messaggi in {folderName} \nda {from}"],
-    "you" : "tu",
-    "Send message to {email}" : "Invia messaggio a {email}",
     "Error while loading the selected account." : "Errore durante il caricamento dell'account selezionato.",
     "Error while loading messages." : "Errore durante il caricamento dei messaggi.",
     "Choose a folder to store the attachment in" : "Scegli una cartella dove salvare l'allegato",
@@ -19,19 +17,20 @@
     "Unknown error" : "Errore sconosciuto",
     "Error while creating an account: " : "Errore durante la creazione di un account:",
     "Connect" : "Connetti",
-    "Sending …" : "Invio in corso...",
-    "Reply" : "Rispondi",
-    "Message sent!" : "Messaggio inviato!",
-    "Error sending the reply." : "Errore durante l'invio della risposta.",
     "Error while deleting account." : "Errore durante l'eliminazione dell'account.",
     "Choose a file to add as attachment" : "Scegli un file da aggiungere come allegato",
+    "Reply" : "Rispondi",
+    "Send" : "Invia",
+    "Sending …" : "Invio in corso...",
+    "Message sent!" : "Messaggio inviato!",
+    "you" : "tu",
+    "Send message to {email}" : "Invia messaggio a {email}",
     "Message could not be starred. Please try again." : "Il messaggio non può essere aggiunto ai preferiti. Prova ancora.",
     "Error while deleting message." : "Errore durante l'eliminazione del messaggio.",
     "Checking mail …" : "Controllo della posta in corso...",
     "Loading …" : "Caricamento in corso...",
     "Load more …" : "Carica altro...",
     "Check messages …" : "Controlla i messaggi...",
-    "Send" : "Invia",
     "Inbox" : "Posta in arrivo",
     "Sent" : "Posta inviata",
     "Drafts" : "Bozze",
@@ -52,16 +51,13 @@
     "bcc" : "ccn",
     "Subject" : "Oggetto",
     "Message …" : "Messaggio…",
-    "Add attachment from Files" : "Aggiungi allegato da File",
     "Open Mail App" : "Apri applicazione Posta",
     "Back to website" : "Ritorna al sito web",
+    "Add attachment from Files" : "Aggiungi allegato da File",
     "Error loading message" : "Errore durante il caricamento del messaggio",
     "Download attachment" : "Scarica allegato",
     "Save to Files" : "Salva in File",
     "Save all to Files" : "Salva tutto in File",
-    "+ cc" : "+ cc",
-    "Reply …" : "Rispondi...",
-    "Forward" : "Inoltra",
     "Delete" : "Elimina",
     "Add mail account" : "Aggiungi account di posta",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Intendi cifrare i tuoi messaggi di posta? Installa l'<a href=\"https://www.mailvelope.com/\" target=\"_blank\">estensione del browser Mailvelope</a>!",
diff --git a/l10n/ja.js b/l10n/ja.js
index 9665db81f..d8455d39b 100644
--- a/l10n/ja.js
+++ b/l10n/ja.js
@@ -3,8 +3,6 @@ OC.L10N.register(
     {
     "Mail" : "メール",
     "Error while loading the accounts." : "アカウントの読み込みエラー",
-    "you" : "あなた",
-    "Send message to {email}" : "{email} にメッセージを送信",
     "Error while loading the selected account." : "選択されたアカウントの読み込みエラー",
     "Error while loading messages." : "メールメッセージの読み込みエラー",
     "Choose a folder to store the attachment in" : "添付ファイルを保存するフォルダーを選択",
@@ -18,19 +16,20 @@ OC.L10N.register(
     "Unknown error" : "不明なエラー",
     "Error while creating an account: " : "アカウント作成エラー:",
     "Connect" : "接続",
-    "Sending …" : "送信中 …",
-    "Reply" : "返信",
-    "Message sent!" : "へメッセージを送信しました！",
-    "Error sending the reply." : "返信の送信エラー",
     "Error while deleting account." : "アカウント削除エラー",
     "Choose a file to add as attachment" : "添付として追加するファイルを選択",
+    "Reply" : "返信",
+    "Send" : "送信",
+    "Sending …" : "送信中 …",
+    "Message sent!" : "へメッセージを送信しました！",
+    "you" : "あなた",
+    "Send message to {email}" : "{email} にメッセージを送信",
     "Message could not be starred. Please try again." : "メッセージにスターをつけられませんでした。再試行してください。",
     "Error while deleting message." : "メッセージ削除中にエラーが発生",
     "Checking mail …" : "メール確認中...",
     "Loading …" : "読込中...",
     "Load more …" : "読込中 …",
     "Check messages …" : "メッセージをチェック…",
-    "Send" : "送信",
     "Inbox" : "受信箱",
     "Sent" : "送信",
     "Drafts" : "草稿",
@@ -49,16 +48,13 @@ OC.L10N.register(
     "bcc" : "bcc",
     "Subject" : "件名",
     "Message …" : "メッセージ …",
-    "Add attachment from Files" : "添付ファイルを追加",
     "Open Mail App" : "メールアプリを起動",
     "Back to website" : "ウェブサイトへ戻る",
+    "Add attachment from Files" : "添付ファイルを追加",
     "Error loading message" : "メッセージ読み込みエラー",
     "Download attachment" : "添付ファイルをダウンロード",
     "Save to Files" : "ファイルに保存",
     "Save all to Files" : "すべてファイルに保存",
-    "+ cc" : "+ cc",
-    "Reply …" : "返信 …",
-    "Forward" : "転送",
     "Delete" : "削除",
     "Add mail account" : "メールアカウントの追加",
     "No messages in this folder!" : "このフォルダーにメッセージはありません。",
diff --git a/l10n/ja.json b/l10n/ja.json
index 03999369c..06d139a4f 100644
--- a/l10n/ja.json
+++ b/l10n/ja.json
@@ -1,8 +1,6 @@
 { "translations": {
     "Mail" : "メール",
     "Error while loading the accounts." : "アカウントの読み込みエラー",
-    "you" : "あなた",
-    "Send message to {email}" : "{email} にメッセージを送信",
     "Error while loading the selected account." : "選択されたアカウントの読み込みエラー",
     "Error while loading messages." : "メールメッセージの読み込みエラー",
     "Choose a folder to store the attachment in" : "添付ファイルを保存するフォルダーを選択",
@@ -16,19 +14,20 @@
     "Unknown error" : "不明なエラー",
     "Error while creating an account: " : "アカウント作成エラー:",
     "Connect" : "接続",
-    "Sending …" : "送信中 …",
-    "Reply" : "返信",
-    "Message sent!" : "へメッセージを送信しました！",
-    "Error sending the reply." : "返信の送信エラー",
     "Error while deleting account." : "アカウント削除エラー",
     "Choose a file to add as attachment" : "添付として追加するファイルを選択",
+    "Reply" : "返信",
+    "Send" : "送信",
+    "Sending …" : "送信中 …",
+    "Message sent!" : "へメッセージを送信しました！",
+    "you" : "あなた",
+    "Send message to {email}" : "{email} にメッセージを送信",
     "Message could not be starred. Please try again." : "メッセージにスターをつけられませんでした。再試行してください。",
     "Error while deleting message." : "メッセージ削除中にエラーが発生",
     "Checking mail …" : "メール確認中...",
     "Loading …" : "読込中...",
     "Load more …" : "読込中 …",
     "Check messages …" : "メッセージをチェック…",
-    "Send" : "送信",
     "Inbox" : "受信箱",
     "Sent" : "送信",
     "Drafts" : "草稿",
@@ -47,16 +46,13 @@
     "bcc" : "bcc",
     "Subject" : "件名",
     "Message …" : "メッセージ …",
-    "Add attachment from Files" : "添付ファイルを追加",
     "Open Mail App" : "メールアプリを起動",
     "Back to website" : "ウェブサイトへ戻る",
+    "Add attachment from Files" : "添付ファイルを追加",
     "Error loading message" : "メッセージ読み込みエラー",
     "Download attachment" : "添付ファイルをダウンロード",
     "Save to Files" : "ファイルに保存",
     "Save all to Files" : "すべてファイルに保存",
-    "+ cc" : "+ cc",
-    "Reply …" : "返信 …",
-    "Forward" : "転送",
     "Delete" : "削除",
     "Add mail account" : "メールアカウントの追加",
     "No messages in this folder!" : "このフォルダーにメッセージはありません。",
diff --git a/l10n/ko.js b/l10n/ko.js
index 19ec3d3dd..89e275a27 100644
--- a/l10n/ko.js
+++ b/l10n/ko.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Mail" : "메일",
     "Error while loading the accounts." : "계정을 불러오는 중 오류가 발생하였습니다.",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["{folderName}에 {from} 님이 보낸 \n새 메시지 %n개"],
-    "you" : "나",
     "Error while loading the selected account." : "선택한 계정을 불러오는 중 오류가 발생하였습니다.",
     "Error while loading messages." : "메시지를 불러오는 중 오류가 발생하였습니다.",
     "Choose a folder to store the attachment in" : "첨부 항목을 저장할 폴더 선택",
@@ -19,19 +18,19 @@ OC.L10N.register(
     "Unknown error" : "알 수 없는 오류",
     "Error while creating an account: " : "계정을 만드는 중 오류 발생: ",
     "Connect" : "연결",
-    "Sending …" : "보내는 중...",
-    "Reply" : "답장",
-    "Message sent!" : "메시지를 보냈습니다!",
-    "Error sending the reply." : "답장을 보내는 중 오류가 발생하였습니다.",
     "Error while deleting account." : "계정을 삭제하는 중 오류가 발생하였습니다.",
     "Choose a file to add as attachment" : "첨부할 파일을 선택하십시오",
+    "Reply" : "답장",
+    "Send" : "보내기",
+    "Sending …" : "보내는 중...",
+    "Message sent!" : "메시지를 보냈습니다!",
+    "you" : "나",
     "Message could not be starred. Please try again." : "메시지에 별표를 붙일 수 없습니다. 다시 시도해 주십시오.",
     "Error while deleting message." : "메시지를 삭제하는 중 오류가 발생하였습니다.",
     "Checking mail …" : "메일 확인 중...",
     "Loading …" : "불러오는 중...",
     "Load more …" : "더 가져오기...",
     "Check messages …" : "메시지 확인 중...",
-    "Send" : "보내기",
     "Inbox" : "받은 편지함",
     "Sent" : "보낸 편지함",
     "Drafts" : "임시 보관함",
@@ -51,16 +50,13 @@ OC.L10N.register(
     "bcc" : "숨은 참조",
     "Subject" : "제목",
     "Message …" : "메시지 ...",
-    "Add attachment from Files" : "업로드된 파일 첨부",
     "Open Mail App" : "메일 앱 열기",
     "Back to website" : "웹 사이트로 돌아가기",
+    "Add attachment from Files" : "업로드된 파일 첨부",
     "Error loading message" : "메시지 불러오기 오류",
     "Download attachment" : "첨부 파일 다운로드",
     "Save to Files" : "클라우드에 저장",
     "Save all to Files" : "모든 항목을 클라우드에 저장",
-    "+ cc" : "+ 참조",
-    "Reply …" : "답장...",
-    "Forward" : "전달",
     "Delete" : "삭제",
     "Add mail account" : "메일 계정 추가",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "메일을 암호화하고 싶으신가요? <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope 브라우저 확장</a>을 설치하십시오!",
diff --git a/l10n/ko.json b/l10n/ko.json
index a991c2b7b..cbed6b145 100644
--- a/l10n/ko.json
+++ b/l10n/ko.json
@@ -2,7 +2,6 @@
     "Mail" : "메일",
     "Error while loading the accounts." : "계정을 불러오는 중 오류가 발생하였습니다.",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["{folderName}에 {from} 님이 보낸 \n새 메시지 %n개"],
-    "you" : "나",
     "Error while loading the selected account." : "선택한 계정을 불러오는 중 오류가 발생하였습니다.",
     "Error while loading messages." : "메시지를 불러오는 중 오류가 발생하였습니다.",
     "Choose a folder to store the attachment in" : "첨부 항목을 저장할 폴더 선택",
@@ -17,19 +16,19 @@
     "Unknown error" : "알 수 없는 오류",
     "Error while creating an account: " : "계정을 만드는 중 오류 발생: ",
     "Connect" : "연결",
-    "Sending …" : "보내는 중...",
-    "Reply" : "답장",
-    "Message sent!" : "메시지를 보냈습니다!",
-    "Error sending the reply." : "답장을 보내는 중 오류가 발생하였습니다.",
     "Error while deleting account." : "계정을 삭제하는 중 오류가 발생하였습니다.",
     "Choose a file to add as attachment" : "첨부할 파일을 선택하십시오",
+    "Reply" : "답장",
+    "Send" : "보내기",
+    "Sending …" : "보내는 중...",
+    "Message sent!" : "메시지를 보냈습니다!",
+    "you" : "나",
     "Message could not be starred. Please try again." : "메시지에 별표를 붙일 수 없습니다. 다시 시도해 주십시오.",
     "Error while deleting message." : "메시지를 삭제하는 중 오류가 발생하였습니다.",
     "Checking mail …" : "메일 확인 중...",
     "Loading …" : "불러오는 중...",
     "Load more …" : "더 가져오기...",
     "Check messages …" : "메시지 확인 중...",
-    "Send" : "보내기",
     "Inbox" : "받은 편지함",
     "Sent" : "보낸 편지함",
     "Drafts" : "임시 보관함",
@@ -49,16 +48,13 @@
     "bcc" : "숨은 참조",
     "Subject" : "제목",
     "Message …" : "메시지 ...",
-    "Add attachment from Files" : "업로드된 파일 첨부",
     "Open Mail App" : "메일 앱 열기",
     "Back to website" : "웹 사이트로 돌아가기",
+    "Add attachment from Files" : "업로드된 파일 첨부",
     "Error loading message" : "메시지 불러오기 오류",
     "Download attachment" : "첨부 파일 다운로드",
     "Save to Files" : "클라우드에 저장",
     "Save all to Files" : "모든 항목을 클라우드에 저장",
-    "+ cc" : "+ 참조",
-    "Reply …" : "답장...",
-    "Forward" : "전달",
     "Delete" : "삭제",
     "Add mail account" : "메일 계정 추가",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "메일을 암호화하고 싶으신가요? <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope 브라우저 확장</a>을 설치하십시오!",
diff --git a/l10n/nb_NO.js b/l10n/nb_NO.js
index 4506cb28c..4d30c547d 100644
--- a/l10n/nb_NO.js
+++ b/l10n/nb_NO.js
@@ -5,8 +5,6 @@ OC.L10N.register(
     "Error while loading the accounts." : "Feil ved innlasting av kontoene.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n ny melding i {folderName} \nfra {from}","%n nye meldinger i {folderName} \nfra {from}"],
-    "you" : "du",
-    "Send message to {email}" : "Send melding til {email}",
     "Error while loading the selected account." : "Feil ved lasting av den valgte kontoen.",
     "Error while loading messages." : "Feil ved innlasting av meldinger.",
     "Choose a folder to store the attachment in" : "Velg en mappe å lagre vedlegget i",
@@ -21,19 +19,20 @@ OC.L10N.register(
     "Unknown error" : "Ukjent feil",
     "Error while creating an account: " : "Feil ved oppretting av en konto:",
     "Connect" : "Koble til",
-    "Sending …" : "Sender ...",
-    "Reply" : "Svar",
-    "Message sent!" : "Melding sendt!",
-    "Error sending the reply." : "Feil ved sending av svaret.",
     "Error while deleting account." : "Feil ved sletting av konto.",
     "Choose a file to add as attachment" : "Velg en fil å legge til som vedlegg",
+    "Reply" : "Svar",
+    "Send" : "Send",
+    "Sending …" : "Sender ...",
+    "Message sent!" : "Melding sendt!",
+    "you" : "du",
+    "Send message to {email}" : "Send melding til {email}",
     "Message could not be starred. Please try again." : "Klarte ikke å merke melding. Prøv igjen.",
     "Error while deleting message." : "Feil ved sletting av melding.",
     "Checking mail …" : "Sjekker e-post …",
     "Loading …" : "Laster...",
     "Load more …" : "Last mer ...",
     "Check messages …" : "Sjekk meldinger ...",
-    "Send" : "Send",
     "Inbox" : "Innboks",
     "Sent" : "Sendt",
     "Drafts" : "Kladd",
@@ -54,16 +53,13 @@ OC.L10N.register(
     "bcc" : "bcc",
     "Subject" : "Emne",
     "Message …" : "Melding ...",
-    "Add attachment from Files" : "Legg til vedlegg fra Filer",
     "Open Mail App" : "Åpne epost-ap",
     "Back to website" : "Tilbake til webside",
+    "Add attachment from Files" : "Legg til vedlegg fra Filer",
     "Error loading message" : "Feil ved innlasting av melding",
     "Download attachment" : "Last ned vedlegg",
     "Save to Files" : "Lagre i Filer",
     "Save all to Files" : "Lagre alle til Filer",
-    "+ cc" : "+ cc",
-    "Reply …" : "Svar ...",
-    "Forward" : "Videresend",
     "Delete" : "Slett",
     "Add mail account" : "Legg til epost-konto",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Ønsker du å kryptere e-postene dine? Installer <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope nettleser-utvidelse</a>!",
diff --git a/l10n/nb_NO.json b/l10n/nb_NO.json
index c6eaf46fc..a23d9d5fa 100644
--- a/l10n/nb_NO.json
+++ b/l10n/nb_NO.json
@@ -3,8 +3,6 @@
     "Error while loading the accounts." : "Feil ved innlasting av kontoene.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n ny melding i {folderName} \nfra {from}","%n nye meldinger i {folderName} \nfra {from}"],
-    "you" : "du",
-    "Send message to {email}" : "Send melding til {email}",
     "Error while loading the selected account." : "Feil ved lasting av den valgte kontoen.",
     "Error while loading messages." : "Feil ved innlasting av meldinger.",
     "Choose a folder to store the attachment in" : "Velg en mappe å lagre vedlegget i",
@@ -19,19 +17,20 @@
     "Unknown error" : "Ukjent feil",
     "Error while creating an account: " : "Feil ved oppretting av en konto:",
     "Connect" : "Koble til",
-    "Sending …" : "Sender ...",
-    "Reply" : "Svar",
-    "Message sent!" : "Melding sendt!",
-    "Error sending the reply." : "Feil ved sending av svaret.",
     "Error while deleting account." : "Feil ved sletting av konto.",
     "Choose a file to add as attachment" : "Velg en fil å legge til som vedlegg",
+    "Reply" : "Svar",
+    "Send" : "Send",
+    "Sending …" : "Sender ...",
+    "Message sent!" : "Melding sendt!",
+    "you" : "du",
+    "Send message to {email}" : "Send melding til {email}",
     "Message could not be starred. Please try again." : "Klarte ikke å merke melding. Prøv igjen.",
     "Error while deleting message." : "Feil ved sletting av melding.",
     "Checking mail …" : "Sjekker e-post …",
     "Loading …" : "Laster...",
     "Load more …" : "Last mer ...",
     "Check messages …" : "Sjekk meldinger ...",
-    "Send" : "Send",
     "Inbox" : "Innboks",
     "Sent" : "Sendt",
     "Drafts" : "Kladd",
@@ -52,16 +51,13 @@
     "bcc" : "bcc",
     "Subject" : "Emne",
     "Message …" : "Melding ...",
-    "Add attachment from Files" : "Legg til vedlegg fra Filer",
     "Open Mail App" : "Åpne epost-ap",
     "Back to website" : "Tilbake til webside",
+    "Add attachment from Files" : "Legg til vedlegg fra Filer",
     "Error loading message" : "Feil ved innlasting av melding",
     "Download attachment" : "Last ned vedlegg",
     "Save to Files" : "Lagre i Filer",
     "Save all to Files" : "Lagre alle til Filer",
-    "+ cc" : "+ cc",
-    "Reply …" : "Svar ...",
-    "Forward" : "Videresend",
     "Delete" : "Slett",
     "Add mail account" : "Legg til epost-konto",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Ønsker du å kryptere e-postene dine? Installer <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope nettleser-utvidelse</a>!",
diff --git a/l10n/nl.js b/l10n/nl.js
index 191738ddb..39ecafcb2 100644
--- a/l10n/nl.js
+++ b/l10n/nl.js
@@ -5,8 +5,6 @@ OC.L10N.register(
     "Error while loading the accounts." : "Fout tijdens het laden van de accounts.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n nieuw bericht in {folderName} \nvan {from}","%n nieuwe berichten in {folderName} \nvan {from}"],
-    "you" : "je",
-    "Send message to {email}" : "Versturen bericht naar {email}",
     "Error while loading the selected account." : "Fout tijdens het laden van het gekozen account.",
     "Error while loading messages." : "Fout bij laden berichten.",
     "Choose a folder to store the attachment in" : "Kies een map op de bijlage in op te slaan",
@@ -21,19 +19,20 @@ OC.L10N.register(
     "Unknown error" : "Onbekende fout",
     "Error while creating an account: " : "Fout bij het creëren van een account.",
     "Connect" : "Verbinden",
-    "Sending …" : "Versturen ...",
-    "Reply" : "Antwoord",
-    "Message sent!" : "Bericht verzonden!",
-    "Error sending the reply." : "Fout het het sturen van een antwoord",
     "Error while deleting account." : "Fout bij verwijderen account.",
     "Choose a file to add as attachment" : "Kies een bestand om als bijlage toe te voegen",
+    "Reply" : "Antwoord",
+    "Send" : "Versturen",
+    "Sending …" : "Versturen ...",
+    "Message sent!" : "Bericht verzonden!",
+    "you" : "je",
+    "Send message to {email}" : "Versturen bericht naar {email}",
     "Message could not be starred. Please try again." : "Bericht kon niet als gemarkeerd worden. Probeer het opnieuw.",
     "Error while deleting message." : "Fout bij verwijderen berichtn",
     "Checking mail …" : "E-mail controleren ...",
     "Loading …" : "Laden...",
     "Load more …" : "Laad meer ...",
     "Check messages …" : "Controleren berichten ...",
-    "Send" : "Versturen",
     "Inbox" : "Inbakje",
     "Sent" : "Verzonden",
     "Drafts" : "Concepten",
@@ -54,16 +53,13 @@ OC.L10N.register(
     "bcc" : "bcc",
     "Subject" : "Onderwerp",
     "Message …" : "Bericht ...",
-    "Add attachment from Files" : "Voeg een bijlage toe uit Bestanden",
     "Open Mail App" : "Open de e-mail app",
     "Back to website" : "Terug naar de website",
+    "Add attachment from Files" : "Voeg een bijlage toe uit Bestanden",
     "Error loading message" : "Fout bij laden bericht",
     "Download attachment" : "Download bijlage",
     "Save to Files" : "Opslaan in Bestanden",
     "Save all to Files" : "Alles opslaan in Bestanden",
-    "+ cc" : "+ cc",
-    "Reply …" : "Antwoord …",
-    "Forward" : "Doorsturen",
     "Delete" : "Verwijderen",
     "Add mail account" : "Toevoegen e-mailaccount",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Wilt u uw e-mailberichten versleutelen? Installeer de <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extensie</a>!",
diff --git a/l10n/nl.json b/l10n/nl.json
index 9386f6ce1..fbecf0f33 100644
--- a/l10n/nl.json
+++ b/l10n/nl.json
@@ -3,8 +3,6 @@
     "Error while loading the accounts." : "Fout tijdens het laden van de accounts.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n nieuw bericht in {folderName} \nvan {from}","%n nieuwe berichten in {folderName} \nvan {from}"],
-    "you" : "je",
-    "Send message to {email}" : "Versturen bericht naar {email}",
     "Error while loading the selected account." : "Fout tijdens het laden van het gekozen account.",
     "Error while loading messages." : "Fout bij laden berichten.",
     "Choose a folder to store the attachment in" : "Kies een map op de bijlage in op te slaan",
@@ -19,19 +17,20 @@
     "Unknown error" : "Onbekende fout",
     "Error while creating an account: " : "Fout bij het creëren van een account.",
     "Connect" : "Verbinden",
-    "Sending …" : "Versturen ...",
-    "Reply" : "Antwoord",
-    "Message sent!" : "Bericht verzonden!",
-    "Error sending the reply." : "Fout het het sturen van een antwoord",
     "Error while deleting account." : "Fout bij verwijderen account.",
     "Choose a file to add as attachment" : "Kies een bestand om als bijlage toe te voegen",
+    "Reply" : "Antwoord",
+    "Send" : "Versturen",
+    "Sending …" : "Versturen ...",
+    "Message sent!" : "Bericht verzonden!",
+    "you" : "je",
+    "Send message to {email}" : "Versturen bericht naar {email}",
     "Message could not be starred. Please try again." : "Bericht kon niet als gemarkeerd worden. Probeer het opnieuw.",
     "Error while deleting message." : "Fout bij verwijderen berichtn",
     "Checking mail …" : "E-mail controleren ...",
     "Loading …" : "Laden...",
     "Load more …" : "Laad meer ...",
     "Check messages …" : "Controleren berichten ...",
-    "Send" : "Versturen",
     "Inbox" : "Inbakje",
     "Sent" : "Verzonden",
     "Drafts" : "Concepten",
@@ -52,16 +51,13 @@
     "bcc" : "bcc",
     "Subject" : "Onderwerp",
     "Message …" : "Bericht ...",
-    "Add attachment from Files" : "Voeg een bijlage toe uit Bestanden",
     "Open Mail App" : "Open de e-mail app",
     "Back to website" : "Terug naar de website",
+    "Add attachment from Files" : "Voeg een bijlage toe uit Bestanden",
     "Error loading message" : "Fout bij laden bericht",
     "Download attachment" : "Download bijlage",
     "Save to Files" : "Opslaan in Bestanden",
     "Save all to Files" : "Alles opslaan in Bestanden",
-    "+ cc" : "+ cc",
-    "Reply …" : "Antwoord …",
-    "Forward" : "Doorsturen",
     "Delete" : "Verwijderen",
     "Add mail account" : "Toevoegen e-mailaccount",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Wilt u uw e-mailberichten versleutelen? Installeer de <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extensie</a>!",
diff --git a/l10n/pl.js b/l10n/pl.js
index 9d0175f8a..9fa152e22 100644
--- a/l10n/pl.js
+++ b/l10n/pl.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Mail" : "Poczta",
     "Error while loading the accounts." : "Błąd podczas ładowania kont.",
-    "you" : "Ty",
     "Error while loading the selected account." : "Błąd podczas ładowania zaznaczonego konta.",
     "Error while loading messages." : "Błąd podczas ładowania wiadomości.",
     "Choose a folder to store the attachment in" : "Proszę wybrać folder do zapisania załącznika",
@@ -16,15 +15,15 @@ OC.L10N.register(
     "Unknown error" : "Nieznany błąd",
     "Error while creating an account: " : "Błąd podczas tworzenia konta:",
     "Connect" : "Połącz",
-    "Sending …" : "Wysyłanie...",
-    "Reply" : "Odpowiedz",
-    "Error sending the reply." : "Błąd podczas wysyłania odpowiedzi.",
     "Error while deleting account." : "Błąd podczas usuwania konta.",
     "Choose a file to add as attachment" : "Wybierz plik aby dodać jako załącznik",
+    "Reply" : "Odpowiedz",
+    "Send" : "Wyślij",
+    "Sending …" : "Wysyłanie...",
+    "you" : "Ty",
     "Checking mail …" : "Sprawdzanie poczty ...",
     "Loading …" : "Wczytuję ...",
     "Load more …" : "Załaduj dalsze ...",
-    "Send" : "Wyślij",
     "Inbox" : "Odbiorcza",
     "Sent" : "Wyślij",
     "Drafts" : "Szkice",
@@ -43,15 +42,12 @@ OC.L10N.register(
     "bcc" : "bcc",
     "Subject" : "Temat",
     "Message …" : "Wiadomość ...",
-    "Add attachment from Files" : "Dodaj załącznik z Plików",
     "Open Mail App" : "Otwórz aplikację pocztową",
     "Back to website" : "Z powrotem do strony",
+    "Add attachment from Files" : "Dodaj załącznik z Plików",
     "Download attachment" : "Pobierz załącznik",
     "Save to Files" : "Zapisz do plików",
     "Save all to Files" : "Zapisz wszystko do plików",
-    "+ cc" : "+ cc",
-    "Reply …" : "Odpowiedz ...",
-    "Forward" : "Przekaż dalej",
     "Delete" : "Usuń",
     "No messages in this folder!" : "Brak wiadomości w tym folderze!",
     "Connect your mail account" : "Podłącz Twoje konto email",
diff --git a/l10n/pl.json b/l10n/pl.json
index 7dcaa93de..dd877428d 100644
--- a/l10n/pl.json
+++ b/l10n/pl.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Mail" : "Poczta",
     "Error while loading the accounts." : "Błąd podczas ładowania kont.",
-    "you" : "Ty",
     "Error while loading the selected account." : "Błąd podczas ładowania zaznaczonego konta.",
     "Error while loading messages." : "Błąd podczas ładowania wiadomości.",
     "Choose a folder to store the attachment in" : "Proszę wybrać folder do zapisania załącznika",
@@ -14,15 +13,15 @@
     "Unknown error" : "Nieznany błąd",
     "Error while creating an account: " : "Błąd podczas tworzenia konta:",
     "Connect" : "Połącz",
-    "Sending …" : "Wysyłanie...",
-    "Reply" : "Odpowiedz",
-    "Error sending the reply." : "Błąd podczas wysyłania odpowiedzi.",
     "Error while deleting account." : "Błąd podczas usuwania konta.",
     "Choose a file to add as attachment" : "Wybierz plik aby dodać jako załącznik",
+    "Reply" : "Odpowiedz",
+    "Send" : "Wyślij",
+    "Sending …" : "Wysyłanie...",
+    "you" : "Ty",
     "Checking mail …" : "Sprawdzanie poczty ...",
     "Loading …" : "Wczytuję ...",
     "Load more …" : "Załaduj dalsze ...",
-    "Send" : "Wyślij",
     "Inbox" : "Odbiorcza",
     "Sent" : "Wyślij",
     "Drafts" : "Szkice",
@@ -41,15 +40,12 @@
     "bcc" : "bcc",
     "Subject" : "Temat",
     "Message …" : "Wiadomość ...",
-    "Add attachment from Files" : "Dodaj załącznik z Plików",
     "Open Mail App" : "Otwórz aplikację pocztową",
     "Back to website" : "Z powrotem do strony",
+    "Add attachment from Files" : "Dodaj załącznik z Plików",
     "Download attachment" : "Pobierz załącznik",
     "Save to Files" : "Zapisz do plików",
     "Save all to Files" : "Zapisz wszystko do plików",
-    "+ cc" : "+ cc",
-    "Reply …" : "Odpowiedz ...",
-    "Forward" : "Przekaż dalej",
     "Delete" : "Usuń",
     "No messages in this folder!" : "Brak wiadomości w tym folderze!",
     "Connect your mail account" : "Podłącz Twoje konto email",
diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js
index f9bd3254f..decdb2c37 100644
--- a/l10n/pt_BR.js
+++ b/l10n/pt_BR.js
@@ -5,8 +5,6 @@ OC.L10N.register(
     "Error while loading the accounts." : "Erro no carregamento das contas.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n nova mensagem em {folderName}\nde {from}","%n novas mensagens em {folderName}\nde {from}"],
-    "you" : "você",
-    "Send message to {email}" : "Enviar mensagem para {email}",
     "Error while loading the selected account." : "Erro enquanto carregava a conta selecionada",
     "Error while loading messages." : "Erro no carregamento das mensagens.",
     "Choose a folder to store the attachment in" : "Escolha uma pasta para armazenar os anexos",
@@ -21,19 +19,20 @@ OC.L10N.register(
     "Unknown error" : "Erro desconhecido",
     "Error while creating an account: " : "Erro na criação da conta:",
     "Connect" : "Conectar",
-    "Sending …" : "Enviando ...",
-    "Reply" : "Responder",
-    "Message sent!" : "Mensagem enviada!",
-    "Error sending the reply." : "Erro enviando uma resposta.",
     "Error while deleting account." : "Erro enquanto eliminava uma conta.",
     "Choose a file to add as attachment" : "Escolha um arquivo para adicionar como anexo",
+    "Reply" : "Responder",
+    "Send" : "Enviar",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "Mensagem enviada!",
+    "you" : "você",
+    "Send message to {email}" : "Enviar mensagem para {email}",
     "Message could not be starred. Please try again." : "Mensagem não pode ser marcada com estrela. Por favor tente novamente.",
     "Error while deleting message." : "Erro enquanto apagava mensagem.",
     "Checking mail …" : "Verificando email ...",
     "Loading …" : "Carregando ...",
     "Load more …" : "Carregar mais ...",
     "Check messages …" : "Verificar mensagens",
-    "Send" : "Enviar",
     "Inbox" : "Caixa de Entrada",
     "Sent" : "Enviar",
     "Drafts" : "Rascunhos",
@@ -54,16 +53,13 @@ OC.L10N.register(
     "bcc" : "bcc",
     "Subject" : "Assunto",
     "Message …" : "Mensagem ...",
-    "Add attachment from Files" : "Adicionar anexos de Arquivos",
     "Open Mail App" : "Aplicativo Open Mail",
     "Back to website" : "Retornar ao servidor web",
+    "Add attachment from Files" : "Adicionar anexos de Arquivos",
     "Error loading message" : "Erro carregando mensagem",
     "Download attachment" : "Baixar anexo",
     "Save to Files" : "Salvar para Arquivos",
     "Save all to Files" : "Salvar tudo para Arquivos",
-    "+ cc" : "+ cc",
-    "Reply …" : "Responder ...",
-    "Forward" : "Redirecionar",
     "Delete" : "Excluir",
     "Add mail account" : "Adicionar conta de email",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Tentando criptografar seus e-mails? Instale a extensão <a href=\"https://www.mailvelope.com/\" target=\"_blank\"> Mailvelope no navegador</a>!",
diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json
index 938377c17..9f41b0e70 100644
--- a/l10n/pt_BR.json
+++ b/l10n/pt_BR.json
@@ -3,8 +3,6 @@
     "Error while loading the accounts." : "Erro no carregamento das contas.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n nova mensagem em {folderName}\nde {from}","%n novas mensagens em {folderName}\nde {from}"],
-    "you" : "você",
-    "Send message to {email}" : "Enviar mensagem para {email}",
     "Error while loading the selected account." : "Erro enquanto carregava a conta selecionada",
     "Error while loading messages." : "Erro no carregamento das mensagens.",
     "Choose a folder to store the attachment in" : "Escolha uma pasta para armazenar os anexos",
@@ -19,19 +17,20 @@
     "Unknown error" : "Erro desconhecido",
     "Error while creating an account: " : "Erro na criação da conta:",
     "Connect" : "Conectar",
-    "Sending …" : "Enviando ...",
-    "Reply" : "Responder",
-    "Message sent!" : "Mensagem enviada!",
-    "Error sending the reply." : "Erro enviando uma resposta.",
     "Error while deleting account." : "Erro enquanto eliminava uma conta.",
     "Choose a file to add as attachment" : "Escolha um arquivo para adicionar como anexo",
+    "Reply" : "Responder",
+    "Send" : "Enviar",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "Mensagem enviada!",
+    "you" : "você",
+    "Send message to {email}" : "Enviar mensagem para {email}",
     "Message could not be starred. Please try again." : "Mensagem não pode ser marcada com estrela. Por favor tente novamente.",
     "Error while deleting message." : "Erro enquanto apagava mensagem.",
     "Checking mail …" : "Verificando email ...",
     "Loading …" : "Carregando ...",
     "Load more …" : "Carregar mais ...",
     "Check messages …" : "Verificar mensagens",
-    "Send" : "Enviar",
     "Inbox" : "Caixa de Entrada",
     "Sent" : "Enviar",
     "Drafts" : "Rascunhos",
@@ -52,16 +51,13 @@
     "bcc" : "bcc",
     "Subject" : "Assunto",
     "Message …" : "Mensagem ...",
-    "Add attachment from Files" : "Adicionar anexos de Arquivos",
     "Open Mail App" : "Aplicativo Open Mail",
     "Back to website" : "Retornar ao servidor web",
+    "Add attachment from Files" : "Adicionar anexos de Arquivos",
     "Error loading message" : "Erro carregando mensagem",
     "Download attachment" : "Baixar anexo",
     "Save to Files" : "Salvar para Arquivos",
     "Save all to Files" : "Salvar tudo para Arquivos",
-    "+ cc" : "+ cc",
-    "Reply …" : "Responder ...",
-    "Forward" : "Redirecionar",
     "Delete" : "Excluir",
     "Add mail account" : "Adicionar conta de email",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Tentando criptografar seus e-mails? Instale a extensão <a href=\"https://www.mailvelope.com/\" target=\"_blank\"> Mailvelope no navegador</a>!",
diff --git a/l10n/pt_PT.js b/l10n/pt_PT.js
index 7b32d07a7..8feb074af 100644
--- a/l10n/pt_PT.js
+++ b/l10n/pt_PT.js
@@ -4,8 +4,6 @@ OC.L10N.register(
     "Mail" : "Correio",
     "Error while loading the accounts." : "Erro a carregar as contas.",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n nova mensagem na pasta {folderName} \nenviada por {from}","%n novas mensagems na pasta {folderName}\nenviadas por {from}"],
-    "you" : "Você",
-    "Send message to {email}" : "Enviar mensagem para {email}",
     "Error while loading the selected account." : "Erro a carregar a conta seleccionada.",
     "Error while loading messages." : "Erro durante o carregamento das mensagens.",
     "Choose a folder to store the attachment in" : "Escolha uma pasta para guardar o anexo",
@@ -19,19 +17,20 @@ OC.L10N.register(
     "Unknown error" : "Erro Desconhecido",
     "Error while creating an account: " : "Erro durante a criação da conta:",
     "Connect" : "Ligar",
-    "Sending …" : "A enviar...",
-    "Reply" : "Responder",
-    "Message sent!" : "Mensagem enviada!",
-    "Error sending the reply." : "Erro ao enviar a resposta.",
     "Error while deleting account." : "Erro durante a eliminação da conta.",
     "Choose a file to add as attachment" : "Escolha um ficheiro para adicionar como anexo",
+    "Reply" : "Responder",
+    "Send" : "Enviar",
+    "Sending …" : "A enviar...",
+    "Message sent!" : "Mensagem enviada!",
+    "you" : "Você",
+    "Send message to {email}" : "Enviar mensagem para {email}",
     "Message could not be starred. Please try again." : "Não foi possível atribuir as estrelas à mensagem. Por favor, tente de novo.",
     "Error while deleting message." : "Erro durante a eliminação da mensagem.",
     "Checking mail …" : "A verificar o correio...",
     "Loading …" : "A carregar...",
     "Load more …" : "Carregar mais...",
     "Check messages …" : "Verificar mensagens...",
-    "Send" : "Enviar",
     "Inbox" : "Caixa de Entrada",
     "Sent" : "Enviada",
     "Drafts" : "Rascunhos",
@@ -51,16 +50,13 @@ OC.L10N.register(
     "bcc" : "bcc",
     "Subject" : "Assunto",
     "Message …" : "Mensagem...",
-    "Add attachment from Files" : "Adicione anexo a partir dos ficheiros",
     "Open Mail App" : "Abrir Aplicação de Correio",
     "Back to website" : "Voltar ao sítio da Web",
+    "Add attachment from Files" : "Adicione anexo a partir dos ficheiros",
     "Error loading message" : "Erro ao carregar a mensagem",
     "Download attachment" : "Descarregar anexo",
     "Save to Files" : "Guardado em Ficheiros",
     "Save all to Files" : "Guardar tudo em Ficheiros",
-    "+ cc" : "+ cc",
-    "Reply …" : "Responder...",
-    "Forward" : "Avançar",
     "Delete" : "Apagar",
     "Add mail account" : "Adicionar conta de correio",
     "No search results for {{searchTerm}}" : "Sem resultados de procura para {{searchTerm}}",
diff --git a/l10n/pt_PT.json b/l10n/pt_PT.json
index cf0bbb738..3e3797498 100644
--- a/l10n/pt_PT.json
+++ b/l10n/pt_PT.json
@@ -2,8 +2,6 @@
     "Mail" : "Correio",
     "Error while loading the accounts." : "Erro a carregar as contas.",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n nova mensagem na pasta {folderName} \nenviada por {from}","%n novas mensagems na pasta {folderName}\nenviadas por {from}"],
-    "you" : "Você",
-    "Send message to {email}" : "Enviar mensagem para {email}",
     "Error while loading the selected account." : "Erro a carregar a conta seleccionada.",
     "Error while loading messages." : "Erro durante o carregamento das mensagens.",
     "Choose a folder to store the attachment in" : "Escolha uma pasta para guardar o anexo",
@@ -17,19 +15,20 @@
     "Unknown error" : "Erro Desconhecido",
     "Error while creating an account: " : "Erro durante a criação da conta:",
     "Connect" : "Ligar",
-    "Sending …" : "A enviar...",
-    "Reply" : "Responder",
-    "Message sent!" : "Mensagem enviada!",
-    "Error sending the reply." : "Erro ao enviar a resposta.",
     "Error while deleting account." : "Erro durante a eliminação da conta.",
     "Choose a file to add as attachment" : "Escolha um ficheiro para adicionar como anexo",
+    "Reply" : "Responder",
+    "Send" : "Enviar",
+    "Sending …" : "A enviar...",
+    "Message sent!" : "Mensagem enviada!",
+    "you" : "Você",
+    "Send message to {email}" : "Enviar mensagem para {email}",
     "Message could not be starred. Please try again." : "Não foi possível atribuir as estrelas à mensagem. Por favor, tente de novo.",
     "Error while deleting message." : "Erro durante a eliminação da mensagem.",
     "Checking mail …" : "A verificar o correio...",
     "Loading …" : "A carregar...",
     "Load more …" : "Carregar mais...",
     "Check messages …" : "Verificar mensagens...",
-    "Send" : "Enviar",
     "Inbox" : "Caixa de Entrada",
     "Sent" : "Enviada",
     "Drafts" : "Rascunhos",
@@ -49,16 +48,13 @@
     "bcc" : "bcc",
     "Subject" : "Assunto",
     "Message …" : "Mensagem...",
-    "Add attachment from Files" : "Adicione anexo a partir dos ficheiros",
     "Open Mail App" : "Abrir Aplicação de Correio",
     "Back to website" : "Voltar ao sítio da Web",
+    "Add attachment from Files" : "Adicione anexo a partir dos ficheiros",
     "Error loading message" : "Erro ao carregar a mensagem",
     "Download attachment" : "Descarregar anexo",
     "Save to Files" : "Guardado em Ficheiros",
     "Save all to Files" : "Guardar tudo em Ficheiros",
-    "+ cc" : "+ cc",
-    "Reply …" : "Responder...",
-    "Forward" : "Avançar",
     "Delete" : "Apagar",
     "Add mail account" : "Adicionar conta de correio",
     "No search results for {{searchTerm}}" : "Sem resultados de procura para {{searchTerm}}",
diff --git a/l10n/ru.js b/l10n/ru.js
index 384cbca24..65c634105 100644
--- a/l10n/ru.js
+++ b/l10n/ru.js
@@ -5,8 +5,6 @@ OC.L10N.register(
     "Error while loading the accounts." : "Ошибка при загрузке учётных записей",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n новое сообщение в {folderName} \nот {from}","%n новых сообщения в {folderName} \nот {from}","%n новых сообщения в {folderName} \nот {from}","%n новых сообщений в {folderName} \nот {from}"],
-    "you" : "вы",
-    "Send message to {email}" : "Отправить сообщения на {email}",
     "Error while loading the selected account." : "Ошибка загрузки выбранного аккаунта.",
     "Error while loading messages." : "Ошибка пр загрузке изображений.",
     "Choose a folder to store the attachment in" : "Выберите каталог для хранения вложений",
@@ -21,19 +19,20 @@ OC.L10N.register(
     "Unknown error" : "Неизвестная ошибка",
     "Error while creating an account: " : "Ошибка при создании учётной записи:",
     "Connect" : "Соединить",
-    "Sending …" : "Отправляется ...",
-    "Reply" : "Ответ",
-    "Message sent!" : "Сообщение отправлено!",
-    "Error sending the reply." : "Ошибка при отправке ответа.",
     "Error while deleting account." : "Ошибка при удалении учётной записи.",
     "Choose a file to add as attachment" : "Выбрать файл для вложения",
+    "Reply" : "Ответ",
+    "Send" : "Отправить",
+    "Sending …" : "Отправляется ...",
+    "Message sent!" : "Сообщение отправлено!",
+    "you" : "вы",
+    "Send message to {email}" : "Отправить сообщения на {email}",
     "Message could not be starred. Please try again." : "Не удалось пометить сообщение. Попробуйте снова.",
     "Error while deleting message." : "Ошибка при удалении сообщения.",
     "Checking mail …" : "Проверка почты ...",
     "Loading …" : "Идёт загрузка ...",
     "Load more …" : "Загрузить больше ...",
     "Check messages …" : "Проверяем сообщения ...",
-    "Send" : "Отправить",
     "Inbox" : "Входящие",
     "Sent" : "Отправленные",
     "Drafts" : "Черновики",
@@ -54,16 +53,13 @@ OC.L10N.register(
     "bcc" : "Скрытая копия",
     "Subject" : "Тема",
     "Message …" : "Сообщение ...",
-    "Add attachment from Files" : "Добавить вложение из файла",
     "Open Mail App" : "Открыть почтовое приложение",
     "Back to website" : "Обратно к веб-сайту",
+    "Add attachment from Files" : "Добавить вложение из файла",
     "Error loading message" : "Ошибка при загрузке сообщения",
     "Download attachment" : "Скачать вложение",
     "Save to Files" : "Сохранить в Файлы",
     "Save all to Files" : "Сохранить всё в Файлы",
-    "+ cc" : "+ Копия",
-    "Reply …" : "Ответить ...",
-    "Forward" : "Переслать",
     "Delete" : "Удалить",
     "Add mail account" : "Добавить почтовую учетную запись",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Хотите зашифровать свою почту? Установите <a href=\"https://www.mailvelope.com/\" target=\"_blank\">расширение для браузера Mailvelope</a>!",
diff --git a/l10n/ru.json b/l10n/ru.json
index ccb6038f4..2ad3f4500 100644
--- a/l10n/ru.json
+++ b/l10n/ru.json
@@ -3,8 +3,6 @@
     "Error while loading the accounts." : "Ошибка при загрузке учётных записей",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n новое сообщение в {folderName} \nот {from}","%n новых сообщения в {folderName} \nот {from}","%n новых сообщения в {folderName} \nот {from}","%n новых сообщений в {folderName} \nот {from}"],
-    "you" : "вы",
-    "Send message to {email}" : "Отправить сообщения на {email}",
     "Error while loading the selected account." : "Ошибка загрузки выбранного аккаунта.",
     "Error while loading messages." : "Ошибка пр загрузке изображений.",
     "Choose a folder to store the attachment in" : "Выберите каталог для хранения вложений",
@@ -19,19 +17,20 @@
     "Unknown error" : "Неизвестная ошибка",
     "Error while creating an account: " : "Ошибка при создании учётной записи:",
     "Connect" : "Соединить",
-    "Sending …" : "Отправляется ...",
-    "Reply" : "Ответ",
-    "Message sent!" : "Сообщение отправлено!",
-    "Error sending the reply." : "Ошибка при отправке ответа.",
     "Error while deleting account." : "Ошибка при удалении учётной записи.",
     "Choose a file to add as attachment" : "Выбрать файл для вложения",
+    "Reply" : "Ответ",
+    "Send" : "Отправить",
+    "Sending …" : "Отправляется ...",
+    "Message sent!" : "Сообщение отправлено!",
+    "you" : "вы",
+    "Send message to {email}" : "Отправить сообщения на {email}",
     "Message could not be starred. Please try again." : "Не удалось пометить сообщение. Попробуйте снова.",
     "Error while deleting message." : "Ошибка при удалении сообщения.",
     "Checking mail …" : "Проверка почты ...",
     "Loading …" : "Идёт загрузка ...",
     "Load more …" : "Загрузить больше ...",
     "Check messages …" : "Проверяем сообщения ...",
-    "Send" : "Отправить",
     "Inbox" : "Входящие",
     "Sent" : "Отправленные",
     "Drafts" : "Черновики",
@@ -52,16 +51,13 @@
     "bcc" : "Скрытая копия",
     "Subject" : "Тема",
     "Message …" : "Сообщение ...",
-    "Add attachment from Files" : "Добавить вложение из файла",
     "Open Mail App" : "Открыть почтовое приложение",
     "Back to website" : "Обратно к веб-сайту",
+    "Add attachment from Files" : "Добавить вложение из файла",
     "Error loading message" : "Ошибка при загрузке сообщения",
     "Download attachment" : "Скачать вложение",
     "Save to Files" : "Сохранить в Файлы",
     "Save all to Files" : "Сохранить всё в Файлы",
-    "+ cc" : "+ Копия",
-    "Reply …" : "Ответить ...",
-    "Forward" : "Переслать",
     "Delete" : "Удалить",
     "Add mail account" : "Добавить почтовую учетную запись",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Хотите зашифровать свою почту? Установите <a href=\"https://www.mailvelope.com/\" target=\"_blank\">расширение для браузера Mailvelope</a>!",
diff --git a/l10n/sk_SK.js b/l10n/sk_SK.js
index 6bff90528..1a1865e9b 100644
--- a/l10n/sk_SK.js
+++ b/l10n/sk_SK.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Mail" : "Pošta",
     "Error while loading the accounts." : "Chyba pri načítaní účtov.",
-    "you" : "vy",
     "Error while loading the selected account." : "Chyba počas načítania zvoleného účtu.",
     "Error while loading messages." : "Chyba počas načítavania správ.",
     "Choose a folder to store the attachment in" : "Vyberte priečinok pre uloženie prílohy",
@@ -17,19 +16,19 @@ OC.L10N.register(
     "Unknown error" : "Neznáma chyba",
     "Error while creating an account: " : "Chyba pri vytváraní účtu:",
     "Connect" : "Pripojiť",
-    "Sending …" : "Odosielam ...",
-    "Reply" : "Odpoveď",
-    "Message sent!" : "Správa odoslaná!",
-    "Error sending the reply." : "Chyba pri odosielaní odpovede.",
     "Error while deleting account." : "Chyba pri mazaní účtu.",
     "Choose a file to add as attachment" : "Zvoľte súbor, ktorý chcete pridať ako prílohu.",
+    "Reply" : "Odpoveď",
+    "Send" : "Odoslať",
+    "Sending …" : "Odosielam ...",
+    "Message sent!" : "Správa odoslaná!",
+    "you" : "vy",
     "Message could not be starred. Please try again." : "Správa nemohla byť označená hviezdičkou. Skúste to znovu.",
     "Error while deleting message." : "Chyba pri mazaní správy.",
     "Checking mail …" : "Kontrolujem email ...",
     "Loading …" : "Načítavam...",
     "Load more …" : "Načítať ďalšie ...",
     "Check messages …" : "Kontrolujem správy ...",
-    "Send" : "Odoslať",
     "Inbox" : "Doručené",
     "Sent" : "Odoslané",
     "Drafts" : "Koncept",
@@ -49,16 +48,13 @@ OC.L10N.register(
     "bcc" : "bcc",
     "Subject" : "Predmet",
     "Message …" : "Správa ...",
-    "Add attachment from Files" : "Pridať prílohu zo Súborov",
     "Open Mail App" : "Otvoriť emailovú aplikáciu",
     "Back to website" : "Návrat na webstránku",
+    "Add attachment from Files" : "Pridať prílohu zo Súborov",
     "Error loading message" : "Chyba načítavania správy",
     "Download attachment" : "Stiahnuť prílohu",
     "Save to Files" : "Uložiť do súborov",
     "Save all to Files" : "Uložiť všetko do Súborov",
-    "+ cc" : "+ cc",
-    "Reply …" : "Odpovedám ...",
-    "Forward" : "Preposlať",
     "Delete" : "Zmazať",
     "Add mail account" : "Pridať mailový účet",
     "No messages in this folder!" : "V priečinku nie sú žiadne správy!",
diff --git a/l10n/sk_SK.json b/l10n/sk_SK.json
index 7dfb98723..8eb3f121c 100644
--- a/l10n/sk_SK.json
+++ b/l10n/sk_SK.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Mail" : "Pošta",
     "Error while loading the accounts." : "Chyba pri načítaní účtov.",
-    "you" : "vy",
     "Error while loading the selected account." : "Chyba počas načítania zvoleného účtu.",
     "Error while loading messages." : "Chyba počas načítavania správ.",
     "Choose a folder to store the attachment in" : "Vyberte priečinok pre uloženie prílohy",
@@ -15,19 +14,19 @@
     "Unknown error" : "Neznáma chyba",
     "Error while creating an account: " : "Chyba pri vytváraní účtu:",
     "Connect" : "Pripojiť",
-    "Sending …" : "Odosielam ...",
-    "Reply" : "Odpoveď",
-    "Message sent!" : "Správa odoslaná!",
-    "Error sending the reply." : "Chyba pri odosielaní odpovede.",
     "Error while deleting account." : "Chyba pri mazaní účtu.",
     "Choose a file to add as attachment" : "Zvoľte súbor, ktorý chcete pridať ako prílohu.",
+    "Reply" : "Odpoveď",
+    "Send" : "Odoslať",
+    "Sending …" : "Odosielam ...",
+    "Message sent!" : "Správa odoslaná!",
+    "you" : "vy",
     "Message could not be starred. Please try again." : "Správa nemohla byť označená hviezdičkou. Skúste to znovu.",
     "Error while deleting message." : "Chyba pri mazaní správy.",
     "Checking mail …" : "Kontrolujem email ...",
     "Loading …" : "Načítavam...",
     "Load more …" : "Načítať ďalšie ...",
     "Check messages …" : "Kontrolujem správy ...",
-    "Send" : "Odoslať",
     "Inbox" : "Doručené",
     "Sent" : "Odoslané",
     "Drafts" : "Koncept",
@@ -47,16 +46,13 @@
     "bcc" : "bcc",
     "Subject" : "Predmet",
     "Message …" : "Správa ...",
-    "Add attachment from Files" : "Pridať prílohu zo Súborov",
     "Open Mail App" : "Otvoriť emailovú aplikáciu",
     "Back to website" : "Návrat na webstránku",
+    "Add attachment from Files" : "Pridať prílohu zo Súborov",
     "Error loading message" : "Chyba načítavania správy",
     "Download attachment" : "Stiahnuť prílohu",
     "Save to Files" : "Uložiť do súborov",
     "Save all to Files" : "Uložiť všetko do Súborov",
-    "+ cc" : "+ cc",
-    "Reply …" : "Odpovedám ...",
-    "Forward" : "Preposlať",
     "Delete" : "Zmazať",
     "Add mail account" : "Pridať mailový účet",
     "No messages in this folder!" : "V priečinku nie sú žiadne správy!",
diff --git a/l10n/sl.js b/l10n/sl.js
index c27ed5665..6a8fda9f0 100644
--- a/l10n/sl.js
+++ b/l10n/sl.js
@@ -3,8 +3,6 @@ OC.L10N.register(
     {
     "Mail" : "Elektronska pošta",
     "Error while loading the accounts." : "Prišlo je do napake med nalaganjem računa.¸",
-    "you" : "vi",
-    "Send message to {email}" : "Pošlji sporočilo na {email}",
     "Error while loading the selected account." : "Prišlo je do napake med nalaganjem izbranega računa.",
     "Error while loading messages." : "Prišlo je do napake nalaganja sporočil.",
     "Choose a folder to store the attachment in" : "Izbor mape za shranjevanje prilog.",
@@ -19,19 +17,20 @@ OC.L10N.register(
     "Unknown error" : "Neznana napaka",
     "Error while creating an account: " : "Prišlo je do napake med ustvarjanjem računa:",
     "Connect" : "Poveži",
-    "Sending …" : "Pošiljanje ...",
-    "Reply" : "Odgovori",
-    "Message sent!" : "Sporočilo je poslano!",
-    "Error sending the reply." : "Napaka pošiljanja odgovora.",
     "Error while deleting account." : "Prišlo je do napake med brisanjem računa.",
     "Choose a file to add as attachment" : "Izbor datoteke za prilogo",
+    "Reply" : "Odgovori",
+    "Send" : "Pošlji",
+    "Sending …" : "Pošiljanje ...",
+    "Message sent!" : "Sporočilo je poslano!",
+    "you" : "vi",
+    "Send message to {email}" : "Pošlji sporočilo na {email}",
     "Message could not be starred. Please try again." : "Sporočila ni mogoče označiti z zvezdico. Poskusite znova.",
     "Error while deleting message." : "Napaka med brisanjem sporočila.",
     "Checking mail …" : "Poteka preverjanje elektronske pošte ...",
     "Loading …" : "Nalaganje ...",
     "Load more …" : "Naloži več ...",
     "Check messages …" : "Preverjanje za nova sporočila...",
-    "Send" : "Pošlji",
     "Inbox" : "Dohodna pošta",
     "Sent" : "Poslano",
     "Drafts" : "Osnutki",
@@ -51,16 +50,13 @@ OC.L10N.register(
     "bcc" : "skp",
     "Subject" : "Zadeva",
     "Message …" : "Sporočilo ...",
-    "Add attachment from Files" : "Dodaj prilogo iz mape Datoteke",
     "Open Mail App" : "Odpri program za elektronsko pošto",
     "Back to website" : "Nazaj na spletno stran",
+    "Add attachment from Files" : "Dodaj prilogo iz mape Datoteke",
     "Error loading message" : "Napaka nalaganja sporočila",
     "Download attachment" : "Prejmi prilogo",
     "Save to Files" : "Shrani v mapo datotek",
     "Save all to Files" : "Shrani vse v mapo datotek",
-    "+ cc" : "+ kp",
-    "Reply …" : "Odgovori ...",
-    "Forward" : "Posreduj",
     "Delete" : "Izbriši",
     "Add mail account" : "Dodaj poštni račun",
     "No search results for {{searchTerm}}" : "Ni zadetkov iskanja za {{searchTerm}}",
diff --git a/l10n/sl.json b/l10n/sl.json
index b5b7d8be2..953a1fc8a 100644
--- a/l10n/sl.json
+++ b/l10n/sl.json
@@ -1,8 +1,6 @@
 { "translations": {
     "Mail" : "Elektronska pošta",
     "Error while loading the accounts." : "Prišlo je do napake med nalaganjem računa.¸",
-    "you" : "vi",
-    "Send message to {email}" : "Pošlji sporočilo na {email}",
     "Error while loading the selected account." : "Prišlo je do napake med nalaganjem izbranega računa.",
     "Error while loading messages." : "Prišlo je do napake nalaganja sporočil.",
     "Choose a folder to store the attachment in" : "Izbor mape za shranjevanje prilog.",
@@ -17,19 +15,20 @@
     "Unknown error" : "Neznana napaka",
     "Error while creating an account: " : "Prišlo je do napake med ustvarjanjem računa:",
     "Connect" : "Poveži",
-    "Sending …" : "Pošiljanje ...",
-    "Reply" : "Odgovori",
-    "Message sent!" : "Sporočilo je poslano!",
-    "Error sending the reply." : "Napaka pošiljanja odgovora.",
     "Error while deleting account." : "Prišlo je do napake med brisanjem računa.",
     "Choose a file to add as attachment" : "Izbor datoteke za prilogo",
+    "Reply" : "Odgovori",
+    "Send" : "Pošlji",
+    "Sending …" : "Pošiljanje ...",
+    "Message sent!" : "Sporočilo je poslano!",
+    "you" : "vi",
+    "Send message to {email}" : "Pošlji sporočilo na {email}",
     "Message could not be starred. Please try again." : "Sporočila ni mogoče označiti z zvezdico. Poskusite znova.",
     "Error while deleting message." : "Napaka med brisanjem sporočila.",
     "Checking mail …" : "Poteka preverjanje elektronske pošte ...",
     "Loading …" : "Nalaganje ...",
     "Load more …" : "Naloži več ...",
     "Check messages …" : "Preverjanje za nova sporočila...",
-    "Send" : "Pošlji",
     "Inbox" : "Dohodna pošta",
     "Sent" : "Poslano",
     "Drafts" : "Osnutki",
@@ -49,16 +48,13 @@
     "bcc" : "skp",
     "Subject" : "Zadeva",
     "Message …" : "Sporočilo ...",
-    "Add attachment from Files" : "Dodaj prilogo iz mape Datoteke",
     "Open Mail App" : "Odpri program za elektronsko pošto",
     "Back to website" : "Nazaj na spletno stran",
+    "Add attachment from Files" : "Dodaj prilogo iz mape Datoteke",
     "Error loading message" : "Napaka nalaganja sporočila",
     "Download attachment" : "Prejmi prilogo",
     "Save to Files" : "Shrani v mapo datotek",
     "Save all to Files" : "Shrani vse v mapo datotek",
-    "+ cc" : "+ kp",
-    "Reply …" : "Odgovori ...",
-    "Forward" : "Posreduj",
     "Delete" : "Izbriši",
     "Add mail account" : "Dodaj poštni račun",
     "No search results for {{searchTerm}}" : "Ni zadetkov iskanja za {{searchTerm}}",
diff --git a/l10n/sr.js b/l10n/sr.js
index a1a8ecb93..da00162fc 100644
--- a/l10n/sr.js
+++ b/l10n/sr.js
@@ -4,8 +4,6 @@ OC.L10N.register(
     "Mail" : "Пошта",
     "Error while loading the accounts." : "Грешка при учитавању налога.",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n нова порука у {folderName} \nод {from}","%n нове поруке у {folderName} \nод {from}","%n нових порука у {folderName} \nод {from}"],
-    "you" : "ви",
-    "Send message to {email}" : "Пошаљи поруку на {email}",
     "Error while loading the selected account." : "Грешка при учитавању изабраног налога.",
     "Error while loading messages." : "Грешка при учитавању порука.",
     "Choose a folder to store the attachment in" : "Изаберите фасциклу за смештање прилога",
@@ -20,19 +18,20 @@ OC.L10N.register(
     "Unknown error" : "Непозната грешка",
     "Error while creating an account: " : "Грешка при прављењу налога:",
     "Connect" : "Повежи се",
-    "Sending …" : "Шаљем...",
-    "Reply" : "Одговори",
-    "Message sent!" : "Порука послата!",
-    "Error sending the reply." : "Грешка при слању одговора.",
     "Error while deleting account." : "Грешка при брисању налога.",
     "Choose a file to add as attachment" : "Изаберите фајл за прилог",
+    "Reply" : "Одговори",
+    "Send" : "Пошаљи",
+    "Sending …" : "Шаљем...",
+    "Message sent!" : "Порука послата!",
+    "you" : "ви",
+    "Send message to {email}" : "Пошаљи поруку на {email}",
     "Message could not be starred. Please try again." : "Порука се не може „озвездати“. Покушајте поново.",
     "Error while deleting message." : "Грешка при брисању поруке.",
     "Checking mail …" : "Проверавам пошту...",
     "Loading …" : "Учитавам...",
     "Load more …" : "Учитај још...",
     "Check messages …" : "Провери поруке…",
-    "Send" : "Пошаљи",
     "Inbox" : "Долазно",
     "Sent" : "Послато",
     "Drafts" : "Недовршено",
@@ -52,16 +51,13 @@ OC.L10N.register(
     "bcc" : "бцц",
     "Subject" : "Тема",
     "Message …" : "Порука...",
-    "Add attachment from Files" : "Додај прилог из фајлова",
     "Open Mail App" : "Отвори апликацију е-поште",
     "Back to website" : "Назад на вебсајт",
+    "Add attachment from Files" : "Додај прилог из фајлова",
     "Error loading message" : "Грешка при учитавању поруке",
     "Download attachment" : "Преузми прилог",
     "Save to Files" : "Сачувај у фајлове",
     "Save all to Files" : "Сачувај све у фајлове",
-    "+ cc" : "+ цц",
-    "Reply …" : "Одговори…",
-    "Forward" : "Проследи",
     "Delete" : "Обриши",
     "Add mail account" : "Додај налог",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Желите да шифрујете пошту? Инсталирајте <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope проширење прегледача</a>!",
diff --git a/l10n/sr.json b/l10n/sr.json
index a070a4f35..133b7297f 100644
--- a/l10n/sr.json
+++ b/l10n/sr.json
@@ -2,8 +2,6 @@
     "Mail" : "Пошта",
     "Error while loading the accounts." : "Грешка при учитавању налога.",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n нова порука у {folderName} \nод {from}","%n нове поруке у {folderName} \nод {from}","%n нових порука у {folderName} \nод {from}"],
-    "you" : "ви",
-    "Send message to {email}" : "Пошаљи поруку на {email}",
     "Error while loading the selected account." : "Грешка при учитавању изабраног налога.",
     "Error while loading messages." : "Грешка при учитавању порука.",
     "Choose a folder to store the attachment in" : "Изаберите фасциклу за смештање прилога",
@@ -18,19 +16,20 @@
     "Unknown error" : "Непозната грешка",
     "Error while creating an account: " : "Грешка при прављењу налога:",
     "Connect" : "Повежи се",
-    "Sending …" : "Шаљем...",
-    "Reply" : "Одговори",
-    "Message sent!" : "Порука послата!",
-    "Error sending the reply." : "Грешка при слању одговора.",
     "Error while deleting account." : "Грешка при брисању налога.",
     "Choose a file to add as attachment" : "Изаберите фајл за прилог",
+    "Reply" : "Одговори",
+    "Send" : "Пошаљи",
+    "Sending …" : "Шаљем...",
+    "Message sent!" : "Порука послата!",
+    "you" : "ви",
+    "Send message to {email}" : "Пошаљи поруку на {email}",
     "Message could not be starred. Please try again." : "Порука се не може „озвездати“. Покушајте поново.",
     "Error while deleting message." : "Грешка при брисању поруке.",
     "Checking mail …" : "Проверавам пошту...",
     "Loading …" : "Учитавам...",
     "Load more …" : "Учитај још...",
     "Check messages …" : "Провери поруке…",
-    "Send" : "Пошаљи",
     "Inbox" : "Долазно",
     "Sent" : "Послато",
     "Drafts" : "Недовршено",
@@ -50,16 +49,13 @@
     "bcc" : "бцц",
     "Subject" : "Тема",
     "Message …" : "Порука...",
-    "Add attachment from Files" : "Додај прилог из фајлова",
     "Open Mail App" : "Отвори апликацију е-поште",
     "Back to website" : "Назад на вебсајт",
+    "Add attachment from Files" : "Додај прилог из фајлова",
     "Error loading message" : "Грешка при учитавању поруке",
     "Download attachment" : "Преузми прилог",
     "Save to Files" : "Сачувај у фајлове",
     "Save all to Files" : "Сачувај све у фајлове",
-    "+ cc" : "+ цц",
-    "Reply …" : "Одговори…",
-    "Forward" : "Проследи",
     "Delete" : "Обриши",
     "Add mail account" : "Додај налог",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Желите да шифрујете пошту? Инсталирајте <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope проширење прегледача</a>!",
diff --git a/l10n/sv.js b/l10n/sv.js
index ebd1858a6..1326dfdfd 100644
--- a/l10n/sv.js
+++ b/l10n/sv.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Mail" : "Mail",
     "Error while loading the accounts." : "Fel vid laddning av konto.",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n nya meddelanden i {folderName}\nfrån {from}","%n nya meddelanden i {folderName}\nfrån {from}"],
-    "you" : "du",
     "Error while loading the selected account." : "Fel vid inläsning av valt konto.",
     "Error while loading messages." : "Fel vid inläsning av meddelanden.",
     "Choose a folder to store the attachment in" : "Välj en mapp att spara den bifogade filen i",
@@ -18,19 +17,19 @@ OC.L10N.register(
     "Unknown error" : "Okänt fel",
     "Error while creating an account: " : "Fel när du skapade konto:",
     "Connect" : "Anslut",
-    "Sending …" : "Sänder ...",
-    "Reply" : "Svara",
-    "Message sent!" : "Meddelande skickat!",
-    "Error sending the reply." : "Fel att skicka svaret.",
     "Error while deleting account." : "Fel vid radering av konto.",
     "Choose a file to add as attachment" : "Välj en fil att lägga som bilaga",
+    "Reply" : "Svara",
+    "Send" : "Skicka",
+    "Sending …" : "Sänder ...",
+    "Message sent!" : "Meddelande skickat!",
+    "you" : "du",
     "Message could not be starred. Please try again." : "Meddelande kan inte starta. Försök igen.",
     "Error while deleting message." : "Fel vid radering av  meddelande.",
     "Checking mail …" : "Kontrollerar e-post ...",
     "Loading …" : "Laddar ...",
     "Load more …" : "Ladda mer ...",
     "Check messages …" : "Kontrollera meddelanden ...",
-    "Send" : "Skicka",
     "Inbox" : "Inkorg",
     "Sent" : "Skickad",
     "Drafts" : "Utkast",
@@ -50,16 +49,13 @@ OC.L10N.register(
     "bcc" : "hemlig kopia",
     "Subject" : "Rubrik",
     "Message …" : "Meddelande ...",
-    "Add attachment from Files" : "Bifoga från Filer",
     "Open Mail App" : "Öppna e-postprogram",
     "Back to website" : "Tillbaka till webbplatsen",
+    "Add attachment from Files" : "Bifoga från Filer",
     "Error loading message" : "Fel vid laddning av meddelande",
     "Download attachment" : "Ladda ner bilaga",
     "Save to Files" : "Spara till Filer",
     "Save all to Files" : "Spara allt till Filer",
-    "+ cc" : "+ kopia",
-    "Reply …" : "Svara ...",
-    "Forward" : "Vidarebefordra",
     "Delete" : "Ta bort",
     "Add mail account" : "Lägg till mailkonto",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Skulle du vilja kryptera dina email? Installera <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!",
diff --git a/l10n/sv.json b/l10n/sv.json
index 437ef90df..16a36a716 100644
--- a/l10n/sv.json
+++ b/l10n/sv.json
@@ -2,7 +2,6 @@
     "Mail" : "Mail",
     "Error while loading the accounts." : "Fel vid laddning av konto.",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n nya meddelanden i {folderName}\nfrån {from}","%n nya meddelanden i {folderName}\nfrån {from}"],
-    "you" : "du",
     "Error while loading the selected account." : "Fel vid inläsning av valt konto.",
     "Error while loading messages." : "Fel vid inläsning av meddelanden.",
     "Choose a folder to store the attachment in" : "Välj en mapp att spara den bifogade filen i",
@@ -16,19 +15,19 @@
     "Unknown error" : "Okänt fel",
     "Error while creating an account: " : "Fel när du skapade konto:",
     "Connect" : "Anslut",
-    "Sending …" : "Sänder ...",
-    "Reply" : "Svara",
-    "Message sent!" : "Meddelande skickat!",
-    "Error sending the reply." : "Fel att skicka svaret.",
     "Error while deleting account." : "Fel vid radering av konto.",
     "Choose a file to add as attachment" : "Välj en fil att lägga som bilaga",
+    "Reply" : "Svara",
+    "Send" : "Skicka",
+    "Sending …" : "Sänder ...",
+    "Message sent!" : "Meddelande skickat!",
+    "you" : "du",
     "Message could not be starred. Please try again." : "Meddelande kan inte starta. Försök igen.",
     "Error while deleting message." : "Fel vid radering av  meddelande.",
     "Checking mail …" : "Kontrollerar e-post ...",
     "Loading …" : "Laddar ...",
     "Load more …" : "Ladda mer ...",
     "Check messages …" : "Kontrollera meddelanden ...",
-    "Send" : "Skicka",
     "Inbox" : "Inkorg",
     "Sent" : "Skickad",
     "Drafts" : "Utkast",
@@ -48,16 +47,13 @@
     "bcc" : "hemlig kopia",
     "Subject" : "Rubrik",
     "Message …" : "Meddelande ...",
-    "Add attachment from Files" : "Bifoga från Filer",
     "Open Mail App" : "Öppna e-postprogram",
     "Back to website" : "Tillbaka till webbplatsen",
+    "Add attachment from Files" : "Bifoga från Filer",
     "Error loading message" : "Fel vid laddning av meddelande",
     "Download attachment" : "Ladda ner bilaga",
     "Save to Files" : "Spara till Filer",
     "Save all to Files" : "Spara allt till Filer",
-    "+ cc" : "+ kopia",
-    "Reply …" : "Svara ...",
-    "Forward" : "Vidarebefordra",
     "Delete" : "Ta bort",
     "Add mail account" : "Lägg till mailkonto",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Skulle du vilja kryptera dina email? Installera <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!",
diff --git a/l10n/th_TH.js b/l10n/th_TH.js
index 0580a285b..e2168a037 100644
--- a/l10n/th_TH.js
+++ b/l10n/th_TH.js
@@ -5,8 +5,6 @@ OC.L10N.register(
     "Error while loading the accounts." : "ข้อผิดพลาดในขณะที่โหลดบัญชี",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["มี %n ข้อความใหม่ใน {folderName}\nจาก {from}"],
-    "you" : "คุณ",
-    "Send message to {email}" : "ส่งข้อความไปยัง {email}",
     "Error while loading the selected account." : "ข้อผิดพลาดในขณะที่โหลดบัญชีที่เลือก",
     "Error while loading messages." : "ข้อผิดพลาดขณะโหลดข้อความ",
     "Choose a folder to store the attachment in" : "เลือกโฟลเดอร์ที่จะเก็บสิ่งที่แนบมาใน",
@@ -21,19 +19,20 @@ OC.L10N.register(
     "Unknown error" : "ข้อผิดพลาดที่ไม่ทราบสาเหตุ",
     "Error while creating an account: " : "ข้อผิดพลาดขณะกำลังสร้างบัญชี:",
     "Connect" : "เชื่อมต่อ",
-    "Sending …" : "กำลังส่ง ...",
-    "Reply" : "ตอบกลับ",
-    "Message sent!" : "ส่งข้อความ!",
-    "Error sending the reply." : "ข้อผิดพลาดขณะส่งการตอบกลับ",
     "Error while deleting account." : "ข้อผิดพลาดขณะลบบัญชี",
     "Choose a file to add as attachment" : "เลือกไฟล์ที่ต้องการแนบ",
+    "Reply" : "ตอบกลับ",
+    "Send" : "ส่ง",
+    "Sending …" : "กำลังส่ง ...",
+    "Message sent!" : "ส่งข้อความ!",
+    "you" : "คุณ",
+    "Send message to {email}" : "ส่งข้อความไปยัง {email}",
     "Message could not be starred. Please try again." : "ไม่สามารถเริ่มต้นข้อความ โปรดลองอีกครั้ง",
     "Error while deleting message." : "ข้อผิดพลาดขณะลบข้อความ",
     "Checking mail …" : "การตรวจสอบอีเมล ...",
     "Loading …" : "กำลังโหลด ...",
     "Load more …" : "โหลดเพิ่มเติม ...",
     "Check messages …" : "ตรวจสอบข้อความ ...",
-    "Send" : "ส่ง",
     "Inbox" : "กล่องขาเข้า",
     "Sent" : "ส่ง",
     "Drafts" : "แบบร่าง",
@@ -54,16 +53,13 @@ OC.L10N.register(
     "bcc" : "สำเนาลับ",
     "Subject" : "หัวเรื่อง",
     "Message …" : "ข้อความ ...",
-    "Add attachment from Files" : "เพิ่มสิ่งที่ต้องการแนบจากไฟล์",
     "Open Mail App" : "เปิดแอพฯเมล",
     "Back to website" : "กลับไปยังเว็บไซต์",
+    "Add attachment from Files" : "เพิ่มสิ่งที่ต้องการแนบจากไฟล์",
     "Error loading message" : "กิดข้อผิดพลาดในการโหลด",
     "Download attachment" : "ดาวน์โหลดสิ่งที่แนบมา",
     "Save to Files" : "บันทึกไปยังไฟล์",
     "Save all to Files" : "บันทึกทั้งหมดไปยังไฟล์",
-    "+ cc" : "+ สำเนาถึง",
-    "Reply …" : "ตอบกลับ ...",
-    "Forward" : "ส่งต่อ",
     "Delete" : "ลบ",
     "Add mail account" : "เพิ่มบัญชีอีเมล",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "กำลังมองหาการเข้ารหัสอีเมลของคุณ? ติดตั้ง <a href=\"https://www.mailvelope.com/\" target=\"_blank\">ส่วนขยาย Mailvelope ของเบราว์เซอร์</a>!",
diff --git a/l10n/th_TH.json b/l10n/th_TH.json
index 241e4a8d1..0058b48e0 100644
--- a/l10n/th_TH.json
+++ b/l10n/th_TH.json
@@ -3,8 +3,6 @@
     "Error while loading the accounts." : "ข้อผิดพลาดในขณะที่โหลดบัญชี",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["มี %n ข้อความใหม่ใน {folderName}\nจาก {from}"],
-    "you" : "คุณ",
-    "Send message to {email}" : "ส่งข้อความไปยัง {email}",
     "Error while loading the selected account." : "ข้อผิดพลาดในขณะที่โหลดบัญชีที่เลือก",
     "Error while loading messages." : "ข้อผิดพลาดขณะโหลดข้อความ",
     "Choose a folder to store the attachment in" : "เลือกโฟลเดอร์ที่จะเก็บสิ่งที่แนบมาใน",
@@ -19,19 +17,20 @@
     "Unknown error" : "ข้อผิดพลาดที่ไม่ทราบสาเหตุ",
     "Error while creating an account: " : "ข้อผิดพลาดขณะกำลังสร้างบัญชี:",
     "Connect" : "เชื่อมต่อ",
-    "Sending …" : "กำลังส่ง ...",
-    "Reply" : "ตอบกลับ",
-    "Message sent!" : "ส่งข้อความ!",
-    "Error sending the reply." : "ข้อผิดพลาดขณะส่งการตอบกลับ",
     "Error while deleting account." : "ข้อผิดพลาดขณะลบบัญชี",
     "Choose a file to add as attachment" : "เลือกไฟล์ที่ต้องการแนบ",
+    "Reply" : "ตอบกลับ",
+    "Send" : "ส่ง",
+    "Sending …" : "กำลังส่ง ...",
+    "Message sent!" : "ส่งข้อความ!",
+    "you" : "คุณ",
+    "Send message to {email}" : "ส่งข้อความไปยัง {email}",
     "Message could not be starred. Please try again." : "ไม่สามารถเริ่มต้นข้อความ โปรดลองอีกครั้ง",
     "Error while deleting message." : "ข้อผิดพลาดขณะลบข้อความ",
     "Checking mail …" : "การตรวจสอบอีเมล ...",
     "Loading …" : "กำลังโหลด ...",
     "Load more …" : "โหลดเพิ่มเติม ...",
     "Check messages …" : "ตรวจสอบข้อความ ...",
-    "Send" : "ส่ง",
     "Inbox" : "กล่องขาเข้า",
     "Sent" : "ส่ง",
     "Drafts" : "แบบร่าง",
@@ -52,16 +51,13 @@
     "bcc" : "สำเนาลับ",
     "Subject" : "หัวเรื่อง",
     "Message …" : "ข้อความ ...",
-    "Add attachment from Files" : "เพิ่มสิ่งที่ต้องการแนบจากไฟล์",
     "Open Mail App" : "เปิดแอพฯเมล",
     "Back to website" : "กลับไปยังเว็บไซต์",
+    "Add attachment from Files" : "เพิ่มสิ่งที่ต้องการแนบจากไฟล์",
     "Error loading message" : "กิดข้อผิดพลาดในการโหลด",
     "Download attachment" : "ดาวน์โหลดสิ่งที่แนบมา",
     "Save to Files" : "บันทึกไปยังไฟล์",
     "Save all to Files" : "บันทึกทั้งหมดไปยังไฟล์",
-    "+ cc" : "+ สำเนาถึง",
-    "Reply …" : "ตอบกลับ ...",
-    "Forward" : "ส่งต่อ",
     "Delete" : "ลบ",
     "Add mail account" : "เพิ่มบัญชีอีเมล",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "กำลังมองหาการเข้ารหัสอีเมลของคุณ? ติดตั้ง <a href=\"https://www.mailvelope.com/\" target=\"_blank\">ส่วนขยาย Mailvelope ของเบราว์เซอร์</a>!",
diff --git a/l10n/tr.js b/l10n/tr.js
index db9045077..2389c25d0 100644
--- a/l10n/tr.js
+++ b/l10n/tr.js
@@ -4,8 +4,6 @@ OC.L10N.register(
     "Mail" : "Posta",
     "Error while loading the accounts." : "Hesaplar yüklenirken hata.",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["{folderName} içerisinde %n yeni ileti\nkimden: {from}","{folderName} içerisinde %n yeni ileti\nkimden: {from}"],
-    "you" : "siz",
-    "Send message to {email}" : "{email} adresine ileti gönder",
     "Error while loading the selected account." : "Seçili hesap yüklenirken hata.",
     "Error while loading messages." : "İletiler yüklenirken hata.",
     "Choose a folder to store the attachment in" : "Ekin saklanmasını istediğiniz bir klasör seçin",
@@ -20,19 +18,20 @@ OC.L10N.register(
     "Unknown error" : "Bilinmeyen hata",
     "Error while creating an account: " : "Bir hesap oluştururken hata:",
     "Connect" : "Bağlan",
-    "Sending …" : "Gönderiliyor...",
-    "Reply" : "Yanıtla",
-    "Message sent!" : "Mesaj gönderildi!",
-    "Error sending the reply." : "Yanıt gönderilirken hata.",
     "Error while deleting account." : "Hesap silinirken hata.",
     "Choose a file to add as attachment" : "Ek olarak eklemek için bir dosya seçin",
+    "Reply" : "Yanıtla",
+    "Send" : "Gönder",
+    "Sending …" : "Gönderiliyor...",
+    "Message sent!" : "Mesaj gönderildi!",
+    "you" : "siz",
+    "Send message to {email}" : "{email} adresine ileti gönder",
     "Message could not be starred. Please try again." : "İleti yıldızlanamadı. Lütfen yeniden deneyin.",
     "Error while deleting message." : "İleti silinirken hata.",
     "Checking mail …" : "Posta denetleniyor...",
     "Loading …" : "Yükleniyor...",
     "Load more …" : "Daha fazla yükle...",
     "Check messages …" : "Mesajları denetle ...",
-    "Send" : "Gönder",
     "Inbox" : "Gelen Kutusu",
     "Sent" : "Gönderilenler",
     "Drafts" : "Taslaklar",
@@ -52,16 +51,13 @@ OC.L10N.register(
     "bcc" : "bcc",
     "Subject" : "Konu",
     "Message …" : "İleti ...",
-    "Add attachment from Files" : "Dosyalardan ek ekle",
     "Open Mail App" : "Posta Uygulamasını Aç",
     "Back to website" : "Web sitesine geri dön",
+    "Add attachment from Files" : "Dosyalardan ek ekle",
     "Error loading message" : "İleti yüklenirken hata",
     "Download attachment" : "Eki indir",
     "Save to Files" : "Dosyalara Kaydet",
     "Save all to Files" : "Tümünü Dosyalara Kaydet",
-    "+ cc" : "+ cc",
-    "Reply …" : "Yanıtla...",
-    "Forward" : "İlet",
     "Delete" : "Sil",
     "Add mail account" : "Posta hesabı ekle",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "E-postalarınızı şifrelemek mi istiyorsunuz? <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope tarayıcı uzantısını</a> yükleyin!",
diff --git a/l10n/tr.json b/l10n/tr.json
index 2b9c6a1f0..adb25f93a 100644
--- a/l10n/tr.json
+++ b/l10n/tr.json
@@ -2,8 +2,6 @@
     "Mail" : "Posta",
     "Error while loading the accounts." : "Hesaplar yüklenirken hata.",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["{folderName} içerisinde %n yeni ileti\nkimden: {from}","{folderName} içerisinde %n yeni ileti\nkimden: {from}"],
-    "you" : "siz",
-    "Send message to {email}" : "{email} adresine ileti gönder",
     "Error while loading the selected account." : "Seçili hesap yüklenirken hata.",
     "Error while loading messages." : "İletiler yüklenirken hata.",
     "Choose a folder to store the attachment in" : "Ekin saklanmasını istediğiniz bir klasör seçin",
@@ -18,19 +16,20 @@
     "Unknown error" : "Bilinmeyen hata",
     "Error while creating an account: " : "Bir hesap oluştururken hata:",
     "Connect" : "Bağlan",
-    "Sending …" : "Gönderiliyor...",
-    "Reply" : "Yanıtla",
-    "Message sent!" : "Mesaj gönderildi!",
-    "Error sending the reply." : "Yanıt gönderilirken hata.",
     "Error while deleting account." : "Hesap silinirken hata.",
     "Choose a file to add as attachment" : "Ek olarak eklemek için bir dosya seçin",
+    "Reply" : "Yanıtla",
+    "Send" : "Gönder",
+    "Sending …" : "Gönderiliyor...",
+    "Message sent!" : "Mesaj gönderildi!",
+    "you" : "siz",
+    "Send message to {email}" : "{email} adresine ileti gönder",
     "Message could not be starred. Please try again." : "İleti yıldızlanamadı. Lütfen yeniden deneyin.",
     "Error while deleting message." : "İleti silinirken hata.",
     "Checking mail …" : "Posta denetleniyor...",
     "Loading …" : "Yükleniyor...",
     "Load more …" : "Daha fazla yükle...",
     "Check messages …" : "Mesajları denetle ...",
-    "Send" : "Gönder",
     "Inbox" : "Gelen Kutusu",
     "Sent" : "Gönderilenler",
     "Drafts" : "Taslaklar",
@@ -50,16 +49,13 @@
     "bcc" : "bcc",
     "Subject" : "Konu",
     "Message …" : "İleti ...",
-    "Add attachment from Files" : "Dosyalardan ek ekle",
     "Open Mail App" : "Posta Uygulamasını Aç",
     "Back to website" : "Web sitesine geri dön",
+    "Add attachment from Files" : "Dosyalardan ek ekle",
     "Error loading message" : "İleti yüklenirken hata",
     "Download attachment" : "Eki indir",
     "Save to Files" : "Dosyalara Kaydet",
     "Save all to Files" : "Tümünü Dosyalara Kaydet",
-    "+ cc" : "+ cc",
-    "Reply …" : "Yanıtla...",
-    "Forward" : "İlet",
     "Delete" : "Sil",
     "Add mail account" : "Posta hesabı ekle",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "E-postalarınızı şifrelemek mi istiyorsunuz? <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope tarayıcı uzantısını</a> yükleyin!",
diff --git a/l10n/uk.js b/l10n/uk.js
index c9dd2b32b..7bca0a378 100644
--- a/l10n/uk.js
+++ b/l10n/uk.js
@@ -5,7 +5,6 @@ OC.L10N.register(
     "Error while loading the accounts." : "Помилка завантаження облікового запису",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n нове повідомлення у {folderName}\nвід {from}","%n нових повідомлень у {folderName}\nвід {from}","%n нових повідомлень у {folderName}\nвід {from}"],
-    "you" : "ви",
     "Error while loading the selected account." : "Помилка завантаження обраного облікового запису.",
     "Error while loading messages." : "Помилка завантаження повідомлень.",
     "Choose a folder to store the attachment in" : "Оберіть теку для зберігання вкладень",
@@ -20,19 +19,19 @@ OC.L10N.register(
     "Unknown error" : "Невідома помилка",
     "Error while creating an account: " : "Помилка при створенні облікового запису:",
     "Connect" : "З'єднати",
-    "Sending …" : "Надсилання...",
-    "Reply" : "Відповісти",
-    "Message sent!" : "Повідомлення відправлено!",
-    "Error sending the reply." : "Помилка надсилання відповіді.",
     "Error while deleting account." : "Помилка при видалені облікового запису.",
     "Choose a file to add as attachment" : "Обрати файл для вкладення",
+    "Reply" : "Відповісти",
+    "Send" : "Надіслати",
+    "Sending …" : "Надсилання...",
+    "Message sent!" : "Повідомлення відправлено!",
+    "you" : "ви",
     "Message could not be starred. Please try again." : "Не вдалося відмітити повідомлення. Будь ласка, спробуйте ще раз.",
     "Error while deleting message." : "Помилка видалення повідомлення.",
     "Checking mail …" : "Перевірка пошту ...",
     "Loading …" : "Завантаження...",
     "Load more …" : "Завантажити ще ...",
     "Check messages …" : "Перевірити повідомлення ...",
-    "Send" : "Надіслати",
     "Inbox" : "Вхідні",
     "Sent" : "Надіслані",
     "Drafts" : "Чорновики",
@@ -52,16 +51,13 @@ OC.L10N.register(
     "bcc" : "Прихована копія",
     "Subject" : "Тема",
     "Message …" : "Повідомлення ...",
-    "Add attachment from Files" : "Додати вкладення з Файлів",
     "Open Mail App" : "Відкрити поштовий додаток",
     "Back to website" : "Повернутися до веб-сайту",
+    "Add attachment from Files" : "Додати вкладення з Файлів",
     "Error loading message" : "Помилка завантаження повідомлення.",
     "Download attachment" : "Завантажити вкладення",
     "Save to Files" : "Зберегти до Файлів",
     "Save all to Files" : "Зберегти усе до Файлів",
-    "+ cc" : "+ Копія",
-    "Reply …" : "Відповісти ...",
-    "Forward" : "Переслати",
     "Delete" : "Видалити",
     "Add mail account" : "Додати обліковий запис пошти",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Бажаєте зашифрувати свою електронну пошту? Встановіть <a href=\"https://www.mailvelope.com/\" target=\"_blank\">розширення для браузера Mailvelope </a>!",
diff --git a/l10n/uk.json b/l10n/uk.json
index 5c8f9b796..f9f305321 100644
--- a/l10n/uk.json
+++ b/l10n/uk.json
@@ -3,7 +3,6 @@
     "Error while loading the accounts." : "Помилка завантаження облікового запису",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n нове повідомлення у {folderName}\nвід {from}","%n нових повідомлень у {folderName}\nвід {from}","%n нових повідомлень у {folderName}\nвід {from}"],
-    "you" : "ви",
     "Error while loading the selected account." : "Помилка завантаження обраного облікового запису.",
     "Error while loading messages." : "Помилка завантаження повідомлень.",
     "Choose a folder to store the attachment in" : "Оберіть теку для зберігання вкладень",
@@ -18,19 +17,19 @@
     "Unknown error" : "Невідома помилка",
     "Error while creating an account: " : "Помилка при створенні облікового запису:",
     "Connect" : "З'єднати",
-    "Sending …" : "Надсилання...",
-    "Reply" : "Відповісти",
-    "Message sent!" : "Повідомлення відправлено!",
-    "Error sending the reply." : "Помилка надсилання відповіді.",
     "Error while deleting account." : "Помилка при видалені облікового запису.",
     "Choose a file to add as attachment" : "Обрати файл для вкладення",
+    "Reply" : "Відповісти",
+    "Send" : "Надіслати",
+    "Sending …" : "Надсилання...",
+    "Message sent!" : "Повідомлення відправлено!",
+    "you" : "ви",
     "Message could not be starred. Please try again." : "Не вдалося відмітити повідомлення. Будь ласка, спробуйте ще раз.",
     "Error while deleting message." : "Помилка видалення повідомлення.",
     "Checking mail …" : "Перевірка пошту ...",
     "Loading …" : "Завантаження...",
     "Load more …" : "Завантажити ще ...",
     "Check messages …" : "Перевірити повідомлення ...",
-    "Send" : "Надіслати",
     "Inbox" : "Вхідні",
     "Sent" : "Надіслані",
     "Drafts" : "Чорновики",
@@ -50,16 +49,13 @@
     "bcc" : "Прихована копія",
     "Subject" : "Тема",
     "Message …" : "Повідомлення ...",
-    "Add attachment from Files" : "Додати вкладення з Файлів",
     "Open Mail App" : "Відкрити поштовий додаток",
     "Back to website" : "Повернутися до веб-сайту",
+    "Add attachment from Files" : "Додати вкладення з Файлів",
     "Error loading message" : "Помилка завантаження повідомлення.",
     "Download attachment" : "Завантажити вкладення",
     "Save to Files" : "Зберегти до Файлів",
     "Save all to Files" : "Зберегти усе до Файлів",
-    "+ cc" : "+ Копія",
-    "Reply …" : "Відповісти ...",
-    "Forward" : "Переслати",
     "Delete" : "Видалити",
     "Add mail account" : "Додати обліковий запис пошти",
     "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Бажаєте зашифрувати свою електронну пошту? Встановіть <a href=\"https://www.mailvelope.com/\" target=\"_blank\">розширення для браузера Mailvelope </a>!",