[tx-robot] updated from transifex

62 files changed, 216 insertions, 30 deletions

diff --git a/l10n/ast.js b/l10n/ast.js
index ffc5894f7..d22798aa7 100644
--- a/l10n/ast.js
+++ b/l10n/ast.js
@@ -37,6 +37,7 @@ OC.L10N.register(
     "Starred" : "Favoritos",
     "Creating account failed: " : "Fallu creando la cuenta:",
     "Auto detect failed. Please use manual mode." : "Falló l'autodeteición. Por favor, usa el mou manual.",
+    "Delete permanently" : "Desaniciar dafechu",
     "from" : "Dende",
     "+ cc/bcc" : "+ cc/cct",
     "to" : "hasta",
@@ -54,6 +55,7 @@ OC.L10N.register(
     "+ 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",
     "Name" : "Nome",
diff --git a/l10n/ast.json b/l10n/ast.json
index 47f8a2453..fc322351e 100644
--- a/l10n/ast.json
+++ b/l10n/ast.json
@@ -35,6 +35,7 @@
     "Starred" : "Favoritos",
     "Creating account failed: " : "Fallu creando la cuenta:",
     "Auto detect failed. Please use manual mode." : "Falló l'autodeteición. Por favor, usa el mou manual.",
+    "Delete permanently" : "Desaniciar dafechu",
     "from" : "Dende",
     "+ cc/bcc" : "+ cc/cct",
     "to" : "hasta",
@@ -52,6 +53,7 @@
     "+ 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",
     "Name" : "Nome",
diff --git a/l10n/az.js b/l10n/az.js
index d78d16df2..c26f2dbaf 100644
--- a/l10n/az.js
+++ b/l10n/az.js
@@ -37,6 +37,7 @@ OC.L10N.register(
     "Starred" : "Ulduzlu",
     "Creating account failed: " : "Hesabın yaradılmasında səhv:",
     "Auto detect failed. Please use manual mode." : "Avtomatik təyinatda səhv baş verdi. Xahiş olunur əl rejimini seçəsiniz.",
+    "Delete permanently" : "Həmişəlik sil",
     "from" : "ondan",
     "+ cc/bcc" : "+ cc/bcc",
     "to" : "doğru",
@@ -54,6 +55,7 @@ OC.L10N.register(
     "+ 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",
     "Name" : "Ad",
diff --git a/l10n/az.json b/l10n/az.json
index f9508f1ed..fc83a774c 100644
--- a/l10n/az.json
+++ b/l10n/az.json
@@ -35,6 +35,7 @@
     "Starred" : "Ulduzlu",
     "Creating account failed: " : "Hesabın yaradılmasında səhv:",
     "Auto detect failed. Please use manual mode." : "Avtomatik təyinatda səhv baş verdi. Xahiş olunur əl rejimini seçəsiniz.",
+    "Delete permanently" : "Həmişəlik sil",
     "from" : "ondan",
     "+ cc/bcc" : "+ cc/bcc",
     "to" : "doğru",
@@ -52,6 +53,7 @@
     "+ 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",
     "Name" : "Ad",
diff --git a/l10n/bg_BG.js b/l10n/bg_BG.js
index def7265cb..859d00dd5 100644
--- a/l10n/bg_BG.js
+++ b/l10n/bg_BG.js
@@ -37,6 +37,7 @@ OC.L10N.register(
     "Starred" : "Отбелязана",
     "Creating account failed: " : "Създаване на профила неуспешно:",
     "Auto detect failed. Please use manual mode." : "Неуспешни автоматични настройки. Моля, използвай ръчен режим.",
+    "Delete permanently" : "Изтрий завинаги",
     "from" : "от",
     "+ cc/bcc" : "+ cc/bcc",
     "to" : "до",
@@ -54,6 +55,7 @@ OC.L10N.register(
     "+ cc" : "+ cc",
     "Reply …" : "Отговори...",
     "Forward" : "Препрати",
+    "Delete" : "Изтриване",
     "No messages in this folder!" : "Няма съобщение в тази папка!",
     "New message" : "Ново Съобщение",
     "Connect your mail account" : "Свържи имейла си",
diff --git a/l10n/bg_BG.json b/l10n/bg_BG.json
index 59d41400b..8f46bbcd9 100644
--- a/l10n/bg_BG.json
+++ b/l10n/bg_BG.json
@@ -35,6 +35,7 @@
     "Starred" : "Отбелязана",
     "Creating account failed: " : "Създаване на профила неуспешно:",
     "Auto detect failed. Please use manual mode." : "Неуспешни автоматични настройки. Моля, използвай ръчен режим.",
+    "Delete permanently" : "Изтрий завинаги",
     "from" : "от",
     "+ cc/bcc" : "+ cc/bcc",
     "to" : "до",
@@ -52,6 +53,7 @@
     "+ cc" : "+ cc",
     "Reply …" : "Отговори...",
     "Forward" : "Препрати",
+    "Delete" : "Изтриване",
     "No messages in this folder!" : "Няма съобщение в тази папка!",
     "New message" : "Ново Съобщение",
     "Connect your mail account" : "Свържи имейла си",
diff --git a/l10n/cs_CZ.js b/l10n/cs_CZ.js
index b9ae1bd06..7d7662b70 100644
--- a/l10n/cs_CZ.js
+++ b/l10n/cs_CZ.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Mail" : "Pošta",
     "Error while loading the accounts." : "Chyba při načítání účtů.",
-    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} nových zpráv v {folderName} \nod {from}",
     "you" : "vy",
     "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.",
@@ -12,6 +11,7 @@ OC.L10N.register(
     "Attachment saved to Files." : "Příloha uložena do Souborů.",
     "Error while saving attachments to Files." : "Chyba při ukládání příloh do Souborů.",
     "Error while saving attachment to Files." : "Chyba při ukládání přílohy do Souborů.",
+    "Opening HTML drafts is not supported yet." : "Otevírání HTML konceptů ještě není podporováno.",
     "Error while loading the selected message." : "Chyba při načítání vybrané zprávy.",
     "Connecting …" : "Připojuji ...",
     "Unknown error" : "Neznámá chyba",
@@ -30,6 +30,7 @@ OC.L10N.register(
     "Load more …" : "Načíst další ...",
     "Check messages …" : "Zkontrolovat zprávy ...",
     "Send" : "Odeslat",
+    "Draft saved!" : "Koncept uložen!",
     "Inbox" : "Doručená",
     "Sent" : "Odeslaná",
     "Drafts" : "Koncepty",
@@ -40,6 +41,7 @@ OC.L10N.register(
     "Starred" : "S hvězdičkou",
     "Creating account failed: " : "Vytvoření účtu selhalo:",
     "Auto detect failed. Please use manual mode." : "Autodetekce selhala. Použijte prosím ruční nastavení.",
+    "Delete permanently" : "Trvale odstranit",
     "& others" : "a další",
     "from" : "od",
     "+ cc/bcc" : "+cc/bcc",
@@ -58,7 +60,9 @@ OC.L10N.register(
     "+ 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>!",
     "No search results for {{searchTerm}}" : "Žádné nálezy pro {{searchTerm}}",
     "No messages in this folder!" : "Žádné zprávy v této složce!",
     "New message" : "Nová zpráva",
diff --git a/l10n/cs_CZ.json b/l10n/cs_CZ.json
index b4b3b96b4..44e02aa9c 100644
--- a/l10n/cs_CZ.json
+++ b/l10n/cs_CZ.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Mail" : "Pošta",
     "Error while loading the accounts." : "Chyba při načítání účtů.",
-    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} nových zpráv v {folderName} \nod {from}",
     "you" : "vy",
     "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.",
@@ -10,6 +9,7 @@
     "Attachment saved to Files." : "Příloha uložena do Souborů.",
     "Error while saving attachments to Files." : "Chyba při ukládání příloh do Souborů.",
     "Error while saving attachment to Files." : "Chyba při ukládání přílohy do Souborů.",
+    "Opening HTML drafts is not supported yet." : "Otevírání HTML konceptů ještě není podporováno.",
     "Error while loading the selected message." : "Chyba při načítání vybrané zprávy.",
     "Connecting …" : "Připojuji ...",
     "Unknown error" : "Neznámá chyba",
@@ -28,6 +28,7 @@
     "Load more …" : "Načíst další ...",
     "Check messages …" : "Zkontrolovat zprávy ...",
     "Send" : "Odeslat",
+    "Draft saved!" : "Koncept uložen!",
     "Inbox" : "Doručená",
     "Sent" : "Odeslaná",
     "Drafts" : "Koncepty",
@@ -38,6 +39,7 @@
     "Starred" : "S hvězdičkou",
     "Creating account failed: " : "Vytvoření účtu selhalo:",
     "Auto detect failed. Please use manual mode." : "Autodetekce selhala. Použijte prosím ruční nastavení.",
+    "Delete permanently" : "Trvale odstranit",
     "& others" : "a další",
     "from" : "od",
     "+ cc/bcc" : "+cc/bcc",
@@ -56,7 +58,9 @@
     "+ 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>!",
     "No search results for {{searchTerm}}" : "Žádné nálezy pro {{searchTerm}}",
     "No messages in this folder!" : "Žádné zprávy v této složce!",
     "New message" : "Nová zpráva",
diff --git a/l10n/da.js b/l10n/da.js
index efdcea850..8d4c83eaa 100644
--- a/l10n/da.js
+++ b/l10n/da.js
@@ -39,6 +39,7 @@ OC.L10N.register(
     "Starred" : "Stjernemarkéret",
     "Creating account failed: " : "Oprettelse af konto mislykkedes:",
     "Auto detect failed. Please use manual mode." : "Fejl ved autodetektion. Anvend venligst manuel opsætning",
+    "Delete permanently" : "Slet permanent",
     "from" : "fra",
     "+ cc/bcc" : "+ cc/bcc",
     "to" : "til",
@@ -56,6 +57,7 @@ OC.L10N.register(
     "+ cc" : "+ cc",
     "Reply …" : "Besvar ...",
     "Forward" : "Videresend",
+    "Delete" : "Slet",
     "Add mail account" : "Tilføj postkonto",
     "No messages in this folder!" : "Ingen beskeder i denne mappe!",
     "New message" : "Ny besked",
diff --git a/l10n/da.json b/l10n/da.json
index bb12b65f9..809fa3ade 100644
--- a/l10n/da.json
+++ b/l10n/da.json
@@ -37,6 +37,7 @@
     "Starred" : "Stjernemarkéret",
     "Creating account failed: " : "Oprettelse af konto mislykkedes:",
     "Auto detect failed. Please use manual mode." : "Fejl ved autodetektion. Anvend venligst manuel opsætning",
+    "Delete permanently" : "Slet permanent",
     "from" : "fra",
     "+ cc/bcc" : "+ cc/bcc",
     "to" : "til",
@@ -54,6 +55,7 @@
     "+ cc" : "+ cc",
     "Reply …" : "Besvar ...",
     "Forward" : "Videresend",
+    "Delete" : "Slet",
     "Add mail account" : "Tilføj postkonto",
     "No messages in this folder!" : "Ingen beskeder i denne mappe!",
     "New message" : "Ny besked",
diff --git a/l10n/de.js b/l10n/de.js
index 7e23f7a20..2a4f8809d 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Mail" : "Mail",
     "Error while loading the accounts." : "Fehler beim Laden der Konten.",
-    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} neue Nachrichten in {folderName} \nvon {from}",
     "you" : "Du",
     "Error while loading the selected account." : "Fehler beim Laden des ausgewählten Kontos.",
     "Error while loading messages." : "Fehler beim Laden der Nachrichten.",
@@ -30,6 +29,7 @@ OC.L10N.register(
     "Load more …" : "Weitere laden…",
     "Check messages …" : "Nachrichten überprüfen…",
     "Send" : "Senden",
+    "Draft saved!" : "Entwurf gespeichert!",
     "Inbox" : "Posteingang",
     "Sent" : "Gesendet",
     "Drafts" : "Entwürfe",
@@ -40,6 +40,7 @@ OC.L10N.register(
     "Starred" : "Favorisiert",
     "Creating account failed: " : "Kontoerstellung fehlgeschlagen:",
     "Auto detect failed. Please use manual mode." : "Automatische Erkennung fehlgeschlagen. Bitte nutze den manuellen Modus.",
+    "Delete permanently" : "Endgültig löschen",
     "& others" : "& weitere",
     "from" : "von",
     "+ cc/bcc" : "+ CC/BCC",
@@ -58,6 +59,7 @@ OC.L10N.register(
     "+ cc" : "+ CC",
     "Reply …" : "Antwort…",
     "Forward" : "Weiterleiten",
+    "Delete" : "Löschen",
     "Add mail account" : "E-Mail-Konto hinzufügen",
     "No search results for {{searchTerm}}" : "Keine Suchergebnisse zu {{searchTerm}}",
     "No messages in this folder!" : "Keine Nachrichten in diesem Ordner gefunden!",
diff --git a/l10n/de.json b/l10n/de.json
index 73bdf5019..bda95eaf3 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Mail" : "Mail",
     "Error while loading the accounts." : "Fehler beim Laden der Konten.",
-    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} neue Nachrichten in {folderName} \nvon {from}",
     "you" : "Du",
     "Error while loading the selected account." : "Fehler beim Laden des ausgewählten Kontos.",
     "Error while loading messages." : "Fehler beim Laden der Nachrichten.",
@@ -28,6 +27,7 @@
     "Load more …" : "Weitere laden…",
     "Check messages …" : "Nachrichten überprüfen…",
     "Send" : "Senden",
+    "Draft saved!" : "Entwurf gespeichert!",
     "Inbox" : "Posteingang",
     "Sent" : "Gesendet",
     "Drafts" : "Entwürfe",
@@ -38,6 +38,7 @@
     "Starred" : "Favorisiert",
     "Creating account failed: " : "Kontoerstellung fehlgeschlagen:",
     "Auto detect failed. Please use manual mode." : "Automatische Erkennung fehlgeschlagen. Bitte nutze den manuellen Modus.",
+    "Delete permanently" : "Endgültig löschen",
     "& others" : "& weitere",
     "from" : "von",
     "+ cc/bcc" : "+ CC/BCC",
@@ -56,6 +57,7 @@
     "+ cc" : "+ CC",
     "Reply …" : "Antwort…",
     "Forward" : "Weiterleiten",
+    "Delete" : "Löschen",
     "Add mail account" : "E-Mail-Konto hinzufügen",
     "No search results for {{searchTerm}}" : "Keine Suchergebnisse zu {{searchTerm}}",
     "No messages in this folder!" : "Keine Nachrichten in diesem Ordner gefunden!",
diff --git a/l10n/de_DE.js b/l10n/de_DE.js
index d51b44f32..a7bde881c 100644
--- a/l10n/de_DE.js
+++ b/l10n/de_DE.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Mail" : "Mail",
     "Error while loading the accounts." : "Fehler beim Laden der Konten.",
-    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} neue Nachrichten in {folderName}\nvon {from}",
     "you" : "Sie",
     "Error while loading the selected account." : "Fehler beim Laden des ausgewählten Kontos.",
     "Error while loading messages." : "Fehler beim Laden der Nachrichten.",
@@ -30,6 +29,7 @@ OC.L10N.register(
     "Load more …" : "Weitere laden…",
     "Check messages …" : "Nachrichten überprüfen…",
     "Send" : "Senden",
+    "Draft saved!" : "Entwurf gespeichert!",
     "Inbox" : "Posteingang",
     "Sent" : "Gesendet",
     "Drafts" : "Entwürfe",
@@ -40,6 +40,7 @@ OC.L10N.register(
     "Starred" : "Favorisiert",
     "Creating account failed: " : "Erstellung des Kontos ist fehlgeschlagen:",
     "Auto detect failed. Please use manual mode." : "Automatische Erkennung fehlgeschlagen. Bitte nutzen Sie den manuellen Modus.",
+    "Delete permanently" : "Endgültig löschen",
     "& others" : "& weitere",
     "from" : "von",
     "+ cc/bcc" : "+ CC/BCC",
@@ -58,6 +59,7 @@ OC.L10N.register(
     "+ cc" : "+ CC",
     "Reply …" : "Antworten…",
     "Forward" : "Weiterleiten",
+    "Delete" : "Löschen",
     "Add mail account" : "E-Mail-Konto hinzufügen",
     "No search results for {{searchTerm}}" : "Keine Suchergebnisse zu {{searchTerm}}",
     "No messages in this folder!" : "Keine Nachrichten in diesem Ordner gefunden!",
diff --git a/l10n/de_DE.json b/l10n/de_DE.json
index fcbf74c74..8b7b9abc8 100644
--- a/l10n/de_DE.json
+++ b/l10n/de_DE.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Mail" : "Mail",
     "Error while loading the accounts." : "Fehler beim Laden der Konten.",
-    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} neue Nachrichten in {folderName}\nvon {from}",
     "you" : "Sie",
     "Error while loading the selected account." : "Fehler beim Laden des ausgewählten Kontos.",
     "Error while loading messages." : "Fehler beim Laden der Nachrichten.",
@@ -28,6 +27,7 @@
     "Load more …" : "Weitere laden…",
     "Check messages …" : "Nachrichten überprüfen…",
     "Send" : "Senden",
+    "Draft saved!" : "Entwurf gespeichert!",
     "Inbox" : "Posteingang",
     "Sent" : "Gesendet",
     "Drafts" : "Entwürfe",
@@ -38,6 +38,7 @@
     "Starred" : "Favorisiert",
     "Creating account failed: " : "Erstellung des Kontos ist fehlgeschlagen:",
     "Auto detect failed. Please use manual mode." : "Automatische Erkennung fehlgeschlagen. Bitte nutzen Sie den manuellen Modus.",
+    "Delete permanently" : "Endgültig löschen",
     "& others" : "& weitere",
     "from" : "von",
     "+ cc/bcc" : "+ CC/BCC",
@@ -56,6 +57,7 @@
     "+ cc" : "+ CC",
     "Reply …" : "Antworten…",
     "Forward" : "Weiterleiten",
+    "Delete" : "Löschen",
     "Add mail account" : "E-Mail-Konto hinzufügen",
     "No search results for {{searchTerm}}" : "Keine Suchergebnisse zu {{searchTerm}}",
     "No messages in this folder!" : "Keine Nachrichten in diesem Ordner gefunden!",
diff --git a/l10n/el.js b/l10n/el.js
index 91ddc3d59..451e16622 100644
--- a/l10n/el.js
+++ b/l10n/el.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Mail" : "Αλληλογραφία",
     "Error while loading the accounts." : "Σφάλμα κατά τη φόρτωση των λογαριασμών.",
-    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} νέα μηνύματα σε {folderName} \nαπό {from}",
     "you" : "εσείς",
     "Error while loading the selected account." : "Σφάλμα κατά τη φόρτωση του επιλεγμένου λογαριασμού.",
     "Error while loading messages." : "Σφάλμα κατά τη φόρτωση μηνυμάτων.",
@@ -12,6 +11,7 @@ OC.L10N.register(
     "Attachment saved to Files." : "Το συνημμένο αποθηκεύτηκε στα Έγγραφα.",
     "Error while saving attachments to Files." : "Σφάλμα κατά την αποθήκευση των συνημμένων στα Έγγραφα.",
     "Error while saving attachment to Files." : "Σφάλμα κατά την αποθήκευση του συνημμένου στα Έγγραφα.",
+    "Opening HTML drafts is not supported yet." : "Το άνοιγμα HTML προχείρων  δεν υποστηρίζεται ακόμη.",
     "Error while loading the selected message." : "Σφάλμα κατά τη φόρτωση του επιλεγμένου μηνύματος.",
     "Connecting …" : "Σύνδεση ...",
     "Unknown error" : "Άγνωστο σφάλμα",
@@ -30,6 +30,7 @@ OC.L10N.register(
     "Load more …" : "Φόρτωση περισσότερων...",
     "Check messages …" : "Έλεγχος μηνυμάτων ...",
     "Send" : "Αποστολή",
+    "Draft saved!" : "Το πρόχειρο αποθηκεύτηκε!",
     "Inbox" : "Εισερχόμενα",
     "Sent" : "Απεστάλη",
     "Drafts" : "Πρόχειρα",
@@ -40,6 +41,7 @@ OC.L10N.register(
     "Starred" : "Με αστέρι",
     "Creating account failed: " : "Η δημιουργία λογαριασμού απέτυχε:",
     "Auto detect failed. Please use manual mode." : " Η αυτόματη ανίχνευση απέτυχε. Παρακαλούμε χρησιμοποιήστε τη χειροκίνητη λειτουργία.",
+    "Delete permanently" : "Μόνιμη διαγραφή",
     "& others" : "& άλλοι",
     "from" : "από",
     "+ cc/bcc" : "+ cc/bcc",
@@ -58,7 +60,9 @@ OC.L10N.register(
     "+ 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>!",
     "No search results for {{searchTerm}}" : "Κανένα αποτέλεσμα αναζήτησης για {{searchTerm}}",
     "No messages in this folder!" : "Δεν υπάρχουν μηνύματα σε αυτό το φάκελο!",
     "New message" : "Νέο μήνυμα",
diff --git a/l10n/el.json b/l10n/el.json
index 85d4117ff..9cd55948a 100644
--- a/l10n/el.json
+++ b/l10n/el.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Mail" : "Αλληλογραφία",
     "Error while loading the accounts." : "Σφάλμα κατά τη φόρτωση των λογαριασμών.",
-    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} νέα μηνύματα σε {folderName} \nαπό {from}",
     "you" : "εσείς",
     "Error while loading the selected account." : "Σφάλμα κατά τη φόρτωση του επιλεγμένου λογαριασμού.",
     "Error while loading messages." : "Σφάλμα κατά τη φόρτωση μηνυμάτων.",
@@ -10,6 +9,7 @@
     "Attachment saved to Files." : "Το συνημμένο αποθηκεύτηκε στα Έγγραφα.",
     "Error while saving attachments to Files." : "Σφάλμα κατά την αποθήκευση των συνημμένων στα Έγγραφα.",
     "Error while saving attachment to Files." : "Σφάλμα κατά την αποθήκευση του συνημμένου στα Έγγραφα.",
+    "Opening HTML drafts is not supported yet." : "Το άνοιγμα HTML προχείρων  δεν υποστηρίζεται ακόμη.",
     "Error while loading the selected message." : "Σφάλμα κατά τη φόρτωση του επιλεγμένου μηνύματος.",
     "Connecting …" : "Σύνδεση ...",
     "Unknown error" : "Άγνωστο σφάλμα",
@@ -28,6 +28,7 @@
     "Load more …" : "Φόρτωση περισσότερων...",
     "Check messages …" : "Έλεγχος μηνυμάτων ...",
     "Send" : "Αποστολή",
+    "Draft saved!" : "Το πρόχειρο αποθηκεύτηκε!",
     "Inbox" : "Εισερχόμενα",
     "Sent" : "Απεστάλη",
     "Drafts" : "Πρόχειρα",
@@ -38,6 +39,7 @@
     "Starred" : "Με αστέρι",
     "Creating account failed: " : "Η δημιουργία λογαριασμού απέτυχε:",
     "Auto detect failed. Please use manual mode." : " Η αυτόματη ανίχνευση απέτυχε. Παρακαλούμε χρησιμοποιήστε τη χειροκίνητη λειτουργία.",
+    "Delete permanently" : "Μόνιμη διαγραφή",
     "& others" : "& άλλοι",
     "from" : "από",
     "+ cc/bcc" : "+ cc/bcc",
@@ -56,7 +58,9 @@
     "+ 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>!",
     "No search results for {{searchTerm}}" : "Κανένα αποτέλεσμα αναζήτησης για {{searchTerm}}",
     "No messages in this folder!" : "Δεν υπάρχουν μηνύματα σε αυτό το φάκελο!",
     "New message" : "Νέο μήνυμα",
diff --git a/l10n/en_GB.js b/l10n/en_GB.js
index 64c358b24..a460a9635 100644
--- a/l10n/en_GB.js
+++ b/l10n/en_GB.js
@@ -39,6 +39,7 @@ OC.L10N.register(
     "Starred" : "Starred",
     "Creating account failed: " : "Creating account failed: ",
     "Auto detect failed. Please use manual mode." : "Auto detect failed. Please use manual mode.",
+    "Delete permanently" : "Delete permanently",
     "from" : "from",
     "+ cc/bcc" : "+ cc/bcc",
     "to" : "to",
@@ -56,6 +57,7 @@ OC.L10N.register(
     "+ cc" : "+ cc",
     "Reply …" : "Reply…",
     "Forward" : "Forward",
+    "Delete" : "Delete",
     "Add mail account" : "Add mail account",
     "No messages in this folder!" : "No messages in this folder!",
     "New message" : "New message",
diff --git a/l10n/en_GB.json b/l10n/en_GB.json
index 9967e7dbf..b97a8fb75 100644
--- a/l10n/en_GB.json
+++ b/l10n/en_GB.json
@@ -37,6 +37,7 @@
     "Starred" : "Starred",
     "Creating account failed: " : "Creating account failed: ",
     "Auto detect failed. Please use manual mode." : "Auto detect failed. Please use manual mode.",
+    "Delete permanently" : "Delete permanently",
     "from" : "from",
     "+ cc/bcc" : "+ cc/bcc",
     "to" : "to",
@@ -54,6 +55,7 @@
     "+ cc" : "+ cc",
     "Reply …" : "Reply…",
     "Forward" : "Forward",
+    "Delete" : "Delete",
     "Add mail account" : "Add mail account",
     "No messages in this folder!" : "No messages in this folder!",
     "New message" : "New message",
diff --git a/l10n/es.js b/l10n/es.js
index c410c2c55..8f80ce626 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -11,6 +11,7 @@ OC.L10N.register(
     "Attachment saved to Files." : "Archivo adjunto guardado en Archivos.",
     "Error while saving attachments to Files." : "Error al guardar archivos adjuntos en Archivos.",
     "Error while saving attachment to Files." : "Error al guardar archivo adjunto en Archivos.",
+    "Opening HTML drafts is not supported yet." : "Abrir borradores HTML no está soportado aún",
     "Error while loading the selected message." : "Error al cargar el mensaje seleccionado.",
     "Connecting …" : "Conectando...",
     "Unknown error" : "Error desconocido",
@@ -29,6 +30,7 @@ OC.L10N.register(
     "Load more …" : "Cargar más...",
     "Check messages …" : "Comprobar mensajes...",
     "Send" : "Enviar",
+    "Draft saved!" : "!Borrador guardado¡",
     "Inbox" : "Recibidos",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -39,6 +41,7 @@ OC.L10N.register(
     "Starred" : "Destacado",
     "Creating account failed: " : "No se pudo crear la cuenta:",
     "Auto detect failed. Please use manual mode." : "La autodetección falló. Use el modo manual.",
+    "Delete permanently" : "Eliminar permanentemente",
     "& others" : "y otros",
     "from" : "Desde",
     "+ cc/bcc" : "+ cc/bcc",
@@ -57,7 +60,9 @@ OC.L10N.register(
     "+ 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>¡",
     "No search results for {{searchTerm}}" : "No hay resultados para {{searchTerm}}",
     "No messages in this folder!" : "No hay mensajes en esta carpeta!",
     "New message" : "Nuevo mensaje",
@@ -69,6 +74,8 @@ OC.L10N.register(
     "IMAP Host" : "Servidor IMAP",
     "IMAP security" : "Seguridad IMAP",
     "None" : "Ninguno",
+    "SSL/TLS" : "SSL/TLS",
+    "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "SMTP Host" : "Servidor SMTP",
diff --git a/l10n/es.json b/l10n/es.json
index 45bf682a9..4144bf3ef 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -9,6 +9,7 @@
     "Attachment saved to Files." : "Archivo adjunto guardado en Archivos.",
     "Error while saving attachments to Files." : "Error al guardar archivos adjuntos en Archivos.",
     "Error while saving attachment to Files." : "Error al guardar archivo adjunto en Archivos.",
+    "Opening HTML drafts is not supported yet." : "Abrir borradores HTML no está soportado aún",
     "Error while loading the selected message." : "Error al cargar el mensaje seleccionado.",
     "Connecting …" : "Conectando...",
     "Unknown error" : "Error desconocido",
@@ -27,6 +28,7 @@
     "Load more …" : "Cargar más...",
     "Check messages …" : "Comprobar mensajes...",
     "Send" : "Enviar",
+    "Draft saved!" : "!Borrador guardado¡",
     "Inbox" : "Recibidos",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -37,6 +39,7 @@
     "Starred" : "Destacado",
     "Creating account failed: " : "No se pudo crear la cuenta:",
     "Auto detect failed. Please use manual mode." : "La autodetección falló. Use el modo manual.",
+    "Delete permanently" : "Eliminar permanentemente",
     "& others" : "y otros",
     "from" : "Desde",
     "+ cc/bcc" : "+ cc/bcc",
@@ -55,7 +58,9 @@
     "+ 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>¡",
     "No search results for {{searchTerm}}" : "No hay resultados para {{searchTerm}}",
     "No messages in this folder!" : "No hay mensajes en esta carpeta!",
     "New message" : "Nuevo mensaje",
@@ -67,6 +72,8 @@
     "IMAP Host" : "Servidor IMAP",
     "IMAP security" : "Seguridad IMAP",
     "None" : "Ninguno",
+    "SSL/TLS" : "SSL/TLS",
+    "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "SMTP Host" : "Servidor SMTP",
diff --git a/l10n/et_EE.js b/l10n/et_EE.js
index 95a2037e9..44cd822c8 100644
--- a/l10n/et_EE.js
+++ b/l10n/et_EE.js
@@ -37,6 +37,7 @@ OC.L10N.register(
     "Starred" : "Tärniga märgitud",
     "Creating account failed: " : "Konto loomine ebaõnnestus:",
     "Auto detect failed. Please use manual mode." : "Automaatne tuvastus ebaõnnestus. Palun proovi käsitsi.",
+    "Delete permanently" : "Kustuta jäädavalt",
     "from" : "alates",
     "+ cc/bcc" : "+ cc/bcc",
     "to" : "kuni",
@@ -54,6 +55,7 @@ OC.L10N.register(
     "+ cc" : "+ cc",
     "Reply …" : "Vasta ...",
     "Forward" : "Edasta",
+    "Delete" : "Kustuta",
     "No messages in this folder!" : "Selles kaustas kirju pole!",
     "Connect your mail account" : "Ühenda oma e-posti konto",
     "Name" : "Nimi",
diff --git a/l10n/et_EE.json b/l10n/et_EE.json
index d42f42b14..4a16f05c8 100644
--- a/l10n/et_EE.json
+++ b/l10n/et_EE.json
@@ -35,6 +35,7 @@
     "Starred" : "Tärniga märgitud",
     "Creating account failed: " : "Konto loomine ebaõnnestus:",
     "Auto detect failed. Please use manual mode." : "Automaatne tuvastus ebaõnnestus. Palun proovi käsitsi.",
+    "Delete permanently" : "Kustuta jäädavalt",
     "from" : "alates",
     "+ cc/bcc" : "+ cc/bcc",
     "to" : "kuni",
@@ -52,6 +53,7 @@
     "+ cc" : "+ cc",
     "Reply …" : "Vasta ...",
     "Forward" : "Edasta",
+    "Delete" : "Kustuta",
     "No messages in this folder!" : "Selles kaustas kirju pole!",
     "Connect your mail account" : "Ühenda oma e-posti konto",
     "Name" : "Nimi",
diff --git a/l10n/eu.js b/l10n/eu.js
index ce03c187a..a94e40650 100644
--- a/l10n/eu.js
+++ b/l10n/eu.js
@@ -36,6 +36,7 @@ OC.L10N.register(
     "Starred" : "Izarduna",
     "Creating account failed: " : "Huts egin du kontua sortzen:",
     "Auto detect failed. Please use manual mode." : "Autodetekzioak huts egin du. Erabili eskuzko modua",
+    "Delete permanently" : "Ezabatu betirako",
     "from" : "lekua",
     "+ cc/bcc" : "+ cc/bcc",
     "to" : "Noiz arte",
@@ -53,6 +54,7 @@ OC.L10N.register(
     "+ 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",
     "Name" : "Izena",
diff --git a/l10n/eu.json b/l10n/eu.json
index f77e93229..500b05ffc 100644
--- a/l10n/eu.json
+++ b/l10n/eu.json
@@ -34,6 +34,7 @@
     "Starred" : "Izarduna",
     "Creating account failed: " : "Huts egin du kontua sortzen:",
     "Auto detect failed. Please use manual mode." : "Autodetekzioak huts egin du. Erabili eskuzko modua",
+    "Delete permanently" : "Ezabatu betirako",
     "from" : "lekua",
     "+ cc/bcc" : "+ cc/bcc",
     "to" : "Noiz arte",
@@ -51,6 +52,7 @@
     "+ 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",
     "Name" : "Izena",
diff --git a/l10n/fi_FI.js b/l10n/fi_FI.js
index 45bcc9586..a9b796373 100644
--- a/l10n/fi_FI.js
+++ b/l10n/fi_FI.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Mail" : "Sähköposti",
     "Error while loading the accounts." : "Virhe tilejä ladatessa.",
-    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} uutta viestiä kansiossa {folderName} \nlähettäjältä {from}",
     "you" : "sinä",
     "Error while loading the selected account." : "Virhe ladatessa valittua tiliä.",
     "Error while loading messages." : "Virhe viestejä ladatessa.",
@@ -12,6 +11,7 @@ OC.L10N.register(
     "Attachment saved to Files." : "Liite tallennettu tiedostoihin.",
     "Error while saving attachments to Files." : "Virhe tallennettaessa liitteitä tiedostoihin.",
     "Error while saving attachment to Files." : "Virhe tallennettaessa liitettä tiedostoihin.",
+    "Opening HTML drafts is not supported yet." : "HTML-luonnosten avaaminen ei ole vielä tuettu ominaisuus.",
     "Error while loading the selected message." : "Virhe ladatessa valittua viestiä.",
     "Connecting …" : "Yhdistetään…",
     "Unknown error" : "Tuntematon virhe",
@@ -30,6 +30,7 @@ OC.L10N.register(
     "Load more …" : "Lataa lisää…",
     "Check messages …" : "Tarkista viestit…",
     "Send" : "Lähetä",
+    "Draft saved!" : "Luonnos tallennettu!",
     "Inbox" : "Saapuneet",
     "Sent" : "Lähetetty",
     "Drafts" : "Luonnokset",
@@ -40,6 +41,7 @@ OC.L10N.register(
     "Starred" : "Suositut",
     "Creating account failed: " : "Tilin luominen epäonnistui:",
     "Auto detect failed. Please use manual mode." : "Automaattinen havaitseminen epäonnistui. Käytä manuaalitilaa.",
+    "Delete permanently" : "Poista pysyvästi",
     "& others" : "& muut",
     "from" : "Syöte:",
     "to" : "- ",
@@ -54,7 +56,9 @@ OC.L10N.register(
     "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>!",
     "No search results for {{searchTerm}}" : "Ei tuloksia haulle {{searchTerm}}",
     "No messages in this folder!" : "Tässä kansiossa ei ole viestejä!",
     "New message" : "Uusi viesti",
diff --git a/l10n/fi_FI.json b/l10n/fi_FI.json
index bd9ef67df..6aee8dd2c 100644
--- a/l10n/fi_FI.json
+++ b/l10n/fi_FI.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Mail" : "Sähköposti",
     "Error while loading the accounts." : "Virhe tilejä ladatessa.",
-    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} uutta viestiä kansiossa {folderName} \nlähettäjältä {from}",
     "you" : "sinä",
     "Error while loading the selected account." : "Virhe ladatessa valittua tiliä.",
     "Error while loading messages." : "Virhe viestejä ladatessa.",
@@ -10,6 +9,7 @@
     "Attachment saved to Files." : "Liite tallennettu tiedostoihin.",
     "Error while saving attachments to Files." : "Virhe tallennettaessa liitteitä tiedostoihin.",
     "Error while saving attachment to Files." : "Virhe tallennettaessa liitettä tiedostoihin.",
+    "Opening HTML drafts is not supported yet." : "HTML-luonnosten avaaminen ei ole vielä tuettu ominaisuus.",
     "Error while loading the selected message." : "Virhe ladatessa valittua viestiä.",
     "Connecting …" : "Yhdistetään…",
     "Unknown error" : "Tuntematon virhe",
@@ -28,6 +28,7 @@
     "Load more …" : "Lataa lisää…",
     "Check messages …" : "Tarkista viestit…",
     "Send" : "Lähetä",
+    "Draft saved!" : "Luonnos tallennettu!",
     "Inbox" : "Saapuneet",
     "Sent" : "Lähetetty",
     "Drafts" : "Luonnokset",
@@ -38,6 +39,7 @@
     "Starred" : "Suositut",
     "Creating account failed: " : "Tilin luominen epäonnistui:",
     "Auto detect failed. Please use manual mode." : "Automaattinen havaitseminen epäonnistui. Käytä manuaalitilaa.",
+    "Delete permanently" : "Poista pysyvästi",
     "& others" : "& muut",
     "from" : "Syöte:",
     "to" : "- ",
@@ -52,7 +54,9 @@
     "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>!",
     "No search results for {{searchTerm}}" : "Ei tuloksia haulle {{searchTerm}}",
     "No messages in this folder!" : "Tässä kansiossa ei ole viestejä!",
     "New message" : "Uusi viesti",
diff --git a/l10n/fr.js b/l10n/fr.js
index 1b2888f14..059c4caa9 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Mail" : "Mail",
     "Error while loading the accounts." : "Erreur lors du chargement des comptes.",
-    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} nouveaux messages dans {folderName}\nde {from}",
     "you" : "vous",
     "Error while loading the selected account." : "Erreur lors du chargement du compte sélectionné.",
     "Error while loading messages." : "Erreur lors du chargement des messages.",
@@ -12,6 +11,7 @@ OC.L10N.register(
     "Attachment saved to Files." : "Pièce jointe enregistrée dans les Fichiers.",
     "Error while saving attachments to Files." : "Erreur lors de l'enregistrement des pièces jointes dans les Fichiers.",
     "Error while saving attachment to Files." : "Erreur lors de l'enregistrement de la pièce jointe dans les Fichiers.",
+    "Opening HTML drafts is not supported yet." : "L'ouverture de brouillons au format HTML n'est pas prise en charge pour le moment.",
     "Error while loading the selected message." : "Erreur lors du chargement du message sélectionné.",
     "Connecting …" : "Connexion en cours ...",
     "Unknown error" : "Erreur inconnue",
@@ -30,6 +30,7 @@ OC.L10N.register(
     "Load more …" : "Charger plus ...",
     "Check messages …" : "Relever le courrier",
     "Send" : "Envoyer",
+    "Draft saved!" : "Brouillon sauvegardé!",
     "Inbox" : "Boîte de réception",
     "Sent" : "Envoyés",
     "Drafts" : "Brouillons",
@@ -40,6 +41,7 @@ OC.L10N.register(
     "Starred" : "Favoris",
     "Creating account failed: " : "La création du compte a échoué :",
     "Auto detect failed. Please use manual mode." : "L'auto-détection a échoué. Veuillez utiliser le mode manuel.",
+    "Delete permanently" : "Supprimer de façon définitive",
     "& others" : "et d'autres",
     "from" : "de",
     "+ cc/bcc" : "+ cc/cci",
@@ -58,7 +60,9 @@ OC.L10N.register(
     "+ 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 !",
     "No search results for {{searchTerm}}" : "Aucun résultat pour {{searchTerm}}",
     "No messages in this folder!" : "Aucun message dans ce dossier !",
     "New message" : "Nouveau message",
diff --git a/l10n/fr.json b/l10n/fr.json
index 51170636c..6d9bfc866 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Mail" : "Mail",
     "Error while loading the accounts." : "Erreur lors du chargement des comptes.",
-    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} nouveaux messages dans {folderName}\nde {from}",
     "you" : "vous",
     "Error while loading the selected account." : "Erreur lors du chargement du compte sélectionné.",
     "Error while loading messages." : "Erreur lors du chargement des messages.",
@@ -10,6 +9,7 @@
     "Attachment saved to Files." : "Pièce jointe enregistrée dans les Fichiers.",
     "Error while saving attachments to Files." : "Erreur lors de l'enregistrement des pièces jointes dans les Fichiers.",
     "Error while saving attachment to Files." : "Erreur lors de l'enregistrement de la pièce jointe dans les Fichiers.",
+    "Opening HTML drafts is not supported yet." : "L'ouverture de brouillons au format HTML n'est pas prise en charge pour le moment.",
     "Error while loading the selected message." : "Erreur lors du chargement du message sélectionné.",
     "Connecting …" : "Connexion en cours ...",
     "Unknown error" : "Erreur inconnue",
@@ -28,6 +28,7 @@
     "Load more …" : "Charger plus ...",
     "Check messages …" : "Relever le courrier",
     "Send" : "Envoyer",
+    "Draft saved!" : "Brouillon sauvegardé!",
     "Inbox" : "Boîte de réception",
     "Sent" : "Envoyés",
     "Drafts" : "Brouillons",
@@ -38,6 +39,7 @@
     "Starred" : "Favoris",
     "Creating account failed: " : "La création du compte a échoué :",
     "Auto detect failed. Please use manual mode." : "L'auto-détection a échoué. Veuillez utiliser le mode manuel.",
+    "Delete permanently" : "Supprimer de façon définitive",
     "& others" : "et d'autres",
     "from" : "de",
     "+ cc/bcc" : "+ cc/cci",
@@ -56,7 +58,9 @@
     "+ 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 !",
     "No search results for {{searchTerm}}" : "Aucun résultat pour {{searchTerm}}",
     "No messages in this folder!" : "Aucun message dans ce dossier !",
     "New message" : "Nouveau message",
diff --git a/l10n/gl.js b/l10n/gl.js
index 1059f0426..c1d158978 100644
--- a/l10n/gl.js
+++ b/l10n/gl.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Mail" : "Correo",
     "Error while loading the accounts." : "Produciuse un erro mentres cargaba as contas.",
-    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} mensaxes novas en {folderName} \nde {from}",
     "you" : "vostede",
     "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.",
@@ -12,6 +11,7 @@ OC.L10N.register(
     "Attachment saved to Files." : "Anexo gardado en Ficheiros.",
     "Error while saving attachments to Files." : "Produciuse un erro ao gardar os anexos en Ficheiros.",
     "Error while saving attachment to Files." : "Produciuse un erro ao gardar o anexo en Ficheiros.",
+    "Opening HTML drafts is not supported yet." : "Aínda non é posíbel abrir borradores HTML.",
     "Error while loading the selected message." : "Produciuse un erro mentres cargaba a mensaxe seleccionada.",
     "Connecting …" : "Conectando ...",
     "Unknown error" : "Produciuse un erro descoñecido",
@@ -30,6 +30,7 @@ OC.L10N.register(
     "Load more …" : "Cargar máis ...",
     "Check messages …" : "Comprobar mensaxes ...",
     "Send" : "Enviar",
+    "Draft saved!" : "Gardouse o borrador!",
     "Inbox" : "Bandexa de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -40,6 +41,7 @@ OC.L10N.register(
     "Starred" : "Destacado",
     "Creating account failed: " : "Non foi posíbel crear a conta:",
     "Auto detect failed. Please use manual mode." : "Fallou o modo de detección automática. empregue o modo manual.",
+    "Delete permanently" : "Eliminar permanentemente",
     "& others" : "E outros",
     "from" : "desde",
     "+ cc/bcc" : "+ cc/cco",
@@ -58,7 +60,9 @@ OC.L10N.register(
     "+ 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>!",
     "No search results for {{searchTerm}}" : "Sen resultados na busca de {{searchTerm}}",
     "No messages in this folder!" : "Non hai mensaxes neste cartafol!",
     "New message" : "Mensaxe nova",
diff --git a/l10n/gl.json b/l10n/gl.json
index 72ae07ea2..655a291d3 100644
--- a/l10n/gl.json
+++ b/l10n/gl.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Mail" : "Correo",
     "Error while loading the accounts." : "Produciuse un erro mentres cargaba as contas.",
-    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} mensaxes novas en {folderName} \nde {from}",
     "you" : "vostede",
     "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.",
@@ -10,6 +9,7 @@
     "Attachment saved to Files." : "Anexo gardado en Ficheiros.",
     "Error while saving attachments to Files." : "Produciuse un erro ao gardar os anexos en Ficheiros.",
     "Error while saving attachment to Files." : "Produciuse un erro ao gardar o anexo en Ficheiros.",
+    "Opening HTML drafts is not supported yet." : "Aínda non é posíbel abrir borradores HTML.",
     "Error while loading the selected message." : "Produciuse un erro mentres cargaba a mensaxe seleccionada.",
     "Connecting …" : "Conectando ...",
     "Unknown error" : "Produciuse un erro descoñecido",
@@ -28,6 +28,7 @@
     "Load more …" : "Cargar máis ...",
     "Check messages …" : "Comprobar mensaxes ...",
     "Send" : "Enviar",
+    "Draft saved!" : "Gardouse o borrador!",
     "Inbox" : "Bandexa de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -38,6 +39,7 @@
     "Starred" : "Destacado",
     "Creating account failed: " : "Non foi posíbel crear a conta:",
     "Auto detect failed. Please use manual mode." : "Fallou o modo de detección automática. empregue o modo manual.",
+    "Delete permanently" : "Eliminar permanentemente",
     "& others" : "E outros",
     "from" : "desde",
     "+ cc/bcc" : "+ cc/cco",
@@ -56,7 +58,9 @@
     "+ 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>!",
     "No search results for {{searchTerm}}" : "Sen resultados na busca de {{searchTerm}}",
     "No messages in this folder!" : "Non hai mensaxes neste cartafol!",
     "New message" : "Mensaxe nova",
diff --git a/l10n/id.js b/l10n/id.js
index 2cf80211c..429f97c90 100644
--- a/l10n/id.js
+++ b/l10n/id.js
@@ -39,6 +39,7 @@ OC.L10N.register(
     "Starred" : "Dibintangi",
     "Creating account failed: " : "Gagal membuat akun:",
     "Auto detect failed. Please use manual mode." : "Deteksi otomatis gagal. Mohon gunakan modus manual.",
+    "Delete permanently" : "Hapus secara permanen",
     "from" : "dari",
     "+ cc/bcc" : "+ cc/bcc",
     "to" : "untuk",
@@ -56,6 +57,7 @@ OC.L10N.register(
     "+ cc" : "+ cc",
     "Reply …" : "Balas …",
     "Forward" : "Teruskan",
+    "Delete" : "Hapus",
     "Add mail account" : "Tambah akun email",
     "No messages in this folder!" : "Tidak ada pesan didalam folder ini!",
     "New message" : "Pesan baru",
diff --git a/l10n/id.json b/l10n/id.json
index ac02252fc..6c9f2bf44 100644
--- a/l10n/id.json
+++ b/l10n/id.json
@@ -37,6 +37,7 @@
     "Starred" : "Dibintangi",
     "Creating account failed: " : "Gagal membuat akun:",
     "Auto detect failed. Please use manual mode." : "Deteksi otomatis gagal. Mohon gunakan modus manual.",
+    "Delete permanently" : "Hapus secara permanen",
     "from" : "dari",
     "+ cc/bcc" : "+ cc/bcc",
     "to" : "untuk",
@@ -54,6 +55,7 @@
     "+ cc" : "+ cc",
     "Reply …" : "Balas …",
     "Forward" : "Teruskan",
+    "Delete" : "Hapus",
     "Add mail account" : "Tambah akun email",
     "No messages in this folder!" : "Tidak ada pesan didalam folder ini!",
     "New message" : "Pesan baru",
diff --git a/l10n/it.js b/l10n/it.js
index 7b8572d3e..b156159d1 100644
--- a/l10n/it.js
+++ b/l10n/it.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Mail" : "Posta",
     "Error while loading the accounts." : "Errore durante il caricamento degli account.",
-    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} nuovi messaggi in {folderName} \nda {from}",
     "you" : "tu",
     "Error while loading the selected account." : "Errore durante il caricamento dell'account selezionato.",
     "Error while loading messages." : "Errore durante il caricamento dei messaggi.",
@@ -12,6 +11,7 @@ OC.L10N.register(
     "Attachment saved to Files." : "Allegato salvato in File.",
     "Error while saving attachments to Files." : "Errore durante il salvataggio degli allegati in File.",
     "Error while saving attachment to Files." : "Errore durante il salvataggio dell'allegato in File.",
+    "Opening HTML drafts is not supported yet." : "L'apertura delle bozze HTML non è ancora supportata.",
     "Error while loading the selected message." : "Errore durante il caricamento del messaggio selezionato.",
     "Connecting …" : "Connessione in corso...",
     "Unknown error" : "Errore sconosciuto",
@@ -30,6 +30,7 @@ OC.L10N.register(
     "Load more …" : "Carica altro...",
     "Check messages …" : "Controlla i messaggi...",
     "Send" : "Invia",
+    "Draft saved!" : "Bozza salvata!",
     "Inbox" : "Posta in arrivo",
     "Sent" : "Posta inviata",
     "Drafts" : "Bozze",
@@ -40,6 +41,7 @@ OC.L10N.register(
     "Starred" : "Preferiti",
     "Creating account failed: " : "Creazione account non riuscita:",
     "Auto detect failed. Please use manual mode." : "Rilevamento automatico non riuscito. Usa la modalità manuale.",
+    "Delete permanently" : "Elimina definitivamente",
     "& others" : "e altri",
     "from" : "da",
     "+ cc/bcc" : "+ cc/ccn",
@@ -58,7 +60,9 @@ OC.L10N.register(
     "+ 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>!",
     "No search results for {{searchTerm}}" : "Nessun risultato di ricerca per {{searchTerm}}",
     "No messages in this folder!" : "Nessun messaggio in questa cartella!",
     "New message" : "Nuovo messaggio",
diff --git a/l10n/it.json b/l10n/it.json
index 569b30f7d..74ff1f584 100644
--- a/l10n/it.json
+++ b/l10n/it.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Mail" : "Posta",
     "Error while loading the accounts." : "Errore durante il caricamento degli account.",
-    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} nuovi messaggi in {folderName} \nda {from}",
     "you" : "tu",
     "Error while loading the selected account." : "Errore durante il caricamento dell'account selezionato.",
     "Error while loading messages." : "Errore durante il caricamento dei messaggi.",
@@ -10,6 +9,7 @@
     "Attachment saved to Files." : "Allegato salvato in File.",
     "Error while saving attachments to Files." : "Errore durante il salvataggio degli allegati in File.",
     "Error while saving attachment to Files." : "Errore durante il salvataggio dell'allegato in File.",
+    "Opening HTML drafts is not supported yet." : "L'apertura delle bozze HTML non è ancora supportata.",
     "Error while loading the selected message." : "Errore durante il caricamento del messaggio selezionato.",
     "Connecting …" : "Connessione in corso...",
     "Unknown error" : "Errore sconosciuto",
@@ -28,6 +28,7 @@
     "Load more …" : "Carica altro...",
     "Check messages …" : "Controlla i messaggi...",
     "Send" : "Invia",
+    "Draft saved!" : "Bozza salvata!",
     "Inbox" : "Posta in arrivo",
     "Sent" : "Posta inviata",
     "Drafts" : "Bozze",
@@ -38,6 +39,7 @@
     "Starred" : "Preferiti",
     "Creating account failed: " : "Creazione account non riuscita:",
     "Auto detect failed. Please use manual mode." : "Rilevamento automatico non riuscito. Usa la modalità manuale.",
+    "Delete permanently" : "Elimina definitivamente",
     "& others" : "e altri",
     "from" : "da",
     "+ cc/bcc" : "+ cc/ccn",
@@ -56,7 +58,9 @@
     "+ 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>!",
     "No search results for {{searchTerm}}" : "Nessun risultato di ricerca per {{searchTerm}}",
     "No messages in this folder!" : "Nessun messaggio in questa cartella!",
     "New message" : "Nuovo messaggio",
diff --git a/l10n/ja.js b/l10n/ja.js
index 84e033636..4ceb74715 100644
--- a/l10n/ja.js
+++ b/l10n/ja.js
@@ -27,6 +27,7 @@ OC.L10N.register(
     "Checking mail …" : "メール確認中...",
     "Loading …" : "読込中...",
     "Load more …" : "読込中 …",
+    "Check messages …" : "メッセージをチェック…",
     "Send" : "送信",
     "Inbox" : "受信箱",
     "Sent" : "送信",
@@ -38,6 +39,7 @@ OC.L10N.register(
     "Starred" : "共有",
     "Creating account failed: " : "アカウント作成に失敗:",
     "Auto detect failed. Please use manual mode." : "自動判別に失敗しました。手動モードをご利用ください。",
+    "Delete permanently" : "完全に削除する",
     "from" : "from",
     "+ cc/bcc" : "+ cc/bcc",
     "to" : "終了",
@@ -55,18 +57,26 @@ OC.L10N.register(
     "+ cc" : "+ cc",
     "Reply …" : "返信 …",
     "Forward" : "転送",
+    "Delete" : "削除",
+    "Add mail account" : "メールアカウントの追加",
     "No messages in this folder!" : "このフォルダーにメッセージはありません。",
+    "New message" : "新しいメッセージ",
     "Connect your mail account" : "メールアカウントに接続",
     "Name" : "名前",
     "Mail Address" : "メールアドレス",
     "IMAP Password" : "IMAP パスワード",
     "Manual configuration" : "手動設定",
     "IMAP Host" : "IMAPホスト",
+    "IMAP security" : "IMAPセキュリティ",
     "None" : "なし",
+    "SSL/TLS" : "SSL/TLS",
+    "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAPポート",
     "IMAP User" : "IMAPユーザー",
     "SMTP Host" : "SMTPホスト",
+    "SMTP security" : "SMTPセキュリティ",
     "SMTP Port" : "SMTPポート",
+    "SMTP Port (default 25, ssl 465)" : "SMTPポート(デフォルト 25, ssl 465)",
     "SMTP User" : "SMTPユーザー",
     "SMTP Password" : "SMTP パスワード",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "%s  へリダイレクトします。数秒後に自動転送されなかったらクリックしてください。",
diff --git a/l10n/ja.json b/l10n/ja.json
index 87f00d928..127592be1 100644
--- a/l10n/ja.json
+++ b/l10n/ja.json
@@ -25,6 +25,7 @@
     "Checking mail …" : "メール確認中...",
     "Loading …" : "読込中...",
     "Load more …" : "読込中 …",
+    "Check messages …" : "メッセージをチェック…",
     "Send" : "送信",
     "Inbox" : "受信箱",
     "Sent" : "送信",
@@ -36,6 +37,7 @@
     "Starred" : "共有",
     "Creating account failed: " : "アカウント作成に失敗:",
     "Auto detect failed. Please use manual mode." : "自動判別に失敗しました。手動モードをご利用ください。",
+    "Delete permanently" : "完全に削除する",
     "from" : "from",
     "+ cc/bcc" : "+ cc/bcc",
     "to" : "終了",
@@ -53,18 +55,26 @@
     "+ cc" : "+ cc",
     "Reply …" : "返信 …",
     "Forward" : "転送",
+    "Delete" : "削除",
+    "Add mail account" : "メールアカウントの追加",
     "No messages in this folder!" : "このフォルダーにメッセージはありません。",
+    "New message" : "新しいメッセージ",
     "Connect your mail account" : "メールアカウントに接続",
     "Name" : "名前",
     "Mail Address" : "メールアドレス",
     "IMAP Password" : "IMAP パスワード",
     "Manual configuration" : "手動設定",
     "IMAP Host" : "IMAPホスト",
+    "IMAP security" : "IMAPセキュリティ",
     "None" : "なし",
+    "SSL/TLS" : "SSL/TLS",
+    "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAPポート",
     "IMAP User" : "IMAPユーザー",
     "SMTP Host" : "SMTPホスト",
+    "SMTP security" : "SMTPセキュリティ",
     "SMTP Port" : "SMTPポート",
+    "SMTP Port (default 25, ssl 465)" : "SMTPポート(デフォルト 25, ssl 465)",
     "SMTP User" : "SMTPユーザー",
     "SMTP Password" : "SMTP パスワード",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "%s  へリダイレクトします。数秒後に自動転送されなかったらクリックしてください。",
diff --git a/l10n/ko.js b/l10n/ko.js
index 8cb560083..d7559d00c 100644
--- a/l10n/ko.js
+++ b/l10n/ko.js
@@ -37,6 +37,7 @@ OC.L10N.register(
     "Starred" : "별표 편지함",
     "Creating account failed: " : "계정 생성 실패: ",
     "Auto detect failed. Please use manual mode." : "자동 감지가 실패하였습니다. 수동 모드를 사용하십시오.",
+    "Delete permanently" : "영구히 삭제",
     "from" : "보낸 사람",
     "+ cc/bcc" : "+ 참조/숨은 참조",
     "to" : "받는 사람",
@@ -54,6 +55,7 @@ OC.L10N.register(
     "+ cc" : "+ 참조",
     "Reply …" : "답장...",
     "Forward" : "전달",
+    "Delete" : "삭제",
     "No messages in this folder!" : "이 폴더에 메시지가 없습니다!",
     "Connect your mail account" : "메일 계정 연결",
     "Name" : "이름",
diff --git a/l10n/ko.json b/l10n/ko.json
index 09042904e..8aa44ea4e 100644
--- a/l10n/ko.json
+++ b/l10n/ko.json
@@ -35,6 +35,7 @@
     "Starred" : "별표 편지함",
     "Creating account failed: " : "계정 생성 실패: ",
     "Auto detect failed. Please use manual mode." : "자동 감지가 실패하였습니다. 수동 모드를 사용하십시오.",
+    "Delete permanently" : "영구히 삭제",
     "from" : "보낸 사람",
     "+ cc/bcc" : "+ 참조/숨은 참조",
     "to" : "받는 사람",
@@ -52,6 +53,7 @@
     "+ cc" : "+ 참조",
     "Reply …" : "답장...",
     "Forward" : "전달",
+    "Delete" : "삭제",
     "No messages in this folder!" : "이 폴더에 메시지가 없습니다!",
     "Connect your mail account" : "메일 계정 연결",
     "Name" : "이름",
diff --git a/l10n/nb_NO.js b/l10n/nb_NO.js
index a887b531f..2f9b44bf4 100644
--- a/l10n/nb_NO.js
+++ b/l10n/nb_NO.js
@@ -37,6 +37,7 @@ OC.L10N.register(
     "Starred" : "Merket",
     "Creating account failed: " : "Oppretting av konto feilet:",
     "Auto detect failed. Please use manual mode." : "Automatisk påvisning feilet. Bruk manuelt oppsett.",
+    "Delete permanently" : "Slett permanent",
     "from" : "fra",
     "+ cc/bcc" : "+ cc/bcc",
     "to" : "til",
@@ -54,6 +55,7 @@ OC.L10N.register(
     "+ cc" : "+ cc",
     "Reply …" : "Svar ...",
     "Forward" : "Videresend",
+    "Delete" : "Slett",
     "No messages in this folder!" : "Ingen meldinger i denne mappen!",
     "Connect your mail account" : "Koble til din epost-konto",
     "Name" : "Navn",
diff --git a/l10n/nb_NO.json b/l10n/nb_NO.json
index ed537ae69..a5cc6fbd6 100644
--- a/l10n/nb_NO.json
+++ b/l10n/nb_NO.json
@@ -35,6 +35,7 @@
     "Starred" : "Merket",
     "Creating account failed: " : "Oppretting av konto feilet:",
     "Auto detect failed. Please use manual mode." : "Automatisk påvisning feilet. Bruk manuelt oppsett.",
+    "Delete permanently" : "Slett permanent",
     "from" : "fra",
     "+ cc/bcc" : "+ cc/bcc",
     "to" : "til",
@@ -52,6 +53,7 @@
     "+ cc" : "+ cc",
     "Reply …" : "Svar ...",
     "Forward" : "Videresend",
+    "Delete" : "Slett",
     "No messages in this folder!" : "Ingen meldinger i denne mappen!",
     "Connect your mail account" : "Koble til din epost-konto",
     "Name" : "Navn",
diff --git a/l10n/nl.js b/l10n/nl.js
index 0a3e208c8..75ab1295b 100644
--- a/l10n/nl.js
+++ b/l10n/nl.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Mail" : "E-mail",
     "Error while loading the accounts." : "Fout tijdens het laden van de accounts.",
-    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} nieuwe berichten in {folderName} \nvan {from}",
     "you" : "je",
     "Error while loading the selected account." : "Fout tijdens het laden van het gekozen account.",
     "Error while loading messages." : "Fout bij laden berichten.",
@@ -12,6 +11,7 @@ OC.L10N.register(
     "Attachment saved to Files." : "Bijlage opgeslagen in Bestanden.",
     "Error while saving attachments to Files." : "Fout bij opslaan bijlagen in Bestanden.",
     "Error while saving attachment to Files." : "Fout bij opslaan bijlage in Bestanden.",
+    "Opening HTML drafts is not supported yet." : "Openen concept HTML wordt nog niet ondersteund.",
     "Error while loading the selected message." : "Fout bij laden van het geselecteerde bericht.",
     "Connecting …" : "Verbinden...",
     "Unknown error" : "Onbekende fout",
@@ -30,6 +30,7 @@ OC.L10N.register(
     "Load more …" : "Laad meer ...",
     "Check messages …" : "Controleren berichten ...",
     "Send" : "Versturen",
+    "Draft saved!" : "Concept opgeslagen!",
     "Inbox" : "Inbakje",
     "Sent" : "Verzonden",
     "Drafts" : "Concepten",
@@ -40,6 +41,7 @@ OC.L10N.register(
     "Starred" : "Gemarkeerd",
     "Creating account failed: " : "Aanmaken account mislukt:",
     "Auto detect failed. Please use manual mode." : "Automatisch vaststellen mislukt. Gebruik handmatige modus.",
+    "Delete permanently" : "Definitief verwijderen",
     "& others" : "& anderen",
     "from" : "van",
     "+ cc/bcc" : "+ cc/bcc",
@@ -58,7 +60,9 @@ OC.L10N.register(
     "+ 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>!",
     "No search results for {{searchTerm}}" : "Geen zoekresultaten voor {{searchTerm}}",
     "No messages in this folder!" : "Geen berichten in deze map!",
     "New message" : "Nieuw bericht",
diff --git a/l10n/nl.json b/l10n/nl.json
index ba7b05bd4..9bf3a86e9 100644
--- a/l10n/nl.json
+++ b/l10n/nl.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Mail" : "E-mail",
     "Error while loading the accounts." : "Fout tijdens het laden van de accounts.",
-    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} nieuwe berichten in {folderName} \nvan {from}",
     "you" : "je",
     "Error while loading the selected account." : "Fout tijdens het laden van het gekozen account.",
     "Error while loading messages." : "Fout bij laden berichten.",
@@ -10,6 +9,7 @@
     "Attachment saved to Files." : "Bijlage opgeslagen in Bestanden.",
     "Error while saving attachments to Files." : "Fout bij opslaan bijlagen in Bestanden.",
     "Error while saving attachment to Files." : "Fout bij opslaan bijlage in Bestanden.",
+    "Opening HTML drafts is not supported yet." : "Openen concept HTML wordt nog niet ondersteund.",
     "Error while loading the selected message." : "Fout bij laden van het geselecteerde bericht.",
     "Connecting …" : "Verbinden...",
     "Unknown error" : "Onbekende fout",
@@ -28,6 +28,7 @@
     "Load more …" : "Laad meer ...",
     "Check messages …" : "Controleren berichten ...",
     "Send" : "Versturen",
+    "Draft saved!" : "Concept opgeslagen!",
     "Inbox" : "Inbakje",
     "Sent" : "Verzonden",
     "Drafts" : "Concepten",
@@ -38,6 +39,7 @@
     "Starred" : "Gemarkeerd",
     "Creating account failed: " : "Aanmaken account mislukt:",
     "Auto detect failed. Please use manual mode." : "Automatisch vaststellen mislukt. Gebruik handmatige modus.",
+    "Delete permanently" : "Definitief verwijderen",
     "& others" : "& anderen",
     "from" : "van",
     "+ cc/bcc" : "+ cc/bcc",
@@ -56,7 +58,9 @@
     "+ 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>!",
     "No search results for {{searchTerm}}" : "Geen zoekresultaten voor {{searchTerm}}",
     "No messages in this folder!" : "Geen berichten in deze map!",
     "New message" : "Nieuw bericht",
diff --git a/l10n/pl.js b/l10n/pl.js
index 847cf0b14..71f5b5694 100644
--- a/l10n/pl.js
+++ b/l10n/pl.js
@@ -35,6 +35,7 @@ OC.L10N.register(
     "Starred" : "Oznaczone",
     "Creating account failed: " : "Utworzenie konta nie powiodło się:",
     "Auto detect failed. Please use manual mode." : "Autowykrywanie nie powiodło się. Proszę użyć trybu ręcznego.",
+    "Delete permanently" : "Trwale usuń",
     "from" : "z",
     "+ cc/bcc" : "+ cc/bcc",
     "to" : "do",
@@ -51,6 +52,7 @@ OC.L10N.register(
     "+ 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",
     "Name" : "Nazwa",
diff --git a/l10n/pl.json b/l10n/pl.json
index 1472931aa..bd5796e36 100644
--- a/l10n/pl.json
+++ b/l10n/pl.json
@@ -33,6 +33,7 @@
     "Starred" : "Oznaczone",
     "Creating account failed: " : "Utworzenie konta nie powiodło się:",
     "Auto detect failed. Please use manual mode." : "Autowykrywanie nie powiodło się. Proszę użyć trybu ręcznego.",
+    "Delete permanently" : "Trwale usuń",
     "from" : "z",
     "+ cc/bcc" : "+ cc/bcc",
     "to" : "do",
@@ -49,6 +50,7 @@
     "+ 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",
     "Name" : "Nazwa",
diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js
index 7efab6227..79cebe38b 100644
--- a/l10n/pt_BR.js
+++ b/l10n/pt_BR.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Mail" : "EMail",
     "Error while loading the accounts." : "Erro no carregamento das contas.",
-    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} novas mensagens em {folderName} \nde {from}",
     "you" : "você",
     "Error while loading the selected account." : "Erro enquanto carregava a conta selecionada",
     "Error while loading messages." : "Erro no carregamento das mensagens.",
@@ -12,6 +11,7 @@ OC.L10N.register(
     "Attachment saved to Files." : "Compartilhamentos salvos em Arquivos.",
     "Error while saving attachments to Files." : "Erro enquanto salvava compartilhamentos em Arquivos.",
     "Error while saving attachment to Files." : "Erro enquanto salvava compartilhamentos em Arquivos.",
+    "Opening HTML drafts is not supported yet." : "Abrir rascunhos do HTML ainda não é suportado.",
     "Error while loading the selected message." : "Erro enquanto carregava mensagem selecionada.",
     "Connecting …" : "Conectando ...",
     "Unknown error" : "Erro desconhecido",
@@ -30,6 +30,7 @@ OC.L10N.register(
     "Load more …" : "Carregar mais ...",
     "Check messages …" : "Verificar mensagens",
     "Send" : "Enviar",
+    "Draft saved!" : "Rascunho salvo!",
     "Inbox" : "Caixa de Entrada",
     "Sent" : "Enviar",
     "Drafts" : "Rascunhos",
@@ -40,6 +41,7 @@ OC.L10N.register(
     "Starred" : "Marcado com estrela",
     "Creating account failed: " : "A criação de contas falhou:",
     "Auto detect failed. Please use manual mode." : "Auto detecção falhou. Por favor use o modo manual.",
+    "Delete permanently" : "Excluir permanentemente",
     "& others" : "& outros",
     "from" : "de",
     "+ cc/bcc" : "+ cc/bcc",
@@ -58,7 +60,9 @@ OC.L10N.register(
     "+ 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>!",
     "No search results for {{searchTerm}}" : "Nenhum resultado de pesquisa para {{searchTerm}}",
     "No messages in this folder!" : "Nenhuma mensagem nesta pasta!",
     "New message" : "Nova mensagem",
diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json
index 32844d7ec..6e9cb6162 100644
--- a/l10n/pt_BR.json
+++ b/l10n/pt_BR.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Mail" : "EMail",
     "Error while loading the accounts." : "Erro no carregamento das contas.",
-    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} novas mensagens em {folderName} \nde {from}",
     "you" : "você",
     "Error while loading the selected account." : "Erro enquanto carregava a conta selecionada",
     "Error while loading messages." : "Erro no carregamento das mensagens.",
@@ -10,6 +9,7 @@
     "Attachment saved to Files." : "Compartilhamentos salvos em Arquivos.",
     "Error while saving attachments to Files." : "Erro enquanto salvava compartilhamentos em Arquivos.",
     "Error while saving attachment to Files." : "Erro enquanto salvava compartilhamentos em Arquivos.",
+    "Opening HTML drafts is not supported yet." : "Abrir rascunhos do HTML ainda não é suportado.",
     "Error while loading the selected message." : "Erro enquanto carregava mensagem selecionada.",
     "Connecting …" : "Conectando ...",
     "Unknown error" : "Erro desconhecido",
@@ -28,6 +28,7 @@
     "Load more …" : "Carregar mais ...",
     "Check messages …" : "Verificar mensagens",
     "Send" : "Enviar",
+    "Draft saved!" : "Rascunho salvo!",
     "Inbox" : "Caixa de Entrada",
     "Sent" : "Enviar",
     "Drafts" : "Rascunhos",
@@ -38,6 +39,7 @@
     "Starred" : "Marcado com estrela",
     "Creating account failed: " : "A criação de contas falhou:",
     "Auto detect failed. Please use manual mode." : "Auto detecção falhou. Por favor use o modo manual.",
+    "Delete permanently" : "Excluir permanentemente",
     "& others" : "& outros",
     "from" : "de",
     "+ cc/bcc" : "+ cc/bcc",
@@ -56,7 +58,9 @@
     "+ 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>!",
     "No search results for {{searchTerm}}" : "Nenhum resultado de pesquisa para {{searchTerm}}",
     "No messages in this folder!" : "Nenhuma mensagem nesta pasta!",
     "New message" : "Nova mensagem",
diff --git a/l10n/pt_PT.js b/l10n/pt_PT.js
index 22e0af505..85fcff1ca 100644
--- a/l10n/pt_PT.js
+++ b/l10n/pt_PT.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Mail" : "Correio",
     "Error while loading the accounts." : "Erro a carregar as contas.",
-    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} novas mensagens em {folderName} \nde {from}",
     "you" : "Você",
     "Error while loading the selected account." : "Erro a carregar a conta seleccionada.",
     "Error while loading messages." : "Erro durante o carregamento das mensagens.",
@@ -40,6 +39,7 @@ OC.L10N.register(
     "Starred" : "Marcado",
     "Creating account failed: " : "Não foi possível criar a conta:",
     "Auto detect failed. Please use manual mode." : "A deteção automática falhou. Por favor, utilize o modo manual",
+    "Delete permanently" : "Eliminar permanentemente",
     "& others" : "e outros",
     "from" : "de",
     "+ cc/bcc" : "+ cc/bcc",
@@ -58,6 +58,7 @@ OC.L10N.register(
     "+ 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}}",
     "No messages in this folder!" : "Nenhuma mensagem nesta pasta!",
diff --git a/l10n/pt_PT.json b/l10n/pt_PT.json
index 9ee3e25c5..cd360bd81 100644
--- a/l10n/pt_PT.json
+++ b/l10n/pt_PT.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Mail" : "Correio",
     "Error while loading the accounts." : "Erro a carregar as contas.",
-    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} novas mensagens em {folderName} \nde {from}",
     "you" : "Você",
     "Error while loading the selected account." : "Erro a carregar a conta seleccionada.",
     "Error while loading messages." : "Erro durante o carregamento das mensagens.",
@@ -38,6 +37,7 @@
     "Starred" : "Marcado",
     "Creating account failed: " : "Não foi possível criar a conta:",
     "Auto detect failed. Please use manual mode." : "A deteção automática falhou. Por favor, utilize o modo manual",
+    "Delete permanently" : "Eliminar permanentemente",
     "& others" : "e outros",
     "from" : "de",
     "+ cc/bcc" : "+ cc/bcc",
@@ -56,6 +56,7 @@
     "+ 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}}",
     "No messages in this folder!" : "Nenhuma mensagem nesta pasta!",
diff --git a/l10n/ru.js b/l10n/ru.js
index ba71ed6fb..3e3a56219 100644
--- a/l10n/ru.js
+++ b/l10n/ru.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Mail" : "Почта",
     "Error while loading the accounts." : "Ошибка при загрузке учётных записей",
-    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} новых сообщений в {folderName} \nот {from}",
     "you" : "вы",
     "Error while loading the selected account." : "Ошибка загрузки выбранного аккаунта.",
     "Error while loading messages." : "Ошибка пр загрузке изображений.",
@@ -12,6 +11,7 @@ OC.L10N.register(
     "Attachment saved to Files." : "Вложение сохранено в Файлах",
     "Error while saving attachments to Files." : "Ошибка сохранения вложений в Файлах.",
     "Error while saving attachment to Files." : "Ошибка сохранения вложения в Файлах.",
+    "Opening HTML drafts is not supported yet." : "Работа с черновиками HTML пока не поддерживается.",
     "Error while loading the selected message." : "Ошибка при загрузке выбранного сообщения.",
     "Connecting …" : "Соединение ...",
     "Unknown error" : "Неизвестная ошибка",
@@ -30,6 +30,7 @@ OC.L10N.register(
     "Load more …" : "Загрузить больше ...",
     "Check messages …" : "Проверяем сообщения ...",
     "Send" : "Отправить",
+    "Draft saved!" : "Черновик сохранен!",
     "Inbox" : "Входящие",
     "Sent" : "Отправленные",
     "Drafts" : "Черновики",
@@ -40,6 +41,8 @@ OC.L10N.register(
     "Starred" : "Помеченные",
     "Creating account failed: " : "Ошибка создания учетной записи:",
     "Auto detect failed. Please use manual mode." : "Не удалось определить настройки автоматически. Воспользуйтесь ручным режимом.",
+    "Delete permanently" : "Удалить окончательно",
+    "& others" : "и другие",
     "from" : "от",
     "+ cc/bcc" : "+ Копия/Скрытая копия",
     "to" : "к",
@@ -57,7 +60,9 @@ OC.L10N.register(
     "+ 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>!",
     "No search results for {{searchTerm}}" : "По запросу {{searchTerm}} ничего не найдено",
     "No messages in this folder!" : "В этом каталоге нет сообщений!",
     "New message" : "Новое сообщение",
diff --git a/l10n/ru.json b/l10n/ru.json
index 3dba266c0..5b22a2270 100644
--- a/l10n/ru.json
+++ b/l10n/ru.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Mail" : "Почта",
     "Error while loading the accounts." : "Ошибка при загрузке учётных записей",
-    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} новых сообщений в {folderName} \nот {from}",
     "you" : "вы",
     "Error while loading the selected account." : "Ошибка загрузки выбранного аккаунта.",
     "Error while loading messages." : "Ошибка пр загрузке изображений.",
@@ -10,6 +9,7 @@
     "Attachment saved to Files." : "Вложение сохранено в Файлах",
     "Error while saving attachments to Files." : "Ошибка сохранения вложений в Файлах.",
     "Error while saving attachment to Files." : "Ошибка сохранения вложения в Файлах.",
+    "Opening HTML drafts is not supported yet." : "Работа с черновиками HTML пока не поддерживается.",
     "Error while loading the selected message." : "Ошибка при загрузке выбранного сообщения.",
     "Connecting …" : "Соединение ...",
     "Unknown error" : "Неизвестная ошибка",
@@ -28,6 +28,7 @@
     "Load more …" : "Загрузить больше ...",
     "Check messages …" : "Проверяем сообщения ...",
     "Send" : "Отправить",
+    "Draft saved!" : "Черновик сохранен!",
     "Inbox" : "Входящие",
     "Sent" : "Отправленные",
     "Drafts" : "Черновики",
@@ -38,6 +39,8 @@
     "Starred" : "Помеченные",
     "Creating account failed: " : "Ошибка создания учетной записи:",
     "Auto detect failed. Please use manual mode." : "Не удалось определить настройки автоматически. Воспользуйтесь ручным режимом.",
+    "Delete permanently" : "Удалить окончательно",
+    "& others" : "и другие",
     "from" : "от",
     "+ cc/bcc" : "+ Копия/Скрытая копия",
     "to" : "к",
@@ -55,7 +58,9 @@
     "+ 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>!",
     "No search results for {{searchTerm}}" : "По запросу {{searchTerm}} ничего не найдено",
     "No messages in this folder!" : "В этом каталоге нет сообщений!",
     "New message" : "Новое сообщение",
diff --git a/l10n/sk_SK.js b/l10n/sk_SK.js
index e45c5d40a..adeb3c838 100644
--- a/l10n/sk_SK.js
+++ b/l10n/sk_SK.js
@@ -37,6 +37,7 @@ OC.L10N.register(
     "Starred" : "S hviezdičkou",
     "Creating account failed: " : "Vytvorenie účtu zlyhalo:",
     "Auto detect failed. Please use manual mode." : "Automatická detekcia zlyhala. Prosím, použite manuálny režim.",
+    "Delete permanently" : "Zmazať  natrvalo",
     "from" : "od",
     "+ cc/bcc" : "+ cc/bcc",
     "to" : "do",
@@ -54,6 +55,7 @@ OC.L10N.register(
     "+ 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!",
     "New message" : "Nová správa",
diff --git a/l10n/sk_SK.json b/l10n/sk_SK.json
index ac9efbe66..0a507472d 100644
--- a/l10n/sk_SK.json
+++ b/l10n/sk_SK.json
@@ -35,6 +35,7 @@
     "Starred" : "S hviezdičkou",
     "Creating account failed: " : "Vytvorenie účtu zlyhalo:",
     "Auto detect failed. Please use manual mode." : "Automatická detekcia zlyhala. Prosím, použite manuálny režim.",
+    "Delete permanently" : "Zmazať  natrvalo",
     "from" : "od",
     "+ cc/bcc" : "+ cc/bcc",
     "to" : "do",
@@ -52,6 +53,7 @@
     "+ 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!",
     "New message" : "Nová správa",
diff --git a/l10n/sl.js b/l10n/sl.js
index 952ee6ab1..22fb58349 100644
--- a/l10n/sl.js
+++ b/l10n/sl.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Mail" : "Elektronska pošta",
     "Error while loading the accounts." : "Prišlo je do napake med nalaganjem računa.¸",
-    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} novih sporočil v {folderName} \nod {from}",
     "you" : "vi",
     "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.",
@@ -40,6 +39,7 @@ OC.L10N.register(
     "Starred" : "Označeno",
     "Creating account failed: " : "Ustvarjanje računa je spodletelo:",
     "Auto detect failed. Please use manual mode." : "Samodejno zaznavanje je spodletelo. Zaznavo bo treba izvesti ročno.",
+    "Delete permanently" : "Izbriši dokončno",
     "& others" : "in drugo",
     "from" : "od",
     "+ cc/bcc" : "+ kp/skp",
@@ -58,6 +58,7 @@ OC.L10N.register(
     "+ cc" : "+ kp",
     "Reply …" : "Odgovori ...",
     "Forward" : "Posreduj",
+    "Delete" : "Izbriši",
     "Add mail account" : "Dodajte poštni račun",
     "No search results for {{searchTerm}}" : "Ni rezultatov iskanja za  {{searchTerm}}",
     "No messages in this folder!" : "V tej mapi ni sporočil!",
diff --git a/l10n/sl.json b/l10n/sl.json
index f6cd7ea9a..291ab7cc1 100644
--- a/l10n/sl.json
+++ b/l10n/sl.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Mail" : "Elektronska pošta",
     "Error while loading the accounts." : "Prišlo je do napake med nalaganjem računa.¸",
-    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} novih sporočil v {folderName} \nod {from}",
     "you" : "vi",
     "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.",
@@ -38,6 +37,7 @@
     "Starred" : "Označeno",
     "Creating account failed: " : "Ustvarjanje računa je spodletelo:",
     "Auto detect failed. Please use manual mode." : "Samodejno zaznavanje je spodletelo. Zaznavo bo treba izvesti ročno.",
+    "Delete permanently" : "Izbriši dokončno",
     "& others" : "in drugo",
     "from" : "od",
     "+ cc/bcc" : "+ kp/skp",
@@ -56,6 +56,7 @@
     "+ cc" : "+ kp",
     "Reply …" : "Odgovori ...",
     "Forward" : "Posreduj",
+    "Delete" : "Izbriši",
     "Add mail account" : "Dodajte poštni račun",
     "No search results for {{searchTerm}}" : "Ni rezultatov iskanja za  {{searchTerm}}",
     "No messages in this folder!" : "V tej mapi ni sporočil!",
diff --git a/l10n/sr.js b/l10n/sr.js
index 217e9c0cd..b0ac1363e 100644
--- a/l10n/sr.js
+++ b/l10n/sr.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Mail" : "Пошта",
     "Error while loading the accounts." : "Грешка при учитавању налога.",
-    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "Нових порука: {newMessageCount} у {folderName} \nод {from}",
     "you" : "ви",
     "Error while loading the selected account." : "Грешка при учитавању изабраног налога.",
     "Error while loading messages." : "Грешка при учитавању порука.",
@@ -12,6 +11,7 @@ OC.L10N.register(
     "Attachment saved to Files." : "Прилог сачуван у фајловима.",
     "Error while saving attachments to Files." : "Грешка при упису прилога у фајлове.",
     "Error while saving attachment to Files." : "Грешка при упису прилога у фајлове.",
+    "Opening HTML drafts is not supported yet." : "Отварање ХТМЛ нацрта још није подржано.",
     "Error while loading the selected message." : "Грешка при учитавању изабране поруке.",
     "Connecting …" : "Повезујем се...",
     "Unknown error" : "Непозната грешка",
@@ -30,6 +30,7 @@ OC.L10N.register(
     "Load more …" : "Учитај још...",
     "Check messages …" : "Провери поруке…",
     "Send" : "Пошаљи",
+    "Draft saved!" : "Нацрт сачуван!",
     "Inbox" : "Долазно",
     "Sent" : "Послато",
     "Drafts" : "Недовршено",
@@ -40,6 +41,7 @@ OC.L10N.register(
     "Starred" : "Означено звездицом",
     "Creating account failed: " : "Прављење налога није успело:",
     "Auto detect failed. Please use manual mode." : "Ауто-откривање није успело. Покушајте ручно.",
+    "Delete permanently" : "Обриши заувек",
     "& others" : "и осталих",
     "from" : "од",
     "+ cc/bcc" : "+ цц/бцц",
@@ -58,7 +60,9 @@ OC.L10N.register(
     "+ 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>!",
     "No search results for {{searchTerm}}" : "Нема резултата претраге за {{searchTerm}}",
     "No messages in this folder!" : "Нема порука у овој фасцикли!",
     "New message" : "Нова порука",
diff --git a/l10n/sr.json b/l10n/sr.json
index b5de77855..2d32749ea 100644
--- a/l10n/sr.json
+++ b/l10n/sr.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Mail" : "Пошта",
     "Error while loading the accounts." : "Грешка при учитавању налога.",
-    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "Нових порука: {newMessageCount} у {folderName} \nод {from}",
     "you" : "ви",
     "Error while loading the selected account." : "Грешка при учитавању изабраног налога.",
     "Error while loading messages." : "Грешка при учитавању порука.",
@@ -10,6 +9,7 @@
     "Attachment saved to Files." : "Прилог сачуван у фајловима.",
     "Error while saving attachments to Files." : "Грешка при упису прилога у фајлове.",
     "Error while saving attachment to Files." : "Грешка при упису прилога у фајлове.",
+    "Opening HTML drafts is not supported yet." : "Отварање ХТМЛ нацрта још није подржано.",
     "Error while loading the selected message." : "Грешка при учитавању изабране поруке.",
     "Connecting …" : "Повезујем се...",
     "Unknown error" : "Непозната грешка",
@@ -28,6 +28,7 @@
     "Load more …" : "Учитај још...",
     "Check messages …" : "Провери поруке…",
     "Send" : "Пошаљи",
+    "Draft saved!" : "Нацрт сачуван!",
     "Inbox" : "Долазно",
     "Sent" : "Послато",
     "Drafts" : "Недовршено",
@@ -38,6 +39,7 @@
     "Starred" : "Означено звездицом",
     "Creating account failed: " : "Прављење налога није успело:",
     "Auto detect failed. Please use manual mode." : "Ауто-откривање није успело. Покушајте ручно.",
+    "Delete permanently" : "Обриши заувек",
     "& others" : "и осталих",
     "from" : "од",
     "+ cc/bcc" : "+ цц/бцц",
@@ -56,7 +58,9 @@
     "+ 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>!",
     "No search results for {{searchTerm}}" : "Нема резултата претраге за {{searchTerm}}",
     "No messages in this folder!" : "Нема порука у овој фасцикли!",
     "New message" : "Нова порука",
diff --git a/l10n/sv.js b/l10n/sv.js
index e25e1e690..8f535aa47 100644
--- a/l10n/sv.js
+++ b/l10n/sv.js
@@ -37,6 +37,7 @@ OC.L10N.register(
     "Starred" : "Stjärnmärkt",
     "Creating account failed: " : "Skapa konto misslyckades:",
     "Auto detect failed. Please use manual mode." : "Automatisk detektering misslyckades. Vänligen använd manuellt läge.",
+    "Delete permanently" : "Radera permanent",
     "from" : "från",
     "+ cc/bcc" : "+ kopia/hemlig kopia",
     "to" : "till",
@@ -54,6 +55,7 @@ OC.L10N.register(
     "+ cc" : "+ kopia",
     "Reply …" : "Svara ...",
     "Forward" : "Vidarebefordra",
+    "Delete" : "Ta bort",
     "No messages in this folder!" : "Inga meddelanden i denna mapp!",
     "Connect your mail account" : "Anslut ditt e-postkonto",
     "Name" : "Namn",
diff --git a/l10n/sv.json b/l10n/sv.json
index 670dbbadc..9d1c5221e 100644
--- a/l10n/sv.json
+++ b/l10n/sv.json
@@ -35,6 +35,7 @@
     "Starred" : "Stjärnmärkt",
     "Creating account failed: " : "Skapa konto misslyckades:",
     "Auto detect failed. Please use manual mode." : "Automatisk detektering misslyckades. Vänligen använd manuellt läge.",
+    "Delete permanently" : "Radera permanent",
     "from" : "från",
     "+ cc/bcc" : "+ kopia/hemlig kopia",
     "to" : "till",
@@ -52,6 +53,7 @@
     "+ cc" : "+ kopia",
     "Reply …" : "Svara ...",
     "Forward" : "Vidarebefordra",
+    "Delete" : "Ta bort",
     "No messages in this folder!" : "Inga meddelanden i denna mapp!",
     "Connect your mail account" : "Anslut ditt e-postkonto",
     "Name" : "Namn",
diff --git a/l10n/tr.js b/l10n/tr.js
index 90540def9..053a02cac 100644
--- a/l10n/tr.js
+++ b/l10n/tr.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Mail" : "Posta",
     "Error while loading the accounts." : "Hesaplar yüklenirken hata.",
-    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{folderName} içinde  {from} dan {newMessageCount} yeni mesaj bulundu",
     "you" : "siz",
     "Error while loading the selected account." : "Seçili hesap yüklenirken hata.",
     "Error while loading messages." : "İletiler yüklenirken hata.",
@@ -40,6 +39,7 @@ OC.L10N.register(
     "Starred" : "Yıldızlı",
     "Creating account failed: " : "Hesap oluşturma başarısız:",
     "Auto detect failed. Please use manual mode." : "Otomatik sınama başarısız. Lütfen el kipini kullanın.",
+    "Delete permanently" : "Kalıcı olarak sil",
     "& others" : "& diğerleri",
     "from" : "kimden",
     "+ cc/bcc" : "+ cc/bcc",
@@ -58,6 +58,7 @@ OC.L10N.register(
     "+ cc" : "+ cc",
     "Reply …" : "Yanıtla...",
     "Forward" : "İlet",
+    "Delete" : "Sil",
     "Add mail account" : "Posta hesabı ekle",
     "No search results for {{searchTerm}}" : "{{searchTerm}} için hiç bir sonuç bulunamadı",
     "No messages in this folder!" : "Bu klasörde ileti yok!",
diff --git a/l10n/tr.json b/l10n/tr.json
index 311d0469a..03fc97be8 100644
--- a/l10n/tr.json
+++ b/l10n/tr.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Mail" : "Posta",
     "Error while loading the accounts." : "Hesaplar yüklenirken hata.",
-    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{folderName} içinde  {from} dan {newMessageCount} yeni mesaj bulundu",
     "you" : "siz",
     "Error while loading the selected account." : "Seçili hesap yüklenirken hata.",
     "Error while loading messages." : "İletiler yüklenirken hata.",
@@ -38,6 +37,7 @@
     "Starred" : "Yıldızlı",
     "Creating account failed: " : "Hesap oluşturma başarısız:",
     "Auto detect failed. Please use manual mode." : "Otomatik sınama başarısız. Lütfen el kipini kullanın.",
+    "Delete permanently" : "Kalıcı olarak sil",
     "& others" : "& diğerleri",
     "from" : "kimden",
     "+ cc/bcc" : "+ cc/bcc",
@@ -56,6 +56,7 @@
     "+ cc" : "+ cc",
     "Reply …" : "Yanıtla...",
     "Forward" : "İlet",
+    "Delete" : "Sil",
     "Add mail account" : "Posta hesabı ekle",
     "No search results for {{searchTerm}}" : "{{searchTerm}} için hiç bir sonuç bulunamadı",
     "No messages in this folder!" : "Bu klasörde ileti yok!",
diff --git a/l10n/uk.js b/l10n/uk.js
index 1f55bf78f..d07faec5c 100644
--- a/l10n/uk.js
+++ b/l10n/uk.js
@@ -39,6 +39,7 @@ OC.L10N.register(
     "Starred" : "Помічені зірочкою",
     "Creating account failed: " : "Помилка створення облікового запису:",
     "Auto detect failed. Please use manual mode." : "Авто-виявлення не спрацювало. Будь ласка, скористайтесь ручний режимом.",
+    "Delete permanently" : "Видалити назавжди",
     "from" : "З",
     "+ cc/bcc" : "+ Копія/Прихована копія",
     "to" : "в",
@@ -56,6 +57,7 @@ OC.L10N.register(
     "+ cc" : "+ Копія",
     "Reply …" : "Відповісти ...",
     "Forward" : "Переслати",
+    "Delete" : "Видалити",
     "Add mail account" : "Додати обліковий запис пошти",
     "No messages in this folder!" : "В цій теці повідомлення відсутні!",
     "New message" : "Нове повідомлення",
diff --git a/l10n/uk.json b/l10n/uk.json
index 553205d36..41b79a948 100644
--- a/l10n/uk.json
+++ b/l10n/uk.json
@@ -37,6 +37,7 @@
     "Starred" : "Помічені зірочкою",
     "Creating account failed: " : "Помилка створення облікового запису:",
     "Auto detect failed. Please use manual mode." : "Авто-виявлення не спрацювало. Будь ласка, скористайтесь ручний режимом.",
+    "Delete permanently" : "Видалити назавжди",
     "from" : "З",
     "+ cc/bcc" : "+ Копія/Прихована копія",
     "to" : "в",
@@ -54,6 +55,7 @@
     "+ cc" : "+ Копія",
     "Reply …" : "Відповісти ...",
     "Forward" : "Переслати",
+    "Delete" : "Видалити",
     "Add mail account" : "Додати обліковий запис пошти",
     "No messages in this folder!" : "В цій теці повідомлення відсутні!",
     "New message" : "Нове повідомлення",