[tx-robot] updated from transifex

70 files changed, 302 insertions, 158 deletions

diff --git a/l10n/ast.js b/l10n/ast.js
index a864e2fda..a65982d9f 100644
--- a/l10n/ast.js
+++ b/l10n/ast.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Message could not be starred. Please try again." : "El mensaxe nun se puede marcar como favoritu. Inténtalo más tarde.",
     "Unknown error" : "Fallu desconocíu",
     "Error while creating an account: " : "Fallu creando la cuenta",
+    "Draft saved!" : "¡Borrador salváu!",
     "Error while loading messages." : "Fallu cargando mensaxes",
     "Choose a folder to store the attachment in" : "Escueyi una carpeta pa guardar l'axuntu",
     "Attachments saved to Files." : "Ficheros axuntos guardaos en Ficheros.",
@@ -18,7 +19,6 @@ OC.L10N.register(
     "Opening HTML drafts is not supported yet." : "Abrir borradores de HTML ainda nun ta soportáu",
     "Forwarded message" : "Mensaxe reunviáu",
     "Error while loading the selected message." : "Fallu cargando'l mensaxe esbilláu",
-    "Draft saved!" : "¡Borrador salváu!",
     "Choose a file to add as attachment" : "Escueyi un ficheru p'amestalu como axuntu",
     "Reply" : "Rempuesta",
     "Send" : "Unviar",
@@ -27,11 +27,11 @@ OC.L10N.register(
     "Server error" : "Fallu de sirvidor",
     "you" : "tu",
     "Send message to {email}" : "Unviar mensaje a {email}",
-    "Error while deleting message." : "Fallu desaniciando'l mensaxe",
     "Checking messages" : "Comprobando mensaxes",
     "Loading …" : "Cargando ...",
     "Load more …" : "Cargar más …",
     "Check messages" : "Comprueba mensaxes",
+    "Error while deleting message." : "Fallu desaniciando'l mensaxe",
     "Error while deleting account." : "Fallu desaniciando la cuenta",
     "Connecting" : "Coneutando",
     "Connect" : "Coneutar",
diff --git a/l10n/ast.json b/l10n/ast.json
index 56ca1db2b..f6ff2e9ef 100644
--- a/l10n/ast.json
+++ b/l10n/ast.json
@@ -7,6 +7,7 @@
     "Message could not be starred. Please try again." : "El mensaxe nun se puede marcar como favoritu. Inténtalo más tarde.",
     "Unknown error" : "Fallu desconocíu",
     "Error while creating an account: " : "Fallu creando la cuenta",
+    "Draft saved!" : "¡Borrador salváu!",
     "Error while loading messages." : "Fallu cargando mensaxes",
     "Choose a folder to store the attachment in" : "Escueyi una carpeta pa guardar l'axuntu",
     "Attachments saved to Files." : "Ficheros axuntos guardaos en Ficheros.",
@@ -16,7 +17,6 @@
     "Opening HTML drafts is not supported yet." : "Abrir borradores de HTML ainda nun ta soportáu",
     "Forwarded message" : "Mensaxe reunviáu",
     "Error while loading the selected message." : "Fallu cargando'l mensaxe esbilláu",
-    "Draft saved!" : "¡Borrador salváu!",
     "Choose a file to add as attachment" : "Escueyi un ficheru p'amestalu como axuntu",
     "Reply" : "Rempuesta",
     "Send" : "Unviar",
@@ -25,11 +25,11 @@
     "Server error" : "Fallu de sirvidor",
     "you" : "tu",
     "Send message to {email}" : "Unviar mensaje a {email}",
-    "Error while deleting message." : "Fallu desaniciando'l mensaxe",
     "Checking messages" : "Comprobando mensaxes",
     "Loading …" : "Cargando ...",
     "Load more …" : "Cargar más …",
     "Check messages" : "Comprueba mensaxes",
+    "Error while deleting message." : "Fallu desaniciando'l mensaxe",
     "Error while deleting account." : "Fallu desaniciando la cuenta",
     "Connecting" : "Coneutando",
     "Connect" : "Coneutar",
diff --git a/l10n/cs_CZ.js b/l10n/cs_CZ.js
index cc0c683de..6ddab50fe 100644
--- a/l10n/cs_CZ.js
+++ b/l10n/cs_CZ.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Message could not be starred. Please try again." : "Zpráva nemohla být označena hvězdičkou. Zkuste to prosím znovu.",
     "Unknown error" : "Neznámá chyba",
     "Error while creating an account: " : "Chyba při vytváření účtu:",
+    "Draft saved!" : "Koncept uložen!",
     "Error while loading messages." : "Chyba během načítání zpráv.",
     "Choose a folder to store the attachment in" : "Vyber adresář pro uložení přílohy",
     "Attachments saved to Files." : "Přílohy uloženy do Souborů.",
@@ -18,7 +19,6 @@ OC.L10N.register(
     "Opening HTML drafts is not supported yet." : "Otevírání HTML konceptů ještě není podporováno.",
     "Forwarded message" : "Přeposlaná zpráva",
     "Error while loading the selected message." : "Chyba při načítání vybrané zprávy.",
-    "Draft saved!" : "Koncept uložen!",
     "Choose a file to add as attachment" : "Vyberte soubor k přiložení",
     "Reply" : "Odpověď",
     "Send" : "Odeslat",
@@ -27,11 +27,11 @@ OC.L10N.register(
     "Server error" : "Chyba serveru",
     "you" : "vy",
     "Send message to {email}" : "Poslat email na {email}",
-    "Error while deleting message." : "Chyba při mazání zprávy.",
     "Checking messages" : "Kontrola zpráv",
     "Loading …" : "Načítání ...",
     "Load more …" : "Načíst další ...",
     "Check messages" : "Zkontrolovat zprávy",
+    "Error while deleting message." : "Chyba při mazání zprávy.",
     "Error while deleting account." : "Chyba při mazání účtu.",
     "Connecting" : "Připojování",
     "Connect" : "Připojit",
diff --git a/l10n/cs_CZ.json b/l10n/cs_CZ.json
index b7bc20982..c508fafd0 100644
--- a/l10n/cs_CZ.json
+++ b/l10n/cs_CZ.json
@@ -7,6 +7,7 @@
     "Message could not be starred. Please try again." : "Zpráva nemohla být označena hvězdičkou. Zkuste to prosím znovu.",
     "Unknown error" : "Neznámá chyba",
     "Error while creating an account: " : "Chyba při vytváření účtu:",
+    "Draft saved!" : "Koncept uložen!",
     "Error while loading messages." : "Chyba během načítání zpráv.",
     "Choose a folder to store the attachment in" : "Vyber adresář pro uložení přílohy",
     "Attachments saved to Files." : "Přílohy uloženy do Souborů.",
@@ -16,7 +17,6 @@
     "Opening HTML drafts is not supported yet." : "Otevírání HTML konceptů ještě není podporováno.",
     "Forwarded message" : "Přeposlaná zpráva",
     "Error while loading the selected message." : "Chyba při načítání vybrané zprávy.",
-    "Draft saved!" : "Koncept uložen!",
     "Choose a file to add as attachment" : "Vyberte soubor k přiložení",
     "Reply" : "Odpověď",
     "Send" : "Odeslat",
@@ -25,11 +25,11 @@
     "Server error" : "Chyba serveru",
     "you" : "vy",
     "Send message to {email}" : "Poslat email na {email}",
-    "Error while deleting message." : "Chyba při mazání zprávy.",
     "Checking messages" : "Kontrola zpráv",
     "Loading …" : "Načítání ...",
     "Load more …" : "Načíst další ...",
     "Check messages" : "Zkontrolovat zprávy",
+    "Error while deleting message." : "Chyba při mazání zprávy.",
     "Error while deleting account." : "Chyba při mazání účtu.",
     "Connecting" : "Připojování",
     "Connect" : "Připojit",
diff --git a/l10n/da.js b/l10n/da.js
index c02e6feb0..9b717e93b 100644
--- a/l10n/da.js
+++ b/l10n/da.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Message could not be starred. Please try again." : "Beskeden kunne ikke sternemarkeres. Forsøg venligst igen.",
     "Unknown error" : "Ukendt fejl",
     "Error while creating an account: " : "Fejl under oprettelse af kontoen:",
+    "Draft saved!" : "Kladde blev gemt!",
     "Error while loading messages." : "Fejl under indlæsning af beskeder.",
     "Choose a folder to store the attachment in" : "Vælg den mappe, hvor vedhæftningen skal gemmes i",
     "Attachments saved to Files." : "Vedhæftning blev gemt i Filer.",
@@ -18,7 +19,6 @@ OC.L10N.register(
     "Opening HTML drafts is not supported yet." : "Åbning af HTML-kladder understøttes endnu ikke.",
     "Forwarded message" : "Videresendt besked",
     "Error while loading the selected message." : "Fejl under indlæsning af den valgte besked.",
-    "Draft saved!" : "Kladde blev gemt!",
     "Choose a file to add as attachment" : "Vælg en fil, der skal tilføjes som vedhæftning",
     "Reply" : "Besvar",
     "Send" : "Send",
@@ -27,11 +27,11 @@ OC.L10N.register(
     "Server error" : "Serverfejl",
     "you" : "dig",
     "Send message to {email}" : "Send besked til {email}",
-    "Error while deleting message." : "Fejl under sletning af besked.",
     "Checking messages" : "Henter beskeder",
     "Loading …" : "Indlæser...",
     "Load more …" : "Indlæs flere ...",
     "Check messages" : "Henter beskeder",
+    "Error while deleting message." : "Fejl under sletning af besked.",
     "Error while deleting account." : "Fejl under sletning af kontoen.",
     "Connecting" : "Tilslutter",
     "Connect" : "Tilslut",
diff --git a/l10n/da.json b/l10n/da.json
index a2f439f19..416c5ecd2 100644
--- a/l10n/da.json
+++ b/l10n/da.json
@@ -7,6 +7,7 @@
     "Message could not be starred. Please try again." : "Beskeden kunne ikke sternemarkeres. Forsøg venligst igen.",
     "Unknown error" : "Ukendt fejl",
     "Error while creating an account: " : "Fejl under oprettelse af kontoen:",
+    "Draft saved!" : "Kladde blev gemt!",
     "Error while loading messages." : "Fejl under indlæsning af beskeder.",
     "Choose a folder to store the attachment in" : "Vælg den mappe, hvor vedhæftningen skal gemmes i",
     "Attachments saved to Files." : "Vedhæftning blev gemt i Filer.",
@@ -16,7 +17,6 @@
     "Opening HTML drafts is not supported yet." : "Åbning af HTML-kladder understøttes endnu ikke.",
     "Forwarded message" : "Videresendt besked",
     "Error while loading the selected message." : "Fejl under indlæsning af den valgte besked.",
-    "Draft saved!" : "Kladde blev gemt!",
     "Choose a file to add as attachment" : "Vælg en fil, der skal tilføjes som vedhæftning",
     "Reply" : "Besvar",
     "Send" : "Send",
@@ -25,11 +25,11 @@
     "Server error" : "Serverfejl",
     "you" : "dig",
     "Send message to {email}" : "Send besked til {email}",
-    "Error while deleting message." : "Fejl under sletning af besked.",
     "Checking messages" : "Henter beskeder",
     "Loading …" : "Indlæser...",
     "Load more …" : "Indlæs flere ...",
     "Check messages" : "Henter beskeder",
+    "Error while deleting message." : "Fejl under sletning af besked.",
     "Error while deleting account." : "Fejl under sletning af kontoen.",
     "Connecting" : "Tilslutter",
     "Connect" : "Tilslut",
diff --git a/l10n/de.js b/l10n/de.js
index 25fd789cd..855335c04 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Message could not be starred. Please try again." : "Nachricht konnte nicht als Favorit markiert werden. Bitte noch einmal versuchen.",
     "Unknown error" : "Unbekannter Fehler",
     "Error while creating an account: " : "Fehler beim Erstellen eines Kontos:",
+    "Draft saved!" : "Entwurf gespeichert!",
     "Error while loading messages." : "Fehler beim Laden der Nachrichten.",
     "Choose a folder to store the attachment in" : "Ordner zum Anhang speichern auswählen",
     "Attachments saved to Files." : "Anhänge unter Dateien gespeichert.",
@@ -18,7 +19,6 @@ OC.L10N.register(
     "Opening HTML drafts is not supported yet." : "Das Öffnen von HTML-Entwürfen wird noch nicht unterstützt.",
     "Forwarded message" : "Weitergeleitete Nachricht",
     "Error while loading the selected message." : "Fehler beim Laden der ausgewählten Nachricht.",
-    "Draft saved!" : "Entwurf gespeichert!",
     "Choose a file to add as attachment" : "Wähle eine Datei, die als Anhang angefügt werden soll",
     "Reply" : "Antwort",
     "Send" : "Senden",
@@ -27,11 +27,11 @@ OC.L10N.register(
     "Server error" : "Serverfehler",
     "you" : "Du",
     "Send message to {email}" : "Nachricht an {email} senden",
-    "Error while deleting message." : "Fehler beim Löschen der Nachricht.",
     "Checking messages" : "Nachrichten werden überprüft",
     "Loading …" : "Laden…",
     "Load more …" : "Weitere laden…",
     "Check messages" : "Überprüfe Nachrichten",
+    "Error while deleting message." : "Fehler beim Löschen der Nachricht.",
     "Error while deleting account." : "Fehler beim Löschen des Kontos.",
     "Connecting" : "Verbinden…",
     "Connect" : "Verbinden",
diff --git a/l10n/de.json b/l10n/de.json
index 4f7f6115a..b16b869bb 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -7,6 +7,7 @@
     "Message could not be starred. Please try again." : "Nachricht konnte nicht als Favorit markiert werden. Bitte noch einmal versuchen.",
     "Unknown error" : "Unbekannter Fehler",
     "Error while creating an account: " : "Fehler beim Erstellen eines Kontos:",
+    "Draft saved!" : "Entwurf gespeichert!",
     "Error while loading messages." : "Fehler beim Laden der Nachrichten.",
     "Choose a folder to store the attachment in" : "Ordner zum Anhang speichern auswählen",
     "Attachments saved to Files." : "Anhänge unter Dateien gespeichert.",
@@ -16,7 +17,6 @@
     "Opening HTML drafts is not supported yet." : "Das Öffnen von HTML-Entwürfen wird noch nicht unterstützt.",
     "Forwarded message" : "Weitergeleitete Nachricht",
     "Error while loading the selected message." : "Fehler beim Laden der ausgewählten Nachricht.",
-    "Draft saved!" : "Entwurf gespeichert!",
     "Choose a file to add as attachment" : "Wähle eine Datei, die als Anhang angefügt werden soll",
     "Reply" : "Antwort",
     "Send" : "Senden",
@@ -25,11 +25,11 @@
     "Server error" : "Serverfehler",
     "you" : "Du",
     "Send message to {email}" : "Nachricht an {email} senden",
-    "Error while deleting message." : "Fehler beim Löschen der Nachricht.",
     "Checking messages" : "Nachrichten werden überprüft",
     "Loading …" : "Laden…",
     "Load more …" : "Weitere laden…",
     "Check messages" : "Überprüfe Nachrichten",
+    "Error while deleting message." : "Fehler beim Löschen der Nachricht.",
     "Error while deleting account." : "Fehler beim Löschen des Kontos.",
     "Connecting" : "Verbinden…",
     "Connect" : "Verbinden",
diff --git a/l10n/de_DE.js b/l10n/de_DE.js
index 8b6969815..cf2e72697 100644
--- a/l10n/de_DE.js
+++ b/l10n/de_DE.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Message could not be starred. Please try again." : "Nachricht konnte nicht als Favorit markiert werden. Bitte noch einmal versuchen.",
     "Unknown error" : "Unbekannter Fehler",
     "Error while creating an account: " : "Fehler beim Erstellen eines Kontos:",
+    "Draft saved!" : "Entwurf gespeichert!",
     "Error while loading messages." : "Fehler beim Laden der Nachrichten.",
     "Choose a folder to store the attachment in" : "Ordner zum Speichern des Anhangs auswählen",
     "Attachments saved to Files." : "Anhänge wurde in Dateien gespeichert.",
@@ -18,7 +19,6 @@ OC.L10N.register(
     "Opening HTML drafts is not supported yet." : "Das Öffnen von HTML-Entwürfen wird noch nicht unterstützt.",
     "Forwarded message" : "Weitergeleitete Nachricht",
     "Error while loading the selected message." : "Fehler beim Laden der ausgewählten Nachricht.",
-    "Draft saved!" : "Entwurf gespeichert!",
     "Choose a file to add as attachment" : "Wählen Sie eine Datei, die als Anhang angefügt werden soll",
     "Reply" : "Antwort",
     "Send" : "Senden",
@@ -27,11 +27,11 @@ OC.L10N.register(
     "Server error" : "Serverfehler",
     "you" : "Sie",
     "Send message to {email}" : "Nachricht an {email} senden",
-    "Error while deleting message." : "Fehler beim Löschen der Nachricht.",
     "Checking messages" : "Nachrichten überprüfen",
     "Loading …" : "Laden…",
     "Load more …" : "Weitere laden…",
     "Check messages" : "Nachrichten überprüfen",
+    "Error while deleting message." : "Fehler beim Löschen der Nachricht.",
     "Error while deleting account." : "Fehler beim Löschen des Kontos.",
     "Connecting" : "Verbinde",
     "Connect" : "Verbinden",
@@ -52,6 +52,8 @@ OC.L10N.register(
     "New message" : "Neue Nachricht",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Sie werden zu %s weitergeleitet - Bitte hier klicken, wenn Sie nicht automatisch innerhalb der nächsten Sekunden weitergeleitet werden.",
     "Redirect warning" : "Umleitungswarnung",
-    "If you do not want to visit that page, you can return to <a href=\"%s\">the mail app</a>." : "Wenn Sie diese Seite nicht besuchen möchten, können Sie <a href=\"%s\">zur Mail-App</a> zurück kehren."
+    "The previous page is sending you to %s" : "Die vorangegangene Seite leitet Sie zu %s weiter",
+    "If you do not want to visit that page, you can return to <a href=\"%s\">the mail app</a>." : "Wenn Sie diese Seite nicht besuchen möchten, können Sie <a href=\"%s\">zur Mail-App</a> zurück kehren.",
+    "Continue to %s" : "Fortsetzen auf %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/de_DE.json b/l10n/de_DE.json
index b9d64952e..dc848f6c3 100644
--- a/l10n/de_DE.json
+++ b/l10n/de_DE.json
@@ -7,6 +7,7 @@
     "Message could not be starred. Please try again." : "Nachricht konnte nicht als Favorit markiert werden. Bitte noch einmal versuchen.",
     "Unknown error" : "Unbekannter Fehler",
     "Error while creating an account: " : "Fehler beim Erstellen eines Kontos:",
+    "Draft saved!" : "Entwurf gespeichert!",
     "Error while loading messages." : "Fehler beim Laden der Nachrichten.",
     "Choose a folder to store the attachment in" : "Ordner zum Speichern des Anhangs auswählen",
     "Attachments saved to Files." : "Anhänge wurde in Dateien gespeichert.",
@@ -16,7 +17,6 @@
     "Opening HTML drafts is not supported yet." : "Das Öffnen von HTML-Entwürfen wird noch nicht unterstützt.",
     "Forwarded message" : "Weitergeleitete Nachricht",
     "Error while loading the selected message." : "Fehler beim Laden der ausgewählten Nachricht.",
-    "Draft saved!" : "Entwurf gespeichert!",
     "Choose a file to add as attachment" : "Wählen Sie eine Datei, die als Anhang angefügt werden soll",
     "Reply" : "Antwort",
     "Send" : "Senden",
@@ -25,11 +25,11 @@
     "Server error" : "Serverfehler",
     "you" : "Sie",
     "Send message to {email}" : "Nachricht an {email} senden",
-    "Error while deleting message." : "Fehler beim Löschen der Nachricht.",
     "Checking messages" : "Nachrichten überprüfen",
     "Loading …" : "Laden…",
     "Load more …" : "Weitere laden…",
     "Check messages" : "Nachrichten überprüfen",
+    "Error while deleting message." : "Fehler beim Löschen der Nachricht.",
     "Error while deleting account." : "Fehler beim Löschen des Kontos.",
     "Connecting" : "Verbinde",
     "Connect" : "Verbinden",
@@ -50,6 +50,8 @@
     "New message" : "Neue Nachricht",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Sie werden zu %s weitergeleitet - Bitte hier klicken, wenn Sie nicht automatisch innerhalb der nächsten Sekunden weitergeleitet werden.",
     "Redirect warning" : "Umleitungswarnung",
-    "If you do not want to visit that page, you can return to <a href=\"%s\">the mail app</a>." : "Wenn Sie diese Seite nicht besuchen möchten, können Sie <a href=\"%s\">zur Mail-App</a> zurück kehren."
+    "The previous page is sending you to %s" : "Die vorangegangene Seite leitet Sie zu %s weiter",
+    "If you do not want to visit that page, you can return to <a href=\"%s\">the mail app</a>." : "Wenn Sie diese Seite nicht besuchen möchten, können Sie <a href=\"%s\">zur Mail-App</a> zurück kehren.",
+    "Continue to %s" : "Fortsetzen auf %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/el.js b/l10n/el.js
index f497317ff..452059e10 100644
--- a/l10n/el.js
+++ b/l10n/el.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Message could not be starred. Please try again." : "Το μήνυμα δεν ήταν εφικτό να επισημανθεί με αστέρι. Παρακαλώ προσπαθήστε ξανά.",
     "Unknown error" : "Άγνωστο σφάλμα",
     "Error while creating an account: " : "Σφάλμα κατά τη δημιουργία λογαριασμού:",
+    "Draft saved!" : "Το πρόχειρο αποθηκεύτηκε!",
     "Error while loading messages." : "Σφάλμα κατά τη φόρτωση μηνυμάτων.",
     "Choose a folder to store the attachment in" : "Επιλέξτε ένα φάκελο για να αποθηκεύσετε τα συννημένα",
     "Attachments saved to Files." : "Τα συνημμένα αποθηκεύτηκαν στα Έγγραφα.",
@@ -18,7 +19,6 @@ OC.L10N.register(
     "Opening HTML drafts is not supported yet." : "Το άνοιγμα HTML προχείρων  δεν υποστηρίζεται ακόμη.",
     "Forwarded message" : "Προωθημένο μήνυμα",
     "Error while loading the selected message." : "Σφάλμα κατά τη φόρτωση του επιλεγμένου μηνύματος.",
-    "Draft saved!" : "Το πρόχειρο αποθηκεύτηκε!",
     "Choose a file to add as attachment" : "Επιλέξτε έναν φάκελο για να προσθέσετε σαν συνημμένο",
     "Reply" : "Απάντηση",
     "Send" : "Αποστολή",
@@ -27,11 +27,11 @@ OC.L10N.register(
     "Server error" : "Σφάλμα διακομιστή",
     "you" : "εσείς",
     "Send message to {email}" : "Αποστολή μηνύματος σε {email}",
-    "Error while deleting message." : "Σφάλμα κατά τη διαγραφή του μηνύματος",
     "Checking messages" : "Γίνεται έλεγχος μηνυμάτων",
     "Loading …" : "Φόρτωση ...",
     "Load more …" : "Φόρτωση περισσότερων...",
     "Check messages" : "Έλεγχος μηνυμάτων",
+    "Error while deleting message." : "Σφάλμα κατά τη διαγραφή του μηνύματος",
     "Error while deleting account." : "Σφάλμα κατά τη διαγραφή λογαριασμού.",
     "Connecting" : "Σύνδεση",
     "Connect" : "Σύνδεση",
diff --git a/l10n/el.json b/l10n/el.json
index 4509629d8..4274de0c4 100644
--- a/l10n/el.json
+++ b/l10n/el.json
@@ -7,6 +7,7 @@
     "Message could not be starred. Please try again." : "Το μήνυμα δεν ήταν εφικτό να επισημανθεί με αστέρι. Παρακαλώ προσπαθήστε ξανά.",
     "Unknown error" : "Άγνωστο σφάλμα",
     "Error while creating an account: " : "Σφάλμα κατά τη δημιουργία λογαριασμού:",
+    "Draft saved!" : "Το πρόχειρο αποθηκεύτηκε!",
     "Error while loading messages." : "Σφάλμα κατά τη φόρτωση μηνυμάτων.",
     "Choose a folder to store the attachment in" : "Επιλέξτε ένα φάκελο για να αποθηκεύσετε τα συννημένα",
     "Attachments saved to Files." : "Τα συνημμένα αποθηκεύτηκαν στα Έγγραφα.",
@@ -16,7 +17,6 @@
     "Opening HTML drafts is not supported yet." : "Το άνοιγμα HTML προχείρων  δεν υποστηρίζεται ακόμη.",
     "Forwarded message" : "Προωθημένο μήνυμα",
     "Error while loading the selected message." : "Σφάλμα κατά τη φόρτωση του επιλεγμένου μηνύματος.",
-    "Draft saved!" : "Το πρόχειρο αποθηκεύτηκε!",
     "Choose a file to add as attachment" : "Επιλέξτε έναν φάκελο για να προσθέσετε σαν συνημμένο",
     "Reply" : "Απάντηση",
     "Send" : "Αποστολή",
@@ -25,11 +25,11 @@
     "Server error" : "Σφάλμα διακομιστή",
     "you" : "εσείς",
     "Send message to {email}" : "Αποστολή μηνύματος σε {email}",
-    "Error while deleting message." : "Σφάλμα κατά τη διαγραφή του μηνύματος",
     "Checking messages" : "Γίνεται έλεγχος μηνυμάτων",
     "Loading …" : "Φόρτωση ...",
     "Load more …" : "Φόρτωση περισσότερων...",
     "Check messages" : "Έλεγχος μηνυμάτων",
+    "Error while deleting message." : "Σφάλμα κατά τη διαγραφή του μηνύματος",
     "Error while deleting account." : "Σφάλμα κατά τη διαγραφή λογαριασμού.",
     "Connecting" : "Σύνδεση",
     "Connect" : "Σύνδεση",
diff --git a/l10n/en_GB.js b/l10n/en_GB.js
index fc4498f1f..4ed6c99c7 100644
--- a/l10n/en_GB.js
+++ b/l10n/en_GB.js
@@ -2,12 +2,14 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Mail",
+    "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n new message in {folderName} \nfrom {from}","%n new messages in {folderName} \nfrom {from}"],
     "Error while loading the accounts." : "Error whilst loading the accounts.",
     "Error while loading the selected account." : "Error whilst loading the selected account.",
     "Message could not be starred. Please try again." : "Message could not be starred. Please try again.",
     "Unknown error" : "Unknown error",
     "Error while creating an account: " : "Error whilst creating an account: ",
+    "Draft saved!" : "Draft saved!",
     "Error while loading messages." : "Error whilst loading messages.",
     "Choose a folder to store the attachment in" : "Choose a folder to store the attachment in",
     "Attachments saved to Files." : "Attachments saved to Files.",
@@ -15,8 +17,8 @@ OC.L10N.register(
     "Error while saving attachments to Files." : "Error whilst saving attachments to Files.",
     "Error while saving attachment to Files." : "Error whilst saving attachment to Files.",
     "Opening HTML drafts is not supported yet." : "Opening HTML drafts is not supported yet.",
+    "Forwarded message" : "Forwarded message",
     "Error while loading the selected message." : "Error whilst loading the selected message.",
-    "Draft saved!" : "Draft saved!",
     "Choose a file to add as attachment" : "Choose a file to add as attachment",
     "Reply" : "Reply",
     "Send" : "Send",
@@ -24,10 +26,14 @@ OC.L10N.register(
     "Message sent!" : "Message sent!",
     "Server error" : "Server error",
     "you" : "you",
-    "Error while deleting message." : "Error whilst deleting message.",
+    "Send message to {email}" : "Send message to {email}",
+    "Checking messages" : "Checking messages",
     "Loading …" : "Loading…",
     "Load more …" : "Load more…",
+    "Check messages" : "Check messages",
+    "Error while deleting message." : "Error whilst deleting message.",
     "Error while deleting account." : "Error whilst deleting account.",
+    "Connecting" : "Connecting",
     "Connect" : "Connect",
     "Inbox" : "Inbox",
     "Sent" : "Sent",
@@ -41,9 +47,13 @@ OC.L10N.register(
     "Auto detect failed. Please use manual mode." : "Auto detect failed. Please use manual mode.",
     "Delete permanently" : "Delete permanently",
     "& others" : "& others",
+    "All inboxes" : "All inboxes",
     "Error loading message" : "Error loading message",
     "New message" : "New message",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds.",
-    "If you do not want to visit that page, you can return to <a href=\"%s\">the mail app</a>." : "If you do not want to visit that page, you can return to <a href=\"%s\">the mail app</a>."
+    "Redirect warning" : "Redirect warning",
+    "The previous page is sending you to %s" : "The previous page is sending you to %s",
+    "If you do not want to visit that page, you can return to <a href=\"%s\">the mail app</a>." : "If you do not want to visit that page, you can return to <a href=\"%s\">the mail app</a>.",
+    "Continue to %s" : "Continue to %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/en_GB.json b/l10n/en_GB.json
index c093fc7d3..391ff9e0a 100644
--- a/l10n/en_GB.json
+++ b/l10n/en_GB.json
@@ -1,11 +1,13 @@
 { "translations": {
     "Mail" : "Mail",
+    "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n new message in {folderName} \nfrom {from}","%n new messages in {folderName} \nfrom {from}"],
     "Error while loading the accounts." : "Error whilst loading the accounts.",
     "Error while loading the selected account." : "Error whilst loading the selected account.",
     "Message could not be starred. Please try again." : "Message could not be starred. Please try again.",
     "Unknown error" : "Unknown error",
     "Error while creating an account: " : "Error whilst creating an account: ",
+    "Draft saved!" : "Draft saved!",
     "Error while loading messages." : "Error whilst loading messages.",
     "Choose a folder to store the attachment in" : "Choose a folder to store the attachment in",
     "Attachments saved to Files." : "Attachments saved to Files.",
@@ -13,8 +15,8 @@
     "Error while saving attachments to Files." : "Error whilst saving attachments to Files.",
     "Error while saving attachment to Files." : "Error whilst saving attachment to Files.",
     "Opening HTML drafts is not supported yet." : "Opening HTML drafts is not supported yet.",
+    "Forwarded message" : "Forwarded message",
     "Error while loading the selected message." : "Error whilst loading the selected message.",
-    "Draft saved!" : "Draft saved!",
     "Choose a file to add as attachment" : "Choose a file to add as attachment",
     "Reply" : "Reply",
     "Send" : "Send",
@@ -22,10 +24,14 @@
     "Message sent!" : "Message sent!",
     "Server error" : "Server error",
     "you" : "you",
-    "Error while deleting message." : "Error whilst deleting message.",
+    "Send message to {email}" : "Send message to {email}",
+    "Checking messages" : "Checking messages",
     "Loading …" : "Loading…",
     "Load more …" : "Load more…",
+    "Check messages" : "Check messages",
+    "Error while deleting message." : "Error whilst deleting message.",
     "Error while deleting account." : "Error whilst deleting account.",
+    "Connecting" : "Connecting",
     "Connect" : "Connect",
     "Inbox" : "Inbox",
     "Sent" : "Sent",
@@ -39,9 +45,13 @@
     "Auto detect failed. Please use manual mode." : "Auto detect failed. Please use manual mode.",
     "Delete permanently" : "Delete permanently",
     "& others" : "& others",
+    "All inboxes" : "All inboxes",
     "Error loading message" : "Error loading message",
     "New message" : "New message",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds.",
-    "If you do not want to visit that page, you can return to <a href=\"%s\">the mail app</a>." : "If you do not want to visit that page, you can return to <a href=\"%s\">the mail app</a>."
+    "Redirect warning" : "Redirect warning",
+    "The previous page is sending you to %s" : "The previous page is sending you to %s",
+    "If you do not want to visit that page, you can return to <a href=\"%s\">the mail app</a>." : "If you do not want to visit that page, you can return to <a href=\"%s\">the mail app</a>.",
+    "Continue to %s" : "Continue to %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/eo.js b/l10n/eo.js
new file mode 100644
index 000000000..1216bff18
--- /dev/null
+++ b/l10n/eo.js
@@ -0,0 +1,47 @@
+OC.L10N.register(
+    "mail",
+    {
+    "Mail" : "Retpoŝto",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n nova mesaĝo en {folderName}\nde {from}","%n novaj mesaĝoj en {folderName}\nde {from}"],
+    "Error while loading the accounts." : "Eraris ŝargo de la kontoj.",
+    "Error while loading the selected account." : "Eraris ŝargo de la elektita konto.",
+    "Unknown error" : "Nekonata eraro",
+    "Error while creating an account: " : "Eraris kreo de konto:",
+    "Draft saved!" : "Malneto konserviĝis!",
+    "Error while loading messages." : "Eraris ŝargo de mesaĝoj.",
+    "Attachments saved to Files." : "Kunsendaĵoj konserviĝis en Dosierojn.",
+    "Attachment saved to Files." : "Kunsendaĵo konserviĝis en Dosierojn.",
+    "Error while saving attachments to Files." : "Eraris konservo de kunsendaĵoj en Dosierojn.",
+    "Error while saving attachment to Files." : "Eraris konservo de kunsendaĵo en Dosierojn.",
+    "Choose a file to add as attachment" : "Elektu dosieron por aldoni kiel kunsendaĵo",
+    "Reply" : "Respondi",
+    "Send" : "Sendi",
+    "Sending …" : "Sendante...",
+    "Message sent!" : "Mesaĝo sendiĝis!",
+    "Server error" : "Eraro pri servilo",
+    "you" : "vi",
+    "Send message to {email}" : "Mesaĝi al {email}",
+    "Loading …" : "Ŝargante...",
+    "Load more …" : "Ŝargante pli...",
+    "Error while deleting message." : "Eraris forigo de mesaĝo.",
+    "Error while deleting account." : "Eraris forigo de konto.",
+    "Connecting" : "Konektante",
+    "Connect" : "Konekti",
+    "Inbox" : "Enirkesto",
+    "Sent" : "Senditujo",
+    "Drafts" : "Malnetujo",
+    "Archive" : "Arĥivo",
+    "Trash" : "Rubujo",
+    "Junk" : "Trudmesaĝujo",
+    "All" : "Ĉio",
+    "Favorites" : "Pliŝatoj",
+    "Creating account failed: " : "Kreo de konto malsukcesis:",
+    "Delete permanently" : "Forigi por ĉiam",
+    "& others" : "kaj aliaj",
+    "All inboxes" : "Ĉiuj enirkestoj",
+    "Error loading message" : "Eraris ŝargo de mesaĝo",
+    "New message" : "Nova mesaĝo",
+    "Continue to %s" : "Daŭri al %s"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/l10n/eo.json b/l10n/eo.json
new file mode 100644
index 000000000..09080a87c
--- /dev/null
+++ b/l10n/eo.json
@@ -0,0 +1,45 @@
+{ "translations": {
+    "Mail" : "Retpoŝto",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n nova mesaĝo en {folderName}\nde {from}","%n novaj mesaĝoj en {folderName}\nde {from}"],
+    "Error while loading the accounts." : "Eraris ŝargo de la kontoj.",
+    "Error while loading the selected account." : "Eraris ŝargo de la elektita konto.",
+    "Unknown error" : "Nekonata eraro",
+    "Error while creating an account: " : "Eraris kreo de konto:",
+    "Draft saved!" : "Malneto konserviĝis!",
+    "Error while loading messages." : "Eraris ŝargo de mesaĝoj.",
+    "Attachments saved to Files." : "Kunsendaĵoj konserviĝis en Dosierojn.",
+    "Attachment saved to Files." : "Kunsendaĵo konserviĝis en Dosierojn.",
+    "Error while saving attachments to Files." : "Eraris konservo de kunsendaĵoj en Dosierojn.",
+    "Error while saving attachment to Files." : "Eraris konservo de kunsendaĵo en Dosierojn.",
+    "Choose a file to add as attachment" : "Elektu dosieron por aldoni kiel kunsendaĵo",
+    "Reply" : "Respondi",
+    "Send" : "Sendi",
+    "Sending …" : "Sendante...",
+    "Message sent!" : "Mesaĝo sendiĝis!",
+    "Server error" : "Eraro pri servilo",
+    "you" : "vi",
+    "Send message to {email}" : "Mesaĝi al {email}",
+    "Loading …" : "Ŝargante...",
+    "Load more …" : "Ŝargante pli...",
+    "Error while deleting message." : "Eraris forigo de mesaĝo.",
+    "Error while deleting account." : "Eraris forigo de konto.",
+    "Connecting" : "Konektante",
+    "Connect" : "Konekti",
+    "Inbox" : "Enirkesto",
+    "Sent" : "Senditujo",
+    "Drafts" : "Malnetujo",
+    "Archive" : "Arĥivo",
+    "Trash" : "Rubujo",
+    "Junk" : "Trudmesaĝujo",
+    "All" : "Ĉio",
+    "Favorites" : "Pliŝatoj",
+    "Creating account failed: " : "Kreo de konto malsukcesis:",
+    "Delete permanently" : "Forigi por ĉiam",
+    "& others" : "kaj aliaj",
+    "All inboxes" : "Ĉiuj enirkestoj",
+    "Error loading message" : "Eraris ŝargo de mesaĝo",
+    "New message" : "Nova mesaĝo",
+    "Continue to %s" : "Daŭri al %s"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/l10n/es.js b/l10n/es.js
index b848b4eb5..fce39f027 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Message could not be starred. Please try again." : "El mensaje no se pudo marcar como favorito. Vuelva a intentarlo.",
     "Unknown error" : "Error desconocido",
     "Error while creating an account: " : "Error al crear una cuenta:",
+    "Draft saved!" : "¡Borrador guardado!",
     "Error while loading messages." : "Error al cargar los mensajes.",
     "Choose a folder to store the attachment in" : "Escoja una carpeta para guardar el adjunto",
     "Attachments saved to Files." : "Archivos adjuntos guardados en Archivos.",
@@ -18,7 +19,6 @@ OC.L10N.register(
     "Opening HTML drafts is not supported yet." : "Apertura de borradores HTML aun no está soportado.",
     "Forwarded message" : "Mensaje reenviado",
     "Error while loading the selected message." : "Error al cargar el mensaje seleccionado.",
-    "Draft saved!" : "¡Borrador guardado!",
     "Choose a file to add as attachment" : "Escoja un archivo para adjuntar",
     "Reply" : "Responder",
     "Send" : "Enviar",
@@ -27,11 +27,11 @@ OC.L10N.register(
     "Server error" : "Error en servidor",
     "you" : "usted",
     "Send message to {email}" : "Enviar mensaje a {email}",
-    "Error while deleting message." : "Error al eliminar el mensaje.",
     "Checking messages" : "Comprobando mensajes",
     "Loading …" : "Cargando...",
     "Load more …" : "Cargar más...",
     "Check messages" : "Comprobar mensajes",
+    "Error while deleting message." : "Error al eliminar el mensaje.",
     "Error while deleting account." : "Error al eliminar la cuenta.",
     "Connecting" : "Conectando",
     "Connect" : "Conectar",
diff --git a/l10n/es.json b/l10n/es.json
index 657602cbb..f5f301e54 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -7,6 +7,7 @@
     "Message could not be starred. Please try again." : "El mensaje no se pudo marcar como favorito. Vuelva a intentarlo.",
     "Unknown error" : "Error desconocido",
     "Error while creating an account: " : "Error al crear una cuenta:",
+    "Draft saved!" : "¡Borrador guardado!",
     "Error while loading messages." : "Error al cargar los mensajes.",
     "Choose a folder to store the attachment in" : "Escoja una carpeta para guardar el adjunto",
     "Attachments saved to Files." : "Archivos adjuntos guardados en Archivos.",
@@ -16,7 +17,6 @@
     "Opening HTML drafts is not supported yet." : "Apertura de borradores HTML aun no está soportado.",
     "Forwarded message" : "Mensaje reenviado",
     "Error while loading the selected message." : "Error al cargar el mensaje seleccionado.",
-    "Draft saved!" : "¡Borrador guardado!",
     "Choose a file to add as attachment" : "Escoja un archivo para adjuntar",
     "Reply" : "Responder",
     "Send" : "Enviar",
@@ -25,11 +25,11 @@
     "Server error" : "Error en servidor",
     "you" : "usted",
     "Send message to {email}" : "Enviar mensaje a {email}",
-    "Error while deleting message." : "Error al eliminar el mensaje.",
     "Checking messages" : "Comprobando mensajes",
     "Loading …" : "Cargando...",
     "Load more …" : "Cargar más...",
     "Check messages" : "Comprobar mensajes",
+    "Error while deleting message." : "Error al eliminar el mensaje.",
     "Error while deleting account." : "Error al eliminar la cuenta.",
     "Connecting" : "Conectando",
     "Connect" : "Conectar",
diff --git a/l10n/et_EE.js b/l10n/et_EE.js
index c8b5aa61e..06bafd7b8 100644
--- a/l10n/et_EE.js
+++ b/l10n/et_EE.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Message could not be starred. Please try again." : "Sõnumit ei õnnestunud tärniga märkida. Palun proovi uuesti.",
     "Unknown error" : "Tundmatu viga",
     "Error while creating an account: " : "Tõrge konto loomisel:",
+    "Draft saved!" : "Mustand on salvestatud!",
     "Error while loading messages." : "Tõrge sõnumite laadimisel.",
     "Choose a folder to store the attachment in" : "Vali kaust, kuhu manus salvestada",
     "Attachments saved to Files." : "Manused on salvestatud failidesse.",
@@ -18,7 +19,6 @@ OC.L10N.register(
     "Opening HTML drafts is not supported yet." : "HTML mustandite avamine pole veel toetatud.",
     "Forwarded message" : "Edastatud sõnum",
     "Error while loading the selected message." : "Viga valitud sõnumi laadimisel.",
-    "Draft saved!" : "Mustand on salvestatud!",
     "Choose a file to add as attachment" : "Vali fail, mida manustada",
     "Reply" : "Vasta",
     "Send" : "Saada",
@@ -27,11 +27,11 @@ OC.L10N.register(
     "Server error" : "Serveri tõrge",
     "you" : "sina",
     "Send message to {email}" : "Saada kiri aadressile {email}",
-    "Error while deleting message." : "Tõrge sõnumi kustutamisel.",
     "Checking messages" : "Sõnumite kontrollimine",
     "Loading …" : "Laadimine ...",
     "Load more …" : "Laadi rohkem ...",
     "Check messages" : "Kontrolli sõnumeid",
+    "Error while deleting message." : "Tõrge sõnumi kustutamisel.",
     "Error while deleting account." : "Tõrge konto kustutamisel.",
     "Connecting" : "Ühendamine",
     "Connect" : "Ühenda",
diff --git a/l10n/et_EE.json b/l10n/et_EE.json
index 926348b74..6b50049f0 100644
--- a/l10n/et_EE.json
+++ b/l10n/et_EE.json
@@ -7,6 +7,7 @@
     "Message could not be starred. Please try again." : "Sõnumit ei õnnestunud tärniga märkida. Palun proovi uuesti.",
     "Unknown error" : "Tundmatu viga",
     "Error while creating an account: " : "Tõrge konto loomisel:",
+    "Draft saved!" : "Mustand on salvestatud!",
     "Error while loading messages." : "Tõrge sõnumite laadimisel.",
     "Choose a folder to store the attachment in" : "Vali kaust, kuhu manus salvestada",
     "Attachments saved to Files." : "Manused on salvestatud failidesse.",
@@ -16,7 +17,6 @@
     "Opening HTML drafts is not supported yet." : "HTML mustandite avamine pole veel toetatud.",
     "Forwarded message" : "Edastatud sõnum",
     "Error while loading the selected message." : "Viga valitud sõnumi laadimisel.",
-    "Draft saved!" : "Mustand on salvestatud!",
     "Choose a file to add as attachment" : "Vali fail, mida manustada",
     "Reply" : "Vasta",
     "Send" : "Saada",
@@ -25,11 +25,11 @@
     "Server error" : "Serveri tõrge",
     "you" : "sina",
     "Send message to {email}" : "Saada kiri aadressile {email}",
-    "Error while deleting message." : "Tõrge sõnumi kustutamisel.",
     "Checking messages" : "Sõnumite kontrollimine",
     "Loading …" : "Laadimine ...",
     "Load more …" : "Laadi rohkem ...",
     "Check messages" : "Kontrolli sõnumeid",
+    "Error while deleting message." : "Tõrge sõnumi kustutamisel.",
     "Error while deleting account." : "Tõrge konto kustutamisel.",
     "Connecting" : "Ühendamine",
     "Connect" : "Ühenda",
diff --git a/l10n/fi_FI.js b/l10n/fi_FI.js
index 51f2b7b67..f9f3cb9e1 100644
--- a/l10n/fi_FI.js
+++ b/l10n/fi_FI.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Message could not be starred. Please try again." : "Tähden lisääminen viestille epäonnistui. Yritä uudelleen.",
     "Unknown error" : "Tuntematon virhe",
     "Error while creating an account: " : "Virhe tiliä luotaessa:",
+    "Draft saved!" : "Luonnos tallennettu!",
     "Error while loading messages." : "Virhe viestejä ladatessa.",
     "Choose a folder to store the attachment in" : "Valitse kansio liitetiedoston tallentamiselle",
     "Attachments saved to Files." : "Liitteet tallennettu tiedostoihin.",
@@ -18,7 +19,6 @@ OC.L10N.register(
     "Opening HTML drafts is not supported yet." : "HTML-luonnosten avaaminen ei ole vielä tuettu ominaisuus.",
     "Forwarded message" : "Edelleenlähetetty viesti",
     "Error while loading the selected message." : "Virhe ladatessa valittua viestiä.",
-    "Draft saved!" : "Luonnos tallennettu!",
     "Choose a file to add as attachment" : "Valitse liitteeksi lisättävä tiedosto",
     "Reply" : "Vastaa",
     "Send" : "Lähetä",
@@ -27,11 +27,11 @@ OC.L10N.register(
     "Server error" : "Palvelinvirhe",
     "you" : "sinä",
     "Send message to {email}" : "Lähetä viesti osoitteeseen {email}",
-    "Error while deleting message." : "Virhe viestiä poistaessa.",
     "Checking messages" : "Tarkistetaan viestejä",
     "Loading …" : "Ladataan…",
     "Load more …" : "Lataa lisää…",
     "Check messages" : "Tarkista viestit",
+    "Error while deleting message." : "Virhe viestiä poistaessa.",
     "Error while deleting account." : "Virhe tiliä poistaessa.",
     "Connecting" : "Yhdistetään",
     "Connect" : "Yhdistä",
diff --git a/l10n/fi_FI.json b/l10n/fi_FI.json
index 3b8ab0a04..4dc08334b 100644
--- a/l10n/fi_FI.json
+++ b/l10n/fi_FI.json
@@ -7,6 +7,7 @@
     "Message could not be starred. Please try again." : "Tähden lisääminen viestille epäonnistui. Yritä uudelleen.",
     "Unknown error" : "Tuntematon virhe",
     "Error while creating an account: " : "Virhe tiliä luotaessa:",
+    "Draft saved!" : "Luonnos tallennettu!",
     "Error while loading messages." : "Virhe viestejä ladatessa.",
     "Choose a folder to store the attachment in" : "Valitse kansio liitetiedoston tallentamiselle",
     "Attachments saved to Files." : "Liitteet tallennettu tiedostoihin.",
@@ -16,7 +17,6 @@
     "Opening HTML drafts is not supported yet." : "HTML-luonnosten avaaminen ei ole vielä tuettu ominaisuus.",
     "Forwarded message" : "Edelleenlähetetty viesti",
     "Error while loading the selected message." : "Virhe ladatessa valittua viestiä.",
-    "Draft saved!" : "Luonnos tallennettu!",
     "Choose a file to add as attachment" : "Valitse liitteeksi lisättävä tiedosto",
     "Reply" : "Vastaa",
     "Send" : "Lähetä",
@@ -25,11 +25,11 @@
     "Server error" : "Palvelinvirhe",
     "you" : "sinä",
     "Send message to {email}" : "Lähetä viesti osoitteeseen {email}",
-    "Error while deleting message." : "Virhe viestiä poistaessa.",
     "Checking messages" : "Tarkistetaan viestejä",
     "Loading …" : "Ladataan…",
     "Load more …" : "Lataa lisää…",
     "Check messages" : "Tarkista viestit",
+    "Error while deleting message." : "Virhe viestiä poistaessa.",
     "Error while deleting account." : "Virhe tiliä poistaessa.",
     "Connecting" : "Yhdistetään",
     "Connect" : "Yhdistä",
diff --git a/l10n/fr.js b/l10n/fr.js
index 25fcaf8d9..7d73c977c 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Message could not be starred. Please try again." : "Le message n'a pu être placé parmi les favoris. Veuillez essayer à nouveau.",
     "Unknown error" : "Erreur inconnue",
     "Error while creating an account: " : "Erreur lors de la création du compte :",
+    "Draft saved!" : "Brouillon sauvegardé!",
     "Error while loading messages." : "Erreur lors du chargement des messages.",
     "Choose a folder to store the attachment in" : "Choisissez le dossier dans lequel enregistrer la pièce jointe",
     "Attachments saved to Files." : "Pièces jointes enregistrées dans les Fichiers.",
@@ -18,7 +19,6 @@ OC.L10N.register(
     "Opening HTML drafts is not supported yet." : "L'ouverture de brouillons au format HTML n'est pas prise en charge pour le moment.",
     "Forwarded message" : "Message transféré",
     "Error while loading the selected message." : "Erreur lors du chargement du message sélectionné.",
-    "Draft saved!" : "Brouillon sauvegardé!",
     "Choose a file to add as attachment" : "Choisissez un fichier à joindre au message",
     "Reply" : "Répondre",
     "Send" : "Envoyer",
@@ -27,11 +27,11 @@ OC.L10N.register(
     "Server error" : "Erreur du serveur",
     "you" : "vous",
     "Send message to {email}" : "Envoyer un mail à {email}",
-    "Error while deleting message." : "Erreur lors de la suppression du message.",
     "Checking messages" : "Relève du courrier",
     "Loading …" : "Chargement ...",
     "Load more …" : "Charger plus ...",
     "Check messages" : "Relever le courrier",
+    "Error while deleting message." : "Erreur lors de la suppression du message.",
     "Error while deleting account." : "Erreur lors de la suppression du compte.",
     "Connecting" : "Connexion ...",
     "Connect" : "Connecter",
diff --git a/l10n/fr.json b/l10n/fr.json
index af5b05587..edc343295 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -7,6 +7,7 @@
     "Message could not be starred. Please try again." : "Le message n'a pu être placé parmi les favoris. Veuillez essayer à nouveau.",
     "Unknown error" : "Erreur inconnue",
     "Error while creating an account: " : "Erreur lors de la création du compte :",
+    "Draft saved!" : "Brouillon sauvegardé!",
     "Error while loading messages." : "Erreur lors du chargement des messages.",
     "Choose a folder to store the attachment in" : "Choisissez le dossier dans lequel enregistrer la pièce jointe",
     "Attachments saved to Files." : "Pièces jointes enregistrées dans les Fichiers.",
@@ -16,7 +17,6 @@
     "Opening HTML drafts is not supported yet." : "L'ouverture de brouillons au format HTML n'est pas prise en charge pour le moment.",
     "Forwarded message" : "Message transféré",
     "Error while loading the selected message." : "Erreur lors du chargement du message sélectionné.",
-    "Draft saved!" : "Brouillon sauvegardé!",
     "Choose a file to add as attachment" : "Choisissez un fichier à joindre au message",
     "Reply" : "Répondre",
     "Send" : "Envoyer",
@@ -25,11 +25,11 @@
     "Server error" : "Erreur du serveur",
     "you" : "vous",
     "Send message to {email}" : "Envoyer un mail à {email}",
-    "Error while deleting message." : "Erreur lors de la suppression du message.",
     "Checking messages" : "Relève du courrier",
     "Loading …" : "Chargement ...",
     "Load more …" : "Charger plus ...",
     "Check messages" : "Relever le courrier",
+    "Error while deleting message." : "Erreur lors de la suppression du message.",
     "Error while deleting account." : "Erreur lors de la suppression du compte.",
     "Connecting" : "Connexion ...",
     "Connect" : "Connecter",
diff --git a/l10n/gl.js b/l10n/gl.js
index 029dcd209..8cd9ac554 100644
--- a/l10n/gl.js
+++ b/l10n/gl.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Message could not be starred. Please try again." : "A mensaxe non foi destacada. Ténteo de novo.",
     "Unknown error" : "Produciuse un erro descoñecido",
     "Error while creating an account: " : "produciuse un erro mentres creaba unha conta:",
+    "Draft saved!" : "Gardouse o borrador!",
     "Error while loading messages." : "Produciuse un erro mentres cargaba as mensaxes.",
     "Choose a folder to store the attachment in" : "Escolla un cartafol no que gardar o anexo de entrada",
     "Attachments saved to Files." : "Anexos gardados en Ficheiros.",
@@ -18,7 +19,6 @@ OC.L10N.register(
     "Opening HTML drafts is not supported yet." : "Aínda non é posíbel abrir borradores HTML.",
     "Forwarded message" : "Mensaxe reenviado",
     "Error while loading the selected message." : "Produciuse un erro mentres cargaba a mensaxe seleccionada.",
-    "Draft saved!" : "Gardouse o borrador!",
     "Choose a file to add as attachment" : "Escolla un ficheiro para engadir como anexo",
     "Reply" : "Responder",
     "Send" : "Enviar",
@@ -27,9 +27,9 @@ OC.L10N.register(
     "Server error" : "Produciuse un erro de servidor",
     "you" : "vostede",
     "Send message to {email}" : "Enviar mensaxe a {email}",
-    "Error while deleting message." : "Produciuse un erro ao eliminar a mensaxe.",
     "Loading …" : "Cargando ...",
     "Load more …" : "Cargar máis ...",
+    "Error while deleting message." : "Produciuse un erro ao eliminar a mensaxe.",
     "Error while deleting account." : "Produciuse un erro ao eliminar a conta.",
     "Connect" : "Conectar",
     "Inbox" : "Bandexa de entrada",
diff --git a/l10n/gl.json b/l10n/gl.json
index c2413d338..2d2dae9a5 100644
--- a/l10n/gl.json
+++ b/l10n/gl.json
@@ -7,6 +7,7 @@
     "Message could not be starred. Please try again." : "A mensaxe non foi destacada. Ténteo de novo.",
     "Unknown error" : "Produciuse un erro descoñecido",
     "Error while creating an account: " : "produciuse un erro mentres creaba unha conta:",
+    "Draft saved!" : "Gardouse o borrador!",
     "Error while loading messages." : "Produciuse un erro mentres cargaba as mensaxes.",
     "Choose a folder to store the attachment in" : "Escolla un cartafol no que gardar o anexo de entrada",
     "Attachments saved to Files." : "Anexos gardados en Ficheiros.",
@@ -16,7 +17,6 @@
     "Opening HTML drafts is not supported yet." : "Aínda non é posíbel abrir borradores HTML.",
     "Forwarded message" : "Mensaxe reenviado",
     "Error while loading the selected message." : "Produciuse un erro mentres cargaba a mensaxe seleccionada.",
-    "Draft saved!" : "Gardouse o borrador!",
     "Choose a file to add as attachment" : "Escolla un ficheiro para engadir como anexo",
     "Reply" : "Responder",
     "Send" : "Enviar",
@@ -25,9 +25,9 @@
     "Server error" : "Produciuse un erro de servidor",
     "you" : "vostede",
     "Send message to {email}" : "Enviar mensaxe a {email}",
-    "Error while deleting message." : "Produciuse un erro ao eliminar a mensaxe.",
     "Loading …" : "Cargando ...",
     "Load more …" : "Cargar máis ...",
+    "Error while deleting message." : "Produciuse un erro ao eliminar a mensaxe.",
     "Error while deleting account." : "Produciuse un erro ao eliminar a conta.",
     "Connect" : "Conectar",
     "Inbox" : "Bandexa de entrada",
diff --git a/l10n/he.js b/l10n/he.js
index 04f5e67c2..43171e65a 100644
--- a/l10n/he.js
+++ b/l10n/he.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Message could not be starred. Please try again." : "לא ניתן לסמן הודעה עם כוכב. יש לנסות שוב.",
     "Unknown error" : "שגיאה בלתי ידועה",
     "Error while creating an account: " : "שגיאה בזמן יצירת חשבון:",
+    "Draft saved!" : "טיוטה נשמרה!",
     "Error while loading messages." : "שגיאה בזמן העלאת הודעות.",
     "Choose a folder to store the attachment in" : "יש לבחור תיקייה לשמירת הקובץ המצורף",
     "Attachments saved to Files." : "שבצים מצורפים נשמרו לקטגוריית קבצים.",
@@ -18,7 +19,6 @@ OC.L10N.register(
     "Opening HTML drafts is not supported yet." : "פתיחת טיוטות HTML לא נתמך עדיין.",
     "Forwarded message" : "הודעה שקודמה",
     "Error while loading the selected message." : "שגיאה בזמן טעינת ההודעה שנבחרה.",
-    "Draft saved!" : "טיוטה נשמרה!",
     "Choose a file to add as attachment" : "בחירת קובץ להוספה כקובץ מצורף",
     "Reply" : "תגובה",
     "Send" : "שליחה",
@@ -27,11 +27,11 @@ OC.L10N.register(
     "Server error" : "שגיאת שרת",
     "you" : "את/ה",
     "Send message to {email}" : "שליחת הודעה אל {email}",
-    "Error while deleting message." : "שגיאה בזמן מחיקת הודעה.",
     "Checking messages" : "הודעות בבדיקה",
     "Loading …" : "בטעינה …",
     "Load more …" : "המשך טעינה ...",
     "Check messages" : "לבדוק הודעות",
+    "Error while deleting message." : "שגיאה בזמן מחיקת הודעה.",
     "Error while deleting account." : "שגיאה בזמן מחיקת חשבון.",
     "Connecting" : "מתחבר",
     "Connect" : "התחברות",
diff --git a/l10n/he.json b/l10n/he.json
index b7e0cbdf0..a9f3c9289 100644
--- a/l10n/he.json
+++ b/l10n/he.json
@@ -7,6 +7,7 @@
     "Message could not be starred. Please try again." : "לא ניתן לסמן הודעה עם כוכב. יש לנסות שוב.",
     "Unknown error" : "שגיאה בלתי ידועה",
     "Error while creating an account: " : "שגיאה בזמן יצירת חשבון:",
+    "Draft saved!" : "טיוטה נשמרה!",
     "Error while loading messages." : "שגיאה בזמן העלאת הודעות.",
     "Choose a folder to store the attachment in" : "יש לבחור תיקייה לשמירת הקובץ המצורף",
     "Attachments saved to Files." : "שבצים מצורפים נשמרו לקטגוריית קבצים.",
@@ -16,7 +17,6 @@
     "Opening HTML drafts is not supported yet." : "פתיחת טיוטות HTML לא נתמך עדיין.",
     "Forwarded message" : "הודעה שקודמה",
     "Error while loading the selected message." : "שגיאה בזמן טעינת ההודעה שנבחרה.",
-    "Draft saved!" : "טיוטה נשמרה!",
     "Choose a file to add as attachment" : "בחירת קובץ להוספה כקובץ מצורף",
     "Reply" : "תגובה",
     "Send" : "שליחה",
@@ -25,11 +25,11 @@
     "Server error" : "שגיאת שרת",
     "you" : "את/ה",
     "Send message to {email}" : "שליחת הודעה אל {email}",
-    "Error while deleting message." : "שגיאה בזמן מחיקת הודעה.",
     "Checking messages" : "הודעות בבדיקה",
     "Loading …" : "בטעינה …",
     "Load more …" : "המשך טעינה ...",
     "Check messages" : "לבדוק הודעות",
+    "Error while deleting message." : "שגיאה בזמן מחיקת הודעה.",
     "Error while deleting account." : "שגיאה בזמן מחיקת חשבון.",
     "Connecting" : "מתחבר",
     "Connect" : "התחברות",
diff --git a/l10n/hu_HU.js b/l10n/hu_HU.js
index 66b430562..675d430bd 100644
--- a/l10n/hu_HU.js
+++ b/l10n/hu_HU.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Message could not be starred. Please try again." : "Az üzenet nem csillagozható. Kérlek, próbáld újra!",
     "Unknown error" : "Ismeretlen hiba",
     "Error while creating an account: " : "Hiba történt a fiók létrehozásakor:",
+    "Draft saved!" : "Vázlat mentve.",
     "Error while loading messages." : "Hiba történt az üzenetek betöltése közben.",
     "Choose a folder to store the attachment in" : "Válassz egy mappát a mellékletek tárolásához",
     "Attachments saved to Files." : "Mellékletek mentve a Fájlokba.",
@@ -18,7 +19,6 @@ OC.L10N.register(
     "Opening HTML drafts is not supported yet." : "A HTML vázlatok megnyitása még nem támogatott.",
     "Forwarded message" : "Továbbított üzenet",
     "Error while loading the selected message." : "Hiba történt a kiválasztott üzenet betöltése közben.",
-    "Draft saved!" : "Vázlat mentve.",
     "Choose a file to add as attachment" : "Csatolandó file kiválasztása",
     "Reply" : "Válasz",
     "Send" : "Küldés",
@@ -27,11 +27,11 @@ OC.L10N.register(
     "Server error" : "Szerver hiba",
     "you" : "te",
     "Send message to {email}" : "Üzenet küldés ide: {email}",
-    "Error while deleting message." : "Hiba történt az üzenet törlése közben.",
     "Checking messages" : "Üzenetek ellenőrzése",
     "Loading …" : "Betöltés ...",
     "Load more …" : "Még több betöltése ...",
     "Check messages" : "Üzenetek ellenőrzése",
+    "Error while deleting message." : "Hiba történt az üzenet törlése közben.",
     "Error while deleting account." : "Hiba történt a fiók törlése közben.",
     "Connecting" : "Csatlakozás",
     "Connect" : "Csatlakozás",
diff --git a/l10n/hu_HU.json b/l10n/hu_HU.json
index d076e5983..bff4d0c56 100644
--- a/l10n/hu_HU.json
+++ b/l10n/hu_HU.json
@@ -7,6 +7,7 @@
     "Message could not be starred. Please try again." : "Az üzenet nem csillagozható. Kérlek, próbáld újra!",
     "Unknown error" : "Ismeretlen hiba",
     "Error while creating an account: " : "Hiba történt a fiók létrehozásakor:",
+    "Draft saved!" : "Vázlat mentve.",
     "Error while loading messages." : "Hiba történt az üzenetek betöltése közben.",
     "Choose a folder to store the attachment in" : "Válassz egy mappát a mellékletek tárolásához",
     "Attachments saved to Files." : "Mellékletek mentve a Fájlokba.",
@@ -16,7 +17,6 @@
     "Opening HTML drafts is not supported yet." : "A HTML vázlatok megnyitása még nem támogatott.",
     "Forwarded message" : "Továbbított üzenet",
     "Error while loading the selected message." : "Hiba történt a kiválasztott üzenet betöltése közben.",
-    "Draft saved!" : "Vázlat mentve.",
     "Choose a file to add as attachment" : "Csatolandó file kiválasztása",
     "Reply" : "Válasz",
     "Send" : "Küldés",
@@ -25,11 +25,11 @@
     "Server error" : "Szerver hiba",
     "you" : "te",
     "Send message to {email}" : "Üzenet küldés ide: {email}",
-    "Error while deleting message." : "Hiba történt az üzenet törlése közben.",
     "Checking messages" : "Üzenetek ellenőrzése",
     "Loading …" : "Betöltés ...",
     "Load more …" : "Még több betöltése ...",
     "Check messages" : "Üzenetek ellenőrzése",
+    "Error while deleting message." : "Hiba történt az üzenet törlése közben.",
     "Error while deleting account." : "Hiba történt a fiók törlése közben.",
     "Connecting" : "Csatlakozás",
     "Connect" : "Csatlakozás",
diff --git a/l10n/id.js b/l10n/id.js
index f59c354a2..89991fc75 100644
--- a/l10n/id.js
+++ b/l10n/id.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Message could not be starred. Please try again." : "Pesan tidak dapat dibintangi. Silakan coba lagi.",
     "Unknown error" : "Kesalahan tidak diketahui",
     "Error while creating an account: " : "Terjadi kesalahan saat memuat sebuah akun:",
+    "Draft saved!" : "Draf disimpan!",
     "Error while loading messages." : "Terjadi kesalahan saat memuat pesan.",
     "Choose a folder to store the attachment in" : "Pilih folder untuk menyimpan lampiran didalamnya",
     "Attachments saved to Files." : "Lampiran disimpan pada Berkas.",
@@ -18,7 +19,6 @@ OC.L10N.register(
     "Opening HTML drafts is not supported yet." : "Membuka draf HTML masih belum didukung.",
     "Forwarded message" : "Pesan Teralihkan",
     "Error while loading the selected message." : "Terjadi kesalahan saat memuat pesan terpilih.",
-    "Draft saved!" : "Draf disimpan!",
     "Choose a file to add as attachment" : "Pilih berkas untuk ditambahkan sebagai lampiran",
     "Reply" : "Balas",
     "Send" : "Kirim",
@@ -27,11 +27,11 @@ OC.L10N.register(
     "Server error" : "Kesalahan server",
     "you" : "Anda",
     "Send message to {email}" : "Kirim pesan ke {email}",
-    "Error while deleting message." : "Terjadi kesalahan saat menghapus pesan.",
     "Checking messages" : "Memeriksa pesan",
     "Loading …" : "Memuat ...",
     "Load more …" : "Muat lebih banyak ...",
     "Check messages" : "Periksa pesan",
+    "Error while deleting message." : "Terjadi kesalahan saat menghapus pesan.",
     "Error while deleting account." : "Terjadi kesalahan saat menghapus akun.",
     "Connecting" : "Menyambungkan",
     "Connect" : "Sambungkan",
diff --git a/l10n/id.json b/l10n/id.json
index 17df9456d..9f3a6cf70 100644
--- a/l10n/id.json
+++ b/l10n/id.json
@@ -7,6 +7,7 @@
     "Message could not be starred. Please try again." : "Pesan tidak dapat dibintangi. Silakan coba lagi.",
     "Unknown error" : "Kesalahan tidak diketahui",
     "Error while creating an account: " : "Terjadi kesalahan saat memuat sebuah akun:",
+    "Draft saved!" : "Draf disimpan!",
     "Error while loading messages." : "Terjadi kesalahan saat memuat pesan.",
     "Choose a folder to store the attachment in" : "Pilih folder untuk menyimpan lampiran didalamnya",
     "Attachments saved to Files." : "Lampiran disimpan pada Berkas.",
@@ -16,7 +17,6 @@
     "Opening HTML drafts is not supported yet." : "Membuka draf HTML masih belum didukung.",
     "Forwarded message" : "Pesan Teralihkan",
     "Error while loading the selected message." : "Terjadi kesalahan saat memuat pesan terpilih.",
-    "Draft saved!" : "Draf disimpan!",
     "Choose a file to add as attachment" : "Pilih berkas untuk ditambahkan sebagai lampiran",
     "Reply" : "Balas",
     "Send" : "Kirim",
@@ -25,11 +25,11 @@
     "Server error" : "Kesalahan server",
     "you" : "Anda",
     "Send message to {email}" : "Kirim pesan ke {email}",
-    "Error while deleting message." : "Terjadi kesalahan saat menghapus pesan.",
     "Checking messages" : "Memeriksa pesan",
     "Loading …" : "Memuat ...",
     "Load more …" : "Muat lebih banyak ...",
     "Check messages" : "Periksa pesan",
+    "Error while deleting message." : "Terjadi kesalahan saat menghapus pesan.",
     "Error while deleting account." : "Terjadi kesalahan saat menghapus akun.",
     "Connecting" : "Menyambungkan",
     "Connect" : "Sambungkan",
diff --git a/l10n/it.js b/l10n/it.js
index 5a7577d9b..2f95a59d8 100644
--- a/l10n/it.js
+++ b/l10n/it.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Message could not be starred. Please try again." : "Il messaggio non può essere aggiunto ai preferiti. Prova ancora.",
     "Unknown error" : "Errore sconosciuto",
     "Error while creating an account: " : "Errore durante la creazione di un account:",
+    "Draft saved!" : "Bozza salvata!",
     "Error while loading messages." : "Errore durante il caricamento dei messaggi.",
     "Choose a folder to store the attachment in" : "Scegli una cartella dove salvare l'allegato",
     "Attachments saved to Files." : "Allegati salvati in File.",
@@ -18,7 +19,6 @@ OC.L10N.register(
     "Opening HTML drafts is not supported yet." : "L'apertura delle bozze HTML non è ancora supportata.",
     "Forwarded message" : "Messaggio inoltrato",
     "Error while loading the selected message." : "Errore durante il caricamento del messaggio selezionato.",
-    "Draft saved!" : "Bozza salvata!",
     "Choose a file to add as attachment" : "Scegli un file da aggiungere come allegato",
     "Reply" : "Rispondi",
     "Send" : "Invia",
@@ -27,11 +27,11 @@ OC.L10N.register(
     "Server error" : "Errore del server",
     "you" : "tu",
     "Send message to {email}" : "Invia messaggio a {email}",
-    "Error while deleting message." : "Errore durante l'eliminazione del messaggio.",
     "Checking messages" : "Controllo dei messaggi",
     "Loading …" : "Caricamento in corso...",
     "Load more …" : "Carica altro...",
     "Check messages" : "Controlla i messaggi",
+    "Error while deleting message." : "Errore durante l'eliminazione del messaggio.",
     "Error while deleting account." : "Errore durante l'eliminazione dell'account.",
     "Connecting" : "Connessione in corso",
     "Connect" : "Connetti",
diff --git a/l10n/it.json b/l10n/it.json
index 99e815000..b2a5f3ac6 100644
--- a/l10n/it.json
+++ b/l10n/it.json
@@ -7,6 +7,7 @@
     "Message could not be starred. Please try again." : "Il messaggio non può essere aggiunto ai preferiti. Prova ancora.",
     "Unknown error" : "Errore sconosciuto",
     "Error while creating an account: " : "Errore durante la creazione di un account:",
+    "Draft saved!" : "Bozza salvata!",
     "Error while loading messages." : "Errore durante il caricamento dei messaggi.",
     "Choose a folder to store the attachment in" : "Scegli una cartella dove salvare l'allegato",
     "Attachments saved to Files." : "Allegati salvati in File.",
@@ -16,7 +17,6 @@
     "Opening HTML drafts is not supported yet." : "L'apertura delle bozze HTML non è ancora supportata.",
     "Forwarded message" : "Messaggio inoltrato",
     "Error while loading the selected message." : "Errore durante il caricamento del messaggio selezionato.",
-    "Draft saved!" : "Bozza salvata!",
     "Choose a file to add as attachment" : "Scegli un file da aggiungere come allegato",
     "Reply" : "Rispondi",
     "Send" : "Invia",
@@ -25,11 +25,11 @@
     "Server error" : "Errore del server",
     "you" : "tu",
     "Send message to {email}" : "Invia messaggio a {email}",
-    "Error while deleting message." : "Errore durante l'eliminazione del messaggio.",
     "Checking messages" : "Controllo dei messaggi",
     "Loading …" : "Caricamento in corso...",
     "Load more …" : "Carica altro...",
     "Check messages" : "Controlla i messaggi",
+    "Error while deleting message." : "Errore durante l'eliminazione del messaggio.",
     "Error while deleting account." : "Errore durante l'eliminazione dell'account.",
     "Connecting" : "Connessione in corso",
     "Connect" : "Connetti",
diff --git a/l10n/ja.js b/l10n/ja.js
index 9a149b28f..4f9ce2117 100644
--- a/l10n/ja.js
+++ b/l10n/ja.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Message could not be starred. Please try again." : "メッセージにスターをつけられませんでした。再試行してください。",
     "Unknown error" : "不明なエラー",
     "Error while creating an account: " : "アカウント作成エラー:",
+    "Draft saved!" : "ドラフトを保存しました！",
     "Error while loading messages." : "メールメッセージの読み込みエラー",
     "Choose a folder to store the attachment in" : "添付ファイルを保存するフォルダーを選択",
     "Attachments saved to Files." : "添付ファイルを保存しました。",
@@ -18,7 +19,6 @@ OC.L10N.register(
     "Opening HTML drafts is not supported yet." : "HTML の下書きを開くことはまだサポートされていません。",
     "Forwarded message" : "転送メッセージ",
     "Error while loading the selected message." : "選択メッセージの読み込み中にエラーが発生",
-    "Draft saved!" : "ドラフトを保存しました！",
     "Choose a file to add as attachment" : "添付として追加するファイルを選択",
     "Reply" : "返信",
     "Send" : "送信",
@@ -27,11 +27,11 @@ OC.L10N.register(
     "Server error" : "サーバーエラー",
     "you" : "あなた",
     "Send message to {email}" : "{email} にメッセージを送信",
-    "Error while deleting message." : "メッセージ削除中にエラーが発生",
     "Checking messages" : "メッセージを確認中",
     "Loading …" : "読込中...",
     "Load more …" : "読込中 …",
     "Check messages" : "メッセージを確認",
+    "Error while deleting message." : "メッセージ削除中にエラーが発生",
     "Error while deleting account." : "アカウント削除エラー",
     "Connecting" : "接続中",
     "Connect" : "接続",
diff --git a/l10n/ja.json b/l10n/ja.json
index 8b0df456e..a179a30c5 100644
--- a/l10n/ja.json
+++ b/l10n/ja.json
@@ -7,6 +7,7 @@
     "Message could not be starred. Please try again." : "メッセージにスターをつけられませんでした。再試行してください。",
     "Unknown error" : "不明なエラー",
     "Error while creating an account: " : "アカウント作成エラー:",
+    "Draft saved!" : "ドラフトを保存しました！",
     "Error while loading messages." : "メールメッセージの読み込みエラー",
     "Choose a folder to store the attachment in" : "添付ファイルを保存するフォルダーを選択",
     "Attachments saved to Files." : "添付ファイルを保存しました。",
@@ -16,7 +17,6 @@
     "Opening HTML drafts is not supported yet." : "HTML の下書きを開くことはまだサポートされていません。",
     "Forwarded message" : "転送メッセージ",
     "Error while loading the selected message." : "選択メッセージの読み込み中にエラーが発生",
-    "Draft saved!" : "ドラフトを保存しました！",
     "Choose a file to add as attachment" : "添付として追加するファイルを選択",
     "Reply" : "返信",
     "Send" : "送信",
@@ -25,11 +25,11 @@
     "Server error" : "サーバーエラー",
     "you" : "あなた",
     "Send message to {email}" : "{email} にメッセージを送信",
-    "Error while deleting message." : "メッセージ削除中にエラーが発生",
     "Checking messages" : "メッセージを確認中",
     "Loading …" : "読込中...",
     "Load more …" : "読込中 …",
     "Check messages" : "メッセージを確認",
+    "Error while deleting message." : "メッセージ削除中にエラーが発生",
     "Error while deleting account." : "アカウント削除エラー",
     "Connecting" : "接続中",
     "Connect" : "接続",
diff --git a/l10n/ko.js b/l10n/ko.js
index efa7aa6f7..3504794f6 100644
--- a/l10n/ko.js
+++ b/l10n/ko.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Message could not be starred. Please try again." : "메시지에 별표를 붙일 수 없습니다. 다시 시도해 주십시오.",
     "Unknown error" : "알 수 없는 오류",
     "Error while creating an account: " : "계정을 만드는 중 오류 발생: ",
+    "Draft saved!" : "임시 보관함에 저장했습니다!",
     "Error while loading messages." : "메시지를 불러오는 중 오류가 발생했습니다.",
     "Choose a folder to store the attachment in" : "첨부 항목을 저장할 폴더 선택",
     "Attachments saved to Files." : "첨부 파일이 클라우드에 저장되었습니다.",
@@ -18,7 +19,6 @@ OC.L10N.register(
     "Opening HTML drafts is not supported yet." : "HTML 임시 보관 메시지를 여는 것은 지원되지 않습니다.",
     "Forwarded message" : "전달된 메시지",
     "Error while loading the selected message." : "선택한 메시지를 불러오는 중 오류가 발생했습니다.",
-    "Draft saved!" : "임시 보관함에 저장했습니다!",
     "Choose a file to add as attachment" : "첨부할 파일을 선택하십시오",
     "Reply" : "답장",
     "Send" : "보내기",
@@ -27,11 +27,11 @@ OC.L10N.register(
     "Server error" : "서버 오류",
     "you" : "나",
     "Send message to {email}" : "{email}(으)로 이메일 보내기",
-    "Error while deleting message." : "메시지를 삭제하는 중 오류가 발생했습니다.",
     "Checking messages" : "메시지 확인 중",
     "Loading …" : "불러오는 중...",
     "Load more …" : "더 가져오기...",
     "Check messages" : "메시지 확인",
+    "Error while deleting message." : "메시지를 삭제하는 중 오류가 발생했습니다.",
     "Error while deleting account." : "계정을 삭제하는 중 오류가 발생했습니다.",
     "Connecting" : "연결 중",
     "Connect" : "연결",
diff --git a/l10n/ko.json b/l10n/ko.json
index daae8df1d..820195ba1 100644
--- a/l10n/ko.json
+++ b/l10n/ko.json
@@ -7,6 +7,7 @@
     "Message could not be starred. Please try again." : "메시지에 별표를 붙일 수 없습니다. 다시 시도해 주십시오.",
     "Unknown error" : "알 수 없는 오류",
     "Error while creating an account: " : "계정을 만드는 중 오류 발생: ",
+    "Draft saved!" : "임시 보관함에 저장했습니다!",
     "Error while loading messages." : "메시지를 불러오는 중 오류가 발생했습니다.",
     "Choose a folder to store the attachment in" : "첨부 항목을 저장할 폴더 선택",
     "Attachments saved to Files." : "첨부 파일이 클라우드에 저장되었습니다.",
@@ -16,7 +17,6 @@
     "Opening HTML drafts is not supported yet." : "HTML 임시 보관 메시지를 여는 것은 지원되지 않습니다.",
     "Forwarded message" : "전달된 메시지",
     "Error while loading the selected message." : "선택한 메시지를 불러오는 중 오류가 발생했습니다.",
-    "Draft saved!" : "임시 보관함에 저장했습니다!",
     "Choose a file to add as attachment" : "첨부할 파일을 선택하십시오",
     "Reply" : "답장",
     "Send" : "보내기",
@@ -25,11 +25,11 @@
     "Server error" : "서버 오류",
     "you" : "나",
     "Send message to {email}" : "{email}(으)로 이메일 보내기",
-    "Error while deleting message." : "메시지를 삭제하는 중 오류가 발생했습니다.",
     "Checking messages" : "메시지 확인 중",
     "Loading …" : "불러오는 중...",
     "Load more …" : "더 가져오기...",
     "Check messages" : "메시지 확인",
+    "Error while deleting message." : "메시지를 삭제하는 중 오류가 발생했습니다.",
     "Error while deleting account." : "계정을 삭제하는 중 오류가 발생했습니다.",
     "Connecting" : "연결 중",
     "Connect" : "연결",
diff --git a/l10n/nb_NO.js b/l10n/nb_NO.js
index 099ceb6c7..7abd623fc 100644
--- a/l10n/nb_NO.js
+++ b/l10n/nb_NO.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Message could not be starred. Please try again." : "Klarte ikke å merke melding. Prøv igjen.",
     "Unknown error" : "Ukjent feil",
     "Error while creating an account: " : "Feil ved oppretting av en konto:",
+    "Draft saved!" : "Kladd lagret!",
     "Error while loading messages." : "Feil ved innlasting av meldinger.",
     "Choose a folder to store the attachment in" : "Velg en mappe å lagre vedlegget i",
     "Attachments saved to Files." : "Vedleggene ble lagret i Filer.",
@@ -18,7 +19,6 @@ OC.L10N.register(
     "Opening HTML drafts is not supported yet." : "Åpning av HTML-kladd er ikke støttet ennå.",
     "Forwarded message" : "Videresendt melding",
     "Error while loading the selected message." : "Feil ved innlasting av valgt melding.",
-    "Draft saved!" : "Kladd lagret!",
     "Choose a file to add as attachment" : "Velg en fil å legge til som vedlegg",
     "Reply" : "Svar",
     "Send" : "Send",
@@ -27,11 +27,11 @@ OC.L10N.register(
     "Server error" : "Serverfeil",
     "you" : "du",
     "Send message to {email}" : "Send melding til {email}",
-    "Error while deleting message." : "Feil ved sletting av melding.",
     "Checking messages" : "Sjekker meldinger",
     "Loading …" : "Laster...",
     "Load more …" : "Last mer ...",
     "Check messages" : "Sjekk meldinger",
+    "Error while deleting message." : "Feil ved sletting av melding.",
     "Error while deleting account." : "Feil ved sletting av konto.",
     "Connecting" : "Kobler til",
     "Connect" : "Koble til",
diff --git a/l10n/nb_NO.json b/l10n/nb_NO.json
index 432e4d59a..f9bdd3161 100644
--- a/l10n/nb_NO.json
+++ b/l10n/nb_NO.json
@@ -7,6 +7,7 @@
     "Message could not be starred. Please try again." : "Klarte ikke å merke melding. Prøv igjen.",
     "Unknown error" : "Ukjent feil",
     "Error while creating an account: " : "Feil ved oppretting av en konto:",
+    "Draft saved!" : "Kladd lagret!",
     "Error while loading messages." : "Feil ved innlasting av meldinger.",
     "Choose a folder to store the attachment in" : "Velg en mappe å lagre vedlegget i",
     "Attachments saved to Files." : "Vedleggene ble lagret i Filer.",
@@ -16,7 +17,6 @@
     "Opening HTML drafts is not supported yet." : "Åpning av HTML-kladd er ikke støttet ennå.",
     "Forwarded message" : "Videresendt melding",
     "Error while loading the selected message." : "Feil ved innlasting av valgt melding.",
-    "Draft saved!" : "Kladd lagret!",
     "Choose a file to add as attachment" : "Velg en fil å legge til som vedlegg",
     "Reply" : "Svar",
     "Send" : "Send",
@@ -25,11 +25,11 @@
     "Server error" : "Serverfeil",
     "you" : "du",
     "Send message to {email}" : "Send melding til {email}",
-    "Error while deleting message." : "Feil ved sletting av melding.",
     "Checking messages" : "Sjekker meldinger",
     "Loading …" : "Laster...",
     "Load more …" : "Last mer ...",
     "Check messages" : "Sjekk meldinger",
+    "Error while deleting message." : "Feil ved sletting av melding.",
     "Error while deleting account." : "Feil ved sletting av konto.",
     "Connecting" : "Kobler til",
     "Connect" : "Koble til",
diff --git a/l10n/nl.js b/l10n/nl.js
index 210cfa513..c3a94a4c4 100644
--- a/l10n/nl.js
+++ b/l10n/nl.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Message could not be starred. Please try again." : "Bericht kon niet als gemarkeerd worden. Probeer het opnieuw.",
     "Unknown error" : "Onbekende fout",
     "Error while creating an account: " : "Fout bij het creëren van een account.",
+    "Draft saved!" : "Concept opgeslagen!",
     "Error while loading messages." : "Fout bij laden berichten.",
     "Choose a folder to store the attachment in" : "Kies een map op de bijlage in op te slaan",
     "Attachments saved to Files." : "Bjilagen opgeslagen in Bestanden.",
@@ -18,7 +19,6 @@ OC.L10N.register(
     "Opening HTML drafts is not supported yet." : "Openen concept HTML wordt nog niet ondersteund.",
     "Forwarded message" : "Doorgestuurd bericht",
     "Error while loading the selected message." : "Fout bij laden van het geselecteerde bericht.",
-    "Draft saved!" : "Concept opgeslagen!",
     "Choose a file to add as attachment" : "Kies een bestand om als bijlage toe te voegen",
     "Reply" : "Antwoord",
     "Send" : "Versturen",
@@ -27,11 +27,11 @@ OC.L10N.register(
     "Server error" : "Serverfout",
     "you" : "je",
     "Send message to {email}" : "Versturen bericht naar {email}",
-    "Error while deleting message." : "Fout bij verwijderen bericht.",
     "Checking messages" : "Controleren op berichten",
     "Loading …" : "Laden...",
     "Load more …" : "Laad meer ...",
     "Check messages" : "Controleren op berichten",
+    "Error while deleting message." : "Fout bij verwijderen bericht.",
     "Error while deleting account." : "Fout bij verwijderen account.",
     "Connecting" : "Verbinden",
     "Connect" : "Verbinden",
diff --git a/l10n/nl.json b/l10n/nl.json
index 324bed4d0..353cde7f2 100644
--- a/l10n/nl.json
+++ b/l10n/nl.json
@@ -7,6 +7,7 @@
     "Message could not be starred. Please try again." : "Bericht kon niet als gemarkeerd worden. Probeer het opnieuw.",
     "Unknown error" : "Onbekende fout",
     "Error while creating an account: " : "Fout bij het creëren van een account.",
+    "Draft saved!" : "Concept opgeslagen!",
     "Error while loading messages." : "Fout bij laden berichten.",
     "Choose a folder to store the attachment in" : "Kies een map op de bijlage in op te slaan",
     "Attachments saved to Files." : "Bjilagen opgeslagen in Bestanden.",
@@ -16,7 +17,6 @@
     "Opening HTML drafts is not supported yet." : "Openen concept HTML wordt nog niet ondersteund.",
     "Forwarded message" : "Doorgestuurd bericht",
     "Error while loading the selected message." : "Fout bij laden van het geselecteerde bericht.",
-    "Draft saved!" : "Concept opgeslagen!",
     "Choose a file to add as attachment" : "Kies een bestand om als bijlage toe te voegen",
     "Reply" : "Antwoord",
     "Send" : "Versturen",
@@ -25,11 +25,11 @@
     "Server error" : "Serverfout",
     "you" : "je",
     "Send message to {email}" : "Versturen bericht naar {email}",
-    "Error while deleting message." : "Fout bij verwijderen bericht.",
     "Checking messages" : "Controleren op berichten",
     "Loading …" : "Laden...",
     "Load more …" : "Laad meer ...",
     "Check messages" : "Controleren op berichten",
+    "Error while deleting message." : "Fout bij verwijderen bericht.",
     "Error while deleting account." : "Fout bij verwijderen account.",
     "Connecting" : "Verbinden",
     "Connect" : "Verbinden",
diff --git a/l10n/oc.js b/l10n/oc.js
index 6eb031b78..ecd97d766 100644
--- a/l10n/oc.js
+++ b/l10n/oc.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Message could not be starred. Please try again." : "Lo messatge a pas pogut èsser plaçat demest los favorits. Ensajatz tornamai.",
     "Unknown error" : "Error desconeguda",
     "Error while creating an account: " : "Error al moment de la creacion del compte :",
+    "Draft saved!" : "Borrolhon salvat!",
     "Error while loading messages." : "Error al moment del cargament dels messatges.",
     "Choose a folder to store the attachment in" : "Causissètz lo dorsièr dins lo qual enregistrar la pèça junta",
     "Attachments saved to Files." : "Pèças juntas enregistradas dins los Fichièrs.",
@@ -18,7 +19,6 @@ OC.L10N.register(
     "Opening HTML drafts is not supported yet." : "La dobertura de borrolhons al format HTML es pas presa en carga pel moment.",
     "Forwarded message" : "Messatge transferit",
     "Error while loading the selected message." : "Error al moment del cargament del messatge seleccionat.",
-    "Draft saved!" : "Borrolhon salvat!",
     "Choose a file to add as attachment" : "Causissètz un fichièr de jónher al messatge",
     "Reply" : "Respondre",
     "Send" : "Mandar",
@@ -27,11 +27,11 @@ OC.L10N.register(
     "Server error" : "Error del servidor",
     "you" : "vos",
     "Send message to {email}" : "Mandar un mail a {email}",
-    "Error while deleting message." : "Error al moment de la supression del messatge.",
     "Checking messages" : "Relèva del corrièr",
     "Loading …" : "Cargament ...",
     "Load more …" : "Cargar mai ...",
     "Check messages" : "Relevar lo corrièr",
+    "Error while deleting message." : "Error al moment de la supression del messatge.",
     "Error while deleting account." : "Error al moment de la supression del compte.",
     "Connecting" : "Connexion",
     "Connect" : "Connectar",
diff --git a/l10n/oc.json b/l10n/oc.json
index 792a40417..594477db4 100644
--- a/l10n/oc.json
+++ b/l10n/oc.json
@@ -7,6 +7,7 @@
     "Message could not be starred. Please try again." : "Lo messatge a pas pogut èsser plaçat demest los favorits. Ensajatz tornamai.",
     "Unknown error" : "Error desconeguda",
     "Error while creating an account: " : "Error al moment de la creacion del compte :",
+    "Draft saved!" : "Borrolhon salvat!",
     "Error while loading messages." : "Error al moment del cargament dels messatges.",
     "Choose a folder to store the attachment in" : "Causissètz lo dorsièr dins lo qual enregistrar la pèça junta",
     "Attachments saved to Files." : "Pèças juntas enregistradas dins los Fichièrs.",
@@ -16,7 +17,6 @@
     "Opening HTML drafts is not supported yet." : "La dobertura de borrolhons al format HTML es pas presa en carga pel moment.",
     "Forwarded message" : "Messatge transferit",
     "Error while loading the selected message." : "Error al moment del cargament del messatge seleccionat.",
-    "Draft saved!" : "Borrolhon salvat!",
     "Choose a file to add as attachment" : "Causissètz un fichièr de jónher al messatge",
     "Reply" : "Respondre",
     "Send" : "Mandar",
@@ -25,11 +25,11 @@
     "Server error" : "Error del servidor",
     "you" : "vos",
     "Send message to {email}" : "Mandar un mail a {email}",
-    "Error while deleting message." : "Error al moment de la supression del messatge.",
     "Checking messages" : "Relèva del corrièr",
     "Loading …" : "Cargament ...",
     "Load more …" : "Cargar mai ...",
     "Check messages" : "Relevar lo corrièr",
+    "Error while deleting message." : "Error al moment de la supression del messatge.",
     "Error while deleting account." : "Error al moment de la supression del compte.",
     "Connecting" : "Connexion",
     "Connect" : "Connectar",
diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js
index acb43f871..30093993f 100644
--- a/l10n/pt_BR.js
+++ b/l10n/pt_BR.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Message could not be starred. Please try again." : "Mensagem não pode ser marcada com estrela. Por favor tente novamente.",
     "Unknown error" : "Erro desconhecido",
     "Error while creating an account: " : "Erro na criação da conta:",
+    "Draft saved!" : "Rascunho salvo!",
     "Error while loading messages." : "Erro no carregamento das mensagens.",
     "Choose a folder to store the attachment in" : "Escolha uma pasta para armazenar os anexos",
     "Attachments saved to Files." : "Compartilhamentos salvos em Arquivos.",
@@ -18,7 +19,6 @@ OC.L10N.register(
     "Opening HTML drafts is not supported yet." : "Abrir rascunhos do HTML ainda não é suportado.",
     "Forwarded message" : "Mensagem redirecionada",
     "Error while loading the selected message." : "Erro enquanto carregava mensagem selecionada.",
-    "Draft saved!" : "Rascunho salvo!",
     "Choose a file to add as attachment" : "Escolha um arquivo para adicionar como anexo",
     "Reply" : "Responder",
     "Send" : "Enviar",
@@ -27,11 +27,11 @@ OC.L10N.register(
     "Server error" : "Erro no servidor",
     "you" : "você",
     "Send message to {email}" : "Enviar mensagem para {email}",
-    "Error while deleting message." : "Erro enquanto apagava mensagem.",
     "Checking messages" : "Verificando mensagens",
     "Loading …" : "Carregando ...",
     "Load more …" : "Carregar mais ...",
     "Check messages" : "Verificar mensagens",
+    "Error while deleting message." : "Erro enquanto apagava mensagem.",
     "Error while deleting account." : "Erro enquanto eliminava uma conta.",
     "Connecting" : "Conectando",
     "Connect" : "Conectar",
diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json
index 080e76a32..489e3abd7 100644
--- a/l10n/pt_BR.json
+++ b/l10n/pt_BR.json
@@ -7,6 +7,7 @@
     "Message could not be starred. Please try again." : "Mensagem não pode ser marcada com estrela. Por favor tente novamente.",
     "Unknown error" : "Erro desconhecido",
     "Error while creating an account: " : "Erro na criação da conta:",
+    "Draft saved!" : "Rascunho salvo!",
     "Error while loading messages." : "Erro no carregamento das mensagens.",
     "Choose a folder to store the attachment in" : "Escolha uma pasta para armazenar os anexos",
     "Attachments saved to Files." : "Compartilhamentos salvos em Arquivos.",
@@ -16,7 +17,6 @@
     "Opening HTML drafts is not supported yet." : "Abrir rascunhos do HTML ainda não é suportado.",
     "Forwarded message" : "Mensagem redirecionada",
     "Error while loading the selected message." : "Erro enquanto carregava mensagem selecionada.",
-    "Draft saved!" : "Rascunho salvo!",
     "Choose a file to add as attachment" : "Escolha um arquivo para adicionar como anexo",
     "Reply" : "Responder",
     "Send" : "Enviar",
@@ -25,11 +25,11 @@
     "Server error" : "Erro no servidor",
     "you" : "você",
     "Send message to {email}" : "Enviar mensagem para {email}",
-    "Error while deleting message." : "Erro enquanto apagava mensagem.",
     "Checking messages" : "Verificando mensagens",
     "Loading …" : "Carregando ...",
     "Load more …" : "Carregar mais ...",
     "Check messages" : "Verificar mensagens",
+    "Error while deleting message." : "Erro enquanto apagava mensagem.",
     "Error while deleting account." : "Erro enquanto eliminava uma conta.",
     "Connecting" : "Conectando",
     "Connect" : "Conectar",
diff --git a/l10n/pt_PT.js b/l10n/pt_PT.js
index 098e99489..6307d7d86 100644
--- a/l10n/pt_PT.js
+++ b/l10n/pt_PT.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Message could not be starred. Please try again." : "Não foi possível atribuir as estrelas à mensagem. Por favor, tente de novo.",
     "Unknown error" : "Erro desconhecido",
     "Error while creating an account: " : "Erro durante a criação da conta:",
+    "Draft saved!" : "Rascunho guardado!",
     "Error while loading messages." : "Erro durante o carregamento das mensagens.",
     "Choose a folder to store the attachment in" : "Escolha uma pasta para guardar o anexo",
     "Attachments saved to Files." : "Anexos guardados em Ficheiros.",
@@ -18,7 +19,6 @@ OC.L10N.register(
     "Opening HTML drafts is not supported yet." : "Ainda não é suportada a abertura de rascunhos HTML.",
     "Forwarded message" : "Mensagem reencaminhada",
     "Error while loading the selected message." : "Erro a carregar a mensagem seleccionada.",
-    "Draft saved!" : "Rascunho guardado!",
     "Choose a file to add as attachment" : "Escolha um ficheiro para adicionar como anexo",
     "Reply" : "Responder",
     "Send" : "Enviar",
@@ -27,11 +27,11 @@ OC.L10N.register(
     "Server error" : "Erro do servidor",
     "you" : "Você",
     "Send message to {email}" : "Enviar mensagem para {email}",
-    "Error while deleting message." : "Erro durante a eliminação da mensagem.",
     "Checking messages" : "A verificar as mensagens",
     "Loading …" : "A carregar...",
     "Load more …" : "Carregar mais...",
     "Check messages" : "Verificar mensagens",
+    "Error while deleting message." : "Erro durante a eliminação da mensagem.",
     "Error while deleting account." : "Erro durante a eliminação da conta.",
     "Connecting" : "A ligar",
     "Connect" : "Ligar",
diff --git a/l10n/pt_PT.json b/l10n/pt_PT.json
index 421aa288b..ee3962925 100644
--- a/l10n/pt_PT.json
+++ b/l10n/pt_PT.json
@@ -7,6 +7,7 @@
     "Message could not be starred. Please try again." : "Não foi possível atribuir as estrelas à mensagem. Por favor, tente de novo.",
     "Unknown error" : "Erro desconhecido",
     "Error while creating an account: " : "Erro durante a criação da conta:",
+    "Draft saved!" : "Rascunho guardado!",
     "Error while loading messages." : "Erro durante o carregamento das mensagens.",
     "Choose a folder to store the attachment in" : "Escolha uma pasta para guardar o anexo",
     "Attachments saved to Files." : "Anexos guardados em Ficheiros.",
@@ -16,7 +17,6 @@
     "Opening HTML drafts is not supported yet." : "Ainda não é suportada a abertura de rascunhos HTML.",
     "Forwarded message" : "Mensagem reencaminhada",
     "Error while loading the selected message." : "Erro a carregar a mensagem seleccionada.",
-    "Draft saved!" : "Rascunho guardado!",
     "Choose a file to add as attachment" : "Escolha um ficheiro para adicionar como anexo",
     "Reply" : "Responder",
     "Send" : "Enviar",
@@ -25,11 +25,11 @@
     "Server error" : "Erro do servidor",
     "you" : "Você",
     "Send message to {email}" : "Enviar mensagem para {email}",
-    "Error while deleting message." : "Erro durante a eliminação da mensagem.",
     "Checking messages" : "A verificar as mensagens",
     "Loading …" : "A carregar...",
     "Load more …" : "Carregar mais...",
     "Check messages" : "Verificar mensagens",
+    "Error while deleting message." : "Erro durante a eliminação da mensagem.",
     "Error while deleting account." : "Erro durante a eliminação da conta.",
     "Connecting" : "A ligar",
     "Connect" : "Ligar",
diff --git a/l10n/ru.js b/l10n/ru.js
index 285fbc950..1c65f745a 100644
--- a/l10n/ru.js
+++ b/l10n/ru.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Message could not be starred. Please try again." : "Не удалось пометить сообщение. Попробуйте снова.",
     "Unknown error" : "Неизвестная ошибка",
     "Error while creating an account: " : "Ошибка при создании учётной записи:",
+    "Draft saved!" : "Черновик сохранен!",
     "Error while loading messages." : "Ошибка пр загрузке изображений.",
     "Choose a folder to store the attachment in" : "Выберите каталог для хранения вложений",
     "Attachments saved to Files." : "Вложения сохранены в Файлах",
@@ -18,7 +19,6 @@ OC.L10N.register(
     "Opening HTML drafts is not supported yet." : "Работа с черновиками HTML пока не поддерживается.",
     "Forwarded message" : "Пересланное сообщение",
     "Error while loading the selected message." : "Ошибка при загрузке выбранного сообщения.",
-    "Draft saved!" : "Черновик сохранен!",
     "Choose a file to add as attachment" : "Выбрать файл для вложения",
     "Reply" : "Ответ",
     "Send" : "Отправить",
@@ -27,11 +27,11 @@ OC.L10N.register(
     "Server error" : "Ошибка сервера",
     "you" : "вы",
     "Send message to {email}" : "Отправить сообщения на {email}",
-    "Error while deleting message." : "Ошибка при удалении сообщения.",
     "Checking messages" : "Проверка сообщений",
     "Loading …" : "Идёт загрузка ...",
     "Load more …" : "Загрузить больше ...",
     "Check messages" : "Проверить сообщения",
+    "Error while deleting message." : "Ошибка при удалении сообщения.",
     "Error while deleting account." : "Ошибка при удалении учётной записи.",
     "Connecting" : "Соединение",
     "Connect" : "Соединить",
diff --git a/l10n/ru.json b/l10n/ru.json
index ec191e338..e4dfc1b94 100644
--- a/l10n/ru.json
+++ b/l10n/ru.json
@@ -7,6 +7,7 @@
     "Message could not be starred. Please try again." : "Не удалось пометить сообщение. Попробуйте снова.",
     "Unknown error" : "Неизвестная ошибка",
     "Error while creating an account: " : "Ошибка при создании учётной записи:",
+    "Draft saved!" : "Черновик сохранен!",
     "Error while loading messages." : "Ошибка пр загрузке изображений.",
     "Choose a folder to store the attachment in" : "Выберите каталог для хранения вложений",
     "Attachments saved to Files." : "Вложения сохранены в Файлах",
@@ -16,7 +17,6 @@
     "Opening HTML drafts is not supported yet." : "Работа с черновиками HTML пока не поддерживается.",
     "Forwarded message" : "Пересланное сообщение",
     "Error while loading the selected message." : "Ошибка при загрузке выбранного сообщения.",
-    "Draft saved!" : "Черновик сохранен!",
     "Choose a file to add as attachment" : "Выбрать файл для вложения",
     "Reply" : "Ответ",
     "Send" : "Отправить",
@@ -25,11 +25,11 @@
     "Server error" : "Ошибка сервера",
     "you" : "вы",
     "Send message to {email}" : "Отправить сообщения на {email}",
-    "Error while deleting message." : "Ошибка при удалении сообщения.",
     "Checking messages" : "Проверка сообщений",
     "Loading …" : "Идёт загрузка ...",
     "Load more …" : "Загрузить больше ...",
     "Check messages" : "Проверить сообщения",
+    "Error while deleting message." : "Ошибка при удалении сообщения.",
     "Error while deleting account." : "Ошибка при удалении учётной записи.",
     "Connecting" : "Соединение",
     "Connect" : "Соединить",
diff --git a/l10n/sk_SK.js b/l10n/sk_SK.js
index 02c88efed..fc97224e2 100644
--- a/l10n/sk_SK.js
+++ b/l10n/sk_SK.js
@@ -8,6 +8,7 @@ OC.L10N.register(
     "Message could not be starred. Please try again." : "Správa nemohla byť označená hviezdičkou. Skúste to znovu.",
     "Unknown error" : "Neznáma chyba",
     "Error while creating an account: " : "Chyba pri vytváraní účtu:",
+    "Draft saved!" : "Koncept uložený!",
     "Error while loading messages." : "Chyba počas načítavania správ.",
     "Choose a folder to store the attachment in" : "Vyberte priečinok pre uloženie prílohy",
     "Attachments saved to Files." : "Prílohy sú uložené do Súborov.",
@@ -16,7 +17,6 @@ OC.L10N.register(
     "Error while saving attachment to Files." : "Chyba pri ukladaní prílohy do Súborov.",
     "Forwarded message" : "Preposlané správy",
     "Error while loading the selected message." : "Chyba pri načítavaní vybranej správy.",
-    "Draft saved!" : "Koncept uložený!",
     "Choose a file to add as attachment" : "Zvoľte súbor, ktorý chcete pridať ako prílohu.",
     "Reply" : "Odpoveď",
     "Send" : "Odoslať",
@@ -24,11 +24,11 @@ OC.L10N.register(
     "Message sent!" : "Správa odoslaná!",
     "Server error" : "Chyba servera",
     "you" : "vy",
-    "Error while deleting message." : "Chyba pri mazaní správy.",
     "Checking messages" : "Kontrolujem správy",
     "Loading …" : "Načítavam...",
     "Load more …" : "Načítať ďalšie ...",
     "Check messages" : "Skontrolovať správy",
+    "Error while deleting message." : "Chyba pri mazaní správy.",
     "Error while deleting account." : "Chyba pri mazaní účtu.",
     "Connect" : "Pripojiť",
     "Inbox" : "Doručené",
diff --git a/l10n/sk_SK.json b/l10n/sk_SK.json
index 3e2ed5f28..9a88c9776 100644
--- a/l10n/sk_SK.json
+++ b/l10n/sk_SK.json
@@ -6,6 +6,7 @@
     "Message could not be starred. Please try again." : "Správa nemohla byť označená hviezdičkou. Skúste to znovu.",
     "Unknown error" : "Neznáma chyba",
     "Error while creating an account: " : "Chyba pri vytváraní účtu:",
+    "Draft saved!" : "Koncept uložený!",
     "Error while loading messages." : "Chyba počas načítavania správ.",
     "Choose a folder to store the attachment in" : "Vyberte priečinok pre uloženie prílohy",
     "Attachments saved to Files." : "Prílohy sú uložené do Súborov.",
@@ -14,7 +15,6 @@
     "Error while saving attachment to Files." : "Chyba pri ukladaní prílohy do Súborov.",
     "Forwarded message" : "Preposlané správy",
     "Error while loading the selected message." : "Chyba pri načítavaní vybranej správy.",
-    "Draft saved!" : "Koncept uložený!",
     "Choose a file to add as attachment" : "Zvoľte súbor, ktorý chcete pridať ako prílohu.",
     "Reply" : "Odpoveď",
     "Send" : "Odoslať",
@@ -22,11 +22,11 @@
     "Message sent!" : "Správa odoslaná!",
     "Server error" : "Chyba servera",
     "you" : "vy",
-    "Error while deleting message." : "Chyba pri mazaní správy.",
     "Checking messages" : "Kontrolujem správy",
     "Loading …" : "Načítavam...",
     "Load more …" : "Načítať ďalšie ...",
     "Check messages" : "Skontrolovať správy",
+    "Error while deleting message." : "Chyba pri mazaní správy.",
     "Error while deleting account." : "Chyba pri mazaní účtu.",
     "Connect" : "Pripojiť",
     "Inbox" : "Doručené",
diff --git a/l10n/sl.js b/l10n/sl.js
index 1e2a18f42..8647f658b 100644
--- a/l10n/sl.js
+++ b/l10n/sl.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Message could not be starred. Please try again." : "Sporočila ni mogoče označiti z zvezdico. Poskusite znova.",
     "Unknown error" : "Neznana napaka",
     "Error while creating an account: " : "Prišlo je do napake med ustvarjanjem računa:",
+    "Draft saved!" : "Osnutek sporočila je shranjen!",
     "Error while loading messages." : "Prišlo je do napake nalaganja sporočil.",
     "Choose a folder to store the attachment in" : "Izbor mape za shranjevanje prilog.",
     "Attachments saved to Files." : "Priloge so shranjene med datoteke.",
@@ -18,7 +19,6 @@ OC.L10N.register(
     "Opening HTML drafts is not supported yet." : "Odpiranje osnutkov sporočil v zapisu HTML še ni podprto.",
     "Forwarded message" : "Posreduj sporočilo",
     "Error while loading the selected message." : "Napaka med nalaganjem izbranih sporočil",
-    "Draft saved!" : "Osnutek sporočila je shranjen!",
     "Choose a file to add as attachment" : "Izbor datoteke za prilogo",
     "Reply" : "Odgovori",
     "Send" : "Pošlji",
@@ -27,11 +27,11 @@ OC.L10N.register(
     "Server error" : "Napaka strežnika",
     "you" : "vi",
     "Send message to {email}" : "Pošlji sporočilo na {email}",
-    "Error while deleting message." : "Napaka med brisanjem sporočila.",
     "Checking messages" : "Poteka preverjanje za nova sporočila",
     "Loading …" : "Nalaganje ...",
     "Load more …" : "Naloži več ...",
     "Check messages" : "Preveri za sporočila",
+    "Error while deleting message." : "Napaka med brisanjem sporočila.",
     "Error while deleting account." : "Prišlo je do napake med brisanjem računa.",
     "Connecting" : "Poteka vzpostavljanje povezave ...",
     "Connect" : "Poveži",
diff --git a/l10n/sl.json b/l10n/sl.json
index 34d5046ff..cb3620323 100644
--- a/l10n/sl.json
+++ b/l10n/sl.json
@@ -7,6 +7,7 @@
     "Message could not be starred. Please try again." : "Sporočila ni mogoče označiti z zvezdico. Poskusite znova.",
     "Unknown error" : "Neznana napaka",
     "Error while creating an account: " : "Prišlo je do napake med ustvarjanjem računa:",
+    "Draft saved!" : "Osnutek sporočila je shranjen!",
     "Error while loading messages." : "Prišlo je do napake nalaganja sporočil.",
     "Choose a folder to store the attachment in" : "Izbor mape za shranjevanje prilog.",
     "Attachments saved to Files." : "Priloge so shranjene med datoteke.",
@@ -16,7 +17,6 @@
     "Opening HTML drafts is not supported yet." : "Odpiranje osnutkov sporočil v zapisu HTML še ni podprto.",
     "Forwarded message" : "Posreduj sporočilo",
     "Error while loading the selected message." : "Napaka med nalaganjem izbranih sporočil",
-    "Draft saved!" : "Osnutek sporočila je shranjen!",
     "Choose a file to add as attachment" : "Izbor datoteke za prilogo",
     "Reply" : "Odgovori",
     "Send" : "Pošlji",
@@ -25,11 +25,11 @@
     "Server error" : "Napaka strežnika",
     "you" : "vi",
     "Send message to {email}" : "Pošlji sporočilo na {email}",
-    "Error while deleting message." : "Napaka med brisanjem sporočila.",
     "Checking messages" : "Poteka preverjanje za nova sporočila",
     "Loading …" : "Nalaganje ...",
     "Load more …" : "Naloži več ...",
     "Check messages" : "Preveri za sporočila",
+    "Error while deleting message." : "Napaka med brisanjem sporočila.",
     "Error while deleting account." : "Prišlo je do napake med brisanjem računa.",
     "Connecting" : "Poteka vzpostavljanje povezave ...",
     "Connect" : "Poveži",
diff --git a/l10n/sq.js b/l10n/sq.js
index 925ef4f83..4027863e1 100644
--- a/l10n/sq.js
+++ b/l10n/sq.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Message could not be starred. Please try again." : "Mesazhit s’iu vu dot yll. Ju lutemi, riprovoni.",
     "Unknown error" : "Gabim i panjohur",
     "Error while creating an account: " : "Gabim gjatë ngarkimit të një llogarie: ",
+    "Draft saved!" : "Skica u ruajt!",
     "Error while loading messages." : "Gabim gjatë ngarkimit të mesazheve.",
     "Choose a folder to store the attachment in" : "Zgjidhni një dosje ku të depozitohet bashkëngjitja",
     "Attachments saved to Files." : "Bashkëngjitjet u ruajtën te Kartela.",
@@ -18,7 +19,6 @@ OC.L10N.register(
     "Opening HTML drafts is not supported yet." : "Hapja e skicave HTML nuk mbulohet ende.",
     "Forwarded message" : "Mesazhi u përcoll",
     "Error while loading the selected message." : "Gabim në ngarkimin e mesazhit të përzgjedhur.",
-    "Draft saved!" : "Skica u ruajt!",
     "Choose a file to add as attachment" : "Zgjidhni një kartelë që të shtohet si bashkëngjitje",
     "Reply" : "Përgjigju",
     "Send" : "Dërgo",
@@ -27,11 +27,11 @@ OC.L10N.register(
     "Server error" : "Gabim shërbyesi",
     "you" : "ju",
     "Send message to {email}" : "Dërgoni mesazh te {email}",
-    "Error while deleting message." : "Gabim gjatë fshirjes së mesazhit.",
     "Checking messages" : "Po kontrollohen mesazhet",
     "Loading …" : "Po ngarkohet …",
     "Load more …" : "Ngarkoni më tepër …",
     "Check messages" : "Kontrollo mesazhe",
+    "Error while deleting message." : "Gabim gjatë fshirjes së mesazhit.",
     "Error while deleting account." : "Gabim gjatë fshirjes së llogarisë.",
     "Connecting" : "Po lidhet",
     "Connect" : "Lidhu",
diff --git a/l10n/sq.json b/l10n/sq.json
index 55f81a456..f620b16d5 100644
--- a/l10n/sq.json
+++ b/l10n/sq.json
@@ -7,6 +7,7 @@
     "Message could not be starred. Please try again." : "Mesazhit s’iu vu dot yll. Ju lutemi, riprovoni.",
     "Unknown error" : "Gabim i panjohur",
     "Error while creating an account: " : "Gabim gjatë ngarkimit të një llogarie: ",
+    "Draft saved!" : "Skica u ruajt!",
     "Error while loading messages." : "Gabim gjatë ngarkimit të mesazheve.",
     "Choose a folder to store the attachment in" : "Zgjidhni një dosje ku të depozitohet bashkëngjitja",
     "Attachments saved to Files." : "Bashkëngjitjet u ruajtën te Kartela.",
@@ -16,7 +17,6 @@
     "Opening HTML drafts is not supported yet." : "Hapja e skicave HTML nuk mbulohet ende.",
     "Forwarded message" : "Mesazhi u përcoll",
     "Error while loading the selected message." : "Gabim në ngarkimin e mesazhit të përzgjedhur.",
-    "Draft saved!" : "Skica u ruajt!",
     "Choose a file to add as attachment" : "Zgjidhni një kartelë që të shtohet si bashkëngjitje",
     "Reply" : "Përgjigju",
     "Send" : "Dërgo",
@@ -25,11 +25,11 @@
     "Server error" : "Gabim shërbyesi",
     "you" : "ju",
     "Send message to {email}" : "Dërgoni mesazh te {email}",
-    "Error while deleting message." : "Gabim gjatë fshirjes së mesazhit.",
     "Checking messages" : "Po kontrollohen mesazhet",
     "Loading …" : "Po ngarkohet …",
     "Load more …" : "Ngarkoni më tepër …",
     "Check messages" : "Kontrollo mesazhe",
+    "Error while deleting message." : "Gabim gjatë fshirjes së mesazhit.",
     "Error while deleting account." : "Gabim gjatë fshirjes së llogarisë.",
     "Connecting" : "Po lidhet",
     "Connect" : "Lidhu",
diff --git a/l10n/sr.js b/l10n/sr.js
index 679f0e8c6..68d6474d9 100644
--- a/l10n/sr.js
+++ b/l10n/sr.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Message could not be starred. Please try again." : "Порука се не може „озвездати“. Покушајте поново.",
     "Unknown error" : "Непозната грешка",
     "Error while creating an account: " : "Грешка при прављењу налога:",
+    "Draft saved!" : "Нацрт сачуван!",
     "Error while loading messages." : "Грешка при учитавању порука.",
     "Choose a folder to store the attachment in" : "Изаберите фасциклу за смештање прилога",
     "Attachments saved to Files." : "Прилози сачувани у фајловима",
@@ -18,7 +19,6 @@ OC.L10N.register(
     "Opening HTML drafts is not supported yet." : "Отварање ХТМЛ нацрта још није подржано.",
     "Forwarded message" : "Прослеђена порука",
     "Error while loading the selected message." : "Грешка при учитавању изабране поруке.",
-    "Draft saved!" : "Нацрт сачуван!",
     "Choose a file to add as attachment" : "Изаберите фајл за прилог",
     "Reply" : "Одговори",
     "Send" : "Пошаљи",
@@ -27,11 +27,11 @@ OC.L10N.register(
     "Server error" : "Грешка сервера",
     "you" : "ви",
     "Send message to {email}" : "Пошаљи поруку на {email}",
-    "Error while deleting message." : "Грешка при брисању поруке.",
     "Checking messages" : "Проверавам поруке",
     "Loading …" : "Учитавам...",
     "Load more …" : "Учитај још...",
     "Check messages" : "Провери поруке",
+    "Error while deleting message." : "Грешка при брисању поруке.",
     "Error while deleting account." : "Грешка при брисању налога.",
     "Connect" : "Повежи се",
     "Inbox" : "Долазно",
diff --git a/l10n/sr.json b/l10n/sr.json
index 6c0dc8a9b..8f3ef6bf8 100644
--- a/l10n/sr.json
+++ b/l10n/sr.json
@@ -7,6 +7,7 @@
     "Message could not be starred. Please try again." : "Порука се не може „озвездати“. Покушајте поново.",
     "Unknown error" : "Непозната грешка",
     "Error while creating an account: " : "Грешка при прављењу налога:",
+    "Draft saved!" : "Нацрт сачуван!",
     "Error while loading messages." : "Грешка при учитавању порука.",
     "Choose a folder to store the attachment in" : "Изаберите фасциклу за смештање прилога",
     "Attachments saved to Files." : "Прилози сачувани у фајловима",
@@ -16,7 +17,6 @@
     "Opening HTML drafts is not supported yet." : "Отварање ХТМЛ нацрта још није подржано.",
     "Forwarded message" : "Прослеђена порука",
     "Error while loading the selected message." : "Грешка при учитавању изабране поруке.",
-    "Draft saved!" : "Нацрт сачуван!",
     "Choose a file to add as attachment" : "Изаберите фајл за прилог",
     "Reply" : "Одговори",
     "Send" : "Пошаљи",
@@ -25,11 +25,11 @@
     "Server error" : "Грешка сервера",
     "you" : "ви",
     "Send message to {email}" : "Пошаљи поруку на {email}",
-    "Error while deleting message." : "Грешка при брисању поруке.",
     "Checking messages" : "Проверавам поруке",
     "Loading …" : "Учитавам...",
     "Load more …" : "Учитај још...",
     "Check messages" : "Провери поруке",
+    "Error while deleting message." : "Грешка при брисању поруке.",
     "Error while deleting account." : "Грешка при брисању налога.",
     "Connect" : "Повежи се",
     "Inbox" : "Долазно",
diff --git a/l10n/sv.js b/l10n/sv.js
index e1187173b..00a6e4bc0 100644
--- a/l10n/sv.js
+++ b/l10n/sv.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Message could not be starred. Please try again." : "Meddelande kan inte starta. Försök igen.",
     "Unknown error" : "Okänt fel",
     "Error while creating an account: " : "Fel när du skapade konto:",
+    "Draft saved!" : "Utkast sparat!",
     "Error while loading messages." : "Fel vid inläsning av meddelanden.",
     "Choose a folder to store the attachment in" : "Välj en mapp att spara den bifogade filen i",
     "Attachments saved to Files." : "Bilagor sparas till filer.",
@@ -17,7 +18,6 @@ OC.L10N.register(
     "Error while saving attachment to Files." : "Fel vid sparande bilagor till filer.",
     "Forwarded message" : "Vidarebefordrat meddelande",
     "Error while loading the selected message." : "Fel vid inläsning av valda meddelandet.",
-    "Draft saved!" : "Utkast sparat!",
     "Choose a file to add as attachment" : "Välj en fil att lägga som bilaga",
     "Reply" : "Svara",
     "Send" : "Skicka",
@@ -26,12 +26,13 @@ OC.L10N.register(
     "Server error" : "Serverfel",
     "you" : "du",
     "Send message to {email}" : "Skicka meddelande till {email}",
-    "Error while deleting message." : "Fel vid radering av  meddelande.",
     "Checking messages" : "kontroll meddelanden",
     "Loading …" : "Laddar ...",
     "Load more …" : "Ladda mer ...",
     "Check messages" : "kontroll meddelanden",
+    "Error while deleting message." : "Fel vid radering av  meddelande.",
     "Error while deleting account." : "Fel vid radering av konto.",
+    "Connecting" : "Ansluter",
     "Connect" : "Anslut",
     "Inbox" : "Inkorg",
     "Sent" : "Skickad",
@@ -49,6 +50,9 @@ OC.L10N.register(
     "Error loading message" : "Fel vid laddning av meddelande",
     "New message" : "Nytt meddelande",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Vidarbofordrar dig till %s - klicka här om du inte automatiskt omdirigeras inom några sekunder.",
-    "If you do not want to visit that page, you can return to <a href=\"%s\">the mail app</a>." : "Om du inte vill besöka den sidan kan du återvända till <a href=\"%s\">mail appen</a>."
+    "Redirect warning" : "Omdirigeringsvarning",
+    "The previous page is sending you to %s" : "Föregående sida skickar dig vidare till %s",
+    "If you do not want to visit that page, you can return to <a href=\"%s\">the mail app</a>." : "Om du inte vill besöka den sidan kan du återvända till <a href=\"%s\">mail appen</a>.",
+    "Continue to %s" : "Fortsätt till %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/sv.json b/l10n/sv.json
index 7c8f42545..94b7d14e4 100644
--- a/l10n/sv.json
+++ b/l10n/sv.json
@@ -7,6 +7,7 @@
     "Message could not be starred. Please try again." : "Meddelande kan inte starta. Försök igen.",
     "Unknown error" : "Okänt fel",
     "Error while creating an account: " : "Fel när du skapade konto:",
+    "Draft saved!" : "Utkast sparat!",
     "Error while loading messages." : "Fel vid inläsning av meddelanden.",
     "Choose a folder to store the attachment in" : "Välj en mapp att spara den bifogade filen i",
     "Attachments saved to Files." : "Bilagor sparas till filer.",
@@ -15,7 +16,6 @@
     "Error while saving attachment to Files." : "Fel vid sparande bilagor till filer.",
     "Forwarded message" : "Vidarebefordrat meddelande",
     "Error while loading the selected message." : "Fel vid inläsning av valda meddelandet.",
-    "Draft saved!" : "Utkast sparat!",
     "Choose a file to add as attachment" : "Välj en fil att lägga som bilaga",
     "Reply" : "Svara",
     "Send" : "Skicka",
@@ -24,12 +24,13 @@
     "Server error" : "Serverfel",
     "you" : "du",
     "Send message to {email}" : "Skicka meddelande till {email}",
-    "Error while deleting message." : "Fel vid radering av  meddelande.",
     "Checking messages" : "kontroll meddelanden",
     "Loading …" : "Laddar ...",
     "Load more …" : "Ladda mer ...",
     "Check messages" : "kontroll meddelanden",
+    "Error while deleting message." : "Fel vid radering av  meddelande.",
     "Error while deleting account." : "Fel vid radering av konto.",
+    "Connecting" : "Ansluter",
     "Connect" : "Anslut",
     "Inbox" : "Inkorg",
     "Sent" : "Skickad",
@@ -47,6 +48,9 @@
     "Error loading message" : "Fel vid laddning av meddelande",
     "New message" : "Nytt meddelande",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Vidarbofordrar dig till %s - klicka här om du inte automatiskt omdirigeras inom några sekunder.",
-    "If you do not want to visit that page, you can return to <a href=\"%s\">the mail app</a>." : "Om du inte vill besöka den sidan kan du återvända till <a href=\"%s\">mail appen</a>."
+    "Redirect warning" : "Omdirigeringsvarning",
+    "The previous page is sending you to %s" : "Föregående sida skickar dig vidare till %s",
+    "If you do not want to visit that page, you can return to <a href=\"%s\">the mail app</a>." : "Om du inte vill besöka den sidan kan du återvända till <a href=\"%s\">mail appen</a>.",
+    "Continue to %s" : "Fortsätt till %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/th_TH.js b/l10n/th_TH.js
index 7ba791639..0ef51f7d9 100644
--- a/l10n/th_TH.js
+++ b/l10n/th_TH.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Message could not be starred. Please try again." : "ไม่สามารถเริ่มต้นข้อความ โปรดลองอีกครั้ง",
     "Unknown error" : "ข้อผิดพลาดที่ไม่ทราบสาเหตุ",
     "Error while creating an account: " : "ข้อผิดพลาดขณะกำลังสร้างบัญชี:",
+    "Draft saved!" : "แบบร่างถูกบันทึก!",
     "Error while loading messages." : "ข้อผิดพลาดขณะโหลดข้อความ",
     "Choose a folder to store the attachment in" : "เลือกโฟลเดอร์ที่จะเก็บสิ่งที่แนบมาใน",
     "Attachments saved to Files." : "สิ่งที่แนบมาถูกบันทึกไว้ในไฟล์",
@@ -18,7 +19,6 @@ OC.L10N.register(
     "Opening HTML drafts is not supported yet." : "เปิดแบบร่าง HTML ยังไม่รองรับในตอนนี้",
     "Forwarded message" : "ส่งต่อข้อความ",
     "Error while loading the selected message." : "ข้อผิดพลาดในขณะที่โหลดข้อความที่เลือก",
-    "Draft saved!" : "แบบร่างถูกบันทึก!",
     "Choose a file to add as attachment" : "เลือกไฟล์ที่ต้องการแนบ",
     "Reply" : "ตอบกลับ",
     "Send" : "ส่ง",
@@ -27,11 +27,11 @@ OC.L10N.register(
     "Server error" : "ข้อผิดพลาดของเซิร์ฟเวอร์",
     "you" : "คุณ",
     "Send message to {email}" : "ส่งข้อความไปยัง {email}",
-    "Error while deleting message." : "ข้อผิดพลาดขณะลบข้อความ",
     "Checking messages" : "กำลังตรวจสอบข้อความ",
     "Loading …" : "กำลังโหลด ...",
     "Load more …" : "โหลดเพิ่มเติม ...",
     "Check messages" : "ตรวจสอบข้อความ",
+    "Error while deleting message." : "ข้อผิดพลาดขณะลบข้อความ",
     "Error while deleting account." : "ข้อผิดพลาดขณะลบบัญชี",
     "Connecting" : "กำลังเชื่อมต่อ",
     "Connect" : "เชื่อมต่อ",
diff --git a/l10n/th_TH.json b/l10n/th_TH.json
index 30c39ae14..3368aa3ac 100644
--- a/l10n/th_TH.json
+++ b/l10n/th_TH.json
@@ -7,6 +7,7 @@
     "Message could not be starred. Please try again." : "ไม่สามารถเริ่มต้นข้อความ โปรดลองอีกครั้ง",
     "Unknown error" : "ข้อผิดพลาดที่ไม่ทราบสาเหตุ",
     "Error while creating an account: " : "ข้อผิดพลาดขณะกำลังสร้างบัญชี:",
+    "Draft saved!" : "แบบร่างถูกบันทึก!",
     "Error while loading messages." : "ข้อผิดพลาดขณะโหลดข้อความ",
     "Choose a folder to store the attachment in" : "เลือกโฟลเดอร์ที่จะเก็บสิ่งที่แนบมาใน",
     "Attachments saved to Files." : "สิ่งที่แนบมาถูกบันทึกไว้ในไฟล์",
@@ -16,7 +17,6 @@
     "Opening HTML drafts is not supported yet." : "เปิดแบบร่าง HTML ยังไม่รองรับในตอนนี้",
     "Forwarded message" : "ส่งต่อข้อความ",
     "Error while loading the selected message." : "ข้อผิดพลาดในขณะที่โหลดข้อความที่เลือก",
-    "Draft saved!" : "แบบร่างถูกบันทึก!",
     "Choose a file to add as attachment" : "เลือกไฟล์ที่ต้องการแนบ",
     "Reply" : "ตอบกลับ",
     "Send" : "ส่ง",
@@ -25,11 +25,11 @@
     "Server error" : "ข้อผิดพลาดของเซิร์ฟเวอร์",
     "you" : "คุณ",
     "Send message to {email}" : "ส่งข้อความไปยัง {email}",
-    "Error while deleting message." : "ข้อผิดพลาดขณะลบข้อความ",
     "Checking messages" : "กำลังตรวจสอบข้อความ",
     "Loading …" : "กำลังโหลด ...",
     "Load more …" : "โหลดเพิ่มเติม ...",
     "Check messages" : "ตรวจสอบข้อความ",
+    "Error while deleting message." : "ข้อผิดพลาดขณะลบข้อความ",
     "Error while deleting account." : "ข้อผิดพลาดขณะลบบัญชี",
     "Connecting" : "กำลังเชื่อมต่อ",
     "Connect" : "เชื่อมต่อ",
diff --git a/l10n/tr.js b/l10n/tr.js
index 060a4b0f2..00c60d060 100644
--- a/l10n/tr.js
+++ b/l10n/tr.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Message could not be starred. Please try again." : "İleti yıldızlanamadı. Lütfen yeniden deneyin.",
     "Unknown error" : "Bilinmeyen hata",
     "Error while creating an account: " : "Bir hesap oluştururken hata:",
+    "Draft saved!" : "Taslak kaydedildi!",
     "Error while loading messages." : "İletiler yüklenirken hata.",
     "Choose a folder to store the attachment in" : "Ekin saklanmasını istediğiniz bir klasör seçin",
     "Attachments saved to Files." : "Ekler Dosyalara kaydedildi.",
@@ -18,7 +19,6 @@ OC.L10N.register(
     "Opening HTML drafts is not supported yet." : "HTML taslaklarını açmak henüz desteklenmiyor.",
     "Forwarded message" : "Yönlendirilmiş ileti",
     "Error while loading the selected message." : "Seçili ileti yüklenirken hata.",
-    "Draft saved!" : "Taslak kaydedildi!",
     "Choose a file to add as attachment" : "Ek olarak eklemek için bir dosya seçin",
     "Reply" : "Yanıtla",
     "Send" : "Gönder",
@@ -27,11 +27,11 @@ OC.L10N.register(
     "Server error" : "Sunucu hatası",
     "you" : "siz",
     "Send message to {email}" : "{email} adresine ileti gönder",
-    "Error while deleting message." : "İleti silinirken hata.",
     "Checking messages" : "İletiler kontrol ediliyor",
     "Loading …" : "Yükleniyor...",
     "Load more …" : "Daha fazla yükle...",
     "Check messages" : "İletileri denetle",
+    "Error while deleting message." : "İleti silinirken hata.",
     "Error while deleting account." : "Hesap silinirken hata.",
     "Connecting" : "Bağlanıyor",
     "Connect" : "Bağlan",
diff --git a/l10n/tr.json b/l10n/tr.json
index 5d3d006ed..4db0f845f 100644
--- a/l10n/tr.json
+++ b/l10n/tr.json
@@ -7,6 +7,7 @@
     "Message could not be starred. Please try again." : "İleti yıldızlanamadı. Lütfen yeniden deneyin.",
     "Unknown error" : "Bilinmeyen hata",
     "Error while creating an account: " : "Bir hesap oluştururken hata:",
+    "Draft saved!" : "Taslak kaydedildi!",
     "Error while loading messages." : "İletiler yüklenirken hata.",
     "Choose a folder to store the attachment in" : "Ekin saklanmasını istediğiniz bir klasör seçin",
     "Attachments saved to Files." : "Ekler Dosyalara kaydedildi.",
@@ -16,7 +17,6 @@
     "Opening HTML drafts is not supported yet." : "HTML taslaklarını açmak henüz desteklenmiyor.",
     "Forwarded message" : "Yönlendirilmiş ileti",
     "Error while loading the selected message." : "Seçili ileti yüklenirken hata.",
-    "Draft saved!" : "Taslak kaydedildi!",
     "Choose a file to add as attachment" : "Ek olarak eklemek için bir dosya seçin",
     "Reply" : "Yanıtla",
     "Send" : "Gönder",
@@ -25,11 +25,11 @@
     "Server error" : "Sunucu hatası",
     "you" : "siz",
     "Send message to {email}" : "{email} adresine ileti gönder",
-    "Error while deleting message." : "İleti silinirken hata.",
     "Checking messages" : "İletiler kontrol ediliyor",
     "Loading …" : "Yükleniyor...",
     "Load more …" : "Daha fazla yükle...",
     "Check messages" : "İletileri denetle",
+    "Error while deleting message." : "İleti silinirken hata.",
     "Error while deleting account." : "Hesap silinirken hata.",
     "Connecting" : "Bağlanıyor",
     "Connect" : "Bağlan",
diff --git a/l10n/uk.js b/l10n/uk.js
index 6600f782d..ef61135ba 100644
--- a/l10n/uk.js
+++ b/l10n/uk.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Message could not be starred. Please try again." : "Не вдалося відмітити повідомлення. Будь ласка, спробуйте ще раз.",
     "Unknown error" : "Невідома помилка",
     "Error while creating an account: " : "Помилка при створенні облікового запису:",
+    "Draft saved!" : "Чернетку збережено!",
     "Error while loading messages." : "Помилка завантаження повідомлень.",
     "Choose a folder to store the attachment in" : "Оберіть теку для зберігання вкладень",
     "Attachments saved to Files." : "Вкладення збережені до Файлів.",
@@ -18,7 +19,6 @@ OC.L10N.register(
     "Opening HTML drafts is not supported yet." : "Відкриті HTML чернетки поки не підтримуються.",
     "Forwarded message" : "Пререадресоване повідомлення",
     "Error while loading the selected message." : "Помилка завантаження обраного повідомлення.",
-    "Draft saved!" : "Чернетку збережено!",
     "Choose a file to add as attachment" : "Обрати файл для вкладення",
     "Reply" : "Відповісти",
     "Send" : "Надіслати",
@@ -27,10 +27,13 @@ OC.L10N.register(
     "Server error" : "Помилка серверу",
     "you" : "ви",
     "Send message to {email}" : "Надіслати повідомлення {email}",
-    "Error while deleting message." : "Помилка видалення повідомлення.",
+    "Checking messages" : "Перевірка повідомлень",
     "Loading …" : "Завантаження...",
     "Load more …" : "Завантажити ще ...",
+    "Check messages" : "Перевірити повідомлення",
+    "Error while deleting message." : "Помилка видалення повідомлення.",
     "Error while deleting account." : "Помилка при видалені облікового запису.",
+    "Connecting" : "Підключення",
     "Connect" : "З'єднати",
     "Inbox" : "Вхідні",
     "Sent" : "Надіслані",
@@ -48,6 +51,9 @@ OC.L10N.register(
     "Error loading message" : "Помилка завантаження повідомлення.",
     "New message" : "Нове повідомлення",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Перенаправлення вас на %s - натисніть тут, якщо ви не будете автоматично перенаправлені в найближчі кілька секунд.",
-    "If you do not want to visit that page, you can return to <a href=\"%s\">the mail app</a>." : "Якщо ви не бажаєте відвідувати цю сторінку, ви можете повернутися до <a href=\"%s\">поштового додатку</a>."
+    "Redirect warning" : "Попередження перенаправлення",
+    "The previous page is sending you to %s" : "Попередня сторінка була надіслана вам за %s",
+    "If you do not want to visit that page, you can return to <a href=\"%s\">the mail app</a>." : "Якщо ви не бажаєте відвідувати цю сторінку, ви можете повернутися до <a href=\"%s\">поштового додатку</a>.",
+    "Continue to %s" : "Подовження за %s"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/l10n/uk.json b/l10n/uk.json
index 86b3522da..b7c9388e7 100644
--- a/l10n/uk.json
+++ b/l10n/uk.json
@@ -7,6 +7,7 @@
     "Message could not be starred. Please try again." : "Не вдалося відмітити повідомлення. Будь ласка, спробуйте ще раз.",
     "Unknown error" : "Невідома помилка",
     "Error while creating an account: " : "Помилка при створенні облікового запису:",
+    "Draft saved!" : "Чернетку збережено!",
     "Error while loading messages." : "Помилка завантаження повідомлень.",
     "Choose a folder to store the attachment in" : "Оберіть теку для зберігання вкладень",
     "Attachments saved to Files." : "Вкладення збережені до Файлів.",
@@ -16,7 +17,6 @@
     "Opening HTML drafts is not supported yet." : "Відкриті HTML чернетки поки не підтримуються.",
     "Forwarded message" : "Пререадресоване повідомлення",
     "Error while loading the selected message." : "Помилка завантаження обраного повідомлення.",
-    "Draft saved!" : "Чернетку збережено!",
     "Choose a file to add as attachment" : "Обрати файл для вкладення",
     "Reply" : "Відповісти",
     "Send" : "Надіслати",
@@ -25,10 +25,13 @@
     "Server error" : "Помилка серверу",
     "you" : "ви",
     "Send message to {email}" : "Надіслати повідомлення {email}",
-    "Error while deleting message." : "Помилка видалення повідомлення.",
+    "Checking messages" : "Перевірка повідомлень",
     "Loading …" : "Завантаження...",
     "Load more …" : "Завантажити ще ...",
+    "Check messages" : "Перевірити повідомлення",
+    "Error while deleting message." : "Помилка видалення повідомлення.",
     "Error while deleting account." : "Помилка при видалені облікового запису.",
+    "Connecting" : "Підключення",
     "Connect" : "З'єднати",
     "Inbox" : "Вхідні",
     "Sent" : "Надіслані",
@@ -46,6 +49,9 @@
     "Error loading message" : "Помилка завантаження повідомлення.",
     "New message" : "Нове повідомлення",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Перенаправлення вас на %s - натисніть тут, якщо ви не будете автоматично перенаправлені в найближчі кілька секунд.",
-    "If you do not want to visit that page, you can return to <a href=\"%s\">the mail app</a>." : "Якщо ви не бажаєте відвідувати цю сторінку, ви можете повернутися до <a href=\"%s\">поштового додатку</a>."
+    "Redirect warning" : "Попередження перенаправлення",
+    "The previous page is sending you to %s" : "Попередня сторінка була надіслана вам за %s",
+    "If you do not want to visit that page, you can return to <a href=\"%s\">the mail app</a>." : "Якщо ви не бажаєте відвідувати цю сторінку, ви можете повернутися до <a href=\"%s\">поштового додатку</a>.",
+    "Continue to %s" : "Подовження за %s"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/l10n/zh_CN.js b/l10n/zh_CN.js
index e0c1d2eab..65e34bd44 100644
--- a/l10n/zh_CN.js
+++ b/l10n/zh_CN.js
@@ -1,13 +1,15 @@
 OC.L10N.register(
     "mail",
     {
-    "Mail" : "电邮",
+    "Mail" : "邮箱",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["发自{from}的%n份电邮保存在{folderName}中"],
     "Error while loading the accounts." : "载入账户时出错。",
     "Error while loading the selected account." : "指定账户载入时出错。",
+    "Message could not be starred. Please try again." : "无法加注星标，请重试。",
     "Unknown error" : "未知错误",
     "Error while creating an account: " : "创建账户时出错：",
+    "Draft saved!" : "草稿已保存！",
     "Error while loading messages." : "载入电邮时发生错误。",
     "Choose a folder to store the attachment in" : "选择附件保存的目录",
     "Attachments saved to Files." : "附件已保存。",
@@ -17,24 +19,24 @@ OC.L10N.register(
     "Opening HTML drafts is not supported yet." : "暂时未能打开HTML格式的草稿，请见谅。",
     "Forwarded message" : "电邮已转发。",
     "Error while loading the selected message." : "指定邮件加载时发生错误。",
-    "Draft saved!" : "草稿已保存！",
     "Choose a file to add as attachment" : "选择文件添加为附件",
     "Reply" : "回复",
     "Send" : "发送",
     "Sending …" : "正在发送…",
-    "Message sent!" : "电邮已发送！",
+    "Message sent!" : "邮件已发送！",
     "Server error" : "服务器错误",
-    "Send message to {email}" : "电邮发送至{email}",
-    "Error while deleting message." : "删除邮件时出错。",
-    "Checking messages" : "正在查收邮件",
+    "you" : "你",
+    "Send message to {email}" : "发送邮件至{email}",
+    "Checking messages" : "正在检查邮件",
     "Loading …" : "加载中...",
     "Load more …" : "加载更多…",
     "Check messages" : "检查邮件",
+    "Error while deleting message." : "删除邮件时出错。",
     "Error while deleting account." : "删除账户时出错",
     "Connecting" : "正在连接",
     "Connect" : "连接",
     "Inbox" : "收件箱",
-    "Sent" : "发送",
+    "Sent" : "发出的邮件",
     "Drafts" : "草稿",
     "Archive" : "归档",
     "Trash" : "废纸篓",
@@ -44,12 +46,14 @@ OC.L10N.register(
     "Creating account failed: " : "未能创建账户：",
     "Auto detect failed. Please use manual mode." : "自动检测失败，请使用手动模式。",
     "Delete permanently" : "永久删除",
+    "& others" : "和其他",
     "All inboxes" : "所有目录",
     "Error loading message" : "载入电邮时发生错误",
     "New message" : "写信",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "正在跳转至%s，如果无法成功跳转，请点击这里。",
     "Redirect warning" : "跳转提示",
-    "The previous page is sending you to %s" : "亲，刚才的页面准备把你传送到%s",
-    "If you do not want to visit that page, you can return to <a href=\"%s\">the mail app</a>." : "亲，如果不想前往该页面，请返回<a href=\"%s\">电邮</a>哈！"
+    "The previous page is sending you to %s" : "之前的页面把你带到了 %s",
+    "If you do not want to visit that page, you can return to <a href=\"%s\">the mail app</a>." : "如不您不想访问该页面，请返回<a href=\"%s\">邮件系统</a>。",
+    "Continue to %s" : "继续 %s"
 },
 "nplurals=1; plural=0;");
diff --git a/l10n/zh_CN.json b/l10n/zh_CN.json
index 0ba49be7c..633345547 100644
--- a/l10n/zh_CN.json
+++ b/l10n/zh_CN.json
@@ -1,11 +1,13 @@
 { "translations": {
-    "Mail" : "电邮",
+    "Mail" : "邮箱",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["发自{from}的%n份电邮保存在{folderName}中"],
     "Error while loading the accounts." : "载入账户时出错。",
     "Error while loading the selected account." : "指定账户载入时出错。",
+    "Message could not be starred. Please try again." : "无法加注星标，请重试。",
     "Unknown error" : "未知错误",
     "Error while creating an account: " : "创建账户时出错：",
+    "Draft saved!" : "草稿已保存！",
     "Error while loading messages." : "载入电邮时发生错误。",
     "Choose a folder to store the attachment in" : "选择附件保存的目录",
     "Attachments saved to Files." : "附件已保存。",
@@ -15,24 +17,24 @@
     "Opening HTML drafts is not supported yet." : "暂时未能打开HTML格式的草稿，请见谅。",
     "Forwarded message" : "电邮已转发。",
     "Error while loading the selected message." : "指定邮件加载时发生错误。",
-    "Draft saved!" : "草稿已保存！",
     "Choose a file to add as attachment" : "选择文件添加为附件",
     "Reply" : "回复",
     "Send" : "发送",
     "Sending …" : "正在发送…",
-    "Message sent!" : "电邮已发送！",
+    "Message sent!" : "邮件已发送！",
     "Server error" : "服务器错误",
-    "Send message to {email}" : "电邮发送至{email}",
-    "Error while deleting message." : "删除邮件时出错。",
-    "Checking messages" : "正在查收邮件",
+    "you" : "你",
+    "Send message to {email}" : "发送邮件至{email}",
+    "Checking messages" : "正在检查邮件",
     "Loading …" : "加载中...",
     "Load more …" : "加载更多…",
     "Check messages" : "检查邮件",
+    "Error while deleting message." : "删除邮件时出错。",
     "Error while deleting account." : "删除账户时出错",
     "Connecting" : "正在连接",
     "Connect" : "连接",
     "Inbox" : "收件箱",
-    "Sent" : "发送",
+    "Sent" : "发出的邮件",
     "Drafts" : "草稿",
     "Archive" : "归档",
     "Trash" : "废纸篓",
@@ -42,12 +44,14 @@
     "Creating account failed: " : "未能创建账户：",
     "Auto detect failed. Please use manual mode." : "自动检测失败，请使用手动模式。",
     "Delete permanently" : "永久删除",
+    "& others" : "和其他",
     "All inboxes" : "所有目录",
     "Error loading message" : "载入电邮时发生错误",
     "New message" : "写信",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "正在跳转至%s，如果无法成功跳转，请点击这里。",
     "Redirect warning" : "跳转提示",
-    "The previous page is sending you to %s" : "亲，刚才的页面准备把你传送到%s",
-    "If you do not want to visit that page, you can return to <a href=\"%s\">the mail app</a>." : "亲，如果不想前往该页面，请返回<a href=\"%s\">电邮</a>哈！"
+    "The previous page is sending you to %s" : "之前的页面把你带到了 %s",
+    "If you do not want to visit that page, you can return to <a href=\"%s\">the mail app</a>." : "如不您不想访问该页面，请返回<a href=\"%s\">邮件系统</a>。",
+    "Continue to %s" : "继续 %s"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/l10n/zh_TW.js b/l10n/zh_TW.js
index c60bd4229..2afcdf68b 100644
--- a/l10n/zh_TW.js
+++ b/l10n/zh_TW.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Message could not be starred. Please try again." : "無法為訊息加上星號，請再試一次",
     "Unknown error" : "未知的錯誤",
     "Error while creating an account: " : "建立帳號時發生錯誤：",
+    "Draft saved!" : "草稿已儲存！",
     "Error while loading messages." : "載入訊息時發生錯誤",
     "Choose a folder to store the attachment in" : "選擇目錄供附件存放",
     "Attachments saved to Files." : "附件已儲存至檔案",
@@ -18,7 +19,6 @@ OC.L10N.register(
     "Opening HTML drafts is not supported yet." : "目前尚未支援開啟 HTML 草稿",
     "Forwarded message" : "轉寄訊息",
     "Error while loading the selected message." : "載入選擇的訊息時發生錯誤",
-    "Draft saved!" : "草稿已儲存！",
     "Choose a file to add as attachment" : "選擇檔案作為附件",
     "Reply" : "回覆",
     "Send" : "寄出",
@@ -27,11 +27,11 @@ OC.L10N.register(
     "Server error" : "伺服器錯誤",
     "you" : "您",
     "Send message to {email}" : "送訊息給 {email}",
-    "Error while deleting message." : "刪除訊息時發生錯誤",
     "Checking messages" : "檢查訊息…",
     "Loading …" : "載入…",
     "Load more …" : "載入更多…",
     "Check messages" : "檢查訊息",
+    "Error while deleting message." : "刪除訊息時發生錯誤",
     "Error while deleting account." : "刪除帳號時發生錯誤",
     "Connecting" : "連線中",
     "Connect" : "連線",
diff --git a/l10n/zh_TW.json b/l10n/zh_TW.json
index d02624777..6198a7641 100644
--- a/l10n/zh_TW.json
+++ b/l10n/zh_TW.json
@@ -7,6 +7,7 @@
     "Message could not be starred. Please try again." : "無法為訊息加上星號，請再試一次",
     "Unknown error" : "未知的錯誤",
     "Error while creating an account: " : "建立帳號時發生錯誤：",
+    "Draft saved!" : "草稿已儲存！",
     "Error while loading messages." : "載入訊息時發生錯誤",
     "Choose a folder to store the attachment in" : "選擇目錄供附件存放",
     "Attachments saved to Files." : "附件已儲存至檔案",
@@ -16,7 +17,6 @@
     "Opening HTML drafts is not supported yet." : "目前尚未支援開啟 HTML 草稿",
     "Forwarded message" : "轉寄訊息",
     "Error while loading the selected message." : "載入選擇的訊息時發生錯誤",
-    "Draft saved!" : "草稿已儲存！",
     "Choose a file to add as attachment" : "選擇檔案作為附件",
     "Reply" : "回覆",
     "Send" : "寄出",
@@ -25,11 +25,11 @@
     "Server error" : "伺服器錯誤",
     "you" : "您",
     "Send message to {email}" : "送訊息給 {email}",
-    "Error while deleting message." : "刪除訊息時發生錯誤",
     "Checking messages" : "檢查訊息…",
     "Loading …" : "載入…",
     "Load more …" : "載入更多…",
     "Check messages" : "檢查訊息",
+    "Error while deleting message." : "刪除訊息時發生錯誤",
     "Error while deleting account." : "刪除帳號時發生錯誤",
     "Connecting" : "連線中",
     "Connect" : "連線",