[tx-robot] updated from transifex

60 files changed, 984 insertions, 926 deletions

diff --git a/l10n/ast.js b/l10n/ast.js
index cf246fbfd..e1390ad0c 100644
--- a/l10n/ast.js
+++ b/l10n/ast.js
@@ -3,6 +3,11 @@ OC.L10N.register(
     {
     "Mail" : "Corréu",
     "Error while loading the accounts." : "Fallu mientres se cargaben les cuentes",
+    "Connecting …" : "Coneutando …",
+    "Unknown error" : "Fallu desconocíu",
+    "Error while creating an account: " : "Fallu creando la cuenta",
+    "Connect" : "Coneutar",
+    "Message could not be starred. Please try again." : "El mensaxe nun se puede marcar como favoritu. Inténtalo más tarde.",
     "Error while loading the selected account." : "Fallu cargando la cuenta esbillada",
     "Error while loading messages." : "Fallu cargando mensaxes",
     "Choose a folder to store the attachment in" : "Escueyi una carpeta pa guardar l'axuntu",
@@ -11,20 +16,15 @@ OC.L10N.register(
     "Error while saving attachments to Files." : "Fallu al guardar los ficheros axuntos en Ficheros.",
     "Error while saving attachment to Files." : "Fallu al guardar el ficheru axuntu en Ficheros.",
     "Error while loading the selected message." : "Fallu cargando'l mensaxe esbilláu",
-    "Connecting …" : "Coneutando …",
-    "Unknown error" : "Fallu desconocíu",
-    "Error while creating an account: " : "Fallu creando la cuenta",
-    "Connect" : "Coneutar",
-    "Error while deleting account." : "Fallu desaniciando la cuenta",
     "Choose a file to add as attachment" : "Escueyi un ficheru p'amestalu como axuntu",
     "Reply" : "Rempuesta",
     "Send" : "Unviar",
     "Sending …" : "Unviando...",
     "you" : "tu",
-    "Message could not be starred. Please try again." : "El mensaxe nun se puede marcar como favoritu. Inténtalo más tarde.",
     "Error while deleting message." : "Fallu desaniciando'l mensaxe",
     "Loading …" : "Cargando ...",
     "Load more …" : "Cargar más …",
+    "Error while deleting account." : "Fallu desaniciando la cuenta",
     "Inbox" : "Bandexa d'entrada",
     "Sent" : "Unvíos",
     "Drafts" : "Borradores",
@@ -47,12 +47,6 @@ OC.L10N.register(
     "Back to website" : "Tornar al sitiu web",
     "Add attachment from Files" : "Amestar axuntos dende Ficheros",
     "Error loading message" : "Fallu cargando mensaxe",
-    "Download attachment" : "Descargar axuntu",
-    "Save to Files" : "Guardar en Ficheros",
-    "Save all to Files" : "Guardar too en Ficheros",
-    "Forward" : "Reunviar",
-    "Delete" : "Desaniciar",
-    "No messages in this folder!" : "¡Nun hai mensaxes nesta carpeta!",
     "Connect your mail account" : "Coneuta la to cuenta de corréu",
     "Name" : "Nome",
     "Mail Address" : "Direición de corréu",
@@ -66,6 +60,12 @@ OC.L10N.register(
     "SMTP Port" : "Puertu SMTP",
     "SMTP User" : "Usuariu SMTP",
     "SMTP Password" : "Contraseña SMTP",
+    "Download attachment" : "Descargar axuntu",
+    "Save to Files" : "Guardar en Ficheros",
+    "Save all to Files" : "Guardar too en Ficheros",
+    "Forward" : "Reunviar",
+    "Delete" : "Desaniciar",
+    "No messages in this folder!" : "¡Nun hai mensaxes nesta carpeta!",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Redirixéndote a %s - calca equí si nun te redirixe automáticamente nunos segundos.",
     "Redirect Warning" : "Avisu de Redireición",
     "The previous page is sending you to %s." : "La páxina anterior ta dirixiéndote a %s.",
diff --git a/l10n/ast.json b/l10n/ast.json
index 580f6f08b..8ecd5db60 100644
--- a/l10n/ast.json
+++ b/l10n/ast.json
@@ -1,6 +1,11 @@
 { "translations": {
     "Mail" : "Corréu",
     "Error while loading the accounts." : "Fallu mientres se cargaben les cuentes",
+    "Connecting …" : "Coneutando …",
+    "Unknown error" : "Fallu desconocíu",
+    "Error while creating an account: " : "Fallu creando la cuenta",
+    "Connect" : "Coneutar",
+    "Message could not be starred. Please try again." : "El mensaxe nun se puede marcar como favoritu. Inténtalo más tarde.",
     "Error while loading the selected account." : "Fallu cargando la cuenta esbillada",
     "Error while loading messages." : "Fallu cargando mensaxes",
     "Choose a folder to store the attachment in" : "Escueyi una carpeta pa guardar l'axuntu",
@@ -9,20 +14,15 @@
     "Error while saving attachments to Files." : "Fallu al guardar los ficheros axuntos en Ficheros.",
     "Error while saving attachment to Files." : "Fallu al guardar el ficheru axuntu en Ficheros.",
     "Error while loading the selected message." : "Fallu cargando'l mensaxe esbilláu",
-    "Connecting …" : "Coneutando …",
-    "Unknown error" : "Fallu desconocíu",
-    "Error while creating an account: " : "Fallu creando la cuenta",
-    "Connect" : "Coneutar",
-    "Error while deleting account." : "Fallu desaniciando la cuenta",
     "Choose a file to add as attachment" : "Escueyi un ficheru p'amestalu como axuntu",
     "Reply" : "Rempuesta",
     "Send" : "Unviar",
     "Sending …" : "Unviando...",
     "you" : "tu",
-    "Message could not be starred. Please try again." : "El mensaxe nun se puede marcar como favoritu. Inténtalo más tarde.",
     "Error while deleting message." : "Fallu desaniciando'l mensaxe",
     "Loading …" : "Cargando ...",
     "Load more …" : "Cargar más …",
+    "Error while deleting account." : "Fallu desaniciando la cuenta",
     "Inbox" : "Bandexa d'entrada",
     "Sent" : "Unvíos",
     "Drafts" : "Borradores",
@@ -45,12 +45,6 @@
     "Back to website" : "Tornar al sitiu web",
     "Add attachment from Files" : "Amestar axuntos dende Ficheros",
     "Error loading message" : "Fallu cargando mensaxe",
-    "Download attachment" : "Descargar axuntu",
-    "Save to Files" : "Guardar en Ficheros",
-    "Save all to Files" : "Guardar too en Ficheros",
-    "Forward" : "Reunviar",
-    "Delete" : "Desaniciar",
-    "No messages in this folder!" : "¡Nun hai mensaxes nesta carpeta!",
     "Connect your mail account" : "Coneuta la to cuenta de corréu",
     "Name" : "Nome",
     "Mail Address" : "Direición de corréu",
@@ -64,6 +58,12 @@
     "SMTP Port" : "Puertu SMTP",
     "SMTP User" : "Usuariu SMTP",
     "SMTP Password" : "Contraseña SMTP",
+    "Download attachment" : "Descargar axuntu",
+    "Save to Files" : "Guardar en Ficheros",
+    "Save all to Files" : "Guardar too en Ficheros",
+    "Forward" : "Reunviar",
+    "Delete" : "Desaniciar",
+    "No messages in this folder!" : "¡Nun hai mensaxes nesta carpeta!",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Redirixéndote a %s - calca equí si nun te redirixe automáticamente nunos segundos.",
     "Redirect Warning" : "Avisu de Redireición",
     "The previous page is sending you to %s." : "La páxina anterior ta dirixiéndote a %s.",
diff --git a/l10n/az.js b/l10n/az.js
index 3110c3c0d..647789baf 100644
--- a/l10n/az.js
+++ b/l10n/az.js
@@ -3,6 +3,11 @@ OC.L10N.register(
     {
     "Mail" : "Məktub",
     "Error while loading the accounts." : "Hesabların yüklənməsi müddətində səhv baş verdi",
+    "Connecting …" : "Qoşulur...",
+    "Unknown error" : "Bəlli olmayan səhv baş verdi",
+    "Error while creating an account: " : "Hesabın yaraılması müddətində səhv baş verdi: ",
+    "Connect" : "Qoşul",
+    "Message could not be starred. Please try again." : "Mesaj götürülə bilmir. Xahiş olunur yenidən təkrar edəsiniz.",
     "Error while loading the selected account." : "Seçilmiş hesabın yüklənməsində səhv baş verdi",
     "Error while loading messages." : "Mesajların yüklənməsi müddətində səhv baş verdi.",
     "Choose a folder to store the attachment in" : "Əlavələrin saxlanılması üçün qovluğu seçin",
@@ -11,20 +16,15 @@ OC.L10N.register(
     "Error while saving attachments to Files." : "Məktub əlavəsinin fayllarda saxlanılması zamanı səhv baş verdi.",
     "Error while saving attachment to Files." : "Məktun əlavələrinin fayllarda saxlanılması zamanl səhv baş verdi.",
     "Error while loading the selected message." : "Seçilmiş mesajın yüklənməsi müddətində səhv baş verdi.",
-    "Connecting …" : "Qoşulur...",
-    "Unknown error" : "Bəlli olmayan səhv baş verdi",
-    "Error while creating an account: " : "Hesabın yaraılması müddətində səhv baş verdi: ",
-    "Connect" : "Qoşul",
-    "Error while deleting account." : "Hesabın silinməsində səhv baş verdi.",
     "Choose a file to add as attachment" : "Əlavə ediləcək faylı seçin",
     "Reply" : "Cavab",
     "Send" : "Göndər",
     "Sending …" : "Göndərilir...",
     "you" : "siz",
-    "Message could not be starred. Please try again." : "Mesaj götürülə bilmir. Xahiş olunur yenidən təkrar edəsiniz.",
     "Error while deleting message." : "Mesajın silinməsində səhv baş verdi.",
     "Loading …" : "Yüklənir...",
     "Load more …" : "Çoxlu yüklə ...",
+    "Error while deleting account." : "Hesabın silinməsində səhv baş verdi.",
     "Inbox" : "Gələn qutusu",
     "Sent" : "Göndərildi",
     "Drafts" : "Qaralamalar",
@@ -47,12 +47,6 @@ OC.L10N.register(
     "Back to website" : "website-a qayıt",
     "Add attachment from Files" : "Fayllardan əlavəni et",
     "Error loading message" : "Mesajın yüklənməsində səhv baş verdi",
-    "Download attachment" : "Əlavəni endir",
-    "Save to Files" : "Fayllarda saxla",
-    "Save all to Files" : "Hər şeyi fayllarda saxla",
-    "Forward" : "Yönləndir",
-    "Delete" : "Sil",
-    "No messages in this folder!" : "Bu qovluqda heç bir mesaj yoxdur!",
     "Connect your mail account" : "Mail hesabınızı qoşun",
     "Name" : "Ad",
     "Mail Address" : "Mail ünvanı",
@@ -66,6 +60,12 @@ OC.L10N.register(
     "SMTP Port" : "SMTP Port",
     "SMTP User" : "SMTP İstifadəçi",
     "SMTP Password" : "SMTP Şifrəsi",
+    "Download attachment" : "Əlavəni endir",
+    "Save to Files" : "Fayllarda saxla",
+    "Save all to Files" : "Hər şeyi fayllarda saxla",
+    "Forward" : "Yönləndir",
+    "Delete" : "Sil",
+    "No messages in this folder!" : "Bu qovluqda heç bir mesaj yoxdur!",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Siz yönləndirilirsiniz %s - əgər növbəti bir neçə saniyədə yönləndirilməsəniz buraya sıxın.",
     "Redirect Warning" : "Yönləndirmə xəbərdarlığı",
     "The previous page is sending you to %s." : "Öncəki səhifə sizi %s-ə yollayır.",
diff --git a/l10n/az.json b/l10n/az.json
index e1cdb7f9d..b7df2d893 100644
--- a/l10n/az.json
+++ b/l10n/az.json
@@ -1,6 +1,11 @@
 { "translations": {
     "Mail" : "Məktub",
     "Error while loading the accounts." : "Hesabların yüklənməsi müddətində səhv baş verdi",
+    "Connecting …" : "Qoşulur...",
+    "Unknown error" : "Bəlli olmayan səhv baş verdi",
+    "Error while creating an account: " : "Hesabın yaraılması müddətində səhv baş verdi: ",
+    "Connect" : "Qoşul",
+    "Message could not be starred. Please try again." : "Mesaj götürülə bilmir. Xahiş olunur yenidən təkrar edəsiniz.",
     "Error while loading the selected account." : "Seçilmiş hesabın yüklənməsində səhv baş verdi",
     "Error while loading messages." : "Mesajların yüklənməsi müddətində səhv baş verdi.",
     "Choose a folder to store the attachment in" : "Əlavələrin saxlanılması üçün qovluğu seçin",
@@ -9,20 +14,15 @@
     "Error while saving attachments to Files." : "Məktub əlavəsinin fayllarda saxlanılması zamanı səhv baş verdi.",
     "Error while saving attachment to Files." : "Məktun əlavələrinin fayllarda saxlanılması zamanl səhv baş verdi.",
     "Error while loading the selected message." : "Seçilmiş mesajın yüklənməsi müddətində səhv baş verdi.",
-    "Connecting …" : "Qoşulur...",
-    "Unknown error" : "Bəlli olmayan səhv baş verdi",
-    "Error while creating an account: " : "Hesabın yaraılması müddətində səhv baş verdi: ",
-    "Connect" : "Qoşul",
-    "Error while deleting account." : "Hesabın silinməsində səhv baş verdi.",
     "Choose a file to add as attachment" : "Əlavə ediləcək faylı seçin",
     "Reply" : "Cavab",
     "Send" : "Göndər",
     "Sending …" : "Göndərilir...",
     "you" : "siz",
-    "Message could not be starred. Please try again." : "Mesaj götürülə bilmir. Xahiş olunur yenidən təkrar edəsiniz.",
     "Error while deleting message." : "Mesajın silinməsində səhv baş verdi.",
     "Loading …" : "Yüklənir...",
     "Load more …" : "Çoxlu yüklə ...",
+    "Error while deleting account." : "Hesabın silinməsində səhv baş verdi.",
     "Inbox" : "Gələn qutusu",
     "Sent" : "Göndərildi",
     "Drafts" : "Qaralamalar",
@@ -45,12 +45,6 @@
     "Back to website" : "website-a qayıt",
     "Add attachment from Files" : "Fayllardan əlavəni et",
     "Error loading message" : "Mesajın yüklənməsində səhv baş verdi",
-    "Download attachment" : "Əlavəni endir",
-    "Save to Files" : "Fayllarda saxla",
-    "Save all to Files" : "Hər şeyi fayllarda saxla",
-    "Forward" : "Yönləndir",
-    "Delete" : "Sil",
-    "No messages in this folder!" : "Bu qovluqda heç bir mesaj yoxdur!",
     "Connect your mail account" : "Mail hesabınızı qoşun",
     "Name" : "Ad",
     "Mail Address" : "Mail ünvanı",
@@ -64,6 +58,12 @@
     "SMTP Port" : "SMTP Port",
     "SMTP User" : "SMTP İstifadəçi",
     "SMTP Password" : "SMTP Şifrəsi",
+    "Download attachment" : "Əlavəni endir",
+    "Save to Files" : "Fayllarda saxla",
+    "Save all to Files" : "Hər şeyi fayllarda saxla",
+    "Forward" : "Yönləndir",
+    "Delete" : "Sil",
+    "No messages in this folder!" : "Bu qovluqda heç bir mesaj yoxdur!",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Siz yönləndirilirsiniz %s - əgər növbəti bir neçə saniyədə yönləndirilməsəniz buraya sıxın.",
     "Redirect Warning" : "Yönləndirmə xəbərdarlığı",
     "The previous page is sending you to %s." : "Öncəki səhifə sizi %s-ə yollayır.",
diff --git a/l10n/bg_BG.js b/l10n/bg_BG.js
index dc3503f4d..fdc8ff4ca 100644
--- a/l10n/bg_BG.js
+++ b/l10n/bg_BG.js
@@ -3,6 +3,11 @@ OC.L10N.register(
     {
     "Mail" : "Поща",
     "Error while loading the accounts." : "Грешка при зареждането на профилите.",
+    "Connecting …" : "Свързване ...",
+    "Unknown error" : "Непозната грешка",
+    "Error while creating an account: " : "Грешка при създаване на профил:",
+    "Connect" : "Свържи",
+    "Message could not be starred. Please try again." : "Неуспешно маркиране на съобщението като любимо. Моля, опитай отново.",
     "Error while loading the selected account." : "Грешка при зареждането на избрания профил.",
     "Error while loading messages." : "Грешка при зареждане на съобщенията.",
     "Choose a folder to store the attachment in" : "Избери папка, където да бъде запазен прикаченият файл",
@@ -11,20 +16,15 @@ OC.L10N.register(
     "Error while saving attachments to Files." : "Грешка при запазване на прикачените файлове във Файлове.",
     "Error while saving attachment to Files." : "Грешка при запазване на прикаченият файл във Файлове.",
     "Error while loading the selected message." : "Грешка при зареждане на избраното съобщение.",
-    "Connecting …" : "Свързване ...",
-    "Unknown error" : "Непозната грешка",
-    "Error while creating an account: " : "Грешка при създаване на профил:",
-    "Connect" : "Свържи",
-    "Error while deleting account." : "Грешка при изтриването на профил.",
     "Choose a file to add as attachment" : "Избери файл за прикачване",
     "Reply" : "Отговори",
     "Send" : "Изпрати",
     "Sending …" : "Изпращане...",
     "you" : "ти",
-    "Message could not be starred. Please try again." : "Неуспешно маркиране на съобщението като любимо. Моля, опитай отново.",
     "Error while deleting message." : "Грешка при изтриването на съобщение.",
     "Loading …" : "Зареждане ...",
     "Load more …" : "Зареди повече ...",
+    "Error while deleting account." : "Грешка при изтриването на профил.",
     "Inbox" : "Входяши",
     "Sent" : "Изпратени",
     "Drafts" : "Чернови",
@@ -47,12 +47,6 @@ OC.L10N.register(
     "Back to website" : "Обратно към сайта",
     "Add attachment from Files" : "Добави прикачен файл от Файлове",
     "Error loading message" : "Грешка при зареждане съобщението",
-    "Download attachment" : "Изтегли прикачения файл",
-    "Save to Files" : "Запази във Файлове",
-    "Save all to Files" : "Запази всички във Файлове",
-    "Forward" : "Препрати",
-    "Delete" : "Изтриване",
-    "No messages in this folder!" : "Няма съобщение в тази папка!",
     "New message" : "Ново Съобщение",
     "Connect your mail account" : "Свържи имейла си",
     "Name" : "Име",
@@ -68,6 +62,12 @@ OC.L10N.register(
     "SMTP Port (default 25, ssl 465)" : "SMTP Port (по подразбиране 25, с ssl 465)",
     "SMTP User" : "SMTP Потребител",
     "SMTP Password" : "SMTP Парола",
+    "Download attachment" : "Изтегли прикачения файл",
+    "Save to Files" : "Запази във Файлове",
+    "Save all to Files" : "Запази всички във Файлове",
+    "Forward" : "Препрати",
+    "Delete" : "Изтриване",
+    "No messages in this folder!" : "Няма съобщение в тази папка!",
     "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.",
diff --git a/l10n/bg_BG.json b/l10n/bg_BG.json
index 7bba52e29..53b247873 100644
--- a/l10n/bg_BG.json
+++ b/l10n/bg_BG.json
@@ -1,6 +1,11 @@
 { "translations": {
     "Mail" : "Поща",
     "Error while loading the accounts." : "Грешка при зареждането на профилите.",
+    "Connecting …" : "Свързване ...",
+    "Unknown error" : "Непозната грешка",
+    "Error while creating an account: " : "Грешка при създаване на профил:",
+    "Connect" : "Свържи",
+    "Message could not be starred. Please try again." : "Неуспешно маркиране на съобщението като любимо. Моля, опитай отново.",
     "Error while loading the selected account." : "Грешка при зареждането на избрания профил.",
     "Error while loading messages." : "Грешка при зареждане на съобщенията.",
     "Choose a folder to store the attachment in" : "Избери папка, където да бъде запазен прикаченият файл",
@@ -9,20 +14,15 @@
     "Error while saving attachments to Files." : "Грешка при запазване на прикачените файлове във Файлове.",
     "Error while saving attachment to Files." : "Грешка при запазване на прикаченият файл във Файлове.",
     "Error while loading the selected message." : "Грешка при зареждане на избраното съобщение.",
-    "Connecting …" : "Свързване ...",
-    "Unknown error" : "Непозната грешка",
-    "Error while creating an account: " : "Грешка при създаване на профил:",
-    "Connect" : "Свържи",
-    "Error while deleting account." : "Грешка при изтриването на профил.",
     "Choose a file to add as attachment" : "Избери файл за прикачване",
     "Reply" : "Отговори",
     "Send" : "Изпрати",
     "Sending …" : "Изпращане...",
     "you" : "ти",
-    "Message could not be starred. Please try again." : "Неуспешно маркиране на съобщението като любимо. Моля, опитай отново.",
     "Error while deleting message." : "Грешка при изтриването на съобщение.",
     "Loading …" : "Зареждане ...",
     "Load more …" : "Зареди повече ...",
+    "Error while deleting account." : "Грешка при изтриването на профил.",
     "Inbox" : "Входяши",
     "Sent" : "Изпратени",
     "Drafts" : "Чернови",
@@ -45,12 +45,6 @@
     "Back to website" : "Обратно към сайта",
     "Add attachment from Files" : "Добави прикачен файл от Файлове",
     "Error loading message" : "Грешка при зареждане съобщението",
-    "Download attachment" : "Изтегли прикачения файл",
-    "Save to Files" : "Запази във Файлове",
-    "Save all to Files" : "Запази всички във Файлове",
-    "Forward" : "Препрати",
-    "Delete" : "Изтриване",
-    "No messages in this folder!" : "Няма съобщение в тази папка!",
     "New message" : "Ново Съобщение",
     "Connect your mail account" : "Свържи имейла си",
     "Name" : "Име",
@@ -66,6 +60,12 @@
     "SMTP Port (default 25, ssl 465)" : "SMTP Port (по подразбиране 25, с ssl 465)",
     "SMTP User" : "SMTP Потребител",
     "SMTP Password" : "SMTP Парола",
+    "Download attachment" : "Изтегли прикачения файл",
+    "Save to Files" : "Запази във Файлове",
+    "Save all to Files" : "Запази всички във Файлове",
+    "Forward" : "Препрати",
+    "Delete" : "Изтриване",
+    "No messages in this folder!" : "Няма съобщение в тази папка!",
     "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.",
diff --git a/l10n/cs_CZ.js b/l10n/cs_CZ.js
index 4ec9019f7..faddd66e0 100644
--- a/l10n/cs_CZ.js
+++ b/l10n/cs_CZ.js
@@ -2,9 +2,14 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Pošta",
-    "Error while loading the accounts." : "Chyba při načítání účtů.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n nová zpráva v {folderName} \nod {from}","%n nové zprávy v {folderName} \nod {from}","%n nových zpráv v {folderName} \nod {from}"],
+    "Error while loading the accounts." : "Chyba při načítání účtů.",
+    "Connecting …" : "Připojuji ...",
+    "Unknown error" : "Neznámá chyba",
+    "Error while creating an account: " : "Chyba při vytváření účtu:",
+    "Connect" : "Připojit",
+    "Message could not be starred. Please try again." : "Zpráva nemohla být označena hvězdičkou. Zkuste to prosím znovu.",
     "Error while loading the selected account." : "Chyba během načítání vybraného účtu.",
     "Error while loading messages." : "Chyba během načítání zpráv.",
     "Choose a folder to store the attachment in" : "Vyber adresář pro uložení přílohy",
@@ -16,24 +21,20 @@ OC.L10N.register(
     "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!",
-    "Connecting …" : "Připojuji ...",
-    "Unknown error" : "Neznámá chyba",
-    "Error while creating an account: " : "Chyba při vytváření účtu:",
-    "Connect" : "Připojit",
-    "Error while deleting account." : "Chyba při mazání účtu.",
     "Choose a file to add as attachment" : "Vyberte soubor k přiložení",
     "Reply" : "Odpověď",
     "Send" : "Odeslat",
     "Sending …" : "Odesílám ...",
     "Message sent!" : "Zpráva odeslána!",
+    "Server error" : "Chyba serveru",
     "you" : "vy",
     "Send message to {email}" : "Poslat email na {email}",
-    "Message could not be starred. Please try again." : "Zpráva nemohla být označena hvězdičkou. Zkuste to prosím znovu.",
     "Error while deleting message." : "Chyba při mazání zprávy.",
     "Checking messages …" : "Kontrola zpráv ...",
     "Loading …" : "Načítání ...",
     "Load more …" : "Načíst další ...",
     "Check messages …" : "Zkontrolovat zprávy ...",
+    "Error while deleting account." : "Chyba při mazání účtu.",
     "Inbox" : "Doručená",
     "Sent" : "Odeslaná",
     "Drafts" : "Koncepty",
@@ -58,15 +59,6 @@ OC.L10N.register(
     "Back to website" : "Zpět na webovou stránku",
     "Add attachment from Files" : "Připojit přílohu ze Souborů",
     "Error loading message" : "Chyba načtení zprávy",
-    "Download attachment" : "Stáhnout přílohu",
-    "Save to Files" : "Uložit do Souborů",
-    "Save all to Files" : "Uložit vše do Souborů",
-    "Forward" : "Přeposlat",
-    "Delete" : "Smazat",
-    "Add mail account" : "Přidat emailový účet",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Chcete šifrovat svoje emaily? Nainstalujte rozšíření prohlížeče <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope</a>!",
-    "No search results for {{searchTerm}}" : "Žádné nálezy pro {{searchTerm}}",
-    "No messages in this folder!" : "Žádné zprávy v této složce!",
     "New message" : "Nová zpráva",
     "Connect your mail account" : "Připojte se ke svému emailovému účtu",
     "Name" : "Název",
@@ -86,6 +78,15 @@ OC.L10N.register(
     "SMTP Port (default 25, ssl 465)" : "SMTP port (výchozí 25, ssl 465)",
     "SMTP User" : "SMTP uživatel",
     "SMTP Password" : "SMTP heslo",
+    "Download attachment" : "Stáhnout přílohu",
+    "Save to Files" : "Uložit do Souborů",
+    "Save all to Files" : "Uložit vše do Souborů",
+    "Forward" : "Přeposlat",
+    "Delete" : "Smazat",
+    "Add mail account" : "Přidat emailový účet",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Chcete šifrovat svoje emaily? Nainstalujte rozšíření prohlížeče <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope</a>!",
+    "No messages in this folder!" : "Žádné zprávy v této složce!",
+    "No search results for {{searchTerm}}" : "Žádné nálezy pro {{searchTerm}}",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Přesměrovávám na %s - klikněte sem, pokud nebudete automaticky přesměrováni během několika následujících sekund.",
     "Redirect Warning" : "Upozornění na přesměrování",
     "The previous page is sending you to %s." : "Předchozí stránka vás přesměrovává na %s.",
diff --git a/l10n/cs_CZ.json b/l10n/cs_CZ.json
index 5ba1f195a..65e8e76bb 100644
--- a/l10n/cs_CZ.json
+++ b/l10n/cs_CZ.json
@@ -1,8 +1,13 @@
 { "translations": {
     "Mail" : "Pošta",
-    "Error while loading the accounts." : "Chyba při načítání účtů.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n nová zpráva v {folderName} \nod {from}","%n nové zprávy v {folderName} \nod {from}","%n nových zpráv v {folderName} \nod {from}"],
+    "Error while loading the accounts." : "Chyba při načítání účtů.",
+    "Connecting …" : "Připojuji ...",
+    "Unknown error" : "Neznámá chyba",
+    "Error while creating an account: " : "Chyba při vytváření účtu:",
+    "Connect" : "Připojit",
+    "Message could not be starred. Please try again." : "Zpráva nemohla být označena hvězdičkou. Zkuste to prosím znovu.",
     "Error while loading the selected account." : "Chyba během načítání vybraného účtu.",
     "Error while loading messages." : "Chyba během načítání zpráv.",
     "Choose a folder to store the attachment in" : "Vyber adresář pro uložení přílohy",
@@ -14,24 +19,20 @@
     "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!",
-    "Connecting …" : "Připojuji ...",
-    "Unknown error" : "Neznámá chyba",
-    "Error while creating an account: " : "Chyba při vytváření účtu:",
-    "Connect" : "Připojit",
-    "Error while deleting account." : "Chyba při mazání účtu.",
     "Choose a file to add as attachment" : "Vyberte soubor k přiložení",
     "Reply" : "Odpověď",
     "Send" : "Odeslat",
     "Sending …" : "Odesílám ...",
     "Message sent!" : "Zpráva odeslána!",
+    "Server error" : "Chyba serveru",
     "you" : "vy",
     "Send message to {email}" : "Poslat email na {email}",
-    "Message could not be starred. Please try again." : "Zpráva nemohla být označena hvězdičkou. Zkuste to prosím znovu.",
     "Error while deleting message." : "Chyba při mazání zprávy.",
     "Checking messages …" : "Kontrola zpráv ...",
     "Loading …" : "Načítání ...",
     "Load more …" : "Načíst další ...",
     "Check messages …" : "Zkontrolovat zprávy ...",
+    "Error while deleting account." : "Chyba při mazání účtu.",
     "Inbox" : "Doručená",
     "Sent" : "Odeslaná",
     "Drafts" : "Koncepty",
@@ -56,15 +57,6 @@
     "Back to website" : "Zpět na webovou stránku",
     "Add attachment from Files" : "Připojit přílohu ze Souborů",
     "Error loading message" : "Chyba načtení zprávy",
-    "Download attachment" : "Stáhnout přílohu",
-    "Save to Files" : "Uložit do Souborů",
-    "Save all to Files" : "Uložit vše do Souborů",
-    "Forward" : "Přeposlat",
-    "Delete" : "Smazat",
-    "Add mail account" : "Přidat emailový účet",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Chcete šifrovat svoje emaily? Nainstalujte rozšíření prohlížeče <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope</a>!",
-    "No search results for {{searchTerm}}" : "Žádné nálezy pro {{searchTerm}}",
-    "No messages in this folder!" : "Žádné zprávy v této složce!",
     "New message" : "Nová zpráva",
     "Connect your mail account" : "Připojte se ke svému emailovému účtu",
     "Name" : "Název",
@@ -84,6 +76,15 @@
     "SMTP Port (default 25, ssl 465)" : "SMTP port (výchozí 25, ssl 465)",
     "SMTP User" : "SMTP uživatel",
     "SMTP Password" : "SMTP heslo",
+    "Download attachment" : "Stáhnout přílohu",
+    "Save to Files" : "Uložit do Souborů",
+    "Save all to Files" : "Uložit vše do Souborů",
+    "Forward" : "Přeposlat",
+    "Delete" : "Smazat",
+    "Add mail account" : "Přidat emailový účet",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Chcete šifrovat svoje emaily? Nainstalujte rozšíření prohlížeče <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope</a>!",
+    "No messages in this folder!" : "Žádné zprávy v této složce!",
+    "No search results for {{searchTerm}}" : "Žádné nálezy pro {{searchTerm}}",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Přesměrovávám na %s - klikněte sem, pokud nebudete automaticky přesměrováni během několika následujících sekund.",
     "Redirect Warning" : "Upozornění na přesměrování",
     "The previous page is sending you to %s." : "Předchozí stránka vás přesměrovává na %s.",
diff --git a/l10n/da.js b/l10n/da.js
index 059dc029b..aab6fae06 100644
--- a/l10n/da.js
+++ b/l10n/da.js
@@ -2,9 +2,14 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Mail",
-    "Error while loading the accounts." : "Fejl under indlæsning af konti.",
     "{from}\n{subject}" : "{fra}\n{emne}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n ny besked i {folderName}\nfra {from}","%n nye beskeder i {folderName}\nfra {from}"],
+    "Error while loading the accounts." : "Fejl under indlæsning af konti.",
+    "Connecting …" : "Tilslutter ...",
+    "Unknown error" : "Ukendt fejl",
+    "Error while creating an account: " : "Fejl under oprettelse af kontoen:",
+    "Connect" : "Tilslut",
+    "Message could not be starred. Please try again." : "Beskeden kunne ikke sternemarkeres. Forsøg venligst igen.",
     "Error while loading the selected account." : "Der opstod en fejl under læsningen af den valgte konto.",
     "Error while loading messages." : "Fejl under indlæsning af beskeder.",
     "Choose a folder to store the attachment in" : "Vælg den mappe, hvor vedhæftningen skal gemmes i",
@@ -16,24 +21,20 @@ OC.L10N.register(
     "Forwarded message" : "Videresendt besked",
     "Error while loading the selected message." : "Fejl under indlæsning af den valgte besked.",
     "Draft saved!" : "Kladde blev gemt!",
-    "Connecting …" : "Tilslutter ...",
-    "Unknown error" : "Ukendt fejl",
-    "Error while creating an account: " : "Fejl under oprettelse af kontoen:",
-    "Connect" : "Tilslut",
-    "Error while deleting account." : "Fejl under sletning af kontoen.",
     "Choose a file to add as attachment" : "Vælg en fil, der skal tilføjes som vedhæftning",
     "Reply" : "Besvar",
     "Send" : "Send",
     "Sending …" : "Sender ...",
     "Message sent!" : "Beskeden blev sendt!",
+    "Server error" : "Serverfejl",
     "you" : "dig",
     "Send message to {email}" : "Send besked til {email}",
-    "Message could not be starred. Please try again." : "Beskeden kunne ikke sternemarkeres. Forsøg venligst igen.",
     "Error while deleting message." : "Fejl under sletning af besked.",
     "Checking messages …" : "Tjek efter beskeder...",
     "Loading …" : "Indlæser...",
     "Load more …" : "Indlæs flere ...",
     "Check messages …" : "Tjek efter beskeder...",
+    "Error while deleting account." : "Fejl under sletning af kontoen.",
     "Inbox" : "Indbakke",
     "Sent" : "Sent",
     "Drafts" : "Udkast",
@@ -58,15 +59,6 @@ OC.L10N.register(
     "Back to website" : "Tilbage til websted",
     "Add attachment from Files" : "Tilføj vedhæftning fra Filer",
     "Error loading message" : "Fejl under indlæsning af besked",
-    "Download attachment" : "Hent vedhæftning",
-    "Save to Files" : "Gem til Filer",
-    "Save all to Files" : "Gem alle til Filer",
-    "Forward" : "Videresend",
-    "Delete" : "Slet",
-    "Add mail account" : "Tilføj postkonto",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Vil du gerne kryptere dine e-mails? Installér browserudvidelsen <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope</a>!",
-    "No search results for {{searchTerm}}" : "Ingen søgeresultater for {{searchTerm}}",
-    "No messages in this folder!" : "Ingen beskeder i denne mappe!",
     "New message" : "Ny besked",
     "Connect your mail account" : "Forbind din mail-konto",
     "Name" : "Navn",
@@ -86,6 +78,15 @@ OC.L10N.register(
     "SMTP Port (default 25, ssl 465)" : "SMTP-port (som standard 25, ssl 465)",
     "SMTP User" : "SMTP bruger",
     "SMTP Password" : "SMTP kodeord",
+    "Download attachment" : "Hent vedhæftning",
+    "Save to Files" : "Gem til Filer",
+    "Save all to Files" : "Gem alle til Filer",
+    "Forward" : "Videresend",
+    "Delete" : "Slet",
+    "Add mail account" : "Tilføj postkonto",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Vil du gerne kryptere dine e-mails? Installér browserudvidelsen <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope</a>!",
+    "No messages in this folder!" : "Ingen beskeder i denne mappe!",
+    "No search results for {{searchTerm}}" : "Ingen søgeresultater for {{searchTerm}}",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Viderestiller dig til %s - klik her hvis du ikke bliver viderestillet automatisk inden for få sekunder.",
     "Redirect Warning" : "Advarsel om viderestilling",
     "The previous page is sending you to %s." : "Den foregående side sender dig til %s.",
diff --git a/l10n/da.json b/l10n/da.json
index ac16b0ab2..a2110a03e 100644
--- a/l10n/da.json
+++ b/l10n/da.json
@@ -1,8 +1,13 @@
 { "translations": {
     "Mail" : "Mail",
-    "Error while loading the accounts." : "Fejl under indlæsning af konti.",
     "{from}\n{subject}" : "{fra}\n{emne}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n ny besked i {folderName}\nfra {from}","%n nye beskeder i {folderName}\nfra {from}"],
+    "Error while loading the accounts." : "Fejl under indlæsning af konti.",
+    "Connecting …" : "Tilslutter ...",
+    "Unknown error" : "Ukendt fejl",
+    "Error while creating an account: " : "Fejl under oprettelse af kontoen:",
+    "Connect" : "Tilslut",
+    "Message could not be starred. Please try again." : "Beskeden kunne ikke sternemarkeres. Forsøg venligst igen.",
     "Error while loading the selected account." : "Der opstod en fejl under læsningen af den valgte konto.",
     "Error while loading messages." : "Fejl under indlæsning af beskeder.",
     "Choose a folder to store the attachment in" : "Vælg den mappe, hvor vedhæftningen skal gemmes i",
@@ -14,24 +19,20 @@
     "Forwarded message" : "Videresendt besked",
     "Error while loading the selected message." : "Fejl under indlæsning af den valgte besked.",
     "Draft saved!" : "Kladde blev gemt!",
-    "Connecting …" : "Tilslutter ...",
-    "Unknown error" : "Ukendt fejl",
-    "Error while creating an account: " : "Fejl under oprettelse af kontoen:",
-    "Connect" : "Tilslut",
-    "Error while deleting account." : "Fejl under sletning af kontoen.",
     "Choose a file to add as attachment" : "Vælg en fil, der skal tilføjes som vedhæftning",
     "Reply" : "Besvar",
     "Send" : "Send",
     "Sending …" : "Sender ...",
     "Message sent!" : "Beskeden blev sendt!",
+    "Server error" : "Serverfejl",
     "you" : "dig",
     "Send message to {email}" : "Send besked til {email}",
-    "Message could not be starred. Please try again." : "Beskeden kunne ikke sternemarkeres. Forsøg venligst igen.",
     "Error while deleting message." : "Fejl under sletning af besked.",
     "Checking messages …" : "Tjek efter beskeder...",
     "Loading …" : "Indlæser...",
     "Load more …" : "Indlæs flere ...",
     "Check messages …" : "Tjek efter beskeder...",
+    "Error while deleting account." : "Fejl under sletning af kontoen.",
     "Inbox" : "Indbakke",
     "Sent" : "Sent",
     "Drafts" : "Udkast",
@@ -56,15 +57,6 @@
     "Back to website" : "Tilbage til websted",
     "Add attachment from Files" : "Tilføj vedhæftning fra Filer",
     "Error loading message" : "Fejl under indlæsning af besked",
-    "Download attachment" : "Hent vedhæftning",
-    "Save to Files" : "Gem til Filer",
-    "Save all to Files" : "Gem alle til Filer",
-    "Forward" : "Videresend",
-    "Delete" : "Slet",
-    "Add mail account" : "Tilføj postkonto",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Vil du gerne kryptere dine e-mails? Installér browserudvidelsen <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope</a>!",
-    "No search results for {{searchTerm}}" : "Ingen søgeresultater for {{searchTerm}}",
-    "No messages in this folder!" : "Ingen beskeder i denne mappe!",
     "New message" : "Ny besked",
     "Connect your mail account" : "Forbind din mail-konto",
     "Name" : "Navn",
@@ -84,6 +76,15 @@
     "SMTP Port (default 25, ssl 465)" : "SMTP-port (som standard 25, ssl 465)",
     "SMTP User" : "SMTP bruger",
     "SMTP Password" : "SMTP kodeord",
+    "Download attachment" : "Hent vedhæftning",
+    "Save to Files" : "Gem til Filer",
+    "Save all to Files" : "Gem alle til Filer",
+    "Forward" : "Videresend",
+    "Delete" : "Slet",
+    "Add mail account" : "Tilføj postkonto",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Vil du gerne kryptere dine e-mails? Installér browserudvidelsen <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope</a>!",
+    "No messages in this folder!" : "Ingen beskeder i denne mappe!",
+    "No search results for {{searchTerm}}" : "Ingen søgeresultater for {{searchTerm}}",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Viderestiller dig til %s - klik her hvis du ikke bliver viderestillet automatisk inden for få sekunder.",
     "Redirect Warning" : "Advarsel om viderestilling",
     "The previous page is sending you to %s." : "Den foregående side sender dig til %s.",
diff --git a/l10n/de.js b/l10n/de.js
index b8f7e05c1..e8d5b3aff 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -2,9 +2,14 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Mail",
-    "Error while loading the accounts." : "Fehler beim Laden der Konten.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n neue Nachricht in {folderName} \nvon {from}","%n neue Nachrichten in {folderName} \nvon {from}"],
+    "Error while loading the accounts." : "Fehler beim Laden der Konten.",
+    "Connecting …" : "Verbinden…",
+    "Unknown error" : "Unbekannter Fehler",
+    "Error while creating an account: " : "Fehler beim Erstellen eines Kontos:",
+    "Connect" : "Verbinden",
+    "Message could not be starred. Please try again." : "Nachricht konnte nicht als Favorit markiert werden. Bitte noch einmal versuchen.",
     "Error while loading the selected account." : "Fehler beim Laden des ausgewählten Kontos.",
     "Error while loading messages." : "Fehler beim Laden der Nachrichten.",
     "Choose a folder to store the attachment in" : "Ordner zum Anhang speichern auswählen",
@@ -16,23 +21,19 @@ OC.L10N.register(
     "Forwarded message" : "Weitergeleitete Nachricht",
     "Error while loading the selected message." : "Fehler beim Laden der ausgewählten Nachricht.",
     "Draft saved!" : "Entwurf gespeichert!",
-    "Connecting …" : "Verbinden…",
-    "Unknown error" : "Unbekannter Fehler",
-    "Error while creating an account: " : "Fehler beim Erstellen eines Kontos:",
-    "Connect" : "Verbinden",
-    "Error while deleting account." : "Fehler beim Löschen des Kontos.",
     "Choose a file to add as attachment" : "Wähle eine Datei, die als Anhang angefügt werden soll",
     "Reply" : "Antwort",
     "Send" : "Senden",
     "Sending …" : "Senden…",
     "Message sent!" : "Nachricht versandt!",
+    "Server error" : "Serverfehler",
     "you" : "Du",
     "Send message to {email}" : "Nachricht an {email} senden",
-    "Message could not be starred. Please try again." : "Nachricht konnte nicht als Favorit markiert werden. Bitte noch einmal versuchen.",
     "Error while deleting message." : "Fehler beim Löschen der Nachricht.",
     "Loading …" : "Laden…",
     "Load more …" : "Weitere laden…",
     "Check messages …" : "Nachrichten überprüfen…",
+    "Error while deleting account." : "Fehler beim Löschen des Kontos.",
     "Inbox" : "Posteingang",
     "Sent" : "Gesendet",
     "Drafts" : "Entwürfe",
@@ -57,15 +58,6 @@ OC.L10N.register(
     "Back to website" : "Zurück zur Webseite",
     "Add attachment from Files" : "Anhang aus Dateien hinzufügen",
     "Error loading message" : "Fehler beim Laden der Nachricht",
-    "Download attachment" : "Anhang herunterladen",
-    "Save to Files" : "Unter Dateien speichern",
-    "Save all to Files" : "Alles unter Dateien speichern",
-    "Forward" : "Weiterleiten",
-    "Delete" : "Löschen",
-    "Add mail account" : "E-Mail-Konto hinzufügen",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Suchst Du nach einer Möglichkeit, Deine E-Mails zu verschlüsseln? Installiere die <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope Browser-Erweiterung</a>!",
-    "No search results for {{searchTerm}}" : "Keine Suchergebnisse zu {{searchTerm}}",
-    "No messages in this folder!" : "Keine Nachrichten in diesem Ordner gefunden!",
     "New message" : "Neue Nachricht",
     "Connect your mail account" : "Ihr E-Mail-Konto verknüpfen",
     "Name" : "Name",
@@ -85,6 +77,15 @@ OC.L10N.register(
     "SMTP Port (default 25, ssl 465)" : "SMTP-Port (Standard 25, SSL 465)",
     "SMTP User" : "SMTP-Nutzer",
     "SMTP Password" : "SMTP Passwort",
+    "Download attachment" : "Anhang herunterladen",
+    "Save to Files" : "Unter Dateien speichern",
+    "Save all to Files" : "Alles unter Dateien speichern",
+    "Forward" : "Weiterleiten",
+    "Delete" : "Löschen",
+    "Add mail account" : "E-Mail-Konto hinzufügen",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Suchst Du nach einer Möglichkeit, Deine E-Mails zu verschlüsseln? Installiere die <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope Browser-Erweiterung</a>!",
+    "No messages in this folder!" : "Keine Nachrichten in diesem Ordner gefunden!",
+    "No search results for {{searchTerm}}" : "Keine Suchergebnisse zu {{searchTerm}}",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Du wirst zu %s weitergeleitet - Bitte hier klicken, wenn Du nicht automatisch innerhalb der nächsten Sekunden weitergeleitet wirst.",
     "Redirect Warning" : "Umleitungswarnung",
     "The previous page is sending you to %s." : "Die vorangegangene Seite leitet Dich zu %s weiter.",
diff --git a/l10n/de.json b/l10n/de.json
index e967fe72b..9dd557f0e 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -1,8 +1,13 @@
 { "translations": {
     "Mail" : "Mail",
-    "Error while loading the accounts." : "Fehler beim Laden der Konten.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n neue Nachricht in {folderName} \nvon {from}","%n neue Nachrichten in {folderName} \nvon {from}"],
+    "Error while loading the accounts." : "Fehler beim Laden der Konten.",
+    "Connecting …" : "Verbinden…",
+    "Unknown error" : "Unbekannter Fehler",
+    "Error while creating an account: " : "Fehler beim Erstellen eines Kontos:",
+    "Connect" : "Verbinden",
+    "Message could not be starred. Please try again." : "Nachricht konnte nicht als Favorit markiert werden. Bitte noch einmal versuchen.",
     "Error while loading the selected account." : "Fehler beim Laden des ausgewählten Kontos.",
     "Error while loading messages." : "Fehler beim Laden der Nachrichten.",
     "Choose a folder to store the attachment in" : "Ordner zum Anhang speichern auswählen",
@@ -14,23 +19,19 @@
     "Forwarded message" : "Weitergeleitete Nachricht",
     "Error while loading the selected message." : "Fehler beim Laden der ausgewählten Nachricht.",
     "Draft saved!" : "Entwurf gespeichert!",
-    "Connecting …" : "Verbinden…",
-    "Unknown error" : "Unbekannter Fehler",
-    "Error while creating an account: " : "Fehler beim Erstellen eines Kontos:",
-    "Connect" : "Verbinden",
-    "Error while deleting account." : "Fehler beim Löschen des Kontos.",
     "Choose a file to add as attachment" : "Wähle eine Datei, die als Anhang angefügt werden soll",
     "Reply" : "Antwort",
     "Send" : "Senden",
     "Sending …" : "Senden…",
     "Message sent!" : "Nachricht versandt!",
+    "Server error" : "Serverfehler",
     "you" : "Du",
     "Send message to {email}" : "Nachricht an {email} senden",
-    "Message could not be starred. Please try again." : "Nachricht konnte nicht als Favorit markiert werden. Bitte noch einmal versuchen.",
     "Error while deleting message." : "Fehler beim Löschen der Nachricht.",
     "Loading …" : "Laden…",
     "Load more …" : "Weitere laden…",
     "Check messages …" : "Nachrichten überprüfen…",
+    "Error while deleting account." : "Fehler beim Löschen des Kontos.",
     "Inbox" : "Posteingang",
     "Sent" : "Gesendet",
     "Drafts" : "Entwürfe",
@@ -55,15 +56,6 @@
     "Back to website" : "Zurück zur Webseite",
     "Add attachment from Files" : "Anhang aus Dateien hinzufügen",
     "Error loading message" : "Fehler beim Laden der Nachricht",
-    "Download attachment" : "Anhang herunterladen",
-    "Save to Files" : "Unter Dateien speichern",
-    "Save all to Files" : "Alles unter Dateien speichern",
-    "Forward" : "Weiterleiten",
-    "Delete" : "Löschen",
-    "Add mail account" : "E-Mail-Konto hinzufügen",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Suchst Du nach einer Möglichkeit, Deine E-Mails zu verschlüsseln? Installiere die <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope Browser-Erweiterung</a>!",
-    "No search results for {{searchTerm}}" : "Keine Suchergebnisse zu {{searchTerm}}",
-    "No messages in this folder!" : "Keine Nachrichten in diesem Ordner gefunden!",
     "New message" : "Neue Nachricht",
     "Connect your mail account" : "Ihr E-Mail-Konto verknüpfen",
     "Name" : "Name",
@@ -83,6 +75,15 @@
     "SMTP Port (default 25, ssl 465)" : "SMTP-Port (Standard 25, SSL 465)",
     "SMTP User" : "SMTP-Nutzer",
     "SMTP Password" : "SMTP Passwort",
+    "Download attachment" : "Anhang herunterladen",
+    "Save to Files" : "Unter Dateien speichern",
+    "Save all to Files" : "Alles unter Dateien speichern",
+    "Forward" : "Weiterleiten",
+    "Delete" : "Löschen",
+    "Add mail account" : "E-Mail-Konto hinzufügen",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Suchst Du nach einer Möglichkeit, Deine E-Mails zu verschlüsseln? Installiere die <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope Browser-Erweiterung</a>!",
+    "No messages in this folder!" : "Keine Nachrichten in diesem Ordner gefunden!",
+    "No search results for {{searchTerm}}" : "Keine Suchergebnisse zu {{searchTerm}}",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Du wirst zu %s weitergeleitet - Bitte hier klicken, wenn Du nicht automatisch innerhalb der nächsten Sekunden weitergeleitet wirst.",
     "Redirect Warning" : "Umleitungswarnung",
     "The previous page is sending you to %s." : "Die vorangegangene Seite leitet Dich zu %s weiter.",
diff --git a/l10n/de_DE.js b/l10n/de_DE.js
index ac8bd3975..5835ad6ea 100644
--- a/l10n/de_DE.js
+++ b/l10n/de_DE.js
@@ -2,9 +2,14 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Mail",
-    "Error while loading the accounts." : "Fehler beim Laden der Konten.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n neue Nachricht in {folderName} \nvon {from}","%n neue Nachrichten in {folderName} \nvon {from}"],
+    "Error while loading the accounts." : "Fehler beim Laden der Konten.",
+    "Connecting …" : "Verbinden…",
+    "Unknown error" : "Unbekannter Fehler",
+    "Error while creating an account: " : "Fehler beim Erstellen eines Kontos:",
+    "Connect" : "Verbinden",
+    "Message could not be starred. Please try again." : "Nachricht konnte nicht als Favorit markiert werden. Bitte noch einmal versuchen.",
     "Error while loading the selected account." : "Fehler beim Laden des ausgewählten Kontos.",
     "Error while loading messages." : "Fehler beim Laden der Nachrichten.",
     "Choose a folder to store the attachment in" : "Ordner zum Speichern des Anhangs auswählen",
@@ -15,23 +20,19 @@ OC.L10N.register(
     "Opening HTML drafts is not supported yet." : "Das Öffnen von HTML-Entwürfen wird noch nicht unterstützt.",
     "Error while loading the selected message." : "Fehler beim Laden der ausgewählten Nachricht.",
     "Draft saved!" : "Entwurf gespeichert!",
-    "Connecting …" : "Verbinden…",
-    "Unknown error" : "Unbekannter Fehler",
-    "Error while creating an account: " : "Fehler beim Erstellen eines Kontos:",
-    "Connect" : "Verbinden",
-    "Error while deleting account." : "Fehler beim Löschen des Kontos.",
     "Choose a file to add as attachment" : "Wählen Sie eine Datei, die als Anhang angefügt werden soll",
     "Reply" : "Antwort",
     "Send" : "Senden",
     "Sending …" : "Senden…",
     "Message sent!" : "Nachricht versandt!",
+    "Server error" : "Serverfehler",
     "you" : "Sie",
     "Send message to {email}" : "Nachricht an {email} senden",
-    "Message could not be starred. Please try again." : "Nachricht konnte nicht als Favorit markiert werden. Bitte noch einmal versuchen.",
     "Error while deleting message." : "Fehler beim Löschen der Nachricht.",
     "Loading …" : "Laden…",
     "Load more …" : "Weitere laden…",
     "Check messages …" : "Nachrichten überprüfen…",
+    "Error while deleting account." : "Fehler beim Löschen des Kontos.",
     "Inbox" : "Posteingang",
     "Sent" : "Gesendet",
     "Drafts" : "Entwürfe",
@@ -56,15 +57,6 @@ OC.L10N.register(
     "Back to website" : "Zurück zur Webseite",
     "Add attachment from Files" : "Anhang aus Dateien hinzufügen",
     "Error loading message" : "Fehler beim Laden der Nachricht",
-    "Download attachment" : "Anhang herunterladen",
-    "Save to Files" : "In Dateien speichern",
-    "Save all to Files" : "Alles in Dateien speichern",
-    "Forward" : "Weiterleiten",
-    "Delete" : "Löschen",
-    "Add mail account" : "E-Mail-Konto hinzufügen",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Suchen Sie nach einer Möglichkeit, Ihre E-Mails zu verschlüsseln? Installieren Sie die <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope Browser-Erweiterung</a>!",
-    "No search results for {{searchTerm}}" : "Keine Suchergebnisse zu {{searchTerm}}",
-    "No messages in this folder!" : "Keine Nachrichten in diesem Ordner gefunden!",
     "New message" : "Neue Nachricht",
     "Connect your mail account" : "Ihr E-Mail-Konto verbinden",
     "Name" : "Name",
@@ -84,6 +76,15 @@ OC.L10N.register(
     "SMTP Port (default 25, ssl 465)" : "SMTP-Port (Standard 25, SSL 465)",
     "SMTP User" : "SMTP-Benutzer",
     "SMTP Password" : "SMTP Passwort",
+    "Download attachment" : "Anhang herunterladen",
+    "Save to Files" : "In Dateien speichern",
+    "Save all to Files" : "Alles in Dateien speichern",
+    "Forward" : "Weiterleiten",
+    "Delete" : "Löschen",
+    "Add mail account" : "E-Mail-Konto hinzufügen",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Suchen Sie nach einer Möglichkeit, Ihre E-Mails zu verschlüsseln? Installieren Sie die <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope Browser-Erweiterung</a>!",
+    "No messages in this folder!" : "Keine Nachrichten in diesem Ordner gefunden!",
+    "No search results for {{searchTerm}}" : "Keine Suchergebnisse zu {{searchTerm}}",
     "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",
     "The previous page is sending you to %s." : "Die vorangegangene Seite leitet Sie zu %s weiter.",
diff --git a/l10n/de_DE.json b/l10n/de_DE.json
index 592149901..8becca736 100644
--- a/l10n/de_DE.json
+++ b/l10n/de_DE.json
@@ -1,8 +1,13 @@
 { "translations": {
     "Mail" : "Mail",
-    "Error while loading the accounts." : "Fehler beim Laden der Konten.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n neue Nachricht in {folderName} \nvon {from}","%n neue Nachrichten in {folderName} \nvon {from}"],
+    "Error while loading the accounts." : "Fehler beim Laden der Konten.",
+    "Connecting …" : "Verbinden…",
+    "Unknown error" : "Unbekannter Fehler",
+    "Error while creating an account: " : "Fehler beim Erstellen eines Kontos:",
+    "Connect" : "Verbinden",
+    "Message could not be starred. Please try again." : "Nachricht konnte nicht als Favorit markiert werden. Bitte noch einmal versuchen.",
     "Error while loading the selected account." : "Fehler beim Laden des ausgewählten Kontos.",
     "Error while loading messages." : "Fehler beim Laden der Nachrichten.",
     "Choose a folder to store the attachment in" : "Ordner zum Speichern des Anhangs auswählen",
@@ -13,23 +18,19 @@
     "Opening HTML drafts is not supported yet." : "Das Öffnen von HTML-Entwürfen wird noch nicht unterstützt.",
     "Error while loading the selected message." : "Fehler beim Laden der ausgewählten Nachricht.",
     "Draft saved!" : "Entwurf gespeichert!",
-    "Connecting …" : "Verbinden…",
-    "Unknown error" : "Unbekannter Fehler",
-    "Error while creating an account: " : "Fehler beim Erstellen eines Kontos:",
-    "Connect" : "Verbinden",
-    "Error while deleting account." : "Fehler beim Löschen des Kontos.",
     "Choose a file to add as attachment" : "Wählen Sie eine Datei, die als Anhang angefügt werden soll",
     "Reply" : "Antwort",
     "Send" : "Senden",
     "Sending …" : "Senden…",
     "Message sent!" : "Nachricht versandt!",
+    "Server error" : "Serverfehler",
     "you" : "Sie",
     "Send message to {email}" : "Nachricht an {email} senden",
-    "Message could not be starred. Please try again." : "Nachricht konnte nicht als Favorit markiert werden. Bitte noch einmal versuchen.",
     "Error while deleting message." : "Fehler beim Löschen der Nachricht.",
     "Loading …" : "Laden…",
     "Load more …" : "Weitere laden…",
     "Check messages …" : "Nachrichten überprüfen…",
+    "Error while deleting account." : "Fehler beim Löschen des Kontos.",
     "Inbox" : "Posteingang",
     "Sent" : "Gesendet",
     "Drafts" : "Entwürfe",
@@ -54,15 +55,6 @@
     "Back to website" : "Zurück zur Webseite",
     "Add attachment from Files" : "Anhang aus Dateien hinzufügen",
     "Error loading message" : "Fehler beim Laden der Nachricht",
-    "Download attachment" : "Anhang herunterladen",
-    "Save to Files" : "In Dateien speichern",
-    "Save all to Files" : "Alles in Dateien speichern",
-    "Forward" : "Weiterleiten",
-    "Delete" : "Löschen",
-    "Add mail account" : "E-Mail-Konto hinzufügen",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Suchen Sie nach einer Möglichkeit, Ihre E-Mails zu verschlüsseln? Installieren Sie die <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope Browser-Erweiterung</a>!",
-    "No search results for {{searchTerm}}" : "Keine Suchergebnisse zu {{searchTerm}}",
-    "No messages in this folder!" : "Keine Nachrichten in diesem Ordner gefunden!",
     "New message" : "Neue Nachricht",
     "Connect your mail account" : "Ihr E-Mail-Konto verbinden",
     "Name" : "Name",
@@ -82,6 +74,15 @@
     "SMTP Port (default 25, ssl 465)" : "SMTP-Port (Standard 25, SSL 465)",
     "SMTP User" : "SMTP-Benutzer",
     "SMTP Password" : "SMTP Passwort",
+    "Download attachment" : "Anhang herunterladen",
+    "Save to Files" : "In Dateien speichern",
+    "Save all to Files" : "Alles in Dateien speichern",
+    "Forward" : "Weiterleiten",
+    "Delete" : "Löschen",
+    "Add mail account" : "E-Mail-Konto hinzufügen",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Suchen Sie nach einer Möglichkeit, Ihre E-Mails zu verschlüsseln? Installieren Sie die <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope Browser-Erweiterung</a>!",
+    "No messages in this folder!" : "Keine Nachrichten in diesem Ordner gefunden!",
+    "No search results for {{searchTerm}}" : "Keine Suchergebnisse zu {{searchTerm}}",
     "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",
     "The previous page is sending you to %s." : "Die vorangegangene Seite leitet Sie zu %s weiter.",
diff --git a/l10n/el.js b/l10n/el.js
index cad1a5693..ef3f39bbf 100644
--- a/l10n/el.js
+++ b/l10n/el.js
@@ -2,9 +2,14 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Αλληλογραφία",
-    "Error while loading the accounts." : "Σφάλμα κατά τη φόρτωση των λογαριασμών.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n νέο μήνυμα σε {folderName}\nαπό {from}","%n νέα μηνύματα σε {folderName}\nαπό {from}"],
+    "Error while loading the accounts." : "Σφάλμα κατά τη φόρτωση των λογαριασμών.",
+    "Connecting …" : "Σύνδεση ...",
+    "Unknown error" : "Άγνωστο σφάλμα",
+    "Error while creating an account: " : "Σφάλμα κατά τη δημιουργία λογαριασμού:",
+    "Connect" : "Σύνδεση",
+    "Message could not be starred. Please try again." : "Το μήνυμα δεν ήταν εφικτό να επισημανθεί με αστέρι. Παρακαλώ προσπαθήστε ξανά.",
     "Error while loading the selected account." : "Σφάλμα κατά τη φόρτωση του επιλεγμένου λογαριασμού.",
     "Error while loading messages." : "Σφάλμα κατά τη φόρτωση μηνυμάτων.",
     "Choose a folder to store the attachment in" : "Επιλέξτε ένα φάκελο για να αποθηκεύσετε τα συννημένα",
@@ -16,24 +21,20 @@ OC.L10N.register(
     "Forwarded message" : "Προωθημένο μήνυμα",
     "Error while loading the selected message." : "Σφάλμα κατά τη φόρτωση του επιλεγμένου μηνύματος.",
     "Draft saved!" : "Το πρόχειρο αποθηκεύτηκε!",
-    "Connecting …" : "Σύνδεση ...",
-    "Unknown error" : "Άγνωστο σφάλμα",
-    "Error while creating an account: " : "Σφάλμα κατά τη δημιουργία λογαριασμού:",
-    "Connect" : "Σύνδεση",
-    "Error while deleting account." : "Σφάλμα κατά τη διαγραφή λογαριασμού.",
     "Choose a file to add as attachment" : "Επιλέξτε έναν φάκελο για να προσθέσετε σαν συνημμένο",
     "Reply" : "Απάντηση",
     "Send" : "Αποστολή",
     "Sending …" : "Αποστολή...",
     "Message sent!" : "Μήνυμα εστάλη!",
+    "Server error" : "Σφάλμα διακομιστή",
     "you" : "εσείς",
     "Send message to {email}" : "Αποστολή μηνύματος σε {email}",
-    "Message could not be starred. Please try again." : "Το μήνυμα δεν ήταν εφικτό να επισημανθεί με αστέρι. Παρακαλώ προσπαθήστε ξανά.",
     "Error while deleting message." : "Σφάλμα κατά τη διαγραφή του μηνύματος",
     "Checking messages …" : "Έλεγχος μηνυμάτων ...",
     "Loading …" : "Φόρτωση ...",
     "Load more …" : "Φόρτωση περισσότερων...",
     "Check messages …" : "Έλεγχος μηνυμάτων ...",
+    "Error while deleting account." : "Σφάλμα κατά τη διαγραφή λογαριασμού.",
     "Inbox" : "Εισερχόμενα",
     "Sent" : "Απεστάλη",
     "Drafts" : "Πρόχειρα",
@@ -58,15 +59,6 @@ OC.L10N.register(
     "Back to website" : "Πίσω στην ιστοσελίδα",
     "Add attachment from Files" : "Προσθέστε συνημένο αρχείο απο τα έγραφα",
     "Error loading message" : "Μήνυμα σφάλματος φόρτωσης",
-    "Download attachment" : "Κατεβάστε το συνημμένο",
-    "Save to Files" : "Αποθήκευση στα Έγγραφα",
-    "Save all to Files" : "Αποθήκευση όλων στα Έγγραφα",
-    "Forward" : "Προώθηση",
-    "Delete" : "Διαγραφή",
-    "Add mail account" : "Προσθήκη λογαριασμού αλληλογραφίας",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Θέλετε να κρυπτογραφήσετε τα emails σας; Εγκαταστήστε το <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!",
-    "No search results for {{searchTerm}}" : "Κανένα αποτέλεσμα αναζήτησης για {{searchTerm}}",
-    "No messages in this folder!" : "Δεν υπάρχουν μηνύματα σε αυτό το φάκελο!",
     "New message" : "Νέο μήνυμα",
     "Connect your mail account" : "Σύνδεση με το λογαριασμό ηλ. ταχυδρομείου σας",
     "Name" : "Όνομα",
@@ -86,6 +78,15 @@ OC.L10N.register(
     "SMTP Port (default 25, ssl 465)" : "Θύρα SMTP (προεπιλογή 25, ssl 465)",
     "SMTP User" : "Χρήστης SMTP",
     "SMTP Password" : "Συνθηματικό SMTP",
+    "Download attachment" : "Κατεβάστε το συνημμένο",
+    "Save to Files" : "Αποθήκευση στα Έγγραφα",
+    "Save all to Files" : "Αποθήκευση όλων στα Έγγραφα",
+    "Forward" : "Προώθηση",
+    "Delete" : "Διαγραφή",
+    "Add mail account" : "Προσθήκη λογαριασμού αλληλογραφίας",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Θέλετε να κρυπτογραφήσετε τα emails σας; Εγκαταστήστε το <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!",
+    "No messages in this folder!" : "Δεν υπάρχουν μηνύματα σε αυτό το φάκελο!",
+    "No search results for {{searchTerm}}" : "Κανένα αποτέλεσμα αναζήτησης για {{searchTerm}}",
     "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.",
diff --git a/l10n/el.json b/l10n/el.json
index 1cf76a77f..56382ec81 100644
--- a/l10n/el.json
+++ b/l10n/el.json
@@ -1,8 +1,13 @@
 { "translations": {
     "Mail" : "Αλληλογραφία",
-    "Error while loading the accounts." : "Σφάλμα κατά τη φόρτωση των λογαριασμών.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n νέο μήνυμα σε {folderName}\nαπό {from}","%n νέα μηνύματα σε {folderName}\nαπό {from}"],
+    "Error while loading the accounts." : "Σφάλμα κατά τη φόρτωση των λογαριασμών.",
+    "Connecting …" : "Σύνδεση ...",
+    "Unknown error" : "Άγνωστο σφάλμα",
+    "Error while creating an account: " : "Σφάλμα κατά τη δημιουργία λογαριασμού:",
+    "Connect" : "Σύνδεση",
+    "Message could not be starred. Please try again." : "Το μήνυμα δεν ήταν εφικτό να επισημανθεί με αστέρι. Παρακαλώ προσπαθήστε ξανά.",
     "Error while loading the selected account." : "Σφάλμα κατά τη φόρτωση του επιλεγμένου λογαριασμού.",
     "Error while loading messages." : "Σφάλμα κατά τη φόρτωση μηνυμάτων.",
     "Choose a folder to store the attachment in" : "Επιλέξτε ένα φάκελο για να αποθηκεύσετε τα συννημένα",
@@ -14,24 +19,20 @@
     "Forwarded message" : "Προωθημένο μήνυμα",
     "Error while loading the selected message." : "Σφάλμα κατά τη φόρτωση του επιλεγμένου μηνύματος.",
     "Draft saved!" : "Το πρόχειρο αποθηκεύτηκε!",
-    "Connecting …" : "Σύνδεση ...",
-    "Unknown error" : "Άγνωστο σφάλμα",
-    "Error while creating an account: " : "Σφάλμα κατά τη δημιουργία λογαριασμού:",
-    "Connect" : "Σύνδεση",
-    "Error while deleting account." : "Σφάλμα κατά τη διαγραφή λογαριασμού.",
     "Choose a file to add as attachment" : "Επιλέξτε έναν φάκελο για να προσθέσετε σαν συνημμένο",
     "Reply" : "Απάντηση",
     "Send" : "Αποστολή",
     "Sending …" : "Αποστολή...",
     "Message sent!" : "Μήνυμα εστάλη!",
+    "Server error" : "Σφάλμα διακομιστή",
     "you" : "εσείς",
     "Send message to {email}" : "Αποστολή μηνύματος σε {email}",
-    "Message could not be starred. Please try again." : "Το μήνυμα δεν ήταν εφικτό να επισημανθεί με αστέρι. Παρακαλώ προσπαθήστε ξανά.",
     "Error while deleting message." : "Σφάλμα κατά τη διαγραφή του μηνύματος",
     "Checking messages …" : "Έλεγχος μηνυμάτων ...",
     "Loading …" : "Φόρτωση ...",
     "Load more …" : "Φόρτωση περισσότερων...",
     "Check messages …" : "Έλεγχος μηνυμάτων ...",
+    "Error while deleting account." : "Σφάλμα κατά τη διαγραφή λογαριασμού.",
     "Inbox" : "Εισερχόμενα",
     "Sent" : "Απεστάλη",
     "Drafts" : "Πρόχειρα",
@@ -56,15 +57,6 @@
     "Back to website" : "Πίσω στην ιστοσελίδα",
     "Add attachment from Files" : "Προσθέστε συνημένο αρχείο απο τα έγραφα",
     "Error loading message" : "Μήνυμα σφάλματος φόρτωσης",
-    "Download attachment" : "Κατεβάστε το συνημμένο",
-    "Save to Files" : "Αποθήκευση στα Έγγραφα",
-    "Save all to Files" : "Αποθήκευση όλων στα Έγγραφα",
-    "Forward" : "Προώθηση",
-    "Delete" : "Διαγραφή",
-    "Add mail account" : "Προσθήκη λογαριασμού αλληλογραφίας",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Θέλετε να κρυπτογραφήσετε τα emails σας; Εγκαταστήστε το <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!",
-    "No search results for {{searchTerm}}" : "Κανένα αποτέλεσμα αναζήτησης για {{searchTerm}}",
-    "No messages in this folder!" : "Δεν υπάρχουν μηνύματα σε αυτό το φάκελο!",
     "New message" : "Νέο μήνυμα",
     "Connect your mail account" : "Σύνδεση με το λογαριασμό ηλ. ταχυδρομείου σας",
     "Name" : "Όνομα",
@@ -84,6 +76,15 @@
     "SMTP Port (default 25, ssl 465)" : "Θύρα SMTP (προεπιλογή 25, ssl 465)",
     "SMTP User" : "Χρήστης SMTP",
     "SMTP Password" : "Συνθηματικό SMTP",
+    "Download attachment" : "Κατεβάστε το συνημμένο",
+    "Save to Files" : "Αποθήκευση στα Έγγραφα",
+    "Save all to Files" : "Αποθήκευση όλων στα Έγγραφα",
+    "Forward" : "Προώθηση",
+    "Delete" : "Διαγραφή",
+    "Add mail account" : "Προσθήκη λογαριασμού αλληλογραφίας",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Θέλετε να κρυπτογραφήσετε τα emails σας; Εγκαταστήστε το <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!",
+    "No messages in this folder!" : "Δεν υπάρχουν μηνύματα σε αυτό το φάκελο!",
+    "No search results for {{searchTerm}}" : "Κανένα αποτέλεσμα αναζήτησης για {{searchTerm}}",
     "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.",
diff --git a/l10n/en_GB.js b/l10n/en_GB.js
index 183bad78b..b8b4e8d2d 100644
--- a/l10n/en_GB.js
+++ b/l10n/en_GB.js
@@ -2,8 +2,13 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Mail",
-    "Error while loading the accounts." : "Error whilst loading the accounts.",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n new message in {folderName} \nfrom {from}","%n new messages in {folderName} \nfrom {from}"],
+    "Error while loading the accounts." : "Error whilst loading the accounts.",
+    "Connecting …" : "Connecting…",
+    "Unknown error" : "Unknown error",
+    "Error while creating an account: " : "Error whilst creating an account: ",
+    "Connect" : "Connect",
+    "Message could not be starred. Please try again." : "Message could not be starred. Please try again.",
     "Error while loading the selected account." : "Error whilst loading the selected account.",
     "Error while loading messages." : "Error whilst loading messages.",
     "Choose a folder to store the attachment in" : "Choose a folder to store the attachment in",
@@ -14,22 +19,18 @@ OC.L10N.register(
     "Opening HTML drafts is not supported yet." : "Opening HTML drafts is not supported yet.",
     "Error while loading the selected message." : "Error whilst loading the selected message.",
     "Draft saved!" : "Draft saved!",
-    "Connecting …" : "Connecting…",
-    "Unknown error" : "Unknown error",
-    "Error while creating an account: " : "Error whilst creating an account: ",
-    "Connect" : "Connect",
-    "Error while deleting account." : "Error whilst deleting account.",
     "Choose a file to add as attachment" : "Choose a file to add as attachment",
     "Reply" : "Reply",
     "Send" : "Send",
     "Sending …" : "Sending…",
     "Message sent!" : "Message sent!",
+    "Server error" : "Server error",
     "you" : "you",
-    "Message could not be starred. Please try again." : "Message could not be starred. Please try again.",
     "Error while deleting message." : "Error whilst deleting message.",
     "Loading …" : "Loading…",
     "Load more …" : "Load more…",
     "Check messages …" : "Check messages …",
+    "Error while deleting account." : "Error whilst deleting account.",
     "Inbox" : "Inbox",
     "Sent" : "Sent",
     "Drafts" : "Drafts",
@@ -53,15 +54,6 @@ OC.L10N.register(
     "Back to website" : "Back to website",
     "Add attachment from Files" : "Add attachment from Files",
     "Error loading message" : "Error loading message",
-    "Download attachment" : "Download attachment",
-    "Save to Files" : "Save to Files",
-    "Save all to Files" : "Save all to Files",
-    "Forward" : "Forward",
-    "Delete" : "Delete",
-    "Add mail account" : "Add mail account",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!",
-    "No search results for {{searchTerm}}" : "No search results for {{searchTerm}}",
-    "No messages in this folder!" : "No messages in this folder!",
     "New message" : "New message",
     "Connect your mail account" : "Connect your mail account",
     "Name" : "Name",
@@ -81,6 +73,15 @@ OC.L10N.register(
     "SMTP Port (default 25, ssl 465)" : "SMTP Port (default 25, ssl 465)",
     "SMTP User" : "SMTP User",
     "SMTP Password" : "SMTP Password",
+    "Download attachment" : "Download attachment",
+    "Save to Files" : "Save to Files",
+    "Save all to Files" : "Save all to Files",
+    "Forward" : "Forward",
+    "Delete" : "Delete",
+    "Add mail account" : "Add mail account",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!",
+    "No messages in this folder!" : "No messages in this folder!",
+    "No search results for {{searchTerm}}" : "No search results for {{searchTerm}}",
     "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.",
     "Redirect Warning" : "Redirect Warning",
     "The previous page is sending you to %s." : "The previous page is sending you to %s.",
diff --git a/l10n/en_GB.json b/l10n/en_GB.json
index ea7ff88e4..bf74f6488 100644
--- a/l10n/en_GB.json
+++ b/l10n/en_GB.json
@@ -1,7 +1,12 @@
 { "translations": {
     "Mail" : "Mail",
-    "Error while loading the accounts." : "Error whilst loading the accounts.",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n new message in {folderName} \nfrom {from}","%n new messages in {folderName} \nfrom {from}"],
+    "Error while loading the accounts." : "Error whilst loading the accounts.",
+    "Connecting …" : "Connecting…",
+    "Unknown error" : "Unknown error",
+    "Error while creating an account: " : "Error whilst creating an account: ",
+    "Connect" : "Connect",
+    "Message could not be starred. Please try again." : "Message could not be starred. Please try again.",
     "Error while loading the selected account." : "Error whilst loading the selected account.",
     "Error while loading messages." : "Error whilst loading messages.",
     "Choose a folder to store the attachment in" : "Choose a folder to store the attachment in",
@@ -12,22 +17,18 @@
     "Opening HTML drafts is not supported yet." : "Opening HTML drafts is not supported yet.",
     "Error while loading the selected message." : "Error whilst loading the selected message.",
     "Draft saved!" : "Draft saved!",
-    "Connecting …" : "Connecting…",
-    "Unknown error" : "Unknown error",
-    "Error while creating an account: " : "Error whilst creating an account: ",
-    "Connect" : "Connect",
-    "Error while deleting account." : "Error whilst deleting account.",
     "Choose a file to add as attachment" : "Choose a file to add as attachment",
     "Reply" : "Reply",
     "Send" : "Send",
     "Sending …" : "Sending…",
     "Message sent!" : "Message sent!",
+    "Server error" : "Server error",
     "you" : "you",
-    "Message could not be starred. Please try again." : "Message could not be starred. Please try again.",
     "Error while deleting message." : "Error whilst deleting message.",
     "Loading …" : "Loading…",
     "Load more …" : "Load more…",
     "Check messages …" : "Check messages …",
+    "Error while deleting account." : "Error whilst deleting account.",
     "Inbox" : "Inbox",
     "Sent" : "Sent",
     "Drafts" : "Drafts",
@@ -51,15 +52,6 @@
     "Back to website" : "Back to website",
     "Add attachment from Files" : "Add attachment from Files",
     "Error loading message" : "Error loading message",
-    "Download attachment" : "Download attachment",
-    "Save to Files" : "Save to Files",
-    "Save all to Files" : "Save all to Files",
-    "Forward" : "Forward",
-    "Delete" : "Delete",
-    "Add mail account" : "Add mail account",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!",
-    "No search results for {{searchTerm}}" : "No search results for {{searchTerm}}",
-    "No messages in this folder!" : "No messages in this folder!",
     "New message" : "New message",
     "Connect your mail account" : "Connect your mail account",
     "Name" : "Name",
@@ -79,6 +71,15 @@
     "SMTP Port (default 25, ssl 465)" : "SMTP Port (default 25, ssl 465)",
     "SMTP User" : "SMTP User",
     "SMTP Password" : "SMTP Password",
+    "Download attachment" : "Download attachment",
+    "Save to Files" : "Save to Files",
+    "Save all to Files" : "Save all to Files",
+    "Forward" : "Forward",
+    "Delete" : "Delete",
+    "Add mail account" : "Add mail account",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!",
+    "No messages in this folder!" : "No messages in this folder!",
+    "No search results for {{searchTerm}}" : "No search results for {{searchTerm}}",
     "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.",
     "Redirect Warning" : "Redirect Warning",
     "The previous page is sending you to %s." : "The previous page is sending you to %s.",
diff --git a/l10n/es.js b/l10n/es.js
index c46630977..9b1555b86 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -2,9 +2,14 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Correo electrónico",
-    "Error while loading the accounts." : "Error al cargar las cuentas.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n mensaje nuevo en {folderName} \nde {from}","%n mensajes nuevos en {folderName} \nde {from}"],
+    "Error while loading the accounts." : "Error al cargar las cuentas.",
+    "Connecting …" : "Conectando...",
+    "Unknown error" : "Error desconocido",
+    "Error while creating an account: " : "Error al crear una cuenta:",
+    "Connect" : "Conectar",
+    "Message could not be starred. Please try again." : "El mensaje no se pudo marcar como favorito. Vuelva a intentarlo.",
     "Error while loading the selected account." : "Error al cargar la cuenta seleccionada.",
     "Error while loading messages." : "Error al cargar los mensajes.",
     "Choose a folder to store the attachment in" : "Escoja una carpeta para guardar el adjunto",
@@ -16,24 +21,20 @@ OC.L10N.register(
     "Forwarded message" : "Mensaje reenviado",
     "Error while loading the selected message." : "Error al cargar el mensaje seleccionado.",
     "Draft saved!" : "¡Borrador guardado!",
-    "Connecting …" : "Conectando...",
-    "Unknown error" : "Error desconocido",
-    "Error while creating an account: " : "Error al crear una cuenta:",
-    "Connect" : "Conectar",
-    "Error while deleting account." : "Error al eliminar la cuenta.",
     "Choose a file to add as attachment" : "Escoja un archivo para adjuntar",
     "Reply" : "Responder",
     "Send" : "Enviar",
     "Sending …" : "Enviando...",
     "Message sent!" : "¡Mensaje enviado!",
+    "Server error" : "Error en servidor",
     "you" : "usted",
     "Send message to {email}" : "Enviar mensaje a {email}",
-    "Message could not be starred. Please try again." : "El mensaje no se pudo marcar como favorito. Vuelva a intentarlo.",
     "Error while deleting message." : "Error al eliminar el mensaje.",
     "Checking messages …" : "Comprobando mensajes ...",
     "Loading …" : "Cargando...",
     "Load more …" : "Cargar más...",
     "Check messages …" : "Comprobar mensajes...",
+    "Error while deleting account." : "Error al eliminar la cuenta.",
     "Inbox" : "Recibidos",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -58,15 +59,6 @@ OC.L10N.register(
     "Back to website" : "Volver al sitio de internet",
     "Add attachment from Files" : "Agregar adjunto desde Archivos",
     "Error loading message" : "Error al cargar el mensaje",
-    "Download attachment" : "Descargar adjunto",
-    "Save to Files" : "Guardar en Archivos",
-    "Save all to Files" : "Guardar todo en Archivos",
-    "Forward" : "Reenviar",
-    "Delete" : "Borrar",
-    "Add mail account" : "Agregar cuenta de correo",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "¿Quieres cifrar tus correos electrónicos? ¡Instala la <a href=\"https://www.mailvelope.com/\" target=\"_blank\">extensión de navegador Mailvelope</a>!",
-    "No search results for {{searchTerm}}" : "No hay resultados para {{searchTerm}}",
-    "No messages in this folder!" : "No hay mensajes en esta carpeta!",
     "New message" : "Nuevo mensaje",
     "Connect your mail account" : "Conecte su cuenta de correo",
     "Name" : "Nombre",
@@ -86,6 +78,15 @@ OC.L10N.register(
     "SMTP Port (default 25, ssl 465)" : "Puerto SMTP (predeterminado 25, ssl 465)",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contraseña SMTP",
+    "Download attachment" : "Descargar adjunto",
+    "Save to Files" : "Guardar en Archivos",
+    "Save all to Files" : "Guardar todo en Archivos",
+    "Forward" : "Reenviar",
+    "Delete" : "Borrar",
+    "Add mail account" : "Agregar cuenta de correo",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "¿Quieres cifrar tus correos electrónicos? ¡Instala la <a href=\"https://www.mailvelope.com/\" target=\"_blank\">extensión de navegador Mailvelope</a>!",
+    "No messages in this folder!" : "¡No hay mensajes en esta carpeta!",
+    "No search results for {{searchTerm}}" : "No hay resultados para {{searchTerm}}",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Redireccionando a %s; haga clic aquí si no es redireccionado automáticamente en unos segundos.",
     "Redirect Warning" : "Advertencia de redireccionado",
     "The previous page is sending you to %s." : "La página anterior le está enviando a %s.",
diff --git a/l10n/es.json b/l10n/es.json
index 619fa063c..3472d63e8 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -1,8 +1,13 @@
 { "translations": {
     "Mail" : "Correo electrónico",
-    "Error while loading the accounts." : "Error al cargar las cuentas.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n mensaje nuevo en {folderName} \nde {from}","%n mensajes nuevos en {folderName} \nde {from}"],
+    "Error while loading the accounts." : "Error al cargar las cuentas.",
+    "Connecting …" : "Conectando...",
+    "Unknown error" : "Error desconocido",
+    "Error while creating an account: " : "Error al crear una cuenta:",
+    "Connect" : "Conectar",
+    "Message could not be starred. Please try again." : "El mensaje no se pudo marcar como favorito. Vuelva a intentarlo.",
     "Error while loading the selected account." : "Error al cargar la cuenta seleccionada.",
     "Error while loading messages." : "Error al cargar los mensajes.",
     "Choose a folder to store the attachment in" : "Escoja una carpeta para guardar el adjunto",
@@ -14,24 +19,20 @@
     "Forwarded message" : "Mensaje reenviado",
     "Error while loading the selected message." : "Error al cargar el mensaje seleccionado.",
     "Draft saved!" : "¡Borrador guardado!",
-    "Connecting …" : "Conectando...",
-    "Unknown error" : "Error desconocido",
-    "Error while creating an account: " : "Error al crear una cuenta:",
-    "Connect" : "Conectar",
-    "Error while deleting account." : "Error al eliminar la cuenta.",
     "Choose a file to add as attachment" : "Escoja un archivo para adjuntar",
     "Reply" : "Responder",
     "Send" : "Enviar",
     "Sending …" : "Enviando...",
     "Message sent!" : "¡Mensaje enviado!",
+    "Server error" : "Error en servidor",
     "you" : "usted",
     "Send message to {email}" : "Enviar mensaje a {email}",
-    "Message could not be starred. Please try again." : "El mensaje no se pudo marcar como favorito. Vuelva a intentarlo.",
     "Error while deleting message." : "Error al eliminar el mensaje.",
     "Checking messages …" : "Comprobando mensajes ...",
     "Loading …" : "Cargando...",
     "Load more …" : "Cargar más...",
     "Check messages …" : "Comprobar mensajes...",
+    "Error while deleting account." : "Error al eliminar la cuenta.",
     "Inbox" : "Recibidos",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -56,15 +57,6 @@
     "Back to website" : "Volver al sitio de internet",
     "Add attachment from Files" : "Agregar adjunto desde Archivos",
     "Error loading message" : "Error al cargar el mensaje",
-    "Download attachment" : "Descargar adjunto",
-    "Save to Files" : "Guardar en Archivos",
-    "Save all to Files" : "Guardar todo en Archivos",
-    "Forward" : "Reenviar",
-    "Delete" : "Borrar",
-    "Add mail account" : "Agregar cuenta de correo",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "¿Quieres cifrar tus correos electrónicos? ¡Instala la <a href=\"https://www.mailvelope.com/\" target=\"_blank\">extensión de navegador Mailvelope</a>!",
-    "No search results for {{searchTerm}}" : "No hay resultados para {{searchTerm}}",
-    "No messages in this folder!" : "No hay mensajes en esta carpeta!",
     "New message" : "Nuevo mensaje",
     "Connect your mail account" : "Conecte su cuenta de correo",
     "Name" : "Nombre",
@@ -84,6 +76,15 @@
     "SMTP Port (default 25, ssl 465)" : "Puerto SMTP (predeterminado 25, ssl 465)",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contraseña SMTP",
+    "Download attachment" : "Descargar adjunto",
+    "Save to Files" : "Guardar en Archivos",
+    "Save all to Files" : "Guardar todo en Archivos",
+    "Forward" : "Reenviar",
+    "Delete" : "Borrar",
+    "Add mail account" : "Agregar cuenta de correo",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "¿Quieres cifrar tus correos electrónicos? ¡Instala la <a href=\"https://www.mailvelope.com/\" target=\"_blank\">extensión de navegador Mailvelope</a>!",
+    "No messages in this folder!" : "¡No hay mensajes en esta carpeta!",
+    "No search results for {{searchTerm}}" : "No hay resultados para {{searchTerm}}",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Redireccionando a %s; haga clic aquí si no es redireccionado automáticamente en unos segundos.",
     "Redirect Warning" : "Advertencia de redireccionado",
     "The previous page is sending you to %s." : "La página anterior le está enviando a %s.",
diff --git a/l10n/et_EE.js b/l10n/et_EE.js
index 6ec338e38..3e7aa14f1 100644
--- a/l10n/et_EE.js
+++ b/l10n/et_EE.js
@@ -2,9 +2,14 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Kirjad",
-    "Error while loading the accounts." : "Viga kontode laadimisel",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n uus sõnum kaustas {folderName} \nsaatja: {from}","%n uut sõnumit kaustas {folderName} \nsaatja: {from}"],
+    "Error while loading the accounts." : "Viga kontode laadimisel",
+    "Connecting …" : "Ühendamine ...",
+    "Unknown error" : "Tundmatu viga",
+    "Error while creating an account: " : "Tõrge konto loomisel:",
+    "Connect" : "Ühenda",
+    "Message could not be starred. Please try again." : "Sõnumit ei õnnestunud tärniga märkida. Palun proovi uuesti.",
     "Error while loading the selected account." : "Viga valitud konto laadimisel.",
     "Error while loading messages." : "Tõrge sõnumite laadimisel.",
     "Choose a folder to store the attachment in" : "Vali kaust, kuhu manus salvestada",
@@ -16,24 +21,20 @@ OC.L10N.register(
     "Forwarded message" : "Edastatud sõnum",
     "Error while loading the selected message." : "Viga valitud sõnumi laadimisel.",
     "Draft saved!" : "Mustand on salvestatud!",
-    "Connecting …" : "Ühendamine ...",
-    "Unknown error" : "Tundmatu viga",
-    "Error while creating an account: " : "Tõrge konto loomisel:",
-    "Connect" : "Ühenda",
-    "Error while deleting account." : "Tõrge konto kustutamisel.",
     "Choose a file to add as attachment" : "Vali fail, mida manustada",
     "Reply" : "Vasta",
     "Send" : "Saada",
     "Sending …" : "Saadan ...",
     "Message sent!" : "Sõnum on saadetud!",
+    "Server error" : "Serveri tõrge",
     "you" : "sina",
     "Send message to {email}" : "Saada kiri aadressile {email}",
-    "Message could not be starred. Please try again." : "Sõnumit ei õnnestunud tärniga märkida. Palun proovi uuesti.",
     "Error while deleting message." : "Tõrge sõnumi kustutamisel.",
     "Checking messages …" : "Sõnumite kontrollimine ...",
     "Loading …" : "Laadimine ...",
     "Load more …" : "Laadi rohkem ...",
     "Check messages …" : "Kontrolli sõnumeid ...",
+    "Error while deleting account." : "Tõrge konto kustutamisel.",
     "Inbox" : "Saaabuvad",
     "Sent" : "Saadetud",
     "Drafts" : "Mustandid",
@@ -58,15 +59,6 @@ OC.L10N.register(
     "Back to website" : "Tagasi veebilehele",
     "Add attachment from Files" : "Lisa manus failidest",
     "Error loading message" : "Tõrge kirja laadimisel",
-    "Download attachment" : "Lae manus alla",
-    "Save to Files" : "Salvesta failidesse",
-    "Save all to Files" : "Salvesta kõik failidesse",
-    "Forward" : "Edasta",
-    "Delete" : "Kustuta",
-    "Add mail account" : "Lisa meilikonto",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Otsid oma krüpteeritud kirju? Paigalda <a href=\"https://www.mailvelope.com/\" target=\"_blank\">brauseri lisaprogramm Mailvelope</a>!",
-    "No search results for {{searchTerm}}" : "Otsing {{searchTerm}} ei andnud tulemusi",
-    "No messages in this folder!" : "Selles kaustas kirju pole!",
     "New message" : "Uussõnum",
     "Connect your mail account" : "Ühenda oma e-posti konto",
     "Name" : "Nimi",
@@ -86,6 +78,15 @@ OC.L10N.register(
     "SMTP Port (default 25, ssl 465)" : "SMTP port (vaikeväärtus on 25, ssl 465)",
     "SMTP User" : "SMTP kasutaja",
     "SMTP Password" : "SMTP parool",
+    "Download attachment" : "Lae manus alla",
+    "Save to Files" : "Salvesta failidesse",
+    "Save all to Files" : "Salvesta kõik failidesse",
+    "Forward" : "Edasta",
+    "Delete" : "Kustuta",
+    "Add mail account" : "Lisa meilikonto",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Otsid oma krüpteeritud kirju? Paigalda <a href=\"https://www.mailvelope.com/\" target=\"_blank\">brauseri lisaprogramm Mailvelope</a>!",
+    "No messages in this folder!" : "Selles kaustas kirju pole!",
+    "No search results for {{searchTerm}}" : "Otsing {{searchTerm}} ei andnud tulemusi",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Edasi saamine %s-le - kliki siia kui sind ei suunata automaatselt mõne järgmise sekundi jooksul edasi.",
     "Redirect Warning" : "Edasisuunamise hoiatus",
     "The previous page is sending you to %s." : "Eelmine lehekülg suunab sind %s.",
diff --git a/l10n/et_EE.json b/l10n/et_EE.json
index 742598b7b..c3c6f3118 100644
--- a/l10n/et_EE.json
+++ b/l10n/et_EE.json
@@ -1,8 +1,13 @@
 { "translations": {
     "Mail" : "Kirjad",
-    "Error while loading the accounts." : "Viga kontode laadimisel",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n uus sõnum kaustas {folderName} \nsaatja: {from}","%n uut sõnumit kaustas {folderName} \nsaatja: {from}"],
+    "Error while loading the accounts." : "Viga kontode laadimisel",
+    "Connecting …" : "Ühendamine ...",
+    "Unknown error" : "Tundmatu viga",
+    "Error while creating an account: " : "Tõrge konto loomisel:",
+    "Connect" : "Ühenda",
+    "Message could not be starred. Please try again." : "Sõnumit ei õnnestunud tärniga märkida. Palun proovi uuesti.",
     "Error while loading the selected account." : "Viga valitud konto laadimisel.",
     "Error while loading messages." : "Tõrge sõnumite laadimisel.",
     "Choose a folder to store the attachment in" : "Vali kaust, kuhu manus salvestada",
@@ -14,24 +19,20 @@
     "Forwarded message" : "Edastatud sõnum",
     "Error while loading the selected message." : "Viga valitud sõnumi laadimisel.",
     "Draft saved!" : "Mustand on salvestatud!",
-    "Connecting …" : "Ühendamine ...",
-    "Unknown error" : "Tundmatu viga",
-    "Error while creating an account: " : "Tõrge konto loomisel:",
-    "Connect" : "Ühenda",
-    "Error while deleting account." : "Tõrge konto kustutamisel.",
     "Choose a file to add as attachment" : "Vali fail, mida manustada",
     "Reply" : "Vasta",
     "Send" : "Saada",
     "Sending …" : "Saadan ...",
     "Message sent!" : "Sõnum on saadetud!",
+    "Server error" : "Serveri tõrge",
     "you" : "sina",
     "Send message to {email}" : "Saada kiri aadressile {email}",
-    "Message could not be starred. Please try again." : "Sõnumit ei õnnestunud tärniga märkida. Palun proovi uuesti.",
     "Error while deleting message." : "Tõrge sõnumi kustutamisel.",
     "Checking messages …" : "Sõnumite kontrollimine ...",
     "Loading …" : "Laadimine ...",
     "Load more …" : "Laadi rohkem ...",
     "Check messages …" : "Kontrolli sõnumeid ...",
+    "Error while deleting account." : "Tõrge konto kustutamisel.",
     "Inbox" : "Saaabuvad",
     "Sent" : "Saadetud",
     "Drafts" : "Mustandid",
@@ -56,15 +57,6 @@
     "Back to website" : "Tagasi veebilehele",
     "Add attachment from Files" : "Lisa manus failidest",
     "Error loading message" : "Tõrge kirja laadimisel",
-    "Download attachment" : "Lae manus alla",
-    "Save to Files" : "Salvesta failidesse",
-    "Save all to Files" : "Salvesta kõik failidesse",
-    "Forward" : "Edasta",
-    "Delete" : "Kustuta",
-    "Add mail account" : "Lisa meilikonto",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Otsid oma krüpteeritud kirju? Paigalda <a href=\"https://www.mailvelope.com/\" target=\"_blank\">brauseri lisaprogramm Mailvelope</a>!",
-    "No search results for {{searchTerm}}" : "Otsing {{searchTerm}} ei andnud tulemusi",
-    "No messages in this folder!" : "Selles kaustas kirju pole!",
     "New message" : "Uussõnum",
     "Connect your mail account" : "Ühenda oma e-posti konto",
     "Name" : "Nimi",
@@ -84,6 +76,15 @@
     "SMTP Port (default 25, ssl 465)" : "SMTP port (vaikeväärtus on 25, ssl 465)",
     "SMTP User" : "SMTP kasutaja",
     "SMTP Password" : "SMTP parool",
+    "Download attachment" : "Lae manus alla",
+    "Save to Files" : "Salvesta failidesse",
+    "Save all to Files" : "Salvesta kõik failidesse",
+    "Forward" : "Edasta",
+    "Delete" : "Kustuta",
+    "Add mail account" : "Lisa meilikonto",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Otsid oma krüpteeritud kirju? Paigalda <a href=\"https://www.mailvelope.com/\" target=\"_blank\">brauseri lisaprogramm Mailvelope</a>!",
+    "No messages in this folder!" : "Selles kaustas kirju pole!",
+    "No search results for {{searchTerm}}" : "Otsing {{searchTerm}} ei andnud tulemusi",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Edasi saamine %s-le - kliki siia kui sind ei suunata automaatselt mõne järgmise sekundi jooksul edasi.",
     "Redirect Warning" : "Edasisuunamise hoiatus",
     "The previous page is sending you to %s." : "Eelmine lehekülg suunab sind %s.",
diff --git a/l10n/fi_FI.js b/l10n/fi_FI.js
index c4901d97c..9fbda5ecf 100644
--- a/l10n/fi_FI.js
+++ b/l10n/fi_FI.js
@@ -2,9 +2,14 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Sähköposti",
-    "Error while loading the accounts." : "Virhe tilejä ladatessa.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n uusi viesti kansiossa {folderName},\nlähettäjä {from}","%n uutta viestiä kansiossa {folderName},\nlähettäjä {from}"],
+    "Error while loading the accounts." : "Virhe tilejä ladatessa.",
+    "Connecting …" : "Yhdistetään…",
+    "Unknown error" : "Tuntematon virhe",
+    "Error while creating an account: " : "Virhe tiliä luotaessa:",
+    "Connect" : "Yhdistä",
+    "Message could not be starred. Please try again." : "Tähden lisääminen viestille epäonnistui. Yritä uudelleen.",
     "Error while loading the selected account." : "Virhe ladatessa valittua tiliä.",
     "Error while loading messages." : "Virhe viestejä ladatessa.",
     "Choose a folder to store the attachment in" : "Valitse kansio liitetiedoston tallentamiselle",
@@ -16,24 +21,20 @@ OC.L10N.register(
     "Forwarded message" : "Edelleenlähetetty viesti",
     "Error while loading the selected message." : "Virhe ladatessa valittua viestiä.",
     "Draft saved!" : "Luonnos tallennettu!",
-    "Connecting …" : "Yhdistetään…",
-    "Unknown error" : "Tuntematon virhe",
-    "Error while creating an account: " : "Virhe tiliä luotaessa:",
-    "Connect" : "Yhdistä",
-    "Error while deleting account." : "Virhe tiliä poistaessa.",
     "Choose a file to add as attachment" : "Valitse liitteeksi lisättävä tiedosto",
     "Reply" : "Vastaa",
     "Send" : "Lähetä",
     "Sending …" : "Lähetetään…",
     "Message sent!" : "Viesti lähetetty!",
+    "Server error" : "Palvelinvirhe",
     "you" : "sinä",
     "Send message to {email}" : "Lähetä viesti osoitteeseen {email}",
-    "Message could not be starred. Please try again." : "Tähden lisääminen viestille epäonnistui. Yritä uudelleen.",
     "Error while deleting message." : "Virhe viestiä poistaessa.",
     "Checking messages …" : "Tarkistetaan viestejä…",
     "Loading …" : "Ladataan…",
     "Load more …" : "Lataa lisää…",
     "Check messages …" : "Tarkista viestit…",
+    "Error while deleting account." : "Virhe tiliä poistaessa.",
     "Inbox" : "Saapuneet",
     "Sent" : "Lähetetty",
     "Drafts" : "Luonnokset",
@@ -55,15 +56,6 @@ OC.L10N.register(
     "Back to website" : "Takaisin verkkosivustolle",
     "Add attachment from Files" : "Lisää liite tiedostosovelluksesta",
     "Error loading message" : "Virhe viestiä ladatessa",
-    "Download attachment" : "Lataa liite",
-    "Save to Files" : "Tallenna tiedostosovellukseen",
-    "Save all to Files" : "Tallenna kaikki tiedostosovellukseen",
-    "Forward" : "Välitä",
-    "Delete" : "Poista",
-    "Add mail account" : "Lisää sähköpostitili",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Aiotko salata sähköpostisi? Asenna <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope-selainlaajennus</a>!",
-    "No search results for {{searchTerm}}" : "Ei tuloksia haulle {{searchTerm}}",
-    "No messages in this folder!" : "Tässä kansiossa ei ole viestejä!",
     "New message" : "Uusi viesti",
     "Connect your mail account" : "Yhdistä sähköpostitilisi",
     "Name" : "Nimi",
@@ -83,6 +75,15 @@ OC.L10N.register(
     "SMTP Port (default 25, ssl 465)" : "SMTP-portti (oletus 25, ssl 465)",
     "SMTP User" : "SMTP-käyttäjä",
     "SMTP Password" : "SMTP-salasana",
+    "Download attachment" : "Lataa liite",
+    "Save to Files" : "Tallenna tiedostosovellukseen",
+    "Save all to Files" : "Tallenna kaikki tiedostosovellukseen",
+    "Forward" : "Välitä",
+    "Delete" : "Poista",
+    "Add mail account" : "Lisää sähköpostitili",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Aiotko salata sähköpostisi? Asenna <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope-selainlaajennus</a>!",
+    "No messages in this folder!" : "Tässä kansiossa ei ole viestejä!",
+    "No search results for {{searchTerm}}" : "Ei tuloksia haulle {{searchTerm}}",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Ohjataan edelleen kohteeseen %s - napsauta tästä, jos uudelleenohjaus ei tapahdu muutaman sekunnin kuluessa.",
     "Redirect Warning" : "Varoitus uudelleenohjauksesta",
     "The previous page is sending you to %s." : "Edellinen sivu pyrkii lähettämään sinut sivulle %s.",
diff --git a/l10n/fi_FI.json b/l10n/fi_FI.json
index 4db773aaf..c9389765f 100644
--- a/l10n/fi_FI.json
+++ b/l10n/fi_FI.json
@@ -1,8 +1,13 @@
 { "translations": {
     "Mail" : "Sähköposti",
-    "Error while loading the accounts." : "Virhe tilejä ladatessa.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n uusi viesti kansiossa {folderName},\nlähettäjä {from}","%n uutta viestiä kansiossa {folderName},\nlähettäjä {from}"],
+    "Error while loading the accounts." : "Virhe tilejä ladatessa.",
+    "Connecting …" : "Yhdistetään…",
+    "Unknown error" : "Tuntematon virhe",
+    "Error while creating an account: " : "Virhe tiliä luotaessa:",
+    "Connect" : "Yhdistä",
+    "Message could not be starred. Please try again." : "Tähden lisääminen viestille epäonnistui. Yritä uudelleen.",
     "Error while loading the selected account." : "Virhe ladatessa valittua tiliä.",
     "Error while loading messages." : "Virhe viestejä ladatessa.",
     "Choose a folder to store the attachment in" : "Valitse kansio liitetiedoston tallentamiselle",
@@ -14,24 +19,20 @@
     "Forwarded message" : "Edelleenlähetetty viesti",
     "Error while loading the selected message." : "Virhe ladatessa valittua viestiä.",
     "Draft saved!" : "Luonnos tallennettu!",
-    "Connecting …" : "Yhdistetään…",
-    "Unknown error" : "Tuntematon virhe",
-    "Error while creating an account: " : "Virhe tiliä luotaessa:",
-    "Connect" : "Yhdistä",
-    "Error while deleting account." : "Virhe tiliä poistaessa.",
     "Choose a file to add as attachment" : "Valitse liitteeksi lisättävä tiedosto",
     "Reply" : "Vastaa",
     "Send" : "Lähetä",
     "Sending …" : "Lähetetään…",
     "Message sent!" : "Viesti lähetetty!",
+    "Server error" : "Palvelinvirhe",
     "you" : "sinä",
     "Send message to {email}" : "Lähetä viesti osoitteeseen {email}",
-    "Message could not be starred. Please try again." : "Tähden lisääminen viestille epäonnistui. Yritä uudelleen.",
     "Error while deleting message." : "Virhe viestiä poistaessa.",
     "Checking messages …" : "Tarkistetaan viestejä…",
     "Loading …" : "Ladataan…",
     "Load more …" : "Lataa lisää…",
     "Check messages …" : "Tarkista viestit…",
+    "Error while deleting account." : "Virhe tiliä poistaessa.",
     "Inbox" : "Saapuneet",
     "Sent" : "Lähetetty",
     "Drafts" : "Luonnokset",
@@ -53,15 +54,6 @@
     "Back to website" : "Takaisin verkkosivustolle",
     "Add attachment from Files" : "Lisää liite tiedostosovelluksesta",
     "Error loading message" : "Virhe viestiä ladatessa",
-    "Download attachment" : "Lataa liite",
-    "Save to Files" : "Tallenna tiedostosovellukseen",
-    "Save all to Files" : "Tallenna kaikki tiedostosovellukseen",
-    "Forward" : "Välitä",
-    "Delete" : "Poista",
-    "Add mail account" : "Lisää sähköpostitili",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Aiotko salata sähköpostisi? Asenna <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope-selainlaajennus</a>!",
-    "No search results for {{searchTerm}}" : "Ei tuloksia haulle {{searchTerm}}",
-    "No messages in this folder!" : "Tässä kansiossa ei ole viestejä!",
     "New message" : "Uusi viesti",
     "Connect your mail account" : "Yhdistä sähköpostitilisi",
     "Name" : "Nimi",
@@ -81,6 +73,15 @@
     "SMTP Port (default 25, ssl 465)" : "SMTP-portti (oletus 25, ssl 465)",
     "SMTP User" : "SMTP-käyttäjä",
     "SMTP Password" : "SMTP-salasana",
+    "Download attachment" : "Lataa liite",
+    "Save to Files" : "Tallenna tiedostosovellukseen",
+    "Save all to Files" : "Tallenna kaikki tiedostosovellukseen",
+    "Forward" : "Välitä",
+    "Delete" : "Poista",
+    "Add mail account" : "Lisää sähköpostitili",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Aiotko salata sähköpostisi? Asenna <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope-selainlaajennus</a>!",
+    "No messages in this folder!" : "Tässä kansiossa ei ole viestejä!",
+    "No search results for {{searchTerm}}" : "Ei tuloksia haulle {{searchTerm}}",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Ohjataan edelleen kohteeseen %s - napsauta tästä, jos uudelleenohjaus ei tapahdu muutaman sekunnin kuluessa.",
     "Redirect Warning" : "Varoitus uudelleenohjauksesta",
     "The previous page is sending you to %s." : "Edellinen sivu pyrkii lähettämään sinut sivulle %s.",
diff --git a/l10n/fr.js b/l10n/fr.js
index 13065b385..df9698326 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -2,9 +2,14 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Mail",
-    "Error while loading the accounts." : "Erreur lors du chargement des comptes.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n nouveau message dans {folderName}\nde {from}","%n nouveaux messages dans {folderName}\nde {from}"],
+    "Error while loading the accounts." : "Erreur lors du chargement des comptes.",
+    "Connecting …" : "Connexion en cours ...",
+    "Unknown error" : "Erreur inconnue",
+    "Error while creating an account: " : "Erreur lors de la création du compte :",
+    "Connect" : "Connecter",
+    "Message could not be starred. Please try again." : "Le message n'a pu être placé parmi les favoris. Veuillez essayer à nouveau.",
     "Error while loading the selected account." : "Erreur lors du chargement du compte sélectionné.",
     "Error while loading messages." : "Erreur lors du chargement des messages.",
     "Choose a folder to store the attachment in" : "Choisissez le dossier dans lequel enregistrer la pièce jointe",
@@ -16,24 +21,20 @@ OC.L10N.register(
     "Forwarded message" : "Message transféré",
     "Error while loading the selected message." : "Erreur lors du chargement du message sélectionné.",
     "Draft saved!" : "Brouillon sauvegardé!",
-    "Connecting …" : "Connexion en cours ...",
-    "Unknown error" : "Erreur inconnue",
-    "Error while creating an account: " : "Erreur lors de la création du compte :",
-    "Connect" : "Connecter",
-    "Error while deleting account." : "Erreur lors de la suppression du compte.",
     "Choose a file to add as attachment" : "Choisissez un fichier à joindre au message",
     "Reply" : "Répondre",
     "Send" : "Envoyer",
     "Sending …" : "Envoi ...",
     "Message sent!" : "Message envoyé !",
+    "Server error" : "Erreur du serveur",
     "you" : "vous",
     "Send message to {email}" : "Envoyer un mail à {email}",
-    "Message could not be starred. Please try again." : "Le message n'a pu être placé parmi les favoris. Veuillez essayer à nouveau.",
     "Error while deleting message." : "Erreur lors de la suppression du message.",
     "Checking messages …" : "Relève du courrier...",
     "Loading …" : "Chargement ...",
     "Load more …" : "Charger plus ...",
     "Check messages …" : "Relever le courrier",
+    "Error while deleting account." : "Erreur lors de la suppression du compte.",
     "Inbox" : "Boîte de réception",
     "Sent" : "Envoyés",
     "Drafts" : "Brouillons",
@@ -58,15 +59,6 @@ OC.L10N.register(
     "Back to website" : "Retour au site web",
     "Add attachment from Files" : "Ajouter une pièce jointe depuis les Fichiers",
     "Error loading message" : "Erreur lors du chargement du message",
-    "Download attachment" : "Télécharger la pièce jointe",
-    "Save to Files" : "Enregistrer dans les Fichiers",
-    "Save all to Files" : "Tout enregistrer dans les Fichiers",
-    "Forward" : "Transférer",
-    "Delete" : "Supprimer",
-    "Add mail account" : "Ajouter un compte email",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Désirez-vous chiffrer vos messages ? Installez <a href=\"https://www.mailvelope.com/\" target=\"_blank\">le module complémentaire Mailvelope</a> dans votre navigateur !",
-    "No search results for {{searchTerm}}" : "Aucun résultat pour {{searchTerm}}",
-    "No messages in this folder!" : "Aucun message dans ce dossier !",
     "New message" : "Nouveau message",
     "Connect your mail account" : "Connecter votre compte email",
     "Name" : "Nom",
@@ -86,6 +78,15 @@ OC.L10N.register(
     "SMTP Port (default 25, ssl 465)" : "Port SMTP (Défaut 25, ssl 465)",
     "SMTP User" : "Utilisateur SMTP",
     "SMTP Password" : "Mot de passe SMTP",
+    "Download attachment" : "Télécharger la pièce jointe",
+    "Save to Files" : "Enregistrer dans les Fichiers",
+    "Save all to Files" : "Tout enregistrer dans les Fichiers",
+    "Forward" : "Transférer",
+    "Delete" : "Supprimer",
+    "Add mail account" : "Ajouter un compte email",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Désirez-vous chiffrer vos messages ? Installez <a href=\"https://www.mailvelope.com/\" target=\"_blank\">le module complémentaire Mailvelope</a> dans votre navigateur !",
+    "No messages in this folder!" : "Aucun message dans ce dossier !",
+    "No search results for {{searchTerm}}" : "Aucun résultat pour {{searchTerm}}",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Vous allez être redirigé vers %s - Cliquez ici si vous n'êtes pas redirigé dans les secondes qui suivent.",
     "Redirect Warning" : "Avertissement de redirection",
     "The previous page is sending you to %s." : "La page précédente vous envoie vers %s.",
diff --git a/l10n/fr.json b/l10n/fr.json
index 144dc065f..7862f527f 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -1,8 +1,13 @@
 { "translations": {
     "Mail" : "Mail",
-    "Error while loading the accounts." : "Erreur lors du chargement des comptes.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n nouveau message dans {folderName}\nde {from}","%n nouveaux messages dans {folderName}\nde {from}"],
+    "Error while loading the accounts." : "Erreur lors du chargement des comptes.",
+    "Connecting …" : "Connexion en cours ...",
+    "Unknown error" : "Erreur inconnue",
+    "Error while creating an account: " : "Erreur lors de la création du compte :",
+    "Connect" : "Connecter",
+    "Message could not be starred. Please try again." : "Le message n'a pu être placé parmi les favoris. Veuillez essayer à nouveau.",
     "Error while loading the selected account." : "Erreur lors du chargement du compte sélectionné.",
     "Error while loading messages." : "Erreur lors du chargement des messages.",
     "Choose a folder to store the attachment in" : "Choisissez le dossier dans lequel enregistrer la pièce jointe",
@@ -14,24 +19,20 @@
     "Forwarded message" : "Message transféré",
     "Error while loading the selected message." : "Erreur lors du chargement du message sélectionné.",
     "Draft saved!" : "Brouillon sauvegardé!",
-    "Connecting …" : "Connexion en cours ...",
-    "Unknown error" : "Erreur inconnue",
-    "Error while creating an account: " : "Erreur lors de la création du compte :",
-    "Connect" : "Connecter",
-    "Error while deleting account." : "Erreur lors de la suppression du compte.",
     "Choose a file to add as attachment" : "Choisissez un fichier à joindre au message",
     "Reply" : "Répondre",
     "Send" : "Envoyer",
     "Sending …" : "Envoi ...",
     "Message sent!" : "Message envoyé !",
+    "Server error" : "Erreur du serveur",
     "you" : "vous",
     "Send message to {email}" : "Envoyer un mail à {email}",
-    "Message could not be starred. Please try again." : "Le message n'a pu être placé parmi les favoris. Veuillez essayer à nouveau.",
     "Error while deleting message." : "Erreur lors de la suppression du message.",
     "Checking messages …" : "Relève du courrier...",
     "Loading …" : "Chargement ...",
     "Load more …" : "Charger plus ...",
     "Check messages …" : "Relever le courrier",
+    "Error while deleting account." : "Erreur lors de la suppression du compte.",
     "Inbox" : "Boîte de réception",
     "Sent" : "Envoyés",
     "Drafts" : "Brouillons",
@@ -56,15 +57,6 @@
     "Back to website" : "Retour au site web",
     "Add attachment from Files" : "Ajouter une pièce jointe depuis les Fichiers",
     "Error loading message" : "Erreur lors du chargement du message",
-    "Download attachment" : "Télécharger la pièce jointe",
-    "Save to Files" : "Enregistrer dans les Fichiers",
-    "Save all to Files" : "Tout enregistrer dans les Fichiers",
-    "Forward" : "Transférer",
-    "Delete" : "Supprimer",
-    "Add mail account" : "Ajouter un compte email",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Désirez-vous chiffrer vos messages ? Installez <a href=\"https://www.mailvelope.com/\" target=\"_blank\">le module complémentaire Mailvelope</a> dans votre navigateur !",
-    "No search results for {{searchTerm}}" : "Aucun résultat pour {{searchTerm}}",
-    "No messages in this folder!" : "Aucun message dans ce dossier !",
     "New message" : "Nouveau message",
     "Connect your mail account" : "Connecter votre compte email",
     "Name" : "Nom",
@@ -84,6 +76,15 @@
     "SMTP Port (default 25, ssl 465)" : "Port SMTP (Défaut 25, ssl 465)",
     "SMTP User" : "Utilisateur SMTP",
     "SMTP Password" : "Mot de passe SMTP",
+    "Download attachment" : "Télécharger la pièce jointe",
+    "Save to Files" : "Enregistrer dans les Fichiers",
+    "Save all to Files" : "Tout enregistrer dans les Fichiers",
+    "Forward" : "Transférer",
+    "Delete" : "Supprimer",
+    "Add mail account" : "Ajouter un compte email",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Désirez-vous chiffrer vos messages ? Installez <a href=\"https://www.mailvelope.com/\" target=\"_blank\">le module complémentaire Mailvelope</a> dans votre navigateur !",
+    "No messages in this folder!" : "Aucun message dans ce dossier !",
+    "No search results for {{searchTerm}}" : "Aucun résultat pour {{searchTerm}}",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Vous allez être redirigé vers %s - Cliquez ici si vous n'êtes pas redirigé dans les secondes qui suivent.",
     "Redirect Warning" : "Avertissement de redirection",
     "The previous page is sending you to %s." : "La page précédente vous envoie vers %s.",
diff --git a/l10n/gl.js b/l10n/gl.js
index 3216a9372..d895943d5 100644
--- a/l10n/gl.js
+++ b/l10n/gl.js
@@ -2,9 +2,14 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Correo",
-    "Error while loading the accounts." : "Produciuse un erro mentres cargaba as contas.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n mensaxe nova en {folderName} \nde {from}","%n mensaxes novas en {folderName} \nde {from}"],
+    "Error while loading the accounts." : "Produciuse un erro mentres cargaba as contas.",
+    "Connecting …" : "Conectando ...",
+    "Unknown error" : "Produciuse un erro descoñecido",
+    "Error while creating an account: " : "produciuse un erro mentres creaba unha conta:",
+    "Connect" : "Conectar",
+    "Message could not be starred. Please try again." : "A mensaxe non foi destacada. Ténteo de novo.",
     "Error while loading the selected account." : "Produciuse un erro ao cargar a conta seleccionada.",
     "Error while loading messages." : "Produciuse un erro mentres cargaba as mensaxes.",
     "Choose a folder to store the attachment in" : "Escolla un cartafol no que gardar o anexo de entrada",
@@ -16,24 +21,20 @@ OC.L10N.register(
     "Forwarded message" : "Mensaxe reenviado",
     "Error while loading the selected message." : "Produciuse un erro mentres cargaba a mensaxe seleccionada.",
     "Draft saved!" : "Gardouse o borrador!",
-    "Connecting …" : "Conectando ...",
-    "Unknown error" : "Produciuse un erro descoñecido",
-    "Error while creating an account: " : "produciuse un erro mentres creaba unha conta:",
-    "Connect" : "Conectar",
-    "Error while deleting account." : "Produciuse un erro ao eliminar a conta.",
     "Choose a file to add as attachment" : "Escolla un ficheiro para engadir como anexo",
     "Reply" : "Responder",
     "Send" : "Enviar",
     "Sending …" : "Enviando ...",
     "Message sent!" : "Mensaxe enviada!",
+    "Server error" : "Produciuse un erro de servidor",
     "you" : "vostede",
     "Send message to {email}" : "Enviar mensaxe a {email}",
-    "Message could not be starred. Please try again." : "A mensaxe non foi destacada. Ténteo de novo.",
     "Error while deleting message." : "Produciuse un erro ao eliminar a mensaxe.",
     "Checking messages …" : "Comprobando as mensaxes ...",
     "Loading …" : "Cargando ...",
     "Load more …" : "Cargar máis ...",
     "Check messages …" : "Comprobar mensaxes ...",
+    "Error while deleting account." : "Produciuse un erro ao eliminar a conta.",
     "Inbox" : "Bandexa de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -58,15 +59,6 @@ OC.L10N.register(
     "Back to website" : "Volver ao sitio web",
     "Add attachment from Files" : "Engadir anexo(s) desde Ficheiros",
     "Error loading message" : "Produciuse un erro ao cargar a mensaxe",
-    "Download attachment" : "Descargar o anexo",
-    "Save to Files" : "Gardar en Ficheiros",
-    "Save all to Files" : "Gardar todo en Ficheiros",
-    "Forward" : "Reenviar",
-    "Delete" : "Eliminar",
-    "Add mail account" : "Engadir unha conta de correo",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Vendo a posibilidade de cifrar os seus correos? Instale a <a href=\"https://www.mailvelope.com/\" target=\"_blank\">extensión do navegador Mailvelope</a>!",
-    "No search results for {{searchTerm}}" : "Sen resultados na busca de {{searchTerm}}",
-    "No messages in this folder!" : "Non hai mensaxes neste cartafol!",
     "New message" : "Mensaxe nova",
     "Connect your mail account" : "Conectar a súa conta de correo",
     "Name" : "Nome",
@@ -86,6 +78,15 @@ OC.L10N.register(
     "SMTP Port (default 25, ssl 465)" : "Porto SMTP (predeterminado o 25, SSL o 465)",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contrasinal SMTP",
+    "Download attachment" : "Descargar o anexo",
+    "Save to Files" : "Gardar en Ficheiros",
+    "Save all to Files" : "Gardar todo en Ficheiros",
+    "Forward" : "Reenviar",
+    "Delete" : "Eliminar",
+    "Add mail account" : "Engadir unha conta de correo",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Vendo a posibilidade de cifrar os seus correos? Instale a <a href=\"https://www.mailvelope.com/\" target=\"_blank\">extensión do navegador Mailvelope</a>!",
+    "No messages in this folder!" : "Non hai mensaxes neste cartafol!",
+    "No search results for {{searchTerm}}" : "Sen resultados na busca de {{searchTerm}}",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Dirixíndoo a %s - prema aquí se non é redirixido automaticamente nuns segundos.",
     "Redirect Warning" : "Aviso de redireccionamento",
     "The previous page is sending you to %s." : "Estalle a enviar a páxina anterior a %s.",
diff --git a/l10n/gl.json b/l10n/gl.json
index 500ad62b3..567accc5b 100644
--- a/l10n/gl.json
+++ b/l10n/gl.json
@@ -1,8 +1,13 @@
 { "translations": {
     "Mail" : "Correo",
-    "Error while loading the accounts." : "Produciuse un erro mentres cargaba as contas.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n mensaxe nova en {folderName} \nde {from}","%n mensaxes novas en {folderName} \nde {from}"],
+    "Error while loading the accounts." : "Produciuse un erro mentres cargaba as contas.",
+    "Connecting …" : "Conectando ...",
+    "Unknown error" : "Produciuse un erro descoñecido",
+    "Error while creating an account: " : "produciuse un erro mentres creaba unha conta:",
+    "Connect" : "Conectar",
+    "Message could not be starred. Please try again." : "A mensaxe non foi destacada. Ténteo de novo.",
     "Error while loading the selected account." : "Produciuse un erro ao cargar a conta seleccionada.",
     "Error while loading messages." : "Produciuse un erro mentres cargaba as mensaxes.",
     "Choose a folder to store the attachment in" : "Escolla un cartafol no que gardar o anexo de entrada",
@@ -14,24 +19,20 @@
     "Forwarded message" : "Mensaxe reenviado",
     "Error while loading the selected message." : "Produciuse un erro mentres cargaba a mensaxe seleccionada.",
     "Draft saved!" : "Gardouse o borrador!",
-    "Connecting …" : "Conectando ...",
-    "Unknown error" : "Produciuse un erro descoñecido",
-    "Error while creating an account: " : "produciuse un erro mentres creaba unha conta:",
-    "Connect" : "Conectar",
-    "Error while deleting account." : "Produciuse un erro ao eliminar a conta.",
     "Choose a file to add as attachment" : "Escolla un ficheiro para engadir como anexo",
     "Reply" : "Responder",
     "Send" : "Enviar",
     "Sending …" : "Enviando ...",
     "Message sent!" : "Mensaxe enviada!",
+    "Server error" : "Produciuse un erro de servidor",
     "you" : "vostede",
     "Send message to {email}" : "Enviar mensaxe a {email}",
-    "Message could not be starred. Please try again." : "A mensaxe non foi destacada. Ténteo de novo.",
     "Error while deleting message." : "Produciuse un erro ao eliminar a mensaxe.",
     "Checking messages …" : "Comprobando as mensaxes ...",
     "Loading …" : "Cargando ...",
     "Load more …" : "Cargar máis ...",
     "Check messages …" : "Comprobar mensaxes ...",
+    "Error while deleting account." : "Produciuse un erro ao eliminar a conta.",
     "Inbox" : "Bandexa de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -56,15 +57,6 @@
     "Back to website" : "Volver ao sitio web",
     "Add attachment from Files" : "Engadir anexo(s) desde Ficheiros",
     "Error loading message" : "Produciuse un erro ao cargar a mensaxe",
-    "Download attachment" : "Descargar o anexo",
-    "Save to Files" : "Gardar en Ficheiros",
-    "Save all to Files" : "Gardar todo en Ficheiros",
-    "Forward" : "Reenviar",
-    "Delete" : "Eliminar",
-    "Add mail account" : "Engadir unha conta de correo",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Vendo a posibilidade de cifrar os seus correos? Instale a <a href=\"https://www.mailvelope.com/\" target=\"_blank\">extensión do navegador Mailvelope</a>!",
-    "No search results for {{searchTerm}}" : "Sen resultados na busca de {{searchTerm}}",
-    "No messages in this folder!" : "Non hai mensaxes neste cartafol!",
     "New message" : "Mensaxe nova",
     "Connect your mail account" : "Conectar a súa conta de correo",
     "Name" : "Nome",
@@ -84,6 +76,15 @@
     "SMTP Port (default 25, ssl 465)" : "Porto SMTP (predeterminado o 25, SSL o 465)",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contrasinal SMTP",
+    "Download attachment" : "Descargar o anexo",
+    "Save to Files" : "Gardar en Ficheiros",
+    "Save all to Files" : "Gardar todo en Ficheiros",
+    "Forward" : "Reenviar",
+    "Delete" : "Eliminar",
+    "Add mail account" : "Engadir unha conta de correo",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Vendo a posibilidade de cifrar os seus correos? Instale a <a href=\"https://www.mailvelope.com/\" target=\"_blank\">extensión do navegador Mailvelope</a>!",
+    "No messages in this folder!" : "Non hai mensaxes neste cartafol!",
+    "No search results for {{searchTerm}}" : "Sen resultados na busca de {{searchTerm}}",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Dirixíndoo a %s - prema aquí se non é redirixido automaticamente nuns segundos.",
     "Redirect Warning" : "Aviso de redireccionamento",
     "The previous page is sending you to %s." : "Estalle a enviar a páxina anterior a %s.",
diff --git a/l10n/id.js b/l10n/id.js
index 75f653daa..c594932aa 100644
--- a/l10n/id.js
+++ b/l10n/id.js
@@ -2,9 +2,14 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Email",
-    "Error while loading the accounts." : "Terjadi kesalahan saat memuat akun.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n pesan baru di {folderName} \ndari {from}"],
+    "Error while loading the accounts." : "Terjadi kesalahan saat memuat akun.",
+    "Connecting …" : "Menghubungkan...",
+    "Unknown error" : "Kesalahan tidak diketahui",
+    "Error while creating an account: " : "Terjadi kesalahan saat memuat sebuah akun:",
+    "Connect" : "Sambungkan",
+    "Message could not be starred. Please try again." : "Pesan tidak dapat dibintangi. Silakan coba lagi.",
     "Error while loading the selected account." : "Terjadi kesalahan saat memuat akun terpilih.",
     "Error while loading messages." : "Terjadi kesalahan saat memuat pesan.",
     "Choose a folder to store the attachment in" : "Pilih folder untuk menyimpan lampiran didalamnya",
@@ -16,24 +21,20 @@ OC.L10N.register(
     "Forwarded message" : "Pesan Teralihkan",
     "Error while loading the selected message." : "Terjadi kesalahan saat memuat pesan terpilih.",
     "Draft saved!" : "Draf disimpan!",
-    "Connecting …" : "Menghubungkan...",
-    "Unknown error" : "Kesalahan tidak diketahui",
-    "Error while creating an account: " : "Terjadi kesalahan saat memuat sebuah akun:",
-    "Connect" : "Sambungkan",
-    "Error while deleting account." : "Terjadi kesalahan saat menghapus akun.",
     "Choose a file to add as attachment" : "Pilih berkas untuk ditambahkan sebagai lampiran",
     "Reply" : "Balas",
     "Send" : "Kirim",
     "Sending …" : "Mengirim ...",
     "Message sent!" : "Kirim pesan!",
+    "Server error" : "Kesalahan server",
     "you" : "Anda",
     "Send message to {email}" : "Kirim pesan ke {email}",
-    "Message could not be starred. Please try again." : "Pesan tidak dapat dibintangi. Silakan coba lagi.",
     "Error while deleting message." : "Terjadi kesalahan saat menghapus pesan.",
     "Checking messages …" : "Memeriksa pasan ...",
     "Loading …" : "Memuat ...",
     "Load more …" : "Muat lebih banyak ...",
     "Check messages …" : "Periksa pesan ...",
+    "Error while deleting account." : "Terjadi kesalahan saat menghapus akun.",
     "Inbox" : "Kotak masuk",
     "Sent" : "Kirim",
     "Drafts" : "Konsep",
@@ -58,15 +59,6 @@ OC.L10N.register(
     "Back to website" : "Kembali ke situs web",
     "Add attachment from Files" : "Tambahkan lampiran dari Berkas",
     "Error loading message" : "Terjadi kesalahan saat memuat pesan",
-    "Download attachment" : "Unduh lampiran",
-    "Save to Files" : "Simpan ke Berkas",
-    "Save all to Files" : "Simpan semua ke Berkas",
-    "Forward" : "Teruskan",
-    "Delete" : "Hapus",
-    "Add mail account" : "Tambah akun email",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Ingin mengenkripsi email Anda? Instal <a href=\"https://www.mailvelope.com/\" target=\"_blank\">ekstensi peramban Mailvelope</a>!",
-    "No search results for {{searchTerm}}" : "Tidak ada hasil pencarian untuk {{searchTerm}}",
-    "No messages in this folder!" : "Tidak ada pesan didalam folder ini!",
     "New message" : "Pesan baru",
     "Connect your mail account" : "Hubungkan akun email anda",
     "Name" : "Nama",
@@ -86,6 +78,15 @@ OC.L10N.register(
     "SMTP Port (default 25, ssl 465)" : "Port SMTP (default 25, ssl 465)",
     "SMTP User" : "Pengguna SMTP",
     "SMTP Password" : "Sandi SMTP",
+    "Download attachment" : "Unduh lampiran",
+    "Save to Files" : "Simpan ke Berkas",
+    "Save all to Files" : "Simpan semua ke Berkas",
+    "Forward" : "Teruskan",
+    "Delete" : "Hapus",
+    "Add mail account" : "Tambah akun email",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Ingin mengenkripsi email Anda? Instal <a href=\"https://www.mailvelope.com/\" target=\"_blank\">ekstensi peramban Mailvelope</a>!",
+    "No messages in this folder!" : "Tidak ada pesan didalam folder ini!",
+    "No search results for {{searchTerm}}" : "Tidak ada hasil pencarian untuk {{searchTerm}}",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Meneruskan Anda ke %s - klik disini jika Anda tidak secara otomatis dialihkan dalam beberapa detik kemudian.",
     "Redirect Warning" : "Peringatan Pengalihan",
     "The previous page is sending you to %s." : "Halaman sebelumnya mengirim Anda ke %s.",
diff --git a/l10n/id.json b/l10n/id.json
index 30b2e318f..94e4bf08a 100644
--- a/l10n/id.json
+++ b/l10n/id.json
@@ -1,8 +1,13 @@
 { "translations": {
     "Mail" : "Email",
-    "Error while loading the accounts." : "Terjadi kesalahan saat memuat akun.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n pesan baru di {folderName} \ndari {from}"],
+    "Error while loading the accounts." : "Terjadi kesalahan saat memuat akun.",
+    "Connecting …" : "Menghubungkan...",
+    "Unknown error" : "Kesalahan tidak diketahui",
+    "Error while creating an account: " : "Terjadi kesalahan saat memuat sebuah akun:",
+    "Connect" : "Sambungkan",
+    "Message could not be starred. Please try again." : "Pesan tidak dapat dibintangi. Silakan coba lagi.",
     "Error while loading the selected account." : "Terjadi kesalahan saat memuat akun terpilih.",
     "Error while loading messages." : "Terjadi kesalahan saat memuat pesan.",
     "Choose a folder to store the attachment in" : "Pilih folder untuk menyimpan lampiran didalamnya",
@@ -14,24 +19,20 @@
     "Forwarded message" : "Pesan Teralihkan",
     "Error while loading the selected message." : "Terjadi kesalahan saat memuat pesan terpilih.",
     "Draft saved!" : "Draf disimpan!",
-    "Connecting …" : "Menghubungkan...",
-    "Unknown error" : "Kesalahan tidak diketahui",
-    "Error while creating an account: " : "Terjadi kesalahan saat memuat sebuah akun:",
-    "Connect" : "Sambungkan",
-    "Error while deleting account." : "Terjadi kesalahan saat menghapus akun.",
     "Choose a file to add as attachment" : "Pilih berkas untuk ditambahkan sebagai lampiran",
     "Reply" : "Balas",
     "Send" : "Kirim",
     "Sending …" : "Mengirim ...",
     "Message sent!" : "Kirim pesan!",
+    "Server error" : "Kesalahan server",
     "you" : "Anda",
     "Send message to {email}" : "Kirim pesan ke {email}",
-    "Message could not be starred. Please try again." : "Pesan tidak dapat dibintangi. Silakan coba lagi.",
     "Error while deleting message." : "Terjadi kesalahan saat menghapus pesan.",
     "Checking messages …" : "Memeriksa pasan ...",
     "Loading …" : "Memuat ...",
     "Load more …" : "Muat lebih banyak ...",
     "Check messages …" : "Periksa pesan ...",
+    "Error while deleting account." : "Terjadi kesalahan saat menghapus akun.",
     "Inbox" : "Kotak masuk",
     "Sent" : "Kirim",
     "Drafts" : "Konsep",
@@ -56,15 +57,6 @@
     "Back to website" : "Kembali ke situs web",
     "Add attachment from Files" : "Tambahkan lampiran dari Berkas",
     "Error loading message" : "Terjadi kesalahan saat memuat pesan",
-    "Download attachment" : "Unduh lampiran",
-    "Save to Files" : "Simpan ke Berkas",
-    "Save all to Files" : "Simpan semua ke Berkas",
-    "Forward" : "Teruskan",
-    "Delete" : "Hapus",
-    "Add mail account" : "Tambah akun email",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Ingin mengenkripsi email Anda? Instal <a href=\"https://www.mailvelope.com/\" target=\"_blank\">ekstensi peramban Mailvelope</a>!",
-    "No search results for {{searchTerm}}" : "Tidak ada hasil pencarian untuk {{searchTerm}}",
-    "No messages in this folder!" : "Tidak ada pesan didalam folder ini!",
     "New message" : "Pesan baru",
     "Connect your mail account" : "Hubungkan akun email anda",
     "Name" : "Nama",
@@ -84,6 +76,15 @@
     "SMTP Port (default 25, ssl 465)" : "Port SMTP (default 25, ssl 465)",
     "SMTP User" : "Pengguna SMTP",
     "SMTP Password" : "Sandi SMTP",
+    "Download attachment" : "Unduh lampiran",
+    "Save to Files" : "Simpan ke Berkas",
+    "Save all to Files" : "Simpan semua ke Berkas",
+    "Forward" : "Teruskan",
+    "Delete" : "Hapus",
+    "Add mail account" : "Tambah akun email",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Ingin mengenkripsi email Anda? Instal <a href=\"https://www.mailvelope.com/\" target=\"_blank\">ekstensi peramban Mailvelope</a>!",
+    "No messages in this folder!" : "Tidak ada pesan didalam folder ini!",
+    "No search results for {{searchTerm}}" : "Tidak ada hasil pencarian untuk {{searchTerm}}",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Meneruskan Anda ke %s - klik disini jika Anda tidak secara otomatis dialihkan dalam beberapa detik kemudian.",
     "Redirect Warning" : "Peringatan Pengalihan",
     "The previous page is sending you to %s." : "Halaman sebelumnya mengirim Anda ke %s.",
diff --git a/l10n/it.js b/l10n/it.js
index 07e857f49..fee1d5f5e 100644
--- a/l10n/it.js
+++ b/l10n/it.js
@@ -2,9 +2,14 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Posta",
-    "Error while loading the accounts." : "Errore durante il caricamento degli account.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n nuovo messaggio in {folderName} \nda {from}","%n nuovi messaggi in {folderName} \nda {from}"],
+    "Error while loading the accounts." : "Errore durante il caricamento degli account.",
+    "Connecting …" : "Connessione in corso...",
+    "Unknown error" : "Errore sconosciuto",
+    "Error while creating an account: " : "Errore durante la creazione di un account:",
+    "Connect" : "Connetti",
+    "Message could not be starred. Please try again." : "Il messaggio non può essere aggiunto ai preferiti. Prova ancora.",
     "Error while loading the selected account." : "Errore durante il caricamento dell'account selezionato.",
     "Error while loading messages." : "Errore durante il caricamento dei messaggi.",
     "Choose a folder to store the attachment in" : "Scegli una cartella dove salvare l'allegato",
@@ -16,24 +21,20 @@ OC.L10N.register(
     "Forwarded message" : "Messaggio inoltrato",
     "Error while loading the selected message." : "Errore durante il caricamento del messaggio selezionato.",
     "Draft saved!" : "Bozza salvata!",
-    "Connecting …" : "Connessione in corso...",
-    "Unknown error" : "Errore sconosciuto",
-    "Error while creating an account: " : "Errore durante la creazione di un account:",
-    "Connect" : "Connetti",
-    "Error while deleting account." : "Errore durante l'eliminazione dell'account.",
     "Choose a file to add as attachment" : "Scegli un file da aggiungere come allegato",
     "Reply" : "Rispondi",
     "Send" : "Invia",
     "Sending …" : "Invio in corso...",
     "Message sent!" : "Messaggio inviato!",
+    "Server error" : "Errori di server",
     "you" : "tu",
     "Send message to {email}" : "Invia messaggio a {email}",
-    "Message could not be starred. Please try again." : "Il messaggio non può essere aggiunto ai preferiti. Prova ancora.",
     "Error while deleting message." : "Errore durante l'eliminazione del messaggio.",
     "Checking messages …" : "Controllo dei messaggi in corso...",
     "Loading …" : "Caricamento in corso...",
     "Load more …" : "Carica altro...",
     "Check messages …" : "Controlla i messaggi...",
+    "Error while deleting account." : "Errore durante l'eliminazione dell'account.",
     "Inbox" : "Posta in arrivo",
     "Sent" : "Posta inviata",
     "Drafts" : "Bozze",
@@ -58,15 +59,6 @@ OC.L10N.register(
     "Back to website" : "Ritorna al sito web",
     "Add attachment from Files" : "Aggiungi allegato da File",
     "Error loading message" : "Errore durante il caricamento del messaggio",
-    "Download attachment" : "Scarica allegato",
-    "Save to Files" : "Salva in File",
-    "Save all to Files" : "Salva tutto in File",
-    "Forward" : "Inoltra",
-    "Delete" : "Elimina",
-    "Add mail account" : "Aggiungi account di posta",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Intendi cifrare i tuoi messaggi di posta? Installa l'<a href=\"https://www.mailvelope.com/\" target=\"_blank\">estensione del browser Mailvelope</a>!",
-    "No search results for {{searchTerm}}" : "Nessun risultato di ricerca per {{searchTerm}}",
-    "No messages in this folder!" : "Nessun messaggio in questa cartella!",
     "New message" : "Nuovo messaggio",
     "Connect your mail account" : "Connetti il tuo account di posta",
     "Name" : "Nome",
@@ -86,6 +78,15 @@ OC.L10N.register(
     "SMTP Port (default 25, ssl 465)" : "Porta SMTP (predefinita 25, ssl 465)",
     "SMTP User" : "Utente SMTP",
     "SMTP Password" : "Password SMTP",
+    "Download attachment" : "Scarica allegato",
+    "Save to Files" : "Salva in File",
+    "Save all to Files" : "Salva tutto in File",
+    "Forward" : "Inoltra",
+    "Delete" : "Elimina",
+    "Add mail account" : "Aggiungi account di posta",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Intendi cifrare i tuoi messaggi di posta? Installa l'<a href=\"https://www.mailvelope.com/\" target=\"_blank\">estensione del browser Mailvelope</a>!",
+    "No messages in this folder!" : "Nessun messaggio in questa cartella!",
+    "No search results for {{searchTerm}}" : "Nessun risultato di ricerca per {{searchTerm}}",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Stai per essere inoltrato a %s - fai clic qui se la redirezione automatica non avviene entro pochi secondi.",
     "Redirect Warning" : "Avviso di redirezione",
     "The previous page is sending you to %s." : "La pagina precedente ti sta inviando su %s.",
diff --git a/l10n/it.json b/l10n/it.json
index ec137b242..1ebb28597 100644
--- a/l10n/it.json
+++ b/l10n/it.json
@@ -1,8 +1,13 @@
 { "translations": {
     "Mail" : "Posta",
-    "Error while loading the accounts." : "Errore durante il caricamento degli account.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n nuovo messaggio in {folderName} \nda {from}","%n nuovi messaggi in {folderName} \nda {from}"],
+    "Error while loading the accounts." : "Errore durante il caricamento degli account.",
+    "Connecting …" : "Connessione in corso...",
+    "Unknown error" : "Errore sconosciuto",
+    "Error while creating an account: " : "Errore durante la creazione di un account:",
+    "Connect" : "Connetti",
+    "Message could not be starred. Please try again." : "Il messaggio non può essere aggiunto ai preferiti. Prova ancora.",
     "Error while loading the selected account." : "Errore durante il caricamento dell'account selezionato.",
     "Error while loading messages." : "Errore durante il caricamento dei messaggi.",
     "Choose a folder to store the attachment in" : "Scegli una cartella dove salvare l'allegato",
@@ -14,24 +19,20 @@
     "Forwarded message" : "Messaggio inoltrato",
     "Error while loading the selected message." : "Errore durante il caricamento del messaggio selezionato.",
     "Draft saved!" : "Bozza salvata!",
-    "Connecting …" : "Connessione in corso...",
-    "Unknown error" : "Errore sconosciuto",
-    "Error while creating an account: " : "Errore durante la creazione di un account:",
-    "Connect" : "Connetti",
-    "Error while deleting account." : "Errore durante l'eliminazione dell'account.",
     "Choose a file to add as attachment" : "Scegli un file da aggiungere come allegato",
     "Reply" : "Rispondi",
     "Send" : "Invia",
     "Sending …" : "Invio in corso...",
     "Message sent!" : "Messaggio inviato!",
+    "Server error" : "Errori di server",
     "you" : "tu",
     "Send message to {email}" : "Invia messaggio a {email}",
-    "Message could not be starred. Please try again." : "Il messaggio non può essere aggiunto ai preferiti. Prova ancora.",
     "Error while deleting message." : "Errore durante l'eliminazione del messaggio.",
     "Checking messages …" : "Controllo dei messaggi in corso...",
     "Loading …" : "Caricamento in corso...",
     "Load more …" : "Carica altro...",
     "Check messages …" : "Controlla i messaggi...",
+    "Error while deleting account." : "Errore durante l'eliminazione dell'account.",
     "Inbox" : "Posta in arrivo",
     "Sent" : "Posta inviata",
     "Drafts" : "Bozze",
@@ -56,15 +57,6 @@
     "Back to website" : "Ritorna al sito web",
     "Add attachment from Files" : "Aggiungi allegato da File",
     "Error loading message" : "Errore durante il caricamento del messaggio",
-    "Download attachment" : "Scarica allegato",
-    "Save to Files" : "Salva in File",
-    "Save all to Files" : "Salva tutto in File",
-    "Forward" : "Inoltra",
-    "Delete" : "Elimina",
-    "Add mail account" : "Aggiungi account di posta",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Intendi cifrare i tuoi messaggi di posta? Installa l'<a href=\"https://www.mailvelope.com/\" target=\"_blank\">estensione del browser Mailvelope</a>!",
-    "No search results for {{searchTerm}}" : "Nessun risultato di ricerca per {{searchTerm}}",
-    "No messages in this folder!" : "Nessun messaggio in questa cartella!",
     "New message" : "Nuovo messaggio",
     "Connect your mail account" : "Connetti il tuo account di posta",
     "Name" : "Nome",
@@ -84,6 +76,15 @@
     "SMTP Port (default 25, ssl 465)" : "Porta SMTP (predefinita 25, ssl 465)",
     "SMTP User" : "Utente SMTP",
     "SMTP Password" : "Password SMTP",
+    "Download attachment" : "Scarica allegato",
+    "Save to Files" : "Salva in File",
+    "Save all to Files" : "Salva tutto in File",
+    "Forward" : "Inoltra",
+    "Delete" : "Elimina",
+    "Add mail account" : "Aggiungi account di posta",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Intendi cifrare i tuoi messaggi di posta? Installa l'<a href=\"https://www.mailvelope.com/\" target=\"_blank\">estensione del browser Mailvelope</a>!",
+    "No messages in this folder!" : "Nessun messaggio in questa cartella!",
+    "No search results for {{searchTerm}}" : "Nessun risultato di ricerca per {{searchTerm}}",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Stai per essere inoltrato a %s - fai clic qui se la redirezione automatica non avviene entro pochi secondi.",
     "Redirect Warning" : "Avviso di redirezione",
     "The previous page is sending you to %s." : "La pagina precedente ti sta inviando su %s.",
diff --git a/l10n/ja.js b/l10n/ja.js
index e272a4091..cf5b4ceec 100644
--- a/l10n/ja.js
+++ b/l10n/ja.js
@@ -2,9 +2,14 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "メール",
-    "Error while loading the accounts." : "アカウントの読み込みエラー",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["{folderName} に {from} から %n 件の新しいメッセージ"],
+    "Error while loading the accounts." : "アカウントの読み込みエラー",
+    "Connecting …" : "接続中 …",
+    "Unknown error" : "不明なエラー",
+    "Error while creating an account: " : "アカウント作成エラー:",
+    "Connect" : "接続",
+    "Message could not be starred. Please try again." : "メッセージにスターをつけられませんでした。再試行してください。",
     "Error while loading the selected account." : "選択されたアカウントの読み込みエラー",
     "Error while loading messages." : "メールメッセージの読み込みエラー",
     "Choose a folder to store the attachment in" : "添付ファイルを保存するフォルダーを選択",
@@ -16,23 +21,19 @@ OC.L10N.register(
     "Forwarded message" : "転送メッセージ",
     "Error while loading the selected message." : "選択メッセージの読み込み中にエラーが発生",
     "Draft saved!" : "ドラフトを保存しました！",
-    "Connecting …" : "接続中 …",
-    "Unknown error" : "不明なエラー",
-    "Error while creating an account: " : "アカウント作成エラー:",
-    "Connect" : "接続",
-    "Error while deleting account." : "アカウント削除エラー",
     "Choose a file to add as attachment" : "添付として追加するファイルを選択",
     "Reply" : "返信",
     "Send" : "送信",
     "Sending …" : "送信中 …",
     "Message sent!" : "へメッセージを送信しました！",
+    "Server error" : "サーバーエラー",
     "you" : "あなた",
     "Send message to {email}" : "{email} にメッセージを送信",
-    "Message could not be starred. Please try again." : "メッセージにスターをつけられませんでした。再試行してください。",
     "Error while deleting message." : "メッセージ削除中にエラーが発生",
     "Loading …" : "読込中...",
     "Load more …" : "読込中 …",
     "Check messages …" : "メッセージをチェック…",
+    "Error while deleting account." : "アカウント削除エラー",
     "Inbox" : "受信箱",
     "Sent" : "送信",
     "Drafts" : "草稿",
@@ -57,15 +58,6 @@ OC.L10N.register(
     "Back to website" : "ウェブサイトへ戻る",
     "Add attachment from Files" : "添付ファイルを追加",
     "Error loading message" : "メッセージ読み込みエラー",
-    "Download attachment" : "添付ファイルをダウンロード",
-    "Save to Files" : "ファイルに保存",
-    "Save all to Files" : "すべてファイルに保存",
-    "Forward" : "転送",
-    "Delete" : "削除",
-    "Add mail account" : "メールアカウントの追加",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "メールを暗号化するなら <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a> をインストールしてください！",
-    "No search results for {{searchTerm}}" : "{{searchTerm}} の検索結果はありません",
-    "No messages in this folder!" : "このフォルダーにメッセージはありません。",
     "New message" : "新しいメッセージ",
     "Connect your mail account" : "メールアカウントに接続",
     "Name" : "名前",
@@ -85,6 +77,15 @@ OC.L10N.register(
     "SMTP Port (default 25, ssl 465)" : "SMTPポート(デフォルト 25, ssl 465)",
     "SMTP User" : "SMTPユーザー",
     "SMTP Password" : "SMTP パスワード",
+    "Download attachment" : "添付ファイルをダウンロード",
+    "Save to Files" : "ファイルに保存",
+    "Save all to Files" : "すべてファイルに保存",
+    "Forward" : "転送",
+    "Delete" : "削除",
+    "Add mail account" : "メールアカウントの追加",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "メールを暗号化するなら <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a> をインストールしてください！",
+    "No messages in this folder!" : "このフォルダーにメッセージはありません。",
+    "No search results for {{searchTerm}}" : "{{searchTerm}} の検索結果はありません",
     "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に送信しています。",
diff --git a/l10n/ja.json b/l10n/ja.json
index 22733d234..06693d99c 100644
--- a/l10n/ja.json
+++ b/l10n/ja.json
@@ -1,8 +1,13 @@
 { "translations": {
     "Mail" : "メール",
-    "Error while loading the accounts." : "アカウントの読み込みエラー",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["{folderName} に {from} から %n 件の新しいメッセージ"],
+    "Error while loading the accounts." : "アカウントの読み込みエラー",
+    "Connecting …" : "接続中 …",
+    "Unknown error" : "不明なエラー",
+    "Error while creating an account: " : "アカウント作成エラー:",
+    "Connect" : "接続",
+    "Message could not be starred. Please try again." : "メッセージにスターをつけられませんでした。再試行してください。",
     "Error while loading the selected account." : "選択されたアカウントの読み込みエラー",
     "Error while loading messages." : "メールメッセージの読み込みエラー",
     "Choose a folder to store the attachment in" : "添付ファイルを保存するフォルダーを選択",
@@ -14,23 +19,19 @@
     "Forwarded message" : "転送メッセージ",
     "Error while loading the selected message." : "選択メッセージの読み込み中にエラーが発生",
     "Draft saved!" : "ドラフトを保存しました！",
-    "Connecting …" : "接続中 …",
-    "Unknown error" : "不明なエラー",
-    "Error while creating an account: " : "アカウント作成エラー:",
-    "Connect" : "接続",
-    "Error while deleting account." : "アカウント削除エラー",
     "Choose a file to add as attachment" : "添付として追加するファイルを選択",
     "Reply" : "返信",
     "Send" : "送信",
     "Sending …" : "送信中 …",
     "Message sent!" : "へメッセージを送信しました！",
+    "Server error" : "サーバーエラー",
     "you" : "あなた",
     "Send message to {email}" : "{email} にメッセージを送信",
-    "Message could not be starred. Please try again." : "メッセージにスターをつけられませんでした。再試行してください。",
     "Error while deleting message." : "メッセージ削除中にエラーが発生",
     "Loading …" : "読込中...",
     "Load more …" : "読込中 …",
     "Check messages …" : "メッセージをチェック…",
+    "Error while deleting account." : "アカウント削除エラー",
     "Inbox" : "受信箱",
     "Sent" : "送信",
     "Drafts" : "草稿",
@@ -55,15 +56,6 @@
     "Back to website" : "ウェブサイトへ戻る",
     "Add attachment from Files" : "添付ファイルを追加",
     "Error loading message" : "メッセージ読み込みエラー",
-    "Download attachment" : "添付ファイルをダウンロード",
-    "Save to Files" : "ファイルに保存",
-    "Save all to Files" : "すべてファイルに保存",
-    "Forward" : "転送",
-    "Delete" : "削除",
-    "Add mail account" : "メールアカウントの追加",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "メールを暗号化するなら <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a> をインストールしてください！",
-    "No search results for {{searchTerm}}" : "{{searchTerm}} の検索結果はありません",
-    "No messages in this folder!" : "このフォルダーにメッセージはありません。",
     "New message" : "新しいメッセージ",
     "Connect your mail account" : "メールアカウントに接続",
     "Name" : "名前",
@@ -83,6 +75,15 @@
     "SMTP Port (default 25, ssl 465)" : "SMTPポート(デフォルト 25, ssl 465)",
     "SMTP User" : "SMTPユーザー",
     "SMTP Password" : "SMTP パスワード",
+    "Download attachment" : "添付ファイルをダウンロード",
+    "Save to Files" : "ファイルに保存",
+    "Save all to Files" : "すべてファイルに保存",
+    "Forward" : "転送",
+    "Delete" : "削除",
+    "Add mail account" : "メールアカウントの追加",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "メールを暗号化するなら <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a> をインストールしてください！",
+    "No messages in this folder!" : "このフォルダーにメッセージはありません。",
+    "No search results for {{searchTerm}}" : "{{searchTerm}} の検索結果はありません",
     "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に送信しています。",
diff --git a/l10n/ko.js b/l10n/ko.js
index 3caca5900..a7c6feace 100644
--- a/l10n/ko.js
+++ b/l10n/ko.js
@@ -2,9 +2,14 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "메일",
-    "Error while loading the accounts." : "계정을 불러오는 중 오류가 발생하였습니다.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["{folderName}에 {from} 님이 보낸 \n새 메시지 %n개"],
+    "Error while loading the accounts." : "계정을 불러오는 중 오류가 발생하였습니다.",
+    "Connecting …" : "연결 중...",
+    "Unknown error" : "알 수 없는 오류",
+    "Error while creating an account: " : "계정을 만드는 중 오류 발생: ",
+    "Connect" : "연결",
+    "Message could not be starred. Please try again." : "메시지에 별표를 붙일 수 없습니다. 다시 시도해 주십시오.",
     "Error while loading the selected account." : "선택한 계정을 불러오는 중 오류가 발생하였습니다.",
     "Error while loading messages." : "메시지를 불러오는 중 오류가 발생하였습니다.",
     "Choose a folder to store the attachment in" : "첨부 항목을 저장할 폴더 선택",
@@ -16,23 +21,19 @@ OC.L10N.register(
     "Forwarded message" : "전달된 메시지",
     "Error while loading the selected message." : "선택한 메시지를 불러오는 중 오류가 발생하였습니다.",
     "Draft saved!" : "임시 보관함에 저장하였습니다!",
-    "Connecting …" : "연결 중...",
-    "Unknown error" : "알 수 없는 오류",
-    "Error while creating an account: " : "계정을 만드는 중 오류 발생: ",
-    "Connect" : "연결",
-    "Error while deleting account." : "계정을 삭제하는 중 오류가 발생하였습니다.",
     "Choose a file to add as attachment" : "첨부할 파일을 선택하십시오",
     "Reply" : "답장",
     "Send" : "보내기",
     "Sending …" : "보내는 중...",
     "Message sent!" : "메시지를 보냈습니다!",
+    "Server error" : "서버 오류",
     "you" : "나",
     "Send message to {email}" : "{email}(으)로 이메일 보내기",
-    "Message could not be starred. Please try again." : "메시지에 별표를 붙일 수 없습니다. 다시 시도해 주십시오.",
     "Error while deleting message." : "메시지를 삭제하는 중 오류가 발생하였습니다.",
     "Loading …" : "불러오는 중...",
     "Load more …" : "더 가져오기...",
     "Check messages …" : "메시지 확인 중...",
+    "Error while deleting account." : "계정을 삭제하는 중 오류가 발생하였습니다.",
     "Inbox" : "받은 편지함",
     "Sent" : "보낸 편지함",
     "Drafts" : "임시 보관함",
@@ -57,15 +58,6 @@ OC.L10N.register(
     "Back to website" : "웹 사이트로 돌아가기",
     "Add attachment from Files" : "업로드된 파일 첨부",
     "Error loading message" : "메시지 불러오기 오류",
-    "Download attachment" : "첨부 파일 다운로드",
-    "Save to Files" : "클라우드에 저장",
-    "Save all to Files" : "모든 항목을 클라우드에 저장",
-    "Forward" : "전달",
-    "Delete" : "삭제",
-    "Add mail account" : "메일 계정 추가",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "메일을 암호화하고 싶으신가요? <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope 브라우저 확장</a>을 설치하십시오!",
-    "No search results for {{searchTerm}}" : "{{searchTerm}}에 대한 검색 결과 없음",
-    "No messages in this folder!" : "이 폴더에 메시지가 없습니다!",
     "New message" : "새 메시지",
     "Connect your mail account" : "메일 계정 연결",
     "Name" : "이름",
@@ -85,6 +77,15 @@ OC.L10N.register(
     "SMTP Port (default 25, ssl 465)" : "SMTP 포트(기본값 25, SSL 465)",
     "SMTP User" : "SMTP 사용자",
     "SMTP Password" : "SMTP 암호",
+    "Download attachment" : "첨부 파일 다운로드",
+    "Save to Files" : "클라우드에 저장",
+    "Save all to Files" : "모든 항목을 클라우드에 저장",
+    "Forward" : "전달",
+    "Delete" : "삭제",
+    "Add mail account" : "메일 계정 추가",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "메일을 암호화하고 싶으신가요? <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope 브라우저 확장</a>을 설치하십시오!",
+    "No messages in this folder!" : "이 폴더에 메시지가 없습니다!",
+    "No search results for {{searchTerm}}" : "{{searchTerm}}에 대한 검색 결과 없음",
     "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(으)로 이동하려고 합니다.",
diff --git a/l10n/ko.json b/l10n/ko.json
index f06991133..0ec99f029 100644
--- a/l10n/ko.json
+++ b/l10n/ko.json
@@ -1,8 +1,13 @@
 { "translations": {
     "Mail" : "메일",
-    "Error while loading the accounts." : "계정을 불러오는 중 오류가 발생하였습니다.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["{folderName}에 {from} 님이 보낸 \n새 메시지 %n개"],
+    "Error while loading the accounts." : "계정을 불러오는 중 오류가 발생하였습니다.",
+    "Connecting …" : "연결 중...",
+    "Unknown error" : "알 수 없는 오류",
+    "Error while creating an account: " : "계정을 만드는 중 오류 발생: ",
+    "Connect" : "연결",
+    "Message could not be starred. Please try again." : "메시지에 별표를 붙일 수 없습니다. 다시 시도해 주십시오.",
     "Error while loading the selected account." : "선택한 계정을 불러오는 중 오류가 발생하였습니다.",
     "Error while loading messages." : "메시지를 불러오는 중 오류가 발생하였습니다.",
     "Choose a folder to store the attachment in" : "첨부 항목을 저장할 폴더 선택",
@@ -14,23 +19,19 @@
     "Forwarded message" : "전달된 메시지",
     "Error while loading the selected message." : "선택한 메시지를 불러오는 중 오류가 발생하였습니다.",
     "Draft saved!" : "임시 보관함에 저장하였습니다!",
-    "Connecting …" : "연결 중...",
-    "Unknown error" : "알 수 없는 오류",
-    "Error while creating an account: " : "계정을 만드는 중 오류 발생: ",
-    "Connect" : "연결",
-    "Error while deleting account." : "계정을 삭제하는 중 오류가 발생하였습니다.",
     "Choose a file to add as attachment" : "첨부할 파일을 선택하십시오",
     "Reply" : "답장",
     "Send" : "보내기",
     "Sending …" : "보내는 중...",
     "Message sent!" : "메시지를 보냈습니다!",
+    "Server error" : "서버 오류",
     "you" : "나",
     "Send message to {email}" : "{email}(으)로 이메일 보내기",
-    "Message could not be starred. Please try again." : "메시지에 별표를 붙일 수 없습니다. 다시 시도해 주십시오.",
     "Error while deleting message." : "메시지를 삭제하는 중 오류가 발생하였습니다.",
     "Loading …" : "불러오는 중...",
     "Load more …" : "더 가져오기...",
     "Check messages …" : "메시지 확인 중...",
+    "Error while deleting account." : "계정을 삭제하는 중 오류가 발생하였습니다.",
     "Inbox" : "받은 편지함",
     "Sent" : "보낸 편지함",
     "Drafts" : "임시 보관함",
@@ -55,15 +56,6 @@
     "Back to website" : "웹 사이트로 돌아가기",
     "Add attachment from Files" : "업로드된 파일 첨부",
     "Error loading message" : "메시지 불러오기 오류",
-    "Download attachment" : "첨부 파일 다운로드",
-    "Save to Files" : "클라우드에 저장",
-    "Save all to Files" : "모든 항목을 클라우드에 저장",
-    "Forward" : "전달",
-    "Delete" : "삭제",
-    "Add mail account" : "메일 계정 추가",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "메일을 암호화하고 싶으신가요? <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope 브라우저 확장</a>을 설치하십시오!",
-    "No search results for {{searchTerm}}" : "{{searchTerm}}에 대한 검색 결과 없음",
-    "No messages in this folder!" : "이 폴더에 메시지가 없습니다!",
     "New message" : "새 메시지",
     "Connect your mail account" : "메일 계정 연결",
     "Name" : "이름",
@@ -83,6 +75,15 @@
     "SMTP Port (default 25, ssl 465)" : "SMTP 포트(기본값 25, SSL 465)",
     "SMTP User" : "SMTP 사용자",
     "SMTP Password" : "SMTP 암호",
+    "Download attachment" : "첨부 파일 다운로드",
+    "Save to Files" : "클라우드에 저장",
+    "Save all to Files" : "모든 항목을 클라우드에 저장",
+    "Forward" : "전달",
+    "Delete" : "삭제",
+    "Add mail account" : "메일 계정 추가",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "메일을 암호화하고 싶으신가요? <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope 브라우저 확장</a>을 설치하십시오!",
+    "No messages in this folder!" : "이 폴더에 메시지가 없습니다!",
+    "No search results for {{searchTerm}}" : "{{searchTerm}}에 대한 검색 결과 없음",
     "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(으)로 이동하려고 합니다.",
diff --git a/l10n/nb_NO.js b/l10n/nb_NO.js
index 22b43afb8..b527fdec9 100644
--- a/l10n/nb_NO.js
+++ b/l10n/nb_NO.js
@@ -2,9 +2,14 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "E-post",
-    "Error while loading the accounts." : "Feil ved innlasting av kontoene.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n ny melding i {folderName} \nfra {from}","%n nye meldinger i {folderName} \nfra {from}"],
+    "Error while loading the accounts." : "Feil ved innlasting av kontoene.",
+    "Connecting …" : "Kobler til ...",
+    "Unknown error" : "Ukjent feil",
+    "Error while creating an account: " : "Feil ved oppretting av en konto:",
+    "Connect" : "Koble til",
+    "Message could not be starred. Please try again." : "Klarte ikke å merke melding. Prøv igjen.",
     "Error while loading the selected account." : "Feil ved lasting av den valgte kontoen.",
     "Error while loading messages." : "Feil ved innlasting av meldinger.",
     "Choose a folder to store the attachment in" : "Velg en mappe å lagre vedlegget i",
@@ -15,23 +20,19 @@ OC.L10N.register(
     "Opening HTML drafts is not supported yet." : "Åpning av HTML-kladd er ikke støttet ennå.",
     "Error while loading the selected message." : "Feil ved innlasting av valgt melding.",
     "Draft saved!" : "Kladd lagret!",
-    "Connecting …" : "Kobler til ...",
-    "Unknown error" : "Ukjent feil",
-    "Error while creating an account: " : "Feil ved oppretting av en konto:",
-    "Connect" : "Koble til",
-    "Error while deleting account." : "Feil ved sletting av konto.",
     "Choose a file to add as attachment" : "Velg en fil å legge til som vedlegg",
     "Reply" : "Svar",
     "Send" : "Send",
     "Sending …" : "Sender ...",
     "Message sent!" : "Melding sendt!",
+    "Server error" : "Serverfeil",
     "you" : "du",
     "Send message to {email}" : "Send melding til {email}",
-    "Message could not be starred. Please try again." : "Klarte ikke å merke melding. Prøv igjen.",
     "Error while deleting message." : "Feil ved sletting av melding.",
     "Loading …" : "Laster...",
     "Load more …" : "Last mer ...",
     "Check messages …" : "Sjekk meldinger ...",
+    "Error while deleting account." : "Feil ved sletting av konto.",
     "Inbox" : "Innboks",
     "Sent" : "Sendt",
     "Drafts" : "Kladd",
@@ -56,15 +57,6 @@ OC.L10N.register(
     "Back to website" : "Tilbake til webside",
     "Add attachment from Files" : "Legg til vedlegg fra Filer",
     "Error loading message" : "Feil ved innlasting av melding",
-    "Download attachment" : "Last ned vedlegg",
-    "Save to Files" : "Lagre i Filer",
-    "Save all to Files" : "Lagre alle til Filer",
-    "Forward" : "Videresend",
-    "Delete" : "Slett",
-    "Add mail account" : "Legg til epost-konto",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Ønsker du å kryptere e-postene dine? Installer <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope nettleser-utvidelse</a>!",
-    "No search results for {{searchTerm}}" : "Ingen søkeresultater for {{searchTerm}}",
-    "No messages in this folder!" : "Ingen meldinger i denne mappen!",
     "New message" : "Ny melding",
     "Connect your mail account" : "Koble til din epost-konto",
     "Name" : "Navn",
@@ -84,6 +76,15 @@ OC.L10N.register(
     "SMTP Port (default 25, ssl 465)" : "SMTP-port (standard 25, ssl 465)",
     "SMTP User" : "SMTP-bruker",
     "SMTP Password" : "SMTP-passord",
+    "Download attachment" : "Last ned vedlegg",
+    "Save to Files" : "Lagre i Filer",
+    "Save all to Files" : "Lagre alle til Filer",
+    "Forward" : "Videresend",
+    "Delete" : "Slett",
+    "Add mail account" : "Legg til epost-konto",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Ønsker du å kryptere e-postene dine? Installer <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope nettleser-utvidelse</a>!",
+    "No messages in this folder!" : "Ingen meldinger i denne mappen!",
+    "No search results for {{searchTerm}}" : "Ingen søkeresultater for {{searchTerm}}",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Viderekobler deg til %s - klikk her hvis du ikke blir videresendt automatisk i løpet av noen sekunder.",
     "Redirect Warning" : "Varsel om omdirigering",
     "The previous page is sending you to %s." : "Den forrige siden sender deg til %s.",
diff --git a/l10n/nb_NO.json b/l10n/nb_NO.json
index a9b42a4ff..311015ffd 100644
--- a/l10n/nb_NO.json
+++ b/l10n/nb_NO.json
@@ -1,8 +1,13 @@
 { "translations": {
     "Mail" : "E-post",
-    "Error while loading the accounts." : "Feil ved innlasting av kontoene.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n ny melding i {folderName} \nfra {from}","%n nye meldinger i {folderName} \nfra {from}"],
+    "Error while loading the accounts." : "Feil ved innlasting av kontoene.",
+    "Connecting …" : "Kobler til ...",
+    "Unknown error" : "Ukjent feil",
+    "Error while creating an account: " : "Feil ved oppretting av en konto:",
+    "Connect" : "Koble til",
+    "Message could not be starred. Please try again." : "Klarte ikke å merke melding. Prøv igjen.",
     "Error while loading the selected account." : "Feil ved lasting av den valgte kontoen.",
     "Error while loading messages." : "Feil ved innlasting av meldinger.",
     "Choose a folder to store the attachment in" : "Velg en mappe å lagre vedlegget i",
@@ -13,23 +18,19 @@
     "Opening HTML drafts is not supported yet." : "Åpning av HTML-kladd er ikke støttet ennå.",
     "Error while loading the selected message." : "Feil ved innlasting av valgt melding.",
     "Draft saved!" : "Kladd lagret!",
-    "Connecting …" : "Kobler til ...",
-    "Unknown error" : "Ukjent feil",
-    "Error while creating an account: " : "Feil ved oppretting av en konto:",
-    "Connect" : "Koble til",
-    "Error while deleting account." : "Feil ved sletting av konto.",
     "Choose a file to add as attachment" : "Velg en fil å legge til som vedlegg",
     "Reply" : "Svar",
     "Send" : "Send",
     "Sending …" : "Sender ...",
     "Message sent!" : "Melding sendt!",
+    "Server error" : "Serverfeil",
     "you" : "du",
     "Send message to {email}" : "Send melding til {email}",
-    "Message could not be starred. Please try again." : "Klarte ikke å merke melding. Prøv igjen.",
     "Error while deleting message." : "Feil ved sletting av melding.",
     "Loading …" : "Laster...",
     "Load more …" : "Last mer ...",
     "Check messages …" : "Sjekk meldinger ...",
+    "Error while deleting account." : "Feil ved sletting av konto.",
     "Inbox" : "Innboks",
     "Sent" : "Sendt",
     "Drafts" : "Kladd",
@@ -54,15 +55,6 @@
     "Back to website" : "Tilbake til webside",
     "Add attachment from Files" : "Legg til vedlegg fra Filer",
     "Error loading message" : "Feil ved innlasting av melding",
-    "Download attachment" : "Last ned vedlegg",
-    "Save to Files" : "Lagre i Filer",
-    "Save all to Files" : "Lagre alle til Filer",
-    "Forward" : "Videresend",
-    "Delete" : "Slett",
-    "Add mail account" : "Legg til epost-konto",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Ønsker du å kryptere e-postene dine? Installer <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope nettleser-utvidelse</a>!",
-    "No search results for {{searchTerm}}" : "Ingen søkeresultater for {{searchTerm}}",
-    "No messages in this folder!" : "Ingen meldinger i denne mappen!",
     "New message" : "Ny melding",
     "Connect your mail account" : "Koble til din epost-konto",
     "Name" : "Navn",
@@ -82,6 +74,15 @@
     "SMTP Port (default 25, ssl 465)" : "SMTP-port (standard 25, ssl 465)",
     "SMTP User" : "SMTP-bruker",
     "SMTP Password" : "SMTP-passord",
+    "Download attachment" : "Last ned vedlegg",
+    "Save to Files" : "Lagre i Filer",
+    "Save all to Files" : "Lagre alle til Filer",
+    "Forward" : "Videresend",
+    "Delete" : "Slett",
+    "Add mail account" : "Legg til epost-konto",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Ønsker du å kryptere e-postene dine? Installer <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope nettleser-utvidelse</a>!",
+    "No messages in this folder!" : "Ingen meldinger i denne mappen!",
+    "No search results for {{searchTerm}}" : "Ingen søkeresultater for {{searchTerm}}",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Viderekobler deg til %s - klikk her hvis du ikke blir videresendt automatisk i løpet av noen sekunder.",
     "Redirect Warning" : "Varsel om omdirigering",
     "The previous page is sending you to %s." : "Den forrige siden sender deg til %s.",
diff --git a/l10n/nl.js b/l10n/nl.js
index 6d2e11235..9f702af2d 100644
--- a/l10n/nl.js
+++ b/l10n/nl.js
@@ -2,9 +2,14 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "E-mail",
-    "Error while loading the accounts." : "Fout tijdens het laden van de accounts.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n nieuw bericht in {folderName} \nvan {from}","%n nieuwe berichten in {folderName} \nvan {from}"],
+    "Error while loading the accounts." : "Fout tijdens het laden van de accounts.",
+    "Connecting …" : "Verbinden...",
+    "Unknown error" : "Onbekende fout",
+    "Error while creating an account: " : "Fout bij het creëren van een account.",
+    "Connect" : "Verbinden",
+    "Message could not be starred. Please try again." : "Bericht kon niet als gemarkeerd worden. Probeer het opnieuw.",
     "Error while loading the selected account." : "Fout tijdens het laden van het gekozen account.",
     "Error while loading messages." : "Fout bij laden berichten.",
     "Choose a folder to store the attachment in" : "Kies een map op de bijlage in op te slaan",
@@ -16,24 +21,20 @@ OC.L10N.register(
     "Forwarded message" : "Doorgestuurd bericht",
     "Error while loading the selected message." : "Fout bij laden van het geselecteerde bericht.",
     "Draft saved!" : "Concept opgeslagen!",
-    "Connecting …" : "Verbinden...",
-    "Unknown error" : "Onbekende fout",
-    "Error while creating an account: " : "Fout bij het creëren van een account.",
-    "Connect" : "Verbinden",
-    "Error while deleting account." : "Fout bij verwijderen account.",
     "Choose a file to add as attachment" : "Kies een bestand om als bijlage toe te voegen",
     "Reply" : "Antwoord",
     "Send" : "Versturen",
     "Sending …" : "Versturen ...",
     "Message sent!" : "Bericht verzonden!",
+    "Server error" : "Serverfout",
     "you" : "je",
     "Send message to {email}" : "Versturen bericht naar {email}",
-    "Message could not be starred. Please try again." : "Bericht kon niet als gemarkeerd worden. Probeer het opnieuw.",
     "Error while deleting message." : "Fout bij verwijderen berichtn",
     "Checking messages …" : "Controleren berichten ...",
     "Loading …" : "Laden...",
     "Load more …" : "Laad meer ...",
     "Check messages …" : "Controleren berichten ...",
+    "Error while deleting account." : "Fout bij verwijderen account.",
     "Inbox" : "Inbakje",
     "Sent" : "Verzonden",
     "Drafts" : "Concepten",
@@ -58,15 +59,6 @@ OC.L10N.register(
     "Back to website" : "Terug naar de website",
     "Add attachment from Files" : "Voeg een bijlage toe uit Bestanden",
     "Error loading message" : "Fout bij laden bericht",
-    "Download attachment" : "Download bijlage",
-    "Save to Files" : "Opslaan in Bestanden",
-    "Save all to Files" : "Alles opslaan in Bestanden",
-    "Forward" : "Doorsturen",
-    "Delete" : "Verwijderen",
-    "Add mail account" : "Toevoegen e-mailaccount",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Wilt u uw e-mailberichten versleutelen? Installeer de <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extensie</a>!",
-    "No search results for {{searchTerm}}" : "Geen zoekresultaten voor {{searchTerm}}",
-    "No messages in this folder!" : "Geen berichten in deze map!",
     "New message" : "Nieuw bericht",
     "Connect your mail account" : "Verbind uw e-mailaccount",
     "Name" : "Naam",
@@ -86,6 +78,15 @@ OC.L10N.register(
     "SMTP Port (default 25, ssl 465)" : "SMTP poort (standaard 25, ssl 465)",
     "SMTP User" : "SMTP gebruikersnaam",
     "SMTP Password" : "SMTP wachtwoord",
+    "Download attachment" : "Download bijlage",
+    "Save to Files" : "Opslaan in Bestanden",
+    "Save all to Files" : "Alles opslaan in Bestanden",
+    "Forward" : "Doorsturen",
+    "Delete" : "Verwijderen",
+    "Add mail account" : "Toevoegen e-mailaccount",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Wilt u uw e-mailberichten versleutelen? Installeer de <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extensie</a>!",
+    "No messages in this folder!" : "Geen berichten in deze map!",
+    "No search results for {{searchTerm}}" : "Geen zoekresultaten voor {{searchTerm}}",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "U wordt doorgezet naar %s - klik hier als u niet binnen enkele seconden automatisch wordt doorgestuurd.",
     "Redirect Warning" : "Omleidingswaarschuwing",
     "The previous page is sending you to %s." : "De vorige pagina stuurt u naar %s",
diff --git a/l10n/nl.json b/l10n/nl.json
index 1533fc8f4..a430d631d 100644
--- a/l10n/nl.json
+++ b/l10n/nl.json
@@ -1,8 +1,13 @@
 { "translations": {
     "Mail" : "E-mail",
-    "Error while loading the accounts." : "Fout tijdens het laden van de accounts.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n nieuw bericht in {folderName} \nvan {from}","%n nieuwe berichten in {folderName} \nvan {from}"],
+    "Error while loading the accounts." : "Fout tijdens het laden van de accounts.",
+    "Connecting …" : "Verbinden...",
+    "Unknown error" : "Onbekende fout",
+    "Error while creating an account: " : "Fout bij het creëren van een account.",
+    "Connect" : "Verbinden",
+    "Message could not be starred. Please try again." : "Bericht kon niet als gemarkeerd worden. Probeer het opnieuw.",
     "Error while loading the selected account." : "Fout tijdens het laden van het gekozen account.",
     "Error while loading messages." : "Fout bij laden berichten.",
     "Choose a folder to store the attachment in" : "Kies een map op de bijlage in op te slaan",
@@ -14,24 +19,20 @@
     "Forwarded message" : "Doorgestuurd bericht",
     "Error while loading the selected message." : "Fout bij laden van het geselecteerde bericht.",
     "Draft saved!" : "Concept opgeslagen!",
-    "Connecting …" : "Verbinden...",
-    "Unknown error" : "Onbekende fout",
-    "Error while creating an account: " : "Fout bij het creëren van een account.",
-    "Connect" : "Verbinden",
-    "Error while deleting account." : "Fout bij verwijderen account.",
     "Choose a file to add as attachment" : "Kies een bestand om als bijlage toe te voegen",
     "Reply" : "Antwoord",
     "Send" : "Versturen",
     "Sending …" : "Versturen ...",
     "Message sent!" : "Bericht verzonden!",
+    "Server error" : "Serverfout",
     "you" : "je",
     "Send message to {email}" : "Versturen bericht naar {email}",
-    "Message could not be starred. Please try again." : "Bericht kon niet als gemarkeerd worden. Probeer het opnieuw.",
     "Error while deleting message." : "Fout bij verwijderen berichtn",
     "Checking messages …" : "Controleren berichten ...",
     "Loading …" : "Laden...",
     "Load more …" : "Laad meer ...",
     "Check messages …" : "Controleren berichten ...",
+    "Error while deleting account." : "Fout bij verwijderen account.",
     "Inbox" : "Inbakje",
     "Sent" : "Verzonden",
     "Drafts" : "Concepten",
@@ -56,15 +57,6 @@
     "Back to website" : "Terug naar de website",
     "Add attachment from Files" : "Voeg een bijlage toe uit Bestanden",
     "Error loading message" : "Fout bij laden bericht",
-    "Download attachment" : "Download bijlage",
-    "Save to Files" : "Opslaan in Bestanden",
-    "Save all to Files" : "Alles opslaan in Bestanden",
-    "Forward" : "Doorsturen",
-    "Delete" : "Verwijderen",
-    "Add mail account" : "Toevoegen e-mailaccount",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Wilt u uw e-mailberichten versleutelen? Installeer de <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extensie</a>!",
-    "No search results for {{searchTerm}}" : "Geen zoekresultaten voor {{searchTerm}}",
-    "No messages in this folder!" : "Geen berichten in deze map!",
     "New message" : "Nieuw bericht",
     "Connect your mail account" : "Verbind uw e-mailaccount",
     "Name" : "Naam",
@@ -84,6 +76,15 @@
     "SMTP Port (default 25, ssl 465)" : "SMTP poort (standaard 25, ssl 465)",
     "SMTP User" : "SMTP gebruikersnaam",
     "SMTP Password" : "SMTP wachtwoord",
+    "Download attachment" : "Download bijlage",
+    "Save to Files" : "Opslaan in Bestanden",
+    "Save all to Files" : "Alles opslaan in Bestanden",
+    "Forward" : "Doorsturen",
+    "Delete" : "Verwijderen",
+    "Add mail account" : "Toevoegen e-mailaccount",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Wilt u uw e-mailberichten versleutelen? Installeer de <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extensie</a>!",
+    "No messages in this folder!" : "Geen berichten in deze map!",
+    "No search results for {{searchTerm}}" : "Geen zoekresultaten voor {{searchTerm}}",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "U wordt doorgezet naar %s - klik hier als u niet binnen enkele seconden automatisch wordt doorgestuurd.",
     "Redirect Warning" : "Omleidingswaarschuwing",
     "The previous page is sending you to %s." : "De vorige pagina stuurt u naar %s",
diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js
index 565c067ec..5dae29311 100644
--- a/l10n/pt_BR.js
+++ b/l10n/pt_BR.js
@@ -2,9 +2,14 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "EMail",
-    "Error while loading the accounts." : "Erro no carregamento das contas.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n nova mensagem em {folderName}\nde {from}","%n novas mensagens em {folderName}\nde {from}"],
+    "Error while loading the accounts." : "Erro no carregamento das contas.",
+    "Connecting …" : "Conectando ...",
+    "Unknown error" : "Erro desconhecido",
+    "Error while creating an account: " : "Erro na criação da conta:",
+    "Connect" : "Conectar",
+    "Message could not be starred. Please try again." : "Mensagem não pode ser marcada com estrela. Por favor tente novamente.",
     "Error while loading the selected account." : "Erro enquanto carregava a conta selecionada",
     "Error while loading messages." : "Erro no carregamento das mensagens.",
     "Choose a folder to store the attachment in" : "Escolha uma pasta para armazenar os anexos",
@@ -16,24 +21,20 @@ OC.L10N.register(
     "Forwarded message" : "Mensagem redirecionada",
     "Error while loading the selected message." : "Erro enquanto carregava mensagem selecionada.",
     "Draft saved!" : "Rascunho salvo!",
-    "Connecting …" : "Conectando ...",
-    "Unknown error" : "Erro desconhecido",
-    "Error while creating an account: " : "Erro na criação da conta:",
-    "Connect" : "Conectar",
-    "Error while deleting account." : "Erro enquanto eliminava uma conta.",
     "Choose a file to add as attachment" : "Escolha um arquivo para adicionar como anexo",
     "Reply" : "Responder",
     "Send" : "Enviar",
     "Sending …" : "Enviando ...",
     "Message sent!" : "Mensagem enviada!",
+    "Server error" : "Erro de servidor",
     "you" : "você",
     "Send message to {email}" : "Enviar mensagem para {email}",
-    "Message could not be starred. Please try again." : "Mensagem não pode ser marcada com estrela. Por favor tente novamente.",
     "Error while deleting message." : "Erro enquanto apagava mensagem.",
     "Checking messages …" : "Verificando mensagens ...",
     "Loading …" : "Carregando ...",
     "Load more …" : "Carregar mais ...",
     "Check messages …" : "Verificar mensagens",
+    "Error while deleting account." : "Erro enquanto eliminava uma conta.",
     "Inbox" : "Caixa de Entrada",
     "Sent" : "Enviar",
     "Drafts" : "Rascunhos",
@@ -58,15 +59,6 @@ OC.L10N.register(
     "Back to website" : "Retornar ao servidor web",
     "Add attachment from Files" : "Adicionar anexos de Arquivos",
     "Error loading message" : "Erro carregando mensagem",
-    "Download attachment" : "Baixar anexo",
-    "Save to Files" : "Salvar para Arquivos",
-    "Save all to Files" : "Salvar tudo para Arquivos",
-    "Forward" : "Redirecionar",
-    "Delete" : "Excluir",
-    "Add mail account" : "Adicionar conta de email",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Tentando criptografar seus e-mails? Instale a extensão <a href=\"https://www.mailvelope.com/\" target=\"_blank\"> Mailvelope no navegador</a>!",
-    "No search results for {{searchTerm}}" : "Nenhum resultado de pesquisa para {{searchTerm}}",
-    "No messages in this folder!" : "Nenhuma mensagem nesta pasta!",
     "New message" : "Nova mensagem",
     "Connect your mail account" : "Conectar a sua conta de email",
     "Name" : "Nome",
@@ -86,6 +78,15 @@ OC.L10N.register(
     "SMTP Port (default 25, ssl 465)" : "Porta SMTP (padrão 25, ssl 465)",
     "SMTP User" : "Usuário SMTP",
     "SMTP Password" : "Senha SMTP",
+    "Download attachment" : "Baixar anexo",
+    "Save to Files" : "Salvar para Arquivos",
+    "Save all to Files" : "Salvar tudo para Arquivos",
+    "Forward" : "Redirecionar",
+    "Delete" : "Excluir",
+    "Add mail account" : "Adicionar conta de email",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Tentando criptografar seus e-mails? Instale a extensão <a href=\"https://www.mailvelope.com/\" target=\"_blank\"> Mailvelope no navegador</a>!",
+    "No messages in this folder!" : "Nenhuma mensagem nesta pasta!",
+    "No search results for {{searchTerm}}" : "Nenhum resultado de pesquisa para {{searchTerm}}",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Encaminhando para %s - clique aqui se você não for redirecionado automaticamente dentro dos próximos segundos.",
     "Redirect Warning" : "Redirecionar Aviso",
     "The previous page is sending you to %s." : "A página anterior está lhe enviando para %s.",
diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json
index 073ab9038..50d521522 100644
--- a/l10n/pt_BR.json
+++ b/l10n/pt_BR.json
@@ -1,8 +1,13 @@
 { "translations": {
     "Mail" : "EMail",
-    "Error while loading the accounts." : "Erro no carregamento das contas.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n nova mensagem em {folderName}\nde {from}","%n novas mensagens em {folderName}\nde {from}"],
+    "Error while loading the accounts." : "Erro no carregamento das contas.",
+    "Connecting …" : "Conectando ...",
+    "Unknown error" : "Erro desconhecido",
+    "Error while creating an account: " : "Erro na criação da conta:",
+    "Connect" : "Conectar",
+    "Message could not be starred. Please try again." : "Mensagem não pode ser marcada com estrela. Por favor tente novamente.",
     "Error while loading the selected account." : "Erro enquanto carregava a conta selecionada",
     "Error while loading messages." : "Erro no carregamento das mensagens.",
     "Choose a folder to store the attachment in" : "Escolha uma pasta para armazenar os anexos",
@@ -14,24 +19,20 @@
     "Forwarded message" : "Mensagem redirecionada",
     "Error while loading the selected message." : "Erro enquanto carregava mensagem selecionada.",
     "Draft saved!" : "Rascunho salvo!",
-    "Connecting …" : "Conectando ...",
-    "Unknown error" : "Erro desconhecido",
-    "Error while creating an account: " : "Erro na criação da conta:",
-    "Connect" : "Conectar",
-    "Error while deleting account." : "Erro enquanto eliminava uma conta.",
     "Choose a file to add as attachment" : "Escolha um arquivo para adicionar como anexo",
     "Reply" : "Responder",
     "Send" : "Enviar",
     "Sending …" : "Enviando ...",
     "Message sent!" : "Mensagem enviada!",
+    "Server error" : "Erro de servidor",
     "you" : "você",
     "Send message to {email}" : "Enviar mensagem para {email}",
-    "Message could not be starred. Please try again." : "Mensagem não pode ser marcada com estrela. Por favor tente novamente.",
     "Error while deleting message." : "Erro enquanto apagava mensagem.",
     "Checking messages …" : "Verificando mensagens ...",
     "Loading …" : "Carregando ...",
     "Load more …" : "Carregar mais ...",
     "Check messages …" : "Verificar mensagens",
+    "Error while deleting account." : "Erro enquanto eliminava uma conta.",
     "Inbox" : "Caixa de Entrada",
     "Sent" : "Enviar",
     "Drafts" : "Rascunhos",
@@ -56,15 +57,6 @@
     "Back to website" : "Retornar ao servidor web",
     "Add attachment from Files" : "Adicionar anexos de Arquivos",
     "Error loading message" : "Erro carregando mensagem",
-    "Download attachment" : "Baixar anexo",
-    "Save to Files" : "Salvar para Arquivos",
-    "Save all to Files" : "Salvar tudo para Arquivos",
-    "Forward" : "Redirecionar",
-    "Delete" : "Excluir",
-    "Add mail account" : "Adicionar conta de email",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Tentando criptografar seus e-mails? Instale a extensão <a href=\"https://www.mailvelope.com/\" target=\"_blank\"> Mailvelope no navegador</a>!",
-    "No search results for {{searchTerm}}" : "Nenhum resultado de pesquisa para {{searchTerm}}",
-    "No messages in this folder!" : "Nenhuma mensagem nesta pasta!",
     "New message" : "Nova mensagem",
     "Connect your mail account" : "Conectar a sua conta de email",
     "Name" : "Nome",
@@ -84,6 +76,15 @@
     "SMTP Port (default 25, ssl 465)" : "Porta SMTP (padrão 25, ssl 465)",
     "SMTP User" : "Usuário SMTP",
     "SMTP Password" : "Senha SMTP",
+    "Download attachment" : "Baixar anexo",
+    "Save to Files" : "Salvar para Arquivos",
+    "Save all to Files" : "Salvar tudo para Arquivos",
+    "Forward" : "Redirecionar",
+    "Delete" : "Excluir",
+    "Add mail account" : "Adicionar conta de email",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Tentando criptografar seus e-mails? Instale a extensão <a href=\"https://www.mailvelope.com/\" target=\"_blank\"> Mailvelope no navegador</a>!",
+    "No messages in this folder!" : "Nenhuma mensagem nesta pasta!",
+    "No search results for {{searchTerm}}" : "Nenhum resultado de pesquisa para {{searchTerm}}",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Encaminhando para %s - clique aqui se você não for redirecionado automaticamente dentro dos próximos segundos.",
     "Redirect Warning" : "Redirecionar Aviso",
     "The previous page is sending you to %s." : "A página anterior está lhe enviando para %s.",
diff --git a/l10n/pt_PT.js b/l10n/pt_PT.js
index a1d03fcb5..5dd7bf04f 100644
--- a/l10n/pt_PT.js
+++ b/l10n/pt_PT.js
@@ -2,9 +2,14 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Correio",
-    "Error while loading the accounts." : "Erro durante o carregamento das contas.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n nova mensagem na pasta {folderName} \nenviada por {from}","%n novas mensagems na pasta {folderName}\nenviadas por {from}"],
+    "Error while loading the accounts." : "Erro durante o carregamento das contas.",
+    "Connecting …" : "A ligar...",
+    "Unknown error" : "Erro desconhecido",
+    "Error while creating an account: " : "Erro durante a criação da conta:",
+    "Connect" : "Ligar",
+    "Message could not be starred. Please try again." : "Não foi possível atribuir as estrelas à mensagem. Por favor, tente de novo.",
     "Error while loading the selected account." : "Erro a carregar a conta seleccionada.",
     "Error while loading messages." : "Erro durante o carregamento das mensagens.",
     "Choose a folder to store the attachment in" : "Escolha uma pasta para guardar o anexo",
@@ -16,24 +21,20 @@ OC.L10N.register(
     "Forwarded message" : "Mensagem reencaminhada",
     "Error while loading the selected message." : "Erro a carregar a mensagem seleccionada.",
     "Draft saved!" : "Rascunho guardado!",
-    "Connecting …" : "A ligar...",
-    "Unknown error" : "Erro desconhecido",
-    "Error while creating an account: " : "Erro durante a criação da conta:",
-    "Connect" : "Ligar",
-    "Error while deleting account." : "Erro durante a eliminação da conta.",
     "Choose a file to add as attachment" : "Escolha um ficheiro para adicionar como anexo",
     "Reply" : "Responder",
     "Send" : "Enviar",
     "Sending …" : "A enviar...",
     "Message sent!" : "Mensagem enviada!",
+    "Server error" : "Erro do servidor",
     "you" : "Você",
     "Send message to {email}" : "Enviar mensagem para {email}",
-    "Message could not be starred. Please try again." : "Não foi possível atribuir as estrelas à mensagem. Por favor, tente de novo.",
     "Error while deleting message." : "Erro durante a eliminação da mensagem.",
     "Checking messages …" : "A verificar as mensagens...",
     "Loading …" : "A carregar...",
     "Load more …" : "Carregar mais...",
     "Check messages …" : "Verificar mensagens...",
+    "Error while deleting account." : "Erro durante a eliminação da conta.",
     "Inbox" : "Caixa de Entrada",
     "Sent" : "Enviada",
     "Drafts" : "Rascunhos",
@@ -58,15 +59,6 @@ OC.L10N.register(
     "Back to website" : "Voltar ao sítio da Web",
     "Add attachment from Files" : "Adicione anexo a partir dos ficheiros",
     "Error loading message" : "Erro ao carregar a mensagem",
-    "Download attachment" : "Descarregar anexo",
-    "Save to Files" : "Guardado em Ficheiros",
-    "Save all to Files" : "Guardar tudo em Ficheiros",
-    "Forward" : "Avançar",
-    "Delete" : "Apagar",
-    "Add mail account" : "Adicionar conta de correio",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Pretende encriptar as suas mensagens? Instale a <a href=\"https://www.mailvelope.com/\" target=\"_blank\">extensão de navegador Mailvelope</a>!",
-    "No search results for {{searchTerm}}" : "Sem resultados de procura para {{searchTerm}}",
-    "No messages in this folder!" : "Nenhuma mensagem nesta pasta!",
     "New message" : "Nova mensagem",
     "Connect your mail account" : "Conete a sua conta de correio",
     "Name" : "Nome",
@@ -86,6 +78,15 @@ OC.L10N.register(
     "SMTP Port (default 25, ssl 465)" : "Porta SMTP (predefinição 25, ssl 465)",
     "SMTP User" : "Utilizador SMTP",
     "SMTP Password" : "Senha SMTP",
+    "Download attachment" : "Descarregar anexo",
+    "Save to Files" : "Guardado em Ficheiros",
+    "Save all to Files" : "Guardar tudo em Ficheiros",
+    "Forward" : "Avançar",
+    "Delete" : "Apagar",
+    "Add mail account" : "Adicionar conta de correio",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Pretende encriptar as suas mensagens? Instale a <a href=\"https://www.mailvelope.com/\" target=\"_blank\">extensão de navegador Mailvelope</a>!",
+    "No messages in this folder!" : "Nenhuma mensagem nesta pasta!",
+    "No search results for {{searchTerm}}" : "Sem resultados de procura para {{searchTerm}}",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "A encaminhá-lho para %s - clique aqui se não for redireccionado automaticamente dentro de alguns segundos.",
     "Redirect Warning" : "Redirecionar Aviso",
     "The previous page is sending you to %s." : "A página anterior está a enviá-lo para %s.",
diff --git a/l10n/pt_PT.json b/l10n/pt_PT.json
index cb99b7ad2..27da3081e 100644
--- a/l10n/pt_PT.json
+++ b/l10n/pt_PT.json
@@ -1,8 +1,13 @@
 { "translations": {
     "Mail" : "Correio",
-    "Error while loading the accounts." : "Erro durante o carregamento das contas.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n nova mensagem na pasta {folderName} \nenviada por {from}","%n novas mensagems na pasta {folderName}\nenviadas por {from}"],
+    "Error while loading the accounts." : "Erro durante o carregamento das contas.",
+    "Connecting …" : "A ligar...",
+    "Unknown error" : "Erro desconhecido",
+    "Error while creating an account: " : "Erro durante a criação da conta:",
+    "Connect" : "Ligar",
+    "Message could not be starred. Please try again." : "Não foi possível atribuir as estrelas à mensagem. Por favor, tente de novo.",
     "Error while loading the selected account." : "Erro a carregar a conta seleccionada.",
     "Error while loading messages." : "Erro durante o carregamento das mensagens.",
     "Choose a folder to store the attachment in" : "Escolha uma pasta para guardar o anexo",
@@ -14,24 +19,20 @@
     "Forwarded message" : "Mensagem reencaminhada",
     "Error while loading the selected message." : "Erro a carregar a mensagem seleccionada.",
     "Draft saved!" : "Rascunho guardado!",
-    "Connecting …" : "A ligar...",
-    "Unknown error" : "Erro desconhecido",
-    "Error while creating an account: " : "Erro durante a criação da conta:",
-    "Connect" : "Ligar",
-    "Error while deleting account." : "Erro durante a eliminação da conta.",
     "Choose a file to add as attachment" : "Escolha um ficheiro para adicionar como anexo",
     "Reply" : "Responder",
     "Send" : "Enviar",
     "Sending …" : "A enviar...",
     "Message sent!" : "Mensagem enviada!",
+    "Server error" : "Erro do servidor",
     "you" : "Você",
     "Send message to {email}" : "Enviar mensagem para {email}",
-    "Message could not be starred. Please try again." : "Não foi possível atribuir as estrelas à mensagem. Por favor, tente de novo.",
     "Error while deleting message." : "Erro durante a eliminação da mensagem.",
     "Checking messages …" : "A verificar as mensagens...",
     "Loading …" : "A carregar...",
     "Load more …" : "Carregar mais...",
     "Check messages …" : "Verificar mensagens...",
+    "Error while deleting account." : "Erro durante a eliminação da conta.",
     "Inbox" : "Caixa de Entrada",
     "Sent" : "Enviada",
     "Drafts" : "Rascunhos",
@@ -56,15 +57,6 @@
     "Back to website" : "Voltar ao sítio da Web",
     "Add attachment from Files" : "Adicione anexo a partir dos ficheiros",
     "Error loading message" : "Erro ao carregar a mensagem",
-    "Download attachment" : "Descarregar anexo",
-    "Save to Files" : "Guardado em Ficheiros",
-    "Save all to Files" : "Guardar tudo em Ficheiros",
-    "Forward" : "Avançar",
-    "Delete" : "Apagar",
-    "Add mail account" : "Adicionar conta de correio",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Pretende encriptar as suas mensagens? Instale a <a href=\"https://www.mailvelope.com/\" target=\"_blank\">extensão de navegador Mailvelope</a>!",
-    "No search results for {{searchTerm}}" : "Sem resultados de procura para {{searchTerm}}",
-    "No messages in this folder!" : "Nenhuma mensagem nesta pasta!",
     "New message" : "Nova mensagem",
     "Connect your mail account" : "Conete a sua conta de correio",
     "Name" : "Nome",
@@ -84,6 +76,15 @@
     "SMTP Port (default 25, ssl 465)" : "Porta SMTP (predefinição 25, ssl 465)",
     "SMTP User" : "Utilizador SMTP",
     "SMTP Password" : "Senha SMTP",
+    "Download attachment" : "Descarregar anexo",
+    "Save to Files" : "Guardado em Ficheiros",
+    "Save all to Files" : "Guardar tudo em Ficheiros",
+    "Forward" : "Avançar",
+    "Delete" : "Apagar",
+    "Add mail account" : "Adicionar conta de correio",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Pretende encriptar as suas mensagens? Instale a <a href=\"https://www.mailvelope.com/\" target=\"_blank\">extensão de navegador Mailvelope</a>!",
+    "No messages in this folder!" : "Nenhuma mensagem nesta pasta!",
+    "No search results for {{searchTerm}}" : "Sem resultados de procura para {{searchTerm}}",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "A encaminhá-lho para %s - clique aqui se não for redireccionado automaticamente dentro de alguns segundos.",
     "Redirect Warning" : "Redirecionar Aviso",
     "The previous page is sending you to %s." : "A página anterior está a enviá-lo para %s.",
diff --git a/l10n/ru.js b/l10n/ru.js
index ce66cd564..dbc6f044d 100644
--- a/l10n/ru.js
+++ b/l10n/ru.js
@@ -2,9 +2,14 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Почта",
-    "Error while loading the accounts." : "Ошибка при загрузке учётных записей",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n новое сообщение в {folderName} \nот {from}","%n новых сообщения в {folderName} \nот {from}","%n новых сообщения в {folderName} \nот {from}","%n новых сообщений в {folderName} \nот {from}"],
+    "Error while loading the accounts." : "Ошибка при загрузке учётных записей",
+    "Connecting …" : "Соединение ...",
+    "Unknown error" : "Неизвестная ошибка",
+    "Error while creating an account: " : "Ошибка при создании учётной записи:",
+    "Connect" : "Соединить",
+    "Message could not be starred. Please try again." : "Не удалось пометить сообщение. Попробуйте снова.",
     "Error while loading the selected account." : "Ошибка загрузки выбранного аккаунта.",
     "Error while loading messages." : "Ошибка пр загрузке изображений.",
     "Choose a folder to store the attachment in" : "Выберите каталог для хранения вложений",
@@ -16,23 +21,19 @@ OC.L10N.register(
     "Forwarded message" : "Пересланное сообщение",
     "Error while loading the selected message." : "Ошибка при загрузке выбранного сообщения.",
     "Draft saved!" : "Черновик сохранен!",
-    "Connecting …" : "Соединение ...",
-    "Unknown error" : "Неизвестная ошибка",
-    "Error while creating an account: " : "Ошибка при создании учётной записи:",
-    "Connect" : "Соединить",
-    "Error while deleting account." : "Ошибка при удалении учётной записи.",
     "Choose a file to add as attachment" : "Выбрать файл для вложения",
     "Reply" : "Ответ",
     "Send" : "Отправить",
     "Sending …" : "Отправляется ...",
     "Message sent!" : "Сообщение отправлено!",
+    "Server error" : "Ошибка сервера",
     "you" : "вы",
     "Send message to {email}" : "Отправить сообщения на {email}",
-    "Message could not be starred. Please try again." : "Не удалось пометить сообщение. Попробуйте снова.",
     "Error while deleting message." : "Ошибка при удалении сообщения.",
     "Loading …" : "Идёт загрузка ...",
     "Load more …" : "Загрузить больше ...",
     "Check messages …" : "Проверяем сообщения ...",
+    "Error while deleting account." : "Ошибка при удалении учётной записи.",
     "Inbox" : "Входящие",
     "Sent" : "Отправленные",
     "Drafts" : "Черновики",
@@ -57,15 +58,6 @@ OC.L10N.register(
     "Back to website" : "Обратно к веб-сайту",
     "Add attachment from Files" : "Добавить вложение из файла",
     "Error loading message" : "Ошибка при загрузке сообщения",
-    "Download attachment" : "Скачать вложение",
-    "Save to Files" : "Сохранить в Файлы",
-    "Save all to Files" : "Сохранить всё в Файлы",
-    "Forward" : "Переслать",
-    "Delete" : "Удалить",
-    "Add mail account" : "Добавить почтовую учетную запись",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Хотите зашифровать свою почту? Установите <a href=\"https://www.mailvelope.com/\" target=\"_blank\">расширение для браузера Mailvelope</a>!",
-    "No search results for {{searchTerm}}" : "По запросу {{searchTerm}} ничего не найдено",
-    "No messages in this folder!" : "В этом каталоге нет сообщений!",
     "New message" : "Новое сообщение",
     "Connect your mail account" : "Подключите ваш почтовый аккаунт",
     "Name" : "Имя",
@@ -85,6 +77,15 @@ OC.L10N.register(
     "SMTP Port (default 25, ssl 465)" : "Порт сервера SMTP (по умолчанию 25, SSL 465)",
     "SMTP User" : "Пользователь сервера SMTP",
     "SMTP Password" : "Пароль SMTP",
+    "Download attachment" : "Скачать вложение",
+    "Save to Files" : "Сохранить в Файлы",
+    "Save all to Files" : "Сохранить всё в Файлы",
+    "Forward" : "Переслать",
+    "Delete" : "Удалить",
+    "Add mail account" : "Добавить почтовую учетную запись",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Хотите зашифровать свою почту? Установите <a href=\"https://www.mailvelope.com/\" target=\"_blank\">расширение для браузера Mailvelope</a>!",
+    "No messages in this folder!" : "В этом каталоге нет сообщений!",
+    "No search results for {{searchTerm}}" : "По запросу {{searchTerm}} ничего не найдено",
     "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.",
diff --git a/l10n/ru.json b/l10n/ru.json
index c6625a300..0fee83d0e 100644
--- a/l10n/ru.json
+++ b/l10n/ru.json
@@ -1,8 +1,13 @@
 { "translations": {
     "Mail" : "Почта",
-    "Error while loading the accounts." : "Ошибка при загрузке учётных записей",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n новое сообщение в {folderName} \nот {from}","%n новых сообщения в {folderName} \nот {from}","%n новых сообщения в {folderName} \nот {from}","%n новых сообщений в {folderName} \nот {from}"],
+    "Error while loading the accounts." : "Ошибка при загрузке учётных записей",
+    "Connecting …" : "Соединение ...",
+    "Unknown error" : "Неизвестная ошибка",
+    "Error while creating an account: " : "Ошибка при создании учётной записи:",
+    "Connect" : "Соединить",
+    "Message could not be starred. Please try again." : "Не удалось пометить сообщение. Попробуйте снова.",
     "Error while loading the selected account." : "Ошибка загрузки выбранного аккаунта.",
     "Error while loading messages." : "Ошибка пр загрузке изображений.",
     "Choose a folder to store the attachment in" : "Выберите каталог для хранения вложений",
@@ -14,23 +19,19 @@
     "Forwarded message" : "Пересланное сообщение",
     "Error while loading the selected message." : "Ошибка при загрузке выбранного сообщения.",
     "Draft saved!" : "Черновик сохранен!",
-    "Connecting …" : "Соединение ...",
-    "Unknown error" : "Неизвестная ошибка",
-    "Error while creating an account: " : "Ошибка при создании учётной записи:",
-    "Connect" : "Соединить",
-    "Error while deleting account." : "Ошибка при удалении учётной записи.",
     "Choose a file to add as attachment" : "Выбрать файл для вложения",
     "Reply" : "Ответ",
     "Send" : "Отправить",
     "Sending …" : "Отправляется ...",
     "Message sent!" : "Сообщение отправлено!",
+    "Server error" : "Ошибка сервера",
     "you" : "вы",
     "Send message to {email}" : "Отправить сообщения на {email}",
-    "Message could not be starred. Please try again." : "Не удалось пометить сообщение. Попробуйте снова.",
     "Error while deleting message." : "Ошибка при удалении сообщения.",
     "Loading …" : "Идёт загрузка ...",
     "Load more …" : "Загрузить больше ...",
     "Check messages …" : "Проверяем сообщения ...",
+    "Error while deleting account." : "Ошибка при удалении учётной записи.",
     "Inbox" : "Входящие",
     "Sent" : "Отправленные",
     "Drafts" : "Черновики",
@@ -55,15 +56,6 @@
     "Back to website" : "Обратно к веб-сайту",
     "Add attachment from Files" : "Добавить вложение из файла",
     "Error loading message" : "Ошибка при загрузке сообщения",
-    "Download attachment" : "Скачать вложение",
-    "Save to Files" : "Сохранить в Файлы",
-    "Save all to Files" : "Сохранить всё в Файлы",
-    "Forward" : "Переслать",
-    "Delete" : "Удалить",
-    "Add mail account" : "Добавить почтовую учетную запись",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Хотите зашифровать свою почту? Установите <a href=\"https://www.mailvelope.com/\" target=\"_blank\">расширение для браузера Mailvelope</a>!",
-    "No search results for {{searchTerm}}" : "По запросу {{searchTerm}} ничего не найдено",
-    "No messages in this folder!" : "В этом каталоге нет сообщений!",
     "New message" : "Новое сообщение",
     "Connect your mail account" : "Подключите ваш почтовый аккаунт",
     "Name" : "Имя",
@@ -83,6 +75,15 @@
     "SMTP Port (default 25, ssl 465)" : "Порт сервера SMTP (по умолчанию 25, SSL 465)",
     "SMTP User" : "Пользователь сервера SMTP",
     "SMTP Password" : "Пароль SMTP",
+    "Download attachment" : "Скачать вложение",
+    "Save to Files" : "Сохранить в Файлы",
+    "Save all to Files" : "Сохранить всё в Файлы",
+    "Forward" : "Переслать",
+    "Delete" : "Удалить",
+    "Add mail account" : "Добавить почтовую учетную запись",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Хотите зашифровать свою почту? Установите <a href=\"https://www.mailvelope.com/\" target=\"_blank\">расширение для браузера Mailvelope</a>!",
+    "No messages in this folder!" : "В этом каталоге нет сообщений!",
+    "No search results for {{searchTerm}}" : "По запросу {{searchTerm}} ничего не найдено",
     "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.",
diff --git a/l10n/sk_SK.js b/l10n/sk_SK.js
index 4ba1cb43f..550d0780a 100644
--- a/l10n/sk_SK.js
+++ b/l10n/sk_SK.js
@@ -3,6 +3,11 @@ OC.L10N.register(
     {
     "Mail" : "Pošta",
     "Error while loading the accounts." : "Chyba pri načítaní účtov.",
+    "Connecting …" : "Pripájam sa ...",
+    "Unknown error" : "Neznáma chyba",
+    "Error while creating an account: " : "Chyba pri vytváraní účtu:",
+    "Connect" : "Pripojiť",
+    "Message could not be starred. Please try again." : "Správa nemohla byť označená hviezdičkou. Skúste to znovu.",
     "Error while loading the selected account." : "Chyba počas načítania zvoleného účtu.",
     "Error while loading messages." : "Chyba počas načítavania správ.",
     "Choose a folder to store the attachment in" : "Vyberte priečinok pre uloženie prílohy",
@@ -12,22 +17,18 @@ OC.L10N.register(
     "Error while saving attachment to Files." : "Chyba pri ukladaní prílohy do Súborov.",
     "Error while loading the selected message." : "Chyba pri načítavaní vybranej správy.",
     "Draft saved!" : "Koncept uložený!",
-    "Connecting …" : "Pripájam sa ...",
-    "Unknown error" : "Neznáma chyba",
-    "Error while creating an account: " : "Chyba pri vytváraní účtu:",
-    "Connect" : "Pripojiť",
-    "Error while deleting account." : "Chyba pri mazaní účtu.",
     "Choose a file to add as attachment" : "Zvoľte súbor, ktorý chcete pridať ako prílohu.",
     "Reply" : "Odpoveď",
     "Send" : "Odoslať",
     "Sending …" : "Odosielam ...",
     "Message sent!" : "Správa odoslaná!",
+    "Server error" : "Chyba servera",
     "you" : "vy",
-    "Message could not be starred. Please try again." : "Správa nemohla byť označená hviezdičkou. Skúste to znovu.",
     "Error while deleting message." : "Chyba pri mazaní správy.",
     "Loading …" : "Načítavam...",
     "Load more …" : "Načítať ďalšie ...",
     "Check messages …" : "Kontrolujem správy ...",
+    "Error while deleting account." : "Chyba pri mazaní účtu.",
     "Inbox" : "Doručené",
     "Sent" : "Odoslané",
     "Drafts" : "Koncept",
@@ -51,13 +52,6 @@ OC.L10N.register(
     "Back to website" : "Návrat na webstránku",
     "Add attachment from Files" : "Pridať prílohu zo Súborov",
     "Error loading message" : "Chyba načítavania správy",
-    "Download attachment" : "Stiahnuť prílohu",
-    "Save to Files" : "Uložiť do súborov",
-    "Save all to Files" : "Uložiť všetko do Súborov",
-    "Forward" : "Preposlať",
-    "Delete" : "Zmazať",
-    "Add mail account" : "Pridať mailový účet",
-    "No messages in this folder!" : "V priečinku nie sú žiadne správy!",
     "New message" : "Nová správa",
     "Connect your mail account" : "Pripojte sa k svojmu emailovému účtu",
     "Name" : "Názov",
@@ -77,6 +71,13 @@ OC.L10N.register(
     "SMTP Port (default 25, ssl 465)" : "SMTP port (predvolene 25, ssl 465)",
     "SMTP User" : "SMTP používateľ",
     "SMTP Password" : "SMTP heslo",
+    "Download attachment" : "Stiahnuť prílohu",
+    "Save to Files" : "Uložiť do súborov",
+    "Save all to Files" : "Uložiť všetko do Súborov",
+    "Forward" : "Preposlať",
+    "Delete" : "Zmazať",
+    "Add mail account" : "Pridať mailový účet",
+    "No messages in this folder!" : "V priečinku nie sú žiadne správy!",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Presmerovávam na %s - kliknite sem, ak nebudete automaticky presmerovaní behom niekoľkých sekúnd.",
     "Redirect Warning" : "Upozornenie na presmerovanie",
     "The previous page is sending you to %s." : "Predošlá stránka vás posiela na %s.",
diff --git a/l10n/sk_SK.json b/l10n/sk_SK.json
index 2ffe1e571..d465c8906 100644
--- a/l10n/sk_SK.json
+++ b/l10n/sk_SK.json
@@ -1,6 +1,11 @@
 { "translations": {
     "Mail" : "Pošta",
     "Error while loading the accounts." : "Chyba pri načítaní účtov.",
+    "Connecting …" : "Pripájam sa ...",
+    "Unknown error" : "Neznáma chyba",
+    "Error while creating an account: " : "Chyba pri vytváraní účtu:",
+    "Connect" : "Pripojiť",
+    "Message could not be starred. Please try again." : "Správa nemohla byť označená hviezdičkou. Skúste to znovu.",
     "Error while loading the selected account." : "Chyba počas načítania zvoleného účtu.",
     "Error while loading messages." : "Chyba počas načítavania správ.",
     "Choose a folder to store the attachment in" : "Vyberte priečinok pre uloženie prílohy",
@@ -10,22 +15,18 @@
     "Error while saving attachment to Files." : "Chyba pri ukladaní prílohy do Súborov.",
     "Error while loading the selected message." : "Chyba pri načítavaní vybranej správy.",
     "Draft saved!" : "Koncept uložený!",
-    "Connecting …" : "Pripájam sa ...",
-    "Unknown error" : "Neznáma chyba",
-    "Error while creating an account: " : "Chyba pri vytváraní účtu:",
-    "Connect" : "Pripojiť",
-    "Error while deleting account." : "Chyba pri mazaní účtu.",
     "Choose a file to add as attachment" : "Zvoľte súbor, ktorý chcete pridať ako prílohu.",
     "Reply" : "Odpoveď",
     "Send" : "Odoslať",
     "Sending …" : "Odosielam ...",
     "Message sent!" : "Správa odoslaná!",
+    "Server error" : "Chyba servera",
     "you" : "vy",
-    "Message could not be starred. Please try again." : "Správa nemohla byť označená hviezdičkou. Skúste to znovu.",
     "Error while deleting message." : "Chyba pri mazaní správy.",
     "Loading …" : "Načítavam...",
     "Load more …" : "Načítať ďalšie ...",
     "Check messages …" : "Kontrolujem správy ...",
+    "Error while deleting account." : "Chyba pri mazaní účtu.",
     "Inbox" : "Doručené",
     "Sent" : "Odoslané",
     "Drafts" : "Koncept",
@@ -49,13 +50,6 @@
     "Back to website" : "Návrat na webstránku",
     "Add attachment from Files" : "Pridať prílohu zo Súborov",
     "Error loading message" : "Chyba načítavania správy",
-    "Download attachment" : "Stiahnuť prílohu",
-    "Save to Files" : "Uložiť do súborov",
-    "Save all to Files" : "Uložiť všetko do Súborov",
-    "Forward" : "Preposlať",
-    "Delete" : "Zmazať",
-    "Add mail account" : "Pridať mailový účet",
-    "No messages in this folder!" : "V priečinku nie sú žiadne správy!",
     "New message" : "Nová správa",
     "Connect your mail account" : "Pripojte sa k svojmu emailovému účtu",
     "Name" : "Názov",
@@ -75,6 +69,13 @@
     "SMTP Port (default 25, ssl 465)" : "SMTP port (predvolene 25, ssl 465)",
     "SMTP User" : "SMTP používateľ",
     "SMTP Password" : "SMTP heslo",
+    "Download attachment" : "Stiahnuť prílohu",
+    "Save to Files" : "Uložiť do súborov",
+    "Save all to Files" : "Uložiť všetko do Súborov",
+    "Forward" : "Preposlať",
+    "Delete" : "Zmazať",
+    "Add mail account" : "Pridať mailový účet",
+    "No messages in this folder!" : "V priečinku nie sú žiadne správy!",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Presmerovávam na %s - kliknite sem, ak nebudete automaticky presmerovaní behom niekoľkých sekúnd.",
     "Redirect Warning" : "Upozornenie na presmerovanie",
     "The previous page is sending you to %s." : "Predošlá stránka vás posiela na %s.",
diff --git a/l10n/sl.js b/l10n/sl.js
index ad0e1eadd..681e0c481 100644
--- a/l10n/sl.js
+++ b/l10n/sl.js
@@ -3,6 +3,11 @@ OC.L10N.register(
     {
     "Mail" : "Elektronska pošta",
     "Error while loading the accounts." : "Prišlo je do napake med nalaganjem računa.¸",
+    "Connecting …" : "Poteka vzpostavljanje povezave ...",
+    "Unknown error" : "Neznana napaka",
+    "Error while creating an account: " : "Prišlo je do napake med ustvarjanjem računa:",
+    "Connect" : "Poveži",
+    "Message could not be starred. Please try again." : "Sporočila ni mogoče označiti z zvezdico. Poskusite znova.",
     "Error while loading the selected account." : "Prišlo je do napake med nalaganjem izbranega računa.",
     "Error while loading messages." : "Prišlo je do napake nalaganja sporočil.",
     "Choose a folder to store the attachment in" : "Izbor mape za shranjevanje prilog.",
@@ -13,23 +18,19 @@ OC.L10N.register(
     "Opening HTML drafts is not supported yet." : "Odpiranje osnutkov sporočil v zapisu HTML še ni podprto.",
     "Error while loading the selected message." : "Napaka med nalaganjem izbranih sporočil",
     "Draft saved!" : "Osnutek sporočila je shranjen!",
-    "Connecting …" : "Poteka vzpostavljanje povezave ...",
-    "Unknown error" : "Neznana napaka",
-    "Error while creating an account: " : "Prišlo je do napake med ustvarjanjem računa:",
-    "Connect" : "Poveži",
-    "Error while deleting account." : "Prišlo je do napake med brisanjem računa.",
     "Choose a file to add as attachment" : "Izbor datoteke za prilogo",
     "Reply" : "Odgovori",
     "Send" : "Pošlji",
     "Sending …" : "Pošiljanje ...",
     "Message sent!" : "Sporočilo je poslano!",
+    "Server error" : "Napaka strežnika",
     "you" : "vi",
     "Send message to {email}" : "Pošlji sporočilo na {email}",
-    "Message could not be starred. Please try again." : "Sporočila ni mogoče označiti z zvezdico. Poskusite znova.",
     "Error while deleting message." : "Napaka med brisanjem sporočila.",
     "Loading …" : "Nalaganje ...",
     "Load more …" : "Naloži več ...",
     "Check messages …" : "Preverjanje za nova sporočila...",
+    "Error while deleting account." : "Prišlo je do napake med brisanjem računa.",
     "Inbox" : "Dohodna pošta",
     "Sent" : "Poslano",
     "Drafts" : "Osnutki",
@@ -53,14 +54,6 @@ OC.L10N.register(
     "Back to website" : "Nazaj na spletno stran",
     "Add attachment from Files" : "Dodaj prilogo iz mape Datoteke",
     "Error loading message" : "Napaka nalaganja sporočila",
-    "Download attachment" : "Prejmi prilogo",
-    "Save to Files" : "Shrani v mapo datotek",
-    "Save all to Files" : "Shrani vse v mapo datotek",
-    "Forward" : "Posreduj",
-    "Delete" : "Izbriši",
-    "Add mail account" : "Dodaj poštni račun",
-    "No search results for {{searchTerm}}" : "Ni zadetkov iskanja za {{searchTerm}}",
-    "No messages in this folder!" : "V tej mapi ni sporočil!",
     "New message" : "Novo sporočilo",
     "Connect your mail account" : "Povezava s poštnim računom",
     "Name" : "Ime",
@@ -80,6 +73,14 @@ OC.L10N.register(
     "SMTP Port (default 25, ssl 465)" : "Vrata SMTP (privzeto 25, SSL 465)",
     "SMTP User" : "Uporabnik SMTP",
     "SMTP Password" : "Geslo SMTP",
+    "Download attachment" : "Prejmi prilogo",
+    "Save to Files" : "Shrani v mapo datotek",
+    "Save all to Files" : "Shrani vse v mapo datotek",
+    "Forward" : "Posreduj",
+    "Delete" : "Izbriši",
+    "Add mail account" : "Dodaj poštni račun",
+    "No messages in this folder!" : "V tej mapi ni sporočil!",
+    "No search results for {{searchTerm}}" : "Ni zadetkov iskanja za {{searchTerm}}",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Poteka preusmeritev na %s - v kolikor preusmeritev ni izvedena samodejno, kliknite tu.",
     "Redirect Warning" : "Opozorilo preusmeritve",
     "The previous page is sending you to %s." : "Prej obiskana stran zahteva preusmeritev na %s.",
diff --git a/l10n/sl.json b/l10n/sl.json
index 22ded7db1..dcfaef0d8 100644
--- a/l10n/sl.json
+++ b/l10n/sl.json
@@ -1,6 +1,11 @@
 { "translations": {
     "Mail" : "Elektronska pošta",
     "Error while loading the accounts." : "Prišlo je do napake med nalaganjem računa.¸",
+    "Connecting …" : "Poteka vzpostavljanje povezave ...",
+    "Unknown error" : "Neznana napaka",
+    "Error while creating an account: " : "Prišlo je do napake med ustvarjanjem računa:",
+    "Connect" : "Poveži",
+    "Message could not be starred. Please try again." : "Sporočila ni mogoče označiti z zvezdico. Poskusite znova.",
     "Error while loading the selected account." : "Prišlo je do napake med nalaganjem izbranega računa.",
     "Error while loading messages." : "Prišlo je do napake nalaganja sporočil.",
     "Choose a folder to store the attachment in" : "Izbor mape za shranjevanje prilog.",
@@ -11,23 +16,19 @@
     "Opening HTML drafts is not supported yet." : "Odpiranje osnutkov sporočil v zapisu HTML še ni podprto.",
     "Error while loading the selected message." : "Napaka med nalaganjem izbranih sporočil",
     "Draft saved!" : "Osnutek sporočila je shranjen!",
-    "Connecting …" : "Poteka vzpostavljanje povezave ...",
-    "Unknown error" : "Neznana napaka",
-    "Error while creating an account: " : "Prišlo je do napake med ustvarjanjem računa:",
-    "Connect" : "Poveži",
-    "Error while deleting account." : "Prišlo je do napake med brisanjem računa.",
     "Choose a file to add as attachment" : "Izbor datoteke za prilogo",
     "Reply" : "Odgovori",
     "Send" : "Pošlji",
     "Sending …" : "Pošiljanje ...",
     "Message sent!" : "Sporočilo je poslano!",
+    "Server error" : "Napaka strežnika",
     "you" : "vi",
     "Send message to {email}" : "Pošlji sporočilo na {email}",
-    "Message could not be starred. Please try again." : "Sporočila ni mogoče označiti z zvezdico. Poskusite znova.",
     "Error while deleting message." : "Napaka med brisanjem sporočila.",
     "Loading …" : "Nalaganje ...",
     "Load more …" : "Naloži več ...",
     "Check messages …" : "Preverjanje za nova sporočila...",
+    "Error while deleting account." : "Prišlo je do napake med brisanjem računa.",
     "Inbox" : "Dohodna pošta",
     "Sent" : "Poslano",
     "Drafts" : "Osnutki",
@@ -51,14 +52,6 @@
     "Back to website" : "Nazaj na spletno stran",
     "Add attachment from Files" : "Dodaj prilogo iz mape Datoteke",
     "Error loading message" : "Napaka nalaganja sporočila",
-    "Download attachment" : "Prejmi prilogo",
-    "Save to Files" : "Shrani v mapo datotek",
-    "Save all to Files" : "Shrani vse v mapo datotek",
-    "Forward" : "Posreduj",
-    "Delete" : "Izbriši",
-    "Add mail account" : "Dodaj poštni račun",
-    "No search results for {{searchTerm}}" : "Ni zadetkov iskanja za {{searchTerm}}",
-    "No messages in this folder!" : "V tej mapi ni sporočil!",
     "New message" : "Novo sporočilo",
     "Connect your mail account" : "Povezava s poštnim računom",
     "Name" : "Ime",
@@ -78,6 +71,14 @@
     "SMTP Port (default 25, ssl 465)" : "Vrata SMTP (privzeto 25, SSL 465)",
     "SMTP User" : "Uporabnik SMTP",
     "SMTP Password" : "Geslo SMTP",
+    "Download attachment" : "Prejmi prilogo",
+    "Save to Files" : "Shrani v mapo datotek",
+    "Save all to Files" : "Shrani vse v mapo datotek",
+    "Forward" : "Posreduj",
+    "Delete" : "Izbriši",
+    "Add mail account" : "Dodaj poštni račun",
+    "No messages in this folder!" : "V tej mapi ni sporočil!",
+    "No search results for {{searchTerm}}" : "Ni zadetkov iskanja za {{searchTerm}}",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Poteka preusmeritev na %s - v kolikor preusmeritev ni izvedena samodejno, kliknite tu.",
     "Redirect Warning" : "Opozorilo preusmeritve",
     "The previous page is sending you to %s." : "Prej obiskana stran zahteva preusmeritev na %s.",
diff --git a/l10n/sr.js b/l10n/sr.js
index f348189d7..7a7d554b4 100644
--- a/l10n/sr.js
+++ b/l10n/sr.js
@@ -2,8 +2,13 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Пошта",
-    "Error while loading the accounts." : "Грешка при учитавању налога.",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n нова порука у {folderName} \nод {from}","%n нове поруке у {folderName} \nод {from}","%n нових порука у {folderName} \nод {from}"],
+    "Error while loading the accounts." : "Грешка при учитавању налога.",
+    "Connecting …" : "Повезујем се...",
+    "Unknown error" : "Непозната грешка",
+    "Error while creating an account: " : "Грешка при прављењу налога:",
+    "Connect" : "Повежи се",
+    "Message could not be starred. Please try again." : "Порука се не може „озвездати“. Покушајте поново.",
     "Error while loading the selected account." : "Грешка при учитавању изабраног налога.",
     "Error while loading messages." : "Грешка при учитавању порука.",
     "Choose a folder to store the attachment in" : "Изаберите фасциклу за смештање прилога",
@@ -14,23 +19,19 @@ OC.L10N.register(
     "Opening HTML drafts is not supported yet." : "Отварање ХТМЛ нацрта још није подржано.",
     "Error while loading the selected message." : "Грешка при учитавању изабране поруке.",
     "Draft saved!" : "Нацрт сачуван!",
-    "Connecting …" : "Повезујем се...",
-    "Unknown error" : "Непозната грешка",
-    "Error while creating an account: " : "Грешка при прављењу налога:",
-    "Connect" : "Повежи се",
-    "Error while deleting account." : "Грешка при брисању налога.",
     "Choose a file to add as attachment" : "Изаберите фајл за прилог",
     "Reply" : "Одговори",
     "Send" : "Пошаљи",
     "Sending …" : "Шаљем...",
     "Message sent!" : "Порука послата!",
+    "Server error" : "Грешка сервера",
     "you" : "ви",
     "Send message to {email}" : "Пошаљи поруку на {email}",
-    "Message could not be starred. Please try again." : "Порука се не може „озвездати“. Покушајте поново.",
     "Error while deleting message." : "Грешка при брисању поруке.",
     "Loading …" : "Учитавам...",
     "Load more …" : "Учитај још...",
     "Check messages …" : "Провери поруке…",
+    "Error while deleting account." : "Грешка при брисању налога.",
     "Inbox" : "Долазно",
     "Sent" : "Послато",
     "Drafts" : "Недовршено",
@@ -54,15 +55,6 @@ OC.L10N.register(
     "Back to website" : "Назад на вебсајт",
     "Add attachment from Files" : "Додај прилог из фајлова",
     "Error loading message" : "Грешка при учитавању поруке",
-    "Download attachment" : "Преузми прилог",
-    "Save to Files" : "Сачувај у фајлове",
-    "Save all to Files" : "Сачувај све у фајлове",
-    "Forward" : "Проследи",
-    "Delete" : "Обриши",
-    "Add mail account" : "Додај налог",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Желите да шифрујете пошту? Инсталирајте <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope проширење прегледача</a>!",
-    "No search results for {{searchTerm}}" : "Нема резултата претраге за {{searchTerm}}",
-    "No messages in this folder!" : "Нема порука у овој фасцикли!",
     "New message" : "Нова порука",
     "Connect your mail account" : "Повежите ваш налог е-поште",
     "Name" : "Име",
@@ -82,6 +74,15 @@ OC.L10N.register(
     "SMTP Port (default 25, ssl 465)" : "СМТП порт (обично 25, ССЛ 465)",
     "SMTP User" : "СМТП корисник",
     "SMTP Password" : "СМТП лозинка",
+    "Download attachment" : "Преузми прилог",
+    "Save to Files" : "Сачувај у фајлове",
+    "Save all to Files" : "Сачувај све у фајлове",
+    "Forward" : "Проследи",
+    "Delete" : "Обриши",
+    "Add mail account" : "Додај налог",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Желите да шифрујете пошту? Инсталирајте <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope проширење прегледача</a>!",
+    "No messages in this folder!" : "Нема порука у овој фасцикли!",
+    "No search results for {{searchTerm}}" : "Нема резултата претраге за {{searchTerm}}",
     "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.",
diff --git a/l10n/sr.json b/l10n/sr.json
index 1a0a041cd..0b31dfe6a 100644
--- a/l10n/sr.json
+++ b/l10n/sr.json
@@ -1,7 +1,12 @@
 { "translations": {
     "Mail" : "Пошта",
-    "Error while loading the accounts." : "Грешка при учитавању налога.",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n нова порука у {folderName} \nод {from}","%n нове поруке у {folderName} \nод {from}","%n нових порука у {folderName} \nод {from}"],
+    "Error while loading the accounts." : "Грешка при учитавању налога.",
+    "Connecting …" : "Повезујем се...",
+    "Unknown error" : "Непозната грешка",
+    "Error while creating an account: " : "Грешка при прављењу налога:",
+    "Connect" : "Повежи се",
+    "Message could not be starred. Please try again." : "Порука се не може „озвездати“. Покушајте поново.",
     "Error while loading the selected account." : "Грешка при учитавању изабраног налога.",
     "Error while loading messages." : "Грешка при учитавању порука.",
     "Choose a folder to store the attachment in" : "Изаберите фасциклу за смештање прилога",
@@ -12,23 +17,19 @@
     "Opening HTML drafts is not supported yet." : "Отварање ХТМЛ нацрта још није подржано.",
     "Error while loading the selected message." : "Грешка при учитавању изабране поруке.",
     "Draft saved!" : "Нацрт сачуван!",
-    "Connecting …" : "Повезујем се...",
-    "Unknown error" : "Непозната грешка",
-    "Error while creating an account: " : "Грешка при прављењу налога:",
-    "Connect" : "Повежи се",
-    "Error while deleting account." : "Грешка при брисању налога.",
     "Choose a file to add as attachment" : "Изаберите фајл за прилог",
     "Reply" : "Одговори",
     "Send" : "Пошаљи",
     "Sending …" : "Шаљем...",
     "Message sent!" : "Порука послата!",
+    "Server error" : "Грешка сервера",
     "you" : "ви",
     "Send message to {email}" : "Пошаљи поруку на {email}",
-    "Message could not be starred. Please try again." : "Порука се не може „озвездати“. Покушајте поново.",
     "Error while deleting message." : "Грешка при брисању поруке.",
     "Loading …" : "Учитавам...",
     "Load more …" : "Учитај још...",
     "Check messages …" : "Провери поруке…",
+    "Error while deleting account." : "Грешка при брисању налога.",
     "Inbox" : "Долазно",
     "Sent" : "Послато",
     "Drafts" : "Недовршено",
@@ -52,15 +53,6 @@
     "Back to website" : "Назад на вебсајт",
     "Add attachment from Files" : "Додај прилог из фајлова",
     "Error loading message" : "Грешка при учитавању поруке",
-    "Download attachment" : "Преузми прилог",
-    "Save to Files" : "Сачувај у фајлове",
-    "Save all to Files" : "Сачувај све у фајлове",
-    "Forward" : "Проследи",
-    "Delete" : "Обриши",
-    "Add mail account" : "Додај налог",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Желите да шифрујете пошту? Инсталирајте <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope проширење прегледача</a>!",
-    "No search results for {{searchTerm}}" : "Нема резултата претраге за {{searchTerm}}",
-    "No messages in this folder!" : "Нема порука у овој фасцикли!",
     "New message" : "Нова порука",
     "Connect your mail account" : "Повежите ваш налог е-поште",
     "Name" : "Име",
@@ -80,6 +72,15 @@
     "SMTP Port (default 25, ssl 465)" : "СМТП порт (обично 25, ССЛ 465)",
     "SMTP User" : "СМТП корисник",
     "SMTP Password" : "СМТП лозинка",
+    "Download attachment" : "Преузми прилог",
+    "Save to Files" : "Сачувај у фајлове",
+    "Save all to Files" : "Сачувај све у фајлове",
+    "Forward" : "Проследи",
+    "Delete" : "Обриши",
+    "Add mail account" : "Додај налог",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Желите да шифрујете пошту? Инсталирајте <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope проширење прегледача</a>!",
+    "No messages in this folder!" : "Нема порука у овој фасцикли!",
+    "No search results for {{searchTerm}}" : "Нема резултата претраге за {{searchTerm}}",
     "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.",
diff --git a/l10n/sv.js b/l10n/sv.js
index 7a67b0df5..7f29c82e3 100644
--- a/l10n/sv.js
+++ b/l10n/sv.js
@@ -2,8 +2,13 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Mail",
-    "Error while loading the accounts." : "Fel vid laddning av konto.",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n nya meddelanden i {folderName}\nfrån {from}","%n nya meddelanden i {folderName}\nfrån {from}"],
+    "Error while loading the accounts." : "Fel vid laddning av konto.",
+    "Connecting …" : "Ansluter ...",
+    "Unknown error" : "Okänt fel",
+    "Error while creating an account: " : "Fel när du skapade konto:",
+    "Connect" : "Anslut",
+    "Message could not be starred. Please try again." : "Meddelande kan inte starta. Försök igen.",
     "Error while loading the selected account." : "Fel vid inläsning av valt konto.",
     "Error while loading messages." : "Fel vid inläsning av meddelanden.",
     "Choose a folder to store the attachment in" : "Välj en mapp att spara den bifogade filen i",
@@ -13,22 +18,18 @@ OC.L10N.register(
     "Error while saving attachment to Files." : "Fel vid sparande bilagor till filer.",
     "Error while loading the selected message." : "Fel vid inläsning av valda meddelandet.",
     "Draft saved!" : "Utkast sparat!",
-    "Connecting …" : "Ansluter ...",
-    "Unknown error" : "Okänt fel",
-    "Error while creating an account: " : "Fel när du skapade konto:",
-    "Connect" : "Anslut",
-    "Error while deleting account." : "Fel vid radering av konto.",
     "Choose a file to add as attachment" : "Välj en fil att lägga som bilaga",
     "Reply" : "Svara",
     "Send" : "Skicka",
     "Sending …" : "Sänder ...",
     "Message sent!" : "Meddelande skickat!",
+    "Server error" : "Serverfel",
     "you" : "du",
-    "Message could not be starred. Please try again." : "Meddelande kan inte starta. Försök igen.",
     "Error while deleting message." : "Fel vid radering av  meddelande.",
     "Loading …" : "Laddar ...",
     "Load more …" : "Ladda mer ...",
     "Check messages …" : "Kontrollera meddelanden ...",
+    "Error while deleting account." : "Fel vid radering av konto.",
     "Inbox" : "Inkorg",
     "Sent" : "Skickad",
     "Drafts" : "Utkast",
@@ -52,15 +53,6 @@ OC.L10N.register(
     "Back to website" : "Tillbaka till webbplatsen",
     "Add attachment from Files" : "Bifoga från Filer",
     "Error loading message" : "Fel vid laddning av meddelande",
-    "Download attachment" : "Ladda ner bilaga",
-    "Save to Files" : "Spara till Filer",
-    "Save all to Files" : "Spara allt till Filer",
-    "Forward" : "Vidarebefordra",
-    "Delete" : "Ta bort",
-    "Add mail account" : "Lägg till mailkonto",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Skulle du vilja kryptera dina email? Installera <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!",
-    "No search results for {{searchTerm}}" : "Inga sökresultat för {{searchTerm}}",
-    "No messages in this folder!" : "Inga meddelanden i denna mapp!",
     "New message" : "Nytt meddelande",
     "Connect your mail account" : "Anslut ditt e-postkonto",
     "Name" : "Namn",
@@ -80,6 +72,15 @@ OC.L10N.register(
     "SMTP Port (default 25, ssl 465)" : "SMTP Port (standard 25, ssl 465)",
     "SMTP User" : "SMTP-användare",
     "SMTP Password" : "SMTP-lösenord",
+    "Download attachment" : "Ladda ner bilaga",
+    "Save to Files" : "Spara till Filer",
+    "Save all to Files" : "Spara allt till Filer",
+    "Forward" : "Vidarebefordra",
+    "Delete" : "Ta bort",
+    "Add mail account" : "Lägg till mailkonto",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Skulle du vilja kryptera dina email? Installera <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!",
+    "No messages in this folder!" : "Inga meddelanden i denna mapp!",
+    "No search results for {{searchTerm}}" : "Inga sökresultat för {{searchTerm}}",
     "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.",
     "Redirect Warning" : "Omdirigeringsvarning",
     "The previous page is sending you to %s." : "Föregående sida skickar dig till %s.",
diff --git a/l10n/sv.json b/l10n/sv.json
index fdaf81011..1268f8fcb 100644
--- a/l10n/sv.json
+++ b/l10n/sv.json
@@ -1,7 +1,12 @@
 { "translations": {
     "Mail" : "Mail",
-    "Error while loading the accounts." : "Fel vid laddning av konto.",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n nya meddelanden i {folderName}\nfrån {from}","%n nya meddelanden i {folderName}\nfrån {from}"],
+    "Error while loading the accounts." : "Fel vid laddning av konto.",
+    "Connecting …" : "Ansluter ...",
+    "Unknown error" : "Okänt fel",
+    "Error while creating an account: " : "Fel när du skapade konto:",
+    "Connect" : "Anslut",
+    "Message could not be starred. Please try again." : "Meddelande kan inte starta. Försök igen.",
     "Error while loading the selected account." : "Fel vid inläsning av valt konto.",
     "Error while loading messages." : "Fel vid inläsning av meddelanden.",
     "Choose a folder to store the attachment in" : "Välj en mapp att spara den bifogade filen i",
@@ -11,22 +16,18 @@
     "Error while saving attachment to Files." : "Fel vid sparande bilagor till filer.",
     "Error while loading the selected message." : "Fel vid inläsning av valda meddelandet.",
     "Draft saved!" : "Utkast sparat!",
-    "Connecting …" : "Ansluter ...",
-    "Unknown error" : "Okänt fel",
-    "Error while creating an account: " : "Fel när du skapade konto:",
-    "Connect" : "Anslut",
-    "Error while deleting account." : "Fel vid radering av konto.",
     "Choose a file to add as attachment" : "Välj en fil att lägga som bilaga",
     "Reply" : "Svara",
     "Send" : "Skicka",
     "Sending …" : "Sänder ...",
     "Message sent!" : "Meddelande skickat!",
+    "Server error" : "Serverfel",
     "you" : "du",
-    "Message could not be starred. Please try again." : "Meddelande kan inte starta. Försök igen.",
     "Error while deleting message." : "Fel vid radering av  meddelande.",
     "Loading …" : "Laddar ...",
     "Load more …" : "Ladda mer ...",
     "Check messages …" : "Kontrollera meddelanden ...",
+    "Error while deleting account." : "Fel vid radering av konto.",
     "Inbox" : "Inkorg",
     "Sent" : "Skickad",
     "Drafts" : "Utkast",
@@ -50,15 +51,6 @@
     "Back to website" : "Tillbaka till webbplatsen",
     "Add attachment from Files" : "Bifoga från Filer",
     "Error loading message" : "Fel vid laddning av meddelande",
-    "Download attachment" : "Ladda ner bilaga",
-    "Save to Files" : "Spara till Filer",
-    "Save all to Files" : "Spara allt till Filer",
-    "Forward" : "Vidarebefordra",
-    "Delete" : "Ta bort",
-    "Add mail account" : "Lägg till mailkonto",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Skulle du vilja kryptera dina email? Installera <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!",
-    "No search results for {{searchTerm}}" : "Inga sökresultat för {{searchTerm}}",
-    "No messages in this folder!" : "Inga meddelanden i denna mapp!",
     "New message" : "Nytt meddelande",
     "Connect your mail account" : "Anslut ditt e-postkonto",
     "Name" : "Namn",
@@ -78,6 +70,15 @@
     "SMTP Port (default 25, ssl 465)" : "SMTP Port (standard 25, ssl 465)",
     "SMTP User" : "SMTP-användare",
     "SMTP Password" : "SMTP-lösenord",
+    "Download attachment" : "Ladda ner bilaga",
+    "Save to Files" : "Spara till Filer",
+    "Save all to Files" : "Spara allt till Filer",
+    "Forward" : "Vidarebefordra",
+    "Delete" : "Ta bort",
+    "Add mail account" : "Lägg till mailkonto",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Skulle du vilja kryptera dina email? Installera <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!",
+    "No messages in this folder!" : "Inga meddelanden i denna mapp!",
+    "No search results for {{searchTerm}}" : "Inga sökresultat för {{searchTerm}}",
     "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.",
     "Redirect Warning" : "Omdirigeringsvarning",
     "The previous page is sending you to %s." : "Föregående sida skickar dig till %s.",
diff --git a/l10n/th_TH.js b/l10n/th_TH.js
index 6cfa86d3b..de1005a21 100644
--- a/l10n/th_TH.js
+++ b/l10n/th_TH.js
@@ -2,9 +2,14 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "จดหมาย",
-    "Error while loading the accounts." : "ข้อผิดพลาดในขณะที่โหลดบัญชี",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["มี %n ข้อความใหม่ใน {folderName}\nจาก {from}"],
+    "Error while loading the accounts." : "ข้อผิดพลาดในขณะที่โหลดบัญชี",
+    "Connecting …" : "กำลังเชื่อมต่อ ...",
+    "Unknown error" : "ข้อผิดพลาดที่ไม่ทราบสาเหตุ",
+    "Error while creating an account: " : "ข้อผิดพลาดขณะกำลังสร้างบัญชี:",
+    "Connect" : "เชื่อมต่อ",
+    "Message could not be starred. Please try again." : "ไม่สามารถเริ่มต้นข้อความ โปรดลองอีกครั้ง",
     "Error while loading the selected account." : "ข้อผิดพลาดในขณะที่โหลดบัญชีที่เลือก",
     "Error while loading messages." : "ข้อผิดพลาดขณะโหลดข้อความ",
     "Choose a folder to store the attachment in" : "เลือกโฟลเดอร์ที่จะเก็บสิ่งที่แนบมาใน",
@@ -16,24 +21,20 @@ OC.L10N.register(
     "Forwarded message" : "ส่งต่อข้อความ",
     "Error while loading the selected message." : "ข้อผิดพลาดในขณะที่โหลดข้อความที่เลือก",
     "Draft saved!" : "แบบร่างถูกบันทึก!",
-    "Connecting …" : "กำลังเชื่อมต่อ ...",
-    "Unknown error" : "ข้อผิดพลาดที่ไม่ทราบสาเหตุ",
-    "Error while creating an account: " : "ข้อผิดพลาดขณะกำลังสร้างบัญชี:",
-    "Connect" : "เชื่อมต่อ",
-    "Error while deleting account." : "ข้อผิดพลาดขณะลบบัญชี",
     "Choose a file to add as attachment" : "เลือกไฟล์ที่ต้องการแนบ",
     "Reply" : "ตอบกลับ",
     "Send" : "ส่ง",
     "Sending …" : "กำลังส่ง ...",
     "Message sent!" : "ส่งข้อความ!",
+    "Server error" : "ข้อผิดพลาดของเซิร์ฟเวอร์",
     "you" : "คุณ",
     "Send message to {email}" : "ส่งข้อความไปยัง {email}",
-    "Message could not be starred. Please try again." : "ไม่สามารถเริ่มต้นข้อความ โปรดลองอีกครั้ง",
     "Error while deleting message." : "ข้อผิดพลาดขณะลบข้อความ",
     "Checking messages …" : "กำลังตรวจสอบข้อความ ...",
     "Loading …" : "กำลังโหลด ...",
     "Load more …" : "โหลดเพิ่มเติม ...",
     "Check messages …" : "ตรวจสอบข้อความ ...",
+    "Error while deleting account." : "ข้อผิดพลาดขณะลบบัญชี",
     "Inbox" : "กล่องขาเข้า",
     "Sent" : "ส่ง",
     "Drafts" : "แบบร่าง",
@@ -58,15 +59,6 @@ OC.L10N.register(
     "Back to website" : "กลับไปยังเว็บไซต์",
     "Add attachment from Files" : "เพิ่มสิ่งที่ต้องการแนบจากไฟล์",
     "Error loading message" : "กิดข้อผิดพลาดในการโหลด",
-    "Download attachment" : "ดาวน์โหลดสิ่งที่แนบมา",
-    "Save to Files" : "บันทึกไปยังไฟล์",
-    "Save all to Files" : "บันทึกทั้งหมดไปยังไฟล์",
-    "Forward" : "ส่งต่อ",
-    "Delete" : "ลบ",
-    "Add mail account" : "เพิ่มบัญชีอีเมล",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "กำลังมองหาการเข้ารหัสอีเมลของคุณ? ติดตั้ง <a href=\"https://www.mailvelope.com/\" target=\"_blank\">ส่วนขยาย Mailvelope ของเบราว์เซอร์</a>!",
-    "No search results for {{searchTerm}}" : "ไม่มีผลการค้นหาสำหรับ {{searchTerm}}",
-    "No messages in this folder!" : "ไม่มีข้อความในโฟลเดอร์นี้!",
     "New message" : "ข้อความใหม่",
     "Connect your mail account" : "เชื่อมต่อบัญชีอีเมลของคุณ",
     "Name" : "ชื่อ",
@@ -86,6 +78,15 @@ OC.L10N.register(
     "SMTP Port (default 25, ssl 465)" : "SMTP พอร์ต (ค่าเริ่มต้น 25, SSL 465)",
     "SMTP User" : "ชื่อผู้ใช้ SMTP",
     "SMTP Password" : "รหัสผ่าน SMTP",
+    "Download attachment" : "ดาวน์โหลดสิ่งที่แนบมา",
+    "Save to Files" : "บันทึกไปยังไฟล์",
+    "Save all to Files" : "บันทึกทั้งหมดไปยังไฟล์",
+    "Forward" : "ส่งต่อ",
+    "Delete" : "ลบ",
+    "Add mail account" : "เพิ่มบัญชีอีเมล",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "กำลังมองหาการเข้ารหัสอีเมลของคุณ? ติดตั้ง <a href=\"https://www.mailvelope.com/\" target=\"_blank\">ส่วนขยาย Mailvelope ของเบราว์เซอร์</a>!",
+    "No messages in this folder!" : "ไม่มีข้อความในโฟลเดอร์นี้!",
+    "No search results for {{searchTerm}}" : "ไม่มีผลการค้นหาสำหรับ {{searchTerm}}",
     "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",
diff --git a/l10n/th_TH.json b/l10n/th_TH.json
index 58b99d4e5..b1bcc0e6a 100644
--- a/l10n/th_TH.json
+++ b/l10n/th_TH.json
@@ -1,8 +1,13 @@
 { "translations": {
     "Mail" : "จดหมาย",
-    "Error while loading the accounts." : "ข้อผิดพลาดในขณะที่โหลดบัญชี",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["มี %n ข้อความใหม่ใน {folderName}\nจาก {from}"],
+    "Error while loading the accounts." : "ข้อผิดพลาดในขณะที่โหลดบัญชี",
+    "Connecting …" : "กำลังเชื่อมต่อ ...",
+    "Unknown error" : "ข้อผิดพลาดที่ไม่ทราบสาเหตุ",
+    "Error while creating an account: " : "ข้อผิดพลาดขณะกำลังสร้างบัญชี:",
+    "Connect" : "เชื่อมต่อ",
+    "Message could not be starred. Please try again." : "ไม่สามารถเริ่มต้นข้อความ โปรดลองอีกครั้ง",
     "Error while loading the selected account." : "ข้อผิดพลาดในขณะที่โหลดบัญชีที่เลือก",
     "Error while loading messages." : "ข้อผิดพลาดขณะโหลดข้อความ",
     "Choose a folder to store the attachment in" : "เลือกโฟลเดอร์ที่จะเก็บสิ่งที่แนบมาใน",
@@ -14,24 +19,20 @@
     "Forwarded message" : "ส่งต่อข้อความ",
     "Error while loading the selected message." : "ข้อผิดพลาดในขณะที่โหลดข้อความที่เลือก",
     "Draft saved!" : "แบบร่างถูกบันทึก!",
-    "Connecting …" : "กำลังเชื่อมต่อ ...",
-    "Unknown error" : "ข้อผิดพลาดที่ไม่ทราบสาเหตุ",
-    "Error while creating an account: " : "ข้อผิดพลาดขณะกำลังสร้างบัญชี:",
-    "Connect" : "เชื่อมต่อ",
-    "Error while deleting account." : "ข้อผิดพลาดขณะลบบัญชี",
     "Choose a file to add as attachment" : "เลือกไฟล์ที่ต้องการแนบ",
     "Reply" : "ตอบกลับ",
     "Send" : "ส่ง",
     "Sending …" : "กำลังส่ง ...",
     "Message sent!" : "ส่งข้อความ!",
+    "Server error" : "ข้อผิดพลาดของเซิร์ฟเวอร์",
     "you" : "คุณ",
     "Send message to {email}" : "ส่งข้อความไปยัง {email}",
-    "Message could not be starred. Please try again." : "ไม่สามารถเริ่มต้นข้อความ โปรดลองอีกครั้ง",
     "Error while deleting message." : "ข้อผิดพลาดขณะลบข้อความ",
     "Checking messages …" : "กำลังตรวจสอบข้อความ ...",
     "Loading …" : "กำลังโหลด ...",
     "Load more …" : "โหลดเพิ่มเติม ...",
     "Check messages …" : "ตรวจสอบข้อความ ...",
+    "Error while deleting account." : "ข้อผิดพลาดขณะลบบัญชี",
     "Inbox" : "กล่องขาเข้า",
     "Sent" : "ส่ง",
     "Drafts" : "แบบร่าง",
@@ -56,15 +57,6 @@
     "Back to website" : "กลับไปยังเว็บไซต์",
     "Add attachment from Files" : "เพิ่มสิ่งที่ต้องการแนบจากไฟล์",
     "Error loading message" : "กิดข้อผิดพลาดในการโหลด",
-    "Download attachment" : "ดาวน์โหลดสิ่งที่แนบมา",
-    "Save to Files" : "บันทึกไปยังไฟล์",
-    "Save all to Files" : "บันทึกทั้งหมดไปยังไฟล์",
-    "Forward" : "ส่งต่อ",
-    "Delete" : "ลบ",
-    "Add mail account" : "เพิ่มบัญชีอีเมล",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "กำลังมองหาการเข้ารหัสอีเมลของคุณ? ติดตั้ง <a href=\"https://www.mailvelope.com/\" target=\"_blank\">ส่วนขยาย Mailvelope ของเบราว์เซอร์</a>!",
-    "No search results for {{searchTerm}}" : "ไม่มีผลการค้นหาสำหรับ {{searchTerm}}",
-    "No messages in this folder!" : "ไม่มีข้อความในโฟลเดอร์นี้!",
     "New message" : "ข้อความใหม่",
     "Connect your mail account" : "เชื่อมต่อบัญชีอีเมลของคุณ",
     "Name" : "ชื่อ",
@@ -84,6 +76,15 @@
     "SMTP Port (default 25, ssl 465)" : "SMTP พอร์ต (ค่าเริ่มต้น 25, SSL 465)",
     "SMTP User" : "ชื่อผู้ใช้ SMTP",
     "SMTP Password" : "รหัสผ่าน SMTP",
+    "Download attachment" : "ดาวน์โหลดสิ่งที่แนบมา",
+    "Save to Files" : "บันทึกไปยังไฟล์",
+    "Save all to Files" : "บันทึกทั้งหมดไปยังไฟล์",
+    "Forward" : "ส่งต่อ",
+    "Delete" : "ลบ",
+    "Add mail account" : "เพิ่มบัญชีอีเมล",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "กำลังมองหาการเข้ารหัสอีเมลของคุณ? ติดตั้ง <a href=\"https://www.mailvelope.com/\" target=\"_blank\">ส่วนขยาย Mailvelope ของเบราว์เซอร์</a>!",
+    "No messages in this folder!" : "ไม่มีข้อความในโฟลเดอร์นี้!",
+    "No search results for {{searchTerm}}" : "ไม่มีผลการค้นหาสำหรับ {{searchTerm}}",
     "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",
diff --git a/l10n/tr.js b/l10n/tr.js
index 2f0478bc6..5a24e19e6 100644
--- a/l10n/tr.js
+++ b/l10n/tr.js
@@ -2,9 +2,14 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Posta",
-    "Error while loading the accounts." : "Hesaplar yüklenirken hata.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["{folderName} içerisinde %n yeni ileti\nkimden: {from}","{folderName} içerisinde %n yeni ileti\nkimden: {from}"],
+    "Error while loading the accounts." : "Hesaplar yüklenirken hata.",
+    "Connecting …" : "Bağlanılıyor...",
+    "Unknown error" : "Bilinmeyen hata",
+    "Error while creating an account: " : "Bir hesap oluştururken hata:",
+    "Connect" : "Bağlan",
+    "Message could not be starred. Please try again." : "İleti yıldızlanamadı. Lütfen yeniden deneyin.",
     "Error while loading the selected account." : "Seçili hesap yüklenirken hata.",
     "Error while loading messages." : "İletiler yüklenirken hata.",
     "Choose a folder to store the attachment in" : "Ekin saklanmasını istediğiniz bir klasör seçin",
@@ -13,25 +18,23 @@ OC.L10N.register(
     "Error while saving attachments to Files." : "Ekler Dosyalara kaydedilirken hata.",
     "Error while saving attachment to Files." : "Ek Dosyalara kaydedilirken hata.",
     "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!",
-    "Connecting …" : "Bağlanılıyor...",
-    "Unknown error" : "Bilinmeyen hata",
-    "Error while creating an account: " : "Bir hesap oluştururken hata:",
-    "Connect" : "Bağlan",
-    "Error while deleting account." : "Hesap silinirken hata.",
     "Choose a file to add as attachment" : "Ek olarak eklemek için bir dosya seçin",
     "Reply" : "Yanıtla",
     "Send" : "Gönder",
     "Sending …" : "Gönderiliyor...",
     "Message sent!" : "Mesaj gönderildi!",
+    "Server error" : "Sunucu hatası",
     "you" : "siz",
     "Send message to {email}" : "{email} adresine ileti gönder",
-    "Message could not be starred. Please try again." : "İleti yıldızlanamadı. Lütfen yeniden deneyin.",
     "Error while deleting message." : "İleti silinirken hata.",
+    "Checking messages …" : "İletiler kontrol ediliyor …",
     "Loading …" : "Yükleniyor...",
     "Load more …" : "Daha fazla yükle...",
     "Check messages …" : "Mesajları denetle ...",
+    "Error while deleting account." : "Hesap silinirken hata.",
     "Inbox" : "Gelen Kutusu",
     "Sent" : "Gönderilenler",
     "Drafts" : "Taslaklar",
@@ -56,15 +59,6 @@ OC.L10N.register(
     "Back to website" : "Web sitesine geri dön",
     "Add attachment from Files" : "Dosyalardan ek ekle",
     "Error loading message" : "İleti yüklenirken hata",
-    "Download attachment" : "Eki indir",
-    "Save to Files" : "Dosyalara Kaydet",
-    "Save all to Files" : "Tümünü Dosyalara Kaydet",
-    "Forward" : "İlet",
-    "Delete" : "Sil",
-    "Add mail account" : "Posta hesabı ekle",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "E-postalarınızı şifrelemek mi istiyorsunuz? <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope tarayıcı uzantısını</a> yükleyin!",
-    "No search results for {{searchTerm}}" : "{{searchTerm}} için hiçbir sonuç bulunamadı",
-    "No messages in this folder!" : "Bu klasörde ileti yok!",
     "New message" : "Yeni mesaj",
     "Connect your mail account" : "Posta hesabınızı bağlayın",
     "Name" : "Ad",
@@ -84,6 +78,15 @@ OC.L10N.register(
     "SMTP Port (default 25, ssl 465)" : "SMTP Bağlantı Noktası (öntanımlı 25, ssl 465)",
     "SMTP User" : "SMTP Kullanıcısı",
     "SMTP Password" : "SMTP Parolası",
+    "Download attachment" : "Eki indir",
+    "Save to Files" : "Dosyalara Kaydet",
+    "Save all to Files" : "Tümünü Dosyalara Kaydet",
+    "Forward" : "İlet",
+    "Delete" : "Sil",
+    "Add mail account" : "Posta hesabı ekle",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "E-postalarınızı şifrelemek mi istiyorsunuz? <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope tarayıcı uzantısını</a> yükleyin!",
+    "No messages in this folder!" : "Bu klasörde ileti yok!",
+    "No search results for {{searchTerm}}" : "{{searchTerm}} için hiçbir sonuç bulunamadı",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "%s sayfasına yönlendiriliyorsunuz - birkaç saniye içinde yönlendirilmezseniz, buraya tıklayın.",
     "Redirect Warning" : "Yönlendirme Uyarısı",
     "The previous page is sending you to %s." : "Önceki sayfa sizi %s sayfasına yönlendiriyor.",
diff --git a/l10n/tr.json b/l10n/tr.json
index f7b286e91..4d687228c 100644
--- a/l10n/tr.json
+++ b/l10n/tr.json
@@ -1,8 +1,13 @@
 { "translations": {
     "Mail" : "Posta",
-    "Error while loading the accounts." : "Hesaplar yüklenirken hata.",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["{folderName} içerisinde %n yeni ileti\nkimden: {from}","{folderName} içerisinde %n yeni ileti\nkimden: {from}"],
+    "Error while loading the accounts." : "Hesaplar yüklenirken hata.",
+    "Connecting …" : "Bağlanılıyor...",
+    "Unknown error" : "Bilinmeyen hata",
+    "Error while creating an account: " : "Bir hesap oluştururken hata:",
+    "Connect" : "Bağlan",
+    "Message could not be starred. Please try again." : "İleti yıldızlanamadı. Lütfen yeniden deneyin.",
     "Error while loading the selected account." : "Seçili hesap yüklenirken hata.",
     "Error while loading messages." : "İletiler yüklenirken hata.",
     "Choose a folder to store the attachment in" : "Ekin saklanmasını istediğiniz bir klasör seçin",
@@ -11,25 +16,23 @@
     "Error while saving attachments to Files." : "Ekler Dosyalara kaydedilirken hata.",
     "Error while saving attachment to Files." : "Ek Dosyalara kaydedilirken hata.",
     "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!",
-    "Connecting …" : "Bağlanılıyor...",
-    "Unknown error" : "Bilinmeyen hata",
-    "Error while creating an account: " : "Bir hesap oluştururken hata:",
-    "Connect" : "Bağlan",
-    "Error while deleting account." : "Hesap silinirken hata.",
     "Choose a file to add as attachment" : "Ek olarak eklemek için bir dosya seçin",
     "Reply" : "Yanıtla",
     "Send" : "Gönder",
     "Sending …" : "Gönderiliyor...",
     "Message sent!" : "Mesaj gönderildi!",
+    "Server error" : "Sunucu hatası",
     "you" : "siz",
     "Send message to {email}" : "{email} adresine ileti gönder",
-    "Message could not be starred. Please try again." : "İleti yıldızlanamadı. Lütfen yeniden deneyin.",
     "Error while deleting message." : "İleti silinirken hata.",
+    "Checking messages …" : "İletiler kontrol ediliyor …",
     "Loading …" : "Yükleniyor...",
     "Load more …" : "Daha fazla yükle...",
     "Check messages …" : "Mesajları denetle ...",
+    "Error while deleting account." : "Hesap silinirken hata.",
     "Inbox" : "Gelen Kutusu",
     "Sent" : "Gönderilenler",
     "Drafts" : "Taslaklar",
@@ -54,15 +57,6 @@
     "Back to website" : "Web sitesine geri dön",
     "Add attachment from Files" : "Dosyalardan ek ekle",
     "Error loading message" : "İleti yüklenirken hata",
-    "Download attachment" : "Eki indir",
-    "Save to Files" : "Dosyalara Kaydet",
-    "Save all to Files" : "Tümünü Dosyalara Kaydet",
-    "Forward" : "İlet",
-    "Delete" : "Sil",
-    "Add mail account" : "Posta hesabı ekle",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "E-postalarınızı şifrelemek mi istiyorsunuz? <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope tarayıcı uzantısını</a> yükleyin!",
-    "No search results for {{searchTerm}}" : "{{searchTerm}} için hiçbir sonuç bulunamadı",
-    "No messages in this folder!" : "Bu klasörde ileti yok!",
     "New message" : "Yeni mesaj",
     "Connect your mail account" : "Posta hesabınızı bağlayın",
     "Name" : "Ad",
@@ -82,6 +76,15 @@
     "SMTP Port (default 25, ssl 465)" : "SMTP Bağlantı Noktası (öntanımlı 25, ssl 465)",
     "SMTP User" : "SMTP Kullanıcısı",
     "SMTP Password" : "SMTP Parolası",
+    "Download attachment" : "Eki indir",
+    "Save to Files" : "Dosyalara Kaydet",
+    "Save all to Files" : "Tümünü Dosyalara Kaydet",
+    "Forward" : "İlet",
+    "Delete" : "Sil",
+    "Add mail account" : "Posta hesabı ekle",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "E-postalarınızı şifrelemek mi istiyorsunuz? <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope tarayıcı uzantısını</a> yükleyin!",
+    "No messages in this folder!" : "Bu klasörde ileti yok!",
+    "No search results for {{searchTerm}}" : "{{searchTerm}} için hiçbir sonuç bulunamadı",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "%s sayfasına yönlendiriliyorsunuz - birkaç saniye içinde yönlendirilmezseniz, buraya tıklayın.",
     "Redirect Warning" : "Yönlendirme Uyarısı",
     "The previous page is sending you to %s." : "Önceki sayfa sizi %s sayfasına yönlendiriyor.",
diff --git a/l10n/uk.js b/l10n/uk.js
index 425e41125..c88a0c6ce 100644
--- a/l10n/uk.js
+++ b/l10n/uk.js
@@ -2,9 +2,14 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Повідомлення",
-    "Error while loading the accounts." : "Помилка завантаження облікового запису",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n нове повідомлення у {folderName}\nвід {from}","%n нових повідомлень у {folderName}\nвід {from}","%n нових повідомлень у {folderName}\nвід {from}"],
+    "Error while loading the accounts." : "Помилка завантаження облікового запису",
+    "Connecting …" : "Підключення ...",
+    "Unknown error" : "Невідома помилка",
+    "Error while creating an account: " : "Помилка при створенні облікового запису:",
+    "Connect" : "З'єднати",
+    "Message could not be starred. Please try again." : "Не вдалося відмітити повідомлення. Будь ласка, спробуйте ще раз.",
     "Error while loading the selected account." : "Помилка завантаження обраного облікового запису.",
     "Error while loading messages." : "Помилка завантаження повідомлень.",
     "Choose a folder to store the attachment in" : "Оберіть теку для зберігання вкладень",
@@ -15,22 +20,18 @@ OC.L10N.register(
     "Opening HTML drafts is not supported yet." : "Відкриті HTML чернетки поки не підтримуються.",
     "Error while loading the selected message." : "Помилка завантаження обраного повідомлення.",
     "Draft saved!" : "Чернетку збережено!",
-    "Connecting …" : "Підключення ...",
-    "Unknown error" : "Невідома помилка",
-    "Error while creating an account: " : "Помилка при створенні облікового запису:",
-    "Connect" : "З'єднати",
-    "Error while deleting account." : "Помилка при видалені облікового запису.",
     "Choose a file to add as attachment" : "Обрати файл для вкладення",
     "Reply" : "Відповісти",
     "Send" : "Надіслати",
     "Sending …" : "Надсилання...",
     "Message sent!" : "Повідомлення відправлено!",
+    "Server error" : "Помилка серверу",
     "you" : "ви",
-    "Message could not be starred. Please try again." : "Не вдалося відмітити повідомлення. Будь ласка, спробуйте ще раз.",
     "Error while deleting message." : "Помилка видалення повідомлення.",
     "Loading …" : "Завантаження...",
     "Load more …" : "Завантажити ще ...",
     "Check messages …" : "Перевірити повідомлення ...",
+    "Error while deleting account." : "Помилка при видалені облікового запису.",
     "Inbox" : "Вхідні",
     "Sent" : "Надіслані",
     "Drafts" : "Чорновики",
@@ -54,15 +55,6 @@ OC.L10N.register(
     "Back to website" : "Повернутися до веб-сайту",
     "Add attachment from Files" : "Додати вкладення з Файлів",
     "Error loading message" : "Помилка завантаження повідомлення.",
-    "Download attachment" : "Завантажити вкладення",
-    "Save to Files" : "Зберегти до Файлів",
-    "Save all to Files" : "Зберегти усе до Файлів",
-    "Forward" : "Переслати",
-    "Delete" : "Видалити",
-    "Add mail account" : "Додати обліковий запис пошти",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Бажаєте зашифрувати свою електронну пошту? Встановіть <a href=\"https://www.mailvelope.com/\" target=\"_blank\">розширення для браузера Mailvelope </a>!",
-    "No search results for {{searchTerm}}" : "Немає результатів пошуку для {{searchTerm}}",
-    "No messages in this folder!" : "В цій теці повідомлення відсутні!",
     "New message" : "Нове повідомлення",
     "Connect your mail account" : "Підключити обліковий запис електронної пошти",
     "Name" : "Ім'я",
@@ -82,6 +74,15 @@ OC.L10N.register(
     "SMTP Port (default 25, ssl 465)" : "SMTP Порт (за замовчуванням 25, ssl 465)",
     "SMTP User" : "SMTP Користувач",
     "SMTP Password" : "Пароль SMTP",
+    "Download attachment" : "Завантажити вкладення",
+    "Save to Files" : "Зберегти до Файлів",
+    "Save all to Files" : "Зберегти усе до Файлів",
+    "Forward" : "Переслати",
+    "Delete" : "Видалити",
+    "Add mail account" : "Додати обліковий запис пошти",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Бажаєте зашифрувати свою електронну пошту? Встановіть <a href=\"https://www.mailvelope.com/\" target=\"_blank\">розширення для браузера Mailvelope </a>!",
+    "No messages in this folder!" : "В цій теці повідомлення відсутні!",
+    "No search results for {{searchTerm}}" : "Немає результатів пошуку для {{searchTerm}}",
     "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.",
diff --git a/l10n/uk.json b/l10n/uk.json
index 339efc2ba..e2af7013c 100644
--- a/l10n/uk.json
+++ b/l10n/uk.json
@@ -1,8 +1,13 @@
 { "translations": {
     "Mail" : "Повідомлення",
-    "Error while loading the accounts." : "Помилка завантаження облікового запису",
     "{from}\n{subject}" : "{from}\n{subject}",
     "_%n new message in {folderName} \nfrom {from}_::_%n new messages in {folderName} \nfrom {from}_" : ["%n нове повідомлення у {folderName}\nвід {from}","%n нових повідомлень у {folderName}\nвід {from}","%n нових повідомлень у {folderName}\nвід {from}"],
+    "Error while loading the accounts." : "Помилка завантаження облікового запису",
+    "Connecting …" : "Підключення ...",
+    "Unknown error" : "Невідома помилка",
+    "Error while creating an account: " : "Помилка при створенні облікового запису:",
+    "Connect" : "З'єднати",
+    "Message could not be starred. Please try again." : "Не вдалося відмітити повідомлення. Будь ласка, спробуйте ще раз.",
     "Error while loading the selected account." : "Помилка завантаження обраного облікового запису.",
     "Error while loading messages." : "Помилка завантаження повідомлень.",
     "Choose a folder to store the attachment in" : "Оберіть теку для зберігання вкладень",
@@ -13,22 +18,18 @@
     "Opening HTML drafts is not supported yet." : "Відкриті HTML чернетки поки не підтримуються.",
     "Error while loading the selected message." : "Помилка завантаження обраного повідомлення.",
     "Draft saved!" : "Чернетку збережено!",
-    "Connecting …" : "Підключення ...",
-    "Unknown error" : "Невідома помилка",
-    "Error while creating an account: " : "Помилка при створенні облікового запису:",
-    "Connect" : "З'єднати",
-    "Error while deleting account." : "Помилка при видалені облікового запису.",
     "Choose a file to add as attachment" : "Обрати файл для вкладення",
     "Reply" : "Відповісти",
     "Send" : "Надіслати",
     "Sending …" : "Надсилання...",
     "Message sent!" : "Повідомлення відправлено!",
+    "Server error" : "Помилка серверу",
     "you" : "ви",
-    "Message could not be starred. Please try again." : "Не вдалося відмітити повідомлення. Будь ласка, спробуйте ще раз.",
     "Error while deleting message." : "Помилка видалення повідомлення.",
     "Loading …" : "Завантаження...",
     "Load more …" : "Завантажити ще ...",
     "Check messages …" : "Перевірити повідомлення ...",
+    "Error while deleting account." : "Помилка при видалені облікового запису.",
     "Inbox" : "Вхідні",
     "Sent" : "Надіслані",
     "Drafts" : "Чорновики",
@@ -52,15 +53,6 @@
     "Back to website" : "Повернутися до веб-сайту",
     "Add attachment from Files" : "Додати вкладення з Файлів",
     "Error loading message" : "Помилка завантаження повідомлення.",
-    "Download attachment" : "Завантажити вкладення",
-    "Save to Files" : "Зберегти до Файлів",
-    "Save all to Files" : "Зберегти усе до Файлів",
-    "Forward" : "Переслати",
-    "Delete" : "Видалити",
-    "Add mail account" : "Додати обліковий запис пошти",
-    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Бажаєте зашифрувати свою електронну пошту? Встановіть <a href=\"https://www.mailvelope.com/\" target=\"_blank\">розширення для браузера Mailvelope </a>!",
-    "No search results for {{searchTerm}}" : "Немає результатів пошуку для {{searchTerm}}",
-    "No messages in this folder!" : "В цій теці повідомлення відсутні!",
     "New message" : "Нове повідомлення",
     "Connect your mail account" : "Підключити обліковий запис електронної пошти",
     "Name" : "Ім'я",
@@ -80,6 +72,15 @@
     "SMTP Port (default 25, ssl 465)" : "SMTP Порт (за замовчуванням 25, ssl 465)",
     "SMTP User" : "SMTP Користувач",
     "SMTP Password" : "Пароль SMTP",
+    "Download attachment" : "Завантажити вкладення",
+    "Save to Files" : "Зберегти до Файлів",
+    "Save all to Files" : "Зберегти усе до Файлів",
+    "Forward" : "Переслати",
+    "Delete" : "Видалити",
+    "Add mail account" : "Додати обліковий запис пошти",
+    "Looking to encrypt your emails? Install the <a href=\"https://www.mailvelope.com/\" target=\"_blank\">Mailvelope browser extension</a>!" : "Бажаєте зашифрувати свою електронну пошту? Встановіть <a href=\"https://www.mailvelope.com/\" target=\"_blank\">розширення для браузера Mailvelope </a>!",
+    "No messages in this folder!" : "В цій теці повідомлення відсутні!",
+    "No search results for {{searchTerm}}" : "Немає результатів пошуку для {{searchTerm}}",
     "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.",