[tx-robot] updated from transifex

128 files changed, 4474 insertions, 10014 deletions

diff --git a/l10n/af.js b/l10n/af.js
index 53337f0b9..bdbde5d6a 100644
--- a/l10n/af.js
+++ b/l10n/af.js
@@ -2,23 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Pos",
-    "Searching for {query}" : "Soek na {query}",
-    "Forwarded message" : "Aangestuurde boodskap",
-    "Invalid account" : "Ongeldige rekening",
-    "Invalid folder" : "Ongeldige vouer",
-    "Unknown error" : "Onbekende fout",
-    "All inboxes" : "Alle inkassies",
-    "you" : "u",
-    "Send message to {email}" : "Stuur boodskap na {email}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "Save" : "Bewaar",
-    "Reply" : "Antwoord",
-    "Send" : "Stuur",
-    "Sending …" : "Stuur…",
-    "Message sent!" : "Boodskap gestuur!",
-    "Server error" : "Bedienerfout",
-    "No writable calendars found" : "Geen skryfbare kalenders gevind",
-    "& others" : "& ander",
     "Inbox" : "Inkassie",
     "Sent" : "Gestuur",
     "Drafts" : "Konsepte",
@@ -28,42 +11,37 @@ OC.L10N.register(
     "All" : "Alle",
     "Favorites" : "Gunstelinge",
     "Delete permanently" : "Skrap permanent",
-    "Settings" : "Instellings",
-    "Forwarding to %s" : "Stuur aan na %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Klik hier indien u nie binne die volgende paar sekondes outomaties herverwys word nie.",
-    "Redirect" : "Herverwys",
-    "The link leads to %s" : "Die skakel lei na %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Indien u nie daardie blad wil besoek nie, kan u na <a href=\"%s\">Pos</a> terugkeer.",
-    "Delete account" : "Skrap rekening",
-    "New message" : "Nuwe boodskap",
-    "Account Settings" : "Rekeninginstellings",
-    "Aliases" : "Aliasse",
-    "Mail address" : "Posadres",
-    "Display Name" : "Vertoonnaam",
-    "Connect your mail account" : "Koppel u posrekening",
     "Name" : "Naam",
     "Mail Address" : "Posadres",
     "Password" : "Wagwoord",
-    "Manual configuration" : "Handmatige opstelling",
     "IMAP Host" : "IMAP-gasheer",
-    "IMAP security" : "IMAP-sekuriteit",
     "None" : "Geen",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP-poort",
     "IMAP User" : "IMAP-gebruiker",
     "IMAP Password" : "IMAP-wagwoord",
     "SMTP Host" : "SMTP-gasheer",
-    "SMTP security" : "SMTP-sekuriteit",
     "SMTP Port" : "SMTP-poort",
     "SMTP User" : "SMTP-gebruiker",
     "SMTP Password" : "SMTP-wagwoord",
+    "Add mail account" : "Voeg posrekening toe",
     "from" : "van",
     "to" : "aan",
     "Subject" : "Onderwerp",
-    "Add mail account" : "Voeg posrekening toe",
-    "No search results for" : "Geen soekresultate vir",
-    "Forward" : "Stuur aan",
+    "Sending …" : "Stuur…",
+    "Message sent!" : "Boodskap gestuur!",
+    "Send" : "Stuur",
     "Import into calendar" : "Voer in na kalender",
-    "Download attachment" : "Laai aanhangsel af"
+    "Download attachment" : "Laai aanhangsel af",
+    "New message" : "Nuwe boodskap",
+    "Settings" : "Instellings",
+    "Connect your mail account" : "Koppel u posrekening",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "All inboxes" : "Alle inkassies",
+    "Forwarding to %s" : "Stuur aan na %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Klik hier indien u nie binne die volgende paar sekondes outomaties herverwys word nie.",
+    "Redirect" : "Herverwys",
+    "The link leads to %s" : "Die skakel lei na %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Indien u nie daardie blad wil besoek nie, kan u na <a href=\"%s\">Pos</a> terugkeer."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/af.json b/l10n/af.json
index 1c0dcf766..24b7bb9e9 100644
--- a/l10n/af.json
+++ b/l10n/af.json
@@ -1,22 +1,5 @@
 { "translations": {
     "Mail" : "Pos",
-    "Searching for {query}" : "Soek na {query}",
-    "Forwarded message" : "Aangestuurde boodskap",
-    "Invalid account" : "Ongeldige rekening",
-    "Invalid folder" : "Ongeldige vouer",
-    "Unknown error" : "Onbekende fout",
-    "All inboxes" : "Alle inkassies",
-    "you" : "u",
-    "Send message to {email}" : "Stuur boodskap na {email}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "Save" : "Bewaar",
-    "Reply" : "Antwoord",
-    "Send" : "Stuur",
-    "Sending …" : "Stuur…",
-    "Message sent!" : "Boodskap gestuur!",
-    "Server error" : "Bedienerfout",
-    "No writable calendars found" : "Geen skryfbare kalenders gevind",
-    "& others" : "& ander",
     "Inbox" : "Inkassie",
     "Sent" : "Gestuur",
     "Drafts" : "Konsepte",
@@ -26,42 +9,37 @@
     "All" : "Alle",
     "Favorites" : "Gunstelinge",
     "Delete permanently" : "Skrap permanent",
-    "Settings" : "Instellings",
-    "Forwarding to %s" : "Stuur aan na %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Klik hier indien u nie binne die volgende paar sekondes outomaties herverwys word nie.",
-    "Redirect" : "Herverwys",
-    "The link leads to %s" : "Die skakel lei na %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Indien u nie daardie blad wil besoek nie, kan u na <a href=\"%s\">Pos</a> terugkeer.",
-    "Delete account" : "Skrap rekening",
-    "New message" : "Nuwe boodskap",
-    "Account Settings" : "Rekeninginstellings",
-    "Aliases" : "Aliasse",
-    "Mail address" : "Posadres",
-    "Display Name" : "Vertoonnaam",
-    "Connect your mail account" : "Koppel u posrekening",
     "Name" : "Naam",
     "Mail Address" : "Posadres",
     "Password" : "Wagwoord",
-    "Manual configuration" : "Handmatige opstelling",
     "IMAP Host" : "IMAP-gasheer",
-    "IMAP security" : "IMAP-sekuriteit",
     "None" : "Geen",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP-poort",
     "IMAP User" : "IMAP-gebruiker",
     "IMAP Password" : "IMAP-wagwoord",
     "SMTP Host" : "SMTP-gasheer",
-    "SMTP security" : "SMTP-sekuriteit",
     "SMTP Port" : "SMTP-poort",
     "SMTP User" : "SMTP-gebruiker",
     "SMTP Password" : "SMTP-wagwoord",
+    "Add mail account" : "Voeg posrekening toe",
     "from" : "van",
     "to" : "aan",
     "Subject" : "Onderwerp",
-    "Add mail account" : "Voeg posrekening toe",
-    "No search results for" : "Geen soekresultate vir",
-    "Forward" : "Stuur aan",
+    "Sending …" : "Stuur…",
+    "Message sent!" : "Boodskap gestuur!",
+    "Send" : "Stuur",
     "Import into calendar" : "Voer in na kalender",
-    "Download attachment" : "Laai aanhangsel af"
+    "Download attachment" : "Laai aanhangsel af",
+    "New message" : "Nuwe boodskap",
+    "Settings" : "Instellings",
+    "Connect your mail account" : "Koppel u posrekening",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "All inboxes" : "Alle inkassies",
+    "Forwarding to %s" : "Stuur aan na %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Klik hier indien u nie binne die volgende paar sekondes outomaties herverwys word nie.",
+    "Redirect" : "Herverwys",
+    "The link leads to %s" : "Die skakel lei na %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Indien u nie daardie blad wil besoek nie, kan u na <a href=\"%s\">Pos</a> terugkeer."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/ar.js b/l10n/ar.js
index 0085733d3..5121267f0 100644
--- a/l10n/ar.js
+++ b/l10n/ar.js
@@ -2,52 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "البريد",
-    "Loading accounts" : "تجهيز الحسابات",
-    "Error while loading the accounts." : "حدث خطأ خلال تحميل الحسابات.",
-    "Can not load this folder." : "يتعذر تحميل هذا المجلد.",
-    "Searching for {query}" : "بحث عن {query}",
-    "Error while deleting message." : "حدث خطأ خلال حذف الرسالة.",
-    "Forwarded message" : "تمرير الرسالة",
-    "Choose a folder to store the attachment in" : "اختر مجلد لتخزين المرفقات ",
-    "Attachments saved to Files." : "تم حفظ المرفقات لـ الملفات.",
-    "Attachment saved to Files." : "تم حفظ المرفق لـ الملفات.",
-    "Error while saving attachments to Files." : "حدث خطأ خلال حفظ المرفقات لـ الملفات.",
-    "Error while saving attachment to Files." : "حدث خطأ خلال حفظ المرفق لـ الملفات.",
-    "Message flag could not be set." : "تعذر تعيين إشارة للرسالة.",
-    "Could not move message." : "تعذر نقل الرسالة.",
-    "Invalid account" : "حساب غير صالح",
-    "Invalid folder" : "مجلد غير صالح",
-    "Error while creating the account: " : "حدث خطأ عند إنشاء الحساب:",
-    "Unknown error" : "حدث خطأ غير معروف. ",
-    "Error while updating the account: " : "طرأ هناك خطأ أثناء تحديث الحساب :",
-    "All inboxes" : "جميع الوارد",
-    "you" : "أنت",
-    "Send message to {email}" : "أرسل رسالة لـ {email}",
-    "Could not load {tag}{name}{endtag}" : "تعذر تحميل {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "حدث خطأ ما عند تحميل {tag}{name}{endtag}",
-    "Could not load your message" : "تعذرت عملية تحميل رسالتك",
-    "Could not load the message" : "تعذرت عملية تحميل الرسالة",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "Nextcloud Mail" : "بريد ناكست كلاود",
-    "Save" : "حفظ",
-    "Saved" : "تم الإحتفاظ به",
-    "Show all folders" : "أظهر جميع المجلدات",
-    "Collapse folders" : "طي المجلدات",
-    "Error while deleting account." : "حدث خطأ خلال عملية حذف الحساب.",
-    "Choose a file to add as attachment" : "اختر ملف لإضافته كمرفق",
-    "An error occurred while uploading {fname}" : "يحدث خلل عند رفع {fname}",
-    "Reply" : "رد",
-    "Send" : "أرسل",
-    "Sending …" : "جار الإرسال",
-    "Message sent!" : "تم الإرسال الرسالة!",
-    "Server error" : "خطا في الخادم",
-    "An unknown error occurred" : "حدث خلل غير معروف",
-    "Opening HTML drafts is not supported yet." : "فتح مسودات HTML غير مدعّم حاليا.",
-    "Error while importing the calendar event" : "خلل عند استيراد أحداث التقويم",
-    "Error while downloading calendar event" : "خلل عند تحميل احداث التقويم",
-    "& others" : "و آخرون",
-    "Error while loading messages." : "حدث خطأ خلال تحميل الرسائل.",
-    "Setting up your account" : "إعدادات حسابك",
     "Inbox" : "صندوق الوارد",
     "Sent" : "أرسلت",
     "Drafts" : "المسودات",
@@ -60,65 +14,66 @@ OC.L10N.register(
     "Updating account failed: " : "فشلت عملية تحديث الحساب :",
     "Creating account failed: " : "فشل في إنشاء الحساب:",
     "Delete permanently" : "حذف بشكل دائم",
-    "Error loading message" : "حدث خطأ خلال تحميل الرسالة",
-    "Settings" : "الإعدادات",
-    "Forwarding to %s" : "تمرير إلى %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "إضغط هنا إذا لم يتم إعادة توجيهك تلقائياً بعد عدة ثواني.",
-    "Redirect" : "إعادة توجيه",
-    "The link leads to %s" : "الرابط يؤدي إل %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "إذا لم ترغب في زيارة الصفحة، بإمكانك العودة لـ <a href=\"%s\">البريد</a>",
-    "Continue to %s" : "أكمل إلى %s",
-    "Delete account" : "حذف الحساب",
-    "Try again" : "عاود المحاولة",
-    "New message" : "رسالة جديدة",
-    "Account Settings" : "إعدادات الحساب",
-    "Aliases" : "أسماء مسعارة",
-    "Mail address" : "عنوان البريد الإلكتروني",
-    "Display Name" : "إسم العرض",
-    "Account" : "الحساب",
-    "Delete" : "حذف",
-    "Keyboard shortcuts" : "إختصارات لوحة المفاتيح",
-    "Speed up your Mail experience with these quick shortcuts." : "سرّع تجربة بريدك مع هذه الإختصارات.",
-    "Compose new message" : "إرسل رسالة جديدة",
-    "Newer message" : "الرسائل الأحدث",
-    "Older message" : "الرسائل الأقدم",
-    "Toggle star" : "حدد النجوم",
-    "Toggle unread" : "حدد الغير مقروء",
-    "Search" : "بحث",
-    "Refresh" : "تحديث",
-    "Connect your mail account" : "تحديث",
     "Name" : "الإسم",
     "Mail Address" : "عنوان البريد الإلكتروني",
     "Password" : "كلمة المرور",
-    "Manual configuration" : "الإعدادات اليدوية",
     "IMAP Host" : "مُضيف IMAP",
-    "IMAP security" : "حماية IMAP",
     "None" : "بلا",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "منفذ IMAP",
     "IMAP User" : "مستخدم IMAP",
     "IMAP Password" : "كلمة مرور IMAP",
     "SMTP Host" : "مُضيف SMTP",
-    "SMTP security" : "حماية SMTP",
     "SMTP Port" : "منفذ SMTP",
     "SMTP User" : "مستخدم SMTP",
     "SMTP Password" : "كلمة مرور SMTP",
     "Connect" : "اتصال",
+    "Add mail account" : "أضف حساب بريدي",
+    "Keyboard shortcuts" : "إختصارات لوحة المفاتيح",
     "from" : "من",
     "to" : "إلى",
     "cc" : "نسخة كربونية",
     "bcc" : "نسخة كربونية سرية",
     "Subject" : "الموضوع",
-    "Save all to Files" : "حفظ الجميع لـ الملفات",
-    "Add mail account" : "أضف حساب بريدي",
-    "No search results for" : "لا نتائج بحث لـ",
-    "The images have been blocked to protect your privacy." : "تم حجب هذه الصورة لحماية خصوصيتك",
-    "Show images from this sender" : "أظهر الصور من هذا المُرسل",
-    "Forward" : "مرر",
+    "Sending …" : "جار الإرسال",
+    "Message sent!" : "تم الإرسال الرسالة!",
+    "Send" : "أرسل",
     "Upload attachment" : "رفع المرفقات",
     "Add attachment from Files" : "إضافة مرفقات مِن الملفات",
+    "Choose a file to add as attachment" : "اختر ملف لإضافته كمرفق",
+    "Delete" : "حذف",
+    "Could not load your message" : "تعذرت عملية تحميل رسالتك",
     "Import into calendar" : "إستيراد من التقويم",
     "Download attachment" : "تنزيل الملحق",
-    "Save to Files" : "حفظ للـ الملفات"
+    "Save to Files" : "حفظ للـ الملفات",
+    "Choose a folder to store the attachment in" : "اختر مجلد لتخزين المرفقات ",
+    "Save all to Files" : "حفظ الجميع لـ الملفات",
+    "The images have been blocked to protect your privacy." : "تم حجب هذه الصورة لحماية خصوصيتك",
+    "New message" : "رسالة جديدة",
+    "Settings" : "الإعدادات",
+    "Speed up your Mail experience with these quick shortcuts." : "سرّع تجربة بريدك مع هذه الإختصارات.",
+    "Compose new message" : "إرسل رسالة جديدة",
+    "Newer message" : "الرسائل الأحدث",
+    "Older message" : "الرسائل الأقدم",
+    "Toggle star" : "حدد النجوم",
+    "Toggle unread" : "حدد الغير مقروء",
+    "Search" : "بحث",
+    "Refresh" : "تحديث",
+    "Connect your mail account" : "تحديث",
+    "Show all folders" : "أظهر جميع المجلدات",
+    "Collapse folders" : "طي المجلدات",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "Nextcloud Mail" : "بريد ناكست كلاود",
+    "All inboxes" : "جميع الوارد",
+    "Could not load {tag}{name}{endtag}" : "تعذر تحميل {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "حدث خطأ ما عند تحميل {tag}{name}{endtag}",
+    "Could not load the message" : "تعذرت عملية تحميل الرسالة",
+    "Error loading message" : "حدث خطأ خلال تحميل الرسالة",
+    "Forwarding to %s" : "تمرير إلى %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "إضغط هنا إذا لم يتم إعادة توجيهك تلقائياً بعد عدة ثواني.",
+    "Redirect" : "إعادة توجيه",
+    "The link leads to %s" : "الرابط يؤدي إل %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "إذا لم ترغب في زيارة الصفحة، بإمكانك العودة لـ <a href=\"%s\">البريد</a>",
+    "Continue to %s" : "أكمل إلى %s"
 },
 "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");
diff --git a/l10n/ar.json b/l10n/ar.json
index 8e5b7866e..a6a0c7944 100644
--- a/l10n/ar.json
+++ b/l10n/ar.json
@@ -1,51 +1,5 @@
 { "translations": {
     "Mail" : "البريد",
-    "Loading accounts" : "تجهيز الحسابات",
-    "Error while loading the accounts." : "حدث خطأ خلال تحميل الحسابات.",
-    "Can not load this folder." : "يتعذر تحميل هذا المجلد.",
-    "Searching for {query}" : "بحث عن {query}",
-    "Error while deleting message." : "حدث خطأ خلال حذف الرسالة.",
-    "Forwarded message" : "تمرير الرسالة",
-    "Choose a folder to store the attachment in" : "اختر مجلد لتخزين المرفقات ",
-    "Attachments saved to Files." : "تم حفظ المرفقات لـ الملفات.",
-    "Attachment saved to Files." : "تم حفظ المرفق لـ الملفات.",
-    "Error while saving attachments to Files." : "حدث خطأ خلال حفظ المرفقات لـ الملفات.",
-    "Error while saving attachment to Files." : "حدث خطأ خلال حفظ المرفق لـ الملفات.",
-    "Message flag could not be set." : "تعذر تعيين إشارة للرسالة.",
-    "Could not move message." : "تعذر نقل الرسالة.",
-    "Invalid account" : "حساب غير صالح",
-    "Invalid folder" : "مجلد غير صالح",
-    "Error while creating the account: " : "حدث خطأ عند إنشاء الحساب:",
-    "Unknown error" : "حدث خطأ غير معروف. ",
-    "Error while updating the account: " : "طرأ هناك خطأ أثناء تحديث الحساب :",
-    "All inboxes" : "جميع الوارد",
-    "you" : "أنت",
-    "Send message to {email}" : "أرسل رسالة لـ {email}",
-    "Could not load {tag}{name}{endtag}" : "تعذر تحميل {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "حدث خطأ ما عند تحميل {tag}{name}{endtag}",
-    "Could not load your message" : "تعذرت عملية تحميل رسالتك",
-    "Could not load the message" : "تعذرت عملية تحميل الرسالة",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "Nextcloud Mail" : "بريد ناكست كلاود",
-    "Save" : "حفظ",
-    "Saved" : "تم الإحتفاظ به",
-    "Show all folders" : "أظهر جميع المجلدات",
-    "Collapse folders" : "طي المجلدات",
-    "Error while deleting account." : "حدث خطأ خلال عملية حذف الحساب.",
-    "Choose a file to add as attachment" : "اختر ملف لإضافته كمرفق",
-    "An error occurred while uploading {fname}" : "يحدث خلل عند رفع {fname}",
-    "Reply" : "رد",
-    "Send" : "أرسل",
-    "Sending …" : "جار الإرسال",
-    "Message sent!" : "تم الإرسال الرسالة!",
-    "Server error" : "خطا في الخادم",
-    "An unknown error occurred" : "حدث خلل غير معروف",
-    "Opening HTML drafts is not supported yet." : "فتح مسودات HTML غير مدعّم حاليا.",
-    "Error while importing the calendar event" : "خلل عند استيراد أحداث التقويم",
-    "Error while downloading calendar event" : "خلل عند تحميل احداث التقويم",
-    "& others" : "و آخرون",
-    "Error while loading messages." : "حدث خطأ خلال تحميل الرسائل.",
-    "Setting up your account" : "إعدادات حسابك",
     "Inbox" : "صندوق الوارد",
     "Sent" : "أرسلت",
     "Drafts" : "المسودات",
@@ -58,65 +12,66 @@
     "Updating account failed: " : "فشلت عملية تحديث الحساب :",
     "Creating account failed: " : "فشل في إنشاء الحساب:",
     "Delete permanently" : "حذف بشكل دائم",
-    "Error loading message" : "حدث خطأ خلال تحميل الرسالة",
-    "Settings" : "الإعدادات",
-    "Forwarding to %s" : "تمرير إلى %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "إضغط هنا إذا لم يتم إعادة توجيهك تلقائياً بعد عدة ثواني.",
-    "Redirect" : "إعادة توجيه",
-    "The link leads to %s" : "الرابط يؤدي إل %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "إذا لم ترغب في زيارة الصفحة، بإمكانك العودة لـ <a href=\"%s\">البريد</a>",
-    "Continue to %s" : "أكمل إلى %s",
-    "Delete account" : "حذف الحساب",
-    "Try again" : "عاود المحاولة",
-    "New message" : "رسالة جديدة",
-    "Account Settings" : "إعدادات الحساب",
-    "Aliases" : "أسماء مسعارة",
-    "Mail address" : "عنوان البريد الإلكتروني",
-    "Display Name" : "إسم العرض",
-    "Account" : "الحساب",
-    "Delete" : "حذف",
-    "Keyboard shortcuts" : "إختصارات لوحة المفاتيح",
-    "Speed up your Mail experience with these quick shortcuts." : "سرّع تجربة بريدك مع هذه الإختصارات.",
-    "Compose new message" : "إرسل رسالة جديدة",
-    "Newer message" : "الرسائل الأحدث",
-    "Older message" : "الرسائل الأقدم",
-    "Toggle star" : "حدد النجوم",
-    "Toggle unread" : "حدد الغير مقروء",
-    "Search" : "بحث",
-    "Refresh" : "تحديث",
-    "Connect your mail account" : "تحديث",
     "Name" : "الإسم",
     "Mail Address" : "عنوان البريد الإلكتروني",
     "Password" : "كلمة المرور",
-    "Manual configuration" : "الإعدادات اليدوية",
     "IMAP Host" : "مُضيف IMAP",
-    "IMAP security" : "حماية IMAP",
     "None" : "بلا",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "منفذ IMAP",
     "IMAP User" : "مستخدم IMAP",
     "IMAP Password" : "كلمة مرور IMAP",
     "SMTP Host" : "مُضيف SMTP",
-    "SMTP security" : "حماية SMTP",
     "SMTP Port" : "منفذ SMTP",
     "SMTP User" : "مستخدم SMTP",
     "SMTP Password" : "كلمة مرور SMTP",
     "Connect" : "اتصال",
+    "Add mail account" : "أضف حساب بريدي",
+    "Keyboard shortcuts" : "إختصارات لوحة المفاتيح",
     "from" : "من",
     "to" : "إلى",
     "cc" : "نسخة كربونية",
     "bcc" : "نسخة كربونية سرية",
     "Subject" : "الموضوع",
-    "Save all to Files" : "حفظ الجميع لـ الملفات",
-    "Add mail account" : "أضف حساب بريدي",
-    "No search results for" : "لا نتائج بحث لـ",
-    "The images have been blocked to protect your privacy." : "تم حجب هذه الصورة لحماية خصوصيتك",
-    "Show images from this sender" : "أظهر الصور من هذا المُرسل",
-    "Forward" : "مرر",
+    "Sending …" : "جار الإرسال",
+    "Message sent!" : "تم الإرسال الرسالة!",
+    "Send" : "أرسل",
     "Upload attachment" : "رفع المرفقات",
     "Add attachment from Files" : "إضافة مرفقات مِن الملفات",
+    "Choose a file to add as attachment" : "اختر ملف لإضافته كمرفق",
+    "Delete" : "حذف",
+    "Could not load your message" : "تعذرت عملية تحميل رسالتك",
     "Import into calendar" : "إستيراد من التقويم",
     "Download attachment" : "تنزيل الملحق",
-    "Save to Files" : "حفظ للـ الملفات"
+    "Save to Files" : "حفظ للـ الملفات",
+    "Choose a folder to store the attachment in" : "اختر مجلد لتخزين المرفقات ",
+    "Save all to Files" : "حفظ الجميع لـ الملفات",
+    "The images have been blocked to protect your privacy." : "تم حجب هذه الصورة لحماية خصوصيتك",
+    "New message" : "رسالة جديدة",
+    "Settings" : "الإعدادات",
+    "Speed up your Mail experience with these quick shortcuts." : "سرّع تجربة بريدك مع هذه الإختصارات.",
+    "Compose new message" : "إرسل رسالة جديدة",
+    "Newer message" : "الرسائل الأحدث",
+    "Older message" : "الرسائل الأقدم",
+    "Toggle star" : "حدد النجوم",
+    "Toggle unread" : "حدد الغير مقروء",
+    "Search" : "بحث",
+    "Refresh" : "تحديث",
+    "Connect your mail account" : "تحديث",
+    "Show all folders" : "أظهر جميع المجلدات",
+    "Collapse folders" : "طي المجلدات",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "Nextcloud Mail" : "بريد ناكست كلاود",
+    "All inboxes" : "جميع الوارد",
+    "Could not load {tag}{name}{endtag}" : "تعذر تحميل {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "حدث خطأ ما عند تحميل {tag}{name}{endtag}",
+    "Could not load the message" : "تعذرت عملية تحميل الرسالة",
+    "Error loading message" : "حدث خطأ خلال تحميل الرسالة",
+    "Forwarding to %s" : "تمرير إلى %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "إضغط هنا إذا لم يتم إعادة توجيهك تلقائياً بعد عدة ثواني.",
+    "Redirect" : "إعادة توجيه",
+    "The link leads to %s" : "الرابط يؤدي إل %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "إذا لم ترغب في زيارة الصفحة، بإمكانك العودة لـ <a href=\"%s\">البريد</a>",
+    "Continue to %s" : "أكمل إلى %s"
 },"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
 }
\ No newline at end of file
diff --git a/l10n/ast.js b/l10n/ast.js
index 548b232b9..828c57154 100644
--- a/l10n/ast.js
+++ b/l10n/ast.js
@@ -2,49 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Corréu",
-    "Loading accounts" : "Cargando cuentes",
-    "Error while loading the accounts." : "Fallu entrín se carguen les cuentes.",
-    "Can not load this folder." : "Nun pue cargase esta carpeta.",
-    "Searching for {query}" : "Guetando {query}",
-    "Error while deleting message." : "Fallu desaniciando'l mensaxe",
-    "Forwarded message" : "Mensaxe reunviáu",
-    "Choose a folder to store the attachment in" : "Escueyi una carpeta pa guardar l'axuntu",
-    "Attachments saved to Files." : "Ficheros axuntos guardaos en Ficheros.",
-    "Attachment saved to Files." : "Ficheru axuntu guardáu en Ficheros.",
-    "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.",
-    "Message flag could not be set." : "Nun pudo afitase la etiqueta del mensaxe",
-    "Could not move message." : "Nun pudo movese'l mensaxe.",
-    "Invalid account" : "Cuenta non válida",
-    "Invalid folder" : "Carpeta non válida",
-    "Error while creating the account: " : "Fallu entrín se creaba la cuenta:",
-    "Unknown error" : "Fallu desconocíu",
-    "All inboxes" : "Toles bandexes d'entrada",
-    "you" : "tu",
-    "Send message to {email}" : "Unviar mensaje a {email}",
-    "Could not load {tag}{name}{endtag}" : "Nun pudo cargase {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Hebo un problema cargando  {tag}{name}{endtag}",
-    "Could not load your message" : "Nun pudo cargase'l to mensaxe",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaxe nuevu \nde {from}","%n mensaxes nuevos \nde {from}"],
-    "Save" : "Guardar",
-    "Show all folders" : "Amosar toles carpetes",
-    "Error while deleting account." : "Fallu desaniciando la cuenta",
-    "Choose a file to add as attachment" : "Escueyi un ficheru p'amestalu como axuntu",
-    "An error occurred while uploading {fname}" : "Asocedió un fallu entrín se xubía {fname}",
-    "Reply" : "Rempuesta",
-    "Send" : "Unviar",
-    "Sending …" : "Unviando...",
-    "Message sent!" : "¡Mensaxe unviáu!",
-    "Server error" : "Fallu de sirvidor",
-    "An unknown error occurred" : "Asocedió un fallu desconocíu",
-    "Opening HTML drafts is not supported yet." : "Abrir borradores de HTML ainda nun ta soportáu",
-    "No writable calendars found" : "Nun s'atoparon calendarios pa escribir",
-    "Error while importing the calendar event" : "Fallu mientres importaben los eventos del calendariu",
-    "Error while downloading calendar event" : "Fallu mientres descargaben los eventos del calendariu",
-    "& others" : "y otros",
-    "Error while loading messages." : "Fallu cargando mensaxes",
-    "Setting up your account" : "Configurando la to cuenta",
     "Inbox" : "Bandexa d'entrada",
     "Sent" : "Unvíos",
     "Drafts" : "Borradores",
@@ -56,38 +13,44 @@ OC.L10N.register(
     "Auto detect failed. Please use manual mode." : "Falló l'autodeteición. Por favor, usa el mou manual.",
     "Creating account failed: " : "Fallu creando la cuenta:",
     "Delete permanently" : "Desaniciar dafechu",
-    "Error loading message" : "Fallu cargando mensaxe",
-    "Settings" : "Axustes",
-    "Forwarding to %s" : "Reunviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Primi equí si nun se te redirixe de mou automáticu en próximos segundos.",
-    "Redirect" : "Redirixir",
-    "The link leads to %s" : "L'enllace conduz a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si nun quies dir a esta páxina, pues volver a <a href=\"%s\">Mail</a>.",
-    "Continue to %s" : "Continúa a %s",
-    "Delete account" : "Desaniciar cuenta",
-    "New message" : "Mensaxe nuevu",
-    "Account Settings" : "Axustes de cuenta",
-    "Aliases" : "Nomatos",
-    "Search" : "Guetar",
-    "Refresh" : "Refrescar",
     "Name" : "Nome",
     "Mail Address" : "Direición de corréu",
     "Password" : "Contraseña",
-    "Manual configuration" : "Configuración a mano",
     "IMAP Host" : "Agospiu d'IMAP",
-    "IMAP security" : "Seguranza d'IMAP",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puertu d'IMAP",
     "IMAP User" : "Usuariu d'IMAP",
     "IMAP Password" : "Contraseña IMAP",
     "SMTP Host" : "Agospiu SMTP",
-    "SMTP security" : "Seguranza SMTP",
     "SMTP Port" : "Puertu SMTP",
     "SMTP User" : "Usuariu SMTP",
     "SMTP Password" : "Contraseña SMTP",
     "Connect" : "Coneutar",
     "Subject" : "Asuntu",
+    "Sending …" : "Unviando...",
+    "Message sent!" : "¡Mensaxe unviáu!",
+    "Send" : "Unviar",
+    "Choose a file to add as attachment" : "Escueyi un ficheru p'amestalu como axuntu",
+    "Could not load your message" : "Nun pudo cargase'l to mensaxe",
+    "Download attachment" : "Baxar axuntu",
+    "Choose a folder to store the attachment in" : "Escueyi una carpeta pa guardar l'axuntu",
     "The images have been blocked to protect your privacy." : "Bloquiáronse les imáxenes pa protexer la to privacidá.",
-    "Download attachment" : "Baxar axuntu"
+    "New message" : "Mensaxe nuevu",
+    "Settings" : "Axustes",
+    "Search" : "Guetar",
+    "Refresh" : "Refrescar",
+    "Show all folders" : "Amosar toles carpetes",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaxe nuevu \nde {from}","%n mensaxes nuevos \nde {from}"],
+    "All inboxes" : "Toles bandexes d'entrada",
+    "Could not load {tag}{name}{endtag}" : "Nun pudo cargase {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Hebo un problema cargando  {tag}{name}{endtag}",
+    "Error loading message" : "Fallu cargando mensaxe",
+    "Forwarding to %s" : "Reunviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Primi equí si nun se te redirixe de mou automáticu en próximos segundos.",
+    "Redirect" : "Redirixir",
+    "The link leads to %s" : "L'enllace conduz a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si nun quies dir a esta páxina, pues volver a <a href=\"%s\">Mail</a>.",
+    "Continue to %s" : "Continúa a %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/ast.json b/l10n/ast.json
index 905f99533..b2042ee69 100644
--- a/l10n/ast.json
+++ b/l10n/ast.json
@@ -1,48 +1,5 @@
 { "translations": {
     "Mail" : "Corréu",
-    "Loading accounts" : "Cargando cuentes",
-    "Error while loading the accounts." : "Fallu entrín se carguen les cuentes.",
-    "Can not load this folder." : "Nun pue cargase esta carpeta.",
-    "Searching for {query}" : "Guetando {query}",
-    "Error while deleting message." : "Fallu desaniciando'l mensaxe",
-    "Forwarded message" : "Mensaxe reunviáu",
-    "Choose a folder to store the attachment in" : "Escueyi una carpeta pa guardar l'axuntu",
-    "Attachments saved to Files." : "Ficheros axuntos guardaos en Ficheros.",
-    "Attachment saved to Files." : "Ficheru axuntu guardáu en Ficheros.",
-    "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.",
-    "Message flag could not be set." : "Nun pudo afitase la etiqueta del mensaxe",
-    "Could not move message." : "Nun pudo movese'l mensaxe.",
-    "Invalid account" : "Cuenta non válida",
-    "Invalid folder" : "Carpeta non válida",
-    "Error while creating the account: " : "Fallu entrín se creaba la cuenta:",
-    "Unknown error" : "Fallu desconocíu",
-    "All inboxes" : "Toles bandexes d'entrada",
-    "you" : "tu",
-    "Send message to {email}" : "Unviar mensaje a {email}",
-    "Could not load {tag}{name}{endtag}" : "Nun pudo cargase {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Hebo un problema cargando  {tag}{name}{endtag}",
-    "Could not load your message" : "Nun pudo cargase'l to mensaxe",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaxe nuevu \nde {from}","%n mensaxes nuevos \nde {from}"],
-    "Save" : "Guardar",
-    "Show all folders" : "Amosar toles carpetes",
-    "Error while deleting account." : "Fallu desaniciando la cuenta",
-    "Choose a file to add as attachment" : "Escueyi un ficheru p'amestalu como axuntu",
-    "An error occurred while uploading {fname}" : "Asocedió un fallu entrín se xubía {fname}",
-    "Reply" : "Rempuesta",
-    "Send" : "Unviar",
-    "Sending …" : "Unviando...",
-    "Message sent!" : "¡Mensaxe unviáu!",
-    "Server error" : "Fallu de sirvidor",
-    "An unknown error occurred" : "Asocedió un fallu desconocíu",
-    "Opening HTML drafts is not supported yet." : "Abrir borradores de HTML ainda nun ta soportáu",
-    "No writable calendars found" : "Nun s'atoparon calendarios pa escribir",
-    "Error while importing the calendar event" : "Fallu mientres importaben los eventos del calendariu",
-    "Error while downloading calendar event" : "Fallu mientres descargaben los eventos del calendariu",
-    "& others" : "y otros",
-    "Error while loading messages." : "Fallu cargando mensaxes",
-    "Setting up your account" : "Configurando la to cuenta",
     "Inbox" : "Bandexa d'entrada",
     "Sent" : "Unvíos",
     "Drafts" : "Borradores",
@@ -54,38 +11,44 @@
     "Auto detect failed. Please use manual mode." : "Falló l'autodeteición. Por favor, usa el mou manual.",
     "Creating account failed: " : "Fallu creando la cuenta:",
     "Delete permanently" : "Desaniciar dafechu",
-    "Error loading message" : "Fallu cargando mensaxe",
-    "Settings" : "Axustes",
-    "Forwarding to %s" : "Reunviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Primi equí si nun se te redirixe de mou automáticu en próximos segundos.",
-    "Redirect" : "Redirixir",
-    "The link leads to %s" : "L'enllace conduz a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si nun quies dir a esta páxina, pues volver a <a href=\"%s\">Mail</a>.",
-    "Continue to %s" : "Continúa a %s",
-    "Delete account" : "Desaniciar cuenta",
-    "New message" : "Mensaxe nuevu",
-    "Account Settings" : "Axustes de cuenta",
-    "Aliases" : "Nomatos",
-    "Search" : "Guetar",
-    "Refresh" : "Refrescar",
     "Name" : "Nome",
     "Mail Address" : "Direición de corréu",
     "Password" : "Contraseña",
-    "Manual configuration" : "Configuración a mano",
     "IMAP Host" : "Agospiu d'IMAP",
-    "IMAP security" : "Seguranza d'IMAP",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puertu d'IMAP",
     "IMAP User" : "Usuariu d'IMAP",
     "IMAP Password" : "Contraseña IMAP",
     "SMTP Host" : "Agospiu SMTP",
-    "SMTP security" : "Seguranza SMTP",
     "SMTP Port" : "Puertu SMTP",
     "SMTP User" : "Usuariu SMTP",
     "SMTP Password" : "Contraseña SMTP",
     "Connect" : "Coneutar",
     "Subject" : "Asuntu",
+    "Sending …" : "Unviando...",
+    "Message sent!" : "¡Mensaxe unviáu!",
+    "Send" : "Unviar",
+    "Choose a file to add as attachment" : "Escueyi un ficheru p'amestalu como axuntu",
+    "Could not load your message" : "Nun pudo cargase'l to mensaxe",
+    "Download attachment" : "Baxar axuntu",
+    "Choose a folder to store the attachment in" : "Escueyi una carpeta pa guardar l'axuntu",
     "The images have been blocked to protect your privacy." : "Bloquiáronse les imáxenes pa protexer la to privacidá.",
-    "Download attachment" : "Baxar axuntu"
+    "New message" : "Mensaxe nuevu",
+    "Settings" : "Axustes",
+    "Search" : "Guetar",
+    "Refresh" : "Refrescar",
+    "Show all folders" : "Amosar toles carpetes",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaxe nuevu \nde {from}","%n mensaxes nuevos \nde {from}"],
+    "All inboxes" : "Toles bandexes d'entrada",
+    "Could not load {tag}{name}{endtag}" : "Nun pudo cargase {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Hebo un problema cargando  {tag}{name}{endtag}",
+    "Error loading message" : "Fallu cargando mensaxe",
+    "Forwarding to %s" : "Reunviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Primi equí si nun se te redirixe de mou automáticu en próximos segundos.",
+    "Redirect" : "Redirixir",
+    "The link leads to %s" : "L'enllace conduz a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si nun quies dir a esta páxina, pues volver a <a href=\"%s\">Mail</a>.",
+    "Continue to %s" : "Continúa a %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/bg.js b/l10n/bg.js
index 2c5455fc0..ab601cbc2 100644
--- a/l10n/bg.js
+++ b/l10n/bg.js
@@ -2,52 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Поща",
-    "Loading accounts" : "Зареждане на профили",
-    "Error while loading the accounts." : "Грешка при зареждането на профилите.",
-    "Can not load this folder." : "Тази папка не може да се зареди.",
-    "Searching for {query}" : "Търсене на {query}",
-    "Error while deleting message." : "Грешка при изтриването на съобщение.",
-    "Forwarded message" : "Препратено съобщение",
-    "Choose a folder to store the attachment in" : "Избери папка, където да бъде запазен прикаченият файл",
-    "Attachments saved to Files." : "Прикачените файлове са запазени във Файлове.",
-    "Attachment saved to Files." : "Прикачения файл е запазен във Файлове.",
-    "Error while saving attachments to Files." : "Грешка при запазване на прикачените файлове във Файлове.",
-    "Error while saving attachment to Files." : "Грешка при запазване на прикаченият файл във Файлове.",
-    "Message flag could not be set." : "Флага на съобщението не може да бъде настроен.",
-    "Could not move message." : "Съобщението не може да бъде преместено",
-    "Invalid account" : "Невалиден профил",
-    "Invalid folder" : "Невалидна папка",
-    "Error while creating the account: " : "Грешка при създаване на профил:",
-    "Unknown error" : "Неизвестна грешка",
-    "Error while updating the account: " : "Грешка при обновяване на профил:",
-    "All inboxes" : "Всички",
-    "you" : "ти",
-    "Send message to {email}" : "Изпрати съобщение до {email}",
-    "Could not load {tag}{name}{endtag}" : "{tag}{name}{endtag} не може да бъде зареден",
-    "There was a problem loading {tag}{name}{endtag}" : "Проблем при зареждане на {tag}{name}{endtag}",
-    "Could not load your message" : "Вашето съобщение не може да бъде заредено",
-    "Could not load the desired message" : "Желаното съобщение не може да бъде заредено",
-    "Could not load the message" : "Съобщението не може да бъде заредено",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n ново съобщение \nот {from}","%n нови съобщения\nот {from}"],
-    "Nextcloud Mail" : "Nextcloud Е-Мейл",
-    "Save" : "Запазване",
-    "Saved" : "Запазено",
-    "Show all folders" : "Покажи всички папки",
-    "Collapse folders" : "Свиване на папките",
-    "Error while deleting account." : "Грешка при изтриването на профил.",
-    "Choose a file to add as attachment" : "Избери файл за прикачване",
-    "An error occurred while uploading {fname}" : "Възникна греша по време на качване на {fname}",
-    "Reply" : "Отговори",
-    "Send" : "Изпрати",
-    "Sending …" : "Изпращане...",
-    "Message sent!" : "Съобщението е изпратено!",
-    "Server error" : "Сървърна грешка",
-    "An unknown error occurred" : "Възникна неизвестна грешка",
-    "No writable calendars found" : "Не са открити календари за запис",
-    "& others" : "и други",
-    "Error while loading messages." : "Грешка при зареждане на съобщенията.",
-    "Setting up your account" : "Настройване на профила ви",
     "Inbox" : "Входяши",
     "Sent" : "Изпратени",
     "Drafts" : "Чернови",
@@ -61,26 +15,10 @@ OC.L10N.register(
     "Delete permanently" : "Изтрий завинаги",
     "IMAP web client" : "IMAP уеб клиент",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Имейл клиент, който поддържа IMAP и SMTP.",
-    "Error loading message" : "Грешка при зареждане съобщението",
-    "Settings" : "Настройки",
-    "Forwarding to %s" : "Препращане към %s",
-    "The link leads to %s" : "Връзката води до %s",
-    "Continue to %s" : "Продължи към %s",
-    "Delete account" : "Изтриване на профил",
-    "Try again" : "Опитай отново",
-    "New message" : "Ново съобщение",
-    "Account Settings" : "Настройки на профила",
-    "Aliases" : "Псевдоними",
-    "Mail address" : "Имейл адрес",
-    "Display Name" : "Име за визуализация",
-    "Account" : "Профил",
-    "Refresh" : "Опресняване",
     "Name" : "Име",
     "Mail Address" : "Имейл адрес",
     "Password" : "Парола",
-    "Manual configuration" : "Ръчни настройки",
     "IMAP Host" : "IMAP сървър",
-    "IMAP security" : "IMAP сигурност",
     "None" : "Няма",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP порт",
@@ -91,13 +29,36 @@ OC.L10N.register(
     "SMTP User" : "SMTP потребител",
     "SMTP Password" : "SMTP парола",
     "Connect" : "Свържи",
+    "Add mail account" : "Добавяне на профил",
     "from" : "от",
     "to" : "до",
     "cc" : "ЯК",
     "bcc" : "СК",
     "Subject" : "Тема",
-    "Add mail account" : "Добавяне на профил",
-    "Forward" : "Препращане",
-    "Save to Files" : "Запази във Файлове"
+    "Sending …" : "Изпращане...",
+    "Message sent!" : "Съобщението е изпратено!",
+    "Send" : "Изпрати",
+    "Choose a file to add as attachment" : "Избери файл за прикачване",
+    "Delete" : "Изтриване",
+    "Could not load your message" : "Вашето съобщение не може да бъде заредено",
+    "Save to Files" : "Запази във Файлове",
+    "Choose a folder to store the attachment in" : "Избери папка, където да бъде запазен прикаченият файл",
+    "New message" : "Ново съобщение",
+    "Settings" : "Настройки",
+    "Refresh" : "Опресняване",
+    "Show all folders" : "Покажи всички папки",
+    "Collapse folders" : "Свиване на папките",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n ново съобщение \nот {from}","%n нови съобщения\nот {from}"],
+    "Nextcloud Mail" : "Nextcloud Е-Мейл",
+    "All inboxes" : "Всички",
+    "Could not load {tag}{name}{endtag}" : "{tag}{name}{endtag} не може да бъде зареден",
+    "There was a problem loading {tag}{name}{endtag}" : "Проблем при зареждане на {tag}{name}{endtag}",
+    "Could not load the desired message" : "Желаното съобщение не може да бъде заредено",
+    "Could not load the message" : "Съобщението не може да бъде заредено",
+    "Error loading message" : "Грешка при зареждане съобщението",
+    "Forwarding to %s" : "Препращане към %s",
+    "The link leads to %s" : "Връзката води до %s",
+    "Continue to %s" : "Продължи към %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/bg.json b/l10n/bg.json
index ac892faf8..ab9bb3058 100644
--- a/l10n/bg.json
+++ b/l10n/bg.json
@@ -1,51 +1,5 @@
 { "translations": {
     "Mail" : "Поща",
-    "Loading accounts" : "Зареждане на профили",
-    "Error while loading the accounts." : "Грешка при зареждането на профилите.",
-    "Can not load this folder." : "Тази папка не може да се зареди.",
-    "Searching for {query}" : "Търсене на {query}",
-    "Error while deleting message." : "Грешка при изтриването на съобщение.",
-    "Forwarded message" : "Препратено съобщение",
-    "Choose a folder to store the attachment in" : "Избери папка, където да бъде запазен прикаченият файл",
-    "Attachments saved to Files." : "Прикачените файлове са запазени във Файлове.",
-    "Attachment saved to Files." : "Прикачения файл е запазен във Файлове.",
-    "Error while saving attachments to Files." : "Грешка при запазване на прикачените файлове във Файлове.",
-    "Error while saving attachment to Files." : "Грешка при запазване на прикаченият файл във Файлове.",
-    "Message flag could not be set." : "Флага на съобщението не може да бъде настроен.",
-    "Could not move message." : "Съобщението не може да бъде преместено",
-    "Invalid account" : "Невалиден профил",
-    "Invalid folder" : "Невалидна папка",
-    "Error while creating the account: " : "Грешка при създаване на профил:",
-    "Unknown error" : "Неизвестна грешка",
-    "Error while updating the account: " : "Грешка при обновяване на профил:",
-    "All inboxes" : "Всички",
-    "you" : "ти",
-    "Send message to {email}" : "Изпрати съобщение до {email}",
-    "Could not load {tag}{name}{endtag}" : "{tag}{name}{endtag} не може да бъде зареден",
-    "There was a problem loading {tag}{name}{endtag}" : "Проблем при зареждане на {tag}{name}{endtag}",
-    "Could not load your message" : "Вашето съобщение не може да бъде заредено",
-    "Could not load the desired message" : "Желаното съобщение не може да бъде заредено",
-    "Could not load the message" : "Съобщението не може да бъде заредено",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n ново съобщение \nот {from}","%n нови съобщения\nот {from}"],
-    "Nextcloud Mail" : "Nextcloud Е-Мейл",
-    "Save" : "Запазване",
-    "Saved" : "Запазено",
-    "Show all folders" : "Покажи всички папки",
-    "Collapse folders" : "Свиване на папките",
-    "Error while deleting account." : "Грешка при изтриването на профил.",
-    "Choose a file to add as attachment" : "Избери файл за прикачване",
-    "An error occurred while uploading {fname}" : "Възникна греша по време на качване на {fname}",
-    "Reply" : "Отговори",
-    "Send" : "Изпрати",
-    "Sending …" : "Изпращане...",
-    "Message sent!" : "Съобщението е изпратено!",
-    "Server error" : "Сървърна грешка",
-    "An unknown error occurred" : "Възникна неизвестна грешка",
-    "No writable calendars found" : "Не са открити календари за запис",
-    "& others" : "и други",
-    "Error while loading messages." : "Грешка при зареждане на съобщенията.",
-    "Setting up your account" : "Настройване на профила ви",
     "Inbox" : "Входяши",
     "Sent" : "Изпратени",
     "Drafts" : "Чернови",
@@ -59,26 +13,10 @@
     "Delete permanently" : "Изтрий завинаги",
     "IMAP web client" : "IMAP уеб клиент",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Имейл клиент, който поддържа IMAP и SMTP.",
-    "Error loading message" : "Грешка при зареждане съобщението",
-    "Settings" : "Настройки",
-    "Forwarding to %s" : "Препращане към %s",
-    "The link leads to %s" : "Връзката води до %s",
-    "Continue to %s" : "Продължи към %s",
-    "Delete account" : "Изтриване на профил",
-    "Try again" : "Опитай отново",
-    "New message" : "Ново съобщение",
-    "Account Settings" : "Настройки на профила",
-    "Aliases" : "Псевдоними",
-    "Mail address" : "Имейл адрес",
-    "Display Name" : "Име за визуализация",
-    "Account" : "Профил",
-    "Refresh" : "Опресняване",
     "Name" : "Име",
     "Mail Address" : "Имейл адрес",
     "Password" : "Парола",
-    "Manual configuration" : "Ръчни настройки",
     "IMAP Host" : "IMAP сървър",
-    "IMAP security" : "IMAP сигурност",
     "None" : "Няма",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP порт",
@@ -89,13 +27,36 @@
     "SMTP User" : "SMTP потребител",
     "SMTP Password" : "SMTP парола",
     "Connect" : "Свържи",
+    "Add mail account" : "Добавяне на профил",
     "from" : "от",
     "to" : "до",
     "cc" : "ЯК",
     "bcc" : "СК",
     "Subject" : "Тема",
-    "Add mail account" : "Добавяне на профил",
-    "Forward" : "Препращане",
-    "Save to Files" : "Запази във Файлове"
+    "Sending …" : "Изпращане...",
+    "Message sent!" : "Съобщението е изпратено!",
+    "Send" : "Изпрати",
+    "Choose a file to add as attachment" : "Избери файл за прикачване",
+    "Delete" : "Изтриване",
+    "Could not load your message" : "Вашето съобщение не може да бъде заредено",
+    "Save to Files" : "Запази във Файлове",
+    "Choose a folder to store the attachment in" : "Избери папка, където да бъде запазен прикаченият файл",
+    "New message" : "Ново съобщение",
+    "Settings" : "Настройки",
+    "Refresh" : "Опресняване",
+    "Show all folders" : "Покажи всички папки",
+    "Collapse folders" : "Свиване на папките",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n ново съобщение \nот {from}","%n нови съобщения\nот {from}"],
+    "Nextcloud Mail" : "Nextcloud Е-Мейл",
+    "All inboxes" : "Всички",
+    "Could not load {tag}{name}{endtag}" : "{tag}{name}{endtag} не може да бъде зареден",
+    "There was a problem loading {tag}{name}{endtag}" : "Проблем при зареждане на {tag}{name}{endtag}",
+    "Could not load the desired message" : "Желаното съобщение не може да бъде заредено",
+    "Could not load the message" : "Съобщението не може да бъде заредено",
+    "Error loading message" : "Грешка при зареждане съобщението",
+    "Forwarding to %s" : "Препращане към %s",
+    "The link leads to %s" : "Връзката води до %s",
+    "Continue to %s" : "Продължи към %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/ca.js b/l10n/ca.js
index da2015f1c..da73c9d01 100644
--- a/l10n/ca.js
+++ b/l10n/ca.js
@@ -2,50 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Correu electrònic",
-    "Loading accounts" : "S'està carregant",
-    "Error while loading the accounts." : "Error al carregar els comptes.",
-    "Can not load this folder." : "No s'ha pogut carregar aquesta carpeta.",
-    "Searching for {query}" : "Buscant per {query}",
-    "Error while deleting message." : "Error en esborrar el missatge.",
-    "Forwarded message" : "Missatge respost",
-    "Choose a folder to store the attachment in" : "Esculli una carpeta per guardar el arxiu adjunt",
-    "Attachments saved to Files." : "Arxius adjunts guardats a Fitxers.",
-    "Attachment saved to Files." : "Arxiu adjunt guardat a Fitxers.",
-    "Error while saving attachments to Files." : "Error en guardar els arxius adjunts a Fitxers.",
-    "Error while saving attachment to Files." : "Error al guardar l'arxiu adjunt a Fitxers.",
-    "Message flag could not be set." : "No s'ha pogut assignar l'etiqueta al missatge.",
-    "Could not move message." : "No es pot moure el missatge",
-    "Invalid account" : "Compte invàlid",
-    "Invalid folder" : "Directori invàlid",
-    "Error while creating the account: " : "Error al crear el compte:",
-    "Unknown error" : "Error desconegut",
-    "All inboxes" : "Totes les safates d'entrada",
-    "you" : "Tu",
-    "Send message to {email}" : "Envia missatge per {email}",
-    "Could not load {tag}{name}{endtag}" : "No s'ha pogut carregar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Hi ha hagut un problema al carregar {tag}{name}{endtag}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "Nextcloud Mail" : "Nextcloud correo",
-    "Save" : "Desa",
-    "Show all folders" : "Mostra totes les carpetes",
-    "Collapse folders" : "Redueix les carpetes",
-    "Error while deleting account." : "Error al borrar el compte",
-    "Choose a file to add as attachment" : "Escull un fitxer per adjuntar al correu",
-    "An error occurred while uploading {fname}" : "S'ha produït un error",
-    "Reply" : "Respon",
-    "Send" : "Envia",
-    "Sending …" : "Enviant...",
-    "Message sent!" : "Missatge enviat!",
-    "Server error" : "Error del servidor",
-    "An unknown error occurred" : "S\\'ha produït un error desconegut",
-    "Opening HTML drafts is not supported yet." : "Encara no està permès obrir esborranys en HTML.",
-    "No writable calendars found" : "No s'han trobat calendaris editables",
-    "Error while importing the calendar event" : "Error al importar l'esdeveniment de calendari",
-    "Error while downloading calendar event" : "Error al carregar l'esdeveniment de calendari",
-    "& others" : "& altres",
-    "Error while loading messages." : "Error al carregar els missatges",
-    "Error while refreshing messages." : "Error al carregar els missatges",
-    "Setting up your account" : "Configurant el teu compte",
     "Inbox" : "Safata d'Entrada",
     "Sent" : "Enviat",
     "Drafts" : "Esborranys",
@@ -57,62 +13,62 @@ OC.L10N.register(
     "Auto detect failed. Please use manual mode." : "Detecció automatica fallida. Siusplau, utilitzi el mode manual.",
     "Creating account failed: " : "La creació del compte ha fallat:",
     "Delete permanently" : "Esborra permanentment",
-    "Error loading message" : "Error al carregar el missatge",
-    "Settings" : "Configuració",
-    "Forwarding to %s" : "Reenviant a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Prem aquí si no se't redirigeix automàticament en pocs segons.",
-    "Redirect" : "Redireccionar",
-    "The link leads to %s" : "L'enllaç dirigeix a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no vols visitar aquella pàgina, pots tornar a <a href=\"%s\">Mail</a>.",
-    "Continue to %s" : "Continua a %s",
-    "Delete account" : "Esborra el compte",
-    "Try again" : "Torna a provar",
-    "New message" : "Nou missatge",
-    "Account Settings" : "Paràmetres del compte",
-    "Aliases" : "Àlies",
-    "Mail address" : "Adreça de correu",
-    "Display Name" : "Nom d'usuari",
-    "Delete" : "Esborra",
-    "Keyboard shortcuts" : "Dreceres de teclat",
-    "Speed up your Mail experience with these quick shortcuts." : "Accelera el teu us de Mail amb aquestes dreceres de teclat.",
-    "Compose new message" : "Nou missatge",
-    "Newer message" : "Missatges més nous",
-    "Older message" : "Missatges més vells",
-    "Toggle star" : "Commuta l'estrella",
-    "Toggle unread" : "Commuta la lectura",
-    "Search" : "Cerca",
-    "Refresh" : "Refresca",
-    "Connect your mail account" : "Connecteu el teu compte de correu",
     "Name" : "Nom",
     "Mail Address" : "Adreça de correu",
     "Password" : "Contrasenya",
-    "Manual configuration" : "Manual de la configuració",
     "IMAP Host" : "IMAP Host",
-    "IMAP security" : "IMAP security",
     "None" : "Cap",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Port IMAP",
     "IMAP User" : "Usuari IMAP",
     "IMAP Password" : "Contrasenya IMAP",
     "SMTP Host" : "Host SMTP",
-    "SMTP security" : "security SMTP",
     "SMTP Port" : "Port SMTP",
     "SMTP User" : "Usuari SMTP",
     "SMTP Password" : "Contrasenya SMTP",
     "Connect" : "Connecta",
+    "Add mail account" : "Afegeix compte de correu",
+    "Keyboard shortcuts" : "Dreceres de teclat",
     "from" : "des de",
     "to" : "a",
     "cc" : "cc",
     "bcc" : "bcc",
     "Subject" : "Assumpte",
-    "Save all to Files" : "Desa tots els fitxers",
-    "Add mail account" : "Afegeix compte de correu",
-    "No search results for" : "No s'han trobat cap resultat",
-    "The images have been blocked to protect your privacy." : "S'han bloquejat les imatges per protegir la teva privacitat.",
-    "Show images from this sender" : "Mostra imatges d'aquest remitent",
-    "Forward" : "Respondre",
+    "Sending …" : "Enviant...",
+    "Message sent!" : "Missatge enviat!",
+    "Send" : "Envia",
+    "Choose a file to add as attachment" : "Escull un fitxer per adjuntar al correu",
+    "Delete" : "Esborra",
     "Import into calendar" : "Importar al calendari",
     "Download attachment" : "Descarrega l'adjunt",
-    "Save to Files" : "Desa els fitxers"
+    "Save to Files" : "Desa els fitxers",
+    "Choose a folder to store the attachment in" : "Esculli una carpeta per guardar el arxiu adjunt",
+    "Save all to Files" : "Desa tots els fitxers",
+    "The images have been blocked to protect your privacy." : "S'han bloquejat les imatges per protegir la teva privacitat.",
+    "New message" : "Nou missatge",
+    "Settings" : "Paràmetres",
+    "Speed up your Mail experience with these quick shortcuts." : "Accelera el teu us de Mail amb aquestes dreceres de teclat.",
+    "Compose new message" : "Nou missatge",
+    "Newer message" : "Missatges més nous",
+    "Older message" : "Missatges més vells",
+    "Toggle star" : "Commuta l'estrella",
+    "Toggle unread" : "Commuta la lectura",
+    "Search" : "Cerca",
+    "Refresh" : "Refresca",
+    "Connect your mail account" : "Connecteu el teu compte de correu",
+    "Show all folders" : "Mostra totes les carpetes",
+    "Collapse folders" : "Redueix les carpetes",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "Nextcloud Mail" : "Nextcloud correo",
+    "All inboxes" : "Totes les safates d'entrada",
+    "Could not load {tag}{name}{endtag}" : "No s'ha pogut carregar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Hi ha hagut un problema al carregar {tag}{name}{endtag}",
+    "Error loading message" : "Error al carregar el missatge",
+    "Forwarding to %s" : "Reenviant a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Prem aquí si no se't redirigeix automàticament en pocs segons.",
+    "Redirect" : "Redireccionar",
+    "The link leads to %s" : "L'enllaç dirigeix a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no vols visitar aquella pàgina, pots tornar a <a href=\"%s\">Mail</a>.",
+    "Continue to %s" : "Continua a %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/ca.json b/l10n/ca.json
index 9d92d2d31..6823f786f 100644
--- a/l10n/ca.json
+++ b/l10n/ca.json
@@ -1,49 +1,5 @@
 { "translations": {
     "Mail" : "Correu electrònic",
-    "Loading accounts" : "S'està carregant",
-    "Error while loading the accounts." : "Error al carregar els comptes.",
-    "Can not load this folder." : "No s'ha pogut carregar aquesta carpeta.",
-    "Searching for {query}" : "Buscant per {query}",
-    "Error while deleting message." : "Error en esborrar el missatge.",
-    "Forwarded message" : "Missatge respost",
-    "Choose a folder to store the attachment in" : "Esculli una carpeta per guardar el arxiu adjunt",
-    "Attachments saved to Files." : "Arxius adjunts guardats a Fitxers.",
-    "Attachment saved to Files." : "Arxiu adjunt guardat a Fitxers.",
-    "Error while saving attachments to Files." : "Error en guardar els arxius adjunts a Fitxers.",
-    "Error while saving attachment to Files." : "Error al guardar l'arxiu adjunt a Fitxers.",
-    "Message flag could not be set." : "No s'ha pogut assignar l'etiqueta al missatge.",
-    "Could not move message." : "No es pot moure el missatge",
-    "Invalid account" : "Compte invàlid",
-    "Invalid folder" : "Directori invàlid",
-    "Error while creating the account: " : "Error al crear el compte:",
-    "Unknown error" : "Error desconegut",
-    "All inboxes" : "Totes les safates d'entrada",
-    "you" : "Tu",
-    "Send message to {email}" : "Envia missatge per {email}",
-    "Could not load {tag}{name}{endtag}" : "No s'ha pogut carregar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Hi ha hagut un problema al carregar {tag}{name}{endtag}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "Nextcloud Mail" : "Nextcloud correo",
-    "Save" : "Desa",
-    "Show all folders" : "Mostra totes les carpetes",
-    "Collapse folders" : "Redueix les carpetes",
-    "Error while deleting account." : "Error al borrar el compte",
-    "Choose a file to add as attachment" : "Escull un fitxer per adjuntar al correu",
-    "An error occurred while uploading {fname}" : "S'ha produït un error",
-    "Reply" : "Respon",
-    "Send" : "Envia",
-    "Sending …" : "Enviant...",
-    "Message sent!" : "Missatge enviat!",
-    "Server error" : "Error del servidor",
-    "An unknown error occurred" : "S\\'ha produït un error desconegut",
-    "Opening HTML drafts is not supported yet." : "Encara no està permès obrir esborranys en HTML.",
-    "No writable calendars found" : "No s'han trobat calendaris editables",
-    "Error while importing the calendar event" : "Error al importar l'esdeveniment de calendari",
-    "Error while downloading calendar event" : "Error al carregar l'esdeveniment de calendari",
-    "& others" : "& altres",
-    "Error while loading messages." : "Error al carregar els missatges",
-    "Error while refreshing messages." : "Error al carregar els missatges",
-    "Setting up your account" : "Configurant el teu compte",
     "Inbox" : "Safata d'Entrada",
     "Sent" : "Enviat",
     "Drafts" : "Esborranys",
@@ -55,62 +11,62 @@
     "Auto detect failed. Please use manual mode." : "Detecció automatica fallida. Siusplau, utilitzi el mode manual.",
     "Creating account failed: " : "La creació del compte ha fallat:",
     "Delete permanently" : "Esborra permanentment",
-    "Error loading message" : "Error al carregar el missatge",
-    "Settings" : "Configuració",
-    "Forwarding to %s" : "Reenviant a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Prem aquí si no se't redirigeix automàticament en pocs segons.",
-    "Redirect" : "Redireccionar",
-    "The link leads to %s" : "L'enllaç dirigeix a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no vols visitar aquella pàgina, pots tornar a <a href=\"%s\">Mail</a>.",
-    "Continue to %s" : "Continua a %s",
-    "Delete account" : "Esborra el compte",
-    "Try again" : "Torna a provar",
-    "New message" : "Nou missatge",
-    "Account Settings" : "Paràmetres del compte",
-    "Aliases" : "Àlies",
-    "Mail address" : "Adreça de correu",
-    "Display Name" : "Nom d'usuari",
-    "Delete" : "Esborra",
-    "Keyboard shortcuts" : "Dreceres de teclat",
-    "Speed up your Mail experience with these quick shortcuts." : "Accelera el teu us de Mail amb aquestes dreceres de teclat.",
-    "Compose new message" : "Nou missatge",
-    "Newer message" : "Missatges més nous",
-    "Older message" : "Missatges més vells",
-    "Toggle star" : "Commuta l'estrella",
-    "Toggle unread" : "Commuta la lectura",
-    "Search" : "Cerca",
-    "Refresh" : "Refresca",
-    "Connect your mail account" : "Connecteu el teu compte de correu",
     "Name" : "Nom",
     "Mail Address" : "Adreça de correu",
     "Password" : "Contrasenya",
-    "Manual configuration" : "Manual de la configuració",
     "IMAP Host" : "IMAP Host",
-    "IMAP security" : "IMAP security",
     "None" : "Cap",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Port IMAP",
     "IMAP User" : "Usuari IMAP",
     "IMAP Password" : "Contrasenya IMAP",
     "SMTP Host" : "Host SMTP",
-    "SMTP security" : "security SMTP",
     "SMTP Port" : "Port SMTP",
     "SMTP User" : "Usuari SMTP",
     "SMTP Password" : "Contrasenya SMTP",
     "Connect" : "Connecta",
+    "Add mail account" : "Afegeix compte de correu",
+    "Keyboard shortcuts" : "Dreceres de teclat",
     "from" : "des de",
     "to" : "a",
     "cc" : "cc",
     "bcc" : "bcc",
     "Subject" : "Assumpte",
-    "Save all to Files" : "Desa tots els fitxers",
-    "Add mail account" : "Afegeix compte de correu",
-    "No search results for" : "No s'han trobat cap resultat",
-    "The images have been blocked to protect your privacy." : "S'han bloquejat les imatges per protegir la teva privacitat.",
-    "Show images from this sender" : "Mostra imatges d'aquest remitent",
-    "Forward" : "Respondre",
+    "Sending …" : "Enviant...",
+    "Message sent!" : "Missatge enviat!",
+    "Send" : "Envia",
+    "Choose a file to add as attachment" : "Escull un fitxer per adjuntar al correu",
+    "Delete" : "Esborra",
     "Import into calendar" : "Importar al calendari",
     "Download attachment" : "Descarrega l'adjunt",
-    "Save to Files" : "Desa els fitxers"
+    "Save to Files" : "Desa els fitxers",
+    "Choose a folder to store the attachment in" : "Esculli una carpeta per guardar el arxiu adjunt",
+    "Save all to Files" : "Desa tots els fitxers",
+    "The images have been blocked to protect your privacy." : "S'han bloquejat les imatges per protegir la teva privacitat.",
+    "New message" : "Nou missatge",
+    "Settings" : "Paràmetres",
+    "Speed up your Mail experience with these quick shortcuts." : "Accelera el teu us de Mail amb aquestes dreceres de teclat.",
+    "Compose new message" : "Nou missatge",
+    "Newer message" : "Missatges més nous",
+    "Older message" : "Missatges més vells",
+    "Toggle star" : "Commuta l'estrella",
+    "Toggle unread" : "Commuta la lectura",
+    "Search" : "Cerca",
+    "Refresh" : "Refresca",
+    "Connect your mail account" : "Connecteu el teu compte de correu",
+    "Show all folders" : "Mostra totes les carpetes",
+    "Collapse folders" : "Redueix les carpetes",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "Nextcloud Mail" : "Nextcloud correo",
+    "All inboxes" : "Totes les safates d'entrada",
+    "Could not load {tag}{name}{endtag}" : "No s'ha pogut carregar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Hi ha hagut un problema al carregar {tag}{name}{endtag}",
+    "Error loading message" : "Error al carregar el missatge",
+    "Forwarding to %s" : "Reenviant a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Prem aquí si no se't redirigeix automàticament en pocs segons.",
+    "Redirect" : "Redireccionar",
+    "The link leads to %s" : "L'enllaç dirigeix a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no vols visitar aquella pàgina, pots tornar a <a href=\"%s\">Mail</a>.",
+    "Continue to %s" : "Continua a %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/cs.js b/l10n/cs.js
index d639acfa7..595ad9d8c 100644
--- a/l10n/cs.js
+++ b/l10n/cs.js
@@ -1,57 +1,7 @@
 OC.L10N.register(
     "mail",
     {
-    "Mail" : "E-mail",
-    "Loading accounts" : "Načítání účtů",
-    "Error while loading the accounts." : "Chyba při načítání účtů.",
-    "Can not load this folder." : "Tuto složku se nedaří načíst.",
-    "Searching for {query}" : "Hledání pro {query}",
-    "Error while deleting message." : "Chyba při mazání zprávy.",
-    "Forwarded message" : "Přeposlaná zpráva",
-    "Choose a folder to store the attachment in" : "Vyberte složku pro uložení přílohy",
-    "Attachments saved to Files." : "Přílohy uloženy do Souborů.",
-    "Attachment saved to Files." : "Příloha uložena do Souborů.",
-    "Error while saving attachments to Files." : "Chyba při ukládání příloh do Souborů.",
-    "Error while saving attachment to Files." : "Chyba při ukládání přílohy do Souborů.",
-    "Message flag could not be set." : "Značka zpráva nemohla být nastavena.",
-    "Could not move message." : "Nelze přesunout zprávu.",
-    "Invalid account" : "Neplatný účet",
-    "Invalid folder" : "Neplatná složka",
-    "Error while creating the account: " : "Chyba při vytváření účtu:",
-    "Unknown error" : "Neznámá chyba",
-    "Error while updating the account: " : "Chyba při aktualizaci účtu",
-    "All inboxes" : "Všechny schránky",
-    "you" : "vy",
-    "Send message to {email}" : "Poslat e-mail na {email}",
-    "Could not load {tag}{name}{endtag}" : "Nedaří se načíst {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Došlo k problému s načtením {tag}{name}{endtag}",
-    "Could not load your message" : "Nezdařilo se načtení vaší zprávy",
-    "Could not load the desired message" : "Nelze načíst vyžádanou zprávu",
-    "Could not load the message" : "Nelze načíst zprívu",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n nová zpráva\nod {from}","%n nové zprávy\nod {from}","%n nových zpráv\nod {from}","%n nových zpráv\nod {from}"],
-    "Nextcloud Mail" : "Nextcloud Mail",
-    "Save" : "Uložit",
-    "Saved" : "Uloženo",
-    "Show all folders" : "Zobrazit všechny složky",
-    "Collapse folders" : "Sbalit složky",
-    "Error while deleting account." : "Chyba při mazání účtu.",
-    "Choose a file to add as attachment" : "Vyberte soubor k přiložení",
-    "An error occurred while uploading {fname}" : "Došlo k chybě při nahrávání souboru {fname}",
-    "Reply" : "Odpověď",
-    "Send" : "Odeslat",
-    "Sending …" : "Odesílání…",
-    "Message sent!" : "Zpráva odeslána!",
-    "Server error" : "Chyba serveru",
-    "An unknown error occurred" : "Nastala neznámá chyba",
-    "Opening HTML drafts is not supported yet." : "Otevírání HTML konceptů ještě není podporováno.",
-    "No writable calendars found" : "Nebyly nalezeny žádné zapisovatelné kalendáře",
-    "Error while importing the calendar event" : "Chyba při importu události kalendáře",
-    "Error while downloading calendar event" : "Chyba při stahování události kalendáře",
-    "& others" : "a další",
-    "Error while loading messages." : "Chyba během načítání zpráv.",
-    "Error while refreshing messages." : "Chyba během načítání zpráv.",
-    "Setting up your account" : "Nastavení účtu",
+    "Mail" : "Email",
     "Inbox" : "Doručená",
     "Sent" : "Odeslaná",
     "Drafts" : "Koncepty",
@@ -65,70 +15,71 @@ OC.L10N.register(
     "Creating account failed: " : "Vytvoření účtu se nezdařilo:",
     "Delete permanently" : "Trvale odstranit",
     "IMAP web client" : "Webový IMAP klient",
-    "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Snadno použitelný e-mailový klient který se připojí k vámi používanému serveru prostřednictvím protokolů IMAP a SMTP.",
-    "Error loading message" : "Chyba načtení zprávy",
-    "Settings" : "Nastavení",
-    "Forwarding to %s" : "Přeposílá na %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Pokud nebudete v následujících několika sekundách přesměrováni, klikněte sem.",
-    "Redirect" : "Přesměrovat",
-    "The link leads to %s" : "Odkaz vede na %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Pokud nechcete tuto stránku navštívit, můžete se vrátit do <a href=\"%s\">e-mailu</a>.",
-    "Continue to %s" : "Pokračovat na %s",
-    "Delete account" : "Smazat účet",
-    "Try again" : "Zkusit znovu",
-    "New message" : "Nová zpráva",
-    "Account Settings" : "Nastavení účtu",
-    "Aliases" : "Alternativní názvy",
-    "Mail address" : "E-mailová adresa",
-    "Display Name" : "Zobrazované jméno",
-    "Account" : "Účet",
-    "Toggle read" : "Přepnout čtení",
-    "Delete" : "Smazat",
-    "Keyboard shortcuts" : "Klávesové zkratky",
-    "Speed up your Mail experience with these quick shortcuts." : "Zrychlete své používání aplikace E-mail pomocí těchto pohotových zkratek.",
-    "Compose new message" : "Napsat novou zprávu",
-    "Newer message" : "Novější zpráva",
-    "Older message" : "Starší zpráva",
-    "Toggle star" : "Přepnout hvězdu",
-    "Toggle unread" : "Přepnout nepřečtené",
-    "Search" : "Hledat",
-    "Refresh" : "Načíst znovu",
-    "Connect your mail account" : "Připojit e-mailový účet",
+    "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Snadno použitelný emailový klient který se připojí k vámi používanému serveru prostřednictvím protokolů IMAP a SMTP.",
     "Name" : "Název",
-    "Mail Address" : "E-mailová adresa",
+    "Mail Address" : "Emailová adresa",
     "Password" : "Heslo",
-    "Manual configuration" : "Ruční nastavení",
     "IMAP Host" : "IMAP hostitel",
-    "IMAP security" : "IMAP zabezpečení",
     "None" : "Žádné",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP port",
     "IMAP User" : "IMAP uživatel",
     "IMAP Password" : "IMAP heslo",
     "SMTP Host" : "SMTP hostitel",
-    "SMTP security" : "SMTP zabezpečení",
     "SMTP Port" : "SMTP port",
     "SMTP User" : "SMTP uživatel",
     "SMTP Password" : "SMTP heslo",
     "Connect" : "Připojit",
+    "Add mail account" : "Přidat emailový účet",
+    "Use Gravatar and favicon avatars" : "Použijte Gravatar a favicon avatary",
+    "Keyboard shortcuts" : "Klávesové zkratky",
     "from" : "od",
     "to" : "komu",
     "cc" : "kopie",
     "bcc" : "skrytá kopie",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Poznámka: E-mail pochází z noreply (neodpovídat) adresy pravděpodobně nebude možnost přečíst odpověď.",
     "Subject" : "Předmět",
-    "Save all to Files" : "Uložit vše do Souborů",
-    "Add mail account" : "Přidat e-mailový účet",
-    "Use Gravatar and favicon avatars" : "Použijte Gravatar a favicon avatary",
-    "No search results for" : "Nic nenalezeno pro",
-    "The images have been blocked to protect your privacy." : "Obrázky byly zablokovány pro ochranu vašeho soukromí.",
-    "Show images from this sender" : "Zobrazit obrázky od tohoto odesílatele",
-    "Forward" : "Přeposlat",
-    "No messages in this folder" : "V této složce nejsou žádné zprávy",
+    "Sending …" : "Odesílání…",
+    "Message sent!" : "Zpráva odeslána!",
+    "Send" : "Odeslat",
     "Upload attachment" : "Nahrát přílohu",
     "Add attachment from Files" : "Přidat přílohu ze Souborů",
+    "Choose a file to add as attachment" : "Vyberte soubor k přiložení",
+    "No messages in this folder" : "V této složce nejsou žádné zprávy",
+    "Delete" : "Smazat",
+    "Could not load your message" : "Nezdařilo se načtení vaší zprávy",
     "Import into calendar" : "Importovat do kalendáře",
     "Download attachment" : "Stáhnout přílohu",
-    "Save to Files" : "Uložit do Souborů"
+    "Save to Files" : "Uložit do Souborů",
+    "Choose a folder to store the attachment in" : "Vyberte složku pro uložení přílohy",
+    "Save all to Files" : "Uložit vše do Souborů",
+    "The images have been blocked to protect your privacy." : "Obrázky byly zablokovány pro ochranu vašeho soukromí.",
+    "New message" : "Nová zpráva",
+    "Settings" : "Nastavení",
+    "Speed up your Mail experience with these quick shortcuts." : "Zrychlete své používání aplikace Email pomocí těchto pohotových zkratek.",
+    "Compose new message" : "Napsat novou zprávu",
+    "Newer message" : "Novější zpráva",
+    "Older message" : "Starší zpráva",
+    "Toggle star" : "Přepnout hvězdu",
+    "Toggle unread" : "Přepnout nepřečtené",
+    "Search" : "Hledat",
+    "Refresh" : "Načíst znovu",
+    "Connect your mail account" : "Připojit emailový účet",
+    "Show all folders" : "Zobrazit všechny složky",
+    "Collapse folders" : "Sbalit složky",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n nová zpráva\nod {from}","%n nové zprávy\nod {from}","%n nových zpráv\nod {from}","%n nových zpráv\nod {from}"],
+    "Nextcloud Mail" : "Nextcloud Mail",
+    "All inboxes" : "Všechny schránky",
+    "Could not load {tag}{name}{endtag}" : "Nedaří se načíst {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Došlo k problému s načtením {tag}{name}{endtag}",
+    "Could not load the desired message" : "Nelze načíst vyžádanou zprávu",
+    "Could not load the message" : "Nelze načíst zprívu",
+    "Error loading message" : "Chyba načtení zprávy",
+    "Forwarding to %s" : "Přeposílá na %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Pokud nebudete v následujících několika sekundách přesměrováni, klikněte sem.",
+    "Redirect" : "Přesměrovat",
+    "The link leads to %s" : "Odkaz vede na %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Pokud nechcete tuto stránku navštívit, můžete se vrátit do <a href=\"%s\">e-mailu</a>.",
+    "Continue to %s" : "Pokračovat na %s"
 },
 "nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;");
diff --git a/l10n/cs.json b/l10n/cs.json
index a0d83d0b8..a35ec75a6 100644
--- a/l10n/cs.json
+++ b/l10n/cs.json
@@ -1,55 +1,5 @@
 { "translations": {
-    "Mail" : "E-mail",
-    "Loading accounts" : "Načítání účtů",
-    "Error while loading the accounts." : "Chyba při načítání účtů.",
-    "Can not load this folder." : "Tuto složku se nedaří načíst.",
-    "Searching for {query}" : "Hledání pro {query}",
-    "Error while deleting message." : "Chyba při mazání zprávy.",
-    "Forwarded message" : "Přeposlaná zpráva",
-    "Choose a folder to store the attachment in" : "Vyberte složku pro uložení přílohy",
-    "Attachments saved to Files." : "Přílohy uloženy do Souborů.",
-    "Attachment saved to Files." : "Příloha uložena do Souborů.",
-    "Error while saving attachments to Files." : "Chyba při ukládání příloh do Souborů.",
-    "Error while saving attachment to Files." : "Chyba při ukládání přílohy do Souborů.",
-    "Message flag could not be set." : "Značka zpráva nemohla být nastavena.",
-    "Could not move message." : "Nelze přesunout zprávu.",
-    "Invalid account" : "Neplatný účet",
-    "Invalid folder" : "Neplatná složka",
-    "Error while creating the account: " : "Chyba při vytváření účtu:",
-    "Unknown error" : "Neznámá chyba",
-    "Error while updating the account: " : "Chyba při aktualizaci účtu",
-    "All inboxes" : "Všechny schránky",
-    "you" : "vy",
-    "Send message to {email}" : "Poslat e-mail na {email}",
-    "Could not load {tag}{name}{endtag}" : "Nedaří se načíst {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Došlo k problému s načtením {tag}{name}{endtag}",
-    "Could not load your message" : "Nezdařilo se načtení vaší zprávy",
-    "Could not load the desired message" : "Nelze načíst vyžádanou zprávu",
-    "Could not load the message" : "Nelze načíst zprívu",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n nová zpráva\nod {from}","%n nové zprávy\nod {from}","%n nových zpráv\nod {from}","%n nových zpráv\nod {from}"],
-    "Nextcloud Mail" : "Nextcloud Mail",
-    "Save" : "Uložit",
-    "Saved" : "Uloženo",
-    "Show all folders" : "Zobrazit všechny složky",
-    "Collapse folders" : "Sbalit složky",
-    "Error while deleting account." : "Chyba při mazání účtu.",
-    "Choose a file to add as attachment" : "Vyberte soubor k přiložení",
-    "An error occurred while uploading {fname}" : "Došlo k chybě při nahrávání souboru {fname}",
-    "Reply" : "Odpověď",
-    "Send" : "Odeslat",
-    "Sending …" : "Odesílání…",
-    "Message sent!" : "Zpráva odeslána!",
-    "Server error" : "Chyba serveru",
-    "An unknown error occurred" : "Nastala neznámá chyba",
-    "Opening HTML drafts is not supported yet." : "Otevírání HTML konceptů ještě není podporováno.",
-    "No writable calendars found" : "Nebyly nalezeny žádné zapisovatelné kalendáře",
-    "Error while importing the calendar event" : "Chyba při importu události kalendáře",
-    "Error while downloading calendar event" : "Chyba při stahování události kalendáře",
-    "& others" : "a další",
-    "Error while loading messages." : "Chyba během načítání zpráv.",
-    "Error while refreshing messages." : "Chyba během načítání zpráv.",
-    "Setting up your account" : "Nastavení účtu",
+    "Mail" : "Email",
     "Inbox" : "Doručená",
     "Sent" : "Odeslaná",
     "Drafts" : "Koncepty",
@@ -63,70 +13,71 @@
     "Creating account failed: " : "Vytvoření účtu se nezdařilo:",
     "Delete permanently" : "Trvale odstranit",
     "IMAP web client" : "Webový IMAP klient",
-    "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Snadno použitelný e-mailový klient který se připojí k vámi používanému serveru prostřednictvím protokolů IMAP a SMTP.",
-    "Error loading message" : "Chyba načtení zprávy",
-    "Settings" : "Nastavení",
-    "Forwarding to %s" : "Přeposílá na %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Pokud nebudete v následujících několika sekundách přesměrováni, klikněte sem.",
-    "Redirect" : "Přesměrovat",
-    "The link leads to %s" : "Odkaz vede na %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Pokud nechcete tuto stránku navštívit, můžete se vrátit do <a href=\"%s\">e-mailu</a>.",
-    "Continue to %s" : "Pokračovat na %s",
-    "Delete account" : "Smazat účet",
-    "Try again" : "Zkusit znovu",
-    "New message" : "Nová zpráva",
-    "Account Settings" : "Nastavení účtu",
-    "Aliases" : "Alternativní názvy",
-    "Mail address" : "E-mailová adresa",
-    "Display Name" : "Zobrazované jméno",
-    "Account" : "Účet",
-    "Toggle read" : "Přepnout čtení",
-    "Delete" : "Smazat",
-    "Keyboard shortcuts" : "Klávesové zkratky",
-    "Speed up your Mail experience with these quick shortcuts." : "Zrychlete své používání aplikace E-mail pomocí těchto pohotových zkratek.",
-    "Compose new message" : "Napsat novou zprávu",
-    "Newer message" : "Novější zpráva",
-    "Older message" : "Starší zpráva",
-    "Toggle star" : "Přepnout hvězdu",
-    "Toggle unread" : "Přepnout nepřečtené",
-    "Search" : "Hledat",
-    "Refresh" : "Načíst znovu",
-    "Connect your mail account" : "Připojit e-mailový účet",
+    "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Snadno použitelný emailový klient který se připojí k vámi používanému serveru prostřednictvím protokolů IMAP a SMTP.",
     "Name" : "Název",
-    "Mail Address" : "E-mailová adresa",
+    "Mail Address" : "Emailová adresa",
     "Password" : "Heslo",
-    "Manual configuration" : "Ruční nastavení",
     "IMAP Host" : "IMAP hostitel",
-    "IMAP security" : "IMAP zabezpečení",
     "None" : "Žádné",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP port",
     "IMAP User" : "IMAP uživatel",
     "IMAP Password" : "IMAP heslo",
     "SMTP Host" : "SMTP hostitel",
-    "SMTP security" : "SMTP zabezpečení",
     "SMTP Port" : "SMTP port",
     "SMTP User" : "SMTP uživatel",
     "SMTP Password" : "SMTP heslo",
     "Connect" : "Připojit",
+    "Add mail account" : "Přidat emailový účet",
+    "Use Gravatar and favicon avatars" : "Použijte Gravatar a favicon avatary",
+    "Keyboard shortcuts" : "Klávesové zkratky",
     "from" : "od",
     "to" : "komu",
     "cc" : "kopie",
     "bcc" : "skrytá kopie",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Poznámka: E-mail pochází z noreply (neodpovídat) adresy pravděpodobně nebude možnost přečíst odpověď.",
     "Subject" : "Předmět",
-    "Save all to Files" : "Uložit vše do Souborů",
-    "Add mail account" : "Přidat e-mailový účet",
-    "Use Gravatar and favicon avatars" : "Použijte Gravatar a favicon avatary",
-    "No search results for" : "Nic nenalezeno pro",
-    "The images have been blocked to protect your privacy." : "Obrázky byly zablokovány pro ochranu vašeho soukromí.",
-    "Show images from this sender" : "Zobrazit obrázky od tohoto odesílatele",
-    "Forward" : "Přeposlat",
-    "No messages in this folder" : "V této složce nejsou žádné zprávy",
+    "Sending …" : "Odesílání…",
+    "Message sent!" : "Zpráva odeslána!",
+    "Send" : "Odeslat",
     "Upload attachment" : "Nahrát přílohu",
     "Add attachment from Files" : "Přidat přílohu ze Souborů",
+    "Choose a file to add as attachment" : "Vyberte soubor k přiložení",
+    "No messages in this folder" : "V této složce nejsou žádné zprávy",
+    "Delete" : "Smazat",
+    "Could not load your message" : "Nezdařilo se načtení vaší zprávy",
     "Import into calendar" : "Importovat do kalendáře",
     "Download attachment" : "Stáhnout přílohu",
-    "Save to Files" : "Uložit do Souborů"
+    "Save to Files" : "Uložit do Souborů",
+    "Choose a folder to store the attachment in" : "Vyberte složku pro uložení přílohy",
+    "Save all to Files" : "Uložit vše do Souborů",
+    "The images have been blocked to protect your privacy." : "Obrázky byly zablokovány pro ochranu vašeho soukromí.",
+    "New message" : "Nová zpráva",
+    "Settings" : "Nastavení",
+    "Speed up your Mail experience with these quick shortcuts." : "Zrychlete své používání aplikace Email pomocí těchto pohotových zkratek.",
+    "Compose new message" : "Napsat novou zprávu",
+    "Newer message" : "Novější zpráva",
+    "Older message" : "Starší zpráva",
+    "Toggle star" : "Přepnout hvězdu",
+    "Toggle unread" : "Přepnout nepřečtené",
+    "Search" : "Hledat",
+    "Refresh" : "Načíst znovu",
+    "Connect your mail account" : "Připojit emailový účet",
+    "Show all folders" : "Zobrazit všechny složky",
+    "Collapse folders" : "Sbalit složky",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n nová zpráva\nod {from}","%n nové zprávy\nod {from}","%n nových zpráv\nod {from}","%n nových zpráv\nod {from}"],
+    "Nextcloud Mail" : "Nextcloud Mail",
+    "All inboxes" : "Všechny schránky",
+    "Could not load {tag}{name}{endtag}" : "Nedaří se načíst {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Došlo k problému s načtením {tag}{name}{endtag}",
+    "Could not load the desired message" : "Nelze načíst vyžádanou zprávu",
+    "Could not load the message" : "Nelze načíst zprívu",
+    "Error loading message" : "Chyba načtení zprávy",
+    "Forwarding to %s" : "Přeposílá na %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Pokud nebudete v následujících několika sekundách přesměrováni, klikněte sem.",
+    "Redirect" : "Přesměrovat",
+    "The link leads to %s" : "Odkaz vede na %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Pokud nechcete tuto stránku navštívit, můžete se vrátit do <a href=\"%s\">e-mailu</a>.",
+    "Continue to %s" : "Pokračovat na %s"
 },"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;"
 }
\ No newline at end of file
diff --git a/l10n/da.js b/l10n/da.js
index 8ed1ce321..65b287bd4 100644
--- a/l10n/da.js
+++ b/l10n/da.js
@@ -2,51 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Mail",
-    "Loading accounts" : "Indlæser kontoerne...",
-    "Error while loading the accounts." : "Fejl under indlæsning af konti.",
-    "Can not load this folder." : "Kan ikke indlæse denne mappe.",
-    "Searching for {query}" : "Leder efter {query}",
-    "Error while deleting message." : "Fejl under sletning af besked.",
-    "Forwarded message" : "Videresendt besked",
-    "Choose a folder to store the attachment in" : "Vælg den mappe, hvor vedhæftningen skal gemmes i",
-    "Attachments saved to Files." : "Vedhæftning blev gemt i Filer.",
-    "Attachment saved to Files." : "Vedhæftning blev gemt i Filer.",
-    "Error while saving attachments to Files." : "Fejl under lagring af vedhæftninger i Filer.",
-    "Error while saving attachment to Files." : "Fejl under lagring af vedhæftninger i Filer.",
-    "Message flag could not be set." : "Beskedflaget kunne ikke sættes.",
-    "Could not move message." : "Kunne ikke flytte beskeden.",
-    "Invalid account" : "Ugyldig konto",
-    "Invalid folder" : "Ugyldig mappe",
-    "Error while creating the account: " : "Fejl under oprettelse af kontoen:",
-    "Unknown error" : "Ukendt fejl",
-    "All inboxes" : "Alle indbakker",
-    "you" : "dig",
-    "Send message to {email}" : "Send besked til {email}",
-    "Could not load {tag}{name}{endtag}" : "Kunne ikke hente {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Der var et problem med at hente {tag}{name}{endtag}",
-    "{from}\n{subject}" : "{fra}\n{emne}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n ny besked \nfra {from}","%n nye beskeder \nfra {from}"],
-    "Nextcloud Mail" : "Nextcloud Mail",
-    "Save" : "Gem",
-    "Show all folders" : "Vis all mappe",
-    "Collapse folders" : "Fold mapper sammen",
-    "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",
-    "An error occurred while uploading {fname}" : "Der opstod en fejl under uploading af {fname}",
-    "Reply" : "Besvar",
-    "Send" : "Send",
-    "Sending …" : "Sender ...",
-    "Message sent!" : "Beskeden blev sendt!",
-    "Server error" : "Serverfejl",
-    "An unknown error occurred" : "En ukendt fejl er opstået",
-    "Opening HTML drafts is not supported yet." : "Åbning af HTML-kladder understøttes endnu ikke.",
-    "No writable calendars found" : "Ingen skrivbare kalendre fundet",
-    "Error while importing the calendar event" : "Fejl ved import af kalender begivenhed",
-    "Error while downloading calendar event" : "Fejl ved hentning af kalender begivenhed",
-    "& others" : "& andre",
-    "Error while loading messages." : "Fejl under indlæsning af beskeder.",
-    "Error while refreshing messages." : "Der opstod en fejl under opdatering af besked.",
-    "Setting up your account" : "Opsætter din konto",
     "Inbox" : "Indbakke",
     "Sent" : "Sent",
     "Drafts" : "Udkast",
@@ -58,64 +13,65 @@ OC.L10N.register(
     "Auto detect failed. Please use manual mode." : "Fejl ved autodetektion. Anvend venligst manuel opsætning",
     "Creating account failed: " : "Oprettelse af konto mislykkedes:",
     "Delete permanently" : "Slet permanent",
-    "Error loading message" : "Fejl under indlæsning af besked",
-    "Settings" : "Indstillinger",
-    "Forwarding to %s" : "Videre send til %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Klik her hvis du ikke automatisk bliver videre sendt i løbet af et par sekunder.",
-    "Redirect" : "Omdiriger",
-    "The link leads to %s" : "Linket fører til %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Hvis du ikke ønsker at besøge denne side, kan du vende tilbage til <a href=\"%s\">Mail</a>.",
-    "Continue to %s" : "Videre til %s",
-    "Delete account" : "Slet konto",
-    "Try again" : "Prøv igen",
-    "New message" : "Ny besked",
-    "Account Settings" : "Konto indstillinger",
-    "Aliases" : "Aliases",
-    "Mail address" : "Mail addresse",
-    "Display Name" : "Vist navn",
-    "Delete" : "Slet",
-    "Keyboard shortcuts" : "Tastaturgenveje",
-    "Speed up your Mail experience with these quick shortcuts." : "Gør brugen af Mail hurtige med disse genveje.",
-    "Compose new message" : "Skriv en ny meddelelse",
-    "Newer message" : "Nyere besked",
-    "Older message" : "Ældre besked",
-    "Toggle star" : "Toggle stjerne",
-    "Toggle unread" : "Toggle læst",
-    "Search" : "Søg",
-    "Refresh" : "Opdatér",
-    "Connect your mail account" : "Forbind din mail konto",
     "Name" : "Navn",
     "Mail Address" : "Email addresse",
     "Password" : "Kodeord",
-    "Manual configuration" : "Manual opsætning",
     "IMAP Host" : "IMAP host",
-    "IMAP security" : "IMAP sikkerhed",
     "None" : "Ingen",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP port",
     "IMAP User" : "IMAP bruger",
     "IMAP Password" : "IMAP kodeord",
     "SMTP Host" : "SMTP host",
-    "SMTP security" : "SMTP sikkerhed",
     "SMTP Port" : "SMTP port",
     "SMTP User" : "SMTP bruger",
     "SMTP Password" : "SMTP kodeord",
     "Connect" : "Tilslut",
+    "Add mail account" : "Tilføj mail konto",
+    "Keyboard shortcuts" : "Tastaturgenveje",
     "from" : "fra",
     "to" : "til",
     "cc" : "cc",
     "bcc" : "bcc",
     "Subject" : "Emne",
-    "Save all to Files" : "Gem alle filer",
-    "Add mail account" : "Tilføj mail konto",
-    "No search results for" : "Ingen søge resultater for",
-    "The images have been blocked to protect your privacy." : "Dette billede er blevet blokeret for at beskytte din privat liv",
-    "Show images from this sender" : "Vis billeder fra denne afsender",
-    "Forward" : "Videre send",
+    "Sending …" : "Sender ...",
+    "Message sent!" : "Beskeden blev sendt!",
+    "Send" : "Send",
     "Upload attachment" : "Upload vedhæftning",
     "Add attachment from Files" : "Vedhæft fra filer",
+    "Choose a file to add as attachment" : "Vælg en fil, der skal tilføjes som vedhæftning",
+    "Delete" : "Slet",
     "Import into calendar" : "Importere til kalender",
     "Download attachment" : "Hent vedhæftning",
-    "Save to Files" : "Gem til filer"
+    "Save to Files" : "Gem til filer",
+    "Choose a folder to store the attachment in" : "Vælg den mappe, hvor vedhæftningen skal gemmes i",
+    "Save all to Files" : "Gem alle filer",
+    "The images have been blocked to protect your privacy." : "Dette billede er blevet blokeret for at beskytte din privat liv",
+    "New message" : "Ny besked",
+    "Settings" : "Indstillinger",
+    "Speed up your Mail experience with these quick shortcuts." : "Gør brugen af Mail hurtige med disse genveje.",
+    "Compose new message" : "Skriv en ny meddelelse",
+    "Newer message" : "Nyere besked",
+    "Older message" : "Ældre besked",
+    "Toggle star" : "Toggle stjerne",
+    "Toggle unread" : "Toggle læst",
+    "Search" : "Søg",
+    "Refresh" : "Opdatér",
+    "Connect your mail account" : "Forbind din mail konto",
+    "Show all folders" : "Vis all mappe",
+    "Collapse folders" : "Fold mapper sammen",
+    "{from}\n{subject}" : "{fra}\n{emne}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n ny besked \nfra {from}","%n nye beskeder \nfra {from}"],
+    "Nextcloud Mail" : "Nextcloud Mail",
+    "All inboxes" : "Alle indbakker",
+    "Could not load {tag}{name}{endtag}" : "Kunne ikke hente {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Der var et problem med at hente {tag}{name}{endtag}",
+    "Error loading message" : "Fejl under indlæsning af besked",
+    "Forwarding to %s" : "Videre send til %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Klik her hvis du ikke automatisk bliver videre sendt i løbet af et par sekunder.",
+    "Redirect" : "Omdiriger",
+    "The link leads to %s" : "Linket fører til %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Hvis du ikke ønsker at besøge denne side, kan du vende tilbage til <a href=\"%s\">Mail</a>.",
+    "Continue to %s" : "Videre til %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/da.json b/l10n/da.json
index f3046df11..814c8df7d 100644
--- a/l10n/da.json
+++ b/l10n/da.json
@@ -1,50 +1,5 @@
 { "translations": {
     "Mail" : "Mail",
-    "Loading accounts" : "Indlæser kontoerne...",
-    "Error while loading the accounts." : "Fejl under indlæsning af konti.",
-    "Can not load this folder." : "Kan ikke indlæse denne mappe.",
-    "Searching for {query}" : "Leder efter {query}",
-    "Error while deleting message." : "Fejl under sletning af besked.",
-    "Forwarded message" : "Videresendt besked",
-    "Choose a folder to store the attachment in" : "Vælg den mappe, hvor vedhæftningen skal gemmes i",
-    "Attachments saved to Files." : "Vedhæftning blev gemt i Filer.",
-    "Attachment saved to Files." : "Vedhæftning blev gemt i Filer.",
-    "Error while saving attachments to Files." : "Fejl under lagring af vedhæftninger i Filer.",
-    "Error while saving attachment to Files." : "Fejl under lagring af vedhæftninger i Filer.",
-    "Message flag could not be set." : "Beskedflaget kunne ikke sættes.",
-    "Could not move message." : "Kunne ikke flytte beskeden.",
-    "Invalid account" : "Ugyldig konto",
-    "Invalid folder" : "Ugyldig mappe",
-    "Error while creating the account: " : "Fejl under oprettelse af kontoen:",
-    "Unknown error" : "Ukendt fejl",
-    "All inboxes" : "Alle indbakker",
-    "you" : "dig",
-    "Send message to {email}" : "Send besked til {email}",
-    "Could not load {tag}{name}{endtag}" : "Kunne ikke hente {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Der var et problem med at hente {tag}{name}{endtag}",
-    "{from}\n{subject}" : "{fra}\n{emne}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n ny besked \nfra {from}","%n nye beskeder \nfra {from}"],
-    "Nextcloud Mail" : "Nextcloud Mail",
-    "Save" : "Gem",
-    "Show all folders" : "Vis all mappe",
-    "Collapse folders" : "Fold mapper sammen",
-    "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",
-    "An error occurred while uploading {fname}" : "Der opstod en fejl under uploading af {fname}",
-    "Reply" : "Besvar",
-    "Send" : "Send",
-    "Sending …" : "Sender ...",
-    "Message sent!" : "Beskeden blev sendt!",
-    "Server error" : "Serverfejl",
-    "An unknown error occurred" : "En ukendt fejl er opstået",
-    "Opening HTML drafts is not supported yet." : "Åbning af HTML-kladder understøttes endnu ikke.",
-    "No writable calendars found" : "Ingen skrivbare kalendre fundet",
-    "Error while importing the calendar event" : "Fejl ved import af kalender begivenhed",
-    "Error while downloading calendar event" : "Fejl ved hentning af kalender begivenhed",
-    "& others" : "& andre",
-    "Error while loading messages." : "Fejl under indlæsning af beskeder.",
-    "Error while refreshing messages." : "Der opstod en fejl under opdatering af besked.",
-    "Setting up your account" : "Opsætter din konto",
     "Inbox" : "Indbakke",
     "Sent" : "Sent",
     "Drafts" : "Udkast",
@@ -56,64 +11,65 @@
     "Auto detect failed. Please use manual mode." : "Fejl ved autodetektion. Anvend venligst manuel opsætning",
     "Creating account failed: " : "Oprettelse af konto mislykkedes:",
     "Delete permanently" : "Slet permanent",
-    "Error loading message" : "Fejl under indlæsning af besked",
-    "Settings" : "Indstillinger",
-    "Forwarding to %s" : "Videre send til %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Klik her hvis du ikke automatisk bliver videre sendt i løbet af et par sekunder.",
-    "Redirect" : "Omdiriger",
-    "The link leads to %s" : "Linket fører til %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Hvis du ikke ønsker at besøge denne side, kan du vende tilbage til <a href=\"%s\">Mail</a>.",
-    "Continue to %s" : "Videre til %s",
-    "Delete account" : "Slet konto",
-    "Try again" : "Prøv igen",
-    "New message" : "Ny besked",
-    "Account Settings" : "Konto indstillinger",
-    "Aliases" : "Aliases",
-    "Mail address" : "Mail addresse",
-    "Display Name" : "Vist navn",
-    "Delete" : "Slet",
-    "Keyboard shortcuts" : "Tastaturgenveje",
-    "Speed up your Mail experience with these quick shortcuts." : "Gør brugen af Mail hurtige med disse genveje.",
-    "Compose new message" : "Skriv en ny meddelelse",
-    "Newer message" : "Nyere besked",
-    "Older message" : "Ældre besked",
-    "Toggle star" : "Toggle stjerne",
-    "Toggle unread" : "Toggle læst",
-    "Search" : "Søg",
-    "Refresh" : "Opdatér",
-    "Connect your mail account" : "Forbind din mail konto",
     "Name" : "Navn",
     "Mail Address" : "Email addresse",
     "Password" : "Kodeord",
-    "Manual configuration" : "Manual opsætning",
     "IMAP Host" : "IMAP host",
-    "IMAP security" : "IMAP sikkerhed",
     "None" : "Ingen",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP port",
     "IMAP User" : "IMAP bruger",
     "IMAP Password" : "IMAP kodeord",
     "SMTP Host" : "SMTP host",
-    "SMTP security" : "SMTP sikkerhed",
     "SMTP Port" : "SMTP port",
     "SMTP User" : "SMTP bruger",
     "SMTP Password" : "SMTP kodeord",
     "Connect" : "Tilslut",
+    "Add mail account" : "Tilføj mail konto",
+    "Keyboard shortcuts" : "Tastaturgenveje",
     "from" : "fra",
     "to" : "til",
     "cc" : "cc",
     "bcc" : "bcc",
     "Subject" : "Emne",
-    "Save all to Files" : "Gem alle filer",
-    "Add mail account" : "Tilføj mail konto",
-    "No search results for" : "Ingen søge resultater for",
-    "The images have been blocked to protect your privacy." : "Dette billede er blevet blokeret for at beskytte din privat liv",
-    "Show images from this sender" : "Vis billeder fra denne afsender",
-    "Forward" : "Videre send",
+    "Sending …" : "Sender ...",
+    "Message sent!" : "Beskeden blev sendt!",
+    "Send" : "Send",
     "Upload attachment" : "Upload vedhæftning",
     "Add attachment from Files" : "Vedhæft fra filer",
+    "Choose a file to add as attachment" : "Vælg en fil, der skal tilføjes som vedhæftning",
+    "Delete" : "Slet",
     "Import into calendar" : "Importere til kalender",
     "Download attachment" : "Hent vedhæftning",
-    "Save to Files" : "Gem til filer"
+    "Save to Files" : "Gem til filer",
+    "Choose a folder to store the attachment in" : "Vælg den mappe, hvor vedhæftningen skal gemmes i",
+    "Save all to Files" : "Gem alle filer",
+    "The images have been blocked to protect your privacy." : "Dette billede er blevet blokeret for at beskytte din privat liv",
+    "New message" : "Ny besked",
+    "Settings" : "Indstillinger",
+    "Speed up your Mail experience with these quick shortcuts." : "Gør brugen af Mail hurtige med disse genveje.",
+    "Compose new message" : "Skriv en ny meddelelse",
+    "Newer message" : "Nyere besked",
+    "Older message" : "Ældre besked",
+    "Toggle star" : "Toggle stjerne",
+    "Toggle unread" : "Toggle læst",
+    "Search" : "Søg",
+    "Refresh" : "Opdatér",
+    "Connect your mail account" : "Forbind din mail konto",
+    "Show all folders" : "Vis all mappe",
+    "Collapse folders" : "Fold mapper sammen",
+    "{from}\n{subject}" : "{fra}\n{emne}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n ny besked \nfra {from}","%n nye beskeder \nfra {from}"],
+    "Nextcloud Mail" : "Nextcloud Mail",
+    "All inboxes" : "Alle indbakker",
+    "Could not load {tag}{name}{endtag}" : "Kunne ikke hente {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Der var et problem med at hente {tag}{name}{endtag}",
+    "Error loading message" : "Fejl under indlæsning af besked",
+    "Forwarding to %s" : "Videre send til %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Klik her hvis du ikke automatisk bliver videre sendt i løbet af et par sekunder.",
+    "Redirect" : "Omdiriger",
+    "The link leads to %s" : "Linket fører til %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Hvis du ikke ønsker at besøge denne side, kan du vende tilbage til <a href=\"%s\">Mail</a>.",
+    "Continue to %s" : "Videre til %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/de.js b/l10n/de.js
index b2ac6baf5..22f3ae88e 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -2,56 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "E-Mail",
-    "Loading accounts" : "Lade Konten",
-    "Error while loading the accounts." : "Fehler beim Laden der Konten.",
-    "Can not load this folder." : "Dieser Ordner kann nicht geladen werden.",
-    "Searching for {query}" : "Suche nach {query}",
-    "Error while deleting message." : "Fehler beim Löschen der Nachricht.",
-    "Forwarded message" : "Weitergeleitete Nachricht",
-    "Choose a folder to store the attachment in" : "Ordner zum Speichern des Anhangs auswählen",
-    "Attachments saved to Files." : "Anhänge wurde in Dateien gespeichert.",
-    "Attachment saved to Files." : "Anhang wurde in Dateien gespeichert.",
-    "Error while saving attachments to Files." : "Fehler beim Speichern der Anhänge unter Dateien.",
-    "Error while saving attachment to Files." : "Fehler beim Speichern des Anhangs unter Dateien.",
-    "Message flag could not be set." : "Nachrichten-Kennzeichnung konnte nicht gesetzt werden.",
-    "Could not move message." : "Nachricht konnte nicht verschoben werden.",
-    "Invalid account" : "Ungültiges Benutzerkonto",
-    "Invalid folder" : "Ungültiger Ordner",
-    "Error while creating the account: " : "Fehler beim Erstellen eines Kontos:",
-    "Unknown error" : "Unbekannter Fehler",
-    "Error while updating the account: " : "Fehler beim Aktualisieren des Kontos:",
-    "All inboxes" : "Alle Posteingänge",
-    "you" : "Du",
-    "Send message to {email}" : "Nachricht an {email} senden",
-    "Could not load {tag}{name}{endtag}" : "Konnte {tag}{name}{endtag} nicht laden",
-    "There was a problem loading {tag}{name}{endtag}" : "Beim Laden von {tag}{name}{endtag} ist ein Problem aufgetreten",
-    "Could not load your message" : "Deine Nachricht konnte nicht geladen werden",
-    "Could not load the desired message" : "Gewünschte Nachricht konnte nicht geladen werden",
-    "Could not load the message" : "Nachricht konnte nicht geladen werden",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n neue Nachricht\nvon {from}","%n neue Nachrichten\nvon {from}"],
-    "Nextcloud Mail" : "Nextcloud Mail",
-    "Save" : "Speichern",
-    "Saved" : "Gespeichert",
-    "Show all folders" : "Alle Ordner anzeigen",
-    "Collapse folders" : "Ordner einklappen",
-    "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",
-    "An error occurred while uploading {fname}" : "Fehler aufgetreten beim Hochladen von  {fname}",
-    "Reply" : "Antworten",
-    "Send" : "Senden",
-    "Sending …" : "Sende…",
-    "Message sent!" : "Nachricht versandt!",
-    "Server error" : "Serverfehler",
-    "An unknown error occurred" : "Unbekannter Fehler aufgetreten",
-    "Opening HTML drafts is not supported yet." : "Das Öffnen von HTML-Entwürfen wird noch nicht unterstützt.",
-    "No writable calendars found" : "Keine beschreibbaren Kalender gefunden",
-    "Error while importing the calendar event" : "Fehler beim Importieren des Kalenderereignis",
-    "Error while downloading calendar event" : "Fehler beim Herunterladen des Kalenderereignis",
-    "& others" : "& weitere",
-    "Error while loading messages." : "Fehler beim Laden der Nachrichten.",
-    "Error while refreshing messages." : "Fehler beim Aktualisieren der Nachrichten.",
-    "Setting up your account" : "Dein Konto wird eingerichtet",
     "Inbox" : "Posteingang",
     "Sent" : "Gesendet",
     "Drafts" : "Entwürfe",
@@ -65,70 +15,71 @@ OC.L10N.register(
     "Creating account failed: " : "Kontoerstellung fehlgeschlagen:",
     "Delete permanently" : "Endgültig löschen",
     "IMAP web client" : "IMAP-Web-Client",
-    "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Ein einfach zu nutzender E-Mail-Client der sich via IMAP und SMTP mit Ihrem Mail-Server verbindet.",
-    "Error loading message" : "Fehler beim Laden der Nachricht",
-    "Settings" : "Einstellungen",
-    "Forwarding to %s" : "Weiterleiten an %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Klicke hier, wenn Du nicht automatisch innerhalb der nächsten Sekunden weitergeleitet wirst.",
-    "Redirect" : "Weiterleiten",
-    "The link leads to %s" : "Der Link führt nach %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Wenn Du diese Seite nicht besuchen möchtest, kannst Du zu <a href=\"%s\">Mail</a> zurückkehren.",
-    "Continue to %s" : "Weiter nach %s",
-    "Delete account" : "Konto löschen",
-    "Try again" : "Nochmals versuchen",
-    "New message" : "Neue Nachricht",
-    "Account Settings" : "Konto-Einstellungen",
-    "Aliases" : "Aliasse",
-    "Mail address" : "E-Mail-Adresse",
-    "Display Name" : "Anzeigename",
-    "Account" : "Konto",
-    "Toggle read" : "Gelesen umschalten",
-    "Delete" : "Löschen",
-    "Keyboard shortcuts" : "Tastenkürzel",
-    "Speed up your Mail experience with these quick shortcuts." : "Verbessere Deine Arbeit mit Mail durch diese Schnellbefehle.",
-    "Compose new message" : "Neue Nachricht erstellen",
-    "Newer message" : "Neuere Nachricht",
-    "Older message" : "Ältere Nachricht",
-    "Toggle star" : "Stern umschalten",
-    "Toggle unread" : "Ungelesen umschalten",
-    "Search" : "Suchen",
-    "Refresh" : "Aktualisieren",
-    "Connect your mail account" : "Verbinde Deine E-Mail-Konto",
+    "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Ein einfach zu nutzender E-Mail-Client der sich via IMAP und SMTP mit Deinem E-Mail-Server verbindet.",
     "Name" : "Name",
     "Mail Address" : "E-Mail-Adresse",
     "Password" : "Passwort",
-    "Manual configuration" : "Manuelle Einrichtung",
     "IMAP Host" : "IMAP-Host",
-    "IMAP security" : "IMAP-Sicherheit",
     "None" : "Keine",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP-Port",
     "IMAP User" : "IMAP-Benutzer",
     "IMAP Password" : "IMAP-Passwort",
     "SMTP Host" : "SMTP-Host",
-    "SMTP security" : "SMTP-Sicherheit",
     "SMTP Port" : "SMTP-Port",
     "SMTP User" : "SMTP-Benutzer",
     "SMTP Password" : "SMTP-Passwort",
     "Connect" : "Verbinden",
+    "Add mail account" : "E-Mail-Konto hinzufügen",
+    "Use Gravatar and favicon avatars" : "Gravatar- und Favicon-Avatare verwenden",
+    "Keyboard shortcuts" : "Tastenkürzel",
     "from" : "von",
     "to" : "an",
     "cc" : "cc",
     "bcc" : "bcc",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Diese E-Mail wurde von einer No-Reply-Adresse gesendet und Deine Antwort wird wahrscheinlich nicht gelesen",
     "Subject" : "Betreff",
-    "Save all to Files" : "Alles unter Dateien sichern",
-    "Add mail account" : "E-Mail-Konto hinzufügen",
-    "Use Gravatar and favicon avatars" : "Gravatar- und Favicon-Avatare verwenden",
-    "No search results for" : "Keine Suchergebnisse für",
-    "The images have been blocked to protect your privacy." : "Die Bilder wurden blockiert um Deine Privatsphäre zu schützen.",
-    "Show images from this sender" : "Bilder dieses Absenders anzeigen",
-    "Forward" : "Weiterleiten",
-    "No messages in this folder" : "Keine Nachrichten in diesem Ordner",
+    "Sending …" : "Sende…",
+    "Message sent!" : "Nachricht versandt!",
+    "Send" : "Senden",
     "Upload attachment" : "Anhang hochladen",
     "Add attachment from Files" : "Anhang von \"Dateien\" hinzufügen",
+    "Choose a file to add as attachment" : "Wähle eine Datei, die als Anhang angefügt werden soll",
+    "No messages in this folder" : "Keine Nachrichten in diesem Ordner",
+    "Delete" : "Löschen",
+    "Could not load your message" : "Deine Nachricht konnte nicht geladen werden",
     "Import into calendar" : "In Kalender importieren",
     "Download attachment" : "Anhang herunterladen",
-    "Save to Files" : "Unter Dateien speichern"
+    "Save to Files" : "Unter Dateien speichern",
+    "Choose a folder to store the attachment in" : "Ordner zum Speichern des Anhangs auswählen",
+    "Save all to Files" : "Alles unter Dateien sichern",
+    "The images have been blocked to protect your privacy." : "Die Bilder wurden blockiert um Deine Privatsphäre zu schützen.",
+    "New message" : "Neue Nachricht",
+    "Settings" : "Einstellungen",
+    "Speed up your Mail experience with these quick shortcuts." : "Verbessere Deine Arbeit mit Mail durch diese Schnellbefehle.",
+    "Compose new message" : "Neue Nachricht erstellen",
+    "Newer message" : "Neuere Nachricht",
+    "Older message" : "Ältere Nachricht",
+    "Toggle star" : "Stern umschalten",
+    "Toggle unread" : "Ungelesen umschalten",
+    "Search" : "Suchen",
+    "Refresh" : "Aktualisieren",
+    "Connect your mail account" : "Verbinde Deine E-Mail-Konto",
+    "Show all folders" : "Alle Ordner anzeigen",
+    "Collapse folders" : "Ordner einklappen",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n neue Nachricht\nvon {from}","%n neue Nachrichten\nvon {from}"],
+    "Nextcloud Mail" : "Nextcloud Mail",
+    "All inboxes" : "Alle Posteingänge",
+    "Could not load {tag}{name}{endtag}" : "Konnte {tag}{name}{endtag} nicht laden",
+    "There was a problem loading {tag}{name}{endtag}" : "Beim Laden von {tag}{name}{endtag} ist ein Problem aufgetreten",
+    "Could not load the desired message" : "Gewünschte Nachricht konnte nicht geladen werden",
+    "Could not load the message" : "Nachricht konnte nicht geladen werden",
+    "Error loading message" : "Fehler beim Laden der Nachricht",
+    "Forwarding to %s" : "Weiterleiten an %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Klicke hier, wenn Du nicht automatisch innerhalb der nächsten Sekunden weitergeleitet wirst.",
+    "Redirect" : "Weiterleiten",
+    "The link leads to %s" : "Der Link führt nach %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Wenn Du diese Seite nicht besuchen möchtest, kannst Du zu <a href=\"%s\">Mail</a> zurückkehren.",
+    "Continue to %s" : "Weiter nach %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/de.json b/l10n/de.json
index 8bc4aa9c7..ba2f4a41d 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -1,55 +1,5 @@
 { "translations": {
     "Mail" : "E-Mail",
-    "Loading accounts" : "Lade Konten",
-    "Error while loading the accounts." : "Fehler beim Laden der Konten.",
-    "Can not load this folder." : "Dieser Ordner kann nicht geladen werden.",
-    "Searching for {query}" : "Suche nach {query}",
-    "Error while deleting message." : "Fehler beim Löschen der Nachricht.",
-    "Forwarded message" : "Weitergeleitete Nachricht",
-    "Choose a folder to store the attachment in" : "Ordner zum Speichern des Anhangs auswählen",
-    "Attachments saved to Files." : "Anhänge wurde in Dateien gespeichert.",
-    "Attachment saved to Files." : "Anhang wurde in Dateien gespeichert.",
-    "Error while saving attachments to Files." : "Fehler beim Speichern der Anhänge unter Dateien.",
-    "Error while saving attachment to Files." : "Fehler beim Speichern des Anhangs unter Dateien.",
-    "Message flag could not be set." : "Nachrichten-Kennzeichnung konnte nicht gesetzt werden.",
-    "Could not move message." : "Nachricht konnte nicht verschoben werden.",
-    "Invalid account" : "Ungültiges Benutzerkonto",
-    "Invalid folder" : "Ungültiger Ordner",
-    "Error while creating the account: " : "Fehler beim Erstellen eines Kontos:",
-    "Unknown error" : "Unbekannter Fehler",
-    "Error while updating the account: " : "Fehler beim Aktualisieren des Kontos:",
-    "All inboxes" : "Alle Posteingänge",
-    "you" : "Du",
-    "Send message to {email}" : "Nachricht an {email} senden",
-    "Could not load {tag}{name}{endtag}" : "Konnte {tag}{name}{endtag} nicht laden",
-    "There was a problem loading {tag}{name}{endtag}" : "Beim Laden von {tag}{name}{endtag} ist ein Problem aufgetreten",
-    "Could not load your message" : "Deine Nachricht konnte nicht geladen werden",
-    "Could not load the desired message" : "Gewünschte Nachricht konnte nicht geladen werden",
-    "Could not load the message" : "Nachricht konnte nicht geladen werden",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n neue Nachricht\nvon {from}","%n neue Nachrichten\nvon {from}"],
-    "Nextcloud Mail" : "Nextcloud Mail",
-    "Save" : "Speichern",
-    "Saved" : "Gespeichert",
-    "Show all folders" : "Alle Ordner anzeigen",
-    "Collapse folders" : "Ordner einklappen",
-    "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",
-    "An error occurred while uploading {fname}" : "Fehler aufgetreten beim Hochladen von  {fname}",
-    "Reply" : "Antworten",
-    "Send" : "Senden",
-    "Sending …" : "Sende…",
-    "Message sent!" : "Nachricht versandt!",
-    "Server error" : "Serverfehler",
-    "An unknown error occurred" : "Unbekannter Fehler aufgetreten",
-    "Opening HTML drafts is not supported yet." : "Das Öffnen von HTML-Entwürfen wird noch nicht unterstützt.",
-    "No writable calendars found" : "Keine beschreibbaren Kalender gefunden",
-    "Error while importing the calendar event" : "Fehler beim Importieren des Kalenderereignis",
-    "Error while downloading calendar event" : "Fehler beim Herunterladen des Kalenderereignis",
-    "& others" : "& weitere",
-    "Error while loading messages." : "Fehler beim Laden der Nachrichten.",
-    "Error while refreshing messages." : "Fehler beim Aktualisieren der Nachrichten.",
-    "Setting up your account" : "Dein Konto wird eingerichtet",
     "Inbox" : "Posteingang",
     "Sent" : "Gesendet",
     "Drafts" : "Entwürfe",
@@ -63,70 +13,71 @@
     "Creating account failed: " : "Kontoerstellung fehlgeschlagen:",
     "Delete permanently" : "Endgültig löschen",
     "IMAP web client" : "IMAP-Web-Client",
-    "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Ein einfach zu nutzender E-Mail-Client der sich via IMAP und SMTP mit Ihrem Mail-Server verbindet.",
-    "Error loading message" : "Fehler beim Laden der Nachricht",
-    "Settings" : "Einstellungen",
-    "Forwarding to %s" : "Weiterleiten an %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Klicke hier, wenn Du nicht automatisch innerhalb der nächsten Sekunden weitergeleitet wirst.",
-    "Redirect" : "Weiterleiten",
-    "The link leads to %s" : "Der Link führt nach %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Wenn Du diese Seite nicht besuchen möchtest, kannst Du zu <a href=\"%s\">Mail</a> zurückkehren.",
-    "Continue to %s" : "Weiter nach %s",
-    "Delete account" : "Konto löschen",
-    "Try again" : "Nochmals versuchen",
-    "New message" : "Neue Nachricht",
-    "Account Settings" : "Konto-Einstellungen",
-    "Aliases" : "Aliasse",
-    "Mail address" : "E-Mail-Adresse",
-    "Display Name" : "Anzeigename",
-    "Account" : "Konto",
-    "Toggle read" : "Gelesen umschalten",
-    "Delete" : "Löschen",
-    "Keyboard shortcuts" : "Tastenkürzel",
-    "Speed up your Mail experience with these quick shortcuts." : "Verbessere Deine Arbeit mit Mail durch diese Schnellbefehle.",
-    "Compose new message" : "Neue Nachricht erstellen",
-    "Newer message" : "Neuere Nachricht",
-    "Older message" : "Ältere Nachricht",
-    "Toggle star" : "Stern umschalten",
-    "Toggle unread" : "Ungelesen umschalten",
-    "Search" : "Suchen",
-    "Refresh" : "Aktualisieren",
-    "Connect your mail account" : "Verbinde Deine E-Mail-Konto",
+    "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Ein einfach zu nutzender E-Mail-Client der sich via IMAP und SMTP mit Deinem E-Mail-Server verbindet.",
     "Name" : "Name",
     "Mail Address" : "E-Mail-Adresse",
     "Password" : "Passwort",
-    "Manual configuration" : "Manuelle Einrichtung",
     "IMAP Host" : "IMAP-Host",
-    "IMAP security" : "IMAP-Sicherheit",
     "None" : "Keine",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP-Port",
     "IMAP User" : "IMAP-Benutzer",
     "IMAP Password" : "IMAP-Passwort",
     "SMTP Host" : "SMTP-Host",
-    "SMTP security" : "SMTP-Sicherheit",
     "SMTP Port" : "SMTP-Port",
     "SMTP User" : "SMTP-Benutzer",
     "SMTP Password" : "SMTP-Passwort",
     "Connect" : "Verbinden",
+    "Add mail account" : "E-Mail-Konto hinzufügen",
+    "Use Gravatar and favicon avatars" : "Gravatar- und Favicon-Avatare verwenden",
+    "Keyboard shortcuts" : "Tastenkürzel",
     "from" : "von",
     "to" : "an",
     "cc" : "cc",
     "bcc" : "bcc",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Diese E-Mail wurde von einer No-Reply-Adresse gesendet und Deine Antwort wird wahrscheinlich nicht gelesen",
     "Subject" : "Betreff",
-    "Save all to Files" : "Alles unter Dateien sichern",
-    "Add mail account" : "E-Mail-Konto hinzufügen",
-    "Use Gravatar and favicon avatars" : "Gravatar- und Favicon-Avatare verwenden",
-    "No search results for" : "Keine Suchergebnisse für",
-    "The images have been blocked to protect your privacy." : "Die Bilder wurden blockiert um Deine Privatsphäre zu schützen.",
-    "Show images from this sender" : "Bilder dieses Absenders anzeigen",
-    "Forward" : "Weiterleiten",
-    "No messages in this folder" : "Keine Nachrichten in diesem Ordner",
+    "Sending …" : "Sende…",
+    "Message sent!" : "Nachricht versandt!",
+    "Send" : "Senden",
     "Upload attachment" : "Anhang hochladen",
     "Add attachment from Files" : "Anhang von \"Dateien\" hinzufügen",
+    "Choose a file to add as attachment" : "Wähle eine Datei, die als Anhang angefügt werden soll",
+    "No messages in this folder" : "Keine Nachrichten in diesem Ordner",
+    "Delete" : "Löschen",
+    "Could not load your message" : "Deine Nachricht konnte nicht geladen werden",
     "Import into calendar" : "In Kalender importieren",
     "Download attachment" : "Anhang herunterladen",
-    "Save to Files" : "Unter Dateien speichern"
+    "Save to Files" : "Unter Dateien speichern",
+    "Choose a folder to store the attachment in" : "Ordner zum Speichern des Anhangs auswählen",
+    "Save all to Files" : "Alles unter Dateien sichern",
+    "The images have been blocked to protect your privacy." : "Die Bilder wurden blockiert um Deine Privatsphäre zu schützen.",
+    "New message" : "Neue Nachricht",
+    "Settings" : "Einstellungen",
+    "Speed up your Mail experience with these quick shortcuts." : "Verbessere Deine Arbeit mit Mail durch diese Schnellbefehle.",
+    "Compose new message" : "Neue Nachricht erstellen",
+    "Newer message" : "Neuere Nachricht",
+    "Older message" : "Ältere Nachricht",
+    "Toggle star" : "Stern umschalten",
+    "Toggle unread" : "Ungelesen umschalten",
+    "Search" : "Suchen",
+    "Refresh" : "Aktualisieren",
+    "Connect your mail account" : "Verbinde Deine E-Mail-Konto",
+    "Show all folders" : "Alle Ordner anzeigen",
+    "Collapse folders" : "Ordner einklappen",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n neue Nachricht\nvon {from}","%n neue Nachrichten\nvon {from}"],
+    "Nextcloud Mail" : "Nextcloud Mail",
+    "All inboxes" : "Alle Posteingänge",
+    "Could not load {tag}{name}{endtag}" : "Konnte {tag}{name}{endtag} nicht laden",
+    "There was a problem loading {tag}{name}{endtag}" : "Beim Laden von {tag}{name}{endtag} ist ein Problem aufgetreten",
+    "Could not load the desired message" : "Gewünschte Nachricht konnte nicht geladen werden",
+    "Could not load the message" : "Nachricht konnte nicht geladen werden",
+    "Error loading message" : "Fehler beim Laden der Nachricht",
+    "Forwarding to %s" : "Weiterleiten an %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Klicke hier, wenn Du nicht automatisch innerhalb der nächsten Sekunden weitergeleitet wirst.",
+    "Redirect" : "Weiterleiten",
+    "The link leads to %s" : "Der Link führt nach %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Wenn Du diese Seite nicht besuchen möchtest, kannst Du zu <a href=\"%s\">Mail</a> zurückkehren.",
+    "Continue to %s" : "Weiter nach %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/de_DE.js b/l10n/de_DE.js
index c60d21e8f..3695b12f0 100644
--- a/l10n/de_DE.js
+++ b/l10n/de_DE.js
@@ -2,56 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "E-Mail",
-    "Loading accounts" : "Lade Konten",
-    "Error while loading the accounts." : "Fehler beim Laden der Konten.",
-    "Can not load this folder." : "Dieser Ordner kann nicht geladen werden.",
-    "Searching for {query}" : "Suche nach {query}",
-    "Error while deleting message." : "Fehler beim Löschen der Nachricht.",
-    "Forwarded message" : "Weitergeleitete Nachricht",
-    "Choose a folder to store the attachment in" : "Ordner zum Speichern des Anhangs auswählen",
-    "Attachments saved to Files." : "Anhänge wurde in Dateien gespeichert.",
-    "Attachment saved to Files." : "Anhang wurde in Dateien gespeichert.",
-    "Error while saving attachments to Files." : "Fehler beim Speichern der Anhänge unter Dateien.",
-    "Error while saving attachment to Files." : "Fehler beim Speichern des Anhangs unter Dateien.",
-    "Message flag could not be set." : "Nachrichten-Kennzeichnung konnte nicht gesetzt werden.",
-    "Could not move message." : "Nachricht konnte nicht verschoben werden.",
-    "Invalid account" : "Ungültiges Benutzerkonto",
-    "Invalid folder" : "Ungültiger Ordner",
-    "Error while creating the account: " : "Fehler beim Erstellen des Kontos:",
-    "Unknown error" : "Unbekannter Fehler",
-    "Error while updating the account: " : "Fehler beim Aktualisieren des Kontos:",
-    "All inboxes" : "Alle Posteingänge",
-    "you" : "Sie",
-    "Send message to {email}" : "Nachricht an {email} senden",
-    "Could not load {tag}{name}{endtag}" : "Konnte {tag}{name}{endtag} nicht laden",
-    "There was a problem loading {tag}{name}{endtag}" : "Beim Laden von {tag}{name}{endtag} ist ein Problem aufgetreten",
-    "Could not load your message" : "Ihre Nachricht konnte nicht geladen werden",
-    "Could not load the desired message" : "Gewünschte Nachricht konnte nicht geladen werden",
-    "Could not load the message" : "Nachricht konnte nicht geladen werden",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n neue Nachricht\nvon {from}","%n neue Nachrichten\nvon {from}"],
-    "Nextcloud Mail" : "Nextcloud Mail",
-    "Save" : "Speichern",
-    "Saved" : "Gespeichert",
-    "Show all folders" : "Alle Ordner anzeigen",
-    "Collapse folders" : "Ordner einklappen",
-    "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",
-    "An error occurred while uploading {fname}" : "Fehler aufgetreten beim Hochladen von {fname}",
-    "Reply" : "Antworten",
-    "Send" : "Senden",
-    "Sending …" : "Sende…",
-    "Message sent!" : "Nachricht versandt!",
-    "Server error" : "Serverfehler",
-    "An unknown error occurred" : "Unbekannter Fehler aufgetreten",
-    "Opening HTML drafts is not supported yet." : "Das Öffnen von HTML-Entwürfen wird noch nicht unterstützt.",
-    "No writable calendars found" : "Keine beschreibbaren Kalender gefunden",
-    "Error while importing the calendar event" : "Fehler beim Importieren des Kalenderereignis",
-    "Error while downloading calendar event" : "Fehler beim Herunterladen des Kalenderereignis",
-    "& others" : "& weitere",
-    "Error while loading messages." : "Fehler beim Laden der Nachrichten.",
-    "Error while refreshing messages." : "Fehler beim Aktualisieren der Nachrichten.",
-    "Setting up your account" : "Ihr Konto wird eingerichtet",
     "Inbox" : "Posteingang",
     "Sent" : "Gesendet",
     "Drafts" : "Entwürfe",
@@ -65,70 +15,71 @@ OC.L10N.register(
     "Creating account failed: " : "Kontoerstellung fehlgeschlagen:",
     "Delete permanently" : "Endgültig löschen",
     "IMAP web client" : "IMAP-Web-Client",
-    "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Ein einfach zu nutzender E-Mail-Client der sich via IMAP und SMTP mit Ihrem Mail-Server verbindet",
-    "Error loading message" : "Fehler beim Laden der Nachricht",
-    "Settings" : "Einstellungen",
-    "Forwarding to %s" : "Weiterleiten an %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Hier klicken, wenn Sie nicht iautomatisch innerhalb der nächsten Sekunden weitergeleitet werden.",
-    "Redirect" : "Weiterleiten",
-    "The link leads to %s" : "Der Link führt nach %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Wenn Sie diese Seite nicht besuchen möchten, können Sie <a href=\"%s\">Mail</a> zurückkehren.",
-    "Continue to %s" : "Weiter nach %s",
-    "Delete account" : "Konto löschen",
-    "Try again" : "Nochmals versuchen",
-    "New message" : "Neue Nachricht",
-    "Account Settings" : "Konto-Einstellungen",
-    "Aliases" : "Aliasse",
-    "Mail address" : "E-Mail-Adresse",
-    "Display Name" : "Anzeigename",
-    "Account" : "Konto",
-    "Toggle read" : "Gelesen umschalten",
-    "Delete" : "Löschen",
-    "Keyboard shortcuts" : "Tastenkürzel",
-    "Speed up your Mail experience with these quick shortcuts." : "Verbessern Sie Ihre Arbeit mit Mail durch diese Schnellbefehle.",
-    "Compose new message" : "Neue Nachricht erstellen",
-    "Newer message" : "Neuere Nachricht",
-    "Older message" : "Ältere Nachricht",
-    "Toggle star" : "Stern umschalten",
-    "Toggle unread" : "Ungelesen umschalten",
-    "Search" : "Suchen",
-    "Refresh" : "Aktualisieren",
-    "Connect your mail account" : "Verbinde Dein E-Mail-Konto",
+    "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Ein einfach zu nutzender E-Mail-Client der sich via IMAP und SMTP mit Ihrem E-Mail-Server verbindet",
     "Name" : "Name",
     "Mail Address" : "E-Mail-Adresse",
     "Password" : "Passwort",
-    "Manual configuration" : "Manuelle Einrichtung",
     "IMAP Host" : "IMAP-Host",
-    "IMAP security" : "IMAP-Sicherheit",
     "None" : "Keine",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP-Port",
     "IMAP User" : "IMAP-Benutzer",
     "IMAP Password" : "IMAP-Passwort",
     "SMTP Host" : "SMTP-Host",
-    "SMTP security" : "SMTP-Sicherheit",
     "SMTP Port" : "SMTP-Port",
     "SMTP User" : "SMTP-Benutzer",
     "SMTP Password" : "SMTP-Passwort",
     "Connect" : "Verbinden",
+    "Add mail account" : "E-Mail-Konto hinzufügen",
+    "Use Gravatar and favicon avatars" : "Gravatar- und Favicon-Avatare verwenden",
+    "Keyboard shortcuts" : "Tastenkürzel",
     "from" : "von",
     "to" : "an",
     "cc" : "cc",
     "bcc" : "bcc",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Diese E-Mail wurde von einer No-Reply-Adresse gesendet und Ihre Antwort wird wahrscheinlich nicht gelesen",
     "Subject" : "Betreff",
-    "Save all to Files" : "Alles unter Dateien sichern",
-    "Add mail account" : "E-Mail-Konto hinzufügen",
-    "Use Gravatar and favicon avatars" : "Gravatar- und Favicon-Avatare verwenden",
-    "No search results for" : "Keine Suchergebnisse für",
-    "The images have been blocked to protect your privacy." : "Die Bilder wurden blockiert um Ihre Privatsphäre zu schützen.",
-    "Show images from this sender" : "Bilder dieses Absenders anzeigen",
-    "Forward" : "Weiterleiten",
-    "No messages in this folder" : "Keine Nachrichten in diesem Ordner",
+    "Sending …" : "Sende…",
+    "Message sent!" : "Nachricht versandt!",
+    "Send" : "Senden",
     "Upload attachment" : "Anhang hochladen",
     "Add attachment from Files" : "Anhang von \"Dateien\" hinzufügen",
+    "Choose a file to add as attachment" : "Wählen Sie eine Datei, die als Anhang angefügt werden soll",
+    "No messages in this folder" : "Keine Nachrichten in diesem Ordner",
+    "Delete" : "Löschen",
+    "Could not load your message" : "Ihre Nachricht konnte nicht geladen werden",
     "Import into calendar" : "In Kalender importieren",
     "Download attachment" : "Anhang herunterladen",
-    "Save to Files" : "Unter Dateien speichern"
+    "Save to Files" : "Unter Dateien speichern",
+    "Choose a folder to store the attachment in" : "Ordner zum Speichern des Anhangs auswählen",
+    "Save all to Files" : "Alles unter Dateien sichern",
+    "The images have been blocked to protect your privacy." : "Die Bilder wurden blockiert um Ihre Privatsphäre zu schützen.",
+    "New message" : "Neue Nachricht",
+    "Settings" : "Einstellungen",
+    "Speed up your Mail experience with these quick shortcuts." : "Verbessern Sie Ihre Arbeit mit Mail durch diese Schnellbefehle.",
+    "Compose new message" : "Neue Nachricht erstellen",
+    "Newer message" : "Neuere Nachricht",
+    "Older message" : "Ältere Nachricht",
+    "Toggle star" : "Stern umschalten",
+    "Toggle unread" : "Ungelesen umschalten",
+    "Search" : "Suchen",
+    "Refresh" : "Aktualisieren",
+    "Connect your mail account" : "Verbinde Dein E-Mail-Konto",
+    "Show all folders" : "Alle Ordner anzeigen",
+    "Collapse folders" : "Ordner einklappen",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n neue Nachricht\nvon {from}","%n neue Nachrichten\nvon {from}"],
+    "Nextcloud Mail" : "Nextcloud Mail",
+    "All inboxes" : "Alle Posteingänge",
+    "Could not load {tag}{name}{endtag}" : "Konnte {tag}{name}{endtag} nicht laden",
+    "There was a problem loading {tag}{name}{endtag}" : "Beim Laden von {tag}{name}{endtag} ist ein Problem aufgetreten",
+    "Could not load the desired message" : "Gewünschte Nachricht konnte nicht geladen werden",
+    "Could not load the message" : "Nachricht konnte nicht geladen werden",
+    "Error loading message" : "Fehler beim Laden der Nachricht",
+    "Forwarding to %s" : "Weiterleiten an %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Hier klicken, wenn Sie nicht iautomatisch innerhalb der nächsten Sekunden weitergeleitet werden.",
+    "Redirect" : "Weiterleiten",
+    "The link leads to %s" : "Der Link führt nach %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Wenn Sie diese Seite nicht besuchen möchten, können Sie <a href=\"%s\">Mail</a> zurückkehren.",
+    "Continue to %s" : "Weiter nach %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/de_DE.json b/l10n/de_DE.json
index d63364a9c..6c93515bf 100644
--- a/l10n/de_DE.json
+++ b/l10n/de_DE.json
@@ -1,55 +1,5 @@
 { "translations": {
     "Mail" : "E-Mail",
-    "Loading accounts" : "Lade Konten",
-    "Error while loading the accounts." : "Fehler beim Laden der Konten.",
-    "Can not load this folder." : "Dieser Ordner kann nicht geladen werden.",
-    "Searching for {query}" : "Suche nach {query}",
-    "Error while deleting message." : "Fehler beim Löschen der Nachricht.",
-    "Forwarded message" : "Weitergeleitete Nachricht",
-    "Choose a folder to store the attachment in" : "Ordner zum Speichern des Anhangs auswählen",
-    "Attachments saved to Files." : "Anhänge wurde in Dateien gespeichert.",
-    "Attachment saved to Files." : "Anhang wurde in Dateien gespeichert.",
-    "Error while saving attachments to Files." : "Fehler beim Speichern der Anhänge unter Dateien.",
-    "Error while saving attachment to Files." : "Fehler beim Speichern des Anhangs unter Dateien.",
-    "Message flag could not be set." : "Nachrichten-Kennzeichnung konnte nicht gesetzt werden.",
-    "Could not move message." : "Nachricht konnte nicht verschoben werden.",
-    "Invalid account" : "Ungültiges Benutzerkonto",
-    "Invalid folder" : "Ungültiger Ordner",
-    "Error while creating the account: " : "Fehler beim Erstellen des Kontos:",
-    "Unknown error" : "Unbekannter Fehler",
-    "Error while updating the account: " : "Fehler beim Aktualisieren des Kontos:",
-    "All inboxes" : "Alle Posteingänge",
-    "you" : "Sie",
-    "Send message to {email}" : "Nachricht an {email} senden",
-    "Could not load {tag}{name}{endtag}" : "Konnte {tag}{name}{endtag} nicht laden",
-    "There was a problem loading {tag}{name}{endtag}" : "Beim Laden von {tag}{name}{endtag} ist ein Problem aufgetreten",
-    "Could not load your message" : "Ihre Nachricht konnte nicht geladen werden",
-    "Could not load the desired message" : "Gewünschte Nachricht konnte nicht geladen werden",
-    "Could not load the message" : "Nachricht konnte nicht geladen werden",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n neue Nachricht\nvon {from}","%n neue Nachrichten\nvon {from}"],
-    "Nextcloud Mail" : "Nextcloud Mail",
-    "Save" : "Speichern",
-    "Saved" : "Gespeichert",
-    "Show all folders" : "Alle Ordner anzeigen",
-    "Collapse folders" : "Ordner einklappen",
-    "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",
-    "An error occurred while uploading {fname}" : "Fehler aufgetreten beim Hochladen von {fname}",
-    "Reply" : "Antworten",
-    "Send" : "Senden",
-    "Sending …" : "Sende…",
-    "Message sent!" : "Nachricht versandt!",
-    "Server error" : "Serverfehler",
-    "An unknown error occurred" : "Unbekannter Fehler aufgetreten",
-    "Opening HTML drafts is not supported yet." : "Das Öffnen von HTML-Entwürfen wird noch nicht unterstützt.",
-    "No writable calendars found" : "Keine beschreibbaren Kalender gefunden",
-    "Error while importing the calendar event" : "Fehler beim Importieren des Kalenderereignis",
-    "Error while downloading calendar event" : "Fehler beim Herunterladen des Kalenderereignis",
-    "& others" : "& weitere",
-    "Error while loading messages." : "Fehler beim Laden der Nachrichten.",
-    "Error while refreshing messages." : "Fehler beim Aktualisieren der Nachrichten.",
-    "Setting up your account" : "Ihr Konto wird eingerichtet",
     "Inbox" : "Posteingang",
     "Sent" : "Gesendet",
     "Drafts" : "Entwürfe",
@@ -63,70 +13,71 @@
     "Creating account failed: " : "Kontoerstellung fehlgeschlagen:",
     "Delete permanently" : "Endgültig löschen",
     "IMAP web client" : "IMAP-Web-Client",
-    "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Ein einfach zu nutzender E-Mail-Client der sich via IMAP und SMTP mit Ihrem Mail-Server verbindet",
-    "Error loading message" : "Fehler beim Laden der Nachricht",
-    "Settings" : "Einstellungen",
-    "Forwarding to %s" : "Weiterleiten an %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Hier klicken, wenn Sie nicht iautomatisch innerhalb der nächsten Sekunden weitergeleitet werden.",
-    "Redirect" : "Weiterleiten",
-    "The link leads to %s" : "Der Link führt nach %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Wenn Sie diese Seite nicht besuchen möchten, können Sie <a href=\"%s\">Mail</a> zurückkehren.",
-    "Continue to %s" : "Weiter nach %s",
-    "Delete account" : "Konto löschen",
-    "Try again" : "Nochmals versuchen",
-    "New message" : "Neue Nachricht",
-    "Account Settings" : "Konto-Einstellungen",
-    "Aliases" : "Aliasse",
-    "Mail address" : "E-Mail-Adresse",
-    "Display Name" : "Anzeigename",
-    "Account" : "Konto",
-    "Toggle read" : "Gelesen umschalten",
-    "Delete" : "Löschen",
-    "Keyboard shortcuts" : "Tastenkürzel",
-    "Speed up your Mail experience with these quick shortcuts." : "Verbessern Sie Ihre Arbeit mit Mail durch diese Schnellbefehle.",
-    "Compose new message" : "Neue Nachricht erstellen",
-    "Newer message" : "Neuere Nachricht",
-    "Older message" : "Ältere Nachricht",
-    "Toggle star" : "Stern umschalten",
-    "Toggle unread" : "Ungelesen umschalten",
-    "Search" : "Suchen",
-    "Refresh" : "Aktualisieren",
-    "Connect your mail account" : "Verbinde Dein E-Mail-Konto",
+    "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Ein einfach zu nutzender E-Mail-Client der sich via IMAP und SMTP mit Ihrem E-Mail-Server verbindet",
     "Name" : "Name",
     "Mail Address" : "E-Mail-Adresse",
     "Password" : "Passwort",
-    "Manual configuration" : "Manuelle Einrichtung",
     "IMAP Host" : "IMAP-Host",
-    "IMAP security" : "IMAP-Sicherheit",
     "None" : "Keine",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP-Port",
     "IMAP User" : "IMAP-Benutzer",
     "IMAP Password" : "IMAP-Passwort",
     "SMTP Host" : "SMTP-Host",
-    "SMTP security" : "SMTP-Sicherheit",
     "SMTP Port" : "SMTP-Port",
     "SMTP User" : "SMTP-Benutzer",
     "SMTP Password" : "SMTP-Passwort",
     "Connect" : "Verbinden",
+    "Add mail account" : "E-Mail-Konto hinzufügen",
+    "Use Gravatar and favicon avatars" : "Gravatar- und Favicon-Avatare verwenden",
+    "Keyboard shortcuts" : "Tastenkürzel",
     "from" : "von",
     "to" : "an",
     "cc" : "cc",
     "bcc" : "bcc",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Diese E-Mail wurde von einer No-Reply-Adresse gesendet und Ihre Antwort wird wahrscheinlich nicht gelesen",
     "Subject" : "Betreff",
-    "Save all to Files" : "Alles unter Dateien sichern",
-    "Add mail account" : "E-Mail-Konto hinzufügen",
-    "Use Gravatar and favicon avatars" : "Gravatar- und Favicon-Avatare verwenden",
-    "No search results for" : "Keine Suchergebnisse für",
-    "The images have been blocked to protect your privacy." : "Die Bilder wurden blockiert um Ihre Privatsphäre zu schützen.",
-    "Show images from this sender" : "Bilder dieses Absenders anzeigen",
-    "Forward" : "Weiterleiten",
-    "No messages in this folder" : "Keine Nachrichten in diesem Ordner",
+    "Sending …" : "Sende…",
+    "Message sent!" : "Nachricht versandt!",
+    "Send" : "Senden",
     "Upload attachment" : "Anhang hochladen",
     "Add attachment from Files" : "Anhang von \"Dateien\" hinzufügen",
+    "Choose a file to add as attachment" : "Wählen Sie eine Datei, die als Anhang angefügt werden soll",
+    "No messages in this folder" : "Keine Nachrichten in diesem Ordner",
+    "Delete" : "Löschen",
+    "Could not load your message" : "Ihre Nachricht konnte nicht geladen werden",
     "Import into calendar" : "In Kalender importieren",
     "Download attachment" : "Anhang herunterladen",
-    "Save to Files" : "Unter Dateien speichern"
+    "Save to Files" : "Unter Dateien speichern",
+    "Choose a folder to store the attachment in" : "Ordner zum Speichern des Anhangs auswählen",
+    "Save all to Files" : "Alles unter Dateien sichern",
+    "The images have been blocked to protect your privacy." : "Die Bilder wurden blockiert um Ihre Privatsphäre zu schützen.",
+    "New message" : "Neue Nachricht",
+    "Settings" : "Einstellungen",
+    "Speed up your Mail experience with these quick shortcuts." : "Verbessern Sie Ihre Arbeit mit Mail durch diese Schnellbefehle.",
+    "Compose new message" : "Neue Nachricht erstellen",
+    "Newer message" : "Neuere Nachricht",
+    "Older message" : "Ältere Nachricht",
+    "Toggle star" : "Stern umschalten",
+    "Toggle unread" : "Ungelesen umschalten",
+    "Search" : "Suchen",
+    "Refresh" : "Aktualisieren",
+    "Connect your mail account" : "Verbinde Dein E-Mail-Konto",
+    "Show all folders" : "Alle Ordner anzeigen",
+    "Collapse folders" : "Ordner einklappen",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n neue Nachricht\nvon {from}","%n neue Nachrichten\nvon {from}"],
+    "Nextcloud Mail" : "Nextcloud Mail",
+    "All inboxes" : "Alle Posteingänge",
+    "Could not load {tag}{name}{endtag}" : "Konnte {tag}{name}{endtag} nicht laden",
+    "There was a problem loading {tag}{name}{endtag}" : "Beim Laden von {tag}{name}{endtag} ist ein Problem aufgetreten",
+    "Could not load the desired message" : "Gewünschte Nachricht konnte nicht geladen werden",
+    "Could not load the message" : "Nachricht konnte nicht geladen werden",
+    "Error loading message" : "Fehler beim Laden der Nachricht",
+    "Forwarding to %s" : "Weiterleiten an %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Hier klicken, wenn Sie nicht iautomatisch innerhalb der nächsten Sekunden weitergeleitet werden.",
+    "Redirect" : "Weiterleiten",
+    "The link leads to %s" : "Der Link führt nach %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Wenn Sie diese Seite nicht besuchen möchten, können Sie <a href=\"%s\">Mail</a> zurückkehren.",
+    "Continue to %s" : "Weiter nach %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/el.js b/l10n/el.js
index 9646e284f..8424107d3 100644
--- a/l10n/el.js
+++ b/l10n/el.js
@@ -2,50 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Αλληλογραφία",
-    "Loading accounts" : "Γίνεται φόρτωση λογαριασμών",
-    "Error while loading the accounts." : "Σφάλμα κατά τη φόρτωση των λογαριασμών.",
-    "Can not load this folder." : "Αδυναμία φόρτωσης αυτού του φακέλου.",
-    "Searching for {query}" : "Αναζήτηση για {query}",
-    "Error while deleting message." : "Σφάλμα κατά τη διαγραφή του μηνύματος.",
-    "Forwarded message" : "Προωθημένο μήνυμα",
-    "Choose a folder to store the attachment in" : "Επιλέξτε ένα φάκελο για να αποθηκεύσετε τα συνημμένα",
-    "Attachments saved to Files." : "Τα συνημμένα αποθηκεύτηκαν στα Έγγραφα.",
-    "Attachment saved to Files." : "Το συνημμένο αποθηκεύτηκε στα Έγγραφα.",
-    "Error while saving attachments to Files." : "Σφάλμα κατά την αποθήκευση των συνημμένων στα Έγγραφα.",
-    "Error while saving attachment to Files." : "Σφάλμα κατά την αποθήκευση του συνημμένου στα Έγγραφα.",
-    "Message flag could not be set." : "Δεν μπορεί να οριστεί η σημαία για το μήνυμα.",
-    "Could not move message." : "Αδυναμία μετακίνησης μηνύματος",
-    "Invalid account" : "Μη έγκυρος λογαριασμός",
-    "Invalid folder" : "Μη έγκυρος φάκελος",
-    "Error while creating the account: " : "Σφάλμα κατά τη δημιουργία του λογαριασμού:",
-    "Unknown error" : "Άγνωστο σφάλμα",
-    "Error while updating the account: " : "Σφάλμα κατά την ενημέρωση του λογαριασμού:",
-    "All inboxes" : "Όλα τα εισερχόμενα",
-    "you" : "εσείς",
-    "Send message to {email}" : "Αποστολή μηνύματος σε {email}",
-    "Could not load {tag}{name}{endtag}" : "Αδυναμία φόρτωσης {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Παρουσιάστηκε πρόβλημα φόρτωσης {tag}{name}{endtag}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "Nextcloud Mail" : "Αλληλογραφία Nextcloud",
-    "Save" : "Αποθήκευση",
-    "Saved" : "Αποθηκεύτηκε",
-    "Show all folders" : "Εμφάνιση όλων των φακέλων",
-    "Collapse folders" : "Σύμπτυξη φακέλων",
-    "Error while deleting account." : "Σφάλμα κατά τη διαγραφή λογαριασμού.",
-    "Choose a file to add as attachment" : "Επιλέξτε ένα αρχείο για να προσθέσετε ως συνημμένο",
-    "Reply" : "Απάντηση",
-    "Send" : "Αποστολή",
-    "Sending …" : "Αποστέλλεται...",
-    "Message sent!" : "Μήνυμα εστάλη!",
-    "Server error" : "Σφάλμα διακομιστή",
-    "An unknown error occurred" : "Προέκυψε ένα άγνωστο σφάλμα",
-    "Opening HTML drafts is not supported yet." : "Δεν υποστηρίζεται ακόμα το άνοιγμα προχείρων HTML.",
-    "No writable calendars found" : "Δεν βρέθηκαν εγγράψιμα ημερολόγια",
-    "Error while importing the calendar event" : "Σφάλμα κατά την εισαγωγή γεγονότος στο ημερολόγιο",
-    "Error while downloading calendar event" : "Σφάλμα κατά την λήψη συμβάντος ημερολογίου",
-    "& others" : "& άλλοι",
-    "Error while loading messages." : "Σφάλμα κατά τη φόρτωση μηνυμάτων.",
-    "Setting up your account" : "Ρύθμιση του λογαριασμού σας",
     "Inbox" : "Εισερχόμενα",
     "Sent" : "Απεσταλμένα",
     "Drafts" : "Πρόχειρα",
@@ -59,63 +15,62 @@ OC.L10N.register(
     "Creating account failed: " : "Αποτυχία δημιουργίας λογαριασμού:",
     "Delete permanently" : "Μόνιμη διαγραφή",
     "IMAP web client" : "Πελάτης ιστού IMAP",
-    "Error loading message" : "Σφάλμα φόρτωσης μηνύματος",
-    "Settings" : "Ρυθμίσεις",
-    "Forwarding to %s" : "Προώθηση σε %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Κάντε κλικ εδώ εάν δεν ανακατευθυνθείτε αυτόματα μέσα σε λίγα δευτερόλεπτα.",
-    "Redirect" : "Ανακατεύθυνση",
-    "The link leads to %s" : "Αυτός ο σύνδεσμος οδηγεί στο %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Εάν δεν θέλετε να επισκεφθείτε την σελίδα, μπορείτε να επιστρέψετε στην <a href=\"%s\">Αλληλογραφία</a>.",
-    "Continue to %s" : "Συνέχεια στο %s",
-    "Delete account" : "Διαγραφή λογαριασμού",
-    "Try again" : "Δοκιμάστε ξανά",
-    "New message" : "Νέο μήνυμα",
-    "Account Settings" : "Ρυθμίσεις λογαριασμού",
-    "Aliases" : "Ψευδώνυμα",
-    "Mail address" : "Διεύθυνση αλληλογραφίας",
-    "Display Name" : "Εμφανιζόμενο όνομα",
-    "Account" : "Λογαριασμός",
-    "Delete" : "Διαγραφή",
-    "Keyboard shortcuts" : "Συντομεύσεις πληκτρολογίου",
-    "Speed up your Mail experience with these quick shortcuts." : "Βελτιώστε την ταχύτητά σας στην εμπειρία χρήσης στο πρόγραμμα Αλληλογραφίας με αυτές τις συντομεύσεις.",
-    "Compose new message" : "Σύνταξη νέου μηνύματος",
-    "Newer message" : "Νεότερο μήνυμα",
-    "Older message" : "Παλαιότερο μήνυμα",
-    "Toggle star" : "Εναλλαγή αστεριού",
-    "Toggle unread" : "Εναλλαγή αδιάβαστων",
-    "Search" : "Αναζήτηση",
-    "Refresh" : "Ανανέωση",
-    "Connect your mail account" : "Συνδέστε το λογαριασμό αλληλογραφίας σας",
     "Name" : "Όνομα",
     "Mail Address" : "Διεύθυνση αλληλογραφίας",
     "Password" : "Συνθηματικό",
-    "Manual configuration" : "Χειροκίνητη ρύθμιση",
     "IMAP Host" : "Υπολογιστής IMAP",
-    "IMAP security" : "Ασφάλεια IMAP",
     "None" : "Κανένα",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Πόρτα IMAP",
     "IMAP User" : "Χρήστης IMAP",
     "IMAP Password" : "Συνθηματικό IMAP",
     "SMTP Host" : "Υπολογιστής SMTP",
-    "SMTP security" : "Ασφάλεια SMTP",
     "SMTP Port" : "Πόρτα SMTP",
     "SMTP User" : "Χρήστης SMTP",
     "SMTP Password" : "Συνθηματικό SMTP",
     "Connect" : "Σύνδεση",
+    "Add mail account" : "Προσθήκη λογαριασμού αλληλογραφίας",
+    "Keyboard shortcuts" : "Συντομεύσεις πληκτρολογίου",
     "from" : "από",
     "to" : "προς",
     "cc" : "κοιν.",
     "bcc" : "κρυφή κοιν.",
     "Subject" : "Θέμα",
-    "Save all to Files" : "Αποθήκευση όλων στα Αρχεία",
-    "Add mail account" : "Προσθήκη λογαριασμού αλληλογραφίας",
-    "No search results for" : "Δεν βρέθηκαν αποτελέσματα για",
-    "The images have been blocked to protect your privacy." : "Οι εικόνες έχουν αποκλειστεί για να προστατευθεί η ιδιωτικότητά σας.",
-    "Show images from this sender" : "Εμφάνιση εικόνων από αυτόν τον αποστολέα",
-    "Forward" : "Προώθηση",
+    "Sending …" : "Αποστέλλεται...",
+    "Message sent!" : "Μήνυμα εστάλη!",
+    "Send" : "Αποστολή",
+    "Choose a file to add as attachment" : "Επιλέξτε ένα αρχείο για να προσθέσετε ως συνημμένο",
+    "Delete" : "Διαγραφή",
     "Import into calendar" : "Εισαγωγή στο ημερολόγιο",
     "Download attachment" : "Λήψη συνημμένου",
-    "Save to Files" : "Αποθήκευση στα Αρχεία"
+    "Save to Files" : "Αποθήκευση στα Αρχεία",
+    "Choose a folder to store the attachment in" : "Επιλέξτε ένα φάκελο για να αποθηκεύσετε τα συνημμένα",
+    "Save all to Files" : "Αποθήκευση όλων στα Αρχεία",
+    "The images have been blocked to protect your privacy." : "Οι εικόνες έχουν αποκλειστεί για να προστατευθεί η ιδιωτικότητά σας.",
+    "New message" : "Νέο μήνυμα",
+    "Settings" : "Ρυθμίσεις",
+    "Speed up your Mail experience with these quick shortcuts." : "Βελτιώστε την ταχύτητά σας στην εμπειρία χρήσης στο πρόγραμμα Αλληλογραφίας με αυτές τις συντομεύσεις.",
+    "Compose new message" : "Σύνταξη νέου μηνύματος",
+    "Newer message" : "Νεότερο μήνυμα",
+    "Older message" : "Παλαιότερο μήνυμα",
+    "Toggle star" : "Εναλλαγή αστεριού",
+    "Toggle unread" : "Εναλλαγή αδιάβαστων",
+    "Search" : "Αναζήτηση",
+    "Refresh" : "Ανανέωση",
+    "Connect your mail account" : "Συνδέστε το λογαριασμό αλληλογραφίας σας",
+    "Show all folders" : "Εμφάνιση όλων των φακέλων",
+    "Collapse folders" : "Σύμπτυξη φακέλων",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "Nextcloud Mail" : "Αλληλογραφία Nextcloud",
+    "All inboxes" : "Όλα τα εισερχόμενα",
+    "Could not load {tag}{name}{endtag}" : "Αδυναμία φόρτωσης {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Παρουσιάστηκε πρόβλημα φόρτωσης {tag}{name}{endtag}",
+    "Error loading message" : "Σφάλμα φόρτωσης μηνύματος",
+    "Forwarding to %s" : "Προώθηση σε %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Κάντε κλικ εδώ εάν δεν ανακατευθυνθείτε αυτόματα μέσα σε λίγα δευτερόλεπτα.",
+    "Redirect" : "Ανακατεύθυνση",
+    "The link leads to %s" : "Αυτός ο σύνδεσμος οδηγεί στο %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Εάν δεν θέλετε να επισκεφθείτε την σελίδα, μπορείτε να επιστρέψετε στην <a href=\"%s\">Αλληλογραφία</a>.",
+    "Continue to %s" : "Συνέχεια στο %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/el.json b/l10n/el.json
index d57fe77c7..013dbf96c 100644
--- a/l10n/el.json
+++ b/l10n/el.json
@@ -1,49 +1,5 @@
 { "translations": {
     "Mail" : "Αλληλογραφία",
-    "Loading accounts" : "Γίνεται φόρτωση λογαριασμών",
-    "Error while loading the accounts." : "Σφάλμα κατά τη φόρτωση των λογαριασμών.",
-    "Can not load this folder." : "Αδυναμία φόρτωσης αυτού του φακέλου.",
-    "Searching for {query}" : "Αναζήτηση για {query}",
-    "Error while deleting message." : "Σφάλμα κατά τη διαγραφή του μηνύματος.",
-    "Forwarded message" : "Προωθημένο μήνυμα",
-    "Choose a folder to store the attachment in" : "Επιλέξτε ένα φάκελο για να αποθηκεύσετε τα συνημμένα",
-    "Attachments saved to Files." : "Τα συνημμένα αποθηκεύτηκαν στα Έγγραφα.",
-    "Attachment saved to Files." : "Το συνημμένο αποθηκεύτηκε στα Έγγραφα.",
-    "Error while saving attachments to Files." : "Σφάλμα κατά την αποθήκευση των συνημμένων στα Έγγραφα.",
-    "Error while saving attachment to Files." : "Σφάλμα κατά την αποθήκευση του συνημμένου στα Έγγραφα.",
-    "Message flag could not be set." : "Δεν μπορεί να οριστεί η σημαία για το μήνυμα.",
-    "Could not move message." : "Αδυναμία μετακίνησης μηνύματος",
-    "Invalid account" : "Μη έγκυρος λογαριασμός",
-    "Invalid folder" : "Μη έγκυρος φάκελος",
-    "Error while creating the account: " : "Σφάλμα κατά τη δημιουργία του λογαριασμού:",
-    "Unknown error" : "Άγνωστο σφάλμα",
-    "Error while updating the account: " : "Σφάλμα κατά την ενημέρωση του λογαριασμού:",
-    "All inboxes" : "Όλα τα εισερχόμενα",
-    "you" : "εσείς",
-    "Send message to {email}" : "Αποστολή μηνύματος σε {email}",
-    "Could not load {tag}{name}{endtag}" : "Αδυναμία φόρτωσης {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Παρουσιάστηκε πρόβλημα φόρτωσης {tag}{name}{endtag}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "Nextcloud Mail" : "Αλληλογραφία Nextcloud",
-    "Save" : "Αποθήκευση",
-    "Saved" : "Αποθηκεύτηκε",
-    "Show all folders" : "Εμφάνιση όλων των φακέλων",
-    "Collapse folders" : "Σύμπτυξη φακέλων",
-    "Error while deleting account." : "Σφάλμα κατά τη διαγραφή λογαριασμού.",
-    "Choose a file to add as attachment" : "Επιλέξτε ένα αρχείο για να προσθέσετε ως συνημμένο",
-    "Reply" : "Απάντηση",
-    "Send" : "Αποστολή",
-    "Sending …" : "Αποστέλλεται...",
-    "Message sent!" : "Μήνυμα εστάλη!",
-    "Server error" : "Σφάλμα διακομιστή",
-    "An unknown error occurred" : "Προέκυψε ένα άγνωστο σφάλμα",
-    "Opening HTML drafts is not supported yet." : "Δεν υποστηρίζεται ακόμα το άνοιγμα προχείρων HTML.",
-    "No writable calendars found" : "Δεν βρέθηκαν εγγράψιμα ημερολόγια",
-    "Error while importing the calendar event" : "Σφάλμα κατά την εισαγωγή γεγονότος στο ημερολόγιο",
-    "Error while downloading calendar event" : "Σφάλμα κατά την λήψη συμβάντος ημερολογίου",
-    "& others" : "& άλλοι",
-    "Error while loading messages." : "Σφάλμα κατά τη φόρτωση μηνυμάτων.",
-    "Setting up your account" : "Ρύθμιση του λογαριασμού σας",
     "Inbox" : "Εισερχόμενα",
     "Sent" : "Απεσταλμένα",
     "Drafts" : "Πρόχειρα",
@@ -57,63 +13,62 @@
     "Creating account failed: " : "Αποτυχία δημιουργίας λογαριασμού:",
     "Delete permanently" : "Μόνιμη διαγραφή",
     "IMAP web client" : "Πελάτης ιστού IMAP",
-    "Error loading message" : "Σφάλμα φόρτωσης μηνύματος",
-    "Settings" : "Ρυθμίσεις",
-    "Forwarding to %s" : "Προώθηση σε %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Κάντε κλικ εδώ εάν δεν ανακατευθυνθείτε αυτόματα μέσα σε λίγα δευτερόλεπτα.",
-    "Redirect" : "Ανακατεύθυνση",
-    "The link leads to %s" : "Αυτός ο σύνδεσμος οδηγεί στο %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Εάν δεν θέλετε να επισκεφθείτε την σελίδα, μπορείτε να επιστρέψετε στην <a href=\"%s\">Αλληλογραφία</a>.",
-    "Continue to %s" : "Συνέχεια στο %s",
-    "Delete account" : "Διαγραφή λογαριασμού",
-    "Try again" : "Δοκιμάστε ξανά",
-    "New message" : "Νέο μήνυμα",
-    "Account Settings" : "Ρυθμίσεις λογαριασμού",
-    "Aliases" : "Ψευδώνυμα",
-    "Mail address" : "Διεύθυνση αλληλογραφίας",
-    "Display Name" : "Εμφανιζόμενο όνομα",
-    "Account" : "Λογαριασμός",
-    "Delete" : "Διαγραφή",
-    "Keyboard shortcuts" : "Συντομεύσεις πληκτρολογίου",
-    "Speed up your Mail experience with these quick shortcuts." : "Βελτιώστε την ταχύτητά σας στην εμπειρία χρήσης στο πρόγραμμα Αλληλογραφίας με αυτές τις συντομεύσεις.",
-    "Compose new message" : "Σύνταξη νέου μηνύματος",
-    "Newer message" : "Νεότερο μήνυμα",
-    "Older message" : "Παλαιότερο μήνυμα",
-    "Toggle star" : "Εναλλαγή αστεριού",
-    "Toggle unread" : "Εναλλαγή αδιάβαστων",
-    "Search" : "Αναζήτηση",
-    "Refresh" : "Ανανέωση",
-    "Connect your mail account" : "Συνδέστε το λογαριασμό αλληλογραφίας σας",
     "Name" : "Όνομα",
     "Mail Address" : "Διεύθυνση αλληλογραφίας",
     "Password" : "Συνθηματικό",
-    "Manual configuration" : "Χειροκίνητη ρύθμιση",
     "IMAP Host" : "Υπολογιστής IMAP",
-    "IMAP security" : "Ασφάλεια IMAP",
     "None" : "Κανένα",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Πόρτα IMAP",
     "IMAP User" : "Χρήστης IMAP",
     "IMAP Password" : "Συνθηματικό IMAP",
     "SMTP Host" : "Υπολογιστής SMTP",
-    "SMTP security" : "Ασφάλεια SMTP",
     "SMTP Port" : "Πόρτα SMTP",
     "SMTP User" : "Χρήστης SMTP",
     "SMTP Password" : "Συνθηματικό SMTP",
     "Connect" : "Σύνδεση",
+    "Add mail account" : "Προσθήκη λογαριασμού αλληλογραφίας",
+    "Keyboard shortcuts" : "Συντομεύσεις πληκτρολογίου",
     "from" : "από",
     "to" : "προς",
     "cc" : "κοιν.",
     "bcc" : "κρυφή κοιν.",
     "Subject" : "Θέμα",
-    "Save all to Files" : "Αποθήκευση όλων στα Αρχεία",
-    "Add mail account" : "Προσθήκη λογαριασμού αλληλογραφίας",
-    "No search results for" : "Δεν βρέθηκαν αποτελέσματα για",
-    "The images have been blocked to protect your privacy." : "Οι εικόνες έχουν αποκλειστεί για να προστατευθεί η ιδιωτικότητά σας.",
-    "Show images from this sender" : "Εμφάνιση εικόνων από αυτόν τον αποστολέα",
-    "Forward" : "Προώθηση",
+    "Sending …" : "Αποστέλλεται...",
+    "Message sent!" : "Μήνυμα εστάλη!",
+    "Send" : "Αποστολή",
+    "Choose a file to add as attachment" : "Επιλέξτε ένα αρχείο για να προσθέσετε ως συνημμένο",
+    "Delete" : "Διαγραφή",
     "Import into calendar" : "Εισαγωγή στο ημερολόγιο",
     "Download attachment" : "Λήψη συνημμένου",
-    "Save to Files" : "Αποθήκευση στα Αρχεία"
+    "Save to Files" : "Αποθήκευση στα Αρχεία",
+    "Choose a folder to store the attachment in" : "Επιλέξτε ένα φάκελο για να αποθηκεύσετε τα συνημμένα",
+    "Save all to Files" : "Αποθήκευση όλων στα Αρχεία",
+    "The images have been blocked to protect your privacy." : "Οι εικόνες έχουν αποκλειστεί για να προστατευθεί η ιδιωτικότητά σας.",
+    "New message" : "Νέο μήνυμα",
+    "Settings" : "Ρυθμίσεις",
+    "Speed up your Mail experience with these quick shortcuts." : "Βελτιώστε την ταχύτητά σας στην εμπειρία χρήσης στο πρόγραμμα Αλληλογραφίας με αυτές τις συντομεύσεις.",
+    "Compose new message" : "Σύνταξη νέου μηνύματος",
+    "Newer message" : "Νεότερο μήνυμα",
+    "Older message" : "Παλαιότερο μήνυμα",
+    "Toggle star" : "Εναλλαγή αστεριού",
+    "Toggle unread" : "Εναλλαγή αδιάβαστων",
+    "Search" : "Αναζήτηση",
+    "Refresh" : "Ανανέωση",
+    "Connect your mail account" : "Συνδέστε το λογαριασμό αλληλογραφίας σας",
+    "Show all folders" : "Εμφάνιση όλων των φακέλων",
+    "Collapse folders" : "Σύμπτυξη φακέλων",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "Nextcloud Mail" : "Αλληλογραφία Nextcloud",
+    "All inboxes" : "Όλα τα εισερχόμενα",
+    "Could not load {tag}{name}{endtag}" : "Αδυναμία φόρτωσης {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Παρουσιάστηκε πρόβλημα φόρτωσης {tag}{name}{endtag}",
+    "Error loading message" : "Σφάλμα φόρτωσης μηνύματος",
+    "Forwarding to %s" : "Προώθηση σε %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Κάντε κλικ εδώ εάν δεν ανακατευθυνθείτε αυτόματα μέσα σε λίγα δευτερόλεπτα.",
+    "Redirect" : "Ανακατεύθυνση",
+    "The link leads to %s" : "Αυτός ο σύνδεσμος οδηγεί στο %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Εάν δεν θέλετε να επισκεφθείτε την σελίδα, μπορείτε να επιστρέψετε στην <a href=\"%s\">Αλληλογραφία</a>.",
+    "Continue to %s" : "Συνέχεια στο %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/en_GB.js b/l10n/en_GB.js
index 8623dcbf7..7c92a1f98 100644
--- a/l10n/en_GB.js
+++ b/l10n/en_GB.js
@@ -2,56 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Mail",
-    "Loading accounts" : "Loading accounts",
-    "Error while loading the accounts." : "Error whilst loading the accounts.",
-    "Can not load this folder." : "Can not load this folder.",
-    "Searching for {query}" : "Searching for {query}",
-    "Error while deleting message." : "Error whilst deleting message.",
-    "Forwarded message" : "Forwarded message",
-    "Choose a folder to store the attachment in" : "Choose a folder to store the attachment in",
-    "Attachments saved to Files." : "Attachments saved to Files.",
-    "Attachment saved to Files." : "Attachment saved to Files.",
-    "Error while saving attachments to Files." : "Error whilst saving attachments to Files.",
-    "Error while saving attachment to Files." : "Error whilst saving attachment to Files.",
-    "Message flag could not be set." : "Message flag could not be set.",
-    "Could not move message." : "Could not move message.",
-    "Invalid account" : "Invalid account",
-    "Invalid folder" : "Invalid folder",
-    "Error while creating the account: " : "Error while creating the account: ",
-    "Unknown error" : "Unknown error",
-    "Error while updating the account: " : "Error while updating the account: ",
-    "All inboxes" : "All inboxes",
-    "you" : "you",
-    "Send message to {email}" : "Send message to {email}",
-    "Could not load {tag}{name}{endtag}" : "Could not load {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "There was a problem loading {tag}{name}{endtag}",
-    "Could not load your message" : "Could not load your message",
-    "Could not load the desired message" : "Could not load the desired message",
-    "Could not load the message" : "Could not load the message",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n new message \nfrom {from}","%n new messages \nfrom {from}"],
-    "Nextcloud Mail" : "Nextcloud Mail",
-    "Save" : "Save",
-    "Saved" : "Saved",
-    "Show all folders" : "Show all folders",
-    "Collapse folders" : "Collapse folders",
-    "Error while deleting account." : "Error whilst deleting account.",
-    "Choose a file to add as attachment" : "Choose a file to add as attachment",
-    "An error occurred while uploading {fname}" : "An error occurred while uploading {fname}",
-    "Reply" : "Reply",
-    "Send" : "Send",
-    "Sending …" : "Sending…",
-    "Message sent!" : "Message sent!",
-    "Server error" : "Server error",
-    "An unknown error occurred" : "An unknown error occurred",
-    "Opening HTML drafts is not supported yet." : "Opening HTML drafts is not supported yet.",
-    "No writable calendars found" : "No writable calendars found",
-    "Error while importing the calendar event" : "Error whilst importing the calendar event",
-    "Error while downloading calendar event" : "Error whilst downloading calendar event",
-    "& others" : "& others",
-    "Error while loading messages." : "Error whilst loading messages.",
-    "Error while refreshing messages." : "Error while refreshing messages.",
-    "Setting up your account" : "Setting up your account",
     "Inbox" : "Inbox",
     "Sent" : "Sent",
     "Drafts" : "Drafts",
@@ -66,69 +16,70 @@ OC.L10N.register(
     "Delete permanently" : "Delete permanently",
     "IMAP web client" : "IMAP web client",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Easy to use email client which connects to your mail server via IMAP and SMTP.",
-    "Error loading message" : "Error loading message",
-    "Settings" : "Settings",
-    "Forwarding to %s" : "Forwarding to %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Click here if you are not automatically redirected within the next few seconds.",
-    "Redirect" : "Redirect",
-    "The link leads to %s" : "The link leads to %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>.",
-    "Continue to %s" : "Continue to %s",
-    "Delete account" : "Delete account",
-    "Try again" : "Try again",
-    "New message" : "New message",
-    "Account Settings" : "Account Settings",
-    "Aliases" : "Aliases",
-    "Mail address" : "Mail address",
-    "Display Name" : "Display Name",
-    "Account" : "Account",
-    "Toggle read" : "Toggle read",
-    "Delete" : "Delete",
-    "Keyboard shortcuts" : "Keyboard shortcuts",
-    "Speed up your Mail experience with these quick shortcuts." : "Speed up your Mail experience with these quick shortcuts.",
-    "Compose new message" : "Compose new message",
-    "Newer message" : "Newer message",
-    "Older message" : "Older message",
-    "Toggle star" : "Toggle star",
-    "Toggle unread" : "Toggle unread",
-    "Search" : "Search",
-    "Refresh" : "Refresh",
-    "Connect your mail account" : "Connect your mail account",
     "Name" : "Name",
     "Mail Address" : "Mail Address",
     "Password" : "Password",
-    "Manual configuration" : "Manual configuration",
     "IMAP Host" : "IMAP Host",
-    "IMAP security" : "IMAP security",
     "None" : "None",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP Port",
     "IMAP User" : "IMAP User",
     "IMAP Password" : "IMAP Password",
     "SMTP Host" : "SMTP Host",
-    "SMTP security" : "SMTP security",
     "SMTP Port" : "SMTP Port",
     "SMTP User" : "SMTP User",
     "SMTP Password" : "SMTP Password",
     "Connect" : "Connect",
+    "Add mail account" : "Add mail account",
+    "Use Gravatar and favicon avatars" : "Use Gravatar and favicon avatars",
+    "Keyboard shortcuts" : "Keyboard shortcuts",
     "from" : "from",
     "to" : "to",
     "cc" : "cc",
     "bcc" : "bcc",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Note that the mail came from a noreply address so your reply will probably not be read.",
     "Subject" : "Subject",
-    "Save all to Files" : "Save all to Files",
-    "Add mail account" : "Add mail account",
-    "Use Gravatar and favicon avatars" : "Use Gravatar and favicon avatars",
-    "No search results for" : "No search results for",
-    "The images have been blocked to protect your privacy." : "The images have been blocked to protect your privacy.",
-    "Show images from this sender" : "Show images from this sender",
-    "Forward" : "Forward",
-    "No messages in this folder" : "No messages in this folder",
+    "Sending …" : "Sending…",
+    "Message sent!" : "Message sent!",
+    "Send" : "Send",
     "Upload attachment" : "Upload attachment",
     "Add attachment from Files" : "Add attachment from Files",
+    "Choose a file to add as attachment" : "Choose a file to add as attachment",
+    "No messages in this folder" : "No messages in this folder",
+    "Delete" : "Delete",
+    "Could not load your message" : "Could not load your message",
     "Import into calendar" : "Import into calendar",
     "Download attachment" : "Download attachment",
-    "Save to Files" : "Save to Files"
+    "Save to Files" : "Save to Files",
+    "Choose a folder to store the attachment in" : "Choose a folder to store the attachment in",
+    "Save all to Files" : "Save all to Files",
+    "The images have been blocked to protect your privacy." : "The images have been blocked to protect your privacy.",
+    "New message" : "New message",
+    "Settings" : "Settings",
+    "Speed up your Mail experience with these quick shortcuts." : "Speed up your Mail experience with these quick shortcuts.",
+    "Compose new message" : "Compose new message",
+    "Newer message" : "Newer message",
+    "Older message" : "Older message",
+    "Toggle star" : "Toggle star",
+    "Toggle unread" : "Toggle unread",
+    "Search" : "Search",
+    "Refresh" : "Refresh",
+    "Connect your mail account" : "Connect your mail account",
+    "Show all folders" : "Show all folders",
+    "Collapse folders" : "Collapse folders",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n new message \nfrom {from}","%n new messages \nfrom {from}"],
+    "Nextcloud Mail" : "Nextcloud Mail",
+    "All inboxes" : "All inboxes",
+    "Could not load {tag}{name}{endtag}" : "Could not load {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "There was a problem loading {tag}{name}{endtag}",
+    "Could not load the desired message" : "Could not load the desired message",
+    "Could not load the message" : "Could not load the message",
+    "Error loading message" : "Error loading message",
+    "Forwarding to %s" : "Forwarding to %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Click here if you are not automatically redirected within the next few seconds.",
+    "Redirect" : "Redirect",
+    "The link leads to %s" : "The link leads to %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>.",
+    "Continue to %s" : "Continue to %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/en_GB.json b/l10n/en_GB.json
index 1ed7d51d3..a589cec56 100644
--- a/l10n/en_GB.json
+++ b/l10n/en_GB.json
@@ -1,55 +1,5 @@
 { "translations": {
     "Mail" : "Mail",
-    "Loading accounts" : "Loading accounts",
-    "Error while loading the accounts." : "Error whilst loading the accounts.",
-    "Can not load this folder." : "Can not load this folder.",
-    "Searching for {query}" : "Searching for {query}",
-    "Error while deleting message." : "Error whilst deleting message.",
-    "Forwarded message" : "Forwarded message",
-    "Choose a folder to store the attachment in" : "Choose a folder to store the attachment in",
-    "Attachments saved to Files." : "Attachments saved to Files.",
-    "Attachment saved to Files." : "Attachment saved to Files.",
-    "Error while saving attachments to Files." : "Error whilst saving attachments to Files.",
-    "Error while saving attachment to Files." : "Error whilst saving attachment to Files.",
-    "Message flag could not be set." : "Message flag could not be set.",
-    "Could not move message." : "Could not move message.",
-    "Invalid account" : "Invalid account",
-    "Invalid folder" : "Invalid folder",
-    "Error while creating the account: " : "Error while creating the account: ",
-    "Unknown error" : "Unknown error",
-    "Error while updating the account: " : "Error while updating the account: ",
-    "All inboxes" : "All inboxes",
-    "you" : "you",
-    "Send message to {email}" : "Send message to {email}",
-    "Could not load {tag}{name}{endtag}" : "Could not load {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "There was a problem loading {tag}{name}{endtag}",
-    "Could not load your message" : "Could not load your message",
-    "Could not load the desired message" : "Could not load the desired message",
-    "Could not load the message" : "Could not load the message",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n new message \nfrom {from}","%n new messages \nfrom {from}"],
-    "Nextcloud Mail" : "Nextcloud Mail",
-    "Save" : "Save",
-    "Saved" : "Saved",
-    "Show all folders" : "Show all folders",
-    "Collapse folders" : "Collapse folders",
-    "Error while deleting account." : "Error whilst deleting account.",
-    "Choose a file to add as attachment" : "Choose a file to add as attachment",
-    "An error occurred while uploading {fname}" : "An error occurred while uploading {fname}",
-    "Reply" : "Reply",
-    "Send" : "Send",
-    "Sending …" : "Sending…",
-    "Message sent!" : "Message sent!",
-    "Server error" : "Server error",
-    "An unknown error occurred" : "An unknown error occurred",
-    "Opening HTML drafts is not supported yet." : "Opening HTML drafts is not supported yet.",
-    "No writable calendars found" : "No writable calendars found",
-    "Error while importing the calendar event" : "Error whilst importing the calendar event",
-    "Error while downloading calendar event" : "Error whilst downloading calendar event",
-    "& others" : "& others",
-    "Error while loading messages." : "Error whilst loading messages.",
-    "Error while refreshing messages." : "Error while refreshing messages.",
-    "Setting up your account" : "Setting up your account",
     "Inbox" : "Inbox",
     "Sent" : "Sent",
     "Drafts" : "Drafts",
@@ -64,69 +14,70 @@
     "Delete permanently" : "Delete permanently",
     "IMAP web client" : "IMAP web client",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Easy to use email client which connects to your mail server via IMAP and SMTP.",
-    "Error loading message" : "Error loading message",
-    "Settings" : "Settings",
-    "Forwarding to %s" : "Forwarding to %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Click here if you are not automatically redirected within the next few seconds.",
-    "Redirect" : "Redirect",
-    "The link leads to %s" : "The link leads to %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>.",
-    "Continue to %s" : "Continue to %s",
-    "Delete account" : "Delete account",
-    "Try again" : "Try again",
-    "New message" : "New message",
-    "Account Settings" : "Account Settings",
-    "Aliases" : "Aliases",
-    "Mail address" : "Mail address",
-    "Display Name" : "Display Name",
-    "Account" : "Account",
-    "Toggle read" : "Toggle read",
-    "Delete" : "Delete",
-    "Keyboard shortcuts" : "Keyboard shortcuts",
-    "Speed up your Mail experience with these quick shortcuts." : "Speed up your Mail experience with these quick shortcuts.",
-    "Compose new message" : "Compose new message",
-    "Newer message" : "Newer message",
-    "Older message" : "Older message",
-    "Toggle star" : "Toggle star",
-    "Toggle unread" : "Toggle unread",
-    "Search" : "Search",
-    "Refresh" : "Refresh",
-    "Connect your mail account" : "Connect your mail account",
     "Name" : "Name",
     "Mail Address" : "Mail Address",
     "Password" : "Password",
-    "Manual configuration" : "Manual configuration",
     "IMAP Host" : "IMAP Host",
-    "IMAP security" : "IMAP security",
     "None" : "None",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP Port",
     "IMAP User" : "IMAP User",
     "IMAP Password" : "IMAP Password",
     "SMTP Host" : "SMTP Host",
-    "SMTP security" : "SMTP security",
     "SMTP Port" : "SMTP Port",
     "SMTP User" : "SMTP User",
     "SMTP Password" : "SMTP Password",
     "Connect" : "Connect",
+    "Add mail account" : "Add mail account",
+    "Use Gravatar and favicon avatars" : "Use Gravatar and favicon avatars",
+    "Keyboard shortcuts" : "Keyboard shortcuts",
     "from" : "from",
     "to" : "to",
     "cc" : "cc",
     "bcc" : "bcc",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Note that the mail came from a noreply address so your reply will probably not be read.",
     "Subject" : "Subject",
-    "Save all to Files" : "Save all to Files",
-    "Add mail account" : "Add mail account",
-    "Use Gravatar and favicon avatars" : "Use Gravatar and favicon avatars",
-    "No search results for" : "No search results for",
-    "The images have been blocked to protect your privacy." : "The images have been blocked to protect your privacy.",
-    "Show images from this sender" : "Show images from this sender",
-    "Forward" : "Forward",
-    "No messages in this folder" : "No messages in this folder",
+    "Sending …" : "Sending…",
+    "Message sent!" : "Message sent!",
+    "Send" : "Send",
     "Upload attachment" : "Upload attachment",
     "Add attachment from Files" : "Add attachment from Files",
+    "Choose a file to add as attachment" : "Choose a file to add as attachment",
+    "No messages in this folder" : "No messages in this folder",
+    "Delete" : "Delete",
+    "Could not load your message" : "Could not load your message",
     "Import into calendar" : "Import into calendar",
     "Download attachment" : "Download attachment",
-    "Save to Files" : "Save to Files"
+    "Save to Files" : "Save to Files",
+    "Choose a folder to store the attachment in" : "Choose a folder to store the attachment in",
+    "Save all to Files" : "Save all to Files",
+    "The images have been blocked to protect your privacy." : "The images have been blocked to protect your privacy.",
+    "New message" : "New message",
+    "Settings" : "Settings",
+    "Speed up your Mail experience with these quick shortcuts." : "Speed up your Mail experience with these quick shortcuts.",
+    "Compose new message" : "Compose new message",
+    "Newer message" : "Newer message",
+    "Older message" : "Older message",
+    "Toggle star" : "Toggle star",
+    "Toggle unread" : "Toggle unread",
+    "Search" : "Search",
+    "Refresh" : "Refresh",
+    "Connect your mail account" : "Connect your mail account",
+    "Show all folders" : "Show all folders",
+    "Collapse folders" : "Collapse folders",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n new message \nfrom {from}","%n new messages \nfrom {from}"],
+    "Nextcloud Mail" : "Nextcloud Mail",
+    "All inboxes" : "All inboxes",
+    "Could not load {tag}{name}{endtag}" : "Could not load {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "There was a problem loading {tag}{name}{endtag}",
+    "Could not load the desired message" : "Could not load the desired message",
+    "Could not load the message" : "Could not load the message",
+    "Error loading message" : "Error loading message",
+    "Forwarding to %s" : "Forwarding to %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Click here if you are not automatically redirected within the next few seconds.",
+    "Redirect" : "Redirect",
+    "The link leads to %s" : "The link leads to %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>.",
+    "Continue to %s" : "Continue to %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/eo.js b/l10n/eo.js
index 75052b36b..a7aae7d66 100644
--- a/l10n/eo.js
+++ b/l10n/eo.js
@@ -2,31 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Retpoŝto",
-    "Error while loading the accounts." : "Eraris ŝargo de la kontoj.",
-    "Can not load this folder." : "Ne ŝargeblis ĉi tiun dosierujon ",
-    "Error while deleting message." : "Eraris forigo de mesaĝo.",
-    "Attachments saved to Files." : "Kunsendaĵoj konserviĝis en Dosierojn.",
-    "Attachment saved to Files." : "Kunsendaĵo konserviĝis en Dosierojn.",
-    "Error while saving attachments to Files." : "Eraris konservo de kunsendaĵoj en Dosierojn.",
-    "Error while saving attachment to Files." : "Eraris konservo de kunsendaĵo en Dosierojn.",
-    "Error while creating the account: " : "Eraris kreo de konto:",
-    "Unknown error" : "Nekonata eraro",
-    "All inboxes" : "Ĉiuj enirkestoj",
-    "you" : "vi",
-    "Send message to {email}" : "Mesaĝi al {email}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n nova mesaĝo\nde {from}","%n novaj mesaĝoj \nde {from}"],
-    "Save" : "Konservi",
-    "Saved" : "Konservita",
-    "Error while deleting account." : "Eraris forigo de konto.",
-    "Choose a file to add as attachment" : "Elektu dosieron por aldoni kiel kunsendaĵo",
-    "Reply" : "Respondi",
-    "Send" : "Sendi",
-    "Sending …" : "Sendante...",
-    "Message sent!" : "Mesaĝo sendiĝis!",
-    "Server error" : "Eraro pri servilo",
-    "& others" : "kaj aliaj",
-    "Error while loading messages." : "Eraris ŝargo de mesaĝoj.",
     "Inbox" : "Enirkesto",
     "Sent" : "Senditujo",
     "Drafts" : "Malnetujo",
@@ -37,10 +12,6 @@ OC.L10N.register(
     "Favorites" : "Pliŝatoj",
     "Creating account failed: " : "Kreo de konto malsukcesis:",
     "Delete permanently" : "Forigi por ĉiam",
-    "Error loading message" : "Eraris ŝargo de mesaĝo",
-    "Continue to %s" : "Daŭri al %s",
-    "Delete" : "Forigi",
-    "Search" : "Serĉi",
     "Name" : "Nomo",
     "Mail Address" : "Retpoŝtadreso",
     "Password" : "Pasvorto",
@@ -48,6 +19,17 @@ OC.L10N.register(
     "Connect" : "Konekti",
     "from" : "el",
     "to" : "al",
-    "Subject" : "Temo"
+    "Subject" : "Temo",
+    "Sending …" : "Sendante...",
+    "Message sent!" : "Mesaĝo sendiĝis!",
+    "Send" : "Sendi",
+    "Choose a file to add as attachment" : "Elektu dosieron por aldoni kiel kunsendaĵo",
+    "Delete" : "Forigi",
+    "Search" : "Serĉi",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n nova mesaĝo\nde {from}","%n novaj mesaĝoj \nde {from}"],
+    "All inboxes" : "Ĉiuj enirkestoj",
+    "Error loading message" : "Eraris ŝargo de mesaĝo",
+    "Continue to %s" : "Daŭri al %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/eo.json b/l10n/eo.json
index 3a5895b96..4f964aa66 100644
--- a/l10n/eo.json
+++ b/l10n/eo.json
@@ -1,30 +1,5 @@
 { "translations": {
     "Mail" : "Retpoŝto",
-    "Error while loading the accounts." : "Eraris ŝargo de la kontoj.",
-    "Can not load this folder." : "Ne ŝargeblis ĉi tiun dosierujon ",
-    "Error while deleting message." : "Eraris forigo de mesaĝo.",
-    "Attachments saved to Files." : "Kunsendaĵoj konserviĝis en Dosierojn.",
-    "Attachment saved to Files." : "Kunsendaĵo konserviĝis en Dosierojn.",
-    "Error while saving attachments to Files." : "Eraris konservo de kunsendaĵoj en Dosierojn.",
-    "Error while saving attachment to Files." : "Eraris konservo de kunsendaĵo en Dosierojn.",
-    "Error while creating the account: " : "Eraris kreo de konto:",
-    "Unknown error" : "Nekonata eraro",
-    "All inboxes" : "Ĉiuj enirkestoj",
-    "you" : "vi",
-    "Send message to {email}" : "Mesaĝi al {email}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n nova mesaĝo\nde {from}","%n novaj mesaĝoj \nde {from}"],
-    "Save" : "Konservi",
-    "Saved" : "Konservita",
-    "Error while deleting account." : "Eraris forigo de konto.",
-    "Choose a file to add as attachment" : "Elektu dosieron por aldoni kiel kunsendaĵo",
-    "Reply" : "Respondi",
-    "Send" : "Sendi",
-    "Sending …" : "Sendante...",
-    "Message sent!" : "Mesaĝo sendiĝis!",
-    "Server error" : "Eraro pri servilo",
-    "& others" : "kaj aliaj",
-    "Error while loading messages." : "Eraris ŝargo de mesaĝoj.",
     "Inbox" : "Enirkesto",
     "Sent" : "Senditujo",
     "Drafts" : "Malnetujo",
@@ -35,10 +10,6 @@
     "Favorites" : "Pliŝatoj",
     "Creating account failed: " : "Kreo de konto malsukcesis:",
     "Delete permanently" : "Forigi por ĉiam",
-    "Error loading message" : "Eraris ŝargo de mesaĝo",
-    "Continue to %s" : "Daŭri al %s",
-    "Delete" : "Forigi",
-    "Search" : "Serĉi",
     "Name" : "Nomo",
     "Mail Address" : "Retpoŝtadreso",
     "Password" : "Pasvorto",
@@ -46,6 +17,17 @@
     "Connect" : "Konekti",
     "from" : "el",
     "to" : "al",
-    "Subject" : "Temo"
+    "Subject" : "Temo",
+    "Sending …" : "Sendante...",
+    "Message sent!" : "Mesaĝo sendiĝis!",
+    "Send" : "Sendi",
+    "Choose a file to add as attachment" : "Elektu dosieron por aldoni kiel kunsendaĵo",
+    "Delete" : "Forigi",
+    "Search" : "Serĉi",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n nova mesaĝo\nde {from}","%n novaj mesaĝoj \nde {from}"],
+    "All inboxes" : "Ĉiuj enirkestoj",
+    "Error loading message" : "Eraris ŝargo de mesaĝo",
+    "Continue to %s" : "Daŭri al %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/es.js b/l10n/es.js
index 51a97a432..105d50f30 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -2,56 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Correo electrónico",
-    "Loading accounts" : "Cargando cuentas",
-    "Error while loading the accounts." : "Error al cargar las cuentas.",
-    "Can not load this folder." : "No se puede cargar esta carpeta.",
-    "Searching for {query}" : "Buscando {query}",
-    "Error while deleting message." : "Error al eliminar el mensaje.",
-    "Forwarded message" : "Mensaje reenviado",
-    "Choose a folder to store the attachment in" : "Escoja una carpeta para guardar el adjunto",
-    "Attachments saved to Files." : "Archivos adjuntos guardados en Archivos.",
-    "Attachment saved to Files." : "Archivo adjunto guardado en Archivos.",
-    "Error while saving attachments to Files." : "Error al guardar archivos adjuntos en Archivos.",
-    "Error while saving attachment to Files." : "Error al guardar archivo adjunto en Archivos.",
-    "Message flag could not be set." : "No se ha podido marcar el mensaje. ",
-    "Could not move message." : "No se ha podido mover el mensaje",
-    "Invalid account" : "Cuenta inválida",
-    "Invalid folder" : "Carpeta inválida",
-    "Error while creating the account: " : "Error al crear la cuenta:",
-    "Unknown error" : "Error desconocido",
-    "Error while updating the account: " : "Error al actualizar la cuenta:",
-    "All inboxes" : "Todas las bandejas de entrada",
-    "you" : "ti",
-    "Send message to {email}" : "Enviar mensaje a {email}",
-    "Could not load {tag}{name}{endtag}" : "No se ha podido cargar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Ha habido un problema al cargar {tag}{name}{endtag}",
-    "Could not load your message" : "No se ha podido cargar tu mensaje",
-    "Could not load the desired message" : "No se ha podido cargar el mensaje deseado",
-    "Could not load the message" : "No se ha podido cargar el mensaje",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos\nde {from}"],
-    "Nextcloud Mail" : "Correo de Nextcloud",
-    "Save" : "Guardar",
-    "Saved" : "Guardado",
-    "Show all folders" : "Mostrar todas las carpetas",
-    "Collapse folders" : "Ocultar carpetas",
-    "Error while deleting account." : "Error al eliminar la cuenta.",
-    "Choose a file to add as attachment" : "Escoja un archivo para adjuntar",
-    "An error occurred while uploading {fname}" : "Ha ocurrido un error al cargar {fname}",
-    "Reply" : "Responder",
-    "Send" : "Enviar",
-    "Sending …" : "Enviando ...",
-    "Message sent!" : "¡Mensaje enviado!",
-    "Server error" : "Error en el servidor",
-    "An unknown error occurred" : "Se ha producido un error desconocido",
-    "Opening HTML drafts is not supported yet." : "La apertura de borradores HTML aun no está soportada.",
-    "No writable calendars found" : "No se han encontrado calendarios con permiso de escritura",
-    "Error while importing the calendar event" : "Error al importar el evento de calendario",
-    "Error while downloading calendar event" : "Error al descargar el evento de calendario",
-    "& others" : "y otros",
-    "Error while loading messages." : "Error al cargar los mensajes.",
-    "Error while refreshing messages." : "Error al recargar los mensajes.",
-    "Setting up your account" : "Configurando tu cuenta",
     "Inbox" : "Bandeja de entrada",
     "Sent" : "Enviados",
     "Drafts" : "Borradores",
@@ -66,69 +16,70 @@ OC.L10N.register(
     "Delete permanently" : "Eliminar permanentemente",
     "IMAP web client" : "Cliente IMAP web",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Cliente de correo fácil de usar que se conecta a tu servidor de correo vía IMAP y SMTP.",
-    "Error loading message" : "Error al cargar el mensaje",
-    "Settings" : "Ajustes",
-    "Forwarding to %s" : "Reenviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Haz clic aquí si no eres redirigido automáticamente en unos segundos.",
-    "Redirect" : "Redirigir",
-    "The link leads to %s" : "El enlace conduce a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no desea visitar esa página, puede volver a <a href=\"%s\">Correo</a>.",
-    "Continue to %s" : "Continuar a %s",
-    "Delete account" : "Eliminar cuenta",
-    "Try again" : "Vuelve a intentarlo",
-    "New message" : "Nuevo mensaje",
-    "Account Settings" : "Ajustes de la cuenta",
-    "Aliases" : "Alias",
-    "Mail address" : "Dirección de correo electrónico",
-    "Display Name" : "Nombre a mostrar",
-    "Account" : "Cuenta",
-    "Toggle read" : "Marcar/desmarcar leído",
-    "Delete" : "Eliminar",
-    "Keyboard shortcuts" : "Atajos de teclado",
-    "Speed up your Mail experience with these quick shortcuts." : "Acelera tu experiencia de Correo con estos rápidos atajos de teclado.",
-    "Compose new message" : "Crear nuevo mensaje",
-    "Newer message" : "Mensaje más moderno",
-    "Older message" : "Mensaje más antiguo",
-    "Toggle star" : "Marcar/desmarcar con estrella",
-    "Toggle unread" : "Marcar/desmarcar como leído",
-    "Search" : "Buscar",
-    "Refresh" : "Recargar",
-    "Connect your mail account" : "Conecte su cuenta de correo electrónico",
     "Name" : "Nombre",
     "Mail Address" : "Dirección de correo electrónico",
     "Password" : "Contraseña",
-    "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
-    "IMAP security" : "Seguridad IMAP",
     "None" : "Ninguno",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "IMAP Password" : "Contraseña IMAP",
     "SMTP Host" : "Servidor SMTP",
-    "SMTP security" : "Seguridad SMTP",
     "SMTP Port" : "Puerto SMTP",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contraseña SMTP",
     "Connect" : "Conectar",
+    "Add mail account" : "Añadir cuenta de correo",
+    "Use Gravatar and favicon avatars" : "Usar avatares de Gravatar y favicon",
+    "Keyboard shortcuts" : "Atajos de teclado",
     "from" : "de",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Nota: el correo viene de una dirección noreply (no responder), por lo que probablemente no será leído.",
     "Subject" : "Asunto",
-    "Save all to Files" : "Guardar todo en Archivos",
-    "Add mail account" : "Añadir cuenta de correo",
-    "Use Gravatar and favicon avatars" : "Usar avatares de Gravatar y favicon",
-    "No search results for" : "Ningún resultado para la búsqueda de",
-    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad.",
-    "Show images from this sender" : "Mostrar imágenes de este remitente",
-    "Forward" : "Reenviar",
-    "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "¡Mensaje enviado!",
+    "Send" : "Enviar",
     "Upload attachment" : "Subir adjunto",
     "Add attachment from Files" : "Añadir adjunto desde Archivos",
+    "Choose a file to add as attachment" : "Escoja un archivo para adjuntar",
+    "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Delete" : "Eliminar",
+    "Could not load your message" : "No se ha podido cargar tu mensaje",
     "Import into calendar" : "Importar al calendario",
     "Download attachment" : "Descargar adjunto",
-    "Save to Files" : "Guardar en Archivos"
+    "Save to Files" : "Guardar en Archivos",
+    "Choose a folder to store the attachment in" : "Escoja una carpeta para guardar el adjunto",
+    "Save all to Files" : "Guardar todo en Archivos",
+    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad.",
+    "New message" : "Nuevo mensaje",
+    "Settings" : "Ajustes",
+    "Speed up your Mail experience with these quick shortcuts." : "Acelera tu experiencia de Correo con estos rápidos atajos de teclado.",
+    "Compose new message" : "Crear nuevo mensaje",
+    "Newer message" : "Mensaje más moderno",
+    "Older message" : "Mensaje más antiguo",
+    "Toggle star" : "Marcar/desmarcar con estrella",
+    "Toggle unread" : "Marcar/desmarcar como leído",
+    "Search" : "Buscar",
+    "Refresh" : "Recargar",
+    "Connect your mail account" : "Conecte su cuenta de correo electrónico",
+    "Show all folders" : "Mostrar todas las carpetas",
+    "Collapse folders" : "Ocultar carpetas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos\nde {from}"],
+    "Nextcloud Mail" : "Correo de Nextcloud",
+    "All inboxes" : "Todas las bandejas de entrada",
+    "Could not load {tag}{name}{endtag}" : "No se ha podido cargar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Ha habido un problema al cargar {tag}{name}{endtag}",
+    "Could not load the desired message" : "No se ha podido cargar el mensaje deseado",
+    "Could not load the message" : "No se ha podido cargar el mensaje",
+    "Error loading message" : "Error al cargar el mensaje",
+    "Forwarding to %s" : "Reenviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Haz clic aquí si no eres redirigido automáticamente en unos segundos.",
+    "Redirect" : "Redirigir",
+    "The link leads to %s" : "El enlace conduce a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no desea visitar esa página, puede volver a <a href=\"%s\">Correo</a>.",
+    "Continue to %s" : "Continuar a %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/es.json b/l10n/es.json
index aa5e4f81c..76eb85881 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -1,55 +1,5 @@
 { "translations": {
     "Mail" : "Correo electrónico",
-    "Loading accounts" : "Cargando cuentas",
-    "Error while loading the accounts." : "Error al cargar las cuentas.",
-    "Can not load this folder." : "No se puede cargar esta carpeta.",
-    "Searching for {query}" : "Buscando {query}",
-    "Error while deleting message." : "Error al eliminar el mensaje.",
-    "Forwarded message" : "Mensaje reenviado",
-    "Choose a folder to store the attachment in" : "Escoja una carpeta para guardar el adjunto",
-    "Attachments saved to Files." : "Archivos adjuntos guardados en Archivos.",
-    "Attachment saved to Files." : "Archivo adjunto guardado en Archivos.",
-    "Error while saving attachments to Files." : "Error al guardar archivos adjuntos en Archivos.",
-    "Error while saving attachment to Files." : "Error al guardar archivo adjunto en Archivos.",
-    "Message flag could not be set." : "No se ha podido marcar el mensaje. ",
-    "Could not move message." : "No se ha podido mover el mensaje",
-    "Invalid account" : "Cuenta inválida",
-    "Invalid folder" : "Carpeta inválida",
-    "Error while creating the account: " : "Error al crear la cuenta:",
-    "Unknown error" : "Error desconocido",
-    "Error while updating the account: " : "Error al actualizar la cuenta:",
-    "All inboxes" : "Todas las bandejas de entrada",
-    "you" : "ti",
-    "Send message to {email}" : "Enviar mensaje a {email}",
-    "Could not load {tag}{name}{endtag}" : "No se ha podido cargar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Ha habido un problema al cargar {tag}{name}{endtag}",
-    "Could not load your message" : "No se ha podido cargar tu mensaje",
-    "Could not load the desired message" : "No se ha podido cargar el mensaje deseado",
-    "Could not load the message" : "No se ha podido cargar el mensaje",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos\nde {from}"],
-    "Nextcloud Mail" : "Correo de Nextcloud",
-    "Save" : "Guardar",
-    "Saved" : "Guardado",
-    "Show all folders" : "Mostrar todas las carpetas",
-    "Collapse folders" : "Ocultar carpetas",
-    "Error while deleting account." : "Error al eliminar la cuenta.",
-    "Choose a file to add as attachment" : "Escoja un archivo para adjuntar",
-    "An error occurred while uploading {fname}" : "Ha ocurrido un error al cargar {fname}",
-    "Reply" : "Responder",
-    "Send" : "Enviar",
-    "Sending …" : "Enviando ...",
-    "Message sent!" : "¡Mensaje enviado!",
-    "Server error" : "Error en el servidor",
-    "An unknown error occurred" : "Se ha producido un error desconocido",
-    "Opening HTML drafts is not supported yet." : "La apertura de borradores HTML aun no está soportada.",
-    "No writable calendars found" : "No se han encontrado calendarios con permiso de escritura",
-    "Error while importing the calendar event" : "Error al importar el evento de calendario",
-    "Error while downloading calendar event" : "Error al descargar el evento de calendario",
-    "& others" : "y otros",
-    "Error while loading messages." : "Error al cargar los mensajes.",
-    "Error while refreshing messages." : "Error al recargar los mensajes.",
-    "Setting up your account" : "Configurando tu cuenta",
     "Inbox" : "Bandeja de entrada",
     "Sent" : "Enviados",
     "Drafts" : "Borradores",
@@ -64,69 +14,70 @@
     "Delete permanently" : "Eliminar permanentemente",
     "IMAP web client" : "Cliente IMAP web",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Cliente de correo fácil de usar que se conecta a tu servidor de correo vía IMAP y SMTP.",
-    "Error loading message" : "Error al cargar el mensaje",
-    "Settings" : "Ajustes",
-    "Forwarding to %s" : "Reenviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Haz clic aquí si no eres redirigido automáticamente en unos segundos.",
-    "Redirect" : "Redirigir",
-    "The link leads to %s" : "El enlace conduce a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no desea visitar esa página, puede volver a <a href=\"%s\">Correo</a>.",
-    "Continue to %s" : "Continuar a %s",
-    "Delete account" : "Eliminar cuenta",
-    "Try again" : "Vuelve a intentarlo",
-    "New message" : "Nuevo mensaje",
-    "Account Settings" : "Ajustes de la cuenta",
-    "Aliases" : "Alias",
-    "Mail address" : "Dirección de correo electrónico",
-    "Display Name" : "Nombre a mostrar",
-    "Account" : "Cuenta",
-    "Toggle read" : "Marcar/desmarcar leído",
-    "Delete" : "Eliminar",
-    "Keyboard shortcuts" : "Atajos de teclado",
-    "Speed up your Mail experience with these quick shortcuts." : "Acelera tu experiencia de Correo con estos rápidos atajos de teclado.",
-    "Compose new message" : "Crear nuevo mensaje",
-    "Newer message" : "Mensaje más moderno",
-    "Older message" : "Mensaje más antiguo",
-    "Toggle star" : "Marcar/desmarcar con estrella",
-    "Toggle unread" : "Marcar/desmarcar como leído",
-    "Search" : "Buscar",
-    "Refresh" : "Recargar",
-    "Connect your mail account" : "Conecte su cuenta de correo electrónico",
     "Name" : "Nombre",
     "Mail Address" : "Dirección de correo electrónico",
     "Password" : "Contraseña",
-    "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
-    "IMAP security" : "Seguridad IMAP",
     "None" : "Ninguno",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "IMAP Password" : "Contraseña IMAP",
     "SMTP Host" : "Servidor SMTP",
-    "SMTP security" : "Seguridad SMTP",
     "SMTP Port" : "Puerto SMTP",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contraseña SMTP",
     "Connect" : "Conectar",
+    "Add mail account" : "Añadir cuenta de correo",
+    "Use Gravatar and favicon avatars" : "Usar avatares de Gravatar y favicon",
+    "Keyboard shortcuts" : "Atajos de teclado",
     "from" : "de",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Nota: el correo viene de una dirección noreply (no responder), por lo que probablemente no será leído.",
     "Subject" : "Asunto",
-    "Save all to Files" : "Guardar todo en Archivos",
-    "Add mail account" : "Añadir cuenta de correo",
-    "Use Gravatar and favicon avatars" : "Usar avatares de Gravatar y favicon",
-    "No search results for" : "Ningún resultado para la búsqueda de",
-    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad.",
-    "Show images from this sender" : "Mostrar imágenes de este remitente",
-    "Forward" : "Reenviar",
-    "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "¡Mensaje enviado!",
+    "Send" : "Enviar",
     "Upload attachment" : "Subir adjunto",
     "Add attachment from Files" : "Añadir adjunto desde Archivos",
+    "Choose a file to add as attachment" : "Escoja un archivo para adjuntar",
+    "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Delete" : "Eliminar",
+    "Could not load your message" : "No se ha podido cargar tu mensaje",
     "Import into calendar" : "Importar al calendario",
     "Download attachment" : "Descargar adjunto",
-    "Save to Files" : "Guardar en Archivos"
+    "Save to Files" : "Guardar en Archivos",
+    "Choose a folder to store the attachment in" : "Escoja una carpeta para guardar el adjunto",
+    "Save all to Files" : "Guardar todo en Archivos",
+    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad.",
+    "New message" : "Nuevo mensaje",
+    "Settings" : "Ajustes",
+    "Speed up your Mail experience with these quick shortcuts." : "Acelera tu experiencia de Correo con estos rápidos atajos de teclado.",
+    "Compose new message" : "Crear nuevo mensaje",
+    "Newer message" : "Mensaje más moderno",
+    "Older message" : "Mensaje más antiguo",
+    "Toggle star" : "Marcar/desmarcar con estrella",
+    "Toggle unread" : "Marcar/desmarcar como leído",
+    "Search" : "Buscar",
+    "Refresh" : "Recargar",
+    "Connect your mail account" : "Conecte su cuenta de correo electrónico",
+    "Show all folders" : "Mostrar todas las carpetas",
+    "Collapse folders" : "Ocultar carpetas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos\nde {from}"],
+    "Nextcloud Mail" : "Correo de Nextcloud",
+    "All inboxes" : "Todas las bandejas de entrada",
+    "Could not load {tag}{name}{endtag}" : "No se ha podido cargar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Ha habido un problema al cargar {tag}{name}{endtag}",
+    "Could not load the desired message" : "No se ha podido cargar el mensaje deseado",
+    "Could not load the message" : "No se ha podido cargar el mensaje",
+    "Error loading message" : "Error al cargar el mensaje",
+    "Forwarding to %s" : "Reenviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Haz clic aquí si no eres redirigido automáticamente en unos segundos.",
+    "Redirect" : "Redirigir",
+    "The link leads to %s" : "El enlace conduce a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no desea visitar esa página, puede volver a <a href=\"%s\">Correo</a>.",
+    "Continue to %s" : "Continuar a %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/es_419.js b/l10n/es_419.js
index 4de7f878e..c2c1f9f4b 100644
--- a/l10n/es_419.js
+++ b/l10n/es_419.js
@@ -2,51 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Correo",
-    "Loading accounts" : "Cargando cuentas",
-    "Error while loading the accounts." : "Se presentó un error al cargar las cuentas.",
-    "Can not load this folder." : "No se puede cargar esta carpeta.",
-    "Searching for {query}" : "Buscando a {query}",
-    "Error while deleting message." : "Se presentó un error al borrar el mensaje.",
-    "Forwarded message" : "mensaje reenviado",
-    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
-    "Attachments saved to Files." : "Adjuntos guardados a Archivos. ",
-    "Attachment saved to Files." : "Adjunto guardado en Archivos. ",
-    "Error while saving attachments to Files." : "Se presentó un error al guardar los adjuntos en Archivos.",
-    "Error while saving attachment to Files." : "Se presentó un error al guardar los adjuntos en Archivos",
-    "Message flag could not be set." : "No fue posible establecer la bandera del mensaje. ",
-    "Could not move message." : "No fue posible mover el mensaje.",
-    "Invalid account" : "Cuenta inválida",
-    "Invalid folder" : "Carpeta inválida",
-    "Error while creating the account: " : "Se presentó un error al crear la cuenta:",
-    "Unknown error" : "Error desconocido",
-    "All inboxes" : "Todos los buzones de entrada",
-    "you" : "tú",
-    "Send message to {email}" : "Enviar mensaje a {email}",
-    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
-    "Nextcloud Mail" : "Correo Nextcloud",
-    "Save" : "Guardar",
-    "Show all folders" : "Mostrar todas las carpetas",
-    "Collapse folders" : "Compactar carpetas",
-    "Error while deleting account." : "Se presetó un error al borrar la cuenta.",
-    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "An error occurred while uploading {fname}" : "Se presentó un error durante la carga {fname}",
-    "Reply" : "Responder",
-    "Send" : "Enviar",
-    "Sending …" : "Enviando ...",
-    "Message sent!" : "¡Mensaje enviado!",
-    "Server error" : "Se presentó un error en el servidor",
-    "An unknown error occurred" : "Se presentó un error desconocido",
-    "Opening HTML drafts is not supported yet." : "Abrir borradores HTML aún no está soportado.",
-    "No writable calendars found" : "No se encontraron calendarios editables",
-    "Error while importing the calendar event" : "Se presentó un error al importar el evento del calendario",
-    "Error while downloading calendar event" : "Se presentó un error al descargar el evento del calendario",
-    "& others" : "& otros",
-    "Error while loading messages." : "Se presentói un error al cargar los mensajes.",
-    "Error while refreshing messages." : "Se presentó un error al actualizar los mensajes.",
-    "Setting up your account" : "Configura tu cuenta",
     "Inbox" : "Buzón de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -58,65 +13,66 @@ OC.L10N.register(
     "Auto detect failed. Please use manual mode." : "Se presentó una falla en la auto detección. Por favor usa el modo manual.",
     "Creating account failed: " : "Se presentó una falla al crear la cuenta:",
     "Delete permanently" : "Borrar permanentemente",
-    "Error loading message" : "Se presentó un error al cargar el mensaje",
-    "Settings" : "Configuraciones ",
-    "Forwarding to %s" : "Reenviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
-    "Redirect" : "Redireccionar",
-    "The link leads to %s" : "La liga lleva a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
-    "Continue to %s" : "Continuar a %s",
-    "Delete account" : "Borrar cuenta",
-    "Try again" : "Reintentar",
-    "New message" : "Mensaje nuevo",
-    "Account Settings" : "Configuraciones  de la cuenta",
-    "Aliases" : "Aliases",
-    "Mail address" : "Dirección de correo",
-    "Display Name" : "Nombre a desplegar",
-    "Delete" : "Borrar",
-    "Keyboard shortcuts" : "Atajos del teclado",
-    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
-    "Compose new message" : "Escribir mensaje nuevo",
-    "Newer message" : "Mensaje más nuevo",
-    "Older message" : "Mensaje más antiguo",
-    "Toggle star" : "Alternar favoritos",
-    "Toggle unread" : "Alternar no leídos",
-    "Search" : "Buscar",
-    "Refresh" : "Actualizar",
-    "Connect your mail account" : "Conecta tu cuenta de correo",
     "Name" : "Nombre",
     "Mail Address" : "Dirección de Correo",
     "Password" : "Contraseña",
-    "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
-    "IMAP security" : "Seguridad IMAP",
     "None" : "Ninguno",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "IMAP Password" : "Contraseña IMAP",
     "SMTP Host" : "Servior SMTP",
-    "SMTP security" : "Seguridad SMTP",
     "SMTP Port" : "Puerto SMTP",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contraseña SMTP",
     "Connect" : "Conectar",
+    "Add mail account" : "Agregar cuenta de correo",
+    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
+    "Keyboard shortcuts" : "Atajos del teclado",
     "from" : "de",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
     "Subject" : "Asunto",
-    "Save all to Files" : "Guardar todo a Archivos",
-    "Add mail account" : "Agregar cuenta de correo",
-    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
-    "No search results for" : "No se obtuvieron resultados para la búsqueda de ",
-    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
-    "Show images from this sender" : "Mostrar imagenes de este remitente",
-    "Forward" : "Reenviar",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "¡Mensaje enviado!",
+    "Send" : "Enviar",
     "Upload attachment" : "Cargar adjunto",
     "Add attachment from Files" : "Agregar adjunto desd Archivos",
+    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "Delete" : "Borrar",
     "Import into calendar" : "Importar al calendario",
     "Download attachment" : "Descargar adjunto",
-    "Save to Files" : "Guardar a Archivos"
+    "Save to Files" : "Guardar a Archivos",
+    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
+    "Save all to Files" : "Guardar todo a Archivos",
+    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
+    "New message" : "Mensaje nuevo",
+    "Settings" : "Configuraciones ",
+    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
+    "Compose new message" : "Escribir mensaje nuevo",
+    "Newer message" : "Mensaje más nuevo",
+    "Older message" : "Mensaje más antiguo",
+    "Toggle star" : "Alternar favoritos",
+    "Toggle unread" : "Alternar no leídos",
+    "Search" : "Buscar",
+    "Refresh" : "Actualizar",
+    "Connect your mail account" : "Conecta tu cuenta de correo",
+    "Show all folders" : "Mostrar todas las carpetas",
+    "Collapse folders" : "Compactar carpetas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
+    "Nextcloud Mail" : "Correo Nextcloud",
+    "All inboxes" : "Todos los buzones de entrada",
+    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
+    "Error loading message" : "Se presentó un error al cargar el mensaje",
+    "Forwarding to %s" : "Reenviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
+    "Redirect" : "Redireccionar",
+    "The link leads to %s" : "La liga lleva a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
+    "Continue to %s" : "Continuar a %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/es_419.json b/l10n/es_419.json
index 41b28b5dd..2564f869e 100644
--- a/l10n/es_419.json
+++ b/l10n/es_419.json
@@ -1,50 +1,5 @@
 { "translations": {
     "Mail" : "Correo",
-    "Loading accounts" : "Cargando cuentas",
-    "Error while loading the accounts." : "Se presentó un error al cargar las cuentas.",
-    "Can not load this folder." : "No se puede cargar esta carpeta.",
-    "Searching for {query}" : "Buscando a {query}",
-    "Error while deleting message." : "Se presentó un error al borrar el mensaje.",
-    "Forwarded message" : "mensaje reenviado",
-    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
-    "Attachments saved to Files." : "Adjuntos guardados a Archivos. ",
-    "Attachment saved to Files." : "Adjunto guardado en Archivos. ",
-    "Error while saving attachments to Files." : "Se presentó un error al guardar los adjuntos en Archivos.",
-    "Error while saving attachment to Files." : "Se presentó un error al guardar los adjuntos en Archivos",
-    "Message flag could not be set." : "No fue posible establecer la bandera del mensaje. ",
-    "Could not move message." : "No fue posible mover el mensaje.",
-    "Invalid account" : "Cuenta inválida",
-    "Invalid folder" : "Carpeta inválida",
-    "Error while creating the account: " : "Se presentó un error al crear la cuenta:",
-    "Unknown error" : "Error desconocido",
-    "All inboxes" : "Todos los buzones de entrada",
-    "you" : "tú",
-    "Send message to {email}" : "Enviar mensaje a {email}",
-    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
-    "Nextcloud Mail" : "Correo Nextcloud",
-    "Save" : "Guardar",
-    "Show all folders" : "Mostrar todas las carpetas",
-    "Collapse folders" : "Compactar carpetas",
-    "Error while deleting account." : "Se presetó un error al borrar la cuenta.",
-    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "An error occurred while uploading {fname}" : "Se presentó un error durante la carga {fname}",
-    "Reply" : "Responder",
-    "Send" : "Enviar",
-    "Sending …" : "Enviando ...",
-    "Message sent!" : "¡Mensaje enviado!",
-    "Server error" : "Se presentó un error en el servidor",
-    "An unknown error occurred" : "Se presentó un error desconocido",
-    "Opening HTML drafts is not supported yet." : "Abrir borradores HTML aún no está soportado.",
-    "No writable calendars found" : "No se encontraron calendarios editables",
-    "Error while importing the calendar event" : "Se presentó un error al importar el evento del calendario",
-    "Error while downloading calendar event" : "Se presentó un error al descargar el evento del calendario",
-    "& others" : "& otros",
-    "Error while loading messages." : "Se presentói un error al cargar los mensajes.",
-    "Error while refreshing messages." : "Se presentó un error al actualizar los mensajes.",
-    "Setting up your account" : "Configura tu cuenta",
     "Inbox" : "Buzón de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -56,65 +11,66 @@
     "Auto detect failed. Please use manual mode." : "Se presentó una falla en la auto detección. Por favor usa el modo manual.",
     "Creating account failed: " : "Se presentó una falla al crear la cuenta:",
     "Delete permanently" : "Borrar permanentemente",
-    "Error loading message" : "Se presentó un error al cargar el mensaje",
-    "Settings" : "Configuraciones ",
-    "Forwarding to %s" : "Reenviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
-    "Redirect" : "Redireccionar",
-    "The link leads to %s" : "La liga lleva a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
-    "Continue to %s" : "Continuar a %s",
-    "Delete account" : "Borrar cuenta",
-    "Try again" : "Reintentar",
-    "New message" : "Mensaje nuevo",
-    "Account Settings" : "Configuraciones  de la cuenta",
-    "Aliases" : "Aliases",
-    "Mail address" : "Dirección de correo",
-    "Display Name" : "Nombre a desplegar",
-    "Delete" : "Borrar",
-    "Keyboard shortcuts" : "Atajos del teclado",
-    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
-    "Compose new message" : "Escribir mensaje nuevo",
-    "Newer message" : "Mensaje más nuevo",
-    "Older message" : "Mensaje más antiguo",
-    "Toggle star" : "Alternar favoritos",
-    "Toggle unread" : "Alternar no leídos",
-    "Search" : "Buscar",
-    "Refresh" : "Actualizar",
-    "Connect your mail account" : "Conecta tu cuenta de correo",
     "Name" : "Nombre",
     "Mail Address" : "Dirección de Correo",
     "Password" : "Contraseña",
-    "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
-    "IMAP security" : "Seguridad IMAP",
     "None" : "Ninguno",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "IMAP Password" : "Contraseña IMAP",
     "SMTP Host" : "Servior SMTP",
-    "SMTP security" : "Seguridad SMTP",
     "SMTP Port" : "Puerto SMTP",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contraseña SMTP",
     "Connect" : "Conectar",
+    "Add mail account" : "Agregar cuenta de correo",
+    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
+    "Keyboard shortcuts" : "Atajos del teclado",
     "from" : "de",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
     "Subject" : "Asunto",
-    "Save all to Files" : "Guardar todo a Archivos",
-    "Add mail account" : "Agregar cuenta de correo",
-    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
-    "No search results for" : "No se obtuvieron resultados para la búsqueda de ",
-    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
-    "Show images from this sender" : "Mostrar imagenes de este remitente",
-    "Forward" : "Reenviar",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "¡Mensaje enviado!",
+    "Send" : "Enviar",
     "Upload attachment" : "Cargar adjunto",
     "Add attachment from Files" : "Agregar adjunto desd Archivos",
+    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "Delete" : "Borrar",
     "Import into calendar" : "Importar al calendario",
     "Download attachment" : "Descargar adjunto",
-    "Save to Files" : "Guardar a Archivos"
+    "Save to Files" : "Guardar a Archivos",
+    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
+    "Save all to Files" : "Guardar todo a Archivos",
+    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
+    "New message" : "Mensaje nuevo",
+    "Settings" : "Configuraciones ",
+    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
+    "Compose new message" : "Escribir mensaje nuevo",
+    "Newer message" : "Mensaje más nuevo",
+    "Older message" : "Mensaje más antiguo",
+    "Toggle star" : "Alternar favoritos",
+    "Toggle unread" : "Alternar no leídos",
+    "Search" : "Buscar",
+    "Refresh" : "Actualizar",
+    "Connect your mail account" : "Conecta tu cuenta de correo",
+    "Show all folders" : "Mostrar todas las carpetas",
+    "Collapse folders" : "Compactar carpetas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
+    "Nextcloud Mail" : "Correo Nextcloud",
+    "All inboxes" : "Todos los buzones de entrada",
+    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
+    "Error loading message" : "Se presentó un error al cargar el mensaje",
+    "Forwarding to %s" : "Reenviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
+    "Redirect" : "Redireccionar",
+    "The link leads to %s" : "La liga lleva a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
+    "Continue to %s" : "Continuar a %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/es_AR.js b/l10n/es_AR.js
index a59bb4a5b..b4b478193 100644
--- a/l10n/es_AR.js
+++ b/l10n/es_AR.js
@@ -2,55 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Correo",
-    "Loading accounts" : "Cargando cuentas",
-    "Error while loading the accounts." : "Se presentó un error al cargar las cuentas.",
-    "Can not load this folder." : "No se puede cargar esta carpeta.",
-    "Searching for {query}" : "Buscando a {query}",
-    "Error while deleting message." : "Se presentó un error al borrar el mensaje.",
-    "Forwarded message" : "Mensaje reenviado",
-    "Choose a folder to store the attachment in" : "Selecccione la carpeta en la cual almacenar el adjunto",
-    "Attachments saved to Files." : "Adjuntos guardados a Archivos. ",
-    "Attachment saved to Files." : "Adjunto guardado en Archivos. ",
-    "Error while saving attachments to Files." : "Se presentó un error al guardar los adjuntos en Archivos.",
-    "Error while saving attachment to Files." : "Se presentó un error al guardar los adjuntos en Archivos",
-    "Message flag could not be set." : "No fue posible establecer la bandera del mensaje. ",
-    "Could not move message." : "No fue posible mover el mensaje.",
-    "Invalid account" : "Cuenta inválida",
-    "Invalid folder" : "Carpeta inválida",
-    "Error while creating the account: " : "Error al crear la cuenta:",
-    "Unknown error" : "Error desconocido",
-    "Error while updating the account: " : "Error al actualizar la cuenta:",
-    "All inboxes" : "Todos los buzones de entrada",
-    "you" : "usted",
-    "Send message to {email}" : "Enviar mensaje a {email}",
-    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
-    "Could not load your message" : "No se pudo cargar tu mensaje",
-    "Could not load the desired message" : "No se pudo cargar el mensaje deseado",
-    "Could not load the message" : "No se pudo cargar el mensaje.",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "Nextcloud Mail" : "Correo de Nextcloud",
-    "Save" : "Guardar",
-    "Saved" : "Guardado",
-    "Show all folders" : "Mostrar todos las carpetas",
-    "Collapse folders" : "Compactar carpetas",
-    "Error while deleting account." : "Se presetó un error al borrar la cuenta.",
-    "Choose a file to add as attachment" : "Seleccione el archivo a agregar como adjunto",
-    "An error occurred while uploading {fname}" : "Se produjo un error al cargar {fname}",
-    "Reply" : "Responder",
-    "Send" : "Enviar",
-    "Sending …" : "Enviando ...",
-    "Message sent!" : "¡Mensaje enviado!",
-    "Server error" : "Se presentó un error en el servidor",
-    "An unknown error occurred" : "Se presentó un error desconocido",
-    "Opening HTML drafts is not supported yet." : "Abrir borradores HTML aún no está soportado.",
-    "No writable calendars found" : "No se encontraron calendarios editables",
-    "Error while importing the calendar event" : "Se presentó un error al importar el evento del calendario",
-    "Error while downloading calendar event" : "Se presentó un error al descargar el evento del calendario",
-    "& others" : "& otros",
-    "Error while loading messages." : "Se presentó un error al cargar los mensajes.",
-    "Error while refreshing messages." : "Error al actualizar mensajes.",
-    "Setting up your account" : "Configurando tu cuenta",
     "Inbox" : "Buzón de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -64,60 +15,61 @@ OC.L10N.register(
     "Creating account failed: " : "Se presentó una falla al crear la cuenta:",
     "Delete permanently" : "Borrar permanentemente",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Cliente de correo electrónico fácil de usar que se conecta a su servidor de correo a través de IMAP y SMTP.",
-    "Error loading message" : "Se presentó un error al cargar el mensaje",
-    "Settings" : "Configuraciones ",
-    "Forwarding to %s" : "Reenviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Haga click aqui si no es redireccionado automáticamente dentro de los siguietes segundos. ",
-    "Redirect" : "Redireccionar",
-    "The link leads to %s" : "El link lleva a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no desea visitar esa página, puede regresar a <a href=\"%s\">Correo</a>.",
-    "Continue to %s" : "Continuar a %s",
-    "Delete account" : "Borrar cuenta",
-    "Try again" : "Inténtalo de nuevo",
-    "New message" : "Mensaje nuevo",
-    "Account Settings" : "Configuraciones  de la cuenta",
-    "Aliases" : "Aliases",
-    "Mail address" : "Dirección de correo",
-    "Display Name" : "Nombre a desplegar",
-    "Account" : "Cuenta",
-    "Toggle read" : "Alternar leer",
-    "Delete" : "Borrar",
-    "Keyboard shortcuts" : "Atajos de teclado",
-    "Speed up your Mail experience with these quick shortcuts." : "Acelera tu experiencia de correo con estos atajos rápidos.",
-    "Compose new message" : "Redactar nuevo mensaje",
-    "Newer message" : "Mensaje mas nuevo",
-    "Older message" : "Mensaje anterior",
-    "Connect your mail account" : "Conecte su cuenta de correo",
     "Name" : "Nombre",
     "Mail Address" : "Dirección de Correo",
     "Password" : "Contraseña",
-    "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
-    "IMAP security" : "Seguridad IMAP",
     "None" : "Ninguno",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "IMAP Password" : "Contraseña IMAP",
     "SMTP Host" : "Servior SMTP",
-    "SMTP security" : "Seguridad SMTP",
     "SMTP Port" : "Puerto SMTP",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contraseña SMTP",
     "Connect" : "Conectar",
+    "Add mail account" : "Agregar cuenta de correo",
+    "Keyboard shortcuts" : "Atajos de teclado",
     "from" : "de",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
     "Subject" : "Asunto",
-    "Save all to Files" : "Guardar todos a Archivos",
-    "Add mail account" : "Agregar cuenta de correo",
-    "No search results for" : "No se tuvieron resultados para la búsqueda de ",
-    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger su privacidad. ",
-    "Show images from this sender" : "Mostrar imagenes de este remitente",
-    "Forward" : "Reenviar",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "¡Mensaje enviado!",
+    "Send" : "Enviar",
+    "Choose a file to add as attachment" : "Seleccione el archivo a agregar como adjunto",
+    "Delete" : "Borrar",
+    "Could not load your message" : "No se pudo cargar tu mensaje",
     "Import into calendar" : "Importar al calendario",
     "Download attachment" : "Descargar adjunto",
-    "Save to Files" : "Guardar a Archivos"
+    "Save to Files" : "Guardar a Archivos",
+    "Choose a folder to store the attachment in" : "Selecccione la carpeta en la cual almacenar el adjunto",
+    "Save all to Files" : "Guardar todos a Archivos",
+    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger su privacidad. ",
+    "New message" : "Mensaje nuevo",
+    "Settings" : "Configuraciones ",
+    "Speed up your Mail experience with these quick shortcuts." : "Acelera tu experiencia de correo con estos atajos rápidos.",
+    "Compose new message" : "Redactar nuevo mensaje",
+    "Newer message" : "Mensaje mas nuevo",
+    "Older message" : "Mensaje anterior",
+    "Connect your mail account" : "Conecte su cuenta de correo",
+    "Show all folders" : "Mostrar todos las carpetas",
+    "Collapse folders" : "Compactar carpetas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "Nextcloud Mail" : "Correo de Nextcloud",
+    "All inboxes" : "Todos los buzones de entrada",
+    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
+    "Could not load the desired message" : "No se pudo cargar el mensaje deseado",
+    "Could not load the message" : "No se pudo cargar el mensaje.",
+    "Error loading message" : "Se presentó un error al cargar el mensaje",
+    "Forwarding to %s" : "Reenviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Haga click aqui si no es redireccionado automáticamente dentro de los siguietes segundos. ",
+    "Redirect" : "Redireccionar",
+    "The link leads to %s" : "El link lleva a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no desea visitar esa página, puede regresar a <a href=\"%s\">Correo</a>.",
+    "Continue to %s" : "Continuar a %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/es_AR.json b/l10n/es_AR.json
index 8a2743c91..32e387826 100644
--- a/l10n/es_AR.json
+++ b/l10n/es_AR.json
@@ -1,54 +1,5 @@
 { "translations": {
     "Mail" : "Correo",
-    "Loading accounts" : "Cargando cuentas",
-    "Error while loading the accounts." : "Se presentó un error al cargar las cuentas.",
-    "Can not load this folder." : "No se puede cargar esta carpeta.",
-    "Searching for {query}" : "Buscando a {query}",
-    "Error while deleting message." : "Se presentó un error al borrar el mensaje.",
-    "Forwarded message" : "Mensaje reenviado",
-    "Choose a folder to store the attachment in" : "Selecccione la carpeta en la cual almacenar el adjunto",
-    "Attachments saved to Files." : "Adjuntos guardados a Archivos. ",
-    "Attachment saved to Files." : "Adjunto guardado en Archivos. ",
-    "Error while saving attachments to Files." : "Se presentó un error al guardar los adjuntos en Archivos.",
-    "Error while saving attachment to Files." : "Se presentó un error al guardar los adjuntos en Archivos",
-    "Message flag could not be set." : "No fue posible establecer la bandera del mensaje. ",
-    "Could not move message." : "No fue posible mover el mensaje.",
-    "Invalid account" : "Cuenta inválida",
-    "Invalid folder" : "Carpeta inválida",
-    "Error while creating the account: " : "Error al crear la cuenta:",
-    "Unknown error" : "Error desconocido",
-    "Error while updating the account: " : "Error al actualizar la cuenta:",
-    "All inboxes" : "Todos los buzones de entrada",
-    "you" : "usted",
-    "Send message to {email}" : "Enviar mensaje a {email}",
-    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
-    "Could not load your message" : "No se pudo cargar tu mensaje",
-    "Could not load the desired message" : "No se pudo cargar el mensaje deseado",
-    "Could not load the message" : "No se pudo cargar el mensaje.",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "Nextcloud Mail" : "Correo de Nextcloud",
-    "Save" : "Guardar",
-    "Saved" : "Guardado",
-    "Show all folders" : "Mostrar todos las carpetas",
-    "Collapse folders" : "Compactar carpetas",
-    "Error while deleting account." : "Se presetó un error al borrar la cuenta.",
-    "Choose a file to add as attachment" : "Seleccione el archivo a agregar como adjunto",
-    "An error occurred while uploading {fname}" : "Se produjo un error al cargar {fname}",
-    "Reply" : "Responder",
-    "Send" : "Enviar",
-    "Sending …" : "Enviando ...",
-    "Message sent!" : "¡Mensaje enviado!",
-    "Server error" : "Se presentó un error en el servidor",
-    "An unknown error occurred" : "Se presentó un error desconocido",
-    "Opening HTML drafts is not supported yet." : "Abrir borradores HTML aún no está soportado.",
-    "No writable calendars found" : "No se encontraron calendarios editables",
-    "Error while importing the calendar event" : "Se presentó un error al importar el evento del calendario",
-    "Error while downloading calendar event" : "Se presentó un error al descargar el evento del calendario",
-    "& others" : "& otros",
-    "Error while loading messages." : "Se presentó un error al cargar los mensajes.",
-    "Error while refreshing messages." : "Error al actualizar mensajes.",
-    "Setting up your account" : "Configurando tu cuenta",
     "Inbox" : "Buzón de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -62,60 +13,61 @@
     "Creating account failed: " : "Se presentó una falla al crear la cuenta:",
     "Delete permanently" : "Borrar permanentemente",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Cliente de correo electrónico fácil de usar que se conecta a su servidor de correo a través de IMAP y SMTP.",
-    "Error loading message" : "Se presentó un error al cargar el mensaje",
-    "Settings" : "Configuraciones ",
-    "Forwarding to %s" : "Reenviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Haga click aqui si no es redireccionado automáticamente dentro de los siguietes segundos. ",
-    "Redirect" : "Redireccionar",
-    "The link leads to %s" : "El link lleva a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no desea visitar esa página, puede regresar a <a href=\"%s\">Correo</a>.",
-    "Continue to %s" : "Continuar a %s",
-    "Delete account" : "Borrar cuenta",
-    "Try again" : "Inténtalo de nuevo",
-    "New message" : "Mensaje nuevo",
-    "Account Settings" : "Configuraciones  de la cuenta",
-    "Aliases" : "Aliases",
-    "Mail address" : "Dirección de correo",
-    "Display Name" : "Nombre a desplegar",
-    "Account" : "Cuenta",
-    "Toggle read" : "Alternar leer",
-    "Delete" : "Borrar",
-    "Keyboard shortcuts" : "Atajos de teclado",
-    "Speed up your Mail experience with these quick shortcuts." : "Acelera tu experiencia de correo con estos atajos rápidos.",
-    "Compose new message" : "Redactar nuevo mensaje",
-    "Newer message" : "Mensaje mas nuevo",
-    "Older message" : "Mensaje anterior",
-    "Connect your mail account" : "Conecte su cuenta de correo",
     "Name" : "Nombre",
     "Mail Address" : "Dirección de Correo",
     "Password" : "Contraseña",
-    "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
-    "IMAP security" : "Seguridad IMAP",
     "None" : "Ninguno",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "IMAP Password" : "Contraseña IMAP",
     "SMTP Host" : "Servior SMTP",
-    "SMTP security" : "Seguridad SMTP",
     "SMTP Port" : "Puerto SMTP",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contraseña SMTP",
     "Connect" : "Conectar",
+    "Add mail account" : "Agregar cuenta de correo",
+    "Keyboard shortcuts" : "Atajos de teclado",
     "from" : "de",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
     "Subject" : "Asunto",
-    "Save all to Files" : "Guardar todos a Archivos",
-    "Add mail account" : "Agregar cuenta de correo",
-    "No search results for" : "No se tuvieron resultados para la búsqueda de ",
-    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger su privacidad. ",
-    "Show images from this sender" : "Mostrar imagenes de este remitente",
-    "Forward" : "Reenviar",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "¡Mensaje enviado!",
+    "Send" : "Enviar",
+    "Choose a file to add as attachment" : "Seleccione el archivo a agregar como adjunto",
+    "Delete" : "Borrar",
+    "Could not load your message" : "No se pudo cargar tu mensaje",
     "Import into calendar" : "Importar al calendario",
     "Download attachment" : "Descargar adjunto",
-    "Save to Files" : "Guardar a Archivos"
+    "Save to Files" : "Guardar a Archivos",
+    "Choose a folder to store the attachment in" : "Selecccione la carpeta en la cual almacenar el adjunto",
+    "Save all to Files" : "Guardar todos a Archivos",
+    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger su privacidad. ",
+    "New message" : "Mensaje nuevo",
+    "Settings" : "Configuraciones ",
+    "Speed up your Mail experience with these quick shortcuts." : "Acelera tu experiencia de correo con estos atajos rápidos.",
+    "Compose new message" : "Redactar nuevo mensaje",
+    "Newer message" : "Mensaje mas nuevo",
+    "Older message" : "Mensaje anterior",
+    "Connect your mail account" : "Conecte su cuenta de correo",
+    "Show all folders" : "Mostrar todos las carpetas",
+    "Collapse folders" : "Compactar carpetas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "Nextcloud Mail" : "Correo de Nextcloud",
+    "All inboxes" : "Todos los buzones de entrada",
+    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
+    "Could not load the desired message" : "No se pudo cargar el mensaje deseado",
+    "Could not load the message" : "No se pudo cargar el mensaje.",
+    "Error loading message" : "Se presentó un error al cargar el mensaje",
+    "Forwarding to %s" : "Reenviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Haga click aqui si no es redireccionado automáticamente dentro de los siguietes segundos. ",
+    "Redirect" : "Redireccionar",
+    "The link leads to %s" : "El link lleva a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no desea visitar esa página, puede regresar a <a href=\"%s\">Correo</a>.",
+    "Continue to %s" : "Continuar a %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/es_CL.js b/l10n/es_CL.js
index 7e3ca3ea1..a5b5292ed 100644
--- a/l10n/es_CL.js
+++ b/l10n/es_CL.js
@@ -2,56 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Correo",
-    "Loading accounts" : "Cargando cuentas",
-    "Error while loading the accounts." : "Se presentó un error al cargar las cuentas.",
-    "Can not load this folder." : "No se puede cargar esta carpeta.",
-    "Searching for {query}" : "Buscando a {query}",
-    "Error while deleting message." : "Se presentó un error al borrar el mensaje.",
-    "Forwarded message" : "mensaje reenviado",
-    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
-    "Attachments saved to Files." : "Adjuntos guardados a Archivos. ",
-    "Attachment saved to Files." : "Adjunto guardado en Archivos. ",
-    "Error while saving attachments to Files." : "Se presentó un error al guardar los adjuntos en Archivos.",
-    "Error while saving attachment to Files." : "Se presentó un error al guardar los adjuntos en Archivos",
-    "Message flag could not be set." : "No fue posible establecer la bandera del mensaje. ",
-    "Could not move message." : "No fue posible mover el mensaje.",
-    "Invalid account" : "Cuenta inválida",
-    "Invalid folder" : "Carpeta inválida",
-    "Error while creating the account: " : "Se presentó un error al crear la cuenta:",
-    "Unknown error" : "Error desconocido",
-    "Error while updating the account: " : "Se presentó un error al actualizar la cuenta:",
-    "All inboxes" : "Todos los buzones de entrada",
-    "you" : "tú",
-    "Send message to {email}" : "Enviar mensaje a {email}",
-    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
-    "Could not load your message" : "No fue posible cargar tu mensaje",
-    "Could not load the desired message" : "No fue posible cargar el mensaje deseado",
-    "Could not load the message" : "No fue posible cargar el mensaje",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
-    "Nextcloud Mail" : "Correo Nextcloud",
-    "Save" : "Guardar",
-    "Saved" : "Guardado",
-    "Show all folders" : "Mostrar todas las carpetas",
-    "Collapse folders" : "Compactar carpetas",
-    "Error while deleting account." : "Se presetó un error al borrar la cuenta.",
-    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "An error occurred while uploading {fname}" : "Se presentó un error durante la carga {fname}",
-    "Reply" : "Responder",
-    "Send" : "Enviar",
-    "Sending …" : "Enviando ...",
-    "Message sent!" : "¡Mensaje enviado!",
-    "Server error" : "Se presentó un error en el servidor",
-    "An unknown error occurred" : "Se presentó un error desconocido",
-    "Opening HTML drafts is not supported yet." : "Abrir borradores HTML aún no está soportado.",
-    "No writable calendars found" : "No se encontraron calendarios editables",
-    "Error while importing the calendar event" : "Se presentó un error al importar el evento del calendario",
-    "Error while downloading calendar event" : "Se presentó un error al descargar el evento del calendario",
-    "& others" : "& otros",
-    "Error while loading messages." : "Se presentói un error al cargar los mensajes.",
-    "Error while refreshing messages." : "Se presentó un error al actualizar los mensajes.",
-    "Setting up your account" : "Configura tu cuenta",
     "Inbox" : "Buzón de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -64,68 +14,70 @@ OC.L10N.register(
     "Updating account failed: " : "Se presentó una falla al actualizar la cuenta",
     "Creating account failed: " : "Se presentó una falla al crear la cuenta:",
     "Delete permanently" : "Borrar permanentemente",
-    "Error loading message" : "Se presentó un error al cargar el mensaje",
-    "Settings" : "Configuraciones ",
-    "Forwarding to %s" : "Reenviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
-    "Redirect" : "Redireccionar",
-    "The link leads to %s" : "La liga lleva a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
-    "Continue to %s" : "Continuar a %s",
-    "Delete account" : "Borrar cuenta",
-    "Try again" : "Reintentar",
-    "New message" : "Mensaje nuevo",
-    "Account Settings" : "Configuraciones  de la cuenta",
-    "Aliases" : "Aliases",
-    "Mail address" : "Dirección de correo",
-    "Display Name" : "Nombre a desplegar",
-    "Account" : "Cuenta",
-    "Delete" : "Borrar",
-    "Keyboard shortcuts" : "Atajos del teclado",
-    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
-    "Compose new message" : "Escribir mensaje nuevo",
-    "Newer message" : "Mensaje más nuevo",
-    "Older message" : "Mensaje más antiguo",
-    "Toggle star" : "Alternar favoritos",
-    "Toggle unread" : "Alternar no leídos",
-    "Search" : "Buscar",
-    "Refresh" : "Actualizar",
-    "Connect your mail account" : "Conecta tu cuenta de correo",
     "Name" : "Nombre",
     "Mail Address" : "Dirección de Correo",
     "Password" : "Contraseña",
-    "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
-    "IMAP security" : "Seguridad IMAP",
     "None" : "Ninguno",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "IMAP Password" : "Contraseña IMAP",
     "SMTP Host" : "Servior SMTP",
-    "SMTP security" : "Seguridad SMTP",
     "SMTP Port" : "Puerto SMTP",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contraseña SMTP",
     "Connect" : "Conectar",
+    "Add mail account" : "Agregar cuenta de correo",
+    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
+    "Keyboard shortcuts" : "Atajos del teclado",
     "from" : "de",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Nota que el correo vino de una dirección no-responda asi que tu respuesta probablemente no sea leida. ",
     "Subject" : "Asunto",
-    "Save all to Files" : "Guardar todo a Archivos",
-    "Add mail account" : "Agregar cuenta de correo",
-    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
-    "No search results for" : "No se obtuvieron resultados para la búsqueda de ",
-    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
-    "Show images from this sender" : "Mostrar imagenes de este remitente",
-    "Forward" : "Reenviar",
-    "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "¡Mensaje enviado!",
+    "Send" : "Enviar",
     "Upload attachment" : "Cargar adjunto",
     "Add attachment from Files" : "Agregar adjunto desd Archivos",
+    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Delete" : "Borrar",
+    "Could not load your message" : "No fue posible cargar tu mensaje",
     "Import into calendar" : "Importar al calendario",
     "Download attachment" : "Descargar adjunto",
-    "Save to Files" : "Guardar a Archivos"
+    "Save to Files" : "Guardar a Archivos",
+    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
+    "Save all to Files" : "Guardar todo a Archivos",
+    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
+    "New message" : "Mensaje nuevo",
+    "Settings" : "Configuraciones ",
+    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
+    "Compose new message" : "Escribir mensaje nuevo",
+    "Newer message" : "Mensaje más nuevo",
+    "Older message" : "Mensaje más antiguo",
+    "Toggle star" : "Alternar favoritos",
+    "Toggle unread" : "Alternar no leídos",
+    "Search" : "Buscar",
+    "Refresh" : "Actualizar",
+    "Connect your mail account" : "Conecta tu cuenta de correo",
+    "Show all folders" : "Mostrar todas las carpetas",
+    "Collapse folders" : "Compactar carpetas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
+    "Nextcloud Mail" : "Correo Nextcloud",
+    "All inboxes" : "Todos los buzones de entrada",
+    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
+    "Could not load the desired message" : "No fue posible cargar el mensaje deseado",
+    "Could not load the message" : "No fue posible cargar el mensaje",
+    "Error loading message" : "Se presentó un error al cargar el mensaje",
+    "Forwarding to %s" : "Reenviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
+    "Redirect" : "Redireccionar",
+    "The link leads to %s" : "La liga lleva a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
+    "Continue to %s" : "Continuar a %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/es_CL.json b/l10n/es_CL.json
index b652d4609..f23270e4e 100644
--- a/l10n/es_CL.json
+++ b/l10n/es_CL.json
@@ -1,55 +1,5 @@
 { "translations": {
     "Mail" : "Correo",
-    "Loading accounts" : "Cargando cuentas",
-    "Error while loading the accounts." : "Se presentó un error al cargar las cuentas.",
-    "Can not load this folder." : "No se puede cargar esta carpeta.",
-    "Searching for {query}" : "Buscando a {query}",
-    "Error while deleting message." : "Se presentó un error al borrar el mensaje.",
-    "Forwarded message" : "mensaje reenviado",
-    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
-    "Attachments saved to Files." : "Adjuntos guardados a Archivos. ",
-    "Attachment saved to Files." : "Adjunto guardado en Archivos. ",
-    "Error while saving attachments to Files." : "Se presentó un error al guardar los adjuntos en Archivos.",
-    "Error while saving attachment to Files." : "Se presentó un error al guardar los adjuntos en Archivos",
-    "Message flag could not be set." : "No fue posible establecer la bandera del mensaje. ",
-    "Could not move message." : "No fue posible mover el mensaje.",
-    "Invalid account" : "Cuenta inválida",
-    "Invalid folder" : "Carpeta inválida",
-    "Error while creating the account: " : "Se presentó un error al crear la cuenta:",
-    "Unknown error" : "Error desconocido",
-    "Error while updating the account: " : "Se presentó un error al actualizar la cuenta:",
-    "All inboxes" : "Todos los buzones de entrada",
-    "you" : "tú",
-    "Send message to {email}" : "Enviar mensaje a {email}",
-    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
-    "Could not load your message" : "No fue posible cargar tu mensaje",
-    "Could not load the desired message" : "No fue posible cargar el mensaje deseado",
-    "Could not load the message" : "No fue posible cargar el mensaje",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
-    "Nextcloud Mail" : "Correo Nextcloud",
-    "Save" : "Guardar",
-    "Saved" : "Guardado",
-    "Show all folders" : "Mostrar todas las carpetas",
-    "Collapse folders" : "Compactar carpetas",
-    "Error while deleting account." : "Se presetó un error al borrar la cuenta.",
-    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "An error occurred while uploading {fname}" : "Se presentó un error durante la carga {fname}",
-    "Reply" : "Responder",
-    "Send" : "Enviar",
-    "Sending …" : "Enviando ...",
-    "Message sent!" : "¡Mensaje enviado!",
-    "Server error" : "Se presentó un error en el servidor",
-    "An unknown error occurred" : "Se presentó un error desconocido",
-    "Opening HTML drafts is not supported yet." : "Abrir borradores HTML aún no está soportado.",
-    "No writable calendars found" : "No se encontraron calendarios editables",
-    "Error while importing the calendar event" : "Se presentó un error al importar el evento del calendario",
-    "Error while downloading calendar event" : "Se presentó un error al descargar el evento del calendario",
-    "& others" : "& otros",
-    "Error while loading messages." : "Se presentói un error al cargar los mensajes.",
-    "Error while refreshing messages." : "Se presentó un error al actualizar los mensajes.",
-    "Setting up your account" : "Configura tu cuenta",
     "Inbox" : "Buzón de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -62,68 +12,70 @@
     "Updating account failed: " : "Se presentó una falla al actualizar la cuenta",
     "Creating account failed: " : "Se presentó una falla al crear la cuenta:",
     "Delete permanently" : "Borrar permanentemente",
-    "Error loading message" : "Se presentó un error al cargar el mensaje",
-    "Settings" : "Configuraciones ",
-    "Forwarding to %s" : "Reenviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
-    "Redirect" : "Redireccionar",
-    "The link leads to %s" : "La liga lleva a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
-    "Continue to %s" : "Continuar a %s",
-    "Delete account" : "Borrar cuenta",
-    "Try again" : "Reintentar",
-    "New message" : "Mensaje nuevo",
-    "Account Settings" : "Configuraciones  de la cuenta",
-    "Aliases" : "Aliases",
-    "Mail address" : "Dirección de correo",
-    "Display Name" : "Nombre a desplegar",
-    "Account" : "Cuenta",
-    "Delete" : "Borrar",
-    "Keyboard shortcuts" : "Atajos del teclado",
-    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
-    "Compose new message" : "Escribir mensaje nuevo",
-    "Newer message" : "Mensaje más nuevo",
-    "Older message" : "Mensaje más antiguo",
-    "Toggle star" : "Alternar favoritos",
-    "Toggle unread" : "Alternar no leídos",
-    "Search" : "Buscar",
-    "Refresh" : "Actualizar",
-    "Connect your mail account" : "Conecta tu cuenta de correo",
     "Name" : "Nombre",
     "Mail Address" : "Dirección de Correo",
     "Password" : "Contraseña",
-    "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
-    "IMAP security" : "Seguridad IMAP",
     "None" : "Ninguno",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "IMAP Password" : "Contraseña IMAP",
     "SMTP Host" : "Servior SMTP",
-    "SMTP security" : "Seguridad SMTP",
     "SMTP Port" : "Puerto SMTP",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contraseña SMTP",
     "Connect" : "Conectar",
+    "Add mail account" : "Agregar cuenta de correo",
+    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
+    "Keyboard shortcuts" : "Atajos del teclado",
     "from" : "de",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Nota que el correo vino de una dirección no-responda asi que tu respuesta probablemente no sea leida. ",
     "Subject" : "Asunto",
-    "Save all to Files" : "Guardar todo a Archivos",
-    "Add mail account" : "Agregar cuenta de correo",
-    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
-    "No search results for" : "No se obtuvieron resultados para la búsqueda de ",
-    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
-    "Show images from this sender" : "Mostrar imagenes de este remitente",
-    "Forward" : "Reenviar",
-    "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "¡Mensaje enviado!",
+    "Send" : "Enviar",
     "Upload attachment" : "Cargar adjunto",
     "Add attachment from Files" : "Agregar adjunto desd Archivos",
+    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Delete" : "Borrar",
+    "Could not load your message" : "No fue posible cargar tu mensaje",
     "Import into calendar" : "Importar al calendario",
     "Download attachment" : "Descargar adjunto",
-    "Save to Files" : "Guardar a Archivos"
+    "Save to Files" : "Guardar a Archivos",
+    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
+    "Save all to Files" : "Guardar todo a Archivos",
+    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
+    "New message" : "Mensaje nuevo",
+    "Settings" : "Configuraciones ",
+    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
+    "Compose new message" : "Escribir mensaje nuevo",
+    "Newer message" : "Mensaje más nuevo",
+    "Older message" : "Mensaje más antiguo",
+    "Toggle star" : "Alternar favoritos",
+    "Toggle unread" : "Alternar no leídos",
+    "Search" : "Buscar",
+    "Refresh" : "Actualizar",
+    "Connect your mail account" : "Conecta tu cuenta de correo",
+    "Show all folders" : "Mostrar todas las carpetas",
+    "Collapse folders" : "Compactar carpetas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
+    "Nextcloud Mail" : "Correo Nextcloud",
+    "All inboxes" : "Todos los buzones de entrada",
+    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
+    "Could not load the desired message" : "No fue posible cargar el mensaje deseado",
+    "Could not load the message" : "No fue posible cargar el mensaje",
+    "Error loading message" : "Se presentó un error al cargar el mensaje",
+    "Forwarding to %s" : "Reenviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
+    "Redirect" : "Redireccionar",
+    "The link leads to %s" : "La liga lleva a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
+    "Continue to %s" : "Continuar a %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/es_CO.js b/l10n/es_CO.js
index 7e3ca3ea1..a5b5292ed 100644
--- a/l10n/es_CO.js
+++ b/l10n/es_CO.js
@@ -2,56 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Correo",
-    "Loading accounts" : "Cargando cuentas",
-    "Error while loading the accounts." : "Se presentó un error al cargar las cuentas.",
-    "Can not load this folder." : "No se puede cargar esta carpeta.",
-    "Searching for {query}" : "Buscando a {query}",
-    "Error while deleting message." : "Se presentó un error al borrar el mensaje.",
-    "Forwarded message" : "mensaje reenviado",
-    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
-    "Attachments saved to Files." : "Adjuntos guardados a Archivos. ",
-    "Attachment saved to Files." : "Adjunto guardado en Archivos. ",
-    "Error while saving attachments to Files." : "Se presentó un error al guardar los adjuntos en Archivos.",
-    "Error while saving attachment to Files." : "Se presentó un error al guardar los adjuntos en Archivos",
-    "Message flag could not be set." : "No fue posible establecer la bandera del mensaje. ",
-    "Could not move message." : "No fue posible mover el mensaje.",
-    "Invalid account" : "Cuenta inválida",
-    "Invalid folder" : "Carpeta inválida",
-    "Error while creating the account: " : "Se presentó un error al crear la cuenta:",
-    "Unknown error" : "Error desconocido",
-    "Error while updating the account: " : "Se presentó un error al actualizar la cuenta:",
-    "All inboxes" : "Todos los buzones de entrada",
-    "you" : "tú",
-    "Send message to {email}" : "Enviar mensaje a {email}",
-    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
-    "Could not load your message" : "No fue posible cargar tu mensaje",
-    "Could not load the desired message" : "No fue posible cargar el mensaje deseado",
-    "Could not load the message" : "No fue posible cargar el mensaje",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
-    "Nextcloud Mail" : "Correo Nextcloud",
-    "Save" : "Guardar",
-    "Saved" : "Guardado",
-    "Show all folders" : "Mostrar todas las carpetas",
-    "Collapse folders" : "Compactar carpetas",
-    "Error while deleting account." : "Se presetó un error al borrar la cuenta.",
-    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "An error occurred while uploading {fname}" : "Se presentó un error durante la carga {fname}",
-    "Reply" : "Responder",
-    "Send" : "Enviar",
-    "Sending …" : "Enviando ...",
-    "Message sent!" : "¡Mensaje enviado!",
-    "Server error" : "Se presentó un error en el servidor",
-    "An unknown error occurred" : "Se presentó un error desconocido",
-    "Opening HTML drafts is not supported yet." : "Abrir borradores HTML aún no está soportado.",
-    "No writable calendars found" : "No se encontraron calendarios editables",
-    "Error while importing the calendar event" : "Se presentó un error al importar el evento del calendario",
-    "Error while downloading calendar event" : "Se presentó un error al descargar el evento del calendario",
-    "& others" : "& otros",
-    "Error while loading messages." : "Se presentói un error al cargar los mensajes.",
-    "Error while refreshing messages." : "Se presentó un error al actualizar los mensajes.",
-    "Setting up your account" : "Configura tu cuenta",
     "Inbox" : "Buzón de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -64,68 +14,70 @@ OC.L10N.register(
     "Updating account failed: " : "Se presentó una falla al actualizar la cuenta",
     "Creating account failed: " : "Se presentó una falla al crear la cuenta:",
     "Delete permanently" : "Borrar permanentemente",
-    "Error loading message" : "Se presentó un error al cargar el mensaje",
-    "Settings" : "Configuraciones ",
-    "Forwarding to %s" : "Reenviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
-    "Redirect" : "Redireccionar",
-    "The link leads to %s" : "La liga lleva a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
-    "Continue to %s" : "Continuar a %s",
-    "Delete account" : "Borrar cuenta",
-    "Try again" : "Reintentar",
-    "New message" : "Mensaje nuevo",
-    "Account Settings" : "Configuraciones  de la cuenta",
-    "Aliases" : "Aliases",
-    "Mail address" : "Dirección de correo",
-    "Display Name" : "Nombre a desplegar",
-    "Account" : "Cuenta",
-    "Delete" : "Borrar",
-    "Keyboard shortcuts" : "Atajos del teclado",
-    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
-    "Compose new message" : "Escribir mensaje nuevo",
-    "Newer message" : "Mensaje más nuevo",
-    "Older message" : "Mensaje más antiguo",
-    "Toggle star" : "Alternar favoritos",
-    "Toggle unread" : "Alternar no leídos",
-    "Search" : "Buscar",
-    "Refresh" : "Actualizar",
-    "Connect your mail account" : "Conecta tu cuenta de correo",
     "Name" : "Nombre",
     "Mail Address" : "Dirección de Correo",
     "Password" : "Contraseña",
-    "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
-    "IMAP security" : "Seguridad IMAP",
     "None" : "Ninguno",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "IMAP Password" : "Contraseña IMAP",
     "SMTP Host" : "Servior SMTP",
-    "SMTP security" : "Seguridad SMTP",
     "SMTP Port" : "Puerto SMTP",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contraseña SMTP",
     "Connect" : "Conectar",
+    "Add mail account" : "Agregar cuenta de correo",
+    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
+    "Keyboard shortcuts" : "Atajos del teclado",
     "from" : "de",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Nota que el correo vino de una dirección no-responda asi que tu respuesta probablemente no sea leida. ",
     "Subject" : "Asunto",
-    "Save all to Files" : "Guardar todo a Archivos",
-    "Add mail account" : "Agregar cuenta de correo",
-    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
-    "No search results for" : "No se obtuvieron resultados para la búsqueda de ",
-    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
-    "Show images from this sender" : "Mostrar imagenes de este remitente",
-    "Forward" : "Reenviar",
-    "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "¡Mensaje enviado!",
+    "Send" : "Enviar",
     "Upload attachment" : "Cargar adjunto",
     "Add attachment from Files" : "Agregar adjunto desd Archivos",
+    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Delete" : "Borrar",
+    "Could not load your message" : "No fue posible cargar tu mensaje",
     "Import into calendar" : "Importar al calendario",
     "Download attachment" : "Descargar adjunto",
-    "Save to Files" : "Guardar a Archivos"
+    "Save to Files" : "Guardar a Archivos",
+    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
+    "Save all to Files" : "Guardar todo a Archivos",
+    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
+    "New message" : "Mensaje nuevo",
+    "Settings" : "Configuraciones ",
+    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
+    "Compose new message" : "Escribir mensaje nuevo",
+    "Newer message" : "Mensaje más nuevo",
+    "Older message" : "Mensaje más antiguo",
+    "Toggle star" : "Alternar favoritos",
+    "Toggle unread" : "Alternar no leídos",
+    "Search" : "Buscar",
+    "Refresh" : "Actualizar",
+    "Connect your mail account" : "Conecta tu cuenta de correo",
+    "Show all folders" : "Mostrar todas las carpetas",
+    "Collapse folders" : "Compactar carpetas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
+    "Nextcloud Mail" : "Correo Nextcloud",
+    "All inboxes" : "Todos los buzones de entrada",
+    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
+    "Could not load the desired message" : "No fue posible cargar el mensaje deseado",
+    "Could not load the message" : "No fue posible cargar el mensaje",
+    "Error loading message" : "Se presentó un error al cargar el mensaje",
+    "Forwarding to %s" : "Reenviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
+    "Redirect" : "Redireccionar",
+    "The link leads to %s" : "La liga lleva a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
+    "Continue to %s" : "Continuar a %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/es_CO.json b/l10n/es_CO.json
index b652d4609..f23270e4e 100644
--- a/l10n/es_CO.json
+++ b/l10n/es_CO.json
@@ -1,55 +1,5 @@
 { "translations": {
     "Mail" : "Correo",
-    "Loading accounts" : "Cargando cuentas",
-    "Error while loading the accounts." : "Se presentó un error al cargar las cuentas.",
-    "Can not load this folder." : "No se puede cargar esta carpeta.",
-    "Searching for {query}" : "Buscando a {query}",
-    "Error while deleting message." : "Se presentó un error al borrar el mensaje.",
-    "Forwarded message" : "mensaje reenviado",
-    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
-    "Attachments saved to Files." : "Adjuntos guardados a Archivos. ",
-    "Attachment saved to Files." : "Adjunto guardado en Archivos. ",
-    "Error while saving attachments to Files." : "Se presentó un error al guardar los adjuntos en Archivos.",
-    "Error while saving attachment to Files." : "Se presentó un error al guardar los adjuntos en Archivos",
-    "Message flag could not be set." : "No fue posible establecer la bandera del mensaje. ",
-    "Could not move message." : "No fue posible mover el mensaje.",
-    "Invalid account" : "Cuenta inválida",
-    "Invalid folder" : "Carpeta inválida",
-    "Error while creating the account: " : "Se presentó un error al crear la cuenta:",
-    "Unknown error" : "Error desconocido",
-    "Error while updating the account: " : "Se presentó un error al actualizar la cuenta:",
-    "All inboxes" : "Todos los buzones de entrada",
-    "you" : "tú",
-    "Send message to {email}" : "Enviar mensaje a {email}",
-    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
-    "Could not load your message" : "No fue posible cargar tu mensaje",
-    "Could not load the desired message" : "No fue posible cargar el mensaje deseado",
-    "Could not load the message" : "No fue posible cargar el mensaje",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
-    "Nextcloud Mail" : "Correo Nextcloud",
-    "Save" : "Guardar",
-    "Saved" : "Guardado",
-    "Show all folders" : "Mostrar todas las carpetas",
-    "Collapse folders" : "Compactar carpetas",
-    "Error while deleting account." : "Se presetó un error al borrar la cuenta.",
-    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "An error occurred while uploading {fname}" : "Se presentó un error durante la carga {fname}",
-    "Reply" : "Responder",
-    "Send" : "Enviar",
-    "Sending …" : "Enviando ...",
-    "Message sent!" : "¡Mensaje enviado!",
-    "Server error" : "Se presentó un error en el servidor",
-    "An unknown error occurred" : "Se presentó un error desconocido",
-    "Opening HTML drafts is not supported yet." : "Abrir borradores HTML aún no está soportado.",
-    "No writable calendars found" : "No se encontraron calendarios editables",
-    "Error while importing the calendar event" : "Se presentó un error al importar el evento del calendario",
-    "Error while downloading calendar event" : "Se presentó un error al descargar el evento del calendario",
-    "& others" : "& otros",
-    "Error while loading messages." : "Se presentói un error al cargar los mensajes.",
-    "Error while refreshing messages." : "Se presentó un error al actualizar los mensajes.",
-    "Setting up your account" : "Configura tu cuenta",
     "Inbox" : "Buzón de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -62,68 +12,70 @@
     "Updating account failed: " : "Se presentó una falla al actualizar la cuenta",
     "Creating account failed: " : "Se presentó una falla al crear la cuenta:",
     "Delete permanently" : "Borrar permanentemente",
-    "Error loading message" : "Se presentó un error al cargar el mensaje",
-    "Settings" : "Configuraciones ",
-    "Forwarding to %s" : "Reenviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
-    "Redirect" : "Redireccionar",
-    "The link leads to %s" : "La liga lleva a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
-    "Continue to %s" : "Continuar a %s",
-    "Delete account" : "Borrar cuenta",
-    "Try again" : "Reintentar",
-    "New message" : "Mensaje nuevo",
-    "Account Settings" : "Configuraciones  de la cuenta",
-    "Aliases" : "Aliases",
-    "Mail address" : "Dirección de correo",
-    "Display Name" : "Nombre a desplegar",
-    "Account" : "Cuenta",
-    "Delete" : "Borrar",
-    "Keyboard shortcuts" : "Atajos del teclado",
-    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
-    "Compose new message" : "Escribir mensaje nuevo",
-    "Newer message" : "Mensaje más nuevo",
-    "Older message" : "Mensaje más antiguo",
-    "Toggle star" : "Alternar favoritos",
-    "Toggle unread" : "Alternar no leídos",
-    "Search" : "Buscar",
-    "Refresh" : "Actualizar",
-    "Connect your mail account" : "Conecta tu cuenta de correo",
     "Name" : "Nombre",
     "Mail Address" : "Dirección de Correo",
     "Password" : "Contraseña",
-    "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
-    "IMAP security" : "Seguridad IMAP",
     "None" : "Ninguno",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "IMAP Password" : "Contraseña IMAP",
     "SMTP Host" : "Servior SMTP",
-    "SMTP security" : "Seguridad SMTP",
     "SMTP Port" : "Puerto SMTP",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contraseña SMTP",
     "Connect" : "Conectar",
+    "Add mail account" : "Agregar cuenta de correo",
+    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
+    "Keyboard shortcuts" : "Atajos del teclado",
     "from" : "de",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Nota que el correo vino de una dirección no-responda asi que tu respuesta probablemente no sea leida. ",
     "Subject" : "Asunto",
-    "Save all to Files" : "Guardar todo a Archivos",
-    "Add mail account" : "Agregar cuenta de correo",
-    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
-    "No search results for" : "No se obtuvieron resultados para la búsqueda de ",
-    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
-    "Show images from this sender" : "Mostrar imagenes de este remitente",
-    "Forward" : "Reenviar",
-    "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "¡Mensaje enviado!",
+    "Send" : "Enviar",
     "Upload attachment" : "Cargar adjunto",
     "Add attachment from Files" : "Agregar adjunto desd Archivos",
+    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Delete" : "Borrar",
+    "Could not load your message" : "No fue posible cargar tu mensaje",
     "Import into calendar" : "Importar al calendario",
     "Download attachment" : "Descargar adjunto",
-    "Save to Files" : "Guardar a Archivos"
+    "Save to Files" : "Guardar a Archivos",
+    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
+    "Save all to Files" : "Guardar todo a Archivos",
+    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
+    "New message" : "Mensaje nuevo",
+    "Settings" : "Configuraciones ",
+    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
+    "Compose new message" : "Escribir mensaje nuevo",
+    "Newer message" : "Mensaje más nuevo",
+    "Older message" : "Mensaje más antiguo",
+    "Toggle star" : "Alternar favoritos",
+    "Toggle unread" : "Alternar no leídos",
+    "Search" : "Buscar",
+    "Refresh" : "Actualizar",
+    "Connect your mail account" : "Conecta tu cuenta de correo",
+    "Show all folders" : "Mostrar todas las carpetas",
+    "Collapse folders" : "Compactar carpetas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
+    "Nextcloud Mail" : "Correo Nextcloud",
+    "All inboxes" : "Todos los buzones de entrada",
+    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
+    "Could not load the desired message" : "No fue posible cargar el mensaje deseado",
+    "Could not load the message" : "No fue posible cargar el mensaje",
+    "Error loading message" : "Se presentó un error al cargar el mensaje",
+    "Forwarding to %s" : "Reenviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
+    "Redirect" : "Redireccionar",
+    "The link leads to %s" : "La liga lleva a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
+    "Continue to %s" : "Continuar a %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/es_CR.js b/l10n/es_CR.js
index 7e3ca3ea1..a5b5292ed 100644
--- a/l10n/es_CR.js
+++ b/l10n/es_CR.js
@@ -2,56 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Correo",
-    "Loading accounts" : "Cargando cuentas",
-    "Error while loading the accounts." : "Se presentó un error al cargar las cuentas.",
-    "Can not load this folder." : "No se puede cargar esta carpeta.",
-    "Searching for {query}" : "Buscando a {query}",
-    "Error while deleting message." : "Se presentó un error al borrar el mensaje.",
-    "Forwarded message" : "mensaje reenviado",
-    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
-    "Attachments saved to Files." : "Adjuntos guardados a Archivos. ",
-    "Attachment saved to Files." : "Adjunto guardado en Archivos. ",
-    "Error while saving attachments to Files." : "Se presentó un error al guardar los adjuntos en Archivos.",
-    "Error while saving attachment to Files." : "Se presentó un error al guardar los adjuntos en Archivos",
-    "Message flag could not be set." : "No fue posible establecer la bandera del mensaje. ",
-    "Could not move message." : "No fue posible mover el mensaje.",
-    "Invalid account" : "Cuenta inválida",
-    "Invalid folder" : "Carpeta inválida",
-    "Error while creating the account: " : "Se presentó un error al crear la cuenta:",
-    "Unknown error" : "Error desconocido",
-    "Error while updating the account: " : "Se presentó un error al actualizar la cuenta:",
-    "All inboxes" : "Todos los buzones de entrada",
-    "you" : "tú",
-    "Send message to {email}" : "Enviar mensaje a {email}",
-    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
-    "Could not load your message" : "No fue posible cargar tu mensaje",
-    "Could not load the desired message" : "No fue posible cargar el mensaje deseado",
-    "Could not load the message" : "No fue posible cargar el mensaje",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
-    "Nextcloud Mail" : "Correo Nextcloud",
-    "Save" : "Guardar",
-    "Saved" : "Guardado",
-    "Show all folders" : "Mostrar todas las carpetas",
-    "Collapse folders" : "Compactar carpetas",
-    "Error while deleting account." : "Se presetó un error al borrar la cuenta.",
-    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "An error occurred while uploading {fname}" : "Se presentó un error durante la carga {fname}",
-    "Reply" : "Responder",
-    "Send" : "Enviar",
-    "Sending …" : "Enviando ...",
-    "Message sent!" : "¡Mensaje enviado!",
-    "Server error" : "Se presentó un error en el servidor",
-    "An unknown error occurred" : "Se presentó un error desconocido",
-    "Opening HTML drafts is not supported yet." : "Abrir borradores HTML aún no está soportado.",
-    "No writable calendars found" : "No se encontraron calendarios editables",
-    "Error while importing the calendar event" : "Se presentó un error al importar el evento del calendario",
-    "Error while downloading calendar event" : "Se presentó un error al descargar el evento del calendario",
-    "& others" : "& otros",
-    "Error while loading messages." : "Se presentói un error al cargar los mensajes.",
-    "Error while refreshing messages." : "Se presentó un error al actualizar los mensajes.",
-    "Setting up your account" : "Configura tu cuenta",
     "Inbox" : "Buzón de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -64,68 +14,70 @@ OC.L10N.register(
     "Updating account failed: " : "Se presentó una falla al actualizar la cuenta",
     "Creating account failed: " : "Se presentó una falla al crear la cuenta:",
     "Delete permanently" : "Borrar permanentemente",
-    "Error loading message" : "Se presentó un error al cargar el mensaje",
-    "Settings" : "Configuraciones ",
-    "Forwarding to %s" : "Reenviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
-    "Redirect" : "Redireccionar",
-    "The link leads to %s" : "La liga lleva a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
-    "Continue to %s" : "Continuar a %s",
-    "Delete account" : "Borrar cuenta",
-    "Try again" : "Reintentar",
-    "New message" : "Mensaje nuevo",
-    "Account Settings" : "Configuraciones  de la cuenta",
-    "Aliases" : "Aliases",
-    "Mail address" : "Dirección de correo",
-    "Display Name" : "Nombre a desplegar",
-    "Account" : "Cuenta",
-    "Delete" : "Borrar",
-    "Keyboard shortcuts" : "Atajos del teclado",
-    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
-    "Compose new message" : "Escribir mensaje nuevo",
-    "Newer message" : "Mensaje más nuevo",
-    "Older message" : "Mensaje más antiguo",
-    "Toggle star" : "Alternar favoritos",
-    "Toggle unread" : "Alternar no leídos",
-    "Search" : "Buscar",
-    "Refresh" : "Actualizar",
-    "Connect your mail account" : "Conecta tu cuenta de correo",
     "Name" : "Nombre",
     "Mail Address" : "Dirección de Correo",
     "Password" : "Contraseña",
-    "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
-    "IMAP security" : "Seguridad IMAP",
     "None" : "Ninguno",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "IMAP Password" : "Contraseña IMAP",
     "SMTP Host" : "Servior SMTP",
-    "SMTP security" : "Seguridad SMTP",
     "SMTP Port" : "Puerto SMTP",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contraseña SMTP",
     "Connect" : "Conectar",
+    "Add mail account" : "Agregar cuenta de correo",
+    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
+    "Keyboard shortcuts" : "Atajos del teclado",
     "from" : "de",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Nota que el correo vino de una dirección no-responda asi que tu respuesta probablemente no sea leida. ",
     "Subject" : "Asunto",
-    "Save all to Files" : "Guardar todo a Archivos",
-    "Add mail account" : "Agregar cuenta de correo",
-    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
-    "No search results for" : "No se obtuvieron resultados para la búsqueda de ",
-    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
-    "Show images from this sender" : "Mostrar imagenes de este remitente",
-    "Forward" : "Reenviar",
-    "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "¡Mensaje enviado!",
+    "Send" : "Enviar",
     "Upload attachment" : "Cargar adjunto",
     "Add attachment from Files" : "Agregar adjunto desd Archivos",
+    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Delete" : "Borrar",
+    "Could not load your message" : "No fue posible cargar tu mensaje",
     "Import into calendar" : "Importar al calendario",
     "Download attachment" : "Descargar adjunto",
-    "Save to Files" : "Guardar a Archivos"
+    "Save to Files" : "Guardar a Archivos",
+    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
+    "Save all to Files" : "Guardar todo a Archivos",
+    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
+    "New message" : "Mensaje nuevo",
+    "Settings" : "Configuraciones ",
+    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
+    "Compose new message" : "Escribir mensaje nuevo",
+    "Newer message" : "Mensaje más nuevo",
+    "Older message" : "Mensaje más antiguo",
+    "Toggle star" : "Alternar favoritos",
+    "Toggle unread" : "Alternar no leídos",
+    "Search" : "Buscar",
+    "Refresh" : "Actualizar",
+    "Connect your mail account" : "Conecta tu cuenta de correo",
+    "Show all folders" : "Mostrar todas las carpetas",
+    "Collapse folders" : "Compactar carpetas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
+    "Nextcloud Mail" : "Correo Nextcloud",
+    "All inboxes" : "Todos los buzones de entrada",
+    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
+    "Could not load the desired message" : "No fue posible cargar el mensaje deseado",
+    "Could not load the message" : "No fue posible cargar el mensaje",
+    "Error loading message" : "Se presentó un error al cargar el mensaje",
+    "Forwarding to %s" : "Reenviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
+    "Redirect" : "Redireccionar",
+    "The link leads to %s" : "La liga lleva a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
+    "Continue to %s" : "Continuar a %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/es_CR.json b/l10n/es_CR.json
index b652d4609..f23270e4e 100644
--- a/l10n/es_CR.json
+++ b/l10n/es_CR.json
@@ -1,55 +1,5 @@
 { "translations": {
     "Mail" : "Correo",
-    "Loading accounts" : "Cargando cuentas",
-    "Error while loading the accounts." : "Se presentó un error al cargar las cuentas.",
-    "Can not load this folder." : "No se puede cargar esta carpeta.",
-    "Searching for {query}" : "Buscando a {query}",
-    "Error while deleting message." : "Se presentó un error al borrar el mensaje.",
-    "Forwarded message" : "mensaje reenviado",
-    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
-    "Attachments saved to Files." : "Adjuntos guardados a Archivos. ",
-    "Attachment saved to Files." : "Adjunto guardado en Archivos. ",
-    "Error while saving attachments to Files." : "Se presentó un error al guardar los adjuntos en Archivos.",
-    "Error while saving attachment to Files." : "Se presentó un error al guardar los adjuntos en Archivos",
-    "Message flag could not be set." : "No fue posible establecer la bandera del mensaje. ",
-    "Could not move message." : "No fue posible mover el mensaje.",
-    "Invalid account" : "Cuenta inválida",
-    "Invalid folder" : "Carpeta inválida",
-    "Error while creating the account: " : "Se presentó un error al crear la cuenta:",
-    "Unknown error" : "Error desconocido",
-    "Error while updating the account: " : "Se presentó un error al actualizar la cuenta:",
-    "All inboxes" : "Todos los buzones de entrada",
-    "you" : "tú",
-    "Send message to {email}" : "Enviar mensaje a {email}",
-    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
-    "Could not load your message" : "No fue posible cargar tu mensaje",
-    "Could not load the desired message" : "No fue posible cargar el mensaje deseado",
-    "Could not load the message" : "No fue posible cargar el mensaje",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
-    "Nextcloud Mail" : "Correo Nextcloud",
-    "Save" : "Guardar",
-    "Saved" : "Guardado",
-    "Show all folders" : "Mostrar todas las carpetas",
-    "Collapse folders" : "Compactar carpetas",
-    "Error while deleting account." : "Se presetó un error al borrar la cuenta.",
-    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "An error occurred while uploading {fname}" : "Se presentó un error durante la carga {fname}",
-    "Reply" : "Responder",
-    "Send" : "Enviar",
-    "Sending …" : "Enviando ...",
-    "Message sent!" : "¡Mensaje enviado!",
-    "Server error" : "Se presentó un error en el servidor",
-    "An unknown error occurred" : "Se presentó un error desconocido",
-    "Opening HTML drafts is not supported yet." : "Abrir borradores HTML aún no está soportado.",
-    "No writable calendars found" : "No se encontraron calendarios editables",
-    "Error while importing the calendar event" : "Se presentó un error al importar el evento del calendario",
-    "Error while downloading calendar event" : "Se presentó un error al descargar el evento del calendario",
-    "& others" : "& otros",
-    "Error while loading messages." : "Se presentói un error al cargar los mensajes.",
-    "Error while refreshing messages." : "Se presentó un error al actualizar los mensajes.",
-    "Setting up your account" : "Configura tu cuenta",
     "Inbox" : "Buzón de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -62,68 +12,70 @@
     "Updating account failed: " : "Se presentó una falla al actualizar la cuenta",
     "Creating account failed: " : "Se presentó una falla al crear la cuenta:",
     "Delete permanently" : "Borrar permanentemente",
-    "Error loading message" : "Se presentó un error al cargar el mensaje",
-    "Settings" : "Configuraciones ",
-    "Forwarding to %s" : "Reenviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
-    "Redirect" : "Redireccionar",
-    "The link leads to %s" : "La liga lleva a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
-    "Continue to %s" : "Continuar a %s",
-    "Delete account" : "Borrar cuenta",
-    "Try again" : "Reintentar",
-    "New message" : "Mensaje nuevo",
-    "Account Settings" : "Configuraciones  de la cuenta",
-    "Aliases" : "Aliases",
-    "Mail address" : "Dirección de correo",
-    "Display Name" : "Nombre a desplegar",
-    "Account" : "Cuenta",
-    "Delete" : "Borrar",
-    "Keyboard shortcuts" : "Atajos del teclado",
-    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
-    "Compose new message" : "Escribir mensaje nuevo",
-    "Newer message" : "Mensaje más nuevo",
-    "Older message" : "Mensaje más antiguo",
-    "Toggle star" : "Alternar favoritos",
-    "Toggle unread" : "Alternar no leídos",
-    "Search" : "Buscar",
-    "Refresh" : "Actualizar",
-    "Connect your mail account" : "Conecta tu cuenta de correo",
     "Name" : "Nombre",
     "Mail Address" : "Dirección de Correo",
     "Password" : "Contraseña",
-    "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
-    "IMAP security" : "Seguridad IMAP",
     "None" : "Ninguno",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "IMAP Password" : "Contraseña IMAP",
     "SMTP Host" : "Servior SMTP",
-    "SMTP security" : "Seguridad SMTP",
     "SMTP Port" : "Puerto SMTP",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contraseña SMTP",
     "Connect" : "Conectar",
+    "Add mail account" : "Agregar cuenta de correo",
+    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
+    "Keyboard shortcuts" : "Atajos del teclado",
     "from" : "de",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Nota que el correo vino de una dirección no-responda asi que tu respuesta probablemente no sea leida. ",
     "Subject" : "Asunto",
-    "Save all to Files" : "Guardar todo a Archivos",
-    "Add mail account" : "Agregar cuenta de correo",
-    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
-    "No search results for" : "No se obtuvieron resultados para la búsqueda de ",
-    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
-    "Show images from this sender" : "Mostrar imagenes de este remitente",
-    "Forward" : "Reenviar",
-    "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "¡Mensaje enviado!",
+    "Send" : "Enviar",
     "Upload attachment" : "Cargar adjunto",
     "Add attachment from Files" : "Agregar adjunto desd Archivos",
+    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Delete" : "Borrar",
+    "Could not load your message" : "No fue posible cargar tu mensaje",
     "Import into calendar" : "Importar al calendario",
     "Download attachment" : "Descargar adjunto",
-    "Save to Files" : "Guardar a Archivos"
+    "Save to Files" : "Guardar a Archivos",
+    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
+    "Save all to Files" : "Guardar todo a Archivos",
+    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
+    "New message" : "Mensaje nuevo",
+    "Settings" : "Configuraciones ",
+    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
+    "Compose new message" : "Escribir mensaje nuevo",
+    "Newer message" : "Mensaje más nuevo",
+    "Older message" : "Mensaje más antiguo",
+    "Toggle star" : "Alternar favoritos",
+    "Toggle unread" : "Alternar no leídos",
+    "Search" : "Buscar",
+    "Refresh" : "Actualizar",
+    "Connect your mail account" : "Conecta tu cuenta de correo",
+    "Show all folders" : "Mostrar todas las carpetas",
+    "Collapse folders" : "Compactar carpetas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
+    "Nextcloud Mail" : "Correo Nextcloud",
+    "All inboxes" : "Todos los buzones de entrada",
+    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
+    "Could not load the desired message" : "No fue posible cargar el mensaje deseado",
+    "Could not load the message" : "No fue posible cargar el mensaje",
+    "Error loading message" : "Se presentó un error al cargar el mensaje",
+    "Forwarding to %s" : "Reenviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
+    "Redirect" : "Redireccionar",
+    "The link leads to %s" : "La liga lleva a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
+    "Continue to %s" : "Continuar a %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/es_DO.js b/l10n/es_DO.js
index 7e3ca3ea1..a5b5292ed 100644
--- a/l10n/es_DO.js
+++ b/l10n/es_DO.js
@@ -2,56 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Correo",
-    "Loading accounts" : "Cargando cuentas",
-    "Error while loading the accounts." : "Se presentó un error al cargar las cuentas.",
-    "Can not load this folder." : "No se puede cargar esta carpeta.",
-    "Searching for {query}" : "Buscando a {query}",
-    "Error while deleting message." : "Se presentó un error al borrar el mensaje.",
-    "Forwarded message" : "mensaje reenviado",
-    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
-    "Attachments saved to Files." : "Adjuntos guardados a Archivos. ",
-    "Attachment saved to Files." : "Adjunto guardado en Archivos. ",
-    "Error while saving attachments to Files." : "Se presentó un error al guardar los adjuntos en Archivos.",
-    "Error while saving attachment to Files." : "Se presentó un error al guardar los adjuntos en Archivos",
-    "Message flag could not be set." : "No fue posible establecer la bandera del mensaje. ",
-    "Could not move message." : "No fue posible mover el mensaje.",
-    "Invalid account" : "Cuenta inválida",
-    "Invalid folder" : "Carpeta inválida",
-    "Error while creating the account: " : "Se presentó un error al crear la cuenta:",
-    "Unknown error" : "Error desconocido",
-    "Error while updating the account: " : "Se presentó un error al actualizar la cuenta:",
-    "All inboxes" : "Todos los buzones de entrada",
-    "you" : "tú",
-    "Send message to {email}" : "Enviar mensaje a {email}",
-    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
-    "Could not load your message" : "No fue posible cargar tu mensaje",
-    "Could not load the desired message" : "No fue posible cargar el mensaje deseado",
-    "Could not load the message" : "No fue posible cargar el mensaje",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
-    "Nextcloud Mail" : "Correo Nextcloud",
-    "Save" : "Guardar",
-    "Saved" : "Guardado",
-    "Show all folders" : "Mostrar todas las carpetas",
-    "Collapse folders" : "Compactar carpetas",
-    "Error while deleting account." : "Se presetó un error al borrar la cuenta.",
-    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "An error occurred while uploading {fname}" : "Se presentó un error durante la carga {fname}",
-    "Reply" : "Responder",
-    "Send" : "Enviar",
-    "Sending …" : "Enviando ...",
-    "Message sent!" : "¡Mensaje enviado!",
-    "Server error" : "Se presentó un error en el servidor",
-    "An unknown error occurred" : "Se presentó un error desconocido",
-    "Opening HTML drafts is not supported yet." : "Abrir borradores HTML aún no está soportado.",
-    "No writable calendars found" : "No se encontraron calendarios editables",
-    "Error while importing the calendar event" : "Se presentó un error al importar el evento del calendario",
-    "Error while downloading calendar event" : "Se presentó un error al descargar el evento del calendario",
-    "& others" : "& otros",
-    "Error while loading messages." : "Se presentói un error al cargar los mensajes.",
-    "Error while refreshing messages." : "Se presentó un error al actualizar los mensajes.",
-    "Setting up your account" : "Configura tu cuenta",
     "Inbox" : "Buzón de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -64,68 +14,70 @@ OC.L10N.register(
     "Updating account failed: " : "Se presentó una falla al actualizar la cuenta",
     "Creating account failed: " : "Se presentó una falla al crear la cuenta:",
     "Delete permanently" : "Borrar permanentemente",
-    "Error loading message" : "Se presentó un error al cargar el mensaje",
-    "Settings" : "Configuraciones ",
-    "Forwarding to %s" : "Reenviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
-    "Redirect" : "Redireccionar",
-    "The link leads to %s" : "La liga lleva a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
-    "Continue to %s" : "Continuar a %s",
-    "Delete account" : "Borrar cuenta",
-    "Try again" : "Reintentar",
-    "New message" : "Mensaje nuevo",
-    "Account Settings" : "Configuraciones  de la cuenta",
-    "Aliases" : "Aliases",
-    "Mail address" : "Dirección de correo",
-    "Display Name" : "Nombre a desplegar",
-    "Account" : "Cuenta",
-    "Delete" : "Borrar",
-    "Keyboard shortcuts" : "Atajos del teclado",
-    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
-    "Compose new message" : "Escribir mensaje nuevo",
-    "Newer message" : "Mensaje más nuevo",
-    "Older message" : "Mensaje más antiguo",
-    "Toggle star" : "Alternar favoritos",
-    "Toggle unread" : "Alternar no leídos",
-    "Search" : "Buscar",
-    "Refresh" : "Actualizar",
-    "Connect your mail account" : "Conecta tu cuenta de correo",
     "Name" : "Nombre",
     "Mail Address" : "Dirección de Correo",
     "Password" : "Contraseña",
-    "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
-    "IMAP security" : "Seguridad IMAP",
     "None" : "Ninguno",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "IMAP Password" : "Contraseña IMAP",
     "SMTP Host" : "Servior SMTP",
-    "SMTP security" : "Seguridad SMTP",
     "SMTP Port" : "Puerto SMTP",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contraseña SMTP",
     "Connect" : "Conectar",
+    "Add mail account" : "Agregar cuenta de correo",
+    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
+    "Keyboard shortcuts" : "Atajos del teclado",
     "from" : "de",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Nota que el correo vino de una dirección no-responda asi que tu respuesta probablemente no sea leida. ",
     "Subject" : "Asunto",
-    "Save all to Files" : "Guardar todo a Archivos",
-    "Add mail account" : "Agregar cuenta de correo",
-    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
-    "No search results for" : "No se obtuvieron resultados para la búsqueda de ",
-    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
-    "Show images from this sender" : "Mostrar imagenes de este remitente",
-    "Forward" : "Reenviar",
-    "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "¡Mensaje enviado!",
+    "Send" : "Enviar",
     "Upload attachment" : "Cargar adjunto",
     "Add attachment from Files" : "Agregar adjunto desd Archivos",
+    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Delete" : "Borrar",
+    "Could not load your message" : "No fue posible cargar tu mensaje",
     "Import into calendar" : "Importar al calendario",
     "Download attachment" : "Descargar adjunto",
-    "Save to Files" : "Guardar a Archivos"
+    "Save to Files" : "Guardar a Archivos",
+    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
+    "Save all to Files" : "Guardar todo a Archivos",
+    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
+    "New message" : "Mensaje nuevo",
+    "Settings" : "Configuraciones ",
+    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
+    "Compose new message" : "Escribir mensaje nuevo",
+    "Newer message" : "Mensaje más nuevo",
+    "Older message" : "Mensaje más antiguo",
+    "Toggle star" : "Alternar favoritos",
+    "Toggle unread" : "Alternar no leídos",
+    "Search" : "Buscar",
+    "Refresh" : "Actualizar",
+    "Connect your mail account" : "Conecta tu cuenta de correo",
+    "Show all folders" : "Mostrar todas las carpetas",
+    "Collapse folders" : "Compactar carpetas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
+    "Nextcloud Mail" : "Correo Nextcloud",
+    "All inboxes" : "Todos los buzones de entrada",
+    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
+    "Could not load the desired message" : "No fue posible cargar el mensaje deseado",
+    "Could not load the message" : "No fue posible cargar el mensaje",
+    "Error loading message" : "Se presentó un error al cargar el mensaje",
+    "Forwarding to %s" : "Reenviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
+    "Redirect" : "Redireccionar",
+    "The link leads to %s" : "La liga lleva a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
+    "Continue to %s" : "Continuar a %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/es_DO.json b/l10n/es_DO.json
index b652d4609..f23270e4e 100644
--- a/l10n/es_DO.json
+++ b/l10n/es_DO.json
@@ -1,55 +1,5 @@
 { "translations": {
     "Mail" : "Correo",
-    "Loading accounts" : "Cargando cuentas",
-    "Error while loading the accounts." : "Se presentó un error al cargar las cuentas.",
-    "Can not load this folder." : "No se puede cargar esta carpeta.",
-    "Searching for {query}" : "Buscando a {query}",
-    "Error while deleting message." : "Se presentó un error al borrar el mensaje.",
-    "Forwarded message" : "mensaje reenviado",
-    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
-    "Attachments saved to Files." : "Adjuntos guardados a Archivos. ",
-    "Attachment saved to Files." : "Adjunto guardado en Archivos. ",
-    "Error while saving attachments to Files." : "Se presentó un error al guardar los adjuntos en Archivos.",
-    "Error while saving attachment to Files." : "Se presentó un error al guardar los adjuntos en Archivos",
-    "Message flag could not be set." : "No fue posible establecer la bandera del mensaje. ",
-    "Could not move message." : "No fue posible mover el mensaje.",
-    "Invalid account" : "Cuenta inválida",
-    "Invalid folder" : "Carpeta inválida",
-    "Error while creating the account: " : "Se presentó un error al crear la cuenta:",
-    "Unknown error" : "Error desconocido",
-    "Error while updating the account: " : "Se presentó un error al actualizar la cuenta:",
-    "All inboxes" : "Todos los buzones de entrada",
-    "you" : "tú",
-    "Send message to {email}" : "Enviar mensaje a {email}",
-    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
-    "Could not load your message" : "No fue posible cargar tu mensaje",
-    "Could not load the desired message" : "No fue posible cargar el mensaje deseado",
-    "Could not load the message" : "No fue posible cargar el mensaje",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
-    "Nextcloud Mail" : "Correo Nextcloud",
-    "Save" : "Guardar",
-    "Saved" : "Guardado",
-    "Show all folders" : "Mostrar todas las carpetas",
-    "Collapse folders" : "Compactar carpetas",
-    "Error while deleting account." : "Se presetó un error al borrar la cuenta.",
-    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "An error occurred while uploading {fname}" : "Se presentó un error durante la carga {fname}",
-    "Reply" : "Responder",
-    "Send" : "Enviar",
-    "Sending …" : "Enviando ...",
-    "Message sent!" : "¡Mensaje enviado!",
-    "Server error" : "Se presentó un error en el servidor",
-    "An unknown error occurred" : "Se presentó un error desconocido",
-    "Opening HTML drafts is not supported yet." : "Abrir borradores HTML aún no está soportado.",
-    "No writable calendars found" : "No se encontraron calendarios editables",
-    "Error while importing the calendar event" : "Se presentó un error al importar el evento del calendario",
-    "Error while downloading calendar event" : "Se presentó un error al descargar el evento del calendario",
-    "& others" : "& otros",
-    "Error while loading messages." : "Se presentói un error al cargar los mensajes.",
-    "Error while refreshing messages." : "Se presentó un error al actualizar los mensajes.",
-    "Setting up your account" : "Configura tu cuenta",
     "Inbox" : "Buzón de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -62,68 +12,70 @@
     "Updating account failed: " : "Se presentó una falla al actualizar la cuenta",
     "Creating account failed: " : "Se presentó una falla al crear la cuenta:",
     "Delete permanently" : "Borrar permanentemente",
-    "Error loading message" : "Se presentó un error al cargar el mensaje",
-    "Settings" : "Configuraciones ",
-    "Forwarding to %s" : "Reenviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
-    "Redirect" : "Redireccionar",
-    "The link leads to %s" : "La liga lleva a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
-    "Continue to %s" : "Continuar a %s",
-    "Delete account" : "Borrar cuenta",
-    "Try again" : "Reintentar",
-    "New message" : "Mensaje nuevo",
-    "Account Settings" : "Configuraciones  de la cuenta",
-    "Aliases" : "Aliases",
-    "Mail address" : "Dirección de correo",
-    "Display Name" : "Nombre a desplegar",
-    "Account" : "Cuenta",
-    "Delete" : "Borrar",
-    "Keyboard shortcuts" : "Atajos del teclado",
-    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
-    "Compose new message" : "Escribir mensaje nuevo",
-    "Newer message" : "Mensaje más nuevo",
-    "Older message" : "Mensaje más antiguo",
-    "Toggle star" : "Alternar favoritos",
-    "Toggle unread" : "Alternar no leídos",
-    "Search" : "Buscar",
-    "Refresh" : "Actualizar",
-    "Connect your mail account" : "Conecta tu cuenta de correo",
     "Name" : "Nombre",
     "Mail Address" : "Dirección de Correo",
     "Password" : "Contraseña",
-    "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
-    "IMAP security" : "Seguridad IMAP",
     "None" : "Ninguno",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "IMAP Password" : "Contraseña IMAP",
     "SMTP Host" : "Servior SMTP",
-    "SMTP security" : "Seguridad SMTP",
     "SMTP Port" : "Puerto SMTP",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contraseña SMTP",
     "Connect" : "Conectar",
+    "Add mail account" : "Agregar cuenta de correo",
+    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
+    "Keyboard shortcuts" : "Atajos del teclado",
     "from" : "de",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Nota que el correo vino de una dirección no-responda asi que tu respuesta probablemente no sea leida. ",
     "Subject" : "Asunto",
-    "Save all to Files" : "Guardar todo a Archivos",
-    "Add mail account" : "Agregar cuenta de correo",
-    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
-    "No search results for" : "No se obtuvieron resultados para la búsqueda de ",
-    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
-    "Show images from this sender" : "Mostrar imagenes de este remitente",
-    "Forward" : "Reenviar",
-    "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "¡Mensaje enviado!",
+    "Send" : "Enviar",
     "Upload attachment" : "Cargar adjunto",
     "Add attachment from Files" : "Agregar adjunto desd Archivos",
+    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Delete" : "Borrar",
+    "Could not load your message" : "No fue posible cargar tu mensaje",
     "Import into calendar" : "Importar al calendario",
     "Download attachment" : "Descargar adjunto",
-    "Save to Files" : "Guardar a Archivos"
+    "Save to Files" : "Guardar a Archivos",
+    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
+    "Save all to Files" : "Guardar todo a Archivos",
+    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
+    "New message" : "Mensaje nuevo",
+    "Settings" : "Configuraciones ",
+    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
+    "Compose new message" : "Escribir mensaje nuevo",
+    "Newer message" : "Mensaje más nuevo",
+    "Older message" : "Mensaje más antiguo",
+    "Toggle star" : "Alternar favoritos",
+    "Toggle unread" : "Alternar no leídos",
+    "Search" : "Buscar",
+    "Refresh" : "Actualizar",
+    "Connect your mail account" : "Conecta tu cuenta de correo",
+    "Show all folders" : "Mostrar todas las carpetas",
+    "Collapse folders" : "Compactar carpetas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
+    "Nextcloud Mail" : "Correo Nextcloud",
+    "All inboxes" : "Todos los buzones de entrada",
+    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
+    "Could not load the desired message" : "No fue posible cargar el mensaje deseado",
+    "Could not load the message" : "No fue posible cargar el mensaje",
+    "Error loading message" : "Se presentó un error al cargar el mensaje",
+    "Forwarding to %s" : "Reenviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
+    "Redirect" : "Redireccionar",
+    "The link leads to %s" : "La liga lleva a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
+    "Continue to %s" : "Continuar a %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/es_EC.js b/l10n/es_EC.js
index 7e3ca3ea1..a5b5292ed 100644
--- a/l10n/es_EC.js
+++ b/l10n/es_EC.js
@@ -2,56 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Correo",
-    "Loading accounts" : "Cargando cuentas",
-    "Error while loading the accounts." : "Se presentó un error al cargar las cuentas.",
-    "Can not load this folder." : "No se puede cargar esta carpeta.",
-    "Searching for {query}" : "Buscando a {query}",
-    "Error while deleting message." : "Se presentó un error al borrar el mensaje.",
-    "Forwarded message" : "mensaje reenviado",
-    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
-    "Attachments saved to Files." : "Adjuntos guardados a Archivos. ",
-    "Attachment saved to Files." : "Adjunto guardado en Archivos. ",
-    "Error while saving attachments to Files." : "Se presentó un error al guardar los adjuntos en Archivos.",
-    "Error while saving attachment to Files." : "Se presentó un error al guardar los adjuntos en Archivos",
-    "Message flag could not be set." : "No fue posible establecer la bandera del mensaje. ",
-    "Could not move message." : "No fue posible mover el mensaje.",
-    "Invalid account" : "Cuenta inválida",
-    "Invalid folder" : "Carpeta inválida",
-    "Error while creating the account: " : "Se presentó un error al crear la cuenta:",
-    "Unknown error" : "Error desconocido",
-    "Error while updating the account: " : "Se presentó un error al actualizar la cuenta:",
-    "All inboxes" : "Todos los buzones de entrada",
-    "you" : "tú",
-    "Send message to {email}" : "Enviar mensaje a {email}",
-    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
-    "Could not load your message" : "No fue posible cargar tu mensaje",
-    "Could not load the desired message" : "No fue posible cargar el mensaje deseado",
-    "Could not load the message" : "No fue posible cargar el mensaje",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
-    "Nextcloud Mail" : "Correo Nextcloud",
-    "Save" : "Guardar",
-    "Saved" : "Guardado",
-    "Show all folders" : "Mostrar todas las carpetas",
-    "Collapse folders" : "Compactar carpetas",
-    "Error while deleting account." : "Se presetó un error al borrar la cuenta.",
-    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "An error occurred while uploading {fname}" : "Se presentó un error durante la carga {fname}",
-    "Reply" : "Responder",
-    "Send" : "Enviar",
-    "Sending …" : "Enviando ...",
-    "Message sent!" : "¡Mensaje enviado!",
-    "Server error" : "Se presentó un error en el servidor",
-    "An unknown error occurred" : "Se presentó un error desconocido",
-    "Opening HTML drafts is not supported yet." : "Abrir borradores HTML aún no está soportado.",
-    "No writable calendars found" : "No se encontraron calendarios editables",
-    "Error while importing the calendar event" : "Se presentó un error al importar el evento del calendario",
-    "Error while downloading calendar event" : "Se presentó un error al descargar el evento del calendario",
-    "& others" : "& otros",
-    "Error while loading messages." : "Se presentói un error al cargar los mensajes.",
-    "Error while refreshing messages." : "Se presentó un error al actualizar los mensajes.",
-    "Setting up your account" : "Configura tu cuenta",
     "Inbox" : "Buzón de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -64,68 +14,70 @@ OC.L10N.register(
     "Updating account failed: " : "Se presentó una falla al actualizar la cuenta",
     "Creating account failed: " : "Se presentó una falla al crear la cuenta:",
     "Delete permanently" : "Borrar permanentemente",
-    "Error loading message" : "Se presentó un error al cargar el mensaje",
-    "Settings" : "Configuraciones ",
-    "Forwarding to %s" : "Reenviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
-    "Redirect" : "Redireccionar",
-    "The link leads to %s" : "La liga lleva a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
-    "Continue to %s" : "Continuar a %s",
-    "Delete account" : "Borrar cuenta",
-    "Try again" : "Reintentar",
-    "New message" : "Mensaje nuevo",
-    "Account Settings" : "Configuraciones  de la cuenta",
-    "Aliases" : "Aliases",
-    "Mail address" : "Dirección de correo",
-    "Display Name" : "Nombre a desplegar",
-    "Account" : "Cuenta",
-    "Delete" : "Borrar",
-    "Keyboard shortcuts" : "Atajos del teclado",
-    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
-    "Compose new message" : "Escribir mensaje nuevo",
-    "Newer message" : "Mensaje más nuevo",
-    "Older message" : "Mensaje más antiguo",
-    "Toggle star" : "Alternar favoritos",
-    "Toggle unread" : "Alternar no leídos",
-    "Search" : "Buscar",
-    "Refresh" : "Actualizar",
-    "Connect your mail account" : "Conecta tu cuenta de correo",
     "Name" : "Nombre",
     "Mail Address" : "Dirección de Correo",
     "Password" : "Contraseña",
-    "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
-    "IMAP security" : "Seguridad IMAP",
     "None" : "Ninguno",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "IMAP Password" : "Contraseña IMAP",
     "SMTP Host" : "Servior SMTP",
-    "SMTP security" : "Seguridad SMTP",
     "SMTP Port" : "Puerto SMTP",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contraseña SMTP",
     "Connect" : "Conectar",
+    "Add mail account" : "Agregar cuenta de correo",
+    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
+    "Keyboard shortcuts" : "Atajos del teclado",
     "from" : "de",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Nota que el correo vino de una dirección no-responda asi que tu respuesta probablemente no sea leida. ",
     "Subject" : "Asunto",
-    "Save all to Files" : "Guardar todo a Archivos",
-    "Add mail account" : "Agregar cuenta de correo",
-    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
-    "No search results for" : "No se obtuvieron resultados para la búsqueda de ",
-    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
-    "Show images from this sender" : "Mostrar imagenes de este remitente",
-    "Forward" : "Reenviar",
-    "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "¡Mensaje enviado!",
+    "Send" : "Enviar",
     "Upload attachment" : "Cargar adjunto",
     "Add attachment from Files" : "Agregar adjunto desd Archivos",
+    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Delete" : "Borrar",
+    "Could not load your message" : "No fue posible cargar tu mensaje",
     "Import into calendar" : "Importar al calendario",
     "Download attachment" : "Descargar adjunto",
-    "Save to Files" : "Guardar a Archivos"
+    "Save to Files" : "Guardar a Archivos",
+    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
+    "Save all to Files" : "Guardar todo a Archivos",
+    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
+    "New message" : "Mensaje nuevo",
+    "Settings" : "Configuraciones ",
+    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
+    "Compose new message" : "Escribir mensaje nuevo",
+    "Newer message" : "Mensaje más nuevo",
+    "Older message" : "Mensaje más antiguo",
+    "Toggle star" : "Alternar favoritos",
+    "Toggle unread" : "Alternar no leídos",
+    "Search" : "Buscar",
+    "Refresh" : "Actualizar",
+    "Connect your mail account" : "Conecta tu cuenta de correo",
+    "Show all folders" : "Mostrar todas las carpetas",
+    "Collapse folders" : "Compactar carpetas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
+    "Nextcloud Mail" : "Correo Nextcloud",
+    "All inboxes" : "Todos los buzones de entrada",
+    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
+    "Could not load the desired message" : "No fue posible cargar el mensaje deseado",
+    "Could not load the message" : "No fue posible cargar el mensaje",
+    "Error loading message" : "Se presentó un error al cargar el mensaje",
+    "Forwarding to %s" : "Reenviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
+    "Redirect" : "Redireccionar",
+    "The link leads to %s" : "La liga lleva a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
+    "Continue to %s" : "Continuar a %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/es_EC.json b/l10n/es_EC.json
index b652d4609..f23270e4e 100644
--- a/l10n/es_EC.json
+++ b/l10n/es_EC.json
@@ -1,55 +1,5 @@
 { "translations": {
     "Mail" : "Correo",
-    "Loading accounts" : "Cargando cuentas",
-    "Error while loading the accounts." : "Se presentó un error al cargar las cuentas.",
-    "Can not load this folder." : "No se puede cargar esta carpeta.",
-    "Searching for {query}" : "Buscando a {query}",
-    "Error while deleting message." : "Se presentó un error al borrar el mensaje.",
-    "Forwarded message" : "mensaje reenviado",
-    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
-    "Attachments saved to Files." : "Adjuntos guardados a Archivos. ",
-    "Attachment saved to Files." : "Adjunto guardado en Archivos. ",
-    "Error while saving attachments to Files." : "Se presentó un error al guardar los adjuntos en Archivos.",
-    "Error while saving attachment to Files." : "Se presentó un error al guardar los adjuntos en Archivos",
-    "Message flag could not be set." : "No fue posible establecer la bandera del mensaje. ",
-    "Could not move message." : "No fue posible mover el mensaje.",
-    "Invalid account" : "Cuenta inválida",
-    "Invalid folder" : "Carpeta inválida",
-    "Error while creating the account: " : "Se presentó un error al crear la cuenta:",
-    "Unknown error" : "Error desconocido",
-    "Error while updating the account: " : "Se presentó un error al actualizar la cuenta:",
-    "All inboxes" : "Todos los buzones de entrada",
-    "you" : "tú",
-    "Send message to {email}" : "Enviar mensaje a {email}",
-    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
-    "Could not load your message" : "No fue posible cargar tu mensaje",
-    "Could not load the desired message" : "No fue posible cargar el mensaje deseado",
-    "Could not load the message" : "No fue posible cargar el mensaje",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
-    "Nextcloud Mail" : "Correo Nextcloud",
-    "Save" : "Guardar",
-    "Saved" : "Guardado",
-    "Show all folders" : "Mostrar todas las carpetas",
-    "Collapse folders" : "Compactar carpetas",
-    "Error while deleting account." : "Se presetó un error al borrar la cuenta.",
-    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "An error occurred while uploading {fname}" : "Se presentó un error durante la carga {fname}",
-    "Reply" : "Responder",
-    "Send" : "Enviar",
-    "Sending …" : "Enviando ...",
-    "Message sent!" : "¡Mensaje enviado!",
-    "Server error" : "Se presentó un error en el servidor",
-    "An unknown error occurred" : "Se presentó un error desconocido",
-    "Opening HTML drafts is not supported yet." : "Abrir borradores HTML aún no está soportado.",
-    "No writable calendars found" : "No se encontraron calendarios editables",
-    "Error while importing the calendar event" : "Se presentó un error al importar el evento del calendario",
-    "Error while downloading calendar event" : "Se presentó un error al descargar el evento del calendario",
-    "& others" : "& otros",
-    "Error while loading messages." : "Se presentói un error al cargar los mensajes.",
-    "Error while refreshing messages." : "Se presentó un error al actualizar los mensajes.",
-    "Setting up your account" : "Configura tu cuenta",
     "Inbox" : "Buzón de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -62,68 +12,70 @@
     "Updating account failed: " : "Se presentó una falla al actualizar la cuenta",
     "Creating account failed: " : "Se presentó una falla al crear la cuenta:",
     "Delete permanently" : "Borrar permanentemente",
-    "Error loading message" : "Se presentó un error al cargar el mensaje",
-    "Settings" : "Configuraciones ",
-    "Forwarding to %s" : "Reenviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
-    "Redirect" : "Redireccionar",
-    "The link leads to %s" : "La liga lleva a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
-    "Continue to %s" : "Continuar a %s",
-    "Delete account" : "Borrar cuenta",
-    "Try again" : "Reintentar",
-    "New message" : "Mensaje nuevo",
-    "Account Settings" : "Configuraciones  de la cuenta",
-    "Aliases" : "Aliases",
-    "Mail address" : "Dirección de correo",
-    "Display Name" : "Nombre a desplegar",
-    "Account" : "Cuenta",
-    "Delete" : "Borrar",
-    "Keyboard shortcuts" : "Atajos del teclado",
-    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
-    "Compose new message" : "Escribir mensaje nuevo",
-    "Newer message" : "Mensaje más nuevo",
-    "Older message" : "Mensaje más antiguo",
-    "Toggle star" : "Alternar favoritos",
-    "Toggle unread" : "Alternar no leídos",
-    "Search" : "Buscar",
-    "Refresh" : "Actualizar",
-    "Connect your mail account" : "Conecta tu cuenta de correo",
     "Name" : "Nombre",
     "Mail Address" : "Dirección de Correo",
     "Password" : "Contraseña",
-    "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
-    "IMAP security" : "Seguridad IMAP",
     "None" : "Ninguno",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "IMAP Password" : "Contraseña IMAP",
     "SMTP Host" : "Servior SMTP",
-    "SMTP security" : "Seguridad SMTP",
     "SMTP Port" : "Puerto SMTP",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contraseña SMTP",
     "Connect" : "Conectar",
+    "Add mail account" : "Agregar cuenta de correo",
+    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
+    "Keyboard shortcuts" : "Atajos del teclado",
     "from" : "de",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Nota que el correo vino de una dirección no-responda asi que tu respuesta probablemente no sea leida. ",
     "Subject" : "Asunto",
-    "Save all to Files" : "Guardar todo a Archivos",
-    "Add mail account" : "Agregar cuenta de correo",
-    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
-    "No search results for" : "No se obtuvieron resultados para la búsqueda de ",
-    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
-    "Show images from this sender" : "Mostrar imagenes de este remitente",
-    "Forward" : "Reenviar",
-    "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "¡Mensaje enviado!",
+    "Send" : "Enviar",
     "Upload attachment" : "Cargar adjunto",
     "Add attachment from Files" : "Agregar adjunto desd Archivos",
+    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Delete" : "Borrar",
+    "Could not load your message" : "No fue posible cargar tu mensaje",
     "Import into calendar" : "Importar al calendario",
     "Download attachment" : "Descargar adjunto",
-    "Save to Files" : "Guardar a Archivos"
+    "Save to Files" : "Guardar a Archivos",
+    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
+    "Save all to Files" : "Guardar todo a Archivos",
+    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
+    "New message" : "Mensaje nuevo",
+    "Settings" : "Configuraciones ",
+    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
+    "Compose new message" : "Escribir mensaje nuevo",
+    "Newer message" : "Mensaje más nuevo",
+    "Older message" : "Mensaje más antiguo",
+    "Toggle star" : "Alternar favoritos",
+    "Toggle unread" : "Alternar no leídos",
+    "Search" : "Buscar",
+    "Refresh" : "Actualizar",
+    "Connect your mail account" : "Conecta tu cuenta de correo",
+    "Show all folders" : "Mostrar todas las carpetas",
+    "Collapse folders" : "Compactar carpetas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
+    "Nextcloud Mail" : "Correo Nextcloud",
+    "All inboxes" : "Todos los buzones de entrada",
+    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
+    "Could not load the desired message" : "No fue posible cargar el mensaje deseado",
+    "Could not load the message" : "No fue posible cargar el mensaje",
+    "Error loading message" : "Se presentó un error al cargar el mensaje",
+    "Forwarding to %s" : "Reenviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
+    "Redirect" : "Redireccionar",
+    "The link leads to %s" : "La liga lleva a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
+    "Continue to %s" : "Continuar a %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/es_GT.js b/l10n/es_GT.js
index 7e3ca3ea1..a5b5292ed 100644
--- a/l10n/es_GT.js
+++ b/l10n/es_GT.js
@@ -2,56 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Correo",
-    "Loading accounts" : "Cargando cuentas",
-    "Error while loading the accounts." : "Se presentó un error al cargar las cuentas.",
-    "Can not load this folder." : "No se puede cargar esta carpeta.",
-    "Searching for {query}" : "Buscando a {query}",
-    "Error while deleting message." : "Se presentó un error al borrar el mensaje.",
-    "Forwarded message" : "mensaje reenviado",
-    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
-    "Attachments saved to Files." : "Adjuntos guardados a Archivos. ",
-    "Attachment saved to Files." : "Adjunto guardado en Archivos. ",
-    "Error while saving attachments to Files." : "Se presentó un error al guardar los adjuntos en Archivos.",
-    "Error while saving attachment to Files." : "Se presentó un error al guardar los adjuntos en Archivos",
-    "Message flag could not be set." : "No fue posible establecer la bandera del mensaje. ",
-    "Could not move message." : "No fue posible mover el mensaje.",
-    "Invalid account" : "Cuenta inválida",
-    "Invalid folder" : "Carpeta inválida",
-    "Error while creating the account: " : "Se presentó un error al crear la cuenta:",
-    "Unknown error" : "Error desconocido",
-    "Error while updating the account: " : "Se presentó un error al actualizar la cuenta:",
-    "All inboxes" : "Todos los buzones de entrada",
-    "you" : "tú",
-    "Send message to {email}" : "Enviar mensaje a {email}",
-    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
-    "Could not load your message" : "No fue posible cargar tu mensaje",
-    "Could not load the desired message" : "No fue posible cargar el mensaje deseado",
-    "Could not load the message" : "No fue posible cargar el mensaje",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
-    "Nextcloud Mail" : "Correo Nextcloud",
-    "Save" : "Guardar",
-    "Saved" : "Guardado",
-    "Show all folders" : "Mostrar todas las carpetas",
-    "Collapse folders" : "Compactar carpetas",
-    "Error while deleting account." : "Se presetó un error al borrar la cuenta.",
-    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "An error occurred while uploading {fname}" : "Se presentó un error durante la carga {fname}",
-    "Reply" : "Responder",
-    "Send" : "Enviar",
-    "Sending …" : "Enviando ...",
-    "Message sent!" : "¡Mensaje enviado!",
-    "Server error" : "Se presentó un error en el servidor",
-    "An unknown error occurred" : "Se presentó un error desconocido",
-    "Opening HTML drafts is not supported yet." : "Abrir borradores HTML aún no está soportado.",
-    "No writable calendars found" : "No se encontraron calendarios editables",
-    "Error while importing the calendar event" : "Se presentó un error al importar el evento del calendario",
-    "Error while downloading calendar event" : "Se presentó un error al descargar el evento del calendario",
-    "& others" : "& otros",
-    "Error while loading messages." : "Se presentói un error al cargar los mensajes.",
-    "Error while refreshing messages." : "Se presentó un error al actualizar los mensajes.",
-    "Setting up your account" : "Configura tu cuenta",
     "Inbox" : "Buzón de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -64,68 +14,70 @@ OC.L10N.register(
     "Updating account failed: " : "Se presentó una falla al actualizar la cuenta",
     "Creating account failed: " : "Se presentó una falla al crear la cuenta:",
     "Delete permanently" : "Borrar permanentemente",
-    "Error loading message" : "Se presentó un error al cargar el mensaje",
-    "Settings" : "Configuraciones ",
-    "Forwarding to %s" : "Reenviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
-    "Redirect" : "Redireccionar",
-    "The link leads to %s" : "La liga lleva a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
-    "Continue to %s" : "Continuar a %s",
-    "Delete account" : "Borrar cuenta",
-    "Try again" : "Reintentar",
-    "New message" : "Mensaje nuevo",
-    "Account Settings" : "Configuraciones  de la cuenta",
-    "Aliases" : "Aliases",
-    "Mail address" : "Dirección de correo",
-    "Display Name" : "Nombre a desplegar",
-    "Account" : "Cuenta",
-    "Delete" : "Borrar",
-    "Keyboard shortcuts" : "Atajos del teclado",
-    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
-    "Compose new message" : "Escribir mensaje nuevo",
-    "Newer message" : "Mensaje más nuevo",
-    "Older message" : "Mensaje más antiguo",
-    "Toggle star" : "Alternar favoritos",
-    "Toggle unread" : "Alternar no leídos",
-    "Search" : "Buscar",
-    "Refresh" : "Actualizar",
-    "Connect your mail account" : "Conecta tu cuenta de correo",
     "Name" : "Nombre",
     "Mail Address" : "Dirección de Correo",
     "Password" : "Contraseña",
-    "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
-    "IMAP security" : "Seguridad IMAP",
     "None" : "Ninguno",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "IMAP Password" : "Contraseña IMAP",
     "SMTP Host" : "Servior SMTP",
-    "SMTP security" : "Seguridad SMTP",
     "SMTP Port" : "Puerto SMTP",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contraseña SMTP",
     "Connect" : "Conectar",
+    "Add mail account" : "Agregar cuenta de correo",
+    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
+    "Keyboard shortcuts" : "Atajos del teclado",
     "from" : "de",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Nota que el correo vino de una dirección no-responda asi que tu respuesta probablemente no sea leida. ",
     "Subject" : "Asunto",
-    "Save all to Files" : "Guardar todo a Archivos",
-    "Add mail account" : "Agregar cuenta de correo",
-    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
-    "No search results for" : "No se obtuvieron resultados para la búsqueda de ",
-    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
-    "Show images from this sender" : "Mostrar imagenes de este remitente",
-    "Forward" : "Reenviar",
-    "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "¡Mensaje enviado!",
+    "Send" : "Enviar",
     "Upload attachment" : "Cargar adjunto",
     "Add attachment from Files" : "Agregar adjunto desd Archivos",
+    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Delete" : "Borrar",
+    "Could not load your message" : "No fue posible cargar tu mensaje",
     "Import into calendar" : "Importar al calendario",
     "Download attachment" : "Descargar adjunto",
-    "Save to Files" : "Guardar a Archivos"
+    "Save to Files" : "Guardar a Archivos",
+    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
+    "Save all to Files" : "Guardar todo a Archivos",
+    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
+    "New message" : "Mensaje nuevo",
+    "Settings" : "Configuraciones ",
+    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
+    "Compose new message" : "Escribir mensaje nuevo",
+    "Newer message" : "Mensaje más nuevo",
+    "Older message" : "Mensaje más antiguo",
+    "Toggle star" : "Alternar favoritos",
+    "Toggle unread" : "Alternar no leídos",
+    "Search" : "Buscar",
+    "Refresh" : "Actualizar",
+    "Connect your mail account" : "Conecta tu cuenta de correo",
+    "Show all folders" : "Mostrar todas las carpetas",
+    "Collapse folders" : "Compactar carpetas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
+    "Nextcloud Mail" : "Correo Nextcloud",
+    "All inboxes" : "Todos los buzones de entrada",
+    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
+    "Could not load the desired message" : "No fue posible cargar el mensaje deseado",
+    "Could not load the message" : "No fue posible cargar el mensaje",
+    "Error loading message" : "Se presentó un error al cargar el mensaje",
+    "Forwarding to %s" : "Reenviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
+    "Redirect" : "Redireccionar",
+    "The link leads to %s" : "La liga lleva a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
+    "Continue to %s" : "Continuar a %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/es_GT.json b/l10n/es_GT.json
index b652d4609..f23270e4e 100644
--- a/l10n/es_GT.json
+++ b/l10n/es_GT.json
@@ -1,55 +1,5 @@
 { "translations": {
     "Mail" : "Correo",
-    "Loading accounts" : "Cargando cuentas",
-    "Error while loading the accounts." : "Se presentó un error al cargar las cuentas.",
-    "Can not load this folder." : "No se puede cargar esta carpeta.",
-    "Searching for {query}" : "Buscando a {query}",
-    "Error while deleting message." : "Se presentó un error al borrar el mensaje.",
-    "Forwarded message" : "mensaje reenviado",
-    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
-    "Attachments saved to Files." : "Adjuntos guardados a Archivos. ",
-    "Attachment saved to Files." : "Adjunto guardado en Archivos. ",
-    "Error while saving attachments to Files." : "Se presentó un error al guardar los adjuntos en Archivos.",
-    "Error while saving attachment to Files." : "Se presentó un error al guardar los adjuntos en Archivos",
-    "Message flag could not be set." : "No fue posible establecer la bandera del mensaje. ",
-    "Could not move message." : "No fue posible mover el mensaje.",
-    "Invalid account" : "Cuenta inválida",
-    "Invalid folder" : "Carpeta inválida",
-    "Error while creating the account: " : "Se presentó un error al crear la cuenta:",
-    "Unknown error" : "Error desconocido",
-    "Error while updating the account: " : "Se presentó un error al actualizar la cuenta:",
-    "All inboxes" : "Todos los buzones de entrada",
-    "you" : "tú",
-    "Send message to {email}" : "Enviar mensaje a {email}",
-    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
-    "Could not load your message" : "No fue posible cargar tu mensaje",
-    "Could not load the desired message" : "No fue posible cargar el mensaje deseado",
-    "Could not load the message" : "No fue posible cargar el mensaje",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
-    "Nextcloud Mail" : "Correo Nextcloud",
-    "Save" : "Guardar",
-    "Saved" : "Guardado",
-    "Show all folders" : "Mostrar todas las carpetas",
-    "Collapse folders" : "Compactar carpetas",
-    "Error while deleting account." : "Se presetó un error al borrar la cuenta.",
-    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "An error occurred while uploading {fname}" : "Se presentó un error durante la carga {fname}",
-    "Reply" : "Responder",
-    "Send" : "Enviar",
-    "Sending …" : "Enviando ...",
-    "Message sent!" : "¡Mensaje enviado!",
-    "Server error" : "Se presentó un error en el servidor",
-    "An unknown error occurred" : "Se presentó un error desconocido",
-    "Opening HTML drafts is not supported yet." : "Abrir borradores HTML aún no está soportado.",
-    "No writable calendars found" : "No se encontraron calendarios editables",
-    "Error while importing the calendar event" : "Se presentó un error al importar el evento del calendario",
-    "Error while downloading calendar event" : "Se presentó un error al descargar el evento del calendario",
-    "& others" : "& otros",
-    "Error while loading messages." : "Se presentói un error al cargar los mensajes.",
-    "Error while refreshing messages." : "Se presentó un error al actualizar los mensajes.",
-    "Setting up your account" : "Configura tu cuenta",
     "Inbox" : "Buzón de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -62,68 +12,70 @@
     "Updating account failed: " : "Se presentó una falla al actualizar la cuenta",
     "Creating account failed: " : "Se presentó una falla al crear la cuenta:",
     "Delete permanently" : "Borrar permanentemente",
-    "Error loading message" : "Se presentó un error al cargar el mensaje",
-    "Settings" : "Configuraciones ",
-    "Forwarding to %s" : "Reenviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
-    "Redirect" : "Redireccionar",
-    "The link leads to %s" : "La liga lleva a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
-    "Continue to %s" : "Continuar a %s",
-    "Delete account" : "Borrar cuenta",
-    "Try again" : "Reintentar",
-    "New message" : "Mensaje nuevo",
-    "Account Settings" : "Configuraciones  de la cuenta",
-    "Aliases" : "Aliases",
-    "Mail address" : "Dirección de correo",
-    "Display Name" : "Nombre a desplegar",
-    "Account" : "Cuenta",
-    "Delete" : "Borrar",
-    "Keyboard shortcuts" : "Atajos del teclado",
-    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
-    "Compose new message" : "Escribir mensaje nuevo",
-    "Newer message" : "Mensaje más nuevo",
-    "Older message" : "Mensaje más antiguo",
-    "Toggle star" : "Alternar favoritos",
-    "Toggle unread" : "Alternar no leídos",
-    "Search" : "Buscar",
-    "Refresh" : "Actualizar",
-    "Connect your mail account" : "Conecta tu cuenta de correo",
     "Name" : "Nombre",
     "Mail Address" : "Dirección de Correo",
     "Password" : "Contraseña",
-    "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
-    "IMAP security" : "Seguridad IMAP",
     "None" : "Ninguno",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "IMAP Password" : "Contraseña IMAP",
     "SMTP Host" : "Servior SMTP",
-    "SMTP security" : "Seguridad SMTP",
     "SMTP Port" : "Puerto SMTP",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contraseña SMTP",
     "Connect" : "Conectar",
+    "Add mail account" : "Agregar cuenta de correo",
+    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
+    "Keyboard shortcuts" : "Atajos del teclado",
     "from" : "de",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Nota que el correo vino de una dirección no-responda asi que tu respuesta probablemente no sea leida. ",
     "Subject" : "Asunto",
-    "Save all to Files" : "Guardar todo a Archivos",
-    "Add mail account" : "Agregar cuenta de correo",
-    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
-    "No search results for" : "No se obtuvieron resultados para la búsqueda de ",
-    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
-    "Show images from this sender" : "Mostrar imagenes de este remitente",
-    "Forward" : "Reenviar",
-    "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "¡Mensaje enviado!",
+    "Send" : "Enviar",
     "Upload attachment" : "Cargar adjunto",
     "Add attachment from Files" : "Agregar adjunto desd Archivos",
+    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Delete" : "Borrar",
+    "Could not load your message" : "No fue posible cargar tu mensaje",
     "Import into calendar" : "Importar al calendario",
     "Download attachment" : "Descargar adjunto",
-    "Save to Files" : "Guardar a Archivos"
+    "Save to Files" : "Guardar a Archivos",
+    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
+    "Save all to Files" : "Guardar todo a Archivos",
+    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
+    "New message" : "Mensaje nuevo",
+    "Settings" : "Configuraciones ",
+    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
+    "Compose new message" : "Escribir mensaje nuevo",
+    "Newer message" : "Mensaje más nuevo",
+    "Older message" : "Mensaje más antiguo",
+    "Toggle star" : "Alternar favoritos",
+    "Toggle unread" : "Alternar no leídos",
+    "Search" : "Buscar",
+    "Refresh" : "Actualizar",
+    "Connect your mail account" : "Conecta tu cuenta de correo",
+    "Show all folders" : "Mostrar todas las carpetas",
+    "Collapse folders" : "Compactar carpetas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
+    "Nextcloud Mail" : "Correo Nextcloud",
+    "All inboxes" : "Todos los buzones de entrada",
+    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
+    "Could not load the desired message" : "No fue posible cargar el mensaje deseado",
+    "Could not load the message" : "No fue posible cargar el mensaje",
+    "Error loading message" : "Se presentó un error al cargar el mensaje",
+    "Forwarding to %s" : "Reenviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
+    "Redirect" : "Redireccionar",
+    "The link leads to %s" : "La liga lleva a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
+    "Continue to %s" : "Continuar a %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/es_HN.js b/l10n/es_HN.js
index 4de7f878e..c2c1f9f4b 100644
--- a/l10n/es_HN.js
+++ b/l10n/es_HN.js
@@ -2,51 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Correo",
-    "Loading accounts" : "Cargando cuentas",
-    "Error while loading the accounts." : "Se presentó un error al cargar las cuentas.",
-    "Can not load this folder." : "No se puede cargar esta carpeta.",
-    "Searching for {query}" : "Buscando a {query}",
-    "Error while deleting message." : "Se presentó un error al borrar el mensaje.",
-    "Forwarded message" : "mensaje reenviado",
-    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
-    "Attachments saved to Files." : "Adjuntos guardados a Archivos. ",
-    "Attachment saved to Files." : "Adjunto guardado en Archivos. ",
-    "Error while saving attachments to Files." : "Se presentó un error al guardar los adjuntos en Archivos.",
-    "Error while saving attachment to Files." : "Se presentó un error al guardar los adjuntos en Archivos",
-    "Message flag could not be set." : "No fue posible establecer la bandera del mensaje. ",
-    "Could not move message." : "No fue posible mover el mensaje.",
-    "Invalid account" : "Cuenta inválida",
-    "Invalid folder" : "Carpeta inválida",
-    "Error while creating the account: " : "Se presentó un error al crear la cuenta:",
-    "Unknown error" : "Error desconocido",
-    "All inboxes" : "Todos los buzones de entrada",
-    "you" : "tú",
-    "Send message to {email}" : "Enviar mensaje a {email}",
-    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
-    "Nextcloud Mail" : "Correo Nextcloud",
-    "Save" : "Guardar",
-    "Show all folders" : "Mostrar todas las carpetas",
-    "Collapse folders" : "Compactar carpetas",
-    "Error while deleting account." : "Se presetó un error al borrar la cuenta.",
-    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "An error occurred while uploading {fname}" : "Se presentó un error durante la carga {fname}",
-    "Reply" : "Responder",
-    "Send" : "Enviar",
-    "Sending …" : "Enviando ...",
-    "Message sent!" : "¡Mensaje enviado!",
-    "Server error" : "Se presentó un error en el servidor",
-    "An unknown error occurred" : "Se presentó un error desconocido",
-    "Opening HTML drafts is not supported yet." : "Abrir borradores HTML aún no está soportado.",
-    "No writable calendars found" : "No se encontraron calendarios editables",
-    "Error while importing the calendar event" : "Se presentó un error al importar el evento del calendario",
-    "Error while downloading calendar event" : "Se presentó un error al descargar el evento del calendario",
-    "& others" : "& otros",
-    "Error while loading messages." : "Se presentói un error al cargar los mensajes.",
-    "Error while refreshing messages." : "Se presentó un error al actualizar los mensajes.",
-    "Setting up your account" : "Configura tu cuenta",
     "Inbox" : "Buzón de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -58,65 +13,66 @@ OC.L10N.register(
     "Auto detect failed. Please use manual mode." : "Se presentó una falla en la auto detección. Por favor usa el modo manual.",
     "Creating account failed: " : "Se presentó una falla al crear la cuenta:",
     "Delete permanently" : "Borrar permanentemente",
-    "Error loading message" : "Se presentó un error al cargar el mensaje",
-    "Settings" : "Configuraciones ",
-    "Forwarding to %s" : "Reenviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
-    "Redirect" : "Redireccionar",
-    "The link leads to %s" : "La liga lleva a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
-    "Continue to %s" : "Continuar a %s",
-    "Delete account" : "Borrar cuenta",
-    "Try again" : "Reintentar",
-    "New message" : "Mensaje nuevo",
-    "Account Settings" : "Configuraciones  de la cuenta",
-    "Aliases" : "Aliases",
-    "Mail address" : "Dirección de correo",
-    "Display Name" : "Nombre a desplegar",
-    "Delete" : "Borrar",
-    "Keyboard shortcuts" : "Atajos del teclado",
-    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
-    "Compose new message" : "Escribir mensaje nuevo",
-    "Newer message" : "Mensaje más nuevo",
-    "Older message" : "Mensaje más antiguo",
-    "Toggle star" : "Alternar favoritos",
-    "Toggle unread" : "Alternar no leídos",
-    "Search" : "Buscar",
-    "Refresh" : "Actualizar",
-    "Connect your mail account" : "Conecta tu cuenta de correo",
     "Name" : "Nombre",
     "Mail Address" : "Dirección de Correo",
     "Password" : "Contraseña",
-    "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
-    "IMAP security" : "Seguridad IMAP",
     "None" : "Ninguno",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "IMAP Password" : "Contraseña IMAP",
     "SMTP Host" : "Servior SMTP",
-    "SMTP security" : "Seguridad SMTP",
     "SMTP Port" : "Puerto SMTP",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contraseña SMTP",
     "Connect" : "Conectar",
+    "Add mail account" : "Agregar cuenta de correo",
+    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
+    "Keyboard shortcuts" : "Atajos del teclado",
     "from" : "de",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
     "Subject" : "Asunto",
-    "Save all to Files" : "Guardar todo a Archivos",
-    "Add mail account" : "Agregar cuenta de correo",
-    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
-    "No search results for" : "No se obtuvieron resultados para la búsqueda de ",
-    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
-    "Show images from this sender" : "Mostrar imagenes de este remitente",
-    "Forward" : "Reenviar",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "¡Mensaje enviado!",
+    "Send" : "Enviar",
     "Upload attachment" : "Cargar adjunto",
     "Add attachment from Files" : "Agregar adjunto desd Archivos",
+    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "Delete" : "Borrar",
     "Import into calendar" : "Importar al calendario",
     "Download attachment" : "Descargar adjunto",
-    "Save to Files" : "Guardar a Archivos"
+    "Save to Files" : "Guardar a Archivos",
+    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
+    "Save all to Files" : "Guardar todo a Archivos",
+    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
+    "New message" : "Mensaje nuevo",
+    "Settings" : "Configuraciones ",
+    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
+    "Compose new message" : "Escribir mensaje nuevo",
+    "Newer message" : "Mensaje más nuevo",
+    "Older message" : "Mensaje más antiguo",
+    "Toggle star" : "Alternar favoritos",
+    "Toggle unread" : "Alternar no leídos",
+    "Search" : "Buscar",
+    "Refresh" : "Actualizar",
+    "Connect your mail account" : "Conecta tu cuenta de correo",
+    "Show all folders" : "Mostrar todas las carpetas",
+    "Collapse folders" : "Compactar carpetas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
+    "Nextcloud Mail" : "Correo Nextcloud",
+    "All inboxes" : "Todos los buzones de entrada",
+    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
+    "Error loading message" : "Se presentó un error al cargar el mensaje",
+    "Forwarding to %s" : "Reenviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
+    "Redirect" : "Redireccionar",
+    "The link leads to %s" : "La liga lleva a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
+    "Continue to %s" : "Continuar a %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/es_HN.json b/l10n/es_HN.json
index 41b28b5dd..2564f869e 100644
--- a/l10n/es_HN.json
+++ b/l10n/es_HN.json
@@ -1,50 +1,5 @@
 { "translations": {
     "Mail" : "Correo",
-    "Loading accounts" : "Cargando cuentas",
-    "Error while loading the accounts." : "Se presentó un error al cargar las cuentas.",
-    "Can not load this folder." : "No se puede cargar esta carpeta.",
-    "Searching for {query}" : "Buscando a {query}",
-    "Error while deleting message." : "Se presentó un error al borrar el mensaje.",
-    "Forwarded message" : "mensaje reenviado",
-    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
-    "Attachments saved to Files." : "Adjuntos guardados a Archivos. ",
-    "Attachment saved to Files." : "Adjunto guardado en Archivos. ",
-    "Error while saving attachments to Files." : "Se presentó un error al guardar los adjuntos en Archivos.",
-    "Error while saving attachment to Files." : "Se presentó un error al guardar los adjuntos en Archivos",
-    "Message flag could not be set." : "No fue posible establecer la bandera del mensaje. ",
-    "Could not move message." : "No fue posible mover el mensaje.",
-    "Invalid account" : "Cuenta inválida",
-    "Invalid folder" : "Carpeta inválida",
-    "Error while creating the account: " : "Se presentó un error al crear la cuenta:",
-    "Unknown error" : "Error desconocido",
-    "All inboxes" : "Todos los buzones de entrada",
-    "you" : "tú",
-    "Send message to {email}" : "Enviar mensaje a {email}",
-    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
-    "Nextcloud Mail" : "Correo Nextcloud",
-    "Save" : "Guardar",
-    "Show all folders" : "Mostrar todas las carpetas",
-    "Collapse folders" : "Compactar carpetas",
-    "Error while deleting account." : "Se presetó un error al borrar la cuenta.",
-    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "An error occurred while uploading {fname}" : "Se presentó un error durante la carga {fname}",
-    "Reply" : "Responder",
-    "Send" : "Enviar",
-    "Sending …" : "Enviando ...",
-    "Message sent!" : "¡Mensaje enviado!",
-    "Server error" : "Se presentó un error en el servidor",
-    "An unknown error occurred" : "Se presentó un error desconocido",
-    "Opening HTML drafts is not supported yet." : "Abrir borradores HTML aún no está soportado.",
-    "No writable calendars found" : "No se encontraron calendarios editables",
-    "Error while importing the calendar event" : "Se presentó un error al importar el evento del calendario",
-    "Error while downloading calendar event" : "Se presentó un error al descargar el evento del calendario",
-    "& others" : "& otros",
-    "Error while loading messages." : "Se presentói un error al cargar los mensajes.",
-    "Error while refreshing messages." : "Se presentó un error al actualizar los mensajes.",
-    "Setting up your account" : "Configura tu cuenta",
     "Inbox" : "Buzón de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -56,65 +11,66 @@
     "Auto detect failed. Please use manual mode." : "Se presentó una falla en la auto detección. Por favor usa el modo manual.",
     "Creating account failed: " : "Se presentó una falla al crear la cuenta:",
     "Delete permanently" : "Borrar permanentemente",
-    "Error loading message" : "Se presentó un error al cargar el mensaje",
-    "Settings" : "Configuraciones ",
-    "Forwarding to %s" : "Reenviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
-    "Redirect" : "Redireccionar",
-    "The link leads to %s" : "La liga lleva a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
-    "Continue to %s" : "Continuar a %s",
-    "Delete account" : "Borrar cuenta",
-    "Try again" : "Reintentar",
-    "New message" : "Mensaje nuevo",
-    "Account Settings" : "Configuraciones  de la cuenta",
-    "Aliases" : "Aliases",
-    "Mail address" : "Dirección de correo",
-    "Display Name" : "Nombre a desplegar",
-    "Delete" : "Borrar",
-    "Keyboard shortcuts" : "Atajos del teclado",
-    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
-    "Compose new message" : "Escribir mensaje nuevo",
-    "Newer message" : "Mensaje más nuevo",
-    "Older message" : "Mensaje más antiguo",
-    "Toggle star" : "Alternar favoritos",
-    "Toggle unread" : "Alternar no leídos",
-    "Search" : "Buscar",
-    "Refresh" : "Actualizar",
-    "Connect your mail account" : "Conecta tu cuenta de correo",
     "Name" : "Nombre",
     "Mail Address" : "Dirección de Correo",
     "Password" : "Contraseña",
-    "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
-    "IMAP security" : "Seguridad IMAP",
     "None" : "Ninguno",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "IMAP Password" : "Contraseña IMAP",
     "SMTP Host" : "Servior SMTP",
-    "SMTP security" : "Seguridad SMTP",
     "SMTP Port" : "Puerto SMTP",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contraseña SMTP",
     "Connect" : "Conectar",
+    "Add mail account" : "Agregar cuenta de correo",
+    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
+    "Keyboard shortcuts" : "Atajos del teclado",
     "from" : "de",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
     "Subject" : "Asunto",
-    "Save all to Files" : "Guardar todo a Archivos",
-    "Add mail account" : "Agregar cuenta de correo",
-    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
-    "No search results for" : "No se obtuvieron resultados para la búsqueda de ",
-    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
-    "Show images from this sender" : "Mostrar imagenes de este remitente",
-    "Forward" : "Reenviar",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "¡Mensaje enviado!",
+    "Send" : "Enviar",
     "Upload attachment" : "Cargar adjunto",
     "Add attachment from Files" : "Agregar adjunto desd Archivos",
+    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "Delete" : "Borrar",
     "Import into calendar" : "Importar al calendario",
     "Download attachment" : "Descargar adjunto",
-    "Save to Files" : "Guardar a Archivos"
+    "Save to Files" : "Guardar a Archivos",
+    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
+    "Save all to Files" : "Guardar todo a Archivos",
+    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
+    "New message" : "Mensaje nuevo",
+    "Settings" : "Configuraciones ",
+    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
+    "Compose new message" : "Escribir mensaje nuevo",
+    "Newer message" : "Mensaje más nuevo",
+    "Older message" : "Mensaje más antiguo",
+    "Toggle star" : "Alternar favoritos",
+    "Toggle unread" : "Alternar no leídos",
+    "Search" : "Buscar",
+    "Refresh" : "Actualizar",
+    "Connect your mail account" : "Conecta tu cuenta de correo",
+    "Show all folders" : "Mostrar todas las carpetas",
+    "Collapse folders" : "Compactar carpetas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
+    "Nextcloud Mail" : "Correo Nextcloud",
+    "All inboxes" : "Todos los buzones de entrada",
+    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
+    "Error loading message" : "Se presentó un error al cargar el mensaje",
+    "Forwarding to %s" : "Reenviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
+    "Redirect" : "Redireccionar",
+    "The link leads to %s" : "La liga lleva a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
+    "Continue to %s" : "Continuar a %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/es_MX.js b/l10n/es_MX.js
index 7648f7cbe..6ac69b495 100644
--- a/l10n/es_MX.js
+++ b/l10n/es_MX.js
@@ -2,56 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Correo",
-    "Loading accounts" : "Cargando cuentas",
-    "Error while loading the accounts." : "Se presentó un error al cargar las cuentas.",
-    "Can not load this folder." : "No se puede cargar esta carpeta.",
-    "Searching for {query}" : "Buscando a {query}",
-    "Error while deleting message." : "Se presentó un error al borrar el mensaje.",
-    "Forwarded message" : "mensaje reenviado",
-    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
-    "Attachments saved to Files." : "Adjuntos guardados a Archivos. ",
-    "Attachment saved to Files." : "Adjunto guardado en Archivos. ",
-    "Error while saving attachments to Files." : "Se presentó un error al guardar los adjuntos en Archivos.",
-    "Error while saving attachment to Files." : "Se presentó un error al guardar los adjuntos en Archivos",
-    "Message flag could not be set." : "No fue posible establecer la bandera del mensaje. ",
-    "Could not move message." : "No fue posible mover el mensaje.",
-    "Invalid account" : "Cuenta inválida",
-    "Invalid folder" : "Carpeta inválida",
-    "Error while creating the account: " : "Se presentó un error al crear la cuenta:",
-    "Unknown error" : "Error desconocido",
-    "Error while updating the account: " : "Se presentó un error al actualizar la cuenta:",
-    "All inboxes" : "Todos los buzones de entrada",
-    "you" : "tú",
-    "Send message to {email}" : "Enviar mensaje a {email}",
-    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
-    "Could not load your message" : "No fue posible cargar tu mensaje",
-    "Could not load the desired message" : "No fue posible cargar el mensaje deseado",
-    "Could not load the message" : "No fue posible cargar el mensaje",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
-    "Nextcloud Mail" : "Correo Nextcloud",
-    "Save" : "Guardar",
-    "Saved" : "Guardado",
-    "Show all folders" : "Mostrar todas las carpetas",
-    "Collapse folders" : "Compactar carpetas",
-    "Error while deleting account." : "Se presetó un error al borrar la cuenta.",
-    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "An error occurred while uploading {fname}" : "Se presentó un error durante la carga {fname}",
-    "Reply" : "Responder",
-    "Send" : "Enviar",
-    "Sending …" : "Enviando ...",
-    "Message sent!" : "¡Mensaje enviado!",
-    "Server error" : "Se presentó un error en el servidor",
-    "An unknown error occurred" : "Se presentó un error desconocido",
-    "Opening HTML drafts is not supported yet." : "Abrir borradores HTML aún no está soportado.",
-    "No writable calendars found" : "No se encontraron calendarios editables",
-    "Error while importing the calendar event" : "Se presentó un error al importar el evento del calendario",
-    "Error while downloading calendar event" : "Se presentó un error al descargar el evento del calendario",
-    "& others" : "& otros",
-    "Error while loading messages." : "Se presentói un error al cargar los mensajes.",
-    "Error while refreshing messages." : "Se presentó un error al actualizar los mensajes.",
-    "Setting up your account" : "Configura tu cuenta",
     "Inbox" : "Buzón de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -66,68 +16,70 @@ OC.L10N.register(
     "Delete permanently" : "Borrar permanentemente",
     "IMAP web client" : "Cliente web IMAP",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Cliente de correo electrónico fácil de usar que se conecta con tu servidor de correo vía IMAP y SMTP.",
-    "Error loading message" : "Se presentó un error al cargar el mensaje",
-    "Settings" : "Configuraciones ",
-    "Forwarding to %s" : "Reenviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
-    "Redirect" : "Redireccionar",
-    "The link leads to %s" : "La liga lleva a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
-    "Continue to %s" : "Continuar a %s",
-    "Delete account" : "Borrar cuenta",
-    "Try again" : "Reintentar",
-    "New message" : "Mensaje nuevo",
-    "Account Settings" : "Configuraciones  de la cuenta",
-    "Aliases" : "Aliases",
-    "Mail address" : "Dirección de correo",
-    "Display Name" : "Nombre a desplegar",
-    "Account" : "Cuenta",
-    "Delete" : "Borrar",
-    "Keyboard shortcuts" : "Atajos del teclado",
-    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
-    "Compose new message" : "Escribir mensaje nuevo",
-    "Newer message" : "Mensaje más nuevo",
-    "Older message" : "Mensaje más antiguo",
-    "Toggle star" : "Alternar favoritos",
-    "Toggle unread" : "Alternar no leídos",
-    "Search" : "Buscar",
-    "Refresh" : "Actualizar",
-    "Connect your mail account" : "Conecta tu cuenta de correo",
     "Name" : "Nombre",
     "Mail Address" : "Dirección de Correo",
     "Password" : "Contraseña",
-    "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
-    "IMAP security" : "Seguridad IMAP",
     "None" : "Ninguno",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "IMAP Password" : "Contraseña IMAP",
     "SMTP Host" : "Servior SMTP",
-    "SMTP security" : "Seguridad SMTP",
     "SMTP Port" : "Puerto SMTP",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contraseña SMTP",
     "Connect" : "Conectar",
+    "Add mail account" : "Agregar cuenta de correo",
+    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
+    "Keyboard shortcuts" : "Atajos del teclado",
     "from" : "de",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Nota que el correo vino de una dirección no-responda asi que tu respuesta probablemente no sea leida. ",
     "Subject" : "Asunto",
-    "Save all to Files" : "Guardar todo a Archivos",
-    "Add mail account" : "Agregar cuenta de correo",
-    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
-    "No search results for" : "No se obtuvieron resultados para la búsqueda de ",
-    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
-    "Show images from this sender" : "Mostrar imagenes de este remitente",
-    "Forward" : "Reenviar",
-    "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "¡Mensaje enviado!",
+    "Send" : "Enviar",
     "Upload attachment" : "Cargar adjunto",
     "Add attachment from Files" : "Agregar adjunto desd Archivos",
+    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Delete" : "Borrar",
+    "Could not load your message" : "No fue posible cargar tu mensaje",
     "Import into calendar" : "Importar al calendario",
     "Download attachment" : "Descargar adjunto",
-    "Save to Files" : "Guardar a Archivos"
+    "Save to Files" : "Guardar a Archivos",
+    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
+    "Save all to Files" : "Guardar todo a Archivos",
+    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
+    "New message" : "Mensaje nuevo",
+    "Settings" : "Configuraciones ",
+    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
+    "Compose new message" : "Escribir mensaje nuevo",
+    "Newer message" : "Mensaje más nuevo",
+    "Older message" : "Mensaje más antiguo",
+    "Toggle star" : "Alternar favoritos",
+    "Toggle unread" : "Alternar no leídos",
+    "Search" : "Buscar",
+    "Refresh" : "Actualizar",
+    "Connect your mail account" : "Conecta tu cuenta de correo",
+    "Show all folders" : "Mostrar todas las carpetas",
+    "Collapse folders" : "Compactar carpetas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
+    "Nextcloud Mail" : "Correo Nextcloud",
+    "All inboxes" : "Todos los buzones de entrada",
+    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
+    "Could not load the desired message" : "No fue posible cargar el mensaje deseado",
+    "Could not load the message" : "No fue posible cargar el mensaje",
+    "Error loading message" : "Se presentó un error al cargar el mensaje",
+    "Forwarding to %s" : "Reenviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
+    "Redirect" : "Redireccionar",
+    "The link leads to %s" : "La liga lleva a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
+    "Continue to %s" : "Continuar a %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/es_MX.json b/l10n/es_MX.json
index dcc690b94..d6a81d688 100644
--- a/l10n/es_MX.json
+++ b/l10n/es_MX.json
@@ -1,55 +1,5 @@
 { "translations": {
     "Mail" : "Correo",
-    "Loading accounts" : "Cargando cuentas",
-    "Error while loading the accounts." : "Se presentó un error al cargar las cuentas.",
-    "Can not load this folder." : "No se puede cargar esta carpeta.",
-    "Searching for {query}" : "Buscando a {query}",
-    "Error while deleting message." : "Se presentó un error al borrar el mensaje.",
-    "Forwarded message" : "mensaje reenviado",
-    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
-    "Attachments saved to Files." : "Adjuntos guardados a Archivos. ",
-    "Attachment saved to Files." : "Adjunto guardado en Archivos. ",
-    "Error while saving attachments to Files." : "Se presentó un error al guardar los adjuntos en Archivos.",
-    "Error while saving attachment to Files." : "Se presentó un error al guardar los adjuntos en Archivos",
-    "Message flag could not be set." : "No fue posible establecer la bandera del mensaje. ",
-    "Could not move message." : "No fue posible mover el mensaje.",
-    "Invalid account" : "Cuenta inválida",
-    "Invalid folder" : "Carpeta inválida",
-    "Error while creating the account: " : "Se presentó un error al crear la cuenta:",
-    "Unknown error" : "Error desconocido",
-    "Error while updating the account: " : "Se presentó un error al actualizar la cuenta:",
-    "All inboxes" : "Todos los buzones de entrada",
-    "you" : "tú",
-    "Send message to {email}" : "Enviar mensaje a {email}",
-    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
-    "Could not load your message" : "No fue posible cargar tu mensaje",
-    "Could not load the desired message" : "No fue posible cargar el mensaje deseado",
-    "Could not load the message" : "No fue posible cargar el mensaje",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
-    "Nextcloud Mail" : "Correo Nextcloud",
-    "Save" : "Guardar",
-    "Saved" : "Guardado",
-    "Show all folders" : "Mostrar todas las carpetas",
-    "Collapse folders" : "Compactar carpetas",
-    "Error while deleting account." : "Se presetó un error al borrar la cuenta.",
-    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "An error occurred while uploading {fname}" : "Se presentó un error durante la carga {fname}",
-    "Reply" : "Responder",
-    "Send" : "Enviar",
-    "Sending …" : "Enviando ...",
-    "Message sent!" : "¡Mensaje enviado!",
-    "Server error" : "Se presentó un error en el servidor",
-    "An unknown error occurred" : "Se presentó un error desconocido",
-    "Opening HTML drafts is not supported yet." : "Abrir borradores HTML aún no está soportado.",
-    "No writable calendars found" : "No se encontraron calendarios editables",
-    "Error while importing the calendar event" : "Se presentó un error al importar el evento del calendario",
-    "Error while downloading calendar event" : "Se presentó un error al descargar el evento del calendario",
-    "& others" : "& otros",
-    "Error while loading messages." : "Se presentói un error al cargar los mensajes.",
-    "Error while refreshing messages." : "Se presentó un error al actualizar los mensajes.",
-    "Setting up your account" : "Configura tu cuenta",
     "Inbox" : "Buzón de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -64,68 +14,70 @@
     "Delete permanently" : "Borrar permanentemente",
     "IMAP web client" : "Cliente web IMAP",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Cliente de correo electrónico fácil de usar que se conecta con tu servidor de correo vía IMAP y SMTP.",
-    "Error loading message" : "Se presentó un error al cargar el mensaje",
-    "Settings" : "Configuraciones ",
-    "Forwarding to %s" : "Reenviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
-    "Redirect" : "Redireccionar",
-    "The link leads to %s" : "La liga lleva a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
-    "Continue to %s" : "Continuar a %s",
-    "Delete account" : "Borrar cuenta",
-    "Try again" : "Reintentar",
-    "New message" : "Mensaje nuevo",
-    "Account Settings" : "Configuraciones  de la cuenta",
-    "Aliases" : "Aliases",
-    "Mail address" : "Dirección de correo",
-    "Display Name" : "Nombre a desplegar",
-    "Account" : "Cuenta",
-    "Delete" : "Borrar",
-    "Keyboard shortcuts" : "Atajos del teclado",
-    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
-    "Compose new message" : "Escribir mensaje nuevo",
-    "Newer message" : "Mensaje más nuevo",
-    "Older message" : "Mensaje más antiguo",
-    "Toggle star" : "Alternar favoritos",
-    "Toggle unread" : "Alternar no leídos",
-    "Search" : "Buscar",
-    "Refresh" : "Actualizar",
-    "Connect your mail account" : "Conecta tu cuenta de correo",
     "Name" : "Nombre",
     "Mail Address" : "Dirección de Correo",
     "Password" : "Contraseña",
-    "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
-    "IMAP security" : "Seguridad IMAP",
     "None" : "Ninguno",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "IMAP Password" : "Contraseña IMAP",
     "SMTP Host" : "Servior SMTP",
-    "SMTP security" : "Seguridad SMTP",
     "SMTP Port" : "Puerto SMTP",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contraseña SMTP",
     "Connect" : "Conectar",
+    "Add mail account" : "Agregar cuenta de correo",
+    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
+    "Keyboard shortcuts" : "Atajos del teclado",
     "from" : "de",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Nota que el correo vino de una dirección no-responda asi que tu respuesta probablemente no sea leida. ",
     "Subject" : "Asunto",
-    "Save all to Files" : "Guardar todo a Archivos",
-    "Add mail account" : "Agregar cuenta de correo",
-    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
-    "No search results for" : "No se obtuvieron resultados para la búsqueda de ",
-    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
-    "Show images from this sender" : "Mostrar imagenes de este remitente",
-    "Forward" : "Reenviar",
-    "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "¡Mensaje enviado!",
+    "Send" : "Enviar",
     "Upload attachment" : "Cargar adjunto",
     "Add attachment from Files" : "Agregar adjunto desd Archivos",
+    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Delete" : "Borrar",
+    "Could not load your message" : "No fue posible cargar tu mensaje",
     "Import into calendar" : "Importar al calendario",
     "Download attachment" : "Descargar adjunto",
-    "Save to Files" : "Guardar a Archivos"
+    "Save to Files" : "Guardar a Archivos",
+    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
+    "Save all to Files" : "Guardar todo a Archivos",
+    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
+    "New message" : "Mensaje nuevo",
+    "Settings" : "Configuraciones ",
+    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
+    "Compose new message" : "Escribir mensaje nuevo",
+    "Newer message" : "Mensaje más nuevo",
+    "Older message" : "Mensaje más antiguo",
+    "Toggle star" : "Alternar favoritos",
+    "Toggle unread" : "Alternar no leídos",
+    "Search" : "Buscar",
+    "Refresh" : "Actualizar",
+    "Connect your mail account" : "Conecta tu cuenta de correo",
+    "Show all folders" : "Mostrar todas las carpetas",
+    "Collapse folders" : "Compactar carpetas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
+    "Nextcloud Mail" : "Correo Nextcloud",
+    "All inboxes" : "Todos los buzones de entrada",
+    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
+    "Could not load the desired message" : "No fue posible cargar el mensaje deseado",
+    "Could not load the message" : "No fue posible cargar el mensaje",
+    "Error loading message" : "Se presentó un error al cargar el mensaje",
+    "Forwarding to %s" : "Reenviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
+    "Redirect" : "Redireccionar",
+    "The link leads to %s" : "La liga lleva a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
+    "Continue to %s" : "Continuar a %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/es_NI.js b/l10n/es_NI.js
index 4de7f878e..c2c1f9f4b 100644
--- a/l10n/es_NI.js
+++ b/l10n/es_NI.js
@@ -2,51 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Correo",
-    "Loading accounts" : "Cargando cuentas",
-    "Error while loading the accounts." : "Se presentó un error al cargar las cuentas.",
-    "Can not load this folder." : "No se puede cargar esta carpeta.",
-    "Searching for {query}" : "Buscando a {query}",
-    "Error while deleting message." : "Se presentó un error al borrar el mensaje.",
-    "Forwarded message" : "mensaje reenviado",
-    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
-    "Attachments saved to Files." : "Adjuntos guardados a Archivos. ",
-    "Attachment saved to Files." : "Adjunto guardado en Archivos. ",
-    "Error while saving attachments to Files." : "Se presentó un error al guardar los adjuntos en Archivos.",
-    "Error while saving attachment to Files." : "Se presentó un error al guardar los adjuntos en Archivos",
-    "Message flag could not be set." : "No fue posible establecer la bandera del mensaje. ",
-    "Could not move message." : "No fue posible mover el mensaje.",
-    "Invalid account" : "Cuenta inválida",
-    "Invalid folder" : "Carpeta inválida",
-    "Error while creating the account: " : "Se presentó un error al crear la cuenta:",
-    "Unknown error" : "Error desconocido",
-    "All inboxes" : "Todos los buzones de entrada",
-    "you" : "tú",
-    "Send message to {email}" : "Enviar mensaje a {email}",
-    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
-    "Nextcloud Mail" : "Correo Nextcloud",
-    "Save" : "Guardar",
-    "Show all folders" : "Mostrar todas las carpetas",
-    "Collapse folders" : "Compactar carpetas",
-    "Error while deleting account." : "Se presetó un error al borrar la cuenta.",
-    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "An error occurred while uploading {fname}" : "Se presentó un error durante la carga {fname}",
-    "Reply" : "Responder",
-    "Send" : "Enviar",
-    "Sending …" : "Enviando ...",
-    "Message sent!" : "¡Mensaje enviado!",
-    "Server error" : "Se presentó un error en el servidor",
-    "An unknown error occurred" : "Se presentó un error desconocido",
-    "Opening HTML drafts is not supported yet." : "Abrir borradores HTML aún no está soportado.",
-    "No writable calendars found" : "No se encontraron calendarios editables",
-    "Error while importing the calendar event" : "Se presentó un error al importar el evento del calendario",
-    "Error while downloading calendar event" : "Se presentó un error al descargar el evento del calendario",
-    "& others" : "& otros",
-    "Error while loading messages." : "Se presentói un error al cargar los mensajes.",
-    "Error while refreshing messages." : "Se presentó un error al actualizar los mensajes.",
-    "Setting up your account" : "Configura tu cuenta",
     "Inbox" : "Buzón de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -58,65 +13,66 @@ OC.L10N.register(
     "Auto detect failed. Please use manual mode." : "Se presentó una falla en la auto detección. Por favor usa el modo manual.",
     "Creating account failed: " : "Se presentó una falla al crear la cuenta:",
     "Delete permanently" : "Borrar permanentemente",
-    "Error loading message" : "Se presentó un error al cargar el mensaje",
-    "Settings" : "Configuraciones ",
-    "Forwarding to %s" : "Reenviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
-    "Redirect" : "Redireccionar",
-    "The link leads to %s" : "La liga lleva a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
-    "Continue to %s" : "Continuar a %s",
-    "Delete account" : "Borrar cuenta",
-    "Try again" : "Reintentar",
-    "New message" : "Mensaje nuevo",
-    "Account Settings" : "Configuraciones  de la cuenta",
-    "Aliases" : "Aliases",
-    "Mail address" : "Dirección de correo",
-    "Display Name" : "Nombre a desplegar",
-    "Delete" : "Borrar",
-    "Keyboard shortcuts" : "Atajos del teclado",
-    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
-    "Compose new message" : "Escribir mensaje nuevo",
-    "Newer message" : "Mensaje más nuevo",
-    "Older message" : "Mensaje más antiguo",
-    "Toggle star" : "Alternar favoritos",
-    "Toggle unread" : "Alternar no leídos",
-    "Search" : "Buscar",
-    "Refresh" : "Actualizar",
-    "Connect your mail account" : "Conecta tu cuenta de correo",
     "Name" : "Nombre",
     "Mail Address" : "Dirección de Correo",
     "Password" : "Contraseña",
-    "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
-    "IMAP security" : "Seguridad IMAP",
     "None" : "Ninguno",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "IMAP Password" : "Contraseña IMAP",
     "SMTP Host" : "Servior SMTP",
-    "SMTP security" : "Seguridad SMTP",
     "SMTP Port" : "Puerto SMTP",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contraseña SMTP",
     "Connect" : "Conectar",
+    "Add mail account" : "Agregar cuenta de correo",
+    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
+    "Keyboard shortcuts" : "Atajos del teclado",
     "from" : "de",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
     "Subject" : "Asunto",
-    "Save all to Files" : "Guardar todo a Archivos",
-    "Add mail account" : "Agregar cuenta de correo",
-    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
-    "No search results for" : "No se obtuvieron resultados para la búsqueda de ",
-    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
-    "Show images from this sender" : "Mostrar imagenes de este remitente",
-    "Forward" : "Reenviar",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "¡Mensaje enviado!",
+    "Send" : "Enviar",
     "Upload attachment" : "Cargar adjunto",
     "Add attachment from Files" : "Agregar adjunto desd Archivos",
+    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "Delete" : "Borrar",
     "Import into calendar" : "Importar al calendario",
     "Download attachment" : "Descargar adjunto",
-    "Save to Files" : "Guardar a Archivos"
+    "Save to Files" : "Guardar a Archivos",
+    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
+    "Save all to Files" : "Guardar todo a Archivos",
+    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
+    "New message" : "Mensaje nuevo",
+    "Settings" : "Configuraciones ",
+    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
+    "Compose new message" : "Escribir mensaje nuevo",
+    "Newer message" : "Mensaje más nuevo",
+    "Older message" : "Mensaje más antiguo",
+    "Toggle star" : "Alternar favoritos",
+    "Toggle unread" : "Alternar no leídos",
+    "Search" : "Buscar",
+    "Refresh" : "Actualizar",
+    "Connect your mail account" : "Conecta tu cuenta de correo",
+    "Show all folders" : "Mostrar todas las carpetas",
+    "Collapse folders" : "Compactar carpetas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
+    "Nextcloud Mail" : "Correo Nextcloud",
+    "All inboxes" : "Todos los buzones de entrada",
+    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
+    "Error loading message" : "Se presentó un error al cargar el mensaje",
+    "Forwarding to %s" : "Reenviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
+    "Redirect" : "Redireccionar",
+    "The link leads to %s" : "La liga lleva a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
+    "Continue to %s" : "Continuar a %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/es_NI.json b/l10n/es_NI.json
index 41b28b5dd..2564f869e 100644
--- a/l10n/es_NI.json
+++ b/l10n/es_NI.json
@@ -1,50 +1,5 @@
 { "translations": {
     "Mail" : "Correo",
-    "Loading accounts" : "Cargando cuentas",
-    "Error while loading the accounts." : "Se presentó un error al cargar las cuentas.",
-    "Can not load this folder." : "No se puede cargar esta carpeta.",
-    "Searching for {query}" : "Buscando a {query}",
-    "Error while deleting message." : "Se presentó un error al borrar el mensaje.",
-    "Forwarded message" : "mensaje reenviado",
-    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
-    "Attachments saved to Files." : "Adjuntos guardados a Archivos. ",
-    "Attachment saved to Files." : "Adjunto guardado en Archivos. ",
-    "Error while saving attachments to Files." : "Se presentó un error al guardar los adjuntos en Archivos.",
-    "Error while saving attachment to Files." : "Se presentó un error al guardar los adjuntos en Archivos",
-    "Message flag could not be set." : "No fue posible establecer la bandera del mensaje. ",
-    "Could not move message." : "No fue posible mover el mensaje.",
-    "Invalid account" : "Cuenta inválida",
-    "Invalid folder" : "Carpeta inválida",
-    "Error while creating the account: " : "Se presentó un error al crear la cuenta:",
-    "Unknown error" : "Error desconocido",
-    "All inboxes" : "Todos los buzones de entrada",
-    "you" : "tú",
-    "Send message to {email}" : "Enviar mensaje a {email}",
-    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
-    "Nextcloud Mail" : "Correo Nextcloud",
-    "Save" : "Guardar",
-    "Show all folders" : "Mostrar todas las carpetas",
-    "Collapse folders" : "Compactar carpetas",
-    "Error while deleting account." : "Se presetó un error al borrar la cuenta.",
-    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "An error occurred while uploading {fname}" : "Se presentó un error durante la carga {fname}",
-    "Reply" : "Responder",
-    "Send" : "Enviar",
-    "Sending …" : "Enviando ...",
-    "Message sent!" : "¡Mensaje enviado!",
-    "Server error" : "Se presentó un error en el servidor",
-    "An unknown error occurred" : "Se presentó un error desconocido",
-    "Opening HTML drafts is not supported yet." : "Abrir borradores HTML aún no está soportado.",
-    "No writable calendars found" : "No se encontraron calendarios editables",
-    "Error while importing the calendar event" : "Se presentó un error al importar el evento del calendario",
-    "Error while downloading calendar event" : "Se presentó un error al descargar el evento del calendario",
-    "& others" : "& otros",
-    "Error while loading messages." : "Se presentói un error al cargar los mensajes.",
-    "Error while refreshing messages." : "Se presentó un error al actualizar los mensajes.",
-    "Setting up your account" : "Configura tu cuenta",
     "Inbox" : "Buzón de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -56,65 +11,66 @@
     "Auto detect failed. Please use manual mode." : "Se presentó una falla en la auto detección. Por favor usa el modo manual.",
     "Creating account failed: " : "Se presentó una falla al crear la cuenta:",
     "Delete permanently" : "Borrar permanentemente",
-    "Error loading message" : "Se presentó un error al cargar el mensaje",
-    "Settings" : "Configuraciones ",
-    "Forwarding to %s" : "Reenviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
-    "Redirect" : "Redireccionar",
-    "The link leads to %s" : "La liga lleva a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
-    "Continue to %s" : "Continuar a %s",
-    "Delete account" : "Borrar cuenta",
-    "Try again" : "Reintentar",
-    "New message" : "Mensaje nuevo",
-    "Account Settings" : "Configuraciones  de la cuenta",
-    "Aliases" : "Aliases",
-    "Mail address" : "Dirección de correo",
-    "Display Name" : "Nombre a desplegar",
-    "Delete" : "Borrar",
-    "Keyboard shortcuts" : "Atajos del teclado",
-    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
-    "Compose new message" : "Escribir mensaje nuevo",
-    "Newer message" : "Mensaje más nuevo",
-    "Older message" : "Mensaje más antiguo",
-    "Toggle star" : "Alternar favoritos",
-    "Toggle unread" : "Alternar no leídos",
-    "Search" : "Buscar",
-    "Refresh" : "Actualizar",
-    "Connect your mail account" : "Conecta tu cuenta de correo",
     "Name" : "Nombre",
     "Mail Address" : "Dirección de Correo",
     "Password" : "Contraseña",
-    "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
-    "IMAP security" : "Seguridad IMAP",
     "None" : "Ninguno",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "IMAP Password" : "Contraseña IMAP",
     "SMTP Host" : "Servior SMTP",
-    "SMTP security" : "Seguridad SMTP",
     "SMTP Port" : "Puerto SMTP",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contraseña SMTP",
     "Connect" : "Conectar",
+    "Add mail account" : "Agregar cuenta de correo",
+    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
+    "Keyboard shortcuts" : "Atajos del teclado",
     "from" : "de",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
     "Subject" : "Asunto",
-    "Save all to Files" : "Guardar todo a Archivos",
-    "Add mail account" : "Agregar cuenta de correo",
-    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
-    "No search results for" : "No se obtuvieron resultados para la búsqueda de ",
-    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
-    "Show images from this sender" : "Mostrar imagenes de este remitente",
-    "Forward" : "Reenviar",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "¡Mensaje enviado!",
+    "Send" : "Enviar",
     "Upload attachment" : "Cargar adjunto",
     "Add attachment from Files" : "Agregar adjunto desd Archivos",
+    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "Delete" : "Borrar",
     "Import into calendar" : "Importar al calendario",
     "Download attachment" : "Descargar adjunto",
-    "Save to Files" : "Guardar a Archivos"
+    "Save to Files" : "Guardar a Archivos",
+    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
+    "Save all to Files" : "Guardar todo a Archivos",
+    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
+    "New message" : "Mensaje nuevo",
+    "Settings" : "Configuraciones ",
+    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
+    "Compose new message" : "Escribir mensaje nuevo",
+    "Newer message" : "Mensaje más nuevo",
+    "Older message" : "Mensaje más antiguo",
+    "Toggle star" : "Alternar favoritos",
+    "Toggle unread" : "Alternar no leídos",
+    "Search" : "Buscar",
+    "Refresh" : "Actualizar",
+    "Connect your mail account" : "Conecta tu cuenta de correo",
+    "Show all folders" : "Mostrar todas las carpetas",
+    "Collapse folders" : "Compactar carpetas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
+    "Nextcloud Mail" : "Correo Nextcloud",
+    "All inboxes" : "Todos los buzones de entrada",
+    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
+    "Error loading message" : "Se presentó un error al cargar el mensaje",
+    "Forwarding to %s" : "Reenviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
+    "Redirect" : "Redireccionar",
+    "The link leads to %s" : "La liga lleva a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
+    "Continue to %s" : "Continuar a %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/es_PA.js b/l10n/es_PA.js
index 4de7f878e..c2c1f9f4b 100644
--- a/l10n/es_PA.js
+++ b/l10n/es_PA.js
@@ -2,51 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Correo",
-    "Loading accounts" : "Cargando cuentas",
-    "Error while loading the accounts." : "Se presentó un error al cargar las cuentas.",
-    "Can not load this folder." : "No se puede cargar esta carpeta.",
-    "Searching for {query}" : "Buscando a {query}",
-    "Error while deleting message." : "Se presentó un error al borrar el mensaje.",
-    "Forwarded message" : "mensaje reenviado",
-    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
-    "Attachments saved to Files." : "Adjuntos guardados a Archivos. ",
-    "Attachment saved to Files." : "Adjunto guardado en Archivos. ",
-    "Error while saving attachments to Files." : "Se presentó un error al guardar los adjuntos en Archivos.",
-    "Error while saving attachment to Files." : "Se presentó un error al guardar los adjuntos en Archivos",
-    "Message flag could not be set." : "No fue posible establecer la bandera del mensaje. ",
-    "Could not move message." : "No fue posible mover el mensaje.",
-    "Invalid account" : "Cuenta inválida",
-    "Invalid folder" : "Carpeta inválida",
-    "Error while creating the account: " : "Se presentó un error al crear la cuenta:",
-    "Unknown error" : "Error desconocido",
-    "All inboxes" : "Todos los buzones de entrada",
-    "you" : "tú",
-    "Send message to {email}" : "Enviar mensaje a {email}",
-    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
-    "Nextcloud Mail" : "Correo Nextcloud",
-    "Save" : "Guardar",
-    "Show all folders" : "Mostrar todas las carpetas",
-    "Collapse folders" : "Compactar carpetas",
-    "Error while deleting account." : "Se presetó un error al borrar la cuenta.",
-    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "An error occurred while uploading {fname}" : "Se presentó un error durante la carga {fname}",
-    "Reply" : "Responder",
-    "Send" : "Enviar",
-    "Sending …" : "Enviando ...",
-    "Message sent!" : "¡Mensaje enviado!",
-    "Server error" : "Se presentó un error en el servidor",
-    "An unknown error occurred" : "Se presentó un error desconocido",
-    "Opening HTML drafts is not supported yet." : "Abrir borradores HTML aún no está soportado.",
-    "No writable calendars found" : "No se encontraron calendarios editables",
-    "Error while importing the calendar event" : "Se presentó un error al importar el evento del calendario",
-    "Error while downloading calendar event" : "Se presentó un error al descargar el evento del calendario",
-    "& others" : "& otros",
-    "Error while loading messages." : "Se presentói un error al cargar los mensajes.",
-    "Error while refreshing messages." : "Se presentó un error al actualizar los mensajes.",
-    "Setting up your account" : "Configura tu cuenta",
     "Inbox" : "Buzón de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -58,65 +13,66 @@ OC.L10N.register(
     "Auto detect failed. Please use manual mode." : "Se presentó una falla en la auto detección. Por favor usa el modo manual.",
     "Creating account failed: " : "Se presentó una falla al crear la cuenta:",
     "Delete permanently" : "Borrar permanentemente",
-    "Error loading message" : "Se presentó un error al cargar el mensaje",
-    "Settings" : "Configuraciones ",
-    "Forwarding to %s" : "Reenviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
-    "Redirect" : "Redireccionar",
-    "The link leads to %s" : "La liga lleva a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
-    "Continue to %s" : "Continuar a %s",
-    "Delete account" : "Borrar cuenta",
-    "Try again" : "Reintentar",
-    "New message" : "Mensaje nuevo",
-    "Account Settings" : "Configuraciones  de la cuenta",
-    "Aliases" : "Aliases",
-    "Mail address" : "Dirección de correo",
-    "Display Name" : "Nombre a desplegar",
-    "Delete" : "Borrar",
-    "Keyboard shortcuts" : "Atajos del teclado",
-    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
-    "Compose new message" : "Escribir mensaje nuevo",
-    "Newer message" : "Mensaje más nuevo",
-    "Older message" : "Mensaje más antiguo",
-    "Toggle star" : "Alternar favoritos",
-    "Toggle unread" : "Alternar no leídos",
-    "Search" : "Buscar",
-    "Refresh" : "Actualizar",
-    "Connect your mail account" : "Conecta tu cuenta de correo",
     "Name" : "Nombre",
     "Mail Address" : "Dirección de Correo",
     "Password" : "Contraseña",
-    "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
-    "IMAP security" : "Seguridad IMAP",
     "None" : "Ninguno",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "IMAP Password" : "Contraseña IMAP",
     "SMTP Host" : "Servior SMTP",
-    "SMTP security" : "Seguridad SMTP",
     "SMTP Port" : "Puerto SMTP",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contraseña SMTP",
     "Connect" : "Conectar",
+    "Add mail account" : "Agregar cuenta de correo",
+    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
+    "Keyboard shortcuts" : "Atajos del teclado",
     "from" : "de",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
     "Subject" : "Asunto",
-    "Save all to Files" : "Guardar todo a Archivos",
-    "Add mail account" : "Agregar cuenta de correo",
-    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
-    "No search results for" : "No se obtuvieron resultados para la búsqueda de ",
-    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
-    "Show images from this sender" : "Mostrar imagenes de este remitente",
-    "Forward" : "Reenviar",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "¡Mensaje enviado!",
+    "Send" : "Enviar",
     "Upload attachment" : "Cargar adjunto",
     "Add attachment from Files" : "Agregar adjunto desd Archivos",
+    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "Delete" : "Borrar",
     "Import into calendar" : "Importar al calendario",
     "Download attachment" : "Descargar adjunto",
-    "Save to Files" : "Guardar a Archivos"
+    "Save to Files" : "Guardar a Archivos",
+    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
+    "Save all to Files" : "Guardar todo a Archivos",
+    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
+    "New message" : "Mensaje nuevo",
+    "Settings" : "Configuraciones ",
+    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
+    "Compose new message" : "Escribir mensaje nuevo",
+    "Newer message" : "Mensaje más nuevo",
+    "Older message" : "Mensaje más antiguo",
+    "Toggle star" : "Alternar favoritos",
+    "Toggle unread" : "Alternar no leídos",
+    "Search" : "Buscar",
+    "Refresh" : "Actualizar",
+    "Connect your mail account" : "Conecta tu cuenta de correo",
+    "Show all folders" : "Mostrar todas las carpetas",
+    "Collapse folders" : "Compactar carpetas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
+    "Nextcloud Mail" : "Correo Nextcloud",
+    "All inboxes" : "Todos los buzones de entrada",
+    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
+    "Error loading message" : "Se presentó un error al cargar el mensaje",
+    "Forwarding to %s" : "Reenviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
+    "Redirect" : "Redireccionar",
+    "The link leads to %s" : "La liga lleva a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
+    "Continue to %s" : "Continuar a %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/es_PA.json b/l10n/es_PA.json
index 41b28b5dd..2564f869e 100644
--- a/l10n/es_PA.json
+++ b/l10n/es_PA.json
@@ -1,50 +1,5 @@
 { "translations": {
     "Mail" : "Correo",
-    "Loading accounts" : "Cargando cuentas",
-    "Error while loading the accounts." : "Se presentó un error al cargar las cuentas.",
-    "Can not load this folder." : "No se puede cargar esta carpeta.",
-    "Searching for {query}" : "Buscando a {query}",
-    "Error while deleting message." : "Se presentó un error al borrar el mensaje.",
-    "Forwarded message" : "mensaje reenviado",
-    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
-    "Attachments saved to Files." : "Adjuntos guardados a Archivos. ",
-    "Attachment saved to Files." : "Adjunto guardado en Archivos. ",
-    "Error while saving attachments to Files." : "Se presentó un error al guardar los adjuntos en Archivos.",
-    "Error while saving attachment to Files." : "Se presentó un error al guardar los adjuntos en Archivos",
-    "Message flag could not be set." : "No fue posible establecer la bandera del mensaje. ",
-    "Could not move message." : "No fue posible mover el mensaje.",
-    "Invalid account" : "Cuenta inválida",
-    "Invalid folder" : "Carpeta inválida",
-    "Error while creating the account: " : "Se presentó un error al crear la cuenta:",
-    "Unknown error" : "Error desconocido",
-    "All inboxes" : "Todos los buzones de entrada",
-    "you" : "tú",
-    "Send message to {email}" : "Enviar mensaje a {email}",
-    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
-    "Nextcloud Mail" : "Correo Nextcloud",
-    "Save" : "Guardar",
-    "Show all folders" : "Mostrar todas las carpetas",
-    "Collapse folders" : "Compactar carpetas",
-    "Error while deleting account." : "Se presetó un error al borrar la cuenta.",
-    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "An error occurred while uploading {fname}" : "Se presentó un error durante la carga {fname}",
-    "Reply" : "Responder",
-    "Send" : "Enviar",
-    "Sending …" : "Enviando ...",
-    "Message sent!" : "¡Mensaje enviado!",
-    "Server error" : "Se presentó un error en el servidor",
-    "An unknown error occurred" : "Se presentó un error desconocido",
-    "Opening HTML drafts is not supported yet." : "Abrir borradores HTML aún no está soportado.",
-    "No writable calendars found" : "No se encontraron calendarios editables",
-    "Error while importing the calendar event" : "Se presentó un error al importar el evento del calendario",
-    "Error while downloading calendar event" : "Se presentó un error al descargar el evento del calendario",
-    "& others" : "& otros",
-    "Error while loading messages." : "Se presentói un error al cargar los mensajes.",
-    "Error while refreshing messages." : "Se presentó un error al actualizar los mensajes.",
-    "Setting up your account" : "Configura tu cuenta",
     "Inbox" : "Buzón de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -56,65 +11,66 @@
     "Auto detect failed. Please use manual mode." : "Se presentó una falla en la auto detección. Por favor usa el modo manual.",
     "Creating account failed: " : "Se presentó una falla al crear la cuenta:",
     "Delete permanently" : "Borrar permanentemente",
-    "Error loading message" : "Se presentó un error al cargar el mensaje",
-    "Settings" : "Configuraciones ",
-    "Forwarding to %s" : "Reenviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
-    "Redirect" : "Redireccionar",
-    "The link leads to %s" : "La liga lleva a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
-    "Continue to %s" : "Continuar a %s",
-    "Delete account" : "Borrar cuenta",
-    "Try again" : "Reintentar",
-    "New message" : "Mensaje nuevo",
-    "Account Settings" : "Configuraciones  de la cuenta",
-    "Aliases" : "Aliases",
-    "Mail address" : "Dirección de correo",
-    "Display Name" : "Nombre a desplegar",
-    "Delete" : "Borrar",
-    "Keyboard shortcuts" : "Atajos del teclado",
-    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
-    "Compose new message" : "Escribir mensaje nuevo",
-    "Newer message" : "Mensaje más nuevo",
-    "Older message" : "Mensaje más antiguo",
-    "Toggle star" : "Alternar favoritos",
-    "Toggle unread" : "Alternar no leídos",
-    "Search" : "Buscar",
-    "Refresh" : "Actualizar",
-    "Connect your mail account" : "Conecta tu cuenta de correo",
     "Name" : "Nombre",
     "Mail Address" : "Dirección de Correo",
     "Password" : "Contraseña",
-    "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
-    "IMAP security" : "Seguridad IMAP",
     "None" : "Ninguno",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "IMAP Password" : "Contraseña IMAP",
     "SMTP Host" : "Servior SMTP",
-    "SMTP security" : "Seguridad SMTP",
     "SMTP Port" : "Puerto SMTP",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contraseña SMTP",
     "Connect" : "Conectar",
+    "Add mail account" : "Agregar cuenta de correo",
+    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
+    "Keyboard shortcuts" : "Atajos del teclado",
     "from" : "de",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
     "Subject" : "Asunto",
-    "Save all to Files" : "Guardar todo a Archivos",
-    "Add mail account" : "Agregar cuenta de correo",
-    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
-    "No search results for" : "No se obtuvieron resultados para la búsqueda de ",
-    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
-    "Show images from this sender" : "Mostrar imagenes de este remitente",
-    "Forward" : "Reenviar",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "¡Mensaje enviado!",
+    "Send" : "Enviar",
     "Upload attachment" : "Cargar adjunto",
     "Add attachment from Files" : "Agregar adjunto desd Archivos",
+    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "Delete" : "Borrar",
     "Import into calendar" : "Importar al calendario",
     "Download attachment" : "Descargar adjunto",
-    "Save to Files" : "Guardar a Archivos"
+    "Save to Files" : "Guardar a Archivos",
+    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
+    "Save all to Files" : "Guardar todo a Archivos",
+    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
+    "New message" : "Mensaje nuevo",
+    "Settings" : "Configuraciones ",
+    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
+    "Compose new message" : "Escribir mensaje nuevo",
+    "Newer message" : "Mensaje más nuevo",
+    "Older message" : "Mensaje más antiguo",
+    "Toggle star" : "Alternar favoritos",
+    "Toggle unread" : "Alternar no leídos",
+    "Search" : "Buscar",
+    "Refresh" : "Actualizar",
+    "Connect your mail account" : "Conecta tu cuenta de correo",
+    "Show all folders" : "Mostrar todas las carpetas",
+    "Collapse folders" : "Compactar carpetas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
+    "Nextcloud Mail" : "Correo Nextcloud",
+    "All inboxes" : "Todos los buzones de entrada",
+    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
+    "Error loading message" : "Se presentó un error al cargar el mensaje",
+    "Forwarding to %s" : "Reenviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
+    "Redirect" : "Redireccionar",
+    "The link leads to %s" : "La liga lleva a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
+    "Continue to %s" : "Continuar a %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/es_PE.js b/l10n/es_PE.js
index 4de7f878e..c2c1f9f4b 100644
--- a/l10n/es_PE.js
+++ b/l10n/es_PE.js
@@ -2,51 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Correo",
-    "Loading accounts" : "Cargando cuentas",
-    "Error while loading the accounts." : "Se presentó un error al cargar las cuentas.",
-    "Can not load this folder." : "No se puede cargar esta carpeta.",
-    "Searching for {query}" : "Buscando a {query}",
-    "Error while deleting message." : "Se presentó un error al borrar el mensaje.",
-    "Forwarded message" : "mensaje reenviado",
-    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
-    "Attachments saved to Files." : "Adjuntos guardados a Archivos. ",
-    "Attachment saved to Files." : "Adjunto guardado en Archivos. ",
-    "Error while saving attachments to Files." : "Se presentó un error al guardar los adjuntos en Archivos.",
-    "Error while saving attachment to Files." : "Se presentó un error al guardar los adjuntos en Archivos",
-    "Message flag could not be set." : "No fue posible establecer la bandera del mensaje. ",
-    "Could not move message." : "No fue posible mover el mensaje.",
-    "Invalid account" : "Cuenta inválida",
-    "Invalid folder" : "Carpeta inválida",
-    "Error while creating the account: " : "Se presentó un error al crear la cuenta:",
-    "Unknown error" : "Error desconocido",
-    "All inboxes" : "Todos los buzones de entrada",
-    "you" : "tú",
-    "Send message to {email}" : "Enviar mensaje a {email}",
-    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
-    "Nextcloud Mail" : "Correo Nextcloud",
-    "Save" : "Guardar",
-    "Show all folders" : "Mostrar todas las carpetas",
-    "Collapse folders" : "Compactar carpetas",
-    "Error while deleting account." : "Se presetó un error al borrar la cuenta.",
-    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "An error occurred while uploading {fname}" : "Se presentó un error durante la carga {fname}",
-    "Reply" : "Responder",
-    "Send" : "Enviar",
-    "Sending …" : "Enviando ...",
-    "Message sent!" : "¡Mensaje enviado!",
-    "Server error" : "Se presentó un error en el servidor",
-    "An unknown error occurred" : "Se presentó un error desconocido",
-    "Opening HTML drafts is not supported yet." : "Abrir borradores HTML aún no está soportado.",
-    "No writable calendars found" : "No se encontraron calendarios editables",
-    "Error while importing the calendar event" : "Se presentó un error al importar el evento del calendario",
-    "Error while downloading calendar event" : "Se presentó un error al descargar el evento del calendario",
-    "& others" : "& otros",
-    "Error while loading messages." : "Se presentói un error al cargar los mensajes.",
-    "Error while refreshing messages." : "Se presentó un error al actualizar los mensajes.",
-    "Setting up your account" : "Configura tu cuenta",
     "Inbox" : "Buzón de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -58,65 +13,66 @@ OC.L10N.register(
     "Auto detect failed. Please use manual mode." : "Se presentó una falla en la auto detección. Por favor usa el modo manual.",
     "Creating account failed: " : "Se presentó una falla al crear la cuenta:",
     "Delete permanently" : "Borrar permanentemente",
-    "Error loading message" : "Se presentó un error al cargar el mensaje",
-    "Settings" : "Configuraciones ",
-    "Forwarding to %s" : "Reenviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
-    "Redirect" : "Redireccionar",
-    "The link leads to %s" : "La liga lleva a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
-    "Continue to %s" : "Continuar a %s",
-    "Delete account" : "Borrar cuenta",
-    "Try again" : "Reintentar",
-    "New message" : "Mensaje nuevo",
-    "Account Settings" : "Configuraciones  de la cuenta",
-    "Aliases" : "Aliases",
-    "Mail address" : "Dirección de correo",
-    "Display Name" : "Nombre a desplegar",
-    "Delete" : "Borrar",
-    "Keyboard shortcuts" : "Atajos del teclado",
-    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
-    "Compose new message" : "Escribir mensaje nuevo",
-    "Newer message" : "Mensaje más nuevo",
-    "Older message" : "Mensaje más antiguo",
-    "Toggle star" : "Alternar favoritos",
-    "Toggle unread" : "Alternar no leídos",
-    "Search" : "Buscar",
-    "Refresh" : "Actualizar",
-    "Connect your mail account" : "Conecta tu cuenta de correo",
     "Name" : "Nombre",
     "Mail Address" : "Dirección de Correo",
     "Password" : "Contraseña",
-    "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
-    "IMAP security" : "Seguridad IMAP",
     "None" : "Ninguno",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "IMAP Password" : "Contraseña IMAP",
     "SMTP Host" : "Servior SMTP",
-    "SMTP security" : "Seguridad SMTP",
     "SMTP Port" : "Puerto SMTP",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contraseña SMTP",
     "Connect" : "Conectar",
+    "Add mail account" : "Agregar cuenta de correo",
+    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
+    "Keyboard shortcuts" : "Atajos del teclado",
     "from" : "de",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
     "Subject" : "Asunto",
-    "Save all to Files" : "Guardar todo a Archivos",
-    "Add mail account" : "Agregar cuenta de correo",
-    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
-    "No search results for" : "No se obtuvieron resultados para la búsqueda de ",
-    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
-    "Show images from this sender" : "Mostrar imagenes de este remitente",
-    "Forward" : "Reenviar",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "¡Mensaje enviado!",
+    "Send" : "Enviar",
     "Upload attachment" : "Cargar adjunto",
     "Add attachment from Files" : "Agregar adjunto desd Archivos",
+    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "Delete" : "Borrar",
     "Import into calendar" : "Importar al calendario",
     "Download attachment" : "Descargar adjunto",
-    "Save to Files" : "Guardar a Archivos"
+    "Save to Files" : "Guardar a Archivos",
+    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
+    "Save all to Files" : "Guardar todo a Archivos",
+    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
+    "New message" : "Mensaje nuevo",
+    "Settings" : "Configuraciones ",
+    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
+    "Compose new message" : "Escribir mensaje nuevo",
+    "Newer message" : "Mensaje más nuevo",
+    "Older message" : "Mensaje más antiguo",
+    "Toggle star" : "Alternar favoritos",
+    "Toggle unread" : "Alternar no leídos",
+    "Search" : "Buscar",
+    "Refresh" : "Actualizar",
+    "Connect your mail account" : "Conecta tu cuenta de correo",
+    "Show all folders" : "Mostrar todas las carpetas",
+    "Collapse folders" : "Compactar carpetas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
+    "Nextcloud Mail" : "Correo Nextcloud",
+    "All inboxes" : "Todos los buzones de entrada",
+    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
+    "Error loading message" : "Se presentó un error al cargar el mensaje",
+    "Forwarding to %s" : "Reenviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
+    "Redirect" : "Redireccionar",
+    "The link leads to %s" : "La liga lleva a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
+    "Continue to %s" : "Continuar a %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/es_PE.json b/l10n/es_PE.json
index 41b28b5dd..2564f869e 100644
--- a/l10n/es_PE.json
+++ b/l10n/es_PE.json
@@ -1,50 +1,5 @@
 { "translations": {
     "Mail" : "Correo",
-    "Loading accounts" : "Cargando cuentas",
-    "Error while loading the accounts." : "Se presentó un error al cargar las cuentas.",
-    "Can not load this folder." : "No se puede cargar esta carpeta.",
-    "Searching for {query}" : "Buscando a {query}",
-    "Error while deleting message." : "Se presentó un error al borrar el mensaje.",
-    "Forwarded message" : "mensaje reenviado",
-    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
-    "Attachments saved to Files." : "Adjuntos guardados a Archivos. ",
-    "Attachment saved to Files." : "Adjunto guardado en Archivos. ",
-    "Error while saving attachments to Files." : "Se presentó un error al guardar los adjuntos en Archivos.",
-    "Error while saving attachment to Files." : "Se presentó un error al guardar los adjuntos en Archivos",
-    "Message flag could not be set." : "No fue posible establecer la bandera del mensaje. ",
-    "Could not move message." : "No fue posible mover el mensaje.",
-    "Invalid account" : "Cuenta inválida",
-    "Invalid folder" : "Carpeta inválida",
-    "Error while creating the account: " : "Se presentó un error al crear la cuenta:",
-    "Unknown error" : "Error desconocido",
-    "All inboxes" : "Todos los buzones de entrada",
-    "you" : "tú",
-    "Send message to {email}" : "Enviar mensaje a {email}",
-    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
-    "Nextcloud Mail" : "Correo Nextcloud",
-    "Save" : "Guardar",
-    "Show all folders" : "Mostrar todas las carpetas",
-    "Collapse folders" : "Compactar carpetas",
-    "Error while deleting account." : "Se presetó un error al borrar la cuenta.",
-    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "An error occurred while uploading {fname}" : "Se presentó un error durante la carga {fname}",
-    "Reply" : "Responder",
-    "Send" : "Enviar",
-    "Sending …" : "Enviando ...",
-    "Message sent!" : "¡Mensaje enviado!",
-    "Server error" : "Se presentó un error en el servidor",
-    "An unknown error occurred" : "Se presentó un error desconocido",
-    "Opening HTML drafts is not supported yet." : "Abrir borradores HTML aún no está soportado.",
-    "No writable calendars found" : "No se encontraron calendarios editables",
-    "Error while importing the calendar event" : "Se presentó un error al importar el evento del calendario",
-    "Error while downloading calendar event" : "Se presentó un error al descargar el evento del calendario",
-    "& others" : "& otros",
-    "Error while loading messages." : "Se presentói un error al cargar los mensajes.",
-    "Error while refreshing messages." : "Se presentó un error al actualizar los mensajes.",
-    "Setting up your account" : "Configura tu cuenta",
     "Inbox" : "Buzón de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -56,65 +11,66 @@
     "Auto detect failed. Please use manual mode." : "Se presentó una falla en la auto detección. Por favor usa el modo manual.",
     "Creating account failed: " : "Se presentó una falla al crear la cuenta:",
     "Delete permanently" : "Borrar permanentemente",
-    "Error loading message" : "Se presentó un error al cargar el mensaje",
-    "Settings" : "Configuraciones ",
-    "Forwarding to %s" : "Reenviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
-    "Redirect" : "Redireccionar",
-    "The link leads to %s" : "La liga lleva a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
-    "Continue to %s" : "Continuar a %s",
-    "Delete account" : "Borrar cuenta",
-    "Try again" : "Reintentar",
-    "New message" : "Mensaje nuevo",
-    "Account Settings" : "Configuraciones  de la cuenta",
-    "Aliases" : "Aliases",
-    "Mail address" : "Dirección de correo",
-    "Display Name" : "Nombre a desplegar",
-    "Delete" : "Borrar",
-    "Keyboard shortcuts" : "Atajos del teclado",
-    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
-    "Compose new message" : "Escribir mensaje nuevo",
-    "Newer message" : "Mensaje más nuevo",
-    "Older message" : "Mensaje más antiguo",
-    "Toggle star" : "Alternar favoritos",
-    "Toggle unread" : "Alternar no leídos",
-    "Search" : "Buscar",
-    "Refresh" : "Actualizar",
-    "Connect your mail account" : "Conecta tu cuenta de correo",
     "Name" : "Nombre",
     "Mail Address" : "Dirección de Correo",
     "Password" : "Contraseña",
-    "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
-    "IMAP security" : "Seguridad IMAP",
     "None" : "Ninguno",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "IMAP Password" : "Contraseña IMAP",
     "SMTP Host" : "Servior SMTP",
-    "SMTP security" : "Seguridad SMTP",
     "SMTP Port" : "Puerto SMTP",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contraseña SMTP",
     "Connect" : "Conectar",
+    "Add mail account" : "Agregar cuenta de correo",
+    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
+    "Keyboard shortcuts" : "Atajos del teclado",
     "from" : "de",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
     "Subject" : "Asunto",
-    "Save all to Files" : "Guardar todo a Archivos",
-    "Add mail account" : "Agregar cuenta de correo",
-    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
-    "No search results for" : "No se obtuvieron resultados para la búsqueda de ",
-    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
-    "Show images from this sender" : "Mostrar imagenes de este remitente",
-    "Forward" : "Reenviar",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "¡Mensaje enviado!",
+    "Send" : "Enviar",
     "Upload attachment" : "Cargar adjunto",
     "Add attachment from Files" : "Agregar adjunto desd Archivos",
+    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "Delete" : "Borrar",
     "Import into calendar" : "Importar al calendario",
     "Download attachment" : "Descargar adjunto",
-    "Save to Files" : "Guardar a Archivos"
+    "Save to Files" : "Guardar a Archivos",
+    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
+    "Save all to Files" : "Guardar todo a Archivos",
+    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
+    "New message" : "Mensaje nuevo",
+    "Settings" : "Configuraciones ",
+    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
+    "Compose new message" : "Escribir mensaje nuevo",
+    "Newer message" : "Mensaje más nuevo",
+    "Older message" : "Mensaje más antiguo",
+    "Toggle star" : "Alternar favoritos",
+    "Toggle unread" : "Alternar no leídos",
+    "Search" : "Buscar",
+    "Refresh" : "Actualizar",
+    "Connect your mail account" : "Conecta tu cuenta de correo",
+    "Show all folders" : "Mostrar todas las carpetas",
+    "Collapse folders" : "Compactar carpetas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
+    "Nextcloud Mail" : "Correo Nextcloud",
+    "All inboxes" : "Todos los buzones de entrada",
+    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
+    "Error loading message" : "Se presentó un error al cargar el mensaje",
+    "Forwarding to %s" : "Reenviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
+    "Redirect" : "Redireccionar",
+    "The link leads to %s" : "La liga lleva a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
+    "Continue to %s" : "Continuar a %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/es_PR.js b/l10n/es_PR.js
index 4de7f878e..c2c1f9f4b 100644
--- a/l10n/es_PR.js
+++ b/l10n/es_PR.js
@@ -2,51 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Correo",
-    "Loading accounts" : "Cargando cuentas",
-    "Error while loading the accounts." : "Se presentó un error al cargar las cuentas.",
-    "Can not load this folder." : "No se puede cargar esta carpeta.",
-    "Searching for {query}" : "Buscando a {query}",
-    "Error while deleting message." : "Se presentó un error al borrar el mensaje.",
-    "Forwarded message" : "mensaje reenviado",
-    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
-    "Attachments saved to Files." : "Adjuntos guardados a Archivos. ",
-    "Attachment saved to Files." : "Adjunto guardado en Archivos. ",
-    "Error while saving attachments to Files." : "Se presentó un error al guardar los adjuntos en Archivos.",
-    "Error while saving attachment to Files." : "Se presentó un error al guardar los adjuntos en Archivos",
-    "Message flag could not be set." : "No fue posible establecer la bandera del mensaje. ",
-    "Could not move message." : "No fue posible mover el mensaje.",
-    "Invalid account" : "Cuenta inválida",
-    "Invalid folder" : "Carpeta inválida",
-    "Error while creating the account: " : "Se presentó un error al crear la cuenta:",
-    "Unknown error" : "Error desconocido",
-    "All inboxes" : "Todos los buzones de entrada",
-    "you" : "tú",
-    "Send message to {email}" : "Enviar mensaje a {email}",
-    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
-    "Nextcloud Mail" : "Correo Nextcloud",
-    "Save" : "Guardar",
-    "Show all folders" : "Mostrar todas las carpetas",
-    "Collapse folders" : "Compactar carpetas",
-    "Error while deleting account." : "Se presetó un error al borrar la cuenta.",
-    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "An error occurred while uploading {fname}" : "Se presentó un error durante la carga {fname}",
-    "Reply" : "Responder",
-    "Send" : "Enviar",
-    "Sending …" : "Enviando ...",
-    "Message sent!" : "¡Mensaje enviado!",
-    "Server error" : "Se presentó un error en el servidor",
-    "An unknown error occurred" : "Se presentó un error desconocido",
-    "Opening HTML drafts is not supported yet." : "Abrir borradores HTML aún no está soportado.",
-    "No writable calendars found" : "No se encontraron calendarios editables",
-    "Error while importing the calendar event" : "Se presentó un error al importar el evento del calendario",
-    "Error while downloading calendar event" : "Se presentó un error al descargar el evento del calendario",
-    "& others" : "& otros",
-    "Error while loading messages." : "Se presentói un error al cargar los mensajes.",
-    "Error while refreshing messages." : "Se presentó un error al actualizar los mensajes.",
-    "Setting up your account" : "Configura tu cuenta",
     "Inbox" : "Buzón de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -58,65 +13,66 @@ OC.L10N.register(
     "Auto detect failed. Please use manual mode." : "Se presentó una falla en la auto detección. Por favor usa el modo manual.",
     "Creating account failed: " : "Se presentó una falla al crear la cuenta:",
     "Delete permanently" : "Borrar permanentemente",
-    "Error loading message" : "Se presentó un error al cargar el mensaje",
-    "Settings" : "Configuraciones ",
-    "Forwarding to %s" : "Reenviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
-    "Redirect" : "Redireccionar",
-    "The link leads to %s" : "La liga lleva a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
-    "Continue to %s" : "Continuar a %s",
-    "Delete account" : "Borrar cuenta",
-    "Try again" : "Reintentar",
-    "New message" : "Mensaje nuevo",
-    "Account Settings" : "Configuraciones  de la cuenta",
-    "Aliases" : "Aliases",
-    "Mail address" : "Dirección de correo",
-    "Display Name" : "Nombre a desplegar",
-    "Delete" : "Borrar",
-    "Keyboard shortcuts" : "Atajos del teclado",
-    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
-    "Compose new message" : "Escribir mensaje nuevo",
-    "Newer message" : "Mensaje más nuevo",
-    "Older message" : "Mensaje más antiguo",
-    "Toggle star" : "Alternar favoritos",
-    "Toggle unread" : "Alternar no leídos",
-    "Search" : "Buscar",
-    "Refresh" : "Actualizar",
-    "Connect your mail account" : "Conecta tu cuenta de correo",
     "Name" : "Nombre",
     "Mail Address" : "Dirección de Correo",
     "Password" : "Contraseña",
-    "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
-    "IMAP security" : "Seguridad IMAP",
     "None" : "Ninguno",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "IMAP Password" : "Contraseña IMAP",
     "SMTP Host" : "Servior SMTP",
-    "SMTP security" : "Seguridad SMTP",
     "SMTP Port" : "Puerto SMTP",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contraseña SMTP",
     "Connect" : "Conectar",
+    "Add mail account" : "Agregar cuenta de correo",
+    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
+    "Keyboard shortcuts" : "Atajos del teclado",
     "from" : "de",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
     "Subject" : "Asunto",
-    "Save all to Files" : "Guardar todo a Archivos",
-    "Add mail account" : "Agregar cuenta de correo",
-    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
-    "No search results for" : "No se obtuvieron resultados para la búsqueda de ",
-    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
-    "Show images from this sender" : "Mostrar imagenes de este remitente",
-    "Forward" : "Reenviar",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "¡Mensaje enviado!",
+    "Send" : "Enviar",
     "Upload attachment" : "Cargar adjunto",
     "Add attachment from Files" : "Agregar adjunto desd Archivos",
+    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "Delete" : "Borrar",
     "Import into calendar" : "Importar al calendario",
     "Download attachment" : "Descargar adjunto",
-    "Save to Files" : "Guardar a Archivos"
+    "Save to Files" : "Guardar a Archivos",
+    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
+    "Save all to Files" : "Guardar todo a Archivos",
+    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
+    "New message" : "Mensaje nuevo",
+    "Settings" : "Configuraciones ",
+    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
+    "Compose new message" : "Escribir mensaje nuevo",
+    "Newer message" : "Mensaje más nuevo",
+    "Older message" : "Mensaje más antiguo",
+    "Toggle star" : "Alternar favoritos",
+    "Toggle unread" : "Alternar no leídos",
+    "Search" : "Buscar",
+    "Refresh" : "Actualizar",
+    "Connect your mail account" : "Conecta tu cuenta de correo",
+    "Show all folders" : "Mostrar todas las carpetas",
+    "Collapse folders" : "Compactar carpetas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
+    "Nextcloud Mail" : "Correo Nextcloud",
+    "All inboxes" : "Todos los buzones de entrada",
+    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
+    "Error loading message" : "Se presentó un error al cargar el mensaje",
+    "Forwarding to %s" : "Reenviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
+    "Redirect" : "Redireccionar",
+    "The link leads to %s" : "La liga lleva a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
+    "Continue to %s" : "Continuar a %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/es_PR.json b/l10n/es_PR.json
index 41b28b5dd..2564f869e 100644
--- a/l10n/es_PR.json
+++ b/l10n/es_PR.json
@@ -1,50 +1,5 @@
 { "translations": {
     "Mail" : "Correo",
-    "Loading accounts" : "Cargando cuentas",
-    "Error while loading the accounts." : "Se presentó un error al cargar las cuentas.",
-    "Can not load this folder." : "No se puede cargar esta carpeta.",
-    "Searching for {query}" : "Buscando a {query}",
-    "Error while deleting message." : "Se presentó un error al borrar el mensaje.",
-    "Forwarded message" : "mensaje reenviado",
-    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
-    "Attachments saved to Files." : "Adjuntos guardados a Archivos. ",
-    "Attachment saved to Files." : "Adjunto guardado en Archivos. ",
-    "Error while saving attachments to Files." : "Se presentó un error al guardar los adjuntos en Archivos.",
-    "Error while saving attachment to Files." : "Se presentó un error al guardar los adjuntos en Archivos",
-    "Message flag could not be set." : "No fue posible establecer la bandera del mensaje. ",
-    "Could not move message." : "No fue posible mover el mensaje.",
-    "Invalid account" : "Cuenta inválida",
-    "Invalid folder" : "Carpeta inválida",
-    "Error while creating the account: " : "Se presentó un error al crear la cuenta:",
-    "Unknown error" : "Error desconocido",
-    "All inboxes" : "Todos los buzones de entrada",
-    "you" : "tú",
-    "Send message to {email}" : "Enviar mensaje a {email}",
-    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
-    "Nextcloud Mail" : "Correo Nextcloud",
-    "Save" : "Guardar",
-    "Show all folders" : "Mostrar todas las carpetas",
-    "Collapse folders" : "Compactar carpetas",
-    "Error while deleting account." : "Se presetó un error al borrar la cuenta.",
-    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "An error occurred while uploading {fname}" : "Se presentó un error durante la carga {fname}",
-    "Reply" : "Responder",
-    "Send" : "Enviar",
-    "Sending …" : "Enviando ...",
-    "Message sent!" : "¡Mensaje enviado!",
-    "Server error" : "Se presentó un error en el servidor",
-    "An unknown error occurred" : "Se presentó un error desconocido",
-    "Opening HTML drafts is not supported yet." : "Abrir borradores HTML aún no está soportado.",
-    "No writable calendars found" : "No se encontraron calendarios editables",
-    "Error while importing the calendar event" : "Se presentó un error al importar el evento del calendario",
-    "Error while downloading calendar event" : "Se presentó un error al descargar el evento del calendario",
-    "& others" : "& otros",
-    "Error while loading messages." : "Se presentói un error al cargar los mensajes.",
-    "Error while refreshing messages." : "Se presentó un error al actualizar los mensajes.",
-    "Setting up your account" : "Configura tu cuenta",
     "Inbox" : "Buzón de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -56,65 +11,66 @@
     "Auto detect failed. Please use manual mode." : "Se presentó una falla en la auto detección. Por favor usa el modo manual.",
     "Creating account failed: " : "Se presentó una falla al crear la cuenta:",
     "Delete permanently" : "Borrar permanentemente",
-    "Error loading message" : "Se presentó un error al cargar el mensaje",
-    "Settings" : "Configuraciones ",
-    "Forwarding to %s" : "Reenviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
-    "Redirect" : "Redireccionar",
-    "The link leads to %s" : "La liga lleva a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
-    "Continue to %s" : "Continuar a %s",
-    "Delete account" : "Borrar cuenta",
-    "Try again" : "Reintentar",
-    "New message" : "Mensaje nuevo",
-    "Account Settings" : "Configuraciones  de la cuenta",
-    "Aliases" : "Aliases",
-    "Mail address" : "Dirección de correo",
-    "Display Name" : "Nombre a desplegar",
-    "Delete" : "Borrar",
-    "Keyboard shortcuts" : "Atajos del teclado",
-    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
-    "Compose new message" : "Escribir mensaje nuevo",
-    "Newer message" : "Mensaje más nuevo",
-    "Older message" : "Mensaje más antiguo",
-    "Toggle star" : "Alternar favoritos",
-    "Toggle unread" : "Alternar no leídos",
-    "Search" : "Buscar",
-    "Refresh" : "Actualizar",
-    "Connect your mail account" : "Conecta tu cuenta de correo",
     "Name" : "Nombre",
     "Mail Address" : "Dirección de Correo",
     "Password" : "Contraseña",
-    "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
-    "IMAP security" : "Seguridad IMAP",
     "None" : "Ninguno",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "IMAP Password" : "Contraseña IMAP",
     "SMTP Host" : "Servior SMTP",
-    "SMTP security" : "Seguridad SMTP",
     "SMTP Port" : "Puerto SMTP",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contraseña SMTP",
     "Connect" : "Conectar",
+    "Add mail account" : "Agregar cuenta de correo",
+    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
+    "Keyboard shortcuts" : "Atajos del teclado",
     "from" : "de",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
     "Subject" : "Asunto",
-    "Save all to Files" : "Guardar todo a Archivos",
-    "Add mail account" : "Agregar cuenta de correo",
-    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
-    "No search results for" : "No se obtuvieron resultados para la búsqueda de ",
-    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
-    "Show images from this sender" : "Mostrar imagenes de este remitente",
-    "Forward" : "Reenviar",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "¡Mensaje enviado!",
+    "Send" : "Enviar",
     "Upload attachment" : "Cargar adjunto",
     "Add attachment from Files" : "Agregar adjunto desd Archivos",
+    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "Delete" : "Borrar",
     "Import into calendar" : "Importar al calendario",
     "Download attachment" : "Descargar adjunto",
-    "Save to Files" : "Guardar a Archivos"
+    "Save to Files" : "Guardar a Archivos",
+    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
+    "Save all to Files" : "Guardar todo a Archivos",
+    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
+    "New message" : "Mensaje nuevo",
+    "Settings" : "Configuraciones ",
+    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
+    "Compose new message" : "Escribir mensaje nuevo",
+    "Newer message" : "Mensaje más nuevo",
+    "Older message" : "Mensaje más antiguo",
+    "Toggle star" : "Alternar favoritos",
+    "Toggle unread" : "Alternar no leídos",
+    "Search" : "Buscar",
+    "Refresh" : "Actualizar",
+    "Connect your mail account" : "Conecta tu cuenta de correo",
+    "Show all folders" : "Mostrar todas las carpetas",
+    "Collapse folders" : "Compactar carpetas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
+    "Nextcloud Mail" : "Correo Nextcloud",
+    "All inboxes" : "Todos los buzones de entrada",
+    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
+    "Error loading message" : "Se presentó un error al cargar el mensaje",
+    "Forwarding to %s" : "Reenviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
+    "Redirect" : "Redireccionar",
+    "The link leads to %s" : "La liga lleva a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
+    "Continue to %s" : "Continuar a %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/es_PY.js b/l10n/es_PY.js
index 4de7f878e..c2c1f9f4b 100644
--- a/l10n/es_PY.js
+++ b/l10n/es_PY.js
@@ -2,51 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Correo",
-    "Loading accounts" : "Cargando cuentas",
-    "Error while loading the accounts." : "Se presentó un error al cargar las cuentas.",
-    "Can not load this folder." : "No se puede cargar esta carpeta.",
-    "Searching for {query}" : "Buscando a {query}",
-    "Error while deleting message." : "Se presentó un error al borrar el mensaje.",
-    "Forwarded message" : "mensaje reenviado",
-    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
-    "Attachments saved to Files." : "Adjuntos guardados a Archivos. ",
-    "Attachment saved to Files." : "Adjunto guardado en Archivos. ",
-    "Error while saving attachments to Files." : "Se presentó un error al guardar los adjuntos en Archivos.",
-    "Error while saving attachment to Files." : "Se presentó un error al guardar los adjuntos en Archivos",
-    "Message flag could not be set." : "No fue posible establecer la bandera del mensaje. ",
-    "Could not move message." : "No fue posible mover el mensaje.",
-    "Invalid account" : "Cuenta inválida",
-    "Invalid folder" : "Carpeta inválida",
-    "Error while creating the account: " : "Se presentó un error al crear la cuenta:",
-    "Unknown error" : "Error desconocido",
-    "All inboxes" : "Todos los buzones de entrada",
-    "you" : "tú",
-    "Send message to {email}" : "Enviar mensaje a {email}",
-    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
-    "Nextcloud Mail" : "Correo Nextcloud",
-    "Save" : "Guardar",
-    "Show all folders" : "Mostrar todas las carpetas",
-    "Collapse folders" : "Compactar carpetas",
-    "Error while deleting account." : "Se presetó un error al borrar la cuenta.",
-    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "An error occurred while uploading {fname}" : "Se presentó un error durante la carga {fname}",
-    "Reply" : "Responder",
-    "Send" : "Enviar",
-    "Sending …" : "Enviando ...",
-    "Message sent!" : "¡Mensaje enviado!",
-    "Server error" : "Se presentó un error en el servidor",
-    "An unknown error occurred" : "Se presentó un error desconocido",
-    "Opening HTML drafts is not supported yet." : "Abrir borradores HTML aún no está soportado.",
-    "No writable calendars found" : "No se encontraron calendarios editables",
-    "Error while importing the calendar event" : "Se presentó un error al importar el evento del calendario",
-    "Error while downloading calendar event" : "Se presentó un error al descargar el evento del calendario",
-    "& others" : "& otros",
-    "Error while loading messages." : "Se presentói un error al cargar los mensajes.",
-    "Error while refreshing messages." : "Se presentó un error al actualizar los mensajes.",
-    "Setting up your account" : "Configura tu cuenta",
     "Inbox" : "Buzón de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -58,65 +13,66 @@ OC.L10N.register(
     "Auto detect failed. Please use manual mode." : "Se presentó una falla en la auto detección. Por favor usa el modo manual.",
     "Creating account failed: " : "Se presentó una falla al crear la cuenta:",
     "Delete permanently" : "Borrar permanentemente",
-    "Error loading message" : "Se presentó un error al cargar el mensaje",
-    "Settings" : "Configuraciones ",
-    "Forwarding to %s" : "Reenviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
-    "Redirect" : "Redireccionar",
-    "The link leads to %s" : "La liga lleva a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
-    "Continue to %s" : "Continuar a %s",
-    "Delete account" : "Borrar cuenta",
-    "Try again" : "Reintentar",
-    "New message" : "Mensaje nuevo",
-    "Account Settings" : "Configuraciones  de la cuenta",
-    "Aliases" : "Aliases",
-    "Mail address" : "Dirección de correo",
-    "Display Name" : "Nombre a desplegar",
-    "Delete" : "Borrar",
-    "Keyboard shortcuts" : "Atajos del teclado",
-    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
-    "Compose new message" : "Escribir mensaje nuevo",
-    "Newer message" : "Mensaje más nuevo",
-    "Older message" : "Mensaje más antiguo",
-    "Toggle star" : "Alternar favoritos",
-    "Toggle unread" : "Alternar no leídos",
-    "Search" : "Buscar",
-    "Refresh" : "Actualizar",
-    "Connect your mail account" : "Conecta tu cuenta de correo",
     "Name" : "Nombre",
     "Mail Address" : "Dirección de Correo",
     "Password" : "Contraseña",
-    "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
-    "IMAP security" : "Seguridad IMAP",
     "None" : "Ninguno",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "IMAP Password" : "Contraseña IMAP",
     "SMTP Host" : "Servior SMTP",
-    "SMTP security" : "Seguridad SMTP",
     "SMTP Port" : "Puerto SMTP",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contraseña SMTP",
     "Connect" : "Conectar",
+    "Add mail account" : "Agregar cuenta de correo",
+    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
+    "Keyboard shortcuts" : "Atajos del teclado",
     "from" : "de",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
     "Subject" : "Asunto",
-    "Save all to Files" : "Guardar todo a Archivos",
-    "Add mail account" : "Agregar cuenta de correo",
-    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
-    "No search results for" : "No se obtuvieron resultados para la búsqueda de ",
-    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
-    "Show images from this sender" : "Mostrar imagenes de este remitente",
-    "Forward" : "Reenviar",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "¡Mensaje enviado!",
+    "Send" : "Enviar",
     "Upload attachment" : "Cargar adjunto",
     "Add attachment from Files" : "Agregar adjunto desd Archivos",
+    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "Delete" : "Borrar",
     "Import into calendar" : "Importar al calendario",
     "Download attachment" : "Descargar adjunto",
-    "Save to Files" : "Guardar a Archivos"
+    "Save to Files" : "Guardar a Archivos",
+    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
+    "Save all to Files" : "Guardar todo a Archivos",
+    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
+    "New message" : "Mensaje nuevo",
+    "Settings" : "Configuraciones ",
+    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
+    "Compose new message" : "Escribir mensaje nuevo",
+    "Newer message" : "Mensaje más nuevo",
+    "Older message" : "Mensaje más antiguo",
+    "Toggle star" : "Alternar favoritos",
+    "Toggle unread" : "Alternar no leídos",
+    "Search" : "Buscar",
+    "Refresh" : "Actualizar",
+    "Connect your mail account" : "Conecta tu cuenta de correo",
+    "Show all folders" : "Mostrar todas las carpetas",
+    "Collapse folders" : "Compactar carpetas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
+    "Nextcloud Mail" : "Correo Nextcloud",
+    "All inboxes" : "Todos los buzones de entrada",
+    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
+    "Error loading message" : "Se presentó un error al cargar el mensaje",
+    "Forwarding to %s" : "Reenviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
+    "Redirect" : "Redireccionar",
+    "The link leads to %s" : "La liga lleva a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
+    "Continue to %s" : "Continuar a %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/es_PY.json b/l10n/es_PY.json
index 41b28b5dd..2564f869e 100644
--- a/l10n/es_PY.json
+++ b/l10n/es_PY.json
@@ -1,50 +1,5 @@
 { "translations": {
     "Mail" : "Correo",
-    "Loading accounts" : "Cargando cuentas",
-    "Error while loading the accounts." : "Se presentó un error al cargar las cuentas.",
-    "Can not load this folder." : "No se puede cargar esta carpeta.",
-    "Searching for {query}" : "Buscando a {query}",
-    "Error while deleting message." : "Se presentó un error al borrar el mensaje.",
-    "Forwarded message" : "mensaje reenviado",
-    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
-    "Attachments saved to Files." : "Adjuntos guardados a Archivos. ",
-    "Attachment saved to Files." : "Adjunto guardado en Archivos. ",
-    "Error while saving attachments to Files." : "Se presentó un error al guardar los adjuntos en Archivos.",
-    "Error while saving attachment to Files." : "Se presentó un error al guardar los adjuntos en Archivos",
-    "Message flag could not be set." : "No fue posible establecer la bandera del mensaje. ",
-    "Could not move message." : "No fue posible mover el mensaje.",
-    "Invalid account" : "Cuenta inválida",
-    "Invalid folder" : "Carpeta inválida",
-    "Error while creating the account: " : "Se presentó un error al crear la cuenta:",
-    "Unknown error" : "Error desconocido",
-    "All inboxes" : "Todos los buzones de entrada",
-    "you" : "tú",
-    "Send message to {email}" : "Enviar mensaje a {email}",
-    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
-    "Nextcloud Mail" : "Correo Nextcloud",
-    "Save" : "Guardar",
-    "Show all folders" : "Mostrar todas las carpetas",
-    "Collapse folders" : "Compactar carpetas",
-    "Error while deleting account." : "Se presetó un error al borrar la cuenta.",
-    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "An error occurred while uploading {fname}" : "Se presentó un error durante la carga {fname}",
-    "Reply" : "Responder",
-    "Send" : "Enviar",
-    "Sending …" : "Enviando ...",
-    "Message sent!" : "¡Mensaje enviado!",
-    "Server error" : "Se presentó un error en el servidor",
-    "An unknown error occurred" : "Se presentó un error desconocido",
-    "Opening HTML drafts is not supported yet." : "Abrir borradores HTML aún no está soportado.",
-    "No writable calendars found" : "No se encontraron calendarios editables",
-    "Error while importing the calendar event" : "Se presentó un error al importar el evento del calendario",
-    "Error while downloading calendar event" : "Se presentó un error al descargar el evento del calendario",
-    "& others" : "& otros",
-    "Error while loading messages." : "Se presentói un error al cargar los mensajes.",
-    "Error while refreshing messages." : "Se presentó un error al actualizar los mensajes.",
-    "Setting up your account" : "Configura tu cuenta",
     "Inbox" : "Buzón de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -56,65 +11,66 @@
     "Auto detect failed. Please use manual mode." : "Se presentó una falla en la auto detección. Por favor usa el modo manual.",
     "Creating account failed: " : "Se presentó una falla al crear la cuenta:",
     "Delete permanently" : "Borrar permanentemente",
-    "Error loading message" : "Se presentó un error al cargar el mensaje",
-    "Settings" : "Configuraciones ",
-    "Forwarding to %s" : "Reenviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
-    "Redirect" : "Redireccionar",
-    "The link leads to %s" : "La liga lleva a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
-    "Continue to %s" : "Continuar a %s",
-    "Delete account" : "Borrar cuenta",
-    "Try again" : "Reintentar",
-    "New message" : "Mensaje nuevo",
-    "Account Settings" : "Configuraciones  de la cuenta",
-    "Aliases" : "Aliases",
-    "Mail address" : "Dirección de correo",
-    "Display Name" : "Nombre a desplegar",
-    "Delete" : "Borrar",
-    "Keyboard shortcuts" : "Atajos del teclado",
-    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
-    "Compose new message" : "Escribir mensaje nuevo",
-    "Newer message" : "Mensaje más nuevo",
-    "Older message" : "Mensaje más antiguo",
-    "Toggle star" : "Alternar favoritos",
-    "Toggle unread" : "Alternar no leídos",
-    "Search" : "Buscar",
-    "Refresh" : "Actualizar",
-    "Connect your mail account" : "Conecta tu cuenta de correo",
     "Name" : "Nombre",
     "Mail Address" : "Dirección de Correo",
     "Password" : "Contraseña",
-    "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
-    "IMAP security" : "Seguridad IMAP",
     "None" : "Ninguno",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "IMAP Password" : "Contraseña IMAP",
     "SMTP Host" : "Servior SMTP",
-    "SMTP security" : "Seguridad SMTP",
     "SMTP Port" : "Puerto SMTP",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contraseña SMTP",
     "Connect" : "Conectar",
+    "Add mail account" : "Agregar cuenta de correo",
+    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
+    "Keyboard shortcuts" : "Atajos del teclado",
     "from" : "de",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
     "Subject" : "Asunto",
-    "Save all to Files" : "Guardar todo a Archivos",
-    "Add mail account" : "Agregar cuenta de correo",
-    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
-    "No search results for" : "No se obtuvieron resultados para la búsqueda de ",
-    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
-    "Show images from this sender" : "Mostrar imagenes de este remitente",
-    "Forward" : "Reenviar",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "¡Mensaje enviado!",
+    "Send" : "Enviar",
     "Upload attachment" : "Cargar adjunto",
     "Add attachment from Files" : "Agregar adjunto desd Archivos",
+    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "Delete" : "Borrar",
     "Import into calendar" : "Importar al calendario",
     "Download attachment" : "Descargar adjunto",
-    "Save to Files" : "Guardar a Archivos"
+    "Save to Files" : "Guardar a Archivos",
+    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
+    "Save all to Files" : "Guardar todo a Archivos",
+    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
+    "New message" : "Mensaje nuevo",
+    "Settings" : "Configuraciones ",
+    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
+    "Compose new message" : "Escribir mensaje nuevo",
+    "Newer message" : "Mensaje más nuevo",
+    "Older message" : "Mensaje más antiguo",
+    "Toggle star" : "Alternar favoritos",
+    "Toggle unread" : "Alternar no leídos",
+    "Search" : "Buscar",
+    "Refresh" : "Actualizar",
+    "Connect your mail account" : "Conecta tu cuenta de correo",
+    "Show all folders" : "Mostrar todas las carpetas",
+    "Collapse folders" : "Compactar carpetas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
+    "Nextcloud Mail" : "Correo Nextcloud",
+    "All inboxes" : "Todos los buzones de entrada",
+    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
+    "Error loading message" : "Se presentó un error al cargar el mensaje",
+    "Forwarding to %s" : "Reenviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
+    "Redirect" : "Redireccionar",
+    "The link leads to %s" : "La liga lleva a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
+    "Continue to %s" : "Continuar a %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/es_SV.js b/l10n/es_SV.js
index 7e3ca3ea1..a5b5292ed 100644
--- a/l10n/es_SV.js
+++ b/l10n/es_SV.js
@@ -2,56 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Correo",
-    "Loading accounts" : "Cargando cuentas",
-    "Error while loading the accounts." : "Se presentó un error al cargar las cuentas.",
-    "Can not load this folder." : "No se puede cargar esta carpeta.",
-    "Searching for {query}" : "Buscando a {query}",
-    "Error while deleting message." : "Se presentó un error al borrar el mensaje.",
-    "Forwarded message" : "mensaje reenviado",
-    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
-    "Attachments saved to Files." : "Adjuntos guardados a Archivos. ",
-    "Attachment saved to Files." : "Adjunto guardado en Archivos. ",
-    "Error while saving attachments to Files." : "Se presentó un error al guardar los adjuntos en Archivos.",
-    "Error while saving attachment to Files." : "Se presentó un error al guardar los adjuntos en Archivos",
-    "Message flag could not be set." : "No fue posible establecer la bandera del mensaje. ",
-    "Could not move message." : "No fue posible mover el mensaje.",
-    "Invalid account" : "Cuenta inválida",
-    "Invalid folder" : "Carpeta inválida",
-    "Error while creating the account: " : "Se presentó un error al crear la cuenta:",
-    "Unknown error" : "Error desconocido",
-    "Error while updating the account: " : "Se presentó un error al actualizar la cuenta:",
-    "All inboxes" : "Todos los buzones de entrada",
-    "you" : "tú",
-    "Send message to {email}" : "Enviar mensaje a {email}",
-    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
-    "Could not load your message" : "No fue posible cargar tu mensaje",
-    "Could not load the desired message" : "No fue posible cargar el mensaje deseado",
-    "Could not load the message" : "No fue posible cargar el mensaje",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
-    "Nextcloud Mail" : "Correo Nextcloud",
-    "Save" : "Guardar",
-    "Saved" : "Guardado",
-    "Show all folders" : "Mostrar todas las carpetas",
-    "Collapse folders" : "Compactar carpetas",
-    "Error while deleting account." : "Se presetó un error al borrar la cuenta.",
-    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "An error occurred while uploading {fname}" : "Se presentó un error durante la carga {fname}",
-    "Reply" : "Responder",
-    "Send" : "Enviar",
-    "Sending …" : "Enviando ...",
-    "Message sent!" : "¡Mensaje enviado!",
-    "Server error" : "Se presentó un error en el servidor",
-    "An unknown error occurred" : "Se presentó un error desconocido",
-    "Opening HTML drafts is not supported yet." : "Abrir borradores HTML aún no está soportado.",
-    "No writable calendars found" : "No se encontraron calendarios editables",
-    "Error while importing the calendar event" : "Se presentó un error al importar el evento del calendario",
-    "Error while downloading calendar event" : "Se presentó un error al descargar el evento del calendario",
-    "& others" : "& otros",
-    "Error while loading messages." : "Se presentói un error al cargar los mensajes.",
-    "Error while refreshing messages." : "Se presentó un error al actualizar los mensajes.",
-    "Setting up your account" : "Configura tu cuenta",
     "Inbox" : "Buzón de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -64,68 +14,70 @@ OC.L10N.register(
     "Updating account failed: " : "Se presentó una falla al actualizar la cuenta",
     "Creating account failed: " : "Se presentó una falla al crear la cuenta:",
     "Delete permanently" : "Borrar permanentemente",
-    "Error loading message" : "Se presentó un error al cargar el mensaje",
-    "Settings" : "Configuraciones ",
-    "Forwarding to %s" : "Reenviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
-    "Redirect" : "Redireccionar",
-    "The link leads to %s" : "La liga lleva a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
-    "Continue to %s" : "Continuar a %s",
-    "Delete account" : "Borrar cuenta",
-    "Try again" : "Reintentar",
-    "New message" : "Mensaje nuevo",
-    "Account Settings" : "Configuraciones  de la cuenta",
-    "Aliases" : "Aliases",
-    "Mail address" : "Dirección de correo",
-    "Display Name" : "Nombre a desplegar",
-    "Account" : "Cuenta",
-    "Delete" : "Borrar",
-    "Keyboard shortcuts" : "Atajos del teclado",
-    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
-    "Compose new message" : "Escribir mensaje nuevo",
-    "Newer message" : "Mensaje más nuevo",
-    "Older message" : "Mensaje más antiguo",
-    "Toggle star" : "Alternar favoritos",
-    "Toggle unread" : "Alternar no leídos",
-    "Search" : "Buscar",
-    "Refresh" : "Actualizar",
-    "Connect your mail account" : "Conecta tu cuenta de correo",
     "Name" : "Nombre",
     "Mail Address" : "Dirección de Correo",
     "Password" : "Contraseña",
-    "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
-    "IMAP security" : "Seguridad IMAP",
     "None" : "Ninguno",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "IMAP Password" : "Contraseña IMAP",
     "SMTP Host" : "Servior SMTP",
-    "SMTP security" : "Seguridad SMTP",
     "SMTP Port" : "Puerto SMTP",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contraseña SMTP",
     "Connect" : "Conectar",
+    "Add mail account" : "Agregar cuenta de correo",
+    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
+    "Keyboard shortcuts" : "Atajos del teclado",
     "from" : "de",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Nota que el correo vino de una dirección no-responda asi que tu respuesta probablemente no sea leida. ",
     "Subject" : "Asunto",
-    "Save all to Files" : "Guardar todo a Archivos",
-    "Add mail account" : "Agregar cuenta de correo",
-    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
-    "No search results for" : "No se obtuvieron resultados para la búsqueda de ",
-    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
-    "Show images from this sender" : "Mostrar imagenes de este remitente",
-    "Forward" : "Reenviar",
-    "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "¡Mensaje enviado!",
+    "Send" : "Enviar",
     "Upload attachment" : "Cargar adjunto",
     "Add attachment from Files" : "Agregar adjunto desd Archivos",
+    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Delete" : "Borrar",
+    "Could not load your message" : "No fue posible cargar tu mensaje",
     "Import into calendar" : "Importar al calendario",
     "Download attachment" : "Descargar adjunto",
-    "Save to Files" : "Guardar a Archivos"
+    "Save to Files" : "Guardar a Archivos",
+    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
+    "Save all to Files" : "Guardar todo a Archivos",
+    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
+    "New message" : "Mensaje nuevo",
+    "Settings" : "Configuraciones ",
+    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
+    "Compose new message" : "Escribir mensaje nuevo",
+    "Newer message" : "Mensaje más nuevo",
+    "Older message" : "Mensaje más antiguo",
+    "Toggle star" : "Alternar favoritos",
+    "Toggle unread" : "Alternar no leídos",
+    "Search" : "Buscar",
+    "Refresh" : "Actualizar",
+    "Connect your mail account" : "Conecta tu cuenta de correo",
+    "Show all folders" : "Mostrar todas las carpetas",
+    "Collapse folders" : "Compactar carpetas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
+    "Nextcloud Mail" : "Correo Nextcloud",
+    "All inboxes" : "Todos los buzones de entrada",
+    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
+    "Could not load the desired message" : "No fue posible cargar el mensaje deseado",
+    "Could not load the message" : "No fue posible cargar el mensaje",
+    "Error loading message" : "Se presentó un error al cargar el mensaje",
+    "Forwarding to %s" : "Reenviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
+    "Redirect" : "Redireccionar",
+    "The link leads to %s" : "La liga lleva a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
+    "Continue to %s" : "Continuar a %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/es_SV.json b/l10n/es_SV.json
index b652d4609..f23270e4e 100644
--- a/l10n/es_SV.json
+++ b/l10n/es_SV.json
@@ -1,55 +1,5 @@
 { "translations": {
     "Mail" : "Correo",
-    "Loading accounts" : "Cargando cuentas",
-    "Error while loading the accounts." : "Se presentó un error al cargar las cuentas.",
-    "Can not load this folder." : "No se puede cargar esta carpeta.",
-    "Searching for {query}" : "Buscando a {query}",
-    "Error while deleting message." : "Se presentó un error al borrar el mensaje.",
-    "Forwarded message" : "mensaje reenviado",
-    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
-    "Attachments saved to Files." : "Adjuntos guardados a Archivos. ",
-    "Attachment saved to Files." : "Adjunto guardado en Archivos. ",
-    "Error while saving attachments to Files." : "Se presentó un error al guardar los adjuntos en Archivos.",
-    "Error while saving attachment to Files." : "Se presentó un error al guardar los adjuntos en Archivos",
-    "Message flag could not be set." : "No fue posible establecer la bandera del mensaje. ",
-    "Could not move message." : "No fue posible mover el mensaje.",
-    "Invalid account" : "Cuenta inválida",
-    "Invalid folder" : "Carpeta inválida",
-    "Error while creating the account: " : "Se presentó un error al crear la cuenta:",
-    "Unknown error" : "Error desconocido",
-    "Error while updating the account: " : "Se presentó un error al actualizar la cuenta:",
-    "All inboxes" : "Todos los buzones de entrada",
-    "you" : "tú",
-    "Send message to {email}" : "Enviar mensaje a {email}",
-    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
-    "Could not load your message" : "No fue posible cargar tu mensaje",
-    "Could not load the desired message" : "No fue posible cargar el mensaje deseado",
-    "Could not load the message" : "No fue posible cargar el mensaje",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
-    "Nextcloud Mail" : "Correo Nextcloud",
-    "Save" : "Guardar",
-    "Saved" : "Guardado",
-    "Show all folders" : "Mostrar todas las carpetas",
-    "Collapse folders" : "Compactar carpetas",
-    "Error while deleting account." : "Se presetó un error al borrar la cuenta.",
-    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "An error occurred while uploading {fname}" : "Se presentó un error durante la carga {fname}",
-    "Reply" : "Responder",
-    "Send" : "Enviar",
-    "Sending …" : "Enviando ...",
-    "Message sent!" : "¡Mensaje enviado!",
-    "Server error" : "Se presentó un error en el servidor",
-    "An unknown error occurred" : "Se presentó un error desconocido",
-    "Opening HTML drafts is not supported yet." : "Abrir borradores HTML aún no está soportado.",
-    "No writable calendars found" : "No se encontraron calendarios editables",
-    "Error while importing the calendar event" : "Se presentó un error al importar el evento del calendario",
-    "Error while downloading calendar event" : "Se presentó un error al descargar el evento del calendario",
-    "& others" : "& otros",
-    "Error while loading messages." : "Se presentói un error al cargar los mensajes.",
-    "Error while refreshing messages." : "Se presentó un error al actualizar los mensajes.",
-    "Setting up your account" : "Configura tu cuenta",
     "Inbox" : "Buzón de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -62,68 +12,70 @@
     "Updating account failed: " : "Se presentó una falla al actualizar la cuenta",
     "Creating account failed: " : "Se presentó una falla al crear la cuenta:",
     "Delete permanently" : "Borrar permanentemente",
-    "Error loading message" : "Se presentó un error al cargar el mensaje",
-    "Settings" : "Configuraciones ",
-    "Forwarding to %s" : "Reenviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
-    "Redirect" : "Redireccionar",
-    "The link leads to %s" : "La liga lleva a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
-    "Continue to %s" : "Continuar a %s",
-    "Delete account" : "Borrar cuenta",
-    "Try again" : "Reintentar",
-    "New message" : "Mensaje nuevo",
-    "Account Settings" : "Configuraciones  de la cuenta",
-    "Aliases" : "Aliases",
-    "Mail address" : "Dirección de correo",
-    "Display Name" : "Nombre a desplegar",
-    "Account" : "Cuenta",
-    "Delete" : "Borrar",
-    "Keyboard shortcuts" : "Atajos del teclado",
-    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
-    "Compose new message" : "Escribir mensaje nuevo",
-    "Newer message" : "Mensaje más nuevo",
-    "Older message" : "Mensaje más antiguo",
-    "Toggle star" : "Alternar favoritos",
-    "Toggle unread" : "Alternar no leídos",
-    "Search" : "Buscar",
-    "Refresh" : "Actualizar",
-    "Connect your mail account" : "Conecta tu cuenta de correo",
     "Name" : "Nombre",
     "Mail Address" : "Dirección de Correo",
     "Password" : "Contraseña",
-    "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
-    "IMAP security" : "Seguridad IMAP",
     "None" : "Ninguno",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "IMAP Password" : "Contraseña IMAP",
     "SMTP Host" : "Servior SMTP",
-    "SMTP security" : "Seguridad SMTP",
     "SMTP Port" : "Puerto SMTP",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contraseña SMTP",
     "Connect" : "Conectar",
+    "Add mail account" : "Agregar cuenta de correo",
+    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
+    "Keyboard shortcuts" : "Atajos del teclado",
     "from" : "de",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Nota que el correo vino de una dirección no-responda asi que tu respuesta probablemente no sea leida. ",
     "Subject" : "Asunto",
-    "Save all to Files" : "Guardar todo a Archivos",
-    "Add mail account" : "Agregar cuenta de correo",
-    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
-    "No search results for" : "No se obtuvieron resultados para la búsqueda de ",
-    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
-    "Show images from this sender" : "Mostrar imagenes de este remitente",
-    "Forward" : "Reenviar",
-    "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "¡Mensaje enviado!",
+    "Send" : "Enviar",
     "Upload attachment" : "Cargar adjunto",
     "Add attachment from Files" : "Agregar adjunto desd Archivos",
+    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Delete" : "Borrar",
+    "Could not load your message" : "No fue posible cargar tu mensaje",
     "Import into calendar" : "Importar al calendario",
     "Download attachment" : "Descargar adjunto",
-    "Save to Files" : "Guardar a Archivos"
+    "Save to Files" : "Guardar a Archivos",
+    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
+    "Save all to Files" : "Guardar todo a Archivos",
+    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
+    "New message" : "Mensaje nuevo",
+    "Settings" : "Configuraciones ",
+    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
+    "Compose new message" : "Escribir mensaje nuevo",
+    "Newer message" : "Mensaje más nuevo",
+    "Older message" : "Mensaje más antiguo",
+    "Toggle star" : "Alternar favoritos",
+    "Toggle unread" : "Alternar no leídos",
+    "Search" : "Buscar",
+    "Refresh" : "Actualizar",
+    "Connect your mail account" : "Conecta tu cuenta de correo",
+    "Show all folders" : "Mostrar todas las carpetas",
+    "Collapse folders" : "Compactar carpetas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
+    "Nextcloud Mail" : "Correo Nextcloud",
+    "All inboxes" : "Todos los buzones de entrada",
+    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
+    "Could not load the desired message" : "No fue posible cargar el mensaje deseado",
+    "Could not load the message" : "No fue posible cargar el mensaje",
+    "Error loading message" : "Se presentó un error al cargar el mensaje",
+    "Forwarding to %s" : "Reenviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
+    "Redirect" : "Redireccionar",
+    "The link leads to %s" : "La liga lleva a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
+    "Continue to %s" : "Continuar a %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/es_UY.js b/l10n/es_UY.js
index 4de7f878e..c2c1f9f4b 100644
--- a/l10n/es_UY.js
+++ b/l10n/es_UY.js
@@ -2,51 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Correo",
-    "Loading accounts" : "Cargando cuentas",
-    "Error while loading the accounts." : "Se presentó un error al cargar las cuentas.",
-    "Can not load this folder." : "No se puede cargar esta carpeta.",
-    "Searching for {query}" : "Buscando a {query}",
-    "Error while deleting message." : "Se presentó un error al borrar el mensaje.",
-    "Forwarded message" : "mensaje reenviado",
-    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
-    "Attachments saved to Files." : "Adjuntos guardados a Archivos. ",
-    "Attachment saved to Files." : "Adjunto guardado en Archivos. ",
-    "Error while saving attachments to Files." : "Se presentó un error al guardar los adjuntos en Archivos.",
-    "Error while saving attachment to Files." : "Se presentó un error al guardar los adjuntos en Archivos",
-    "Message flag could not be set." : "No fue posible establecer la bandera del mensaje. ",
-    "Could not move message." : "No fue posible mover el mensaje.",
-    "Invalid account" : "Cuenta inválida",
-    "Invalid folder" : "Carpeta inválida",
-    "Error while creating the account: " : "Se presentó un error al crear la cuenta:",
-    "Unknown error" : "Error desconocido",
-    "All inboxes" : "Todos los buzones de entrada",
-    "you" : "tú",
-    "Send message to {email}" : "Enviar mensaje a {email}",
-    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
-    "Nextcloud Mail" : "Correo Nextcloud",
-    "Save" : "Guardar",
-    "Show all folders" : "Mostrar todas las carpetas",
-    "Collapse folders" : "Compactar carpetas",
-    "Error while deleting account." : "Se presetó un error al borrar la cuenta.",
-    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "An error occurred while uploading {fname}" : "Se presentó un error durante la carga {fname}",
-    "Reply" : "Responder",
-    "Send" : "Enviar",
-    "Sending …" : "Enviando ...",
-    "Message sent!" : "¡Mensaje enviado!",
-    "Server error" : "Se presentó un error en el servidor",
-    "An unknown error occurred" : "Se presentó un error desconocido",
-    "Opening HTML drafts is not supported yet." : "Abrir borradores HTML aún no está soportado.",
-    "No writable calendars found" : "No se encontraron calendarios editables",
-    "Error while importing the calendar event" : "Se presentó un error al importar el evento del calendario",
-    "Error while downloading calendar event" : "Se presentó un error al descargar el evento del calendario",
-    "& others" : "& otros",
-    "Error while loading messages." : "Se presentói un error al cargar los mensajes.",
-    "Error while refreshing messages." : "Se presentó un error al actualizar los mensajes.",
-    "Setting up your account" : "Configura tu cuenta",
     "Inbox" : "Buzón de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -58,65 +13,66 @@ OC.L10N.register(
     "Auto detect failed. Please use manual mode." : "Se presentó una falla en la auto detección. Por favor usa el modo manual.",
     "Creating account failed: " : "Se presentó una falla al crear la cuenta:",
     "Delete permanently" : "Borrar permanentemente",
-    "Error loading message" : "Se presentó un error al cargar el mensaje",
-    "Settings" : "Configuraciones ",
-    "Forwarding to %s" : "Reenviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
-    "Redirect" : "Redireccionar",
-    "The link leads to %s" : "La liga lleva a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
-    "Continue to %s" : "Continuar a %s",
-    "Delete account" : "Borrar cuenta",
-    "Try again" : "Reintentar",
-    "New message" : "Mensaje nuevo",
-    "Account Settings" : "Configuraciones  de la cuenta",
-    "Aliases" : "Aliases",
-    "Mail address" : "Dirección de correo",
-    "Display Name" : "Nombre a desplegar",
-    "Delete" : "Borrar",
-    "Keyboard shortcuts" : "Atajos del teclado",
-    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
-    "Compose new message" : "Escribir mensaje nuevo",
-    "Newer message" : "Mensaje más nuevo",
-    "Older message" : "Mensaje más antiguo",
-    "Toggle star" : "Alternar favoritos",
-    "Toggle unread" : "Alternar no leídos",
-    "Search" : "Buscar",
-    "Refresh" : "Actualizar",
-    "Connect your mail account" : "Conecta tu cuenta de correo",
     "Name" : "Nombre",
     "Mail Address" : "Dirección de Correo",
     "Password" : "Contraseña",
-    "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
-    "IMAP security" : "Seguridad IMAP",
     "None" : "Ninguno",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "IMAP Password" : "Contraseña IMAP",
     "SMTP Host" : "Servior SMTP",
-    "SMTP security" : "Seguridad SMTP",
     "SMTP Port" : "Puerto SMTP",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contraseña SMTP",
     "Connect" : "Conectar",
+    "Add mail account" : "Agregar cuenta de correo",
+    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
+    "Keyboard shortcuts" : "Atajos del teclado",
     "from" : "de",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
     "Subject" : "Asunto",
-    "Save all to Files" : "Guardar todo a Archivos",
-    "Add mail account" : "Agregar cuenta de correo",
-    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
-    "No search results for" : "No se obtuvieron resultados para la búsqueda de ",
-    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
-    "Show images from this sender" : "Mostrar imagenes de este remitente",
-    "Forward" : "Reenviar",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "¡Mensaje enviado!",
+    "Send" : "Enviar",
     "Upload attachment" : "Cargar adjunto",
     "Add attachment from Files" : "Agregar adjunto desd Archivos",
+    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "Delete" : "Borrar",
     "Import into calendar" : "Importar al calendario",
     "Download attachment" : "Descargar adjunto",
-    "Save to Files" : "Guardar a Archivos"
+    "Save to Files" : "Guardar a Archivos",
+    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
+    "Save all to Files" : "Guardar todo a Archivos",
+    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
+    "New message" : "Mensaje nuevo",
+    "Settings" : "Configuraciones ",
+    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
+    "Compose new message" : "Escribir mensaje nuevo",
+    "Newer message" : "Mensaje más nuevo",
+    "Older message" : "Mensaje más antiguo",
+    "Toggle star" : "Alternar favoritos",
+    "Toggle unread" : "Alternar no leídos",
+    "Search" : "Buscar",
+    "Refresh" : "Actualizar",
+    "Connect your mail account" : "Conecta tu cuenta de correo",
+    "Show all folders" : "Mostrar todas las carpetas",
+    "Collapse folders" : "Compactar carpetas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
+    "Nextcloud Mail" : "Correo Nextcloud",
+    "All inboxes" : "Todos los buzones de entrada",
+    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
+    "Error loading message" : "Se presentó un error al cargar el mensaje",
+    "Forwarding to %s" : "Reenviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
+    "Redirect" : "Redireccionar",
+    "The link leads to %s" : "La liga lleva a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
+    "Continue to %s" : "Continuar a %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/es_UY.json b/l10n/es_UY.json
index 41b28b5dd..2564f869e 100644
--- a/l10n/es_UY.json
+++ b/l10n/es_UY.json
@@ -1,50 +1,5 @@
 { "translations": {
     "Mail" : "Correo",
-    "Loading accounts" : "Cargando cuentas",
-    "Error while loading the accounts." : "Se presentó un error al cargar las cuentas.",
-    "Can not load this folder." : "No se puede cargar esta carpeta.",
-    "Searching for {query}" : "Buscando a {query}",
-    "Error while deleting message." : "Se presentó un error al borrar el mensaje.",
-    "Forwarded message" : "mensaje reenviado",
-    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
-    "Attachments saved to Files." : "Adjuntos guardados a Archivos. ",
-    "Attachment saved to Files." : "Adjunto guardado en Archivos. ",
-    "Error while saving attachments to Files." : "Se presentó un error al guardar los adjuntos en Archivos.",
-    "Error while saving attachment to Files." : "Se presentó un error al guardar los adjuntos en Archivos",
-    "Message flag could not be set." : "No fue posible establecer la bandera del mensaje. ",
-    "Could not move message." : "No fue posible mover el mensaje.",
-    "Invalid account" : "Cuenta inválida",
-    "Invalid folder" : "Carpeta inválida",
-    "Error while creating the account: " : "Se presentó un error al crear la cuenta:",
-    "Unknown error" : "Error desconocido",
-    "All inboxes" : "Todos los buzones de entrada",
-    "you" : "tú",
-    "Send message to {email}" : "Enviar mensaje a {email}",
-    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
-    "Nextcloud Mail" : "Correo Nextcloud",
-    "Save" : "Guardar",
-    "Show all folders" : "Mostrar todas las carpetas",
-    "Collapse folders" : "Compactar carpetas",
-    "Error while deleting account." : "Se presetó un error al borrar la cuenta.",
-    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "An error occurred while uploading {fname}" : "Se presentó un error durante la carga {fname}",
-    "Reply" : "Responder",
-    "Send" : "Enviar",
-    "Sending …" : "Enviando ...",
-    "Message sent!" : "¡Mensaje enviado!",
-    "Server error" : "Se presentó un error en el servidor",
-    "An unknown error occurred" : "Se presentó un error desconocido",
-    "Opening HTML drafts is not supported yet." : "Abrir borradores HTML aún no está soportado.",
-    "No writable calendars found" : "No se encontraron calendarios editables",
-    "Error while importing the calendar event" : "Se presentó un error al importar el evento del calendario",
-    "Error while downloading calendar event" : "Se presentó un error al descargar el evento del calendario",
-    "& others" : "& otros",
-    "Error while loading messages." : "Se presentói un error al cargar los mensajes.",
-    "Error while refreshing messages." : "Se presentó un error al actualizar los mensajes.",
-    "Setting up your account" : "Configura tu cuenta",
     "Inbox" : "Buzón de entrada",
     "Sent" : "Enviado",
     "Drafts" : "Borradores",
@@ -56,65 +11,66 @@
     "Auto detect failed. Please use manual mode." : "Se presentó una falla en la auto detección. Por favor usa el modo manual.",
     "Creating account failed: " : "Se presentó una falla al crear la cuenta:",
     "Delete permanently" : "Borrar permanentemente",
-    "Error loading message" : "Se presentó un error al cargar el mensaje",
-    "Settings" : "Configuraciones ",
-    "Forwarding to %s" : "Reenviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
-    "Redirect" : "Redireccionar",
-    "The link leads to %s" : "La liga lleva a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
-    "Continue to %s" : "Continuar a %s",
-    "Delete account" : "Borrar cuenta",
-    "Try again" : "Reintentar",
-    "New message" : "Mensaje nuevo",
-    "Account Settings" : "Configuraciones  de la cuenta",
-    "Aliases" : "Aliases",
-    "Mail address" : "Dirección de correo",
-    "Display Name" : "Nombre a desplegar",
-    "Delete" : "Borrar",
-    "Keyboard shortcuts" : "Atajos del teclado",
-    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
-    "Compose new message" : "Escribir mensaje nuevo",
-    "Newer message" : "Mensaje más nuevo",
-    "Older message" : "Mensaje más antiguo",
-    "Toggle star" : "Alternar favoritos",
-    "Toggle unread" : "Alternar no leídos",
-    "Search" : "Buscar",
-    "Refresh" : "Actualizar",
-    "Connect your mail account" : "Conecta tu cuenta de correo",
     "Name" : "Nombre",
     "Mail Address" : "Dirección de Correo",
     "Password" : "Contraseña",
-    "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
-    "IMAP security" : "Seguridad IMAP",
     "None" : "Ninguno",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "IMAP Password" : "Contraseña IMAP",
     "SMTP Host" : "Servior SMTP",
-    "SMTP security" : "Seguridad SMTP",
     "SMTP Port" : "Puerto SMTP",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contraseña SMTP",
     "Connect" : "Conectar",
+    "Add mail account" : "Agregar cuenta de correo",
+    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
+    "Keyboard shortcuts" : "Atajos del teclado",
     "from" : "de",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
     "Subject" : "Asunto",
-    "Save all to Files" : "Guardar todo a Archivos",
-    "Add mail account" : "Agregar cuenta de correo",
-    "Use Gravatar and favicon avatars" : "Usar Gravatar y avatares favicon",
-    "No search results for" : "No se obtuvieron resultados para la búsqueda de ",
-    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
-    "Show images from this sender" : "Mostrar imagenes de este remitente",
-    "Forward" : "Reenviar",
+    "Sending …" : "Enviando ...",
+    "Message sent!" : "¡Mensaje enviado!",
+    "Send" : "Enviar",
     "Upload attachment" : "Cargar adjunto",
     "Add attachment from Files" : "Agregar adjunto desd Archivos",
+    "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "Delete" : "Borrar",
     "Import into calendar" : "Importar al calendario",
     "Download attachment" : "Descargar adjunto",
-    "Save to Files" : "Guardar a Archivos"
+    "Save to Files" : "Guardar a Archivos",
+    "Choose a folder to store the attachment in" : "Seleccciona la carpeta en la cual almacenar el adjunto",
+    "Save all to Files" : "Guardar todo a Archivos",
+    "The images have been blocked to protect your privacy." : "Las imágenes han sido bloqueadas para proteger tu privacidad. ",
+    "New message" : "Mensaje nuevo",
+    "Settings" : "Configuraciones ",
+    "Speed up your Mail experience with these quick shortcuts." : "Haz más rápida tu experiencia de Correo con estos atajos rápidos. ",
+    "Compose new message" : "Escribir mensaje nuevo",
+    "Newer message" : "Mensaje más nuevo",
+    "Older message" : "Mensaje más antiguo",
+    "Toggle star" : "Alternar favoritos",
+    "Toggle unread" : "Alternar no leídos",
+    "Search" : "Buscar",
+    "Refresh" : "Actualizar",
+    "Connect your mail account" : "Conecta tu cuenta de correo",
+    "Show all folders" : "Mostrar todas las carpetas",
+    "Collapse folders" : "Compactar carpetas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaje nuevo \nde {from}","%n mensajes nuevos \nde {from}"],
+    "Nextcloud Mail" : "Correo Nextcloud",
+    "All inboxes" : "Todos los buzones de entrada",
+    "Could not load {tag}{name}{endtag}" : "No fue posible cargar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Se presentó un problema al cargar  {tag}{name}{endtag}",
+    "Error loading message" : "Se presentó un error al cargar el mensaje",
+    "Forwarding to %s" : "Reenviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Haz click aqui si no eres redireccionado automáticamente dentro de los siguietes segundos. ",
+    "Redirect" : "Redireccionar",
+    "The link leads to %s" : "La liga lleva a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si no quieres visitar esa página, puedes regresar a <a href=\"%s\">Correo</a>.",
+    "Continue to %s" : "Continuar a %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/et_EE.js b/l10n/et_EE.js
index db3334290..235a31e99 100644
--- a/l10n/et_EE.js
+++ b/l10n/et_EE.js
@@ -2,34 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Kirjad",
-    "Loading accounts" : "Kontode laadimine",
-    "Error while loading the accounts." : "Viga kontode laadimisel",
-    "Can not load this folder." : "Seda kausta ei saa laadida.",
-    "Error while deleting message." : "Tõrge sõnumi kustutamisel.",
-    "Forwarded message" : "Edastatud sõnum",
-    "Choose a folder to store the attachment in" : "Vali kaust, kuhu manus salvestada",
-    "Attachments saved to Files." : "Manused on salvestatud failidesse.",
-    "Attachment saved to Files." : "Manus on salvestatud failidesse.",
-    "Error while saving attachments to Files." : "Viga manuste salvestamisel failidesse.",
-    "Error while saving attachment to Files." : "Viga manuse salvestamisel failidesse.",
-    "Unknown error" : "Tundmatu viga",
-    "All inboxes" : "Kõik postkastid",
-    "you" : "sina",
-    "Send message to {email}" : "Saada kiri aadressile {email}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "Save" : "Salvesta",
-    "Saved" : "Salvestatud",
-    "Show all folders" : "Näita kõiki kaustu",
-    "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",
-    "Opening HTML drafts is not supported yet." : "HTML mustandite avamine pole veel toetatud.",
-    "& others" : "& muud",
-    "Error while loading messages." : "Tõrge sõnumite laadimisel.",
     "Inbox" : "Saaabuvad",
     "Sent" : "Saadetud",
     "Drafts" : "Mustandid",
@@ -41,21 +13,6 @@ OC.L10N.register(
     "Auto detect failed. Please use manual mode." : "Automaatne tuvastus ebaõnnestus. Palun proovi käsitsi.",
     "Creating account failed: " : "Konto loomine ebaõnnestus:",
     "Delete permanently" : "Kustuta jäädavalt",
-    "Error loading message" : "Tõrge kirja laadimisel",
-    "Settings" : "Seaded",
-    "Forwarding to %s" : "Edasta %s",
-    "Delete account" : "Kustuta konto",
-    "Try again" : "Proovi uuesti",
-    "New message" : "Uus sõnum",
-    "Account Settings" : "Konto seaded",
-    "Aliases" : "Aliased",
-    "Mail address" : "E-posti aadress",
-    "Display Name" : "Kuvatav nimi",
-    "Account" : "Konto",
-    "Delete" : "Kustuta",
-    "Keyboard shortcuts" : "Klaviatuuri otseteed",
-    "Search" : "Otsi",
-    "Refresh" : "Värskenda",
     "Name" : "Nimi",
     "Mail Address" : "E-posti aadress",
     "Password" : "Parool",
@@ -69,10 +26,26 @@ OC.L10N.register(
     "SMTP User" : "SMTP kasutaja",
     "SMTP Password" : "SMTP parool",
     "Connect" : "Ühenda",
+    "Keyboard shortcuts" : "Klaviatuuri otseteed",
     "from" : "saatja",
     "to" : "saaja",
     "cc" : "cc",
     "bcc" : "bcc",
-    "Subject" : "Teema"
+    "Subject" : "Teema",
+    "Sending …" : "Saadan ...",
+    "Message sent!" : "Sõnum on saadetud!",
+    "Send" : "Saada",
+    "Choose a file to add as attachment" : "Vali fail, mida manustada",
+    "Delete" : "Kustuta",
+    "Choose a folder to store the attachment in" : "Vali kaust, kuhu manus salvestada",
+    "New message" : "Uus sõnum",
+    "Settings" : "Seaded",
+    "Search" : "Otsi",
+    "Refresh" : "Värskenda",
+    "Show all folders" : "Näita kõiki kaustu",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "All inboxes" : "Kõik postkastid",
+    "Error loading message" : "Tõrge kirja laadimisel",
+    "Forwarding to %s" : "Edasta %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/et_EE.json b/l10n/et_EE.json
index 017706719..4e3c9b706 100644
--- a/l10n/et_EE.json
+++ b/l10n/et_EE.json
@@ -1,33 +1,5 @@
 { "translations": {
     "Mail" : "Kirjad",
-    "Loading accounts" : "Kontode laadimine",
-    "Error while loading the accounts." : "Viga kontode laadimisel",
-    "Can not load this folder." : "Seda kausta ei saa laadida.",
-    "Error while deleting message." : "Tõrge sõnumi kustutamisel.",
-    "Forwarded message" : "Edastatud sõnum",
-    "Choose a folder to store the attachment in" : "Vali kaust, kuhu manus salvestada",
-    "Attachments saved to Files." : "Manused on salvestatud failidesse.",
-    "Attachment saved to Files." : "Manus on salvestatud failidesse.",
-    "Error while saving attachments to Files." : "Viga manuste salvestamisel failidesse.",
-    "Error while saving attachment to Files." : "Viga manuse salvestamisel failidesse.",
-    "Unknown error" : "Tundmatu viga",
-    "All inboxes" : "Kõik postkastid",
-    "you" : "sina",
-    "Send message to {email}" : "Saada kiri aadressile {email}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "Save" : "Salvesta",
-    "Saved" : "Salvestatud",
-    "Show all folders" : "Näita kõiki kaustu",
-    "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",
-    "Opening HTML drafts is not supported yet." : "HTML mustandite avamine pole veel toetatud.",
-    "& others" : "& muud",
-    "Error while loading messages." : "Tõrge sõnumite laadimisel.",
     "Inbox" : "Saaabuvad",
     "Sent" : "Saadetud",
     "Drafts" : "Mustandid",
@@ -39,21 +11,6 @@
     "Auto detect failed. Please use manual mode." : "Automaatne tuvastus ebaõnnestus. Palun proovi käsitsi.",
     "Creating account failed: " : "Konto loomine ebaõnnestus:",
     "Delete permanently" : "Kustuta jäädavalt",
-    "Error loading message" : "Tõrge kirja laadimisel",
-    "Settings" : "Seaded",
-    "Forwarding to %s" : "Edasta %s",
-    "Delete account" : "Kustuta konto",
-    "Try again" : "Proovi uuesti",
-    "New message" : "Uus sõnum",
-    "Account Settings" : "Konto seaded",
-    "Aliases" : "Aliased",
-    "Mail address" : "E-posti aadress",
-    "Display Name" : "Kuvatav nimi",
-    "Account" : "Konto",
-    "Delete" : "Kustuta",
-    "Keyboard shortcuts" : "Klaviatuuri otseteed",
-    "Search" : "Otsi",
-    "Refresh" : "Värskenda",
     "Name" : "Nimi",
     "Mail Address" : "E-posti aadress",
     "Password" : "Parool",
@@ -67,10 +24,26 @@
     "SMTP User" : "SMTP kasutaja",
     "SMTP Password" : "SMTP parool",
     "Connect" : "Ühenda",
+    "Keyboard shortcuts" : "Klaviatuuri otseteed",
     "from" : "saatja",
     "to" : "saaja",
     "cc" : "cc",
     "bcc" : "bcc",
-    "Subject" : "Teema"
+    "Subject" : "Teema",
+    "Sending …" : "Saadan ...",
+    "Message sent!" : "Sõnum on saadetud!",
+    "Send" : "Saada",
+    "Choose a file to add as attachment" : "Vali fail, mida manustada",
+    "Delete" : "Kustuta",
+    "Choose a folder to store the attachment in" : "Vali kaust, kuhu manus salvestada",
+    "New message" : "Uus sõnum",
+    "Settings" : "Seaded",
+    "Search" : "Otsi",
+    "Refresh" : "Värskenda",
+    "Show all folders" : "Näita kõiki kaustu",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "All inboxes" : "Kõik postkastid",
+    "Error loading message" : "Tõrge kirja laadimisel",
+    "Forwarding to %s" : "Edasta %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/eu.js b/l10n/eu.js
index 965dffff3..33d117127 100644
--- a/l10n/eu.js
+++ b/l10n/eu.js
@@ -2,52 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Posta",
-    "Loading accounts" : "Kontuak kargatzen",
-    "Error while loading the accounts." : "Errorea kontuak kargatzean.",
-    "Can not load this folder." : "Ezin da karpeta kargatu",
-    "Searching for {query}" : "{query} bilatzen",
-    "Error while deleting message." : "Akatsa mezua ezabatzerakoan.",
-    "Forwarded message" : "Berbideratutako mesua",
-    "Choose a folder to store the attachment in" : "Hautatu karpeta bat eranskina gordetzeko",
-    "Attachments saved to Files." : "Eranskinak gordeta Fitxategiak-en.",
-    "Attachment saved to Files." : "Eranskina gordeta Fitxategiak-en.",
-    "Error while saving attachments to Files." : "Akatsa eranskinak Fitxategian gordetzerakoan.",
-    "Error while saving attachment to Files." : "Akatsa eranskina Fitxategian gordetzerakoan.",
-    "Message flag could not be set." : "Mezuaren bandera ezin izan da ezarri.",
-    "Could not move message." : "Ezin izan da mezua mugitu.",
-    "Invalid account" : "Baliogabeko kontua",
-    "Invalid folder" : "Baliogabeko karpeta",
-    "Error while creating the account: " : "Errorea kontua sortzean:",
-    "Unknown error" : "Akats ezezaguna",
-    "All inboxes" : "Postontzi guztiak",
-    "you" : "zu",
-    "Send message to {email}" : "{email}-ri mezua bidali",
-    "Could not load {tag}{name}{endtag}" : "Ezin izan da {tag}{name}{endtag} kargatu",
-    "There was a problem loading {tag}{name}{endtag}" : "Akats bat egon da {tag}{name}{endtag} kargatzerakoan",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mezu berri \njaso dituzu {from}-etik","%n mezu berri \njaso dituzu {from}-etik"],
-    "Nextcloud Mail" : "Nextcloud eposta",
-    "Save" : "Gorde",
-    "Saved" : "Gordeta",
-    "Show all folders" : "Erakutsi karpeta guztiak",
-    "Collapse folders" : "Bildu karpetak",
-    "Error while deleting account." : "Akatsa kontua ezabatzerakoan.",
-    "Choose a file to add as attachment" : "Hautatu fitxategia gehitzeko eranskin gisa",
-    "An error occurred while uploading {fname}" : "{fname} kargatzean errorea",
-    "Reply" : "Erantzun",
-    "Send" : "Bidali",
-    "Sending …" : "Bidaltzen...",
-    "Message sent!" : "Mezua bidali egin da!",
-    "Server error" : "Zerbitzari akatsa",
-    "An unknown error occurred" : "Akats ezezagun bat gertatu da",
-    "Opening HTML drafts is not supported yet." : "HTML zirriborroak irekitzea ez da oraindik onartzen.",
-    "No writable calendars found" : "Ez da idazgai den egunkaririk aurkitu",
-    "Error while importing the calendar event" : "Akatsa egutegiko gertakaria importatzerakoan",
-    "Error while downloading calendar event" : "Akatsa egutegiko gertakaria deskargatzerakoan",
-    "& others" : "eta bestelakoak",
-    "Error while loading messages." : "Akatsa mezuak kargatzerakoan.",
-    "Error while refreshing messages." : "Errorea mezuak birkargatzean",
-    "Setting up your account" : "Kontua konfiguratzen",
     "Inbox" : "Sarrera ontzia",
     "Sent" : "Bidalia",
     "Drafts" : "Zirriborroak",
@@ -59,65 +13,66 @@ OC.L10N.register(
     "Auto detect failed. Please use manual mode." : "Autodetekzioa huts egin du. Erabili eskuzko modua",
     "Creating account failed: " : "Huts egin du kontua sortzerakoan:",
     "Delete permanently" : "Ezabatu betirako",
-    "Error loading message" : "Akatsa mezua kargatzerakoan",
-    "Settings" : "Ezarpenak",
-    "Forwarding to %s" : "%s birbidaltzen",
-    "Click here if you are not automatically redirected within the next few seconds." : "Sakatu hemen hurrengo segunduetan automatikoki birbideratzen ez bada.",
-    "Redirect" : "Birbideratu",
-    "The link leads to %s" : "Estekak 1%s-ra apuntatzen du",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Ez baduzu webgune horretara joan nahi <a href=\"%s\">Mail</a>  webgunera itzul zaitezke",
-    "Continue to %s" : "1%s-ra jarraitu",
-    "Delete account" : "Kontua borratu",
-    "Try again" : "Saiatu berriz",
-    "New message" : "Mezu berria",
-    "Account Settings" : "Kontuaren ezarpenak",
-    "Aliases" : "Aliasak",
-    "Mail address" : "Eposta helbidea",
-    "Display Name" : "Izena erakutsi",
-    "Account" : "Kontua",
-    "Delete" : "Ezabatu",
-    "Keyboard shortcuts" : "Teklatuaren lasterbideak",
-    "Speed up your Mail experience with these quick shortcuts." : "Zure Mail erabilpena azkartu lasterbide azkar hauekin",
-    "Compose new message" : "Mezu berria idatzi",
-    "Newer message" : "Mezu berriagoa",
-    "Older message" : "Mezu zaharragoa",
-    "Toggle star" : "Izarra aldatu",
-    "Toggle unread" : "Irakurria aldatu",
-    "Search" : "Bilatu",
-    "Refresh" : "Birkargatu",
-    "Connect your mail account" : "Konektatu zure eposta kontua",
+    "IMAP web client" : "IMAP web bezeroa",
     "Name" : "Izena",
     "Mail Address" : "Eposta helbidea",
     "Password" : "Pasahitza",
-    "Manual configuration" : "Eskuzko konfigurazioa",
     "IMAP Host" : "IMAP ostalaria",
-    "IMAP security" : "IMAP segurtasuna",
     "None" : "Ezer",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP portua",
     "IMAP User" : "IMAP erabiltzailea",
     "IMAP Password" : "IMAP pasahitza",
     "SMTP Host" : "SMTP ostalaria",
-    "SMTP security" : "SMTP segurtasuna",
     "SMTP Port" : "SMTP portua",
     "SMTP User" : "SMTP erabiltzailea",
     "SMTP Password" : "SMTP pasahitza",
     "Connect" : "Konektatu",
+    "Add mail account" : "Eposta helbidea gehitu",
+    "Keyboard shortcuts" : "Teklatuaren lasterbideak",
     "from" : "Nondik",
     "to" : "nora",
     "cc" : "cc",
     "bcc" : "bcc",
     "Subject" : "Gaia",
-    "Save all to Files" : "Dena fitxategitan gorde",
-    "Add mail account" : "Eposta helbidea gehitu",
-    "No search results for" : "Bilaketak ez du emaitzarik eman:",
-    "The images have been blocked to protect your privacy." : "Irudiak blokeatu dira zure segurtasunerako",
-    "Show images from this sender" : "Bidaltzaile honen irudiak ikusi",
-    "Forward" : "Birbidali",
+    "Sending …" : "Bidaltzen...",
+    "Message sent!" : "Mezua bidali egin da!",
+    "Send" : "Bidali",
     "Upload attachment" : "Eranskina igo",
     "Add attachment from Files" : "Eranskina gehitu fitxategitik",
+    "Choose a file to add as attachment" : "Hautatu fitxategia gehitzeko eranskin gisa",
+    "Delete" : "Ezabatu",
     "Import into calendar" : "Egutegian inportatu",
     "Download attachment" : "Eranskina jaitsi",
-    "Save to Files" : "Fitxategitan gorde"
+    "Save to Files" : "Fitxategitan gorde",
+    "Choose a folder to store the attachment in" : "Hautatu karpeta bat eranskina gordetzeko",
+    "Save all to Files" : "Dena fitxategitan gorde",
+    "The images have been blocked to protect your privacy." : "Irudiak blokeatu dira zure segurtasunerako",
+    "New message" : "Mezu berria",
+    "Settings" : "Ezarpenak",
+    "Speed up your Mail experience with these quick shortcuts." : "Zure Mail erabilpena azkartu lasterbide azkar hauekin",
+    "Compose new message" : "Mezu berria idatzi",
+    "Newer message" : "Mezu berriagoa",
+    "Older message" : "Mezu zaharragoa",
+    "Toggle star" : "Izarra aldatu",
+    "Toggle unread" : "Irakurria aldatu",
+    "Search" : "Bilatu",
+    "Refresh" : "Birkargatu",
+    "Connect your mail account" : "Konektatu zure eposta kontua",
+    "Show all folders" : "Erakutsi karpeta guztiak",
+    "Collapse folders" : "Bildu karpetak",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mezu berri \njaso dituzu {from}-etik","%n mezu berri \njaso dituzu {from}-etik"],
+    "Nextcloud Mail" : "Nextcloud eposta",
+    "All inboxes" : "Postontzi guztiak",
+    "Could not load {tag}{name}{endtag}" : "Ezin izan da {tag}{name}{endtag} kargatu",
+    "There was a problem loading {tag}{name}{endtag}" : "Akats bat egon da {tag}{name}{endtag} kargatzerakoan",
+    "Error loading message" : "Akatsa mezua kargatzerakoan",
+    "Forwarding to %s" : "%s birbidaltzen",
+    "Click here if you are not automatically redirected within the next few seconds." : "Sakatu hemen hurrengo segunduetan automatikoki birbideratzen ez bada.",
+    "Redirect" : "Birbideratu",
+    "The link leads to %s" : "Estekak 1%s-ra apuntatzen du",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Ez baduzu webgune horretara joan nahi <a href=\"%s\">Mail</a>  webgunera itzul zaitezke",
+    "Continue to %s" : "1%s-ra jarraitu"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/eu.json b/l10n/eu.json
index 3cf65b5b9..5b3ce46af 100644
--- a/l10n/eu.json
+++ b/l10n/eu.json
@@ -1,51 +1,5 @@
 { "translations": {
     "Mail" : "Posta",
-    "Loading accounts" : "Kontuak kargatzen",
-    "Error while loading the accounts." : "Errorea kontuak kargatzean.",
-    "Can not load this folder." : "Ezin da karpeta kargatu",
-    "Searching for {query}" : "{query} bilatzen",
-    "Error while deleting message." : "Akatsa mezua ezabatzerakoan.",
-    "Forwarded message" : "Berbideratutako mesua",
-    "Choose a folder to store the attachment in" : "Hautatu karpeta bat eranskina gordetzeko",
-    "Attachments saved to Files." : "Eranskinak gordeta Fitxategiak-en.",
-    "Attachment saved to Files." : "Eranskina gordeta Fitxategiak-en.",
-    "Error while saving attachments to Files." : "Akatsa eranskinak Fitxategian gordetzerakoan.",
-    "Error while saving attachment to Files." : "Akatsa eranskina Fitxategian gordetzerakoan.",
-    "Message flag could not be set." : "Mezuaren bandera ezin izan da ezarri.",
-    "Could not move message." : "Ezin izan da mezua mugitu.",
-    "Invalid account" : "Baliogabeko kontua",
-    "Invalid folder" : "Baliogabeko karpeta",
-    "Error while creating the account: " : "Errorea kontua sortzean:",
-    "Unknown error" : "Akats ezezaguna",
-    "All inboxes" : "Postontzi guztiak",
-    "you" : "zu",
-    "Send message to {email}" : "{email}-ri mezua bidali",
-    "Could not load {tag}{name}{endtag}" : "Ezin izan da {tag}{name}{endtag} kargatu",
-    "There was a problem loading {tag}{name}{endtag}" : "Akats bat egon da {tag}{name}{endtag} kargatzerakoan",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mezu berri \njaso dituzu {from}-etik","%n mezu berri \njaso dituzu {from}-etik"],
-    "Nextcloud Mail" : "Nextcloud eposta",
-    "Save" : "Gorde",
-    "Saved" : "Gordeta",
-    "Show all folders" : "Erakutsi karpeta guztiak",
-    "Collapse folders" : "Bildu karpetak",
-    "Error while deleting account." : "Akatsa kontua ezabatzerakoan.",
-    "Choose a file to add as attachment" : "Hautatu fitxategia gehitzeko eranskin gisa",
-    "An error occurred while uploading {fname}" : "{fname} kargatzean errorea",
-    "Reply" : "Erantzun",
-    "Send" : "Bidali",
-    "Sending …" : "Bidaltzen...",
-    "Message sent!" : "Mezua bidali egin da!",
-    "Server error" : "Zerbitzari akatsa",
-    "An unknown error occurred" : "Akats ezezagun bat gertatu da",
-    "Opening HTML drafts is not supported yet." : "HTML zirriborroak irekitzea ez da oraindik onartzen.",
-    "No writable calendars found" : "Ez da idazgai den egunkaririk aurkitu",
-    "Error while importing the calendar event" : "Akatsa egutegiko gertakaria importatzerakoan",
-    "Error while downloading calendar event" : "Akatsa egutegiko gertakaria deskargatzerakoan",
-    "& others" : "eta bestelakoak",
-    "Error while loading messages." : "Akatsa mezuak kargatzerakoan.",
-    "Error while refreshing messages." : "Errorea mezuak birkargatzean",
-    "Setting up your account" : "Kontua konfiguratzen",
     "Inbox" : "Sarrera ontzia",
     "Sent" : "Bidalia",
     "Drafts" : "Zirriborroak",
@@ -57,65 +11,66 @@
     "Auto detect failed. Please use manual mode." : "Autodetekzioa huts egin du. Erabili eskuzko modua",
     "Creating account failed: " : "Huts egin du kontua sortzerakoan:",
     "Delete permanently" : "Ezabatu betirako",
-    "Error loading message" : "Akatsa mezua kargatzerakoan",
-    "Settings" : "Ezarpenak",
-    "Forwarding to %s" : "%s birbidaltzen",
-    "Click here if you are not automatically redirected within the next few seconds." : "Sakatu hemen hurrengo segunduetan automatikoki birbideratzen ez bada.",
-    "Redirect" : "Birbideratu",
-    "The link leads to %s" : "Estekak 1%s-ra apuntatzen du",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Ez baduzu webgune horretara joan nahi <a href=\"%s\">Mail</a>  webgunera itzul zaitezke",
-    "Continue to %s" : "1%s-ra jarraitu",
-    "Delete account" : "Kontua borratu",
-    "Try again" : "Saiatu berriz",
-    "New message" : "Mezu berria",
-    "Account Settings" : "Kontuaren ezarpenak",
-    "Aliases" : "Aliasak",
-    "Mail address" : "Eposta helbidea",
-    "Display Name" : "Izena erakutsi",
-    "Account" : "Kontua",
-    "Delete" : "Ezabatu",
-    "Keyboard shortcuts" : "Teklatuaren lasterbideak",
-    "Speed up your Mail experience with these quick shortcuts." : "Zure Mail erabilpena azkartu lasterbide azkar hauekin",
-    "Compose new message" : "Mezu berria idatzi",
-    "Newer message" : "Mezu berriagoa",
-    "Older message" : "Mezu zaharragoa",
-    "Toggle star" : "Izarra aldatu",
-    "Toggle unread" : "Irakurria aldatu",
-    "Search" : "Bilatu",
-    "Refresh" : "Birkargatu",
-    "Connect your mail account" : "Konektatu zure eposta kontua",
+    "IMAP web client" : "IMAP web bezeroa",
     "Name" : "Izena",
     "Mail Address" : "Eposta helbidea",
     "Password" : "Pasahitza",
-    "Manual configuration" : "Eskuzko konfigurazioa",
     "IMAP Host" : "IMAP ostalaria",
-    "IMAP security" : "IMAP segurtasuna",
     "None" : "Ezer",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP portua",
     "IMAP User" : "IMAP erabiltzailea",
     "IMAP Password" : "IMAP pasahitza",
     "SMTP Host" : "SMTP ostalaria",
-    "SMTP security" : "SMTP segurtasuna",
     "SMTP Port" : "SMTP portua",
     "SMTP User" : "SMTP erabiltzailea",
     "SMTP Password" : "SMTP pasahitza",
     "Connect" : "Konektatu",
+    "Add mail account" : "Eposta helbidea gehitu",
+    "Keyboard shortcuts" : "Teklatuaren lasterbideak",
     "from" : "Nondik",
     "to" : "nora",
     "cc" : "cc",
     "bcc" : "bcc",
     "Subject" : "Gaia",
-    "Save all to Files" : "Dena fitxategitan gorde",
-    "Add mail account" : "Eposta helbidea gehitu",
-    "No search results for" : "Bilaketak ez du emaitzarik eman:",
-    "The images have been blocked to protect your privacy." : "Irudiak blokeatu dira zure segurtasunerako",
-    "Show images from this sender" : "Bidaltzaile honen irudiak ikusi",
-    "Forward" : "Birbidali",
+    "Sending …" : "Bidaltzen...",
+    "Message sent!" : "Mezua bidali egin da!",
+    "Send" : "Bidali",
     "Upload attachment" : "Eranskina igo",
     "Add attachment from Files" : "Eranskina gehitu fitxategitik",
+    "Choose a file to add as attachment" : "Hautatu fitxategia gehitzeko eranskin gisa",
+    "Delete" : "Ezabatu",
     "Import into calendar" : "Egutegian inportatu",
     "Download attachment" : "Eranskina jaitsi",
-    "Save to Files" : "Fitxategitan gorde"
+    "Save to Files" : "Fitxategitan gorde",
+    "Choose a folder to store the attachment in" : "Hautatu karpeta bat eranskina gordetzeko",
+    "Save all to Files" : "Dena fitxategitan gorde",
+    "The images have been blocked to protect your privacy." : "Irudiak blokeatu dira zure segurtasunerako",
+    "New message" : "Mezu berria",
+    "Settings" : "Ezarpenak",
+    "Speed up your Mail experience with these quick shortcuts." : "Zure Mail erabilpena azkartu lasterbide azkar hauekin",
+    "Compose new message" : "Mezu berria idatzi",
+    "Newer message" : "Mezu berriagoa",
+    "Older message" : "Mezu zaharragoa",
+    "Toggle star" : "Izarra aldatu",
+    "Toggle unread" : "Irakurria aldatu",
+    "Search" : "Bilatu",
+    "Refresh" : "Birkargatu",
+    "Connect your mail account" : "Konektatu zure eposta kontua",
+    "Show all folders" : "Erakutsi karpeta guztiak",
+    "Collapse folders" : "Bildu karpetak",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mezu berri \njaso dituzu {from}-etik","%n mezu berri \njaso dituzu {from}-etik"],
+    "Nextcloud Mail" : "Nextcloud eposta",
+    "All inboxes" : "Postontzi guztiak",
+    "Could not load {tag}{name}{endtag}" : "Ezin izan da {tag}{name}{endtag} kargatu",
+    "There was a problem loading {tag}{name}{endtag}" : "Akats bat egon da {tag}{name}{endtag} kargatzerakoan",
+    "Error loading message" : "Akatsa mezua kargatzerakoan",
+    "Forwarding to %s" : "%s birbidaltzen",
+    "Click here if you are not automatically redirected within the next few seconds." : "Sakatu hemen hurrengo segunduetan automatikoki birbideratzen ez bada.",
+    "Redirect" : "Birbideratu",
+    "The link leads to %s" : "Estekak 1%s-ra apuntatzen du",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Ez baduzu webgune horretara joan nahi <a href=\"%s\">Mail</a>  webgunera itzul zaitezke",
+    "Continue to %s" : "1%s-ra jarraitu"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/fi.js b/l10n/fi.js
index 641b8f393..4b12905cf 100644
--- a/l10n/fi.js
+++ b/l10n/fi.js
@@ -2,56 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Sähköposti",
-    "Loading accounts" : "Ladataan tilejä",
-    "Error while loading the accounts." : "Virhe tilejä ladatessa.",
-    "Can not load this folder." : "Tätä kansiota ei voitu ladata.",
-    "Searching for {query}" : "Etsitään tuloksia haulle {query}",
-    "Error while deleting message." : "Virhe viestiä poistaessa.",
-    "Forwarded message" : "Edelleenlähetetty viesti",
-    "Choose a folder to store the attachment in" : "Valitse kansio liitetiedoston tallentamiselle",
-    "Attachments saved to Files." : "Liitteet tallennettu tiedostoihin.",
-    "Attachment saved to Files." : "Liite tallennettu tiedostoihin.",
-    "Error while saving attachments to Files." : "Virhe tallennettaessa liitteitä tiedostoihin.",
-    "Error while saving attachment to Files." : "Virhe tallennettaessa liitettä tiedostoihin.",
-    "Message flag could not be set." : "Viestin lippua ei voitu asettaa.",
-    "Could not move message." : "Viestiä ei voitu siirtää.",
-    "Invalid account" : "Virheellinen tili",
-    "Invalid folder" : "Virheellinen kansio",
-    "Error while creating the account: " : "Virhe tiliä luotaessa: ",
-    "Unknown error" : "Tuntematon virhe",
-    "Error while updating the account: " : "Virhe päivittäessä tiliä:",
-    "All inboxes" : "Kaikki saapuneiden laatikot",
-    "you" : "sinä",
-    "Send message to {email}" : "Lähetä viesti osoitteeseen {email}",
-    "Could not load {tag}{name}{endtag}" : "{tag}{name}{endtag} ei voitu ladata",
-    "There was a problem loading {tag}{name}{endtag}" : "Ladattaessa {tag}{name}{endtag} ilmeni ongelma",
-    "Could not load your message" : "Viestiä ei voitu ladata",
-    "Could not load the desired message" : "Haluttua viestiä ei voitu ladata",
-    "Could not load the message" : "Viestiä ei voitu ladata",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n uusi viesti \nlähettäjältä {from}","%n uutta viestiä \nlähettäjältä {from}"],
-    "Nextcloud Mail" : "Nextcloud-sähköposti",
-    "Save" : "Tallenna",
-    "Saved" : "Tallennettu",
-    "Show all folders" : "Näytä kaikki kansiot",
-    "Collapse folders" : "Supista kansiot",
-    "Error while deleting account." : "Virhe tiliä poistaessa.",
-    "Choose a file to add as attachment" : "Valitse liitteeksi lisättävä tiedosto",
-    "An error occurred while uploading {fname}" : "Virhe lähettäessä tiedostoa {fname}",
-    "Reply" : "Vastaa",
-    "Send" : "Lähetä",
-    "Sending …" : "Lähetetään…",
-    "Message sent!" : "Viesti lähetetty!",
-    "Server error" : "Palvelinvirhe",
-    "An unknown error occurred" : "Tapahtui tuntematon virhe",
-    "Opening HTML drafts is not supported yet." : "HTML-luonnosten avaaminen ei ole vielä tuettu ominaisuus.",
-    "No writable calendars found" : "Kirjoitusoikeudella olevia kalentereita ei löytynyt",
-    "Error while importing the calendar event" : "Virhe kalenteritapahtumaa tuotaessa",
-    "Error while downloading calendar event" : "Virhe kalenteritapahtumaa ladatessa",
-    "& others" : "& muut",
-    "Error while loading messages." : "Virhe viestejä ladatessa.",
-    "Error while refreshing messages." : "Virhe viestejä päivittäessä.",
-    "Setting up your account" : "Määritetään tiliäsi",
     "Inbox" : "Saapuneet",
     "Sent" : "Lähetetyt",
     "Drafts" : "Luonnokset",
@@ -66,69 +16,70 @@ OC.L10N.register(
     "Delete permanently" : "Poista pysyvästi",
     "IMAP web client" : "IMAP-verkkoasiakas",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Helppokäyttöinen sähköpostisovellus, joka yhdistää palvelimiin IMAP- ja SMTP-protokollia käyttäen.",
-    "Error loading message" : "Virhe viestiä ladatessa",
-    "Settings" : "Asetukset",
-    "Forwarding to %s" : "Välitä viesti %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Klikkaa jos sinua ei uudelleenohjata automaattisesti muutamaan sekuntiin.",
-    "Redirect" : "Uudelleenohjaus",
-    "The link leads to %s" : "Tämä linkki johtaa kohteeseen %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Jos et halua vierailla kyseisellä sivulla, voit palata <a href=\"%s\">sähköpostiin</a>.",
-    "Continue to %s" : "Jatka sivulle %s",
-    "Delete account" : "Poista tili",
-    "Try again" : "Yritä uudelleen",
-    "New message" : "Uusi viesti",
-    "Account Settings" : "Tilin asetukset",
-    "Aliases" : "Aliakset",
-    "Mail address" : "Sähköpostiosoite",
-    "Display Name" : "Näyttönimi",
-    "Account" : "Tili",
-    "Toggle read" : "Merkitse luetuksi/lukemattomaksi",
-    "Delete" : "Poista",
-    "Keyboard shortcuts" : "Pikanäppäimet",
-    "Speed up your Mail experience with these quick shortcuts." : "Nopeuta sähköpostikokemustasi näillä pikanäppäimillä.",
-    "Compose new message" : "Uusi viesti",
-    "Newer message" : "Uudempi",
-    "Older message" : "Vanhempi viesti",
-    "Toggle star" : "Lisää/poista tähti",
-    "Toggle unread" : "Merkitse luetuksi/lukemattomaksi",
-    "Search" : "Etsi",
-    "Refresh" : "Päivitä",
-    "Connect your mail account" : "Yhdistä sähköpostitilisi",
     "Name" : "Nimi",
     "Mail Address" : "Sähköpostiosoite",
     "Password" : "Salasana",
-    "Manual configuration" : "Manuaalinen konfiguraatio",
     "IMAP Host" : "IMAP-palvelin",
-    "IMAP security" : "IMAP-yhteyden suojaus",
     "None" : "Ei mitään",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP-portti",
     "IMAP User" : "IMAP-käyttäjä",
     "IMAP Password" : "IMAP-salasana",
     "SMTP Host" : "SMTP-palvelin",
-    "SMTP security" : "SMTP-yhteyden suojaus",
     "SMTP Port" : "SMTP-portti",
     "SMTP User" : "SMTP-käyttäjä",
     "SMTP Password" : "SMTP-salasana",
     "Connect" : "Yhdistä",
+    "Add mail account" : "Lisää sähköpostitili",
+    "Use Gravatar and favicon avatars" : "Käytä Gravatar- ja favicon-avatareja",
+    "Keyboard shortcuts" : "Pikanäppäimet",
     "from" : "Lähettäjä",
     "to" : "Vastaanottaja",
     "cc" : "Kopio",
     "bcc" : "Piilokopio",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Huomioi, että viesti saapui noreply-osoitteesta (ns. älä vastaa -osoite), joten vastausviestiäsi tuskin luetaan.",
     "Subject" : "Aihe",
-    "Save all to Files" : "Tallenna kaikki tiedostoihin",
-    "Add mail account" : "Lisää sähköpostitili",
-    "Use Gravatar and favicon avatars" : "Käytä Gravatar- ja favicon-avatareja",
-    "No search results for" : "Ei tuloksia haulle",
-    "The images have been blocked to protect your privacy." : "Kuvat estettiin yksityisyytesi suojelemiseksi.",
-    "Show images from this sender" : "Näytä kuvat tältä lähettäjältä",
-    "Forward" : "Välitä",
-    "No messages in this folder" : "Tässä kansiossa ei ole viestejä",
+    "Sending …" : "Lähetetään…",
+    "Message sent!" : "Viesti lähetetty!",
+    "Send" : "Lähetä",
     "Upload attachment" : "Lähetä liite",
     "Add attachment from Files" : "Lisää liitteitä tiedostosovelluksesta",
+    "Choose a file to add as attachment" : "Valitse liitteeksi lisättävä tiedosto",
+    "No messages in this folder" : "Tässä kansiossa ei ole viestejä",
+    "Delete" : "Poista",
+    "Could not load your message" : "Viestiä ei voitu ladata",
     "Import into calendar" : "Tuo kalenteriin",
     "Download attachment" : "Lataa liite",
-    "Save to Files" : "Tallenna tiedostoihin"
+    "Save to Files" : "Tallenna tiedostoihin",
+    "Choose a folder to store the attachment in" : "Valitse kansio liitetiedoston tallentamiselle",
+    "Save all to Files" : "Tallenna kaikki tiedostoihin",
+    "The images have been blocked to protect your privacy." : "Kuvat estettiin yksityisyytesi suojelemiseksi.",
+    "New message" : "Uusi viesti",
+    "Settings" : "Asetukset",
+    "Speed up your Mail experience with these quick shortcuts." : "Nopeuta sähköpostikokemustasi näillä pikanäppäimillä.",
+    "Compose new message" : "Uusi viesti",
+    "Newer message" : "Uudempi",
+    "Older message" : "Vanhempi viesti",
+    "Toggle star" : "Lisää/poista tähti",
+    "Toggle unread" : "Merkitse luetuksi/lukemattomaksi",
+    "Search" : "Etsi",
+    "Refresh" : "Päivitä",
+    "Connect your mail account" : "Yhdistä sähköpostitilisi",
+    "Show all folders" : "Näytä kaikki kansiot",
+    "Collapse folders" : "Supista kansiot",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n uusi viesti \nlähettäjältä {from}","%n uutta viestiä \nlähettäjältä {from}"],
+    "Nextcloud Mail" : "Nextcloud-sähköposti",
+    "All inboxes" : "Kaikki saapuneiden laatikot",
+    "Could not load {tag}{name}{endtag}" : "{tag}{name}{endtag} ei voitu ladata",
+    "There was a problem loading {tag}{name}{endtag}" : "Ladattaessa {tag}{name}{endtag} ilmeni ongelma",
+    "Could not load the desired message" : "Haluttua viestiä ei voitu ladata",
+    "Could not load the message" : "Viestiä ei voitu ladata",
+    "Error loading message" : "Virhe viestiä ladatessa",
+    "Forwarding to %s" : "Välitä viesti %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Klikkaa jos sinua ei uudelleenohjata automaattisesti muutamaan sekuntiin.",
+    "Redirect" : "Uudelleenohjaus",
+    "The link leads to %s" : "Tämä linkki johtaa kohteeseen %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Jos et halua vierailla kyseisellä sivulla, voit palata <a href=\"%s\">sähköpostiin</a>.",
+    "Continue to %s" : "Jatka sivulle %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/fi.json b/l10n/fi.json
index 1a313e62d..a34648a5a 100644
--- a/l10n/fi.json
+++ b/l10n/fi.json
@@ -1,55 +1,5 @@
 { "translations": {
     "Mail" : "Sähköposti",
-    "Loading accounts" : "Ladataan tilejä",
-    "Error while loading the accounts." : "Virhe tilejä ladatessa.",
-    "Can not load this folder." : "Tätä kansiota ei voitu ladata.",
-    "Searching for {query}" : "Etsitään tuloksia haulle {query}",
-    "Error while deleting message." : "Virhe viestiä poistaessa.",
-    "Forwarded message" : "Edelleenlähetetty viesti",
-    "Choose a folder to store the attachment in" : "Valitse kansio liitetiedoston tallentamiselle",
-    "Attachments saved to Files." : "Liitteet tallennettu tiedostoihin.",
-    "Attachment saved to Files." : "Liite tallennettu tiedostoihin.",
-    "Error while saving attachments to Files." : "Virhe tallennettaessa liitteitä tiedostoihin.",
-    "Error while saving attachment to Files." : "Virhe tallennettaessa liitettä tiedostoihin.",
-    "Message flag could not be set." : "Viestin lippua ei voitu asettaa.",
-    "Could not move message." : "Viestiä ei voitu siirtää.",
-    "Invalid account" : "Virheellinen tili",
-    "Invalid folder" : "Virheellinen kansio",
-    "Error while creating the account: " : "Virhe tiliä luotaessa: ",
-    "Unknown error" : "Tuntematon virhe",
-    "Error while updating the account: " : "Virhe päivittäessä tiliä:",
-    "All inboxes" : "Kaikki saapuneiden laatikot",
-    "you" : "sinä",
-    "Send message to {email}" : "Lähetä viesti osoitteeseen {email}",
-    "Could not load {tag}{name}{endtag}" : "{tag}{name}{endtag} ei voitu ladata",
-    "There was a problem loading {tag}{name}{endtag}" : "Ladattaessa {tag}{name}{endtag} ilmeni ongelma",
-    "Could not load your message" : "Viestiä ei voitu ladata",
-    "Could not load the desired message" : "Haluttua viestiä ei voitu ladata",
-    "Could not load the message" : "Viestiä ei voitu ladata",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n uusi viesti \nlähettäjältä {from}","%n uutta viestiä \nlähettäjältä {from}"],
-    "Nextcloud Mail" : "Nextcloud-sähköposti",
-    "Save" : "Tallenna",
-    "Saved" : "Tallennettu",
-    "Show all folders" : "Näytä kaikki kansiot",
-    "Collapse folders" : "Supista kansiot",
-    "Error while deleting account." : "Virhe tiliä poistaessa.",
-    "Choose a file to add as attachment" : "Valitse liitteeksi lisättävä tiedosto",
-    "An error occurred while uploading {fname}" : "Virhe lähettäessä tiedostoa {fname}",
-    "Reply" : "Vastaa",
-    "Send" : "Lähetä",
-    "Sending …" : "Lähetetään…",
-    "Message sent!" : "Viesti lähetetty!",
-    "Server error" : "Palvelinvirhe",
-    "An unknown error occurred" : "Tapahtui tuntematon virhe",
-    "Opening HTML drafts is not supported yet." : "HTML-luonnosten avaaminen ei ole vielä tuettu ominaisuus.",
-    "No writable calendars found" : "Kirjoitusoikeudella olevia kalentereita ei löytynyt",
-    "Error while importing the calendar event" : "Virhe kalenteritapahtumaa tuotaessa",
-    "Error while downloading calendar event" : "Virhe kalenteritapahtumaa ladatessa",
-    "& others" : "& muut",
-    "Error while loading messages." : "Virhe viestejä ladatessa.",
-    "Error while refreshing messages." : "Virhe viestejä päivittäessä.",
-    "Setting up your account" : "Määritetään tiliäsi",
     "Inbox" : "Saapuneet",
     "Sent" : "Lähetetyt",
     "Drafts" : "Luonnokset",
@@ -64,69 +14,70 @@
     "Delete permanently" : "Poista pysyvästi",
     "IMAP web client" : "IMAP-verkkoasiakas",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Helppokäyttöinen sähköpostisovellus, joka yhdistää palvelimiin IMAP- ja SMTP-protokollia käyttäen.",
-    "Error loading message" : "Virhe viestiä ladatessa",
-    "Settings" : "Asetukset",
-    "Forwarding to %s" : "Välitä viesti %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Klikkaa jos sinua ei uudelleenohjata automaattisesti muutamaan sekuntiin.",
-    "Redirect" : "Uudelleenohjaus",
-    "The link leads to %s" : "Tämä linkki johtaa kohteeseen %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Jos et halua vierailla kyseisellä sivulla, voit palata <a href=\"%s\">sähköpostiin</a>.",
-    "Continue to %s" : "Jatka sivulle %s",
-    "Delete account" : "Poista tili",
-    "Try again" : "Yritä uudelleen",
-    "New message" : "Uusi viesti",
-    "Account Settings" : "Tilin asetukset",
-    "Aliases" : "Aliakset",
-    "Mail address" : "Sähköpostiosoite",
-    "Display Name" : "Näyttönimi",
-    "Account" : "Tili",
-    "Toggle read" : "Merkitse luetuksi/lukemattomaksi",
-    "Delete" : "Poista",
-    "Keyboard shortcuts" : "Pikanäppäimet",
-    "Speed up your Mail experience with these quick shortcuts." : "Nopeuta sähköpostikokemustasi näillä pikanäppäimillä.",
-    "Compose new message" : "Uusi viesti",
-    "Newer message" : "Uudempi",
-    "Older message" : "Vanhempi viesti",
-    "Toggle star" : "Lisää/poista tähti",
-    "Toggle unread" : "Merkitse luetuksi/lukemattomaksi",
-    "Search" : "Etsi",
-    "Refresh" : "Päivitä",
-    "Connect your mail account" : "Yhdistä sähköpostitilisi",
     "Name" : "Nimi",
     "Mail Address" : "Sähköpostiosoite",
     "Password" : "Salasana",
-    "Manual configuration" : "Manuaalinen konfiguraatio",
     "IMAP Host" : "IMAP-palvelin",
-    "IMAP security" : "IMAP-yhteyden suojaus",
     "None" : "Ei mitään",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP-portti",
     "IMAP User" : "IMAP-käyttäjä",
     "IMAP Password" : "IMAP-salasana",
     "SMTP Host" : "SMTP-palvelin",
-    "SMTP security" : "SMTP-yhteyden suojaus",
     "SMTP Port" : "SMTP-portti",
     "SMTP User" : "SMTP-käyttäjä",
     "SMTP Password" : "SMTP-salasana",
     "Connect" : "Yhdistä",
+    "Add mail account" : "Lisää sähköpostitili",
+    "Use Gravatar and favicon avatars" : "Käytä Gravatar- ja favicon-avatareja",
+    "Keyboard shortcuts" : "Pikanäppäimet",
     "from" : "Lähettäjä",
     "to" : "Vastaanottaja",
     "cc" : "Kopio",
     "bcc" : "Piilokopio",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Huomioi, että viesti saapui noreply-osoitteesta (ns. älä vastaa -osoite), joten vastausviestiäsi tuskin luetaan.",
     "Subject" : "Aihe",
-    "Save all to Files" : "Tallenna kaikki tiedostoihin",
-    "Add mail account" : "Lisää sähköpostitili",
-    "Use Gravatar and favicon avatars" : "Käytä Gravatar- ja favicon-avatareja",
-    "No search results for" : "Ei tuloksia haulle",
-    "The images have been blocked to protect your privacy." : "Kuvat estettiin yksityisyytesi suojelemiseksi.",
-    "Show images from this sender" : "Näytä kuvat tältä lähettäjältä",
-    "Forward" : "Välitä",
-    "No messages in this folder" : "Tässä kansiossa ei ole viestejä",
+    "Sending …" : "Lähetetään…",
+    "Message sent!" : "Viesti lähetetty!",
+    "Send" : "Lähetä",
     "Upload attachment" : "Lähetä liite",
     "Add attachment from Files" : "Lisää liitteitä tiedostosovelluksesta",
+    "Choose a file to add as attachment" : "Valitse liitteeksi lisättävä tiedosto",
+    "No messages in this folder" : "Tässä kansiossa ei ole viestejä",
+    "Delete" : "Poista",
+    "Could not load your message" : "Viestiä ei voitu ladata",
     "Import into calendar" : "Tuo kalenteriin",
     "Download attachment" : "Lataa liite",
-    "Save to Files" : "Tallenna tiedostoihin"
+    "Save to Files" : "Tallenna tiedostoihin",
+    "Choose a folder to store the attachment in" : "Valitse kansio liitetiedoston tallentamiselle",
+    "Save all to Files" : "Tallenna kaikki tiedostoihin",
+    "The images have been blocked to protect your privacy." : "Kuvat estettiin yksityisyytesi suojelemiseksi.",
+    "New message" : "Uusi viesti",
+    "Settings" : "Asetukset",
+    "Speed up your Mail experience with these quick shortcuts." : "Nopeuta sähköpostikokemustasi näillä pikanäppäimillä.",
+    "Compose new message" : "Uusi viesti",
+    "Newer message" : "Uudempi",
+    "Older message" : "Vanhempi viesti",
+    "Toggle star" : "Lisää/poista tähti",
+    "Toggle unread" : "Merkitse luetuksi/lukemattomaksi",
+    "Search" : "Etsi",
+    "Refresh" : "Päivitä",
+    "Connect your mail account" : "Yhdistä sähköpostitilisi",
+    "Show all folders" : "Näytä kaikki kansiot",
+    "Collapse folders" : "Supista kansiot",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n uusi viesti \nlähettäjältä {from}","%n uutta viestiä \nlähettäjältä {from}"],
+    "Nextcloud Mail" : "Nextcloud-sähköposti",
+    "All inboxes" : "Kaikki saapuneiden laatikot",
+    "Could not load {tag}{name}{endtag}" : "{tag}{name}{endtag} ei voitu ladata",
+    "There was a problem loading {tag}{name}{endtag}" : "Ladattaessa {tag}{name}{endtag} ilmeni ongelma",
+    "Could not load the desired message" : "Haluttua viestiä ei voitu ladata",
+    "Could not load the message" : "Viestiä ei voitu ladata",
+    "Error loading message" : "Virhe viestiä ladatessa",
+    "Forwarding to %s" : "Välitä viesti %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Klikkaa jos sinua ei uudelleenohjata automaattisesti muutamaan sekuntiin.",
+    "Redirect" : "Uudelleenohjaus",
+    "The link leads to %s" : "Tämä linkki johtaa kohteeseen %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Jos et halua vierailla kyseisellä sivulla, voit palata <a href=\"%s\">sähköpostiin</a>.",
+    "Continue to %s" : "Jatka sivulle %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/fr.js b/l10n/fr.js
index 361f339c1..41b6af838 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -2,56 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Mail",
-    "Loading accounts" : "Chargement des comptes",
-    "Error while loading the accounts." : "Erreur lors du chargement des comptes.",
-    "Can not load this folder." : "Impossible de charger ce dossier.",
-    "Searching for {query}" : "Recherche pour {query}",
-    "Error while deleting message." : "Erreur lors de la suppression du message.",
-    "Forwarded message" : "Message transféré",
-    "Choose a folder to store the attachment in" : "Choisissez le dossier dans lequel enregistrer la pièce jointe",
-    "Attachments saved to Files." : "Pièces jointes enregistrées dans les Fichiers.",
-    "Attachment saved to Files." : "Pièce jointe enregistrée dans les Fichiers.",
-    "Error while saving attachments to Files." : "Erreur lors de l'enregistrement des pièces jointes dans les Fichiers.",
-    "Error while saving attachment to Files." : "Erreur lors de l'enregistrement de la pièce jointe dans les Fichiers.",
-    "Message flag could not be set." : "Le drapeau n'a pas été ajouté sur le message.",
-    "Could not move message." : "Impossible de déplacer le message.",
-    "Invalid account" : "Compte invalide",
-    "Invalid folder" : "Dossier invalide",
-    "Error while creating the account: " : "Erreur lors de la création du compte:",
-    "Unknown error" : "Erreur inconnue",
-    "Error while updating the account: " : "Erreur lors de la mise à jour du compte :",
-    "All inboxes" : "Toutes les boîtes",
-    "you" : "vous",
-    "Send message to {email}" : "Envoyer un mail à {email}",
-    "Could not load {tag}{name}{endtag}" : "Impossible de charger {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Il y a eu un problème de chargement {tag}{name}{endtag}",
-    "Could not load your message" : "Impossible de charger votre message",
-    "Could not load the desired message" : "Impossible de charger le message souhaité",
-    "Could not load the message" : "Impossible de charger le message",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n nouveau message\nde {from}","%n nouveaux messages\nde {from}"],
-    "Nextcloud Mail" : "Nextcloud Mail",
-    "Save" : "Sauvegarder",
-    "Saved" : "Sauvegardé",
-    "Show all folders" : "Montrer tous les dossiers",
-    "Collapse folders" : "Replier les dossiers",
-    "Error while deleting account." : "Erreur lors de la suppression du compte.",
-    "Choose a file to add as attachment" : "Choisissez un fichier à joindre au message",
-    "An error occurred while uploading {fname}" : "Une erreur est survenue lors du téléversement de la pièce-jointe {fname}",
-    "Reply" : "Répondre",
-    "Send" : "Envoyer",
-    "Sending …" : "Envoi…",
-    "Message sent!" : "Message envoyé !",
-    "Server error" : "Erreur du serveur",
-    "An unknown error occurred" : "Une erreur inconnue est survenue",
-    "Opening HTML drafts is not supported yet." : "L'ouverture de brouillons au format HTML n'est pas prise en charge pour le moment.",
-    "No writable calendars found" : "Aucun calendrier modifiable n'a été trouvé",
-    "Error while importing the calendar event" : "Erreur pendant l'importation de l'évènement du calendrier",
-    "Error while downloading calendar event" : "Erreur pendant le téléchargement de l'évènement du calendrier",
-    "& others" : "et d'autres",
-    "Error while loading messages." : "Erreur lors du chargement des messages.",
-    "Error while refreshing messages." : "Erreur lors de l'actualisation des messages.",
-    "Setting up your account" : "Paramétrage de votre compte",
     "Inbox" : "Boîte de réception",
     "Sent" : "Envoyés",
     "Drafts" : "Brouillons",
@@ -66,69 +16,70 @@ OC.L10N.register(
     "Delete permanently" : "Supprimer définitivement",
     "IMAP web client" : "Client web IMAP",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Client de messagerie facile à utiliser qui se connecte à votre serveur de messagerie via IMAP et SMTP.",
-    "Error loading message" : "Erreur lors du chargement du message",
-    "Settings" : "Paramètres",
-    "Forwarding to %s" : "Faire suivre à %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Cliquer ici si vous n'êtes pas automatiquement redirigé dans les prochaines secondes.",
-    "Redirect" : "Redirection",
-    "The link leads to %s" : "Le lien dirige vers %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si vous ne désirez pas visiter cette page, vous pouvez retourner aux <a href=\"%s\">Mails</a>.",
-    "Continue to %s" : "Continuer vers %s",
-    "Delete account" : "Supprimer le compte",
-    "Try again" : "Réessayez",
-    "New message" : "Nouveau message",
-    "Account Settings" : "Paramètres du compte",
-    "Aliases" : "Alias",
-    "Mail address" : "Adresse mail",
-    "Display Name" : "Nom affiché",
-    "Account" : "Compte",
-    "Toggle read" : "Basculer en lecture",
-    "Delete" : "Supprimer",
-    "Keyboard shortcuts" : "Raccourcis clavier",
-    "Speed up your Mail experience with these quick shortcuts." : "Accélérez votre expérience Mail avec ces raccourcis rapides.",
-    "Compose new message" : "Rédigez un nouveau message",
-    "Newer message" : "Message plus récent",
-    "Older message" : "Message plus ancien",
-    "Toggle star" : "Épingler / Désépingler",
-    "Toggle unread" : "Basculer en lu/non lu",
-    "Search" : "Rechercher",
-    "Refresh" : "Rafraîchir",
-    "Connect your mail account" : "Connecter votre compte mail",
     "Name" : "Nom",
     "Mail Address" : "Adresse mail",
     "Password" : "Mot de passe",
-    "Manual configuration" : "Configuration manuelle",
     "IMAP Host" : "Hôte IMAP",
-    "IMAP security" : "Sécurité IMAP",
     "None" : "Aucun",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Port IMAP",
     "IMAP User" : "Utilisateur IMAP",
     "IMAP Password" : "Mot de passe IMAP",
     "SMTP Host" : "Hôte SMTP",
-    "SMTP security" : "Sécurité SMTP",
     "SMTP Port" : "Port SMTP",
     "SMTP User" : "Utilisateur SMTP",
     "SMTP Password" : "Mot de passe SMTP",
     "Connect" : "Connecter",
+    "Add mail account" : "Ajouter un compte mail",
+    "Use Gravatar and favicon avatars" : "Utiliser Gravatar et des avatars de favicon",
+    "Keyboard shortcuts" : "Raccourcis clavier",
     "from" : "de",
     "to" : "vers",
     "cc" : "cc",
     "bcc" : "bcc",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Notez que le mail provient d'une adresse noreply donc votre réponse ne sera sans doute pas lu.",
     "Subject" : "Sujet",
-    "Save all to Files" : "Enregistrer tout dans les Fichiers",
-    "Add mail account" : "Ajouter un compte mail",
-    "Use Gravatar and favicon avatars" : "Utiliser Gravatar et des avatars de favicon",
-    "No search results for" : "Aucun résultats pour",
-    "The images have been blocked to protect your privacy." : "Les images ont été bloquées pour protéger votre vie privée.",
-    "Show images from this sender" : "Voir les images de cet expéditeur",
-    "Forward" : "Faire suivre",
-    "No messages in this folder" : "Aucun message dans ce dossier",
+    "Sending …" : "Envoi…",
+    "Message sent!" : "Message envoyé !",
+    "Send" : "Envoyer",
     "Upload attachment" : "Téléverser les pièces jointes",
     "Add attachment from Files" : "Ajouter des pièces jointes depuis Fichiers",
+    "Choose a file to add as attachment" : "Choisissez un fichier à joindre au message",
+    "No messages in this folder" : "Aucun message dans ce dossier",
+    "Delete" : "Supprimer",
+    "Could not load your message" : "Impossible de charger votre message",
     "Import into calendar" : "Importer dans le calendrier",
     "Download attachment" : "Télécharger les pièces jointes",
-    "Save to Files" : "Enregistrer dans Fichiers"
+    "Save to Files" : "Enregistrer dans Fichiers",
+    "Choose a folder to store the attachment in" : "Choisissez le dossier dans lequel enregistrer la pièce jointe",
+    "Save all to Files" : "Enregistrer tout dans les Fichiers",
+    "The images have been blocked to protect your privacy." : "Les images ont été bloquées pour protéger votre vie privée.",
+    "New message" : "Nouveau message",
+    "Settings" : "Paramètres",
+    "Speed up your Mail experience with these quick shortcuts." : "Accélérez votre expérience Mail avec ces raccourcis rapides.",
+    "Compose new message" : "Rédigez un nouveau message",
+    "Newer message" : "Message plus récent",
+    "Older message" : "Message plus ancien",
+    "Toggle star" : "Épingler / Désépingler",
+    "Toggle unread" : "Basculer en lu/non lu",
+    "Search" : "Rechercher",
+    "Refresh" : "Rafraîchir",
+    "Connect your mail account" : "Connecter votre compte mail",
+    "Show all folders" : "Montrer tous les dossiers",
+    "Collapse folders" : "Replier les dossiers",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n nouveau message\nde {from}","%n nouveaux messages\nde {from}"],
+    "Nextcloud Mail" : "Nextcloud Mail",
+    "All inboxes" : "Toutes les boîtes",
+    "Could not load {tag}{name}{endtag}" : "Impossible de charger {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Il y a eu un problème de chargement {tag}{name}{endtag}",
+    "Could not load the desired message" : "Impossible de charger le message souhaité",
+    "Could not load the message" : "Impossible de charger le message",
+    "Error loading message" : "Erreur lors du chargement du message",
+    "Forwarding to %s" : "Faire suivre à %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Cliquer ici si vous n'êtes pas automatiquement redirigé dans les prochaines secondes.",
+    "Redirect" : "Redirection",
+    "The link leads to %s" : "Le lien dirige vers %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si vous ne désirez pas visiter cette page, vous pouvez retourner aux <a href=\"%s\">Mails</a>.",
+    "Continue to %s" : "Continuer vers %s"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/l10n/fr.json b/l10n/fr.json
index 79c6fac3c..ca64681ac 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -1,55 +1,5 @@
 { "translations": {
     "Mail" : "Mail",
-    "Loading accounts" : "Chargement des comptes",
-    "Error while loading the accounts." : "Erreur lors du chargement des comptes.",
-    "Can not load this folder." : "Impossible de charger ce dossier.",
-    "Searching for {query}" : "Recherche pour {query}",
-    "Error while deleting message." : "Erreur lors de la suppression du message.",
-    "Forwarded message" : "Message transféré",
-    "Choose a folder to store the attachment in" : "Choisissez le dossier dans lequel enregistrer la pièce jointe",
-    "Attachments saved to Files." : "Pièces jointes enregistrées dans les Fichiers.",
-    "Attachment saved to Files." : "Pièce jointe enregistrée dans les Fichiers.",
-    "Error while saving attachments to Files." : "Erreur lors de l'enregistrement des pièces jointes dans les Fichiers.",
-    "Error while saving attachment to Files." : "Erreur lors de l'enregistrement de la pièce jointe dans les Fichiers.",
-    "Message flag could not be set." : "Le drapeau n'a pas été ajouté sur le message.",
-    "Could not move message." : "Impossible de déplacer le message.",
-    "Invalid account" : "Compte invalide",
-    "Invalid folder" : "Dossier invalide",
-    "Error while creating the account: " : "Erreur lors de la création du compte:",
-    "Unknown error" : "Erreur inconnue",
-    "Error while updating the account: " : "Erreur lors de la mise à jour du compte :",
-    "All inboxes" : "Toutes les boîtes",
-    "you" : "vous",
-    "Send message to {email}" : "Envoyer un mail à {email}",
-    "Could not load {tag}{name}{endtag}" : "Impossible de charger {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Il y a eu un problème de chargement {tag}{name}{endtag}",
-    "Could not load your message" : "Impossible de charger votre message",
-    "Could not load the desired message" : "Impossible de charger le message souhaité",
-    "Could not load the message" : "Impossible de charger le message",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n nouveau message\nde {from}","%n nouveaux messages\nde {from}"],
-    "Nextcloud Mail" : "Nextcloud Mail",
-    "Save" : "Sauvegarder",
-    "Saved" : "Sauvegardé",
-    "Show all folders" : "Montrer tous les dossiers",
-    "Collapse folders" : "Replier les dossiers",
-    "Error while deleting account." : "Erreur lors de la suppression du compte.",
-    "Choose a file to add as attachment" : "Choisissez un fichier à joindre au message",
-    "An error occurred while uploading {fname}" : "Une erreur est survenue lors du téléversement de la pièce-jointe {fname}",
-    "Reply" : "Répondre",
-    "Send" : "Envoyer",
-    "Sending …" : "Envoi…",
-    "Message sent!" : "Message envoyé !",
-    "Server error" : "Erreur du serveur",
-    "An unknown error occurred" : "Une erreur inconnue est survenue",
-    "Opening HTML drafts is not supported yet." : "L'ouverture de brouillons au format HTML n'est pas prise en charge pour le moment.",
-    "No writable calendars found" : "Aucun calendrier modifiable n'a été trouvé",
-    "Error while importing the calendar event" : "Erreur pendant l'importation de l'évènement du calendrier",
-    "Error while downloading calendar event" : "Erreur pendant le téléchargement de l'évènement du calendrier",
-    "& others" : "et d'autres",
-    "Error while loading messages." : "Erreur lors du chargement des messages.",
-    "Error while refreshing messages." : "Erreur lors de l'actualisation des messages.",
-    "Setting up your account" : "Paramétrage de votre compte",
     "Inbox" : "Boîte de réception",
     "Sent" : "Envoyés",
     "Drafts" : "Brouillons",
@@ -64,69 +14,70 @@
     "Delete permanently" : "Supprimer définitivement",
     "IMAP web client" : "Client web IMAP",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Client de messagerie facile à utiliser qui se connecte à votre serveur de messagerie via IMAP et SMTP.",
-    "Error loading message" : "Erreur lors du chargement du message",
-    "Settings" : "Paramètres",
-    "Forwarding to %s" : "Faire suivre à %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Cliquer ici si vous n'êtes pas automatiquement redirigé dans les prochaines secondes.",
-    "Redirect" : "Redirection",
-    "The link leads to %s" : "Le lien dirige vers %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si vous ne désirez pas visiter cette page, vous pouvez retourner aux <a href=\"%s\">Mails</a>.",
-    "Continue to %s" : "Continuer vers %s",
-    "Delete account" : "Supprimer le compte",
-    "Try again" : "Réessayez",
-    "New message" : "Nouveau message",
-    "Account Settings" : "Paramètres du compte",
-    "Aliases" : "Alias",
-    "Mail address" : "Adresse mail",
-    "Display Name" : "Nom affiché",
-    "Account" : "Compte",
-    "Toggle read" : "Basculer en lecture",
-    "Delete" : "Supprimer",
-    "Keyboard shortcuts" : "Raccourcis clavier",
-    "Speed up your Mail experience with these quick shortcuts." : "Accélérez votre expérience Mail avec ces raccourcis rapides.",
-    "Compose new message" : "Rédigez un nouveau message",
-    "Newer message" : "Message plus récent",
-    "Older message" : "Message plus ancien",
-    "Toggle star" : "Épingler / Désépingler",
-    "Toggle unread" : "Basculer en lu/non lu",
-    "Search" : "Rechercher",
-    "Refresh" : "Rafraîchir",
-    "Connect your mail account" : "Connecter votre compte mail",
     "Name" : "Nom",
     "Mail Address" : "Adresse mail",
     "Password" : "Mot de passe",
-    "Manual configuration" : "Configuration manuelle",
     "IMAP Host" : "Hôte IMAP",
-    "IMAP security" : "Sécurité IMAP",
     "None" : "Aucun",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Port IMAP",
     "IMAP User" : "Utilisateur IMAP",
     "IMAP Password" : "Mot de passe IMAP",
     "SMTP Host" : "Hôte SMTP",
-    "SMTP security" : "Sécurité SMTP",
     "SMTP Port" : "Port SMTP",
     "SMTP User" : "Utilisateur SMTP",
     "SMTP Password" : "Mot de passe SMTP",
     "Connect" : "Connecter",
+    "Add mail account" : "Ajouter un compte mail",
+    "Use Gravatar and favicon avatars" : "Utiliser Gravatar et des avatars de favicon",
+    "Keyboard shortcuts" : "Raccourcis clavier",
     "from" : "de",
     "to" : "vers",
     "cc" : "cc",
     "bcc" : "bcc",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Notez que le mail provient d'une adresse noreply donc votre réponse ne sera sans doute pas lu.",
     "Subject" : "Sujet",
-    "Save all to Files" : "Enregistrer tout dans les Fichiers",
-    "Add mail account" : "Ajouter un compte mail",
-    "Use Gravatar and favicon avatars" : "Utiliser Gravatar et des avatars de favicon",
-    "No search results for" : "Aucun résultats pour",
-    "The images have been blocked to protect your privacy." : "Les images ont été bloquées pour protéger votre vie privée.",
-    "Show images from this sender" : "Voir les images de cet expéditeur",
-    "Forward" : "Faire suivre",
-    "No messages in this folder" : "Aucun message dans ce dossier",
+    "Sending …" : "Envoi…",
+    "Message sent!" : "Message envoyé !",
+    "Send" : "Envoyer",
     "Upload attachment" : "Téléverser les pièces jointes",
     "Add attachment from Files" : "Ajouter des pièces jointes depuis Fichiers",
+    "Choose a file to add as attachment" : "Choisissez un fichier à joindre au message",
+    "No messages in this folder" : "Aucun message dans ce dossier",
+    "Delete" : "Supprimer",
+    "Could not load your message" : "Impossible de charger votre message",
     "Import into calendar" : "Importer dans le calendrier",
     "Download attachment" : "Télécharger les pièces jointes",
-    "Save to Files" : "Enregistrer dans Fichiers"
+    "Save to Files" : "Enregistrer dans Fichiers",
+    "Choose a folder to store the attachment in" : "Choisissez le dossier dans lequel enregistrer la pièce jointe",
+    "Save all to Files" : "Enregistrer tout dans les Fichiers",
+    "The images have been blocked to protect your privacy." : "Les images ont été bloquées pour protéger votre vie privée.",
+    "New message" : "Nouveau message",
+    "Settings" : "Paramètres",
+    "Speed up your Mail experience with these quick shortcuts." : "Accélérez votre expérience Mail avec ces raccourcis rapides.",
+    "Compose new message" : "Rédigez un nouveau message",
+    "Newer message" : "Message plus récent",
+    "Older message" : "Message plus ancien",
+    "Toggle star" : "Épingler / Désépingler",
+    "Toggle unread" : "Basculer en lu/non lu",
+    "Search" : "Rechercher",
+    "Refresh" : "Rafraîchir",
+    "Connect your mail account" : "Connecter votre compte mail",
+    "Show all folders" : "Montrer tous les dossiers",
+    "Collapse folders" : "Replier les dossiers",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n nouveau message\nde {from}","%n nouveaux messages\nde {from}"],
+    "Nextcloud Mail" : "Nextcloud Mail",
+    "All inboxes" : "Toutes les boîtes",
+    "Could not load {tag}{name}{endtag}" : "Impossible de charger {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Il y a eu un problème de chargement {tag}{name}{endtag}",
+    "Could not load the desired message" : "Impossible de charger le message souhaité",
+    "Could not load the message" : "Impossible de charger le message",
+    "Error loading message" : "Erreur lors du chargement du message",
+    "Forwarding to %s" : "Faire suivre à %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Cliquer ici si vous n'êtes pas automatiquement redirigé dans les prochaines secondes.",
+    "Redirect" : "Redirection",
+    "The link leads to %s" : "Le lien dirige vers %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Si vous ne désirez pas visiter cette page, vous pouvez retourner aux <a href=\"%s\">Mails</a>.",
+    "Continue to %s" : "Continuer vers %s"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/l10n/gl.js b/l10n/gl.js
index a13f4f4a0..65fe06b33 100644
--- a/l10n/gl.js
+++ b/l10n/gl.js
@@ -2,100 +2,84 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Correo",
-    "Error while loading the accounts." : "Produciuse un erro mentres cargaba as contas.",
-    "Searching for {query}" : "Buscando por {query}",
-    "Error while deleting message." : "Produciuse un erro ao eliminar a mensaxe.",
-    "Forwarded message" : "Mensaxe reenviado",
-    "Choose a folder to store the attachment in" : "Escolla un cartafol no que gardar o anexo de entrada",
-    "Attachments saved to Files." : "Anexos gardados en Ficheiros.",
-    "Attachment saved to Files." : "Anexo gardado en Ficheiros.",
-    "Error while saving attachments to Files." : "Produciuse un erro ao gardar os anexos en Ficheiros.",
-    "Error while saving attachment to Files." : "Produciuse un erro ao gardar o anexo en Ficheiros.",
-    "Message flag could not be set." : "Non foi posíbel marcar a mensaxe.",
-    "Could not move message." : "Non foi posíbel mover a mensaxe.",
-    "Invalid account" : "Conta incorrecta",
-    "Invalid folder" : "Cartafol incorrecto",
-    "Unknown error" : "Produciuse un erro descoñecido",
-    "All inboxes" : "Todas as bandexas de entrada",
-    "you" : "vostede",
-    "Send message to {email}" : "Enviar mensaxe a {email}",
-    "Could not load {tag}{name}{endtag}" : "Non foi posíbel cargar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Produciuse un problema cargando {tag}{name}{endtag}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "Save" : "Gardar",
-    "Show all folders" : "Amosar todos os cartafoles",
-    "Collapse folders" : "Contraer os cartafoles",
-    "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",
-    "An unknown error occurred" : "Produciuse un erro descoñecido",
-    "Opening HTML drafts is not supported yet." : "Aínda non é posíbel abrir borradores HTML.",
-    "No writable calendars found" : "No se atoparon calendarios con permiso de escritura",
-    "Error while importing the calendar event" : "Produciuse un erro ao importar o evento de calendario",
-    "Error while downloading calendar event" : "Produciuse un erro ao descargar o evento de calendario",
-    "& others" : "E outros",
-    "Error while loading messages." : "Produciuse un erro mentres cargaba as mensaxes.",
     "Inbox" : "Bandexa de entrada",
     "Sent" : "Enviado",
-    "Drafts" : "Borradores",
+    "Drafts" : "Bocexos",
     "Archive" : "Arquivo",
     "Trash" : "Cesto do lixo",
     "Junk" : "Lixo",
     "All" : "Todo",
     "Favorites" : "Favoritos",
     "Auto detect failed. Please use manual mode." : "Fallou o modo de detección automática. empregue o modo manual.",
-    "Creating account failed: " : "Non foi posíbel crear a conta:",
+    "Updating account failed: " : "Produciuse un fallo ao actualizar a conta:",
+    "Creating account failed: " : "Produciuse un fallo ao crear a conta:",
     "Delete permanently" : "Eliminar permanentemente",
-    "Error loading message" : "Produciuse un erro ao cargar a mensaxe",
-    "Settings" : "Axustes",
-    "Forwarding to %s" : "Reenviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Prema aquí se non é redireccionado automaticamente nos próximos segundos.",
-    "Redirect" : "Redirixir",
-    "The link leads to %s" : "A ligazón leva a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Se non quere visitar esa páxina, pode volver a <a href=\"%s\">Correo</a>.",
-    "Continue to %s" : "Continuar para %s",
-    "Delete account" : "Eliminar a conta",
-    "New message" : "Nova mensaxe",
-    "Account Settings" : "Axustes da conta",
-    "Aliases" : "Alias",
-    "Mail address" : "Enderezo de correo",
-    "Display Name" : "Nome para amosar",
-    "Connect your mail account" : "Conecte a súa conta de correo",
+    "IMAP web client" : "Cliente web IMAP",
+    "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Cliente de correo doado de empregar que se conecta ao seu servidor de correo mediante IMAP e SMTP",
     "Name" : "Nome",
     "Mail Address" : "Enderezo de correo",
     "Password" : "Contrasinal",
-    "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
-    "IMAP security" : "Seguridade IMAP",
     "None" : "Ningún",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Porto IMAP",
     "IMAP User" : "Usuario IMAP",
     "IMAP Password" : "Contrasinal IMAP",
     "SMTP Host" : "Servidor SMTP",
-    "SMTP security" : "Seguridade SMTP",
     "SMTP Port" : "Porto SMTP",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contrasinal SMTP",
     "Connect" : "Conectar",
-    "from" : "desde",
+    "Add mail account" : "Engadir unha conta de correo",
+    "Use Gravatar and favicon avatars" : "Empregar os avatares de Gravatar e favicon",
+    "Keyboard shortcuts" : "Atallos de teclado",
+    "from" : "dende",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
     "Subject" : "Asunto",
-    "Save all to Files" : "Gardar todo en Ficheiros",
-    "Add mail account" : "Engadir unha conta de correo",
-    "No search results for" : "Sen resultados de busca para",
-    "The images have been blocked to protect your privacy." : "As imaxes foron bloqueadas para protexer a súa intimidade.",
-    "Show images from this sender" : "Amosar as imaxes deste remitente",
-    "Forward" : "Reenviar",
-    "Add attachment from Files" : "Engadir anexos desde Ficheiros",
+    "Sending …" : "Enviando…",
+    "Message sent!" : "Mensaxe enviada!",
+    "Send" : "Enviar",
+    "Upload attachment" : "Enviar anexos",
+    "Add attachment from Files" : "Engadir anexos dende Ficheiros",
+    "Choose a file to add as attachment" : "Escolla un ficheiro para engadir como anexo",
+    "No messages in this folder" : "Non hai mensaxes neste cartafol",
+    "Delete" : "Eliminar",
+    "Could not load your message" : "Non foi posíbel cargar a súa mensaxe",
     "Import into calendar" : "Importar dentro do calendario",
     "Download attachment" : "Descargar anexos",
-    "Save to Files" : "Gardar en Ficheiros"
+    "Save to Files" : "Gardar en Ficheiros",
+    "Choose a folder to store the attachment in" : "Escolla un cartafol no que gardar o anexo de entrada",
+    "Save all to Files" : "Gardar todo en Ficheiros",
+    "The images have been blocked to protect your privacy." : "As imaxes foron bloqueadas para protexer a súa intimidade.",
+    "New message" : "Nova mensaxe",
+    "Settings" : "Axustes",
+    "Speed up your Mail experience with these quick shortcuts." : "Acelere a súa experiencia de correo con estes atallos rápidos.",
+    "Compose new message" : "Redactar unha nova mensaxe",
+    "Newer message" : "Mensaxe máis recente",
+    "Older message" : "Mensaxe máis antiga",
+    "Toggle star" : " Marcar/desmarcar con estrela",
+    "Toggle unread" : "Marcar/desmarcar como non lido",
+    "Search" : "Buscar",
+    "Refresh" : "Actualizar",
+    "Connect your mail account" : "Conecte a súa conta de correo",
+    "Show all folders" : "Amosar todos os cartafoles",
+    "Collapse folders" : "Contraer os cartafoles",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaxe nova\nde {from}","%n mensaxes novas\nde {from}"],
+    "Nextcloud Mail" : "Correo do Nextcloud",
+    "All inboxes" : "Todas as bandexas de entrada",
+    "Could not load {tag}{name}{endtag}" : "Non foi posíbel cargar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Produciuse un problema cargando {tag}{name}{endtag}",
+    "Could not load the desired message" : "Non foi posíbel cargar a mensaxe desexada",
+    "Could not load the message" : "Non foi posíbel cargar a mensaxe",
+    "Error loading message" : "Produciuse un erro ao cargar a mensaxe",
+    "Forwarding to %s" : "Reenviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Prema aquí se non é redireccionado automaticamente nos próximos segundos.",
+    "Redirect" : "Redirixir",
+    "The link leads to %s" : "A ligazón leva a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Se non quere visitar esa páxina, pode volver a <a href=\"%s\">Correo</a>.",
+    "Continue to %s" : "Continuar para %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/gl.json b/l10n/gl.json
index 294679394..90fe1c5cd 100644
--- a/l10n/gl.json
+++ b/l10n/gl.json
@@ -1,99 +1,83 @@
 { "translations": {
     "Mail" : "Correo",
-    "Error while loading the accounts." : "Produciuse un erro mentres cargaba as contas.",
-    "Searching for {query}" : "Buscando por {query}",
-    "Error while deleting message." : "Produciuse un erro ao eliminar a mensaxe.",
-    "Forwarded message" : "Mensaxe reenviado",
-    "Choose a folder to store the attachment in" : "Escolla un cartafol no que gardar o anexo de entrada",
-    "Attachments saved to Files." : "Anexos gardados en Ficheiros.",
-    "Attachment saved to Files." : "Anexo gardado en Ficheiros.",
-    "Error while saving attachments to Files." : "Produciuse un erro ao gardar os anexos en Ficheiros.",
-    "Error while saving attachment to Files." : "Produciuse un erro ao gardar o anexo en Ficheiros.",
-    "Message flag could not be set." : "Non foi posíbel marcar a mensaxe.",
-    "Could not move message." : "Non foi posíbel mover a mensaxe.",
-    "Invalid account" : "Conta incorrecta",
-    "Invalid folder" : "Cartafol incorrecto",
-    "Unknown error" : "Produciuse un erro descoñecido",
-    "All inboxes" : "Todas as bandexas de entrada",
-    "you" : "vostede",
-    "Send message to {email}" : "Enviar mensaxe a {email}",
-    "Could not load {tag}{name}{endtag}" : "Non foi posíbel cargar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Produciuse un problema cargando {tag}{name}{endtag}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "Save" : "Gardar",
-    "Show all folders" : "Amosar todos os cartafoles",
-    "Collapse folders" : "Contraer os cartafoles",
-    "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",
-    "An unknown error occurred" : "Produciuse un erro descoñecido",
-    "Opening HTML drafts is not supported yet." : "Aínda non é posíbel abrir borradores HTML.",
-    "No writable calendars found" : "No se atoparon calendarios con permiso de escritura",
-    "Error while importing the calendar event" : "Produciuse un erro ao importar o evento de calendario",
-    "Error while downloading calendar event" : "Produciuse un erro ao descargar o evento de calendario",
-    "& others" : "E outros",
-    "Error while loading messages." : "Produciuse un erro mentres cargaba as mensaxes.",
     "Inbox" : "Bandexa de entrada",
     "Sent" : "Enviado",
-    "Drafts" : "Borradores",
+    "Drafts" : "Bocexos",
     "Archive" : "Arquivo",
     "Trash" : "Cesto do lixo",
     "Junk" : "Lixo",
     "All" : "Todo",
     "Favorites" : "Favoritos",
     "Auto detect failed. Please use manual mode." : "Fallou o modo de detección automática. empregue o modo manual.",
-    "Creating account failed: " : "Non foi posíbel crear a conta:",
+    "Updating account failed: " : "Produciuse un fallo ao actualizar a conta:",
+    "Creating account failed: " : "Produciuse un fallo ao crear a conta:",
     "Delete permanently" : "Eliminar permanentemente",
-    "Error loading message" : "Produciuse un erro ao cargar a mensaxe",
-    "Settings" : "Axustes",
-    "Forwarding to %s" : "Reenviando a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Prema aquí se non é redireccionado automaticamente nos próximos segundos.",
-    "Redirect" : "Redirixir",
-    "The link leads to %s" : "A ligazón leva a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Se non quere visitar esa páxina, pode volver a <a href=\"%s\">Correo</a>.",
-    "Continue to %s" : "Continuar para %s",
-    "Delete account" : "Eliminar a conta",
-    "New message" : "Nova mensaxe",
-    "Account Settings" : "Axustes da conta",
-    "Aliases" : "Alias",
-    "Mail address" : "Enderezo de correo",
-    "Display Name" : "Nome para amosar",
-    "Connect your mail account" : "Conecte a súa conta de correo",
+    "IMAP web client" : "Cliente web IMAP",
+    "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Cliente de correo doado de empregar que se conecta ao seu servidor de correo mediante IMAP e SMTP",
     "Name" : "Nome",
     "Mail Address" : "Enderezo de correo",
     "Password" : "Contrasinal",
-    "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
-    "IMAP security" : "Seguridade IMAP",
     "None" : "Ningún",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Porto IMAP",
     "IMAP User" : "Usuario IMAP",
     "IMAP Password" : "Contrasinal IMAP",
     "SMTP Host" : "Servidor SMTP",
-    "SMTP security" : "Seguridade SMTP",
     "SMTP Port" : "Porto SMTP",
     "SMTP User" : "Usuario SMTP",
     "SMTP Password" : "Contrasinal SMTP",
     "Connect" : "Conectar",
-    "from" : "desde",
+    "Add mail account" : "Engadir unha conta de correo",
+    "Use Gravatar and favicon avatars" : "Empregar os avatares de Gravatar e favicon",
+    "Keyboard shortcuts" : "Atallos de teclado",
+    "from" : "dende",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
     "Subject" : "Asunto",
-    "Save all to Files" : "Gardar todo en Ficheiros",
-    "Add mail account" : "Engadir unha conta de correo",
-    "No search results for" : "Sen resultados de busca para",
-    "The images have been blocked to protect your privacy." : "As imaxes foron bloqueadas para protexer a súa intimidade.",
-    "Show images from this sender" : "Amosar as imaxes deste remitente",
-    "Forward" : "Reenviar",
-    "Add attachment from Files" : "Engadir anexos desde Ficheiros",
+    "Sending …" : "Enviando…",
+    "Message sent!" : "Mensaxe enviada!",
+    "Send" : "Enviar",
+    "Upload attachment" : "Enviar anexos",
+    "Add attachment from Files" : "Engadir anexos dende Ficheiros",
+    "Choose a file to add as attachment" : "Escolla un ficheiro para engadir como anexo",
+    "No messages in this folder" : "Non hai mensaxes neste cartafol",
+    "Delete" : "Eliminar",
+    "Could not load your message" : "Non foi posíbel cargar a súa mensaxe",
     "Import into calendar" : "Importar dentro do calendario",
     "Download attachment" : "Descargar anexos",
-    "Save to Files" : "Gardar en Ficheiros"
+    "Save to Files" : "Gardar en Ficheiros",
+    "Choose a folder to store the attachment in" : "Escolla un cartafol no que gardar o anexo de entrada",
+    "Save all to Files" : "Gardar todo en Ficheiros",
+    "The images have been blocked to protect your privacy." : "As imaxes foron bloqueadas para protexer a súa intimidade.",
+    "New message" : "Nova mensaxe",
+    "Settings" : "Axustes",
+    "Speed up your Mail experience with these quick shortcuts." : "Acelere a súa experiencia de correo con estes atallos rápidos.",
+    "Compose new message" : "Redactar unha nova mensaxe",
+    "Newer message" : "Mensaxe máis recente",
+    "Older message" : "Mensaxe máis antiga",
+    "Toggle star" : " Marcar/desmarcar con estrela",
+    "Toggle unread" : "Marcar/desmarcar como non lido",
+    "Search" : "Buscar",
+    "Refresh" : "Actualizar",
+    "Connect your mail account" : "Conecte a súa conta de correo",
+    "Show all folders" : "Amosar todos os cartafoles",
+    "Collapse folders" : "Contraer os cartafoles",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n mensaxe nova\nde {from}","%n mensaxes novas\nde {from}"],
+    "Nextcloud Mail" : "Correo do Nextcloud",
+    "All inboxes" : "Todas as bandexas de entrada",
+    "Could not load {tag}{name}{endtag}" : "Non foi posíbel cargar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Produciuse un problema cargando {tag}{name}{endtag}",
+    "Could not load the desired message" : "Non foi posíbel cargar a mensaxe desexada",
+    "Could not load the message" : "Non foi posíbel cargar a mensaxe",
+    "Error loading message" : "Produciuse un erro ao cargar a mensaxe",
+    "Forwarding to %s" : "Reenviando a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Prema aquí se non é redireccionado automaticamente nos próximos segundos.",
+    "Redirect" : "Redirixir",
+    "The link leads to %s" : "A ligazón leva a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Se non quere visitar esa páxina, pode volver a <a href=\"%s\">Correo</a>.",
+    "Continue to %s" : "Continuar para %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/he.js b/l10n/he.js
index c08f56eda..13eb09ec1 100644
--- a/l10n/he.js
+++ b/l10n/he.js
@@ -2,56 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "דואר",
-    "Loading accounts" : "אנשי הקשר נטענים",
-    "Error while loading the accounts." : "שגיאה בזמן העלאת החשבונות.",
-    "Can not load this folder." : "לא ניתן לטעון את התיקייה הזאת.",
-    "Searching for {query}" : "מתבצע חיפוש אחר {query}",
-    "Error while deleting message." : "שגיאה בזמן מחיקת הודעה.",
-    "Forwarded message" : "הודעה שקודמה",
-    "Choose a folder to store the attachment in" : "יש לבחור תיקייה לשמירת הקובץ המצורף",
-    "Attachments saved to Files." : "שבצים מצורפים נשמרו לקטגוריית קבצים.",
-    "Attachment saved to Files." : "קובץ מצורף נשמר לקטגוריית קבצים.",
-    "Error while saving attachments to Files." : "שגיאה בזמן שמירת קבצים מצורפים לקטגוריית קבצים.",
-    "Error while saving attachment to Files." : "שגיאה בזמן שמירת קובץ מצורף לקטגוריית קבצים.",
-    "Message flag could not be set." : "לא ניתן היה להגדיר דגל להודעה",
-    "Could not move message." : "לא ניתן להעביר את ההודעה.",
-    "Invalid account" : "חשבון לא חוקי",
-    "Invalid folder" : "תיקייה לא חוקית",
-    "Error while creating the account: " : "שגיאה בעת יצירת החשבון:",
-    "Unknown error" : "שגיאה בלתי ידועה",
-    "Error while updating the account: " : "אירעה שגיאה בעת עדכון החשבון:",
-    "All inboxes" : "כל תיבות דואר נכנס",
-    "you" : "את/ה",
-    "Send message to {email}" : "שליחת הודעה אל {email}",
-    "Could not load {tag}{name}{endtag}" : "לא ניתן לטעון את {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "אירעה שגיאה בטעינה של {tag}{name}{endtag}",
-    "Could not load your message" : "לא ניתן לטעון את ההודעה שלך",
-    "Could not load the desired message" : "לא ניתן לטעון את ההודעה המבוקשת",
-    "Could not load the message" : "לא ניתן לטעון את ההודעה",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["הודעה חדשה \nמאת {from}","2 הודעות חדשות \nמאת {from}","%n הודעות חדשות \nמאת {from}","%n הודעות חדשות \nמאת {from}"],
-    "Nextcloud Mail" : "דוא״ל Nextcloud",
-    "Save" : "שמירה",
-    "Saved" : "נשמר",
-    "Show all folders" : "הצגת כל התיקיות",
-    "Collapse folders" : "קיווץ תיקיות",
-    "Error while deleting account." : "שגיאה בזמן מחיקת חשבון.",
-    "Choose a file to add as attachment" : "בחירת קובץ להוספה כקובץ מצורף",
-    "An error occurred while uploading {fname}" : "אירעה שגיאה בעת ההעלאה של {fname}",
-    "Reply" : "תגובה",
-    "Send" : "שליחה",
-    "Sending …" : "שולח...",
-    "Message sent!" : "הודעה נשלחה!",
-    "Server error" : "שגיאת שרת",
-    "An unknown error occurred" : "אירעה שגיאה בלתי ידועה",
-    "Opening HTML drafts is not supported yet." : "פתיחת טיוטות HTML לא נתמך עדיין.",
-    "No writable calendars found" : "לא נמצאו יומנים ברי כתיבה",
-    "Error while importing the calendar event" : "שגיאה בזמן יבוא של אירוע היומן",
-    "Error while downloading calendar event" : "שגיאה בזמן הורדת אירוע יומן",
-    "& others" : "& אחרים",
-    "Error while loading messages." : "שגיאה בזמן העלאת הודעות.",
-    "Error while refreshing messages." : "אירעה שגיאה בעת רענון ההודעות.",
-    "Setting up your account" : "החשבון שלך מוגדר",
     "Inbox" : "דואר נכנס",
     "Sent" : "נשלח",
     "Drafts" : "טיוטות",
@@ -66,69 +16,70 @@ OC.L10N.register(
     "Delete permanently" : "מחיקה לצמיתות",
     "IMAP web client" : "לקוח דפדפן IMAP",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "לקוח דוא״ל פשוט שמתחבר לשרת הדוא״ל שלך דרך IMAP ו־SMTP.",
-    "Error loading message" : "שגיאה בהעלאת הודעה",
-    "Settings" : "הגדרות",
-    "Forwarding to %s" : "מועבר אל %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "יש ללחוץ כאן אם לא הועברת אוטומטית בשניות הקרובות.",
-    "Redirect" : "הפנייה",
-    "The link leads to %s" : "הקישור מוביל אל %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "אם אינך רוצה לבקר בדף זה, ניתן לחזור אל <a href=\"%s\">הדואר</a>.",
-    "Continue to %s" : "ממשיך אל %s",
-    "Delete account" : "מחיקת חשבון",
-    "Try again" : "ניסיון חוזר",
-    "New message" : "הודעה חדשה",
-    "Account Settings" : "הגדרות חשבון",
-    "Aliases" : "כינויים",
-    "Mail address" : "כתובת דוא״ל",
-    "Display Name" : "שם תצוגה",
-    "Account" : "חשבון",
-    "Toggle read" : "החלפת מצב קריאה",
-    "Delete" : "מחיקה",
-    "Keyboard shortcuts" : "קיצורי מקלדת",
-    "Speed up your Mail experience with these quick shortcuts." : "ניתן להאיץ את חוויית הדוא״ל שלך עם קיצורי המקלדת הזריזים האלו.",
-    "Compose new message" : "כתיבת הודעה חדשה",
-    "Newer message" : "הודעה חדשה יותר",
-    "Older message" : "הודעה ישנה יותר",
-    "Toggle star" : "החלפת מצב כוכב",
-    "Toggle unread" : "החלפת מצב קריאה",
-    "Search" : "חיפוש",
-    "Refresh" : "רענון",
-    "Connect your mail account" : "התחברות לחשבון הדוא״ל שלך",
     "Name" : "שם",
     "Mail Address" : "כתובת דוא״ל",
     "Password" : "ססמה",
-    "Manual configuration" : "תצורה ידנית",
     "IMAP Host" : "מארח IMAP",
-    "IMAP security" : "אבטחת IMAP",
     "None" : "ללא",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "פתחת IMAP",
     "IMAP User" : "משתמש IMAP",
     "IMAP Password" : "ססמת IMAP",
     "SMTP Host" : "מארח SMTP",
-    "SMTP security" : "אבטחת SMTP",
     "SMTP Port" : "פתחת SMTP",
     "SMTP User" : "משתמש SMTP",
     "SMTP Password" : "ססמת SMTP",
     "Connect" : "התחברות",
+    "Add mail account" : "הוספת חשבון דוא״ל",
+    "Use Gravatar and favicon avatars" : "להשתמש בסמלים של Gravatar ושל favicon",
+    "Keyboard shortcuts" : "קיצורי מקלדת",
     "from" : "מאת",
     "to" : "אל",
     "cc" : "עותק",
     "bcc" : "עותק נסתר",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "נא לשים לב כי הדוא״ל מגיע מכתובת ללא מענה (noreply) ולכן התגובה שלך לא תיקרא.",
     "Subject" : "נושא",
-    "Save all to Files" : "שמירת הכו לקבצים",
-    "Add mail account" : "הוספת חשבון דוא״ל",
-    "Use Gravatar and favicon avatars" : "להשתמש בסמלים של Gravatar ושל favicon",
-    "No search results for" : "אין תוצאות לחיפוש",
-    "The images have been blocked to protect your privacy." : "התמונות נחסמו כדי להגן על הפרטיות שלך",
-    "Show images from this sender" : "הצגת תמונות מנמען זה",
-    "Forward" : "העברה",
-    "No messages in this folder" : "אין הודעות בתיקייה זו",
+    "Sending …" : "שולח...",
+    "Message sent!" : "הודעה נשלחה!",
+    "Send" : "שליחה",
     "Upload attachment" : "העלאת קובץ מצורף",
     "Add attachment from Files" : "הוספת קובץ מצורף מהקבצים",
+    "Choose a file to add as attachment" : "בחירת קובץ להוספה כקובץ מצורף",
+    "No messages in this folder" : "אין הודעות בתיקייה זו",
+    "Delete" : "מחיקה",
+    "Could not load your message" : "לא ניתן לטעון את ההודעה שלך",
     "Import into calendar" : "ייבוא ליומן",
     "Download attachment" : "הורדת קובץ מצורף",
-    "Save to Files" : "שמירה לקבצים"
+    "Save to Files" : "שמירה לקבצים",
+    "Choose a folder to store the attachment in" : "יש לבחור תיקייה לשמירת הקובץ המצורף",
+    "Save all to Files" : "שמירת הכו לקבצים",
+    "The images have been blocked to protect your privacy." : "התמונות נחסמו כדי להגן על הפרטיות שלך",
+    "New message" : "הודעה חדשה",
+    "Settings" : "הגדרות",
+    "Speed up your Mail experience with these quick shortcuts." : "ניתן להאיץ את חוויית הדוא״ל שלך עם קיצורי המקלדת הזריזים האלו.",
+    "Compose new message" : "כתיבת הודעה חדשה",
+    "Newer message" : "הודעה חדשה יותר",
+    "Older message" : "הודעה ישנה יותר",
+    "Toggle star" : "החלפת מצב כוכב",
+    "Toggle unread" : "החלפת מצב קריאה",
+    "Search" : "חיפוש",
+    "Refresh" : "רענון",
+    "Connect your mail account" : "התחברות לחשבון הדוא״ל שלך",
+    "Show all folders" : "הצגת כל התיקיות",
+    "Collapse folders" : "קיווץ תיקיות",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["הודעה חדשה \nמאת {from}","2 הודעות חדשות \nמאת {from}","%n הודעות חדשות \nמאת {from}","%n הודעות חדשות \nמאת {from}"],
+    "Nextcloud Mail" : "דוא״ל Nextcloud",
+    "All inboxes" : "כל תיבות דואר נכנס",
+    "Could not load {tag}{name}{endtag}" : "לא ניתן לטעון את {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "אירעה שגיאה בטעינה של {tag}{name}{endtag}",
+    "Could not load the desired message" : "לא ניתן לטעון את ההודעה המבוקשת",
+    "Could not load the message" : "לא ניתן לטעון את ההודעה",
+    "Error loading message" : "שגיאה בהעלאת הודעה",
+    "Forwarding to %s" : "מועבר אל %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "יש ללחוץ כאן אם לא הועברת אוטומטית בשניות הקרובות.",
+    "Redirect" : "הפנייה",
+    "The link leads to %s" : "הקישור מוביל אל %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "אם אינך רוצה לבקר בדף זה, ניתן לחזור אל <a href=\"%s\">הדואר</a>.",
+    "Continue to %s" : "ממשיך אל %s"
 },
 "nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;");
diff --git a/l10n/he.json b/l10n/he.json
index d42f2b1b9..9257bbcb6 100644
--- a/l10n/he.json
+++ b/l10n/he.json
@@ -1,55 +1,5 @@
 { "translations": {
     "Mail" : "דואר",
-    "Loading accounts" : "אנשי הקשר נטענים",
-    "Error while loading the accounts." : "שגיאה בזמן העלאת החשבונות.",
-    "Can not load this folder." : "לא ניתן לטעון את התיקייה הזאת.",
-    "Searching for {query}" : "מתבצע חיפוש אחר {query}",
-    "Error while deleting message." : "שגיאה בזמן מחיקת הודעה.",
-    "Forwarded message" : "הודעה שקודמה",
-    "Choose a folder to store the attachment in" : "יש לבחור תיקייה לשמירת הקובץ המצורף",
-    "Attachments saved to Files." : "שבצים מצורפים נשמרו לקטגוריית קבצים.",
-    "Attachment saved to Files." : "קובץ מצורף נשמר לקטגוריית קבצים.",
-    "Error while saving attachments to Files." : "שגיאה בזמן שמירת קבצים מצורפים לקטגוריית קבצים.",
-    "Error while saving attachment to Files." : "שגיאה בזמן שמירת קובץ מצורף לקטגוריית קבצים.",
-    "Message flag could not be set." : "לא ניתן היה להגדיר דגל להודעה",
-    "Could not move message." : "לא ניתן להעביר את ההודעה.",
-    "Invalid account" : "חשבון לא חוקי",
-    "Invalid folder" : "תיקייה לא חוקית",
-    "Error while creating the account: " : "שגיאה בעת יצירת החשבון:",
-    "Unknown error" : "שגיאה בלתי ידועה",
-    "Error while updating the account: " : "אירעה שגיאה בעת עדכון החשבון:",
-    "All inboxes" : "כל תיבות דואר נכנס",
-    "you" : "את/ה",
-    "Send message to {email}" : "שליחת הודעה אל {email}",
-    "Could not load {tag}{name}{endtag}" : "לא ניתן לטעון את {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "אירעה שגיאה בטעינה של {tag}{name}{endtag}",
-    "Could not load your message" : "לא ניתן לטעון את ההודעה שלך",
-    "Could not load the desired message" : "לא ניתן לטעון את ההודעה המבוקשת",
-    "Could not load the message" : "לא ניתן לטעון את ההודעה",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["הודעה חדשה \nמאת {from}","2 הודעות חדשות \nמאת {from}","%n הודעות חדשות \nמאת {from}","%n הודעות חדשות \nמאת {from}"],
-    "Nextcloud Mail" : "דוא״ל Nextcloud",
-    "Save" : "שמירה",
-    "Saved" : "נשמר",
-    "Show all folders" : "הצגת כל התיקיות",
-    "Collapse folders" : "קיווץ תיקיות",
-    "Error while deleting account." : "שגיאה בזמן מחיקת חשבון.",
-    "Choose a file to add as attachment" : "בחירת קובץ להוספה כקובץ מצורף",
-    "An error occurred while uploading {fname}" : "אירעה שגיאה בעת ההעלאה של {fname}",
-    "Reply" : "תגובה",
-    "Send" : "שליחה",
-    "Sending …" : "שולח...",
-    "Message sent!" : "הודעה נשלחה!",
-    "Server error" : "שגיאת שרת",
-    "An unknown error occurred" : "אירעה שגיאה בלתי ידועה",
-    "Opening HTML drafts is not supported yet." : "פתיחת טיוטות HTML לא נתמך עדיין.",
-    "No writable calendars found" : "לא נמצאו יומנים ברי כתיבה",
-    "Error while importing the calendar event" : "שגיאה בזמן יבוא של אירוע היומן",
-    "Error while downloading calendar event" : "שגיאה בזמן הורדת אירוע יומן",
-    "& others" : "& אחרים",
-    "Error while loading messages." : "שגיאה בזמן העלאת הודעות.",
-    "Error while refreshing messages." : "אירעה שגיאה בעת רענון ההודעות.",
-    "Setting up your account" : "החשבון שלך מוגדר",
     "Inbox" : "דואר נכנס",
     "Sent" : "נשלח",
     "Drafts" : "טיוטות",
@@ -64,69 +14,70 @@
     "Delete permanently" : "מחיקה לצמיתות",
     "IMAP web client" : "לקוח דפדפן IMAP",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "לקוח דוא״ל פשוט שמתחבר לשרת הדוא״ל שלך דרך IMAP ו־SMTP.",
-    "Error loading message" : "שגיאה בהעלאת הודעה",
-    "Settings" : "הגדרות",
-    "Forwarding to %s" : "מועבר אל %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "יש ללחוץ כאן אם לא הועברת אוטומטית בשניות הקרובות.",
-    "Redirect" : "הפנייה",
-    "The link leads to %s" : "הקישור מוביל אל %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "אם אינך רוצה לבקר בדף זה, ניתן לחזור אל <a href=\"%s\">הדואר</a>.",
-    "Continue to %s" : "ממשיך אל %s",
-    "Delete account" : "מחיקת חשבון",
-    "Try again" : "ניסיון חוזר",
-    "New message" : "הודעה חדשה",
-    "Account Settings" : "הגדרות חשבון",
-    "Aliases" : "כינויים",
-    "Mail address" : "כתובת דוא״ל",
-    "Display Name" : "שם תצוגה",
-    "Account" : "חשבון",
-    "Toggle read" : "החלפת מצב קריאה",
-    "Delete" : "מחיקה",
-    "Keyboard shortcuts" : "קיצורי מקלדת",
-    "Speed up your Mail experience with these quick shortcuts." : "ניתן להאיץ את חוויית הדוא״ל שלך עם קיצורי המקלדת הזריזים האלו.",
-    "Compose new message" : "כתיבת הודעה חדשה",
-    "Newer message" : "הודעה חדשה יותר",
-    "Older message" : "הודעה ישנה יותר",
-    "Toggle star" : "החלפת מצב כוכב",
-    "Toggle unread" : "החלפת מצב קריאה",
-    "Search" : "חיפוש",
-    "Refresh" : "רענון",
-    "Connect your mail account" : "התחברות לחשבון הדוא״ל שלך",
     "Name" : "שם",
     "Mail Address" : "כתובת דוא״ל",
     "Password" : "ססמה",
-    "Manual configuration" : "תצורה ידנית",
     "IMAP Host" : "מארח IMAP",
-    "IMAP security" : "אבטחת IMAP",
     "None" : "ללא",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "פתחת IMAP",
     "IMAP User" : "משתמש IMAP",
     "IMAP Password" : "ססמת IMAP",
     "SMTP Host" : "מארח SMTP",
-    "SMTP security" : "אבטחת SMTP",
     "SMTP Port" : "פתחת SMTP",
     "SMTP User" : "משתמש SMTP",
     "SMTP Password" : "ססמת SMTP",
     "Connect" : "התחברות",
+    "Add mail account" : "הוספת חשבון דוא״ל",
+    "Use Gravatar and favicon avatars" : "להשתמש בסמלים של Gravatar ושל favicon",
+    "Keyboard shortcuts" : "קיצורי מקלדת",
     "from" : "מאת",
     "to" : "אל",
     "cc" : "עותק",
     "bcc" : "עותק נסתר",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "נא לשים לב כי הדוא״ל מגיע מכתובת ללא מענה (noreply) ולכן התגובה שלך לא תיקרא.",
     "Subject" : "נושא",
-    "Save all to Files" : "שמירת הכו לקבצים",
-    "Add mail account" : "הוספת חשבון דוא״ל",
-    "Use Gravatar and favicon avatars" : "להשתמש בסמלים של Gravatar ושל favicon",
-    "No search results for" : "אין תוצאות לחיפוש",
-    "The images have been blocked to protect your privacy." : "התמונות נחסמו כדי להגן על הפרטיות שלך",
-    "Show images from this sender" : "הצגת תמונות מנמען זה",
-    "Forward" : "העברה",
-    "No messages in this folder" : "אין הודעות בתיקייה זו",
+    "Sending …" : "שולח...",
+    "Message sent!" : "הודעה נשלחה!",
+    "Send" : "שליחה",
     "Upload attachment" : "העלאת קובץ מצורף",
     "Add attachment from Files" : "הוספת קובץ מצורף מהקבצים",
+    "Choose a file to add as attachment" : "בחירת קובץ להוספה כקובץ מצורף",
+    "No messages in this folder" : "אין הודעות בתיקייה זו",
+    "Delete" : "מחיקה",
+    "Could not load your message" : "לא ניתן לטעון את ההודעה שלך",
     "Import into calendar" : "ייבוא ליומן",
     "Download attachment" : "הורדת קובץ מצורף",
-    "Save to Files" : "שמירה לקבצים"
+    "Save to Files" : "שמירה לקבצים",
+    "Choose a folder to store the attachment in" : "יש לבחור תיקייה לשמירת הקובץ המצורף",
+    "Save all to Files" : "שמירת הכו לקבצים",
+    "The images have been blocked to protect your privacy." : "התמונות נחסמו כדי להגן על הפרטיות שלך",
+    "New message" : "הודעה חדשה",
+    "Settings" : "הגדרות",
+    "Speed up your Mail experience with these quick shortcuts." : "ניתן להאיץ את חוויית הדוא״ל שלך עם קיצורי המקלדת הזריזים האלו.",
+    "Compose new message" : "כתיבת הודעה חדשה",
+    "Newer message" : "הודעה חדשה יותר",
+    "Older message" : "הודעה ישנה יותר",
+    "Toggle star" : "החלפת מצב כוכב",
+    "Toggle unread" : "החלפת מצב קריאה",
+    "Search" : "חיפוש",
+    "Refresh" : "רענון",
+    "Connect your mail account" : "התחברות לחשבון הדוא״ל שלך",
+    "Show all folders" : "הצגת כל התיקיות",
+    "Collapse folders" : "קיווץ תיקיות",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["הודעה חדשה \nמאת {from}","2 הודעות חדשות \nמאת {from}","%n הודעות חדשות \nמאת {from}","%n הודעות חדשות \nמאת {from}"],
+    "Nextcloud Mail" : "דוא״ל Nextcloud",
+    "All inboxes" : "כל תיבות דואר נכנס",
+    "Could not load {tag}{name}{endtag}" : "לא ניתן לטעון את {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "אירעה שגיאה בטעינה של {tag}{name}{endtag}",
+    "Could not load the desired message" : "לא ניתן לטעון את ההודעה המבוקשת",
+    "Could not load the message" : "לא ניתן לטעון את ההודעה",
+    "Error loading message" : "שגיאה בהעלאת הודעה",
+    "Forwarding to %s" : "מועבר אל %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "יש ללחוץ כאן אם לא הועברת אוטומטית בשניות הקרובות.",
+    "Redirect" : "הפנייה",
+    "The link leads to %s" : "הקישור מוביל אל %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "אם אינך רוצה לבקר בדף זה, ניתן לחזור אל <a href=\"%s\">הדואר</a>.",
+    "Continue to %s" : "ממשיך אל %s"
 },"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;"
 }
\ No newline at end of file
diff --git a/l10n/hr.js b/l10n/hr.js
index b9b0b969b..306836716 100644
--- a/l10n/hr.js
+++ b/l10n/hr.js
@@ -2,41 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Pošta",
-    "Error while loading the accounts." : "Pogreška pri učitavanju računa.",
-    "Searching for {query}" : "Tražim {query}",
-    "Error while deleting message." : "Greška pri brisanju poruke.",
-    "Forwarded message" : "Proslijeđena poruka",
-    "Choose a folder to store the attachment in" : "Izaberi mapu za spremanje priloga",
-    "Attachments saved to Files." : "Prilozi spremljeni u Datoteke.",
-    "Attachment saved to Files." : "Prilog spremljen u Datoteke.",
-    "Error while saving attachments to Files." : "Greška pri spremanju priloga u Datoteke.",
-    "Error while saving attachment to Files." : "Greška pri spremanju priloga u Datoteke.",
-    "Message flag could not be set." : "Greška pri postavljanju oznaka poruke.",
-    "Could not move message." : "Greška pri premještanju poruke.",
-    "Invalid account" : "Nevažeći račun",
-    "Invalid folder" : "Nevažeća mapa",
-    "Unknown error" : "Nepoznata pogreška",
-    "All inboxes" : "Sve dolazne",
-    "Send message to {email}" : "Pošalji poruku na {email}",
-    "Could not load {tag}{name}{endtag}" : "Greška pri učitavanju {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Problem pri učitavanju {tag}{name}{endtag}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "Save" : "Spremi",
-    "Show all folders" : "Prikaži sve mape",
-    "Collapse folders" : "Sakrij mape",
-    "Error while deleting account." : "Greška pri brisanju računa.",
-    "Choose a file to add as attachment" : "Izaberi datoteku",
-    "Reply" : "Odgovori",
-    "Send" : "Pošalji",
-    "Sending …" : "Šaljem …",
-    "Message sent!" : "Poruka poslana!",
-    "Server error" : "Greška poslužitelja",
-    "An unknown error occurred" : "Došlo je do nepoznate greške",
-    "Opening HTML drafts is not supported yet." : "Otvaranje HTML skica još nije podržano.",
-    "No writable calendars found" : "Nije pronađen nijedan dostupni kalendar",
-    "Error while importing the calendar event" : "Greška pri uvozu događaja kalendara",
-    "Error while downloading calendar event" : "Greška pri preuzimanju događaja kalendara",
-    "Error while loading messages." : "Greška pri učitavanju poruke.",
     "Inbox" : "Dolazne",
     "Sent" : "Poslane",
     "Drafts" : "Skice",
@@ -48,49 +13,50 @@ OC.L10N.register(
     "Auto detect failed. Please use manual mode." : "Neuspjelo automatsko otkrivanje. Molim upisati postavke ručno.",
     "Creating account failed: " : "Neuspjela izrada računa:",
     "Delete permanently" : "Trajno izbrisati",
-    "Error loading message" : "Greška pri učitavanju poruke",
-    "Settings" : "Postavke",
-    "Click here if you are not automatically redirected within the next few seconds." : "Kliknuti ovdje ukoliko se ne preusmjeri automatski unutar sljedećih nekoliko sekundi.",
-    "Redirect" : "Preusmjeravanje",
-    "The link leads to %s" : "Ova poveznica vodi do %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Ukoliko ne želite posjetiti tu stranicu, možete se vratiti na <a href=\"%s\">Poštu</a>.",
-    "Continue to %s" : "Idi do %s",
-    "Delete account" : "Izbriši račun",
-    "New message" : "Nova poruka",
-    "Account Settings" : "Postavke računa",
-    "Aliases" : "Pseudonimi",
-    "Mail address" : "Email adresa",
-    "Connect your mail account" : "Poveži svoj email račun",
     "Name" : "Ime",
     "Mail Address" : "Email adresa",
     "Password" : "Lozinka",
-    "Manual configuration" : "Ručne postavke",
     "IMAP Host" : "IMAP poslužiitelj",
-    "IMAP security" : "IMAP osiguranje",
     "None" : "Nema",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP priključak",
     "IMAP User" : "IMAP korisničko ime",
     "IMAP Password" : "IMAP lozinka",
     "SMTP Host" : "SMTP poslužiitelj",
-    "SMTP security" : "SMTP osiguranje",
     "SMTP Port" : "SMTP priključak",
     "SMTP User" : "SMTP korisničko ime",
     "SMTP Password" : "SMTP lozinka",
     "Connect" : "Poveži",
+    "Add mail account" : "Dodaj račun",
     "from" : "od",
     "to" : "do",
     "cc" : "cc",
     "bcc" : "bcc",
     "Subject" : "Predmet",
-    "Save all to Files" : "Spremi sve u Datoteke",
-    "Add mail account" : "Dodaj račun",
-    "No search results for" : "Nije pronađen nijedan rezultat za",
-    "The images have been blocked to protect your privacy." : "Slike su blokirane u svrhu zaštite privatnosti.",
-    "Show images from this sender" : "Prikaži slike od ovog pošaljioca",
-    "Forward" : "Proslijedi",
+    "Sending …" : "Šaljem …",
+    "Message sent!" : "Poruka poslana!",
+    "Send" : "Pošalji",
+    "Choose a file to add as attachment" : "Izaberi datoteku",
     "Import into calendar" : "Dodaj u kalendar",
     "Download attachment" : "Preuzmi prilog",
-    "Save to Files" : "Spremi u Datoteke"
+    "Save to Files" : "Spremi u Datoteke",
+    "Choose a folder to store the attachment in" : "Izaberi mapu za spremanje priloga",
+    "Save all to Files" : "Spremi sve u Datoteke",
+    "The images have been blocked to protect your privacy." : "Slike su blokirane u svrhu zaštite privatnosti.",
+    "New message" : "Nova poruka",
+    "Settings" : "Postavke",
+    "Connect your mail account" : "Poveži svoj email račun",
+    "Show all folders" : "Prikaži sve mape",
+    "Collapse folders" : "Sakrij mape",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "All inboxes" : "Sve dolazne",
+    "Could not load {tag}{name}{endtag}" : "Greška pri učitavanju {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Problem pri učitavanju {tag}{name}{endtag}",
+    "Error loading message" : "Greška pri učitavanju poruke",
+    "Click here if you are not automatically redirected within the next few seconds." : "Kliknuti ovdje ukoliko se ne preusmjeri automatski unutar sljedećih nekoliko sekundi.",
+    "Redirect" : "Preusmjeravanje",
+    "The link leads to %s" : "Ova poveznica vodi do %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Ukoliko ne želite posjetiti tu stranicu, možete se vratiti na <a href=\"%s\">Poštu</a>.",
+    "Continue to %s" : "Idi do %s"
 },
 "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;");
diff --git a/l10n/hr.json b/l10n/hr.json
index b32870aab..ab2ca78cb 100644
--- a/l10n/hr.json
+++ b/l10n/hr.json
@@ -1,40 +1,5 @@
 { "translations": {
     "Mail" : "Pošta",
-    "Error while loading the accounts." : "Pogreška pri učitavanju računa.",
-    "Searching for {query}" : "Tražim {query}",
-    "Error while deleting message." : "Greška pri brisanju poruke.",
-    "Forwarded message" : "Proslijeđena poruka",
-    "Choose a folder to store the attachment in" : "Izaberi mapu za spremanje priloga",
-    "Attachments saved to Files." : "Prilozi spremljeni u Datoteke.",
-    "Attachment saved to Files." : "Prilog spremljen u Datoteke.",
-    "Error while saving attachments to Files." : "Greška pri spremanju priloga u Datoteke.",
-    "Error while saving attachment to Files." : "Greška pri spremanju priloga u Datoteke.",
-    "Message flag could not be set." : "Greška pri postavljanju oznaka poruke.",
-    "Could not move message." : "Greška pri premještanju poruke.",
-    "Invalid account" : "Nevažeći račun",
-    "Invalid folder" : "Nevažeća mapa",
-    "Unknown error" : "Nepoznata pogreška",
-    "All inboxes" : "Sve dolazne",
-    "Send message to {email}" : "Pošalji poruku na {email}",
-    "Could not load {tag}{name}{endtag}" : "Greška pri učitavanju {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Problem pri učitavanju {tag}{name}{endtag}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "Save" : "Spremi",
-    "Show all folders" : "Prikaži sve mape",
-    "Collapse folders" : "Sakrij mape",
-    "Error while deleting account." : "Greška pri brisanju računa.",
-    "Choose a file to add as attachment" : "Izaberi datoteku",
-    "Reply" : "Odgovori",
-    "Send" : "Pošalji",
-    "Sending …" : "Šaljem …",
-    "Message sent!" : "Poruka poslana!",
-    "Server error" : "Greška poslužitelja",
-    "An unknown error occurred" : "Došlo je do nepoznate greške",
-    "Opening HTML drafts is not supported yet." : "Otvaranje HTML skica još nije podržano.",
-    "No writable calendars found" : "Nije pronađen nijedan dostupni kalendar",
-    "Error while importing the calendar event" : "Greška pri uvozu događaja kalendara",
-    "Error while downloading calendar event" : "Greška pri preuzimanju događaja kalendara",
-    "Error while loading messages." : "Greška pri učitavanju poruke.",
     "Inbox" : "Dolazne",
     "Sent" : "Poslane",
     "Drafts" : "Skice",
@@ -46,49 +11,50 @@
     "Auto detect failed. Please use manual mode." : "Neuspjelo automatsko otkrivanje. Molim upisati postavke ručno.",
     "Creating account failed: " : "Neuspjela izrada računa:",
     "Delete permanently" : "Trajno izbrisati",
-    "Error loading message" : "Greška pri učitavanju poruke",
-    "Settings" : "Postavke",
-    "Click here if you are not automatically redirected within the next few seconds." : "Kliknuti ovdje ukoliko se ne preusmjeri automatski unutar sljedećih nekoliko sekundi.",
-    "Redirect" : "Preusmjeravanje",
-    "The link leads to %s" : "Ova poveznica vodi do %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Ukoliko ne želite posjetiti tu stranicu, možete se vratiti na <a href=\"%s\">Poštu</a>.",
-    "Continue to %s" : "Idi do %s",
-    "Delete account" : "Izbriši račun",
-    "New message" : "Nova poruka",
-    "Account Settings" : "Postavke računa",
-    "Aliases" : "Pseudonimi",
-    "Mail address" : "Email adresa",
-    "Connect your mail account" : "Poveži svoj email račun",
     "Name" : "Ime",
     "Mail Address" : "Email adresa",
     "Password" : "Lozinka",
-    "Manual configuration" : "Ručne postavke",
     "IMAP Host" : "IMAP poslužiitelj",
-    "IMAP security" : "IMAP osiguranje",
     "None" : "Nema",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP priključak",
     "IMAP User" : "IMAP korisničko ime",
     "IMAP Password" : "IMAP lozinka",
     "SMTP Host" : "SMTP poslužiitelj",
-    "SMTP security" : "SMTP osiguranje",
     "SMTP Port" : "SMTP priključak",
     "SMTP User" : "SMTP korisničko ime",
     "SMTP Password" : "SMTP lozinka",
     "Connect" : "Poveži",
+    "Add mail account" : "Dodaj račun",
     "from" : "od",
     "to" : "do",
     "cc" : "cc",
     "bcc" : "bcc",
     "Subject" : "Predmet",
-    "Save all to Files" : "Spremi sve u Datoteke",
-    "Add mail account" : "Dodaj račun",
-    "No search results for" : "Nije pronađen nijedan rezultat za",
-    "The images have been blocked to protect your privacy." : "Slike su blokirane u svrhu zaštite privatnosti.",
-    "Show images from this sender" : "Prikaži slike od ovog pošaljioca",
-    "Forward" : "Proslijedi",
+    "Sending …" : "Šaljem …",
+    "Message sent!" : "Poruka poslana!",
+    "Send" : "Pošalji",
+    "Choose a file to add as attachment" : "Izaberi datoteku",
     "Import into calendar" : "Dodaj u kalendar",
     "Download attachment" : "Preuzmi prilog",
-    "Save to Files" : "Spremi u Datoteke"
+    "Save to Files" : "Spremi u Datoteke",
+    "Choose a folder to store the attachment in" : "Izaberi mapu za spremanje priloga",
+    "Save all to Files" : "Spremi sve u Datoteke",
+    "The images have been blocked to protect your privacy." : "Slike su blokirane u svrhu zaštite privatnosti.",
+    "New message" : "Nova poruka",
+    "Settings" : "Postavke",
+    "Connect your mail account" : "Poveži svoj email račun",
+    "Show all folders" : "Prikaži sve mape",
+    "Collapse folders" : "Sakrij mape",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "All inboxes" : "Sve dolazne",
+    "Could not load {tag}{name}{endtag}" : "Greška pri učitavanju {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Problem pri učitavanju {tag}{name}{endtag}",
+    "Error loading message" : "Greška pri učitavanju poruke",
+    "Click here if you are not automatically redirected within the next few seconds." : "Kliknuti ovdje ukoliko se ne preusmjeri automatski unutar sljedećih nekoliko sekundi.",
+    "Redirect" : "Preusmjeravanje",
+    "The link leads to %s" : "Ova poveznica vodi do %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Ukoliko ne želite posjetiti tu stranicu, možete se vratiti na <a href=\"%s\">Poštu</a>.",
+    "Continue to %s" : "Idi do %s"
 },"pluralForm" :"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/hu.js b/l10n/hu.js
index 464671e77..6655f7375 100644
--- a/l10n/hu.js
+++ b/l10n/hu.js
@@ -2,56 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Levelezés",
-    "Loading accounts" : "Fiókok betöltése",
-    "Error while loading the accounts." : "Hiba történt a fiókok betöltése közben.",
-    "Can not load this folder." : "Ezt a mappát nem lehet betölteni.",
-    "Searching for {query}" : "Keresés: {query}",
-    "Error while deleting message." : "Hiba történt az üzenet törlése közben.",
-    "Forwarded message" : "Továbbított üzenet",
-    "Choose a folder to store the attachment in" : "Válasszon egy mappát a mellékletek tárolásához:",
-    "Attachments saved to Files." : "Mellékletek mentve a Fájlokba.",
-    "Attachment saved to Files." : "Melléklet mentve a Fájlokba.",
-    "Error while saving attachments to Files." : "Hiba történt a mellékletek Fájlokba mentése közben.",
-    "Error while saving attachment to Files." : "Hiba történt a melléklet Fájlokba mentése közben.",
-    "Message flag could not be set." : "Üzenet zászló nem állítható be.",
-    "Could not move message." : "Nem lehet áthelyezni az üzenetet",
-    "Invalid account" : "Érvénytelen fiók",
-    "Invalid folder" : "Érvénytelen mappa",
-    "Error while creating the account: " : "Hiba történt a fiók létrehozásakor:",
-    "Unknown error" : "Ismeretlen hiba",
-    "Error while updating the account: " : "Hiba történt a fiók frissítése közben:",
-    "All inboxes" : "Minden bejövő",
-    "you" : "te",
-    "Send message to {email}" : "Üzenet küldés ide: {email}",
-    "Could not load {tag}{name}{endtag}" : "Nem tölthető be: {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Probléma volt a betöltéssel: {tag}{name}{endtag}",
-    "Could not load your message" : "Nem lehet betölteni az üzenetedet",
-    "Could not load the desired message" : "Nem lehet betölteni a kért üzenetet",
-    "Could not load the message" : "Nem lehet betölteni az üzenetet",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n új üzenet \nfeladó: {from}","%n új üzenet \nfeladó: {from}"],
-    "Nextcloud Mail" : "Nextcloud Mail",
-    "Save" : "Mentés",
-    "Saved" : "Elmentve",
-    "Show all folders" : "Minden mappa megjelenítése",
-    "Collapse folders" : "Mappák összecsukása",
-    "Error while deleting account." : "Hiba történt a fiók törlése közben.",
-    "Choose a file to add as attachment" : "Csatolandó fájl kiválasztása",
-    "An error occurred while uploading {fname}" : "Hiba a(z) {fname} feltöltése közben",
-    "Reply" : "Válasz",
-    "Send" : "Küldés",
-    "Sending …" : "Küldés...",
-    "Message sent!" : "Üzenet elküldve!",
-    "Server error" : "Szerver hiba",
-    "An unknown error occurred" : "Ismeretlen hiba történt",
-    "Opening HTML drafts is not supported yet." : "A HTML vázlatok megnyitása még nem támogatott.",
-    "No writable calendars found" : "Nem található írható naptár",
-    "Error while importing the calendar event" : "Hiba a naptár esemény importálása közben",
-    "Error while downloading calendar event" : "Hiba a naptár esemény letöltése közben",
-    "& others" : "és mások",
-    "Error while loading messages." : "Hiba történt az üzenetek betöltése közben.",
-    "Error while refreshing messages." : "Hiba az üzenetek frissítése közben.",
-    "Setting up your account" : "Fiókod beállítása",
     "Inbox" : "Bejövő",
     "Sent" : "Elküldött",
     "Drafts" : "Vázlatok",
@@ -66,69 +16,70 @@ OC.L10N.register(
     "Delete permanently" : "Végleges törlés",
     "IMAP web client" : "IMAP web kliens",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Könnyen használható levelező kliens mely a levelező szerveredhez csatlakozik IMAP és SMTP protokolon.",
-    "Error loading message" : "Hiba történt az üzenet betöltése közben",
-    "Settings" : "Beállítások",
-    "Forwarding to %s" : "Továbbítás ide: %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Kattints ide, ha a következő néhány másodpercben lennél automatikusan átirányítva.",
-    "Redirect" : "Átirányítás",
-    "The link leads to %s" : "A hivatkozás ide mutat: %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Ha nem akarod megnyitni azt az oldalt, akkor térj vissza a <a href=\"%s\">Levelekhez</a>",
-    "Continue to %s" : "Folytatás ide: %s",
-    "Delete account" : "Fiók törlése",
-    "Try again" : "Próbáld újra",
-    "New message" : "Új üzenet",
-    "Account Settings" : "Fiók beállítások",
-    "Aliases" : "Álnevek",
-    "Mail address" : "E-mail cím",
-    "Display Name" : "Megjelenített név",
-    "Account" : "Fiók",
-    "Toggle read" : "Olvasásra váltása",
-    "Delete" : "Törlés",
-    "Keyboard shortcuts" : "Gyorsbillentyűk",
-    "Speed up your Mail experience with these quick shortcuts." : "Gyorsítsd fel a levelezési élményedet ezekkel a rövidítésekkel.",
-    "Compose new message" : "Új üzenet írása",
-    "Newer message" : "Újabb üzenet",
-    "Older message" : "Régebbi üzenet",
-    "Toggle star" : "Csillagozás váltása",
-    "Toggle unread" : "Olvasatlanság váltása",
-    "Search" : "Keresés",
-    "Refresh" : "Frissítés",
-    "Connect your mail account" : "Kapcsolódás az e-mail fiókodhoz",
     "Name" : "Név",
     "Mail Address" : "E-mail cím",
     "Password" : "Jelszó",
-    "Manual configuration" : "Kézi beállítások",
     "IMAP Host" : "IMAP kiszolgáló",
-    "IMAP security" : "IMAP biztonság",
     "None" : "Semmi",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP port",
     "IMAP User" : "IMAP felhasználó",
     "IMAP Password" : "IMAP jelszó",
     "SMTP Host" : "SMTP kiszolgáló",
-    "SMTP security" : "SMTP biztonság",
     "SMTP Port" : "SMTP port",
     "SMTP User" : "SMTP felhasználó",
     "SMTP Password" : "SMTP jelszó",
     "Connect" : "Csatlakozás",
+    "Add mail account" : "E-mail fiók hozzáadás",
+    "Use Gravatar and favicon avatars" : "Gravatar és favicon avatarok használata",
+    "Keyboard shortcuts" : "Gyorsbillentyűk",
     "from" : "feladó",
     "to" : "címzett",
     "cc" : "másolat",
     "bcc" : "titkos másolat",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Vedd figyelembe, hogy egy \"ne válaszolj\" címről jött a levél, így válaszodat valószínűleg nem fogják elolvasni.",
     "Subject" : "Tárgy",
-    "Save all to Files" : "Minden mentése a Fájlokba",
-    "Add mail account" : "E-mail fiók hozzáadás",
-    "Use Gravatar and favicon avatars" : "Gravatar és favicon avatarok használata",
-    "No search results for" : "Ehhez nincsenek keresési eredmények",
-    "The images have been blocked to protect your privacy." : "A személyes adataid védelme érdekében a képeket letiltottuk.",
-    "Show images from this sender" : "Képek megjelenítése ettől a feladótól",
-    "Forward" : "Továbbítás",
-    "No messages in this folder" : "Nincs üzenet a mappában!",
+    "Sending …" : "Küldés...",
+    "Message sent!" : "Üzenet elküldve!",
+    "Send" : "Küldés",
     "Upload attachment" : "Csatolmány feltöltése",
     "Add attachment from Files" : "Csatolmány hozzáadása a Fájlok közül",
+    "Choose a file to add as attachment" : "Csatolandó fájl kiválasztása",
+    "No messages in this folder" : "Nincs üzenet a mappában!",
+    "Delete" : "Törlés",
+    "Could not load your message" : "Nem lehet betölteni az üzenetedet",
     "Import into calendar" : "Betöltés a naptárba",
     "Download attachment" : "Melléklet letöltése",
-    "Save to Files" : "Metés a Fájlokba"
+    "Save to Files" : "Metés a Fájlokba",
+    "Choose a folder to store the attachment in" : "Válasszon egy mappát a mellékletek tárolásához:",
+    "Save all to Files" : "Minden mentése a Fájlokba",
+    "The images have been blocked to protect your privacy." : "A személyes adataid védelme érdekében a képeket letiltottuk.",
+    "New message" : "Új üzenet",
+    "Settings" : "Beállítások",
+    "Speed up your Mail experience with these quick shortcuts." : "Gyorsítsd fel a levelezési élményedet ezekkel a rövidítésekkel.",
+    "Compose new message" : "Új üzenet írása",
+    "Newer message" : "Újabb üzenet",
+    "Older message" : "Régebbi üzenet",
+    "Toggle star" : "Csillagozás váltása",
+    "Toggle unread" : "Olvasatlanság váltása",
+    "Search" : "Keresés",
+    "Refresh" : "Frissítés",
+    "Connect your mail account" : "Kapcsolódás az e-mail fiókodhoz",
+    "Show all folders" : "Minden mappa megjelenítése",
+    "Collapse folders" : "Mappák összecsukása",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n új üzenet \nfeladó: {from}","%n új üzenet \nfeladó: {from}"],
+    "Nextcloud Mail" : "Nextcloud Mail",
+    "All inboxes" : "Minden bejövő",
+    "Could not load {tag}{name}{endtag}" : "Nem tölthető be: {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Probléma volt a betöltéssel: {tag}{name}{endtag}",
+    "Could not load the desired message" : "Nem lehet betölteni a kért üzenetet",
+    "Could not load the message" : "Nem lehet betölteni az üzenetet",
+    "Error loading message" : "Hiba történt az üzenet betöltése közben",
+    "Forwarding to %s" : "Továbbítás ide: %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Kattints ide, ha a következő néhány másodpercben lennél automatikusan átirányítva.",
+    "Redirect" : "Átirányítás",
+    "The link leads to %s" : "A hivatkozás ide mutat: %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Ha nem akarod megnyitni azt az oldalt, akkor térj vissza a <a href=\"%s\">Levelekhez</a>",
+    "Continue to %s" : "Folytatás ide: %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/hu.json b/l10n/hu.json
index d6b13c3ab..5b18025a2 100644
--- a/l10n/hu.json
+++ b/l10n/hu.json
@@ -1,55 +1,5 @@
 { "translations": {
     "Mail" : "Levelezés",
-    "Loading accounts" : "Fiókok betöltése",
-    "Error while loading the accounts." : "Hiba történt a fiókok betöltése közben.",
-    "Can not load this folder." : "Ezt a mappát nem lehet betölteni.",
-    "Searching for {query}" : "Keresés: {query}",
-    "Error while deleting message." : "Hiba történt az üzenet törlése közben.",
-    "Forwarded message" : "Továbbított üzenet",
-    "Choose a folder to store the attachment in" : "Válasszon egy mappát a mellékletek tárolásához:",
-    "Attachments saved to Files." : "Mellékletek mentve a Fájlokba.",
-    "Attachment saved to Files." : "Melléklet mentve a Fájlokba.",
-    "Error while saving attachments to Files." : "Hiba történt a mellékletek Fájlokba mentése közben.",
-    "Error while saving attachment to Files." : "Hiba történt a melléklet Fájlokba mentése közben.",
-    "Message flag could not be set." : "Üzenet zászló nem állítható be.",
-    "Could not move message." : "Nem lehet áthelyezni az üzenetet",
-    "Invalid account" : "Érvénytelen fiók",
-    "Invalid folder" : "Érvénytelen mappa",
-    "Error while creating the account: " : "Hiba történt a fiók létrehozásakor:",
-    "Unknown error" : "Ismeretlen hiba",
-    "Error while updating the account: " : "Hiba történt a fiók frissítése közben:",
-    "All inboxes" : "Minden bejövő",
-    "you" : "te",
-    "Send message to {email}" : "Üzenet küldés ide: {email}",
-    "Could not load {tag}{name}{endtag}" : "Nem tölthető be: {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Probléma volt a betöltéssel: {tag}{name}{endtag}",
-    "Could not load your message" : "Nem lehet betölteni az üzenetedet",
-    "Could not load the desired message" : "Nem lehet betölteni a kért üzenetet",
-    "Could not load the message" : "Nem lehet betölteni az üzenetet",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n új üzenet \nfeladó: {from}","%n új üzenet \nfeladó: {from}"],
-    "Nextcloud Mail" : "Nextcloud Mail",
-    "Save" : "Mentés",
-    "Saved" : "Elmentve",
-    "Show all folders" : "Minden mappa megjelenítése",
-    "Collapse folders" : "Mappák összecsukása",
-    "Error while deleting account." : "Hiba történt a fiók törlése közben.",
-    "Choose a file to add as attachment" : "Csatolandó fájl kiválasztása",
-    "An error occurred while uploading {fname}" : "Hiba a(z) {fname} feltöltése közben",
-    "Reply" : "Válasz",
-    "Send" : "Küldés",
-    "Sending …" : "Küldés...",
-    "Message sent!" : "Üzenet elküldve!",
-    "Server error" : "Szerver hiba",
-    "An unknown error occurred" : "Ismeretlen hiba történt",
-    "Opening HTML drafts is not supported yet." : "A HTML vázlatok megnyitása még nem támogatott.",
-    "No writable calendars found" : "Nem található írható naptár",
-    "Error while importing the calendar event" : "Hiba a naptár esemény importálása közben",
-    "Error while downloading calendar event" : "Hiba a naptár esemény letöltése közben",
-    "& others" : "és mások",
-    "Error while loading messages." : "Hiba történt az üzenetek betöltése közben.",
-    "Error while refreshing messages." : "Hiba az üzenetek frissítése közben.",
-    "Setting up your account" : "Fiókod beállítása",
     "Inbox" : "Bejövő",
     "Sent" : "Elküldött",
     "Drafts" : "Vázlatok",
@@ -64,69 +14,70 @@
     "Delete permanently" : "Végleges törlés",
     "IMAP web client" : "IMAP web kliens",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Könnyen használható levelező kliens mely a levelező szerveredhez csatlakozik IMAP és SMTP protokolon.",
-    "Error loading message" : "Hiba történt az üzenet betöltése közben",
-    "Settings" : "Beállítások",
-    "Forwarding to %s" : "Továbbítás ide: %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Kattints ide, ha a következő néhány másodpercben lennél automatikusan átirányítva.",
-    "Redirect" : "Átirányítás",
-    "The link leads to %s" : "A hivatkozás ide mutat: %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Ha nem akarod megnyitni azt az oldalt, akkor térj vissza a <a href=\"%s\">Levelekhez</a>",
-    "Continue to %s" : "Folytatás ide: %s",
-    "Delete account" : "Fiók törlése",
-    "Try again" : "Próbáld újra",
-    "New message" : "Új üzenet",
-    "Account Settings" : "Fiók beállítások",
-    "Aliases" : "Álnevek",
-    "Mail address" : "E-mail cím",
-    "Display Name" : "Megjelenített név",
-    "Account" : "Fiók",
-    "Toggle read" : "Olvasásra váltása",
-    "Delete" : "Törlés",
-    "Keyboard shortcuts" : "Gyorsbillentyűk",
-    "Speed up your Mail experience with these quick shortcuts." : "Gyorsítsd fel a levelezési élményedet ezekkel a rövidítésekkel.",
-    "Compose new message" : "Új üzenet írása",
-    "Newer message" : "Újabb üzenet",
-    "Older message" : "Régebbi üzenet",
-    "Toggle star" : "Csillagozás váltása",
-    "Toggle unread" : "Olvasatlanság váltása",
-    "Search" : "Keresés",
-    "Refresh" : "Frissítés",
-    "Connect your mail account" : "Kapcsolódás az e-mail fiókodhoz",
     "Name" : "Név",
     "Mail Address" : "E-mail cím",
     "Password" : "Jelszó",
-    "Manual configuration" : "Kézi beállítások",
     "IMAP Host" : "IMAP kiszolgáló",
-    "IMAP security" : "IMAP biztonság",
     "None" : "Semmi",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP port",
     "IMAP User" : "IMAP felhasználó",
     "IMAP Password" : "IMAP jelszó",
     "SMTP Host" : "SMTP kiszolgáló",
-    "SMTP security" : "SMTP biztonság",
     "SMTP Port" : "SMTP port",
     "SMTP User" : "SMTP felhasználó",
     "SMTP Password" : "SMTP jelszó",
     "Connect" : "Csatlakozás",
+    "Add mail account" : "E-mail fiók hozzáadás",
+    "Use Gravatar and favicon avatars" : "Gravatar és favicon avatarok használata",
+    "Keyboard shortcuts" : "Gyorsbillentyűk",
     "from" : "feladó",
     "to" : "címzett",
     "cc" : "másolat",
     "bcc" : "titkos másolat",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Vedd figyelembe, hogy egy \"ne válaszolj\" címről jött a levél, így válaszodat valószínűleg nem fogják elolvasni.",
     "Subject" : "Tárgy",
-    "Save all to Files" : "Minden mentése a Fájlokba",
-    "Add mail account" : "E-mail fiók hozzáadás",
-    "Use Gravatar and favicon avatars" : "Gravatar és favicon avatarok használata",
-    "No search results for" : "Ehhez nincsenek keresési eredmények",
-    "The images have been blocked to protect your privacy." : "A személyes adataid védelme érdekében a képeket letiltottuk.",
-    "Show images from this sender" : "Képek megjelenítése ettől a feladótól",
-    "Forward" : "Továbbítás",
-    "No messages in this folder" : "Nincs üzenet a mappában!",
+    "Sending …" : "Küldés...",
+    "Message sent!" : "Üzenet elküldve!",
+    "Send" : "Küldés",
     "Upload attachment" : "Csatolmány feltöltése",
     "Add attachment from Files" : "Csatolmány hozzáadása a Fájlok közül",
+    "Choose a file to add as attachment" : "Csatolandó fájl kiválasztása",
+    "No messages in this folder" : "Nincs üzenet a mappában!",
+    "Delete" : "Törlés",
+    "Could not load your message" : "Nem lehet betölteni az üzenetedet",
     "Import into calendar" : "Betöltés a naptárba",
     "Download attachment" : "Melléklet letöltése",
-    "Save to Files" : "Metés a Fájlokba"
+    "Save to Files" : "Metés a Fájlokba",
+    "Choose a folder to store the attachment in" : "Válasszon egy mappát a mellékletek tárolásához:",
+    "Save all to Files" : "Minden mentése a Fájlokba",
+    "The images have been blocked to protect your privacy." : "A személyes adataid védelme érdekében a képeket letiltottuk.",
+    "New message" : "Új üzenet",
+    "Settings" : "Beállítások",
+    "Speed up your Mail experience with these quick shortcuts." : "Gyorsítsd fel a levelezési élményedet ezekkel a rövidítésekkel.",
+    "Compose new message" : "Új üzenet írása",
+    "Newer message" : "Újabb üzenet",
+    "Older message" : "Régebbi üzenet",
+    "Toggle star" : "Csillagozás váltása",
+    "Toggle unread" : "Olvasatlanság váltása",
+    "Search" : "Keresés",
+    "Refresh" : "Frissítés",
+    "Connect your mail account" : "Kapcsolódás az e-mail fiókodhoz",
+    "Show all folders" : "Minden mappa megjelenítése",
+    "Collapse folders" : "Mappák összecsukása",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n új üzenet \nfeladó: {from}","%n új üzenet \nfeladó: {from}"],
+    "Nextcloud Mail" : "Nextcloud Mail",
+    "All inboxes" : "Minden bejövő",
+    "Could not load {tag}{name}{endtag}" : "Nem tölthető be: {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Probléma volt a betöltéssel: {tag}{name}{endtag}",
+    "Could not load the desired message" : "Nem lehet betölteni a kért üzenetet",
+    "Could not load the message" : "Nem lehet betölteni az üzenetet",
+    "Error loading message" : "Hiba történt az üzenet betöltése közben",
+    "Forwarding to %s" : "Továbbítás ide: %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Kattints ide, ha a következő néhány másodpercben lennél automatikusan átirányítva.",
+    "Redirect" : "Átirányítás",
+    "The link leads to %s" : "A hivatkozás ide mutat: %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Ha nem akarod megnyitni azt az oldalt, akkor térj vissza a <a href=\"%s\">Levelekhez</a>",
+    "Continue to %s" : "Folytatás ide: %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/id.js b/l10n/id.js
deleted file mode 100644
index d5149d5da..000000000
--- a/l10n/id.js
+++ /dev/null
@@ -1,42 +0,0 @@
-OC.L10N.register(
-    "mail",
-    {
-    "Mail" : "Email",
-    "Error while loading the accounts." : "Terjadi kesalahan saat memuat akun.",
-    "Error while deleting message." : "Terjadi kesalahan saat menghapus pesan.",
-    "Forwarded message" : "Pesan Teralihkan",
-    "Choose a folder to store the attachment in" : "Pilih folder untuk menyimpan lampiran didalamnya",
-    "Attachments saved to Files." : "Lampiran disimpan pada Berkas.",
-    "Attachment saved to Files." : "Lampiran disimpan pada Berkas.",
-    "Error while saving attachments to Files." : "Terjadi kesalahan saat menyimpan lampiran pada Berkas.",
-    "Error while saving attachment to Files." : "Terjadi kesalahan saat menyimpan lampiran pada Berkas.",
-    "Unknown error" : "Kesalahan tidak diketahui",
-    "All inboxes" : "Semua kotak masuk",
-    "you" : "Anda",
-    "Send message to {email}" : "Kirim pesan ke {email}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "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",
-    "Opening HTML drafts is not supported yet." : "Membuka draf HTML masih belum didukung.",
-    "& others" : "& lainnya",
-    "Error while loading messages." : "Terjadi kesalahan saat memuat pesan.",
-    "Inbox" : "Kotak masuk",
-    "Sent" : "Kirim",
-    "Drafts" : "Konsep",
-    "Archive" : "Arsip",
-    "Trash" : "Tempat sampah",
-    "Junk" : "Sampah",
-    "All" : "Semua",
-    "Favorites" : "Favorit",
-    "Auto detect failed. Please use manual mode." : "Deteksi otomatis gagal. Mohon gunakan modus manual.",
-    "Creating account failed: " : "Gagal membuat akun:",
-    "Delete permanently" : "Hapus secara permanen",
-    "Error loading message" : "Terjadi kesalahan saat memuat pesan",
-    "Connect" : "Sambungkan"
-},
-"nplurals=1; plural=0;");
diff --git a/l10n/id.json b/l10n/id.json
deleted file mode 100644
index f548c1d94..000000000
--- a/l10n/id.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{ "translations": {
-    "Mail" : "Email",
-    "Error while loading the accounts." : "Terjadi kesalahan saat memuat akun.",
-    "Error while deleting message." : "Terjadi kesalahan saat menghapus pesan.",
-    "Forwarded message" : "Pesan Teralihkan",
-    "Choose a folder to store the attachment in" : "Pilih folder untuk menyimpan lampiran didalamnya",
-    "Attachments saved to Files." : "Lampiran disimpan pada Berkas.",
-    "Attachment saved to Files." : "Lampiran disimpan pada Berkas.",
-    "Error while saving attachments to Files." : "Terjadi kesalahan saat menyimpan lampiran pada Berkas.",
-    "Error while saving attachment to Files." : "Terjadi kesalahan saat menyimpan lampiran pada Berkas.",
-    "Unknown error" : "Kesalahan tidak diketahui",
-    "All inboxes" : "Semua kotak masuk",
-    "you" : "Anda",
-    "Send message to {email}" : "Kirim pesan ke {email}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "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",
-    "Opening HTML drafts is not supported yet." : "Membuka draf HTML masih belum didukung.",
-    "& others" : "& lainnya",
-    "Error while loading messages." : "Terjadi kesalahan saat memuat pesan.",
-    "Inbox" : "Kotak masuk",
-    "Sent" : "Kirim",
-    "Drafts" : "Konsep",
-    "Archive" : "Arsip",
-    "Trash" : "Tempat sampah",
-    "Junk" : "Sampah",
-    "All" : "Semua",
-    "Favorites" : "Favorit",
-    "Auto detect failed. Please use manual mode." : "Deteksi otomatis gagal. Mohon gunakan modus manual.",
-    "Creating account failed: " : "Gagal membuat akun:",
-    "Delete permanently" : "Hapus secara permanen",
-    "Error loading message" : "Terjadi kesalahan saat memuat pesan",
-    "Connect" : "Sambungkan"
-},"pluralForm" :"nplurals=1; plural=0;"
-}
\ No newline at end of file
diff --git a/l10n/is.js b/l10n/is.js
index 0f322fa57..e1b94df67 100644
--- a/l10n/is.js
+++ b/l10n/is.js
@@ -2,56 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Póstur",
-    "Loading accounts" : "Hleð inn notendaaðgöngum",
-    "Error while loading the accounts." : "Gat ekki lesið inn notandaaðganga..",
-    "Can not load this folder." : "Gat ekki að hlaðið inn möppunni.",
-    "Searching for {query}" : "Leita að {query}",
-    "Error while deleting message." : "Villa kom upp við að eyða skilaboðum.",
-    "Forwarded message" : "Áframsent skeyti",
-    "Choose a folder to store the attachment in" : "Veldu möppu þar sem á að geyma viðhengið",
-    "Attachments saved to Files." : "Viðhengi vistuð í skjalamöppu.",
-    "Attachment saved to Files." : "Viðhengi vistað í skjalamöppu.",
-    "Error while saving attachments to Files." : "Villa við að vista viðhengi í skjalamöppu.",
-    "Error while saving attachment to Files." : "Villa við að vista viðhengi í skjalamöppu.",
-    "Message flag could not be set." : "Ekki var ekki hægt að setja flagg á skilaboðin.",
-    "Could not move message." : "Gat ekki flutt skilaboð.",
-    "Invalid account" : "Ógildur aðgangur",
-    "Invalid folder" : "Ógild mappa",
-    "Error while creating the account: " : "Villa við að búa til notandaaðgang: ",
-    "Unknown error" : "Óþekkt villa",
-    "Error while updating the account: " : "Villa við að uppfæra notandaaðganginn",
-    "All inboxes" : "Öll innhólf",
-    "you" : "þú",
-    "Send message to {email}" : "Senda skilaboð til {email}",
-    "Could not load {tag}{name}{endtag}" : "Gat ekki hlaðið inn {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Vandamál kom upp við hlaða inn {tag}{name}{endtag}",
-    "Could not load your message" : "Gat ekki hlaðið inn skilaboðunum þínum",
-    "Could not load the desired message" : "Gat ekki hlaðið inn umbeðnum skilaboðum",
-    "Could not load the message" : "Gat ekki hlaðið inn skilaboðunum",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n ný skilaboð \nfrá {from}","%n ný skilaboð \nfrá {from}"],
-    "Nextcloud Mail" : "Nextcloud-póstur",
-    "Save" : "Vista",
-    "Saved" : "Vistað",
-    "Show all folders" : "Birta allar möppur",
-    "Collapse folders" : "Fella möppur saman",
-    "Error while deleting account." : "Villa kom upp við að eyða aðgangi.",
-    "Choose a file to add as attachment" : "Veldu skrá til að setja sem viðhengi",
-    "An error occurred while uploading {fname}" : "Villa kom upp við að senda inn {fname}",
-    "Reply" : "Svara",
-    "Send" : "Senda",
-    "Sending …" : "Sendi ...",
-    "Message sent!" : "Skilaboðin hafa verið send!",
-    "Server error" : "Villa frá þjóni",
-    "An unknown error occurred" : "Óþekkt villa kom upp",
-    "Opening HTML drafts is not supported yet." : "Ekki er hægt að opna HTML-drög - ennþá.",
-    "No writable calendars found" : "Engin skrifanleg dagatöl fundust",
-    "Error while importing the calendar event" : "Villa kom upp við að flytja inn dagatalsatburðinn",
-    "Error while downloading calendar event" : "Villa kom upp við að sækja dagatalsatburð",
-    "& others" : "og aðrir",
-    "Error while loading messages." : "Villa viðað hlaða inn skilaboðum.",
-    "Error while refreshing messages." : "Villa kom upp við að endurlesa skilaboð.",
-    "Setting up your account" : "Set upp aðganginn þinn",
     "Inbox" : "Innhólf",
     "Sent" : "Sent",
     "Drafts" : "Drög",
@@ -66,69 +16,70 @@ OC.L10N.register(
     "Delete permanently" : "Eyða varanlega",
     "IMAP web client" : "IMAP vefforrit",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Einfalt og auðvelt tölvupóstforrit sem tengist póstþjóninum þínum með IMAP og SMTP.",
-    "Error loading message" : "Villa við hleðslu á skilaboðum",
-    "Settings" : "Stillingar",
-    "Forwarding to %s" : "Áframsendi til %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Smelltu hér ef þér er ekki beint áfram innan nokkurra sekúndna.",
-    "Redirect" : "Endurbeina",
-    "The link leads to %s" : "Tengillinn leiðir til %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Ef þú vilt ekki fara á þá síðu, geturðu farið til baka í <a href=\"%s\">póstforritið</a>.",
-    "Continue to %s" : "Halda áfram í %s",
-    "Delete account" : "Eyða notandaaðgangi",
-    "Try again" : "Reyndu aftur",
-    "New message" : "Ný skilaboð",
-    "Account Settings" : "Stillingar aðgangs",
-    "Aliases" : "Samheiti",
-    "Mail address" : "Tölvupóstfang",
-    "Display Name" : "Birtingarnafn",
-    "Account" : "Notandaaðgangur",
-    "Toggle read" : "Víxla lesnu af/á",
-    "Delete" : "Eyða",
-    "Keyboard shortcuts" : "Flýtileiðir á lyklaborði",
-    "Speed up your Mail experience with these quick shortcuts." : "Flýttu fyrir vinnu þinni með póst með þessum flýtilyklum.",
-    "Compose new message" : "Semja ný skilaboð",
-    "Newer message" : "Nýrri skilaboð",
-    "Older message" : "Eldri skilaboð",
-    "Toggle star" : "Víxla stjörnumerkingu af/á",
-    "Toggle unread" : "Víxla ólesnu af/á",
-    "Search" : "Leita",
-    "Refresh" : "Endurlesa",
-    "Connect your mail account" : "Tengdu notandaaðganginn þinn",
     "Name" : "Nafn",
     "Mail Address" : "Tölvupóstfang",
     "Password" : "Lykilorð",
-    "Manual configuration" : "Handvirk uppsetning",
     "IMAP Host" : "IMAP-vélarheiti",
-    "IMAP security" : "IMAP-öryggi",
     "None" : "Ekkert",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP-gátt",
     "IMAP User" : "IMAP-notandi",
     "IMAP Password" : "IMAP-lykilorð",
     "SMTP Host" : "SMTP-vélarheiti",
-    "SMTP security" : "SMTP-öryggi",
     "SMTP Port" : "SMTP-gátt",
     "SMTP User" : "SMTP-notandi",
     "SMTP Password" : "SMTP-lykilorð",
     "Connect" : "Tengjast",
+    "Add mail account" : "Bæta við notandaaðgangi",
+    "Use Gravatar and favicon avatars" : "Nota Gravatar og veftáknmyndir (favicon)",
+    "Keyboard shortcuts" : "Flýtileiðir á lyklaborði",
     "from" : "frá",
     "to" : "til",
     "cc" : "cc",
     "bcc" : "bcc",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Athugaðu að skilaboðin komu frá ekki-svara netfangi (noreply) þannig að svarið þitt verður líklega ekki lesið.",
     "Subject" : "Viðfangsefni",
-    "Save all to Files" : "Vista allt í skrár",
-    "Add mail account" : "Bæta við notandaaðgangi",
-    "Use Gravatar and favicon avatars" : "Nota Gravatar og veftáknmyndir (favicon)",
-    "No search results for" : "Engar leitarniðurstöður fyrir",
-    "The images have been blocked to protect your privacy." : "Lokað hefur verið á myndir til að vernda einkalíf þitt.",
-    "Show images from this sender" : "Birta myndir frá þessum sendanda",
-    "Forward" : "Áframsenda",
-    "No messages in this folder" : "Engin skilaboð í þessari möppu",
+    "Sending …" : "Sendi ...",
+    "Message sent!" : "Skilaboðin hafa verið send!",
+    "Send" : "Senda",
     "Upload attachment" : "Senda inn viðhengi",
     "Add attachment from Files" : "Bæta við viðhengi úr skrám",
+    "Choose a file to add as attachment" : "Veldu skrá til að setja sem viðhengi",
+    "No messages in this folder" : "Engin skilaboð í þessari möppu",
+    "Delete" : "Eyða",
+    "Could not load your message" : "Gat ekki hlaðið inn skilaboðunum þínum",
     "Import into calendar" : "Flytja inn dagatal",
     "Download attachment" : "Sækja viðhengi",
-    "Save to Files" : "Vista í skrár"
+    "Save to Files" : "Vista í skrár",
+    "Choose a folder to store the attachment in" : "Veldu möppu þar sem á að geyma viðhengið",
+    "Save all to Files" : "Vista allt í skrár",
+    "The images have been blocked to protect your privacy." : "Lokað hefur verið á myndir til að vernda einkalíf þitt.",
+    "New message" : "Ný skilaboð",
+    "Settings" : "Stillingar",
+    "Speed up your Mail experience with these quick shortcuts." : "Flýttu fyrir vinnu þinni með póst með þessum flýtilyklum.",
+    "Compose new message" : "Semja ný skilaboð",
+    "Newer message" : "Nýrri skilaboð",
+    "Older message" : "Eldri skilaboð",
+    "Toggle star" : "Víxla stjörnumerkingu af/á",
+    "Toggle unread" : "Víxla ólesnu af/á",
+    "Search" : "Leita",
+    "Refresh" : "Endurlesa",
+    "Connect your mail account" : "Tengdu notandaaðganginn þinn",
+    "Show all folders" : "Birta allar möppur",
+    "Collapse folders" : "Fella möppur saman",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n ný skilaboð \nfrá {from}","%n ný skilaboð \nfrá {from}"],
+    "Nextcloud Mail" : "Nextcloud-póstur",
+    "All inboxes" : "Öll innhólf",
+    "Could not load {tag}{name}{endtag}" : "Gat ekki hlaðið inn {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Vandamál kom upp við hlaða inn {tag}{name}{endtag}",
+    "Could not load the desired message" : "Gat ekki hlaðið inn umbeðnum skilaboðum",
+    "Could not load the message" : "Gat ekki hlaðið inn skilaboðunum",
+    "Error loading message" : "Villa við hleðslu á skilaboðum",
+    "Forwarding to %s" : "Áframsendi til %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Smelltu hér ef þér er ekki beint áfram innan nokkurra sekúndna.",
+    "Redirect" : "Endurbeina",
+    "The link leads to %s" : "Tengillinn leiðir til %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Ef þú vilt ekki fara á þá síðu, geturðu farið til baka í <a href=\"%s\">póstforritið</a>.",
+    "Continue to %s" : "Halda áfram í %s"
 },
 "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
diff --git a/l10n/is.json b/l10n/is.json
index 34dd3f21e..a5333874a 100644
--- a/l10n/is.json
+++ b/l10n/is.json
@@ -1,55 +1,5 @@
 { "translations": {
     "Mail" : "Póstur",
-    "Loading accounts" : "Hleð inn notendaaðgöngum",
-    "Error while loading the accounts." : "Gat ekki lesið inn notandaaðganga..",
-    "Can not load this folder." : "Gat ekki að hlaðið inn möppunni.",
-    "Searching for {query}" : "Leita að {query}",
-    "Error while deleting message." : "Villa kom upp við að eyða skilaboðum.",
-    "Forwarded message" : "Áframsent skeyti",
-    "Choose a folder to store the attachment in" : "Veldu möppu þar sem á að geyma viðhengið",
-    "Attachments saved to Files." : "Viðhengi vistuð í skjalamöppu.",
-    "Attachment saved to Files." : "Viðhengi vistað í skjalamöppu.",
-    "Error while saving attachments to Files." : "Villa við að vista viðhengi í skjalamöppu.",
-    "Error while saving attachment to Files." : "Villa við að vista viðhengi í skjalamöppu.",
-    "Message flag could not be set." : "Ekki var ekki hægt að setja flagg á skilaboðin.",
-    "Could not move message." : "Gat ekki flutt skilaboð.",
-    "Invalid account" : "Ógildur aðgangur",
-    "Invalid folder" : "Ógild mappa",
-    "Error while creating the account: " : "Villa við að búa til notandaaðgang: ",
-    "Unknown error" : "Óþekkt villa",
-    "Error while updating the account: " : "Villa við að uppfæra notandaaðganginn",
-    "All inboxes" : "Öll innhólf",
-    "you" : "þú",
-    "Send message to {email}" : "Senda skilaboð til {email}",
-    "Could not load {tag}{name}{endtag}" : "Gat ekki hlaðið inn {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Vandamál kom upp við hlaða inn {tag}{name}{endtag}",
-    "Could not load your message" : "Gat ekki hlaðið inn skilaboðunum þínum",
-    "Could not load the desired message" : "Gat ekki hlaðið inn umbeðnum skilaboðum",
-    "Could not load the message" : "Gat ekki hlaðið inn skilaboðunum",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n ný skilaboð \nfrá {from}","%n ný skilaboð \nfrá {from}"],
-    "Nextcloud Mail" : "Nextcloud-póstur",
-    "Save" : "Vista",
-    "Saved" : "Vistað",
-    "Show all folders" : "Birta allar möppur",
-    "Collapse folders" : "Fella möppur saman",
-    "Error while deleting account." : "Villa kom upp við að eyða aðgangi.",
-    "Choose a file to add as attachment" : "Veldu skrá til að setja sem viðhengi",
-    "An error occurred while uploading {fname}" : "Villa kom upp við að senda inn {fname}",
-    "Reply" : "Svara",
-    "Send" : "Senda",
-    "Sending …" : "Sendi ...",
-    "Message sent!" : "Skilaboðin hafa verið send!",
-    "Server error" : "Villa frá þjóni",
-    "An unknown error occurred" : "Óþekkt villa kom upp",
-    "Opening HTML drafts is not supported yet." : "Ekki er hægt að opna HTML-drög - ennþá.",
-    "No writable calendars found" : "Engin skrifanleg dagatöl fundust",
-    "Error while importing the calendar event" : "Villa kom upp við að flytja inn dagatalsatburðinn",
-    "Error while downloading calendar event" : "Villa kom upp við að sækja dagatalsatburð",
-    "& others" : "og aðrir",
-    "Error while loading messages." : "Villa viðað hlaða inn skilaboðum.",
-    "Error while refreshing messages." : "Villa kom upp við að endurlesa skilaboð.",
-    "Setting up your account" : "Set upp aðganginn þinn",
     "Inbox" : "Innhólf",
     "Sent" : "Sent",
     "Drafts" : "Drög",
@@ -64,69 +14,70 @@
     "Delete permanently" : "Eyða varanlega",
     "IMAP web client" : "IMAP vefforrit",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Einfalt og auðvelt tölvupóstforrit sem tengist póstþjóninum þínum með IMAP og SMTP.",
-    "Error loading message" : "Villa við hleðslu á skilaboðum",
-    "Settings" : "Stillingar",
-    "Forwarding to %s" : "Áframsendi til %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Smelltu hér ef þér er ekki beint áfram innan nokkurra sekúndna.",
-    "Redirect" : "Endurbeina",
-    "The link leads to %s" : "Tengillinn leiðir til %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Ef þú vilt ekki fara á þá síðu, geturðu farið til baka í <a href=\"%s\">póstforritið</a>.",
-    "Continue to %s" : "Halda áfram í %s",
-    "Delete account" : "Eyða notandaaðgangi",
-    "Try again" : "Reyndu aftur",
-    "New message" : "Ný skilaboð",
-    "Account Settings" : "Stillingar aðgangs",
-    "Aliases" : "Samheiti",
-    "Mail address" : "Tölvupóstfang",
-    "Display Name" : "Birtingarnafn",
-    "Account" : "Notandaaðgangur",
-    "Toggle read" : "Víxla lesnu af/á",
-    "Delete" : "Eyða",
-    "Keyboard shortcuts" : "Flýtileiðir á lyklaborði",
-    "Speed up your Mail experience with these quick shortcuts." : "Flýttu fyrir vinnu þinni með póst með þessum flýtilyklum.",
-    "Compose new message" : "Semja ný skilaboð",
-    "Newer message" : "Nýrri skilaboð",
-    "Older message" : "Eldri skilaboð",
-    "Toggle star" : "Víxla stjörnumerkingu af/á",
-    "Toggle unread" : "Víxla ólesnu af/á",
-    "Search" : "Leita",
-    "Refresh" : "Endurlesa",
-    "Connect your mail account" : "Tengdu notandaaðganginn þinn",
     "Name" : "Nafn",
     "Mail Address" : "Tölvupóstfang",
     "Password" : "Lykilorð",
-    "Manual configuration" : "Handvirk uppsetning",
     "IMAP Host" : "IMAP-vélarheiti",
-    "IMAP security" : "IMAP-öryggi",
     "None" : "Ekkert",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP-gátt",
     "IMAP User" : "IMAP-notandi",
     "IMAP Password" : "IMAP-lykilorð",
     "SMTP Host" : "SMTP-vélarheiti",
-    "SMTP security" : "SMTP-öryggi",
     "SMTP Port" : "SMTP-gátt",
     "SMTP User" : "SMTP-notandi",
     "SMTP Password" : "SMTP-lykilorð",
     "Connect" : "Tengjast",
+    "Add mail account" : "Bæta við notandaaðgangi",
+    "Use Gravatar and favicon avatars" : "Nota Gravatar og veftáknmyndir (favicon)",
+    "Keyboard shortcuts" : "Flýtileiðir á lyklaborði",
     "from" : "frá",
     "to" : "til",
     "cc" : "cc",
     "bcc" : "bcc",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Athugaðu að skilaboðin komu frá ekki-svara netfangi (noreply) þannig að svarið þitt verður líklega ekki lesið.",
     "Subject" : "Viðfangsefni",
-    "Save all to Files" : "Vista allt í skrár",
-    "Add mail account" : "Bæta við notandaaðgangi",
-    "Use Gravatar and favicon avatars" : "Nota Gravatar og veftáknmyndir (favicon)",
-    "No search results for" : "Engar leitarniðurstöður fyrir",
-    "The images have been blocked to protect your privacy." : "Lokað hefur verið á myndir til að vernda einkalíf þitt.",
-    "Show images from this sender" : "Birta myndir frá þessum sendanda",
-    "Forward" : "Áframsenda",
-    "No messages in this folder" : "Engin skilaboð í þessari möppu",
+    "Sending …" : "Sendi ...",
+    "Message sent!" : "Skilaboðin hafa verið send!",
+    "Send" : "Senda",
     "Upload attachment" : "Senda inn viðhengi",
     "Add attachment from Files" : "Bæta við viðhengi úr skrám",
+    "Choose a file to add as attachment" : "Veldu skrá til að setja sem viðhengi",
+    "No messages in this folder" : "Engin skilaboð í þessari möppu",
+    "Delete" : "Eyða",
+    "Could not load your message" : "Gat ekki hlaðið inn skilaboðunum þínum",
     "Import into calendar" : "Flytja inn dagatal",
     "Download attachment" : "Sækja viðhengi",
-    "Save to Files" : "Vista í skrár"
+    "Save to Files" : "Vista í skrár",
+    "Choose a folder to store the attachment in" : "Veldu möppu þar sem á að geyma viðhengið",
+    "Save all to Files" : "Vista allt í skrár",
+    "The images have been blocked to protect your privacy." : "Lokað hefur verið á myndir til að vernda einkalíf þitt.",
+    "New message" : "Ný skilaboð",
+    "Settings" : "Stillingar",
+    "Speed up your Mail experience with these quick shortcuts." : "Flýttu fyrir vinnu þinni með póst með þessum flýtilyklum.",
+    "Compose new message" : "Semja ný skilaboð",
+    "Newer message" : "Nýrri skilaboð",
+    "Older message" : "Eldri skilaboð",
+    "Toggle star" : "Víxla stjörnumerkingu af/á",
+    "Toggle unread" : "Víxla ólesnu af/á",
+    "Search" : "Leita",
+    "Refresh" : "Endurlesa",
+    "Connect your mail account" : "Tengdu notandaaðganginn þinn",
+    "Show all folders" : "Birta allar möppur",
+    "Collapse folders" : "Fella möppur saman",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n ný skilaboð \nfrá {from}","%n ný skilaboð \nfrá {from}"],
+    "Nextcloud Mail" : "Nextcloud-póstur",
+    "All inboxes" : "Öll innhólf",
+    "Could not load {tag}{name}{endtag}" : "Gat ekki hlaðið inn {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Vandamál kom upp við hlaða inn {tag}{name}{endtag}",
+    "Could not load the desired message" : "Gat ekki hlaðið inn umbeðnum skilaboðum",
+    "Could not load the message" : "Gat ekki hlaðið inn skilaboðunum",
+    "Error loading message" : "Villa við hleðslu á skilaboðum",
+    "Forwarding to %s" : "Áframsendi til %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Smelltu hér ef þér er ekki beint áfram innan nokkurra sekúndna.",
+    "Redirect" : "Endurbeina",
+    "The link leads to %s" : "Tengillinn leiðir til %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Ef þú vilt ekki fara á þá síðu, geturðu farið til baka í <a href=\"%s\">póstforritið</a>.",
+    "Continue to %s" : "Halda áfram í %s"
 },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
 }
\ No newline at end of file
diff --git a/l10n/it.js b/l10n/it.js
index 27d703983..21bc29bb7 100644
--- a/l10n/it.js
+++ b/l10n/it.js
@@ -2,56 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Posta",
-    "Loading accounts" : "Caricamento account",
-    "Error while loading the accounts." : "Errore durante il caricamento degli account.",
-    "Can not load this folder." : "Impossibile caricare questa cartella.",
-    "Searching for {query}" : "Ricerca di {query}",
-    "Error while deleting message." : "Errore durante l'eliminazione del messaggio.",
-    "Forwarded message" : "Messaggio inoltrato",
-    "Choose a folder to store the attachment in" : "Scegli una cartella dove salvare l'allegato",
-    "Attachments saved to Files." : "Allegati salvati in File.",
-    "Attachment saved to Files." : "Allegato salvato in File.",
-    "Error while saving attachments to Files." : "Errore durante il salvataggio degli allegati in File.",
-    "Error while saving attachment to Files." : "Errore durante il salvataggio dell'allegato in File.",
-    "Message flag could not be set." : "Il contrassegno del messaggio non può essere impostato.",
-    "Could not move message." : "Impossibile spostare il messaggio.",
-    "Invalid account" : "Account non valido",
-    "Invalid folder" : "Cartella non valida",
-    "Error while creating the account: " : "Errore durante la creazione dell'account:",
-    "Unknown error" : "Errore sconosciuto",
-    "Error while updating the account: " : "Errore durante l'aggiornamento dell'account:",
-    "All inboxes" : "Tutte le caselle di posta",
-    "you" : "tu",
-    "Send message to {email}" : "Invia messaggio a {email}",
-    "Could not load {tag}{name}{endtag}" : "Impossibile caricare {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Si è verificato un programma durante il caricamento di {tag}{name}{endtag}",
-    "Could not load your message" : "Impossibile caricare il tuo messaggio",
-    "Could not load the desired message" : "Impossibile caricare messaggio desiderato",
-    "Could not load the message" : "Impossibile caricare il messaggio",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n nuovo messaggio \nda {from}","%n nuovi messaggi \nda {from}"],
-    "Nextcloud Mail" : "Nextcloud Mail",
-    "Save" : "Salva",
-    "Saved" : "Salvato",
-    "Show all folders" : "Mostra tutte le cartelle",
-    "Collapse folders" : "Contrai le cartelle",
-    "Error while deleting account." : "Errore durante l'eliminazione dell'account.",
-    "Choose a file to add as attachment" : "Scegli un file da aggiungere come allegato",
-    "An error occurred while uploading {fname}" : "Si è verificato un errore durante il caricamento di {fname}",
-    "Reply" : "Rispondi",
-    "Send" : "Invia",
-    "Sending …" : "Invio in corso...",
-    "Message sent!" : "Messaggio inviato!",
-    "Server error" : "Errore del server",
-    "An unknown error occurred" : "Si è verificato un errore sconosciuto",
-    "Opening HTML drafts is not supported yet." : "L'apertura delle bozze HTML non è ancora supportata.",
-    "No writable calendars found" : "Nessun calendario scrivibile trovato",
-    "Error while importing the calendar event" : "Errore durante l'importazione dell'evento di calendario",
-    "Error while downloading calendar event" : "Errore durante lo scaricamento dell'evento di calendario",
-    "& others" : "e altri",
-    "Error while loading messages." : "Errore durante il caricamento dei messaggi.",
-    "Error while refreshing messages." : "Errore durante l'aggiornamento dei messaggi.",
-    "Setting up your account" : "Configurazione del tuo account",
     "Inbox" : "Posta in arrivo",
     "Sent" : "Posta inviata",
     "Drafts" : "Bozze",
@@ -66,69 +16,70 @@ OC.L10N.register(
     "Delete permanently" : "Elimina definitivamente",
     "IMAP web client" : "Client web IMAP",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Client di posta elettronica di facile utilizzo che ti collega al tuo server di posta tramite IMAP e SMTP.",
-    "Error loading message" : "Errore durante il caricamento del messaggio",
-    "Settings" : "Impostazioni",
-    "Forwarding to %s" : "Inoltro a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Fai clic qui se non viene rediretto automaticamente entro pochi secondi.",
-    "Redirect" : "Redirigi",
-    "The link leads to %s" : "Il collegamento conduce a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Se non vuoi visitare tale pagina, puoi tornare all'<a href=\"%s\">applicazione di posta</a>.",
-    "Continue to %s" : "Continua su %s",
-    "Delete account" : "Elimina account",
-    "Try again" : "Riprova",
-    "New message" : "Nuovo messaggio",
-    "Account Settings" : "Impostazioni account",
-    "Aliases" : "Alias",
-    "Mail address" : "Indirizzo di posta",
-    "Display Name" : "Nome visualizzato",
-    "Account" : "Account",
-    "Toggle read" : "Commuta letto",
-    "Delete" : "Elimina",
-    "Keyboard shortcuts" : "Scorciatoie da tastiera",
-    "Speed up your Mail experience with these quick shortcuts." : "Velocizza la tua esperienza di posta elettronica con queste scorciatoie.",
-    "Compose new message" : "Componi nuovo messaggio",
-    "Newer message" : "Messaggio più recente",
-    "Older message" : "Messaggio più datato",
-    "Toggle star" : "Commuta stella",
-    "Toggle unread" : "Commuta non letto",
-    "Search" : "Cerca",
-    "Refresh" : "Aggiorna",
-    "Connect your mail account" : "Connetti il tuo account di posta",
     "Name" : "Nome",
     "Mail Address" : "Indirizzo di posta",
     "Password" : "Password",
-    "Manual configuration" : "Configurazione manuale",
     "IMAP Host" : "Host IMAP",
-    "IMAP security" : "Sicurezza IMAP",
     "None" : "Nessuna",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Porta IMAP",
     "IMAP User" : "Utente IMAP",
     "IMAP Password" : "Password IMAP",
     "SMTP Host" : "Host SMTP",
-    "SMTP security" : "Sicurezza SMTP",
     "SMTP Port" : "Porta SMTP",
     "SMTP User" : "Utente SMTP",
     "SMTP Password" : "Password SMTP",
     "Connect" : "Connetti",
+    "Add mail account" : "Aggiungi account di posta",
+    "Use Gravatar and favicon avatars" : "Utilizza Gravatar e avatar favicon",
+    "Keyboard shortcuts" : "Scorciatoie da tastiera",
     "from" : "da",
     "to" : "a",
     "cc" : "cc",
     "bcc" : "ccn",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Nota che il messaggio è arrivato da un indirizzo noreply, perciò la tua risposta non sarà probabilmente letta.",
     "Subject" : "Oggetto",
-    "Save all to Files" : "Salva tutto in File",
-    "Add mail account" : "Aggiungi account di posta",
-    "Use Gravatar and favicon avatars" : "Utilizza Gravatar e avatar favicon",
-    "No search results for" : "Nessun risultato di ricerca per",
-    "The images have been blocked to protect your privacy." : "Le immagini sono state bloccate per proteggere la tua riservatezza.",
-    "Show images from this sender" : "Mostra immagini da questo mittente",
-    "Forward" : "Inoltra",
-    "No messages in this folder" : "Nessun messaggio in questa cartella",
+    "Sending …" : "Invio in corso...",
+    "Message sent!" : "Messaggio inviato!",
+    "Send" : "Invia",
     "Upload attachment" : "Carica allegato",
     "Add attachment from Files" : "Aggiungi allegato da File",
+    "Choose a file to add as attachment" : "Scegli un file da aggiungere come allegato",
+    "No messages in this folder" : "Nessun messaggio in questa cartella",
+    "Delete" : "Elimina",
+    "Could not load your message" : "Impossibile caricare il tuo messaggio",
     "Import into calendar" : "Importa nel calendario",
     "Download attachment" : "Scarica allegato",
-    "Save to Files" : "Salva in File"
+    "Save to Files" : "Salva in File",
+    "Choose a folder to store the attachment in" : "Scegli una cartella dove salvare l'allegato",
+    "Save all to Files" : "Salva tutto in File",
+    "The images have been blocked to protect your privacy." : "Le immagini sono state bloccate per proteggere la tua riservatezza.",
+    "New message" : "Nuovo messaggio",
+    "Settings" : "Impostazioni",
+    "Speed up your Mail experience with these quick shortcuts." : "Velocizza la tua esperienza di posta elettronica con queste scorciatoie.",
+    "Compose new message" : "Componi nuovo messaggio",
+    "Newer message" : "Messaggio più recente",
+    "Older message" : "Messaggio più datato",
+    "Toggle star" : "Commuta stella",
+    "Toggle unread" : "Commuta non letto",
+    "Search" : "Cerca",
+    "Refresh" : "Aggiorna",
+    "Connect your mail account" : "Connetti il tuo account di posta",
+    "Show all folders" : "Mostra tutte le cartelle",
+    "Collapse folders" : "Contrai le cartelle",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n nuovo messaggio \nda {from}","%n nuovi messaggi \nda {from}"],
+    "Nextcloud Mail" : "Nextcloud Mail",
+    "All inboxes" : "Tutte le caselle di posta",
+    "Could not load {tag}{name}{endtag}" : "Impossibile caricare {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Si è verificato un programma durante il caricamento di {tag}{name}{endtag}",
+    "Could not load the desired message" : "Impossibile caricare messaggio desiderato",
+    "Could not load the message" : "Impossibile caricare il messaggio",
+    "Error loading message" : "Errore durante il caricamento del messaggio",
+    "Forwarding to %s" : "Inoltro a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Fai clic qui se non viene rediretto automaticamente entro pochi secondi.",
+    "Redirect" : "Redirigi",
+    "The link leads to %s" : "Il collegamento conduce a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Se non vuoi visitare tale pagina, puoi tornare all'<a href=\"%s\">applicazione di posta</a>.",
+    "Continue to %s" : "Continua su %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/it.json b/l10n/it.json
index 38290fbab..e739595a7 100644
--- a/l10n/it.json
+++ b/l10n/it.json
@@ -1,55 +1,5 @@
 { "translations": {
     "Mail" : "Posta",
-    "Loading accounts" : "Caricamento account",
-    "Error while loading the accounts." : "Errore durante il caricamento degli account.",
-    "Can not load this folder." : "Impossibile caricare questa cartella.",
-    "Searching for {query}" : "Ricerca di {query}",
-    "Error while deleting message." : "Errore durante l'eliminazione del messaggio.",
-    "Forwarded message" : "Messaggio inoltrato",
-    "Choose a folder to store the attachment in" : "Scegli una cartella dove salvare l'allegato",
-    "Attachments saved to Files." : "Allegati salvati in File.",
-    "Attachment saved to Files." : "Allegato salvato in File.",
-    "Error while saving attachments to Files." : "Errore durante il salvataggio degli allegati in File.",
-    "Error while saving attachment to Files." : "Errore durante il salvataggio dell'allegato in File.",
-    "Message flag could not be set." : "Il contrassegno del messaggio non può essere impostato.",
-    "Could not move message." : "Impossibile spostare il messaggio.",
-    "Invalid account" : "Account non valido",
-    "Invalid folder" : "Cartella non valida",
-    "Error while creating the account: " : "Errore durante la creazione dell'account:",
-    "Unknown error" : "Errore sconosciuto",
-    "Error while updating the account: " : "Errore durante l'aggiornamento dell'account:",
-    "All inboxes" : "Tutte le caselle di posta",
-    "you" : "tu",
-    "Send message to {email}" : "Invia messaggio a {email}",
-    "Could not load {tag}{name}{endtag}" : "Impossibile caricare {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Si è verificato un programma durante il caricamento di {tag}{name}{endtag}",
-    "Could not load your message" : "Impossibile caricare il tuo messaggio",
-    "Could not load the desired message" : "Impossibile caricare messaggio desiderato",
-    "Could not load the message" : "Impossibile caricare il messaggio",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n nuovo messaggio \nda {from}","%n nuovi messaggi \nda {from}"],
-    "Nextcloud Mail" : "Nextcloud Mail",
-    "Save" : "Salva",
-    "Saved" : "Salvato",
-    "Show all folders" : "Mostra tutte le cartelle",
-    "Collapse folders" : "Contrai le cartelle",
-    "Error while deleting account." : "Errore durante l'eliminazione dell'account.",
-    "Choose a file to add as attachment" : "Scegli un file da aggiungere come allegato",
-    "An error occurred while uploading {fname}" : "Si è verificato un errore durante il caricamento di {fname}",
-    "Reply" : "Rispondi",
-    "Send" : "Invia",
-    "Sending …" : "Invio in corso...",
-    "Message sent!" : "Messaggio inviato!",
-    "Server error" : "Errore del server",
-    "An unknown error occurred" : "Si è verificato un errore sconosciuto",
-    "Opening HTML drafts is not supported yet." : "L'apertura delle bozze HTML non è ancora supportata.",
-    "No writable calendars found" : "Nessun calendario scrivibile trovato",
-    "Error while importing the calendar event" : "Errore durante l'importazione dell'evento di calendario",
-    "Error while downloading calendar event" : "Errore durante lo scaricamento dell'evento di calendario",
-    "& others" : "e altri",
-    "Error while loading messages." : "Errore durante il caricamento dei messaggi.",
-    "Error while refreshing messages." : "Errore durante l'aggiornamento dei messaggi.",
-    "Setting up your account" : "Configurazione del tuo account",
     "Inbox" : "Posta in arrivo",
     "Sent" : "Posta inviata",
     "Drafts" : "Bozze",
@@ -64,69 +14,70 @@
     "Delete permanently" : "Elimina definitivamente",
     "IMAP web client" : "Client web IMAP",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Client di posta elettronica di facile utilizzo che ti collega al tuo server di posta tramite IMAP e SMTP.",
-    "Error loading message" : "Errore durante il caricamento del messaggio",
-    "Settings" : "Impostazioni",
-    "Forwarding to %s" : "Inoltro a %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Fai clic qui se non viene rediretto automaticamente entro pochi secondi.",
-    "Redirect" : "Redirigi",
-    "The link leads to %s" : "Il collegamento conduce a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Se non vuoi visitare tale pagina, puoi tornare all'<a href=\"%s\">applicazione di posta</a>.",
-    "Continue to %s" : "Continua su %s",
-    "Delete account" : "Elimina account",
-    "Try again" : "Riprova",
-    "New message" : "Nuovo messaggio",
-    "Account Settings" : "Impostazioni account",
-    "Aliases" : "Alias",
-    "Mail address" : "Indirizzo di posta",
-    "Display Name" : "Nome visualizzato",
-    "Account" : "Account",
-    "Toggle read" : "Commuta letto",
-    "Delete" : "Elimina",
-    "Keyboard shortcuts" : "Scorciatoie da tastiera",
-    "Speed up your Mail experience with these quick shortcuts." : "Velocizza la tua esperienza di posta elettronica con queste scorciatoie.",
-    "Compose new message" : "Componi nuovo messaggio",
-    "Newer message" : "Messaggio più recente",
-    "Older message" : "Messaggio più datato",
-    "Toggle star" : "Commuta stella",
-    "Toggle unread" : "Commuta non letto",
-    "Search" : "Cerca",
-    "Refresh" : "Aggiorna",
-    "Connect your mail account" : "Connetti il tuo account di posta",
     "Name" : "Nome",
     "Mail Address" : "Indirizzo di posta",
     "Password" : "Password",
-    "Manual configuration" : "Configurazione manuale",
     "IMAP Host" : "Host IMAP",
-    "IMAP security" : "Sicurezza IMAP",
     "None" : "Nessuna",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Porta IMAP",
     "IMAP User" : "Utente IMAP",
     "IMAP Password" : "Password IMAP",
     "SMTP Host" : "Host SMTP",
-    "SMTP security" : "Sicurezza SMTP",
     "SMTP Port" : "Porta SMTP",
     "SMTP User" : "Utente SMTP",
     "SMTP Password" : "Password SMTP",
     "Connect" : "Connetti",
+    "Add mail account" : "Aggiungi account di posta",
+    "Use Gravatar and favicon avatars" : "Utilizza Gravatar e avatar favicon",
+    "Keyboard shortcuts" : "Scorciatoie da tastiera",
     "from" : "da",
     "to" : "a",
     "cc" : "cc",
     "bcc" : "ccn",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Nota che il messaggio è arrivato da un indirizzo noreply, perciò la tua risposta non sarà probabilmente letta.",
     "Subject" : "Oggetto",
-    "Save all to Files" : "Salva tutto in File",
-    "Add mail account" : "Aggiungi account di posta",
-    "Use Gravatar and favicon avatars" : "Utilizza Gravatar e avatar favicon",
-    "No search results for" : "Nessun risultato di ricerca per",
-    "The images have been blocked to protect your privacy." : "Le immagini sono state bloccate per proteggere la tua riservatezza.",
-    "Show images from this sender" : "Mostra immagini da questo mittente",
-    "Forward" : "Inoltra",
-    "No messages in this folder" : "Nessun messaggio in questa cartella",
+    "Sending …" : "Invio in corso...",
+    "Message sent!" : "Messaggio inviato!",
+    "Send" : "Invia",
     "Upload attachment" : "Carica allegato",
     "Add attachment from Files" : "Aggiungi allegato da File",
+    "Choose a file to add as attachment" : "Scegli un file da aggiungere come allegato",
+    "No messages in this folder" : "Nessun messaggio in questa cartella",
+    "Delete" : "Elimina",
+    "Could not load your message" : "Impossibile caricare il tuo messaggio",
     "Import into calendar" : "Importa nel calendario",
     "Download attachment" : "Scarica allegato",
-    "Save to Files" : "Salva in File"
+    "Save to Files" : "Salva in File",
+    "Choose a folder to store the attachment in" : "Scegli una cartella dove salvare l'allegato",
+    "Save all to Files" : "Salva tutto in File",
+    "The images have been blocked to protect your privacy." : "Le immagini sono state bloccate per proteggere la tua riservatezza.",
+    "New message" : "Nuovo messaggio",
+    "Settings" : "Impostazioni",
+    "Speed up your Mail experience with these quick shortcuts." : "Velocizza la tua esperienza di posta elettronica con queste scorciatoie.",
+    "Compose new message" : "Componi nuovo messaggio",
+    "Newer message" : "Messaggio più recente",
+    "Older message" : "Messaggio più datato",
+    "Toggle star" : "Commuta stella",
+    "Toggle unread" : "Commuta non letto",
+    "Search" : "Cerca",
+    "Refresh" : "Aggiorna",
+    "Connect your mail account" : "Connetti il tuo account di posta",
+    "Show all folders" : "Mostra tutte le cartelle",
+    "Collapse folders" : "Contrai le cartelle",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n nuovo messaggio \nda {from}","%n nuovi messaggi \nda {from}"],
+    "Nextcloud Mail" : "Nextcloud Mail",
+    "All inboxes" : "Tutte le caselle di posta",
+    "Could not load {tag}{name}{endtag}" : "Impossibile caricare {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Si è verificato un programma durante il caricamento di {tag}{name}{endtag}",
+    "Could not load the desired message" : "Impossibile caricare messaggio desiderato",
+    "Could not load the message" : "Impossibile caricare il messaggio",
+    "Error loading message" : "Errore durante il caricamento del messaggio",
+    "Forwarding to %s" : "Inoltro a %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Fai clic qui se non viene rediretto automaticamente entro pochi secondi.",
+    "Redirect" : "Redirigi",
+    "The link leads to %s" : "Il collegamento conduce a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Se non vuoi visitare tale pagina, puoi tornare all'<a href=\"%s\">applicazione di posta</a>.",
+    "Continue to %s" : "Continua su %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/ja.js b/l10n/ja.js
index ce263304a..f0fa18e17 100644
--- a/l10n/ja.js
+++ b/l10n/ja.js
@@ -2,56 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "メール",
-    "Loading accounts" : "アカウントを読み込み中",
-    "Error while loading the accounts." : "アカウントの読み込み中にエラーが発生しました。",
-    "Can not load this folder." : "フォルダーを読み込めません",
-    "Searching for {query}" : "{query}を検索中",
-    "Error while deleting message." : "メッセージの削除中にエラーが発生しました。",
-    "Forwarded message" : "転送メッセージ",
-    "Choose a folder to store the attachment in" : "添付ファイルを保存するフォルダーを選択",
-    "Attachments saved to Files." : "添付ファイルを保存しました。",
-    "Attachment saved to Files." : "添付ファイルを保存しました。",
-    "Error while saving attachments to Files." : "添付ファイルの保存中にエラーが発生しました。",
-    "Error while saving attachment to Files." : "添付ファイルの保存中にエラーが発生しました。",
-    "Message flag could not be set." : "メッセージフラッグが設定できませんでした。",
-    "Could not move message." : "メッセージを移動できませんでした",
-    "Invalid account" : "無効なアカウント",
-    "Invalid folder" : "無効なフォルダー",
-    "Error while creating the account: " : "アカウントの作成中にエラーが発生しました:",
-    "Unknown error" : "不明なエラー",
-    "Error while updating the account: " : "アカウントの更新中にエラーが発生しました:",
-    "All inboxes" : "すべての受信トレイ",
-    "you" : "あなた",
-    "Send message to {email}" : "{email} にメッセージを送信",
-    "Could not load {tag}{name}{endtag}" : "{tag} {name} {endtag}を読み込めませんでした",
-    "There was a problem loading {tag}{name}{endtag}" : "{tag}{name}{endtag} の読み込み中に問題が発生しました",
-    "Could not load your message" : "あなたのメッセージを読み込めませんでした",
-    "Could not load the desired message" : "目的のメッセージを読み込めませんでした",
-    "Could not load the message" : "メッセージを読み込めませんでした",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n個の新しいメッセージ\nfrom{from}"],
-    "Nextcloud Mail" : "Nextcloud メール",
-    "Save" : "保存",
-    "Saved" : "保存しました",
-    "Show all folders" : "すべてのフォルダーを表示",
-    "Collapse folders" : "すべて展開",
-    "Error while deleting account." : "アカウントの削除中にエラーが発生しました。",
-    "Choose a file to add as attachment" : "添付として追加するファイルを選択",
-    "An error occurred while uploading {fname}" : "{fname} のアップロード中にエラーが発生しました",
-    "Reply" : "返信",
-    "Send" : "送信",
-    "Sending …" : "送信中 …",
-    "Message sent!" : "へメッセージを送信しました！",
-    "Server error" : "サーバーエラー",
-    "An unknown error occurred" : "不明なエラーが発生しました",
-    "Opening HTML drafts is not supported yet." : "HTML の下書きを開くことはまだサポートされていません。",
-    "No writable calendars found" : "書き込み可能なカレンダーが見つかりません",
-    "Error while importing the calendar event" : "カレンダーイベントのインポート中にエラーが発生しました",
-    "Error while downloading calendar event" : "カレンダーイベントのダウンロード中にエラーが発生しました",
-    "& others" : "& その他",
-    "Error while loading messages." : "メールメッセージの読み込み中にエラーが発生しました。",
-    "Error while refreshing messages." : "メールメッセージの更新中にエラーが発生しました。",
-    "Setting up your account" : "あなたのアカウントを設定しています",
     "Inbox" : "受信箱",
     "Sent" : "送信",
     "Drafts" : "草稿",
@@ -66,69 +16,70 @@ OC.L10N.register(
     "Delete permanently" : "完全に削除する",
     "IMAP web client" : "IMAPウェブクライアント",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "IMAPとSMTP経由であなたのメールサーバーに接続する使いやすい電子メールクライアント。",
-    "Error loading message" : "メッセージ読み込みエラー",
-    "Settings" : "設定",
-    "Forwarding to %s" : "%s への転送",
-    "Click here if you are not automatically redirected within the next few seconds." : "数秒以内に自動的にリダイレクトされない場合は、ここをクリックしてください。",
-    "Redirect" : "リダイレクト",
-    "The link leads to %s" : "リンクが %s につながります",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "ページを開きたくない場合は、<a href=\"%s\">メール</a> に戻ることができます。",
-    "Continue to %s" : "%s にリダイレクトする",
-    "Delete account" : "アカウント削除",
-    "Try again" : "もう一度やり直してください",
-    "New message" : "新規メッセージ",
-    "Account Settings" : "アカウント設定",
-    "Aliases" : "別名",
-    "Mail address" : "メールアドレス",
-    "Display Name" : "表示名",
-    "Account" : "アカウント",
-    "Toggle read" : "読み込みの切り替え",
-    "Delete" : "削除",
-    "Keyboard shortcuts" : "キーボード ショートカット",
-    "Speed up your Mail experience with these quick shortcuts." : "ショートカットであなたのメール操作をスピードアップしてください。",
-    "Compose new message" : "新しいメッセージを作成する",
-    "Newer message" : "新しいメッセージ",
-    "Older message" : "古いメッセージ",
-    "Toggle star" : "スターを切り替え",
-    "Toggle unread" : "未読を切り替え",
-    "Search" : "検索",
-    "Refresh" : "同期",
-    "Connect your mail account" : "あなたのメールアカウントに接続",
     "Name" : "名前",
     "Mail Address" : "メールアドレス",
     "Password" : "パスワード",
-    "Manual configuration" : "マニュアル設定",
     "IMAP Host" : "IMAPホスト",
-    "IMAP security" : "IMAPセキュリティ",
     "None" : "なし",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAPポート",
     "IMAP User" : "IMAPユーザー",
     "IMAP Password" : "IMAPパスワード",
     "SMTP Host" : "SMTPホスト",
-    "SMTP security" : "SMTPセキュリティ",
     "SMTP Port" : "SMTPポート",
     "SMTP User" : "SMTPユーザー",
     "SMTP Password" : "SMTPパスワード",
     "Connect" : "接続",
+    "Add mail account" : "メールアカウントを追加",
+    "Use Gravatar and favicon avatars" : "Gravatarとfaviconのアバターを使用する",
+    "Keyboard shortcuts" : "キーボード ショートカット",
     "from" : "差出人",
     "to" : "宛先",
     "cc" : "cc",
     "bcc" : "bcc",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "あなたの返信がおそらく読まれないように、メールは不明なアドレスから来ていることに注意してください。",
     "Subject" : "件名",
-    "Save all to Files" : "すべてファイルに保存",
-    "Add mail account" : "メールアカウントを追加",
-    "Use Gravatar and favicon avatars" : "Gravatarとfaviconのアバターを使用する",
-    "No search results for" : "の検索結果はありません",
-    "The images have been blocked to protect your privacy." : "画像はあなたのプライバシーを守るためにブロックされています。",
-    "Show images from this sender" : "この送信者からの画像を表示する",
-    "Forward" : "転送",
-    "No messages in this folder" : "このフォルダーにメッセージはありません",
+    "Sending …" : "送信中 …",
+    "Message sent!" : "へメッセージを送信しました！",
+    "Send" : "送信",
     "Upload attachment" : "添付ファイルをアップロードする",
     "Add attachment from Files" : "ファイルから添付ファイルの追加",
+    "Choose a file to add as attachment" : "添付として追加するファイルを選択",
+    "No messages in this folder" : "このフォルダーにメッセージはありません",
+    "Delete" : "削除",
+    "Could not load your message" : "あなたのメッセージを読み込めませんでした",
     "Import into calendar" : "カレンダーにインポート",
     "Download attachment" : "添付ファイルをダウンロード",
-    "Save to Files" : "ファイルに保存"
+    "Save to Files" : "ファイルに保存",
+    "Choose a folder to store the attachment in" : "添付ファイルを保存するフォルダーを選択",
+    "Save all to Files" : "すべてファイルに保存",
+    "The images have been blocked to protect your privacy." : "画像はあなたのプライバシーを守るためにブロックされています。",
+    "New message" : "新規メッセージ",
+    "Settings" : "設定",
+    "Speed up your Mail experience with these quick shortcuts." : "ショートカットであなたのメール操作をスピードアップしてください。",
+    "Compose new message" : "新しいメッセージを作成する",
+    "Newer message" : "新しいメッセージ",
+    "Older message" : "古いメッセージ",
+    "Toggle star" : "スターを切り替え",
+    "Toggle unread" : "未読を切り替え",
+    "Search" : "検索",
+    "Refresh" : "同期",
+    "Connect your mail account" : "あなたのメールアカウントに接続",
+    "Show all folders" : "すべてのフォルダーを表示",
+    "Collapse folders" : "すべて展開",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n個の新しいメッセージ\nfrom{from}"],
+    "Nextcloud Mail" : "Nextcloud メール",
+    "All inboxes" : "すべての受信トレイ",
+    "Could not load {tag}{name}{endtag}" : "{tag} {name} {endtag}を読み込めませんでした",
+    "There was a problem loading {tag}{name}{endtag}" : "{tag}{name}{endtag} の読み込み中に問題が発生しました",
+    "Could not load the desired message" : "目的のメッセージを読み込めませんでした",
+    "Could not load the message" : "メッセージを読み込めませんでした",
+    "Error loading message" : "メッセージ読み込みエラー",
+    "Forwarding to %s" : "%s への転送",
+    "Click here if you are not automatically redirected within the next few seconds." : "数秒以内に自動的にリダイレクトされない場合は、ここをクリックしてください。",
+    "Redirect" : "リダイレクト",
+    "The link leads to %s" : "リンクが %s につながります",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "ページを開きたくない場合は、<a href=\"%s\">メール</a> に戻ることができます。",
+    "Continue to %s" : "%s にリダイレクトする"
 },
 "nplurals=1; plural=0;");
diff --git a/l10n/ja.json b/l10n/ja.json
index 811f1ea2c..c65dc97a9 100644
--- a/l10n/ja.json
+++ b/l10n/ja.json
@@ -1,55 +1,5 @@
 { "translations": {
     "Mail" : "メール",
-    "Loading accounts" : "アカウントを読み込み中",
-    "Error while loading the accounts." : "アカウントの読み込み中にエラーが発生しました。",
-    "Can not load this folder." : "フォルダーを読み込めません",
-    "Searching for {query}" : "{query}を検索中",
-    "Error while deleting message." : "メッセージの削除中にエラーが発生しました。",
-    "Forwarded message" : "転送メッセージ",
-    "Choose a folder to store the attachment in" : "添付ファイルを保存するフォルダーを選択",
-    "Attachments saved to Files." : "添付ファイルを保存しました。",
-    "Attachment saved to Files." : "添付ファイルを保存しました。",
-    "Error while saving attachments to Files." : "添付ファイルの保存中にエラーが発生しました。",
-    "Error while saving attachment to Files." : "添付ファイルの保存中にエラーが発生しました。",
-    "Message flag could not be set." : "メッセージフラッグが設定できませんでした。",
-    "Could not move message." : "メッセージを移動できませんでした",
-    "Invalid account" : "無効なアカウント",
-    "Invalid folder" : "無効なフォルダー",
-    "Error while creating the account: " : "アカウントの作成中にエラーが発生しました:",
-    "Unknown error" : "不明なエラー",
-    "Error while updating the account: " : "アカウントの更新中にエラーが発生しました:",
-    "All inboxes" : "すべての受信トレイ",
-    "you" : "あなた",
-    "Send message to {email}" : "{email} にメッセージを送信",
-    "Could not load {tag}{name}{endtag}" : "{tag} {name} {endtag}を読み込めませんでした",
-    "There was a problem loading {tag}{name}{endtag}" : "{tag}{name}{endtag} の読み込み中に問題が発生しました",
-    "Could not load your message" : "あなたのメッセージを読み込めませんでした",
-    "Could not load the desired message" : "目的のメッセージを読み込めませんでした",
-    "Could not load the message" : "メッセージを読み込めませんでした",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n個の新しいメッセージ\nfrom{from}"],
-    "Nextcloud Mail" : "Nextcloud メール",
-    "Save" : "保存",
-    "Saved" : "保存しました",
-    "Show all folders" : "すべてのフォルダーを表示",
-    "Collapse folders" : "すべて展開",
-    "Error while deleting account." : "アカウントの削除中にエラーが発生しました。",
-    "Choose a file to add as attachment" : "添付として追加するファイルを選択",
-    "An error occurred while uploading {fname}" : "{fname} のアップロード中にエラーが発生しました",
-    "Reply" : "返信",
-    "Send" : "送信",
-    "Sending …" : "送信中 …",
-    "Message sent!" : "へメッセージを送信しました！",
-    "Server error" : "サーバーエラー",
-    "An unknown error occurred" : "不明なエラーが発生しました",
-    "Opening HTML drafts is not supported yet." : "HTML の下書きを開くことはまだサポートされていません。",
-    "No writable calendars found" : "書き込み可能なカレンダーが見つかりません",
-    "Error while importing the calendar event" : "カレンダーイベントのインポート中にエラーが発生しました",
-    "Error while downloading calendar event" : "カレンダーイベントのダウンロード中にエラーが発生しました",
-    "& others" : "& その他",
-    "Error while loading messages." : "メールメッセージの読み込み中にエラーが発生しました。",
-    "Error while refreshing messages." : "メールメッセージの更新中にエラーが発生しました。",
-    "Setting up your account" : "あなたのアカウントを設定しています",
     "Inbox" : "受信箱",
     "Sent" : "送信",
     "Drafts" : "草稿",
@@ -64,69 +14,70 @@
     "Delete permanently" : "完全に削除する",
     "IMAP web client" : "IMAPウェブクライアント",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "IMAPとSMTP経由であなたのメールサーバーに接続する使いやすい電子メールクライアント。",
-    "Error loading message" : "メッセージ読み込みエラー",
-    "Settings" : "設定",
-    "Forwarding to %s" : "%s への転送",
-    "Click here if you are not automatically redirected within the next few seconds." : "数秒以内に自動的にリダイレクトされない場合は、ここをクリックしてください。",
-    "Redirect" : "リダイレクト",
-    "The link leads to %s" : "リンクが %s につながります",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "ページを開きたくない場合は、<a href=\"%s\">メール</a> に戻ることができます。",
-    "Continue to %s" : "%s にリダイレクトする",
-    "Delete account" : "アカウント削除",
-    "Try again" : "もう一度やり直してください",
-    "New message" : "新規メッセージ",
-    "Account Settings" : "アカウント設定",
-    "Aliases" : "別名",
-    "Mail address" : "メールアドレス",
-    "Display Name" : "表示名",
-    "Account" : "アカウント",
-    "Toggle read" : "読み込みの切り替え",
-    "Delete" : "削除",
-    "Keyboard shortcuts" : "キーボード ショートカット",
-    "Speed up your Mail experience with these quick shortcuts." : "ショートカットであなたのメール操作をスピードアップしてください。",
-    "Compose new message" : "新しいメッセージを作成する",
-    "Newer message" : "新しいメッセージ",
-    "Older message" : "古いメッセージ",
-    "Toggle star" : "スターを切り替え",
-    "Toggle unread" : "未読を切り替え",
-    "Search" : "検索",
-    "Refresh" : "同期",
-    "Connect your mail account" : "あなたのメールアカウントに接続",
     "Name" : "名前",
     "Mail Address" : "メールアドレス",
     "Password" : "パスワード",
-    "Manual configuration" : "マニュアル設定",
     "IMAP Host" : "IMAPホスト",
-    "IMAP security" : "IMAPセキュリティ",
     "None" : "なし",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAPポート",
     "IMAP User" : "IMAPユーザー",
     "IMAP Password" : "IMAPパスワード",
     "SMTP Host" : "SMTPホスト",
-    "SMTP security" : "SMTPセキュリティ",
     "SMTP Port" : "SMTPポート",
     "SMTP User" : "SMTPユーザー",
     "SMTP Password" : "SMTPパスワード",
     "Connect" : "接続",
+    "Add mail account" : "メールアカウントを追加",
+    "Use Gravatar and favicon avatars" : "Gravatarとfaviconのアバターを使用する",
+    "Keyboard shortcuts" : "キーボード ショートカット",
     "from" : "差出人",
     "to" : "宛先",
     "cc" : "cc",
     "bcc" : "bcc",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "あなたの返信がおそらく読まれないように、メールは不明なアドレスから来ていることに注意してください。",
     "Subject" : "件名",
-    "Save all to Files" : "すべてファイルに保存",
-    "Add mail account" : "メールアカウントを追加",
-    "Use Gravatar and favicon avatars" : "Gravatarとfaviconのアバターを使用する",
-    "No search results for" : "の検索結果はありません",
-    "The images have been blocked to protect your privacy." : "画像はあなたのプライバシーを守るためにブロックされています。",
-    "Show images from this sender" : "この送信者からの画像を表示する",
-    "Forward" : "転送",
-    "No messages in this folder" : "このフォルダーにメッセージはありません",
+    "Sending …" : "送信中 …",
+    "Message sent!" : "へメッセージを送信しました！",
+    "Send" : "送信",
     "Upload attachment" : "添付ファイルをアップロードする",
     "Add attachment from Files" : "ファイルから添付ファイルの追加",
+    "Choose a file to add as attachment" : "添付として追加するファイルを選択",
+    "No messages in this folder" : "このフォルダーにメッセージはありません",
+    "Delete" : "削除",
+    "Could not load your message" : "あなたのメッセージを読み込めませんでした",
     "Import into calendar" : "カレンダーにインポート",
     "Download attachment" : "添付ファイルをダウンロード",
-    "Save to Files" : "ファイルに保存"
+    "Save to Files" : "ファイルに保存",
+    "Choose a folder to store the attachment in" : "添付ファイルを保存するフォルダーを選択",
+    "Save all to Files" : "すべてファイルに保存",
+    "The images have been blocked to protect your privacy." : "画像はあなたのプライバシーを守るためにブロックされています。",
+    "New message" : "新規メッセージ",
+    "Settings" : "設定",
+    "Speed up your Mail experience with these quick shortcuts." : "ショートカットであなたのメール操作をスピードアップしてください。",
+    "Compose new message" : "新しいメッセージを作成する",
+    "Newer message" : "新しいメッセージ",
+    "Older message" : "古いメッセージ",
+    "Toggle star" : "スターを切り替え",
+    "Toggle unread" : "未読を切り替え",
+    "Search" : "検索",
+    "Refresh" : "同期",
+    "Connect your mail account" : "あなたのメールアカウントに接続",
+    "Show all folders" : "すべてのフォルダーを表示",
+    "Collapse folders" : "すべて展開",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n個の新しいメッセージ\nfrom{from}"],
+    "Nextcloud Mail" : "Nextcloud メール",
+    "All inboxes" : "すべての受信トレイ",
+    "Could not load {tag}{name}{endtag}" : "{tag} {name} {endtag}を読み込めませんでした",
+    "There was a problem loading {tag}{name}{endtag}" : "{tag}{name}{endtag} の読み込み中に問題が発生しました",
+    "Could not load the desired message" : "目的のメッセージを読み込めませんでした",
+    "Could not load the message" : "メッセージを読み込めませんでした",
+    "Error loading message" : "メッセージ読み込みエラー",
+    "Forwarding to %s" : "%s への転送",
+    "Click here if you are not automatically redirected within the next few seconds." : "数秒以内に自動的にリダイレクトされない場合は、ここをクリックしてください。",
+    "Redirect" : "リダイレクト",
+    "The link leads to %s" : "リンクが %s につながります",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "ページを開きたくない場合は、<a href=\"%s\">メール</a> に戻ることができます。",
+    "Continue to %s" : "%s にリダイレクトする"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/l10n/ka_GE.js b/l10n/ka_GE.js
index ddab91ad7..bd64f9bdd 100644
--- a/l10n/ka_GE.js
+++ b/l10n/ka_GE.js
@@ -2,56 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "ფოსტა",
-    "Loading accounts" : "ანგარიშების ჩატვირთვა",
-    "Error while loading the accounts." : "ანგარიშების ჩატვირთვისას წარმოიქმნა შეცდომა.",
-    "Can not load this folder." : "ამ დირექტორიის ჩატვირთვა ვერ მოხერხდა.",
-    "Searching for {query}" : "ვეძებთ {query}-ის",
-    "Error while deleting message." : "წერილების გაუქმებისას წარმოიშვა შეცდომა",
-    "Forwarded message" : "წერილის გადამისამართება",
-    "Choose a folder to store the attachment in" : "გთხოვთ აირჩიოთ დირექტორია, სადაც მოთავსდება დანართი",
-    "Attachments saved to Files." : "დანართები შენახულია ფაილებში.",
-    "Attachment saved to Files." : "დანართი შენახულია ფაილებში.",
-    "Error while saving attachments to Files." : "დანართების ფაილებში შენახვისას წარმოიშვა შეცდომა.",
-    "Error while saving attachment to Files." : "დანართის ფაილებში შენახვისას წარმოიშვა შეცდომა.",
-    "Message flag could not be set." : "წერილის დროშა ვერ დაყენდა.",
-    "Could not move message." : "წერილის გადატანა ვერ მოხერხდა.",
-    "Invalid account" : "არასწორი ანგარიში",
-    "Invalid folder" : "არასწორი დირექტორია",
-    "Error while creating the account: " : "ანგარიშის შექმნისას წარმოიშვა შეცდომა:",
-    "Unknown error" : "უცნობი შეცდომა",
-    "Error while updating the account: " : "ანგარიშის განახლებისას წარმოიშვა შეცდომა:",
-    "All inboxes" : "ყველა ინბოქსი",
-    "you" : "თქვენ",
-    "Send message to {email}" : "გაუგზავნეთ წერილი {email}-ს",
-    "Could not load {tag}{name}{endtag}" : "{tag}{name}{endtag} ვერ ჩაიტვირთა",
-    "There was a problem loading {tag}{name}{endtag}" : "{tag}{name}{endtag}-ის ჩატვირთვისას მოხდა შეცდომა",
-    "Could not load your message" : "თქვენი წერილის ჩატვირთვა ვერ მოხერხდა",
-    "Could not load the desired message" : "სასურველი წერილის ჩატვირთვა ვერ მოხერხდა",
-    "Could not load the message" : "წერილის ჩატვირთვა ვერ მოხერხდა",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n ახალი წერილი\n{from}-ისგან","%n ახალი წერილი\n{from}-ისგან"],
-    "Nextcloud Mail" : "Nextcloud ფოსტა",
-    "Save" : "შენახვა",
-    "Saved" : "შენახულია",
-    "Show all folders" : "ყველა დირექტორიის ჩვენება",
-    "Collapse folders" : "დირექტორიების კოლაფსი",
-    "Error while deleting account." : "ანგარიშის გაუქმებისას წარმოიშვა შეცდომა.",
-    "Choose a file to add as attachment" : "დანართად დასამატებლად აირჩიეთ ფაილი",
-    "An error occurred while uploading {fname}" : "{fname}-ის ატვირთვისას წარმოიშვა შეცდომა",
-    "Reply" : "პასუხი",
-    "Send" : "გაგზავნა",
-    "Sending …" : "იგზავნება …",
-    "Message sent!" : "წერილი გაგზავნილია!",
-    "Server error" : "სერვერის შეცდომა",
-    "An unknown error occurred" : "გამოჩნდა ამოუცნობი შეცდომა",
-    "Opening HTML drafts is not supported yet." : "HTML მონახაზის გახსნა ჯერ მხარდაჭერილი არაა.",
-    "No writable calendars found" : "ჩაწერადი კალენდრები ვერ იქნა ნაპოვნი",
-    "Error while importing the calendar event" : "კალენდრის მოვლენის იმპორტირებისას წარმოიშვა შეცდომა",
-    "Error while downloading calendar event" : "კალენდრის მოვლენის ჩამოტვირთვისას წარმოიშვა შეცდომა",
-    "& others" : "და სხვები",
-    "Error while loading messages." : "წერილების ჩატვირთვისას წარმოიშვა შეცდომა.",
-    "Error while refreshing messages." : "წერილების განახლებისას წარმოიშვა შეცდომა.",
-    "Setting up your account" : "ანგარიშის დაყენება",
     "Inbox" : "ინბოქსი",
     "Sent" : "გაგზავნილი",
     "Drafts" : "მონახაზები",
@@ -64,67 +14,69 @@ OC.L10N.register(
     "Updating account failed: " : "ანგარიშის განახლება ვერ მოხერხდა:",
     "Creating account failed: " : "ანგარიშების შექმნა ვერ მოხერხდა:",
     "Delete permanently" : "სამუდამოდ წაშლა",
-    "Error loading message" : "წერილის ჩატვირთვისას წარმოიშვა შეცდომა",
-    "Settings" : "პარამეტრები",
-    "Forwarding to %s" : "გადაგზავნილია %s-ზე",
-    "Click here if you are not automatically redirected within the next few seconds." : "იმ შემთხვევაში, თუ რამდენიმე წამის განმავლობაში არ მოხდება ავტომატური გადამისამართება დააწკაპუნეთ აქ.",
-    "Redirect" : "გადამისამართება",
-    "The link leads to %s" : "ბმულს მიყევხართ %s-ისკენ",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "თუ არ გსურთ ესტუმროთ იმ გვერდს, შეგიძლიათ დაუბრუნდეთ <a href=\"%s\">ფოსტას</a>.",
-    "Continue to %s" : "%s-ისკენ გაგრძელება",
-    "Delete account" : "ანგარიშის გაუქმება",
-    "Try again" : "სცადეთ ახლიდან",
-    "New message" : "ახალი წერილი",
-    "Account Settings" : "ანგარიშის პარამეტრები",
-    "Aliases" : "სხვანაირი სახელი",
-    "Mail address" : "ფოსტის მისამართი",
-    "Display Name" : "დისპლეი სახელი",
-    "Account" : "ანგარიში",
-    "Delete" : "გაუქმება",
-    "Keyboard shortcuts" : "კლავიატურის კომბინაციები",
-    "Speed up your Mail experience with these quick shortcuts." : "მოიხმარეთ ეს კომბინაციები ფოსტასთან უფრო სწრაფად სამუშაოდ.",
-    "Compose new message" : "ახალი წერილის შედგენა",
-    "Newer message" : "უფრო ახალი წერილი",
-    "Older message" : "ძველი წერილი",
-    "Toggle star" : "ვარსკლავის გადართვა",
-    "Toggle unread" : "წაუკითხავის გადართვა",
-    "Search" : "ძიება",
-    "Refresh" : "განახლება",
-    "Connect your mail account" : "დააკავშირეთ თქვენი ელ-ფოსტის ანგარიში",
     "Name" : "სახელი",
     "Mail Address" : "ფოსტის მისამართი",
     "Password" : "პაროლი",
-    "Manual configuration" : "კონფიგურირება ხელით",
     "IMAP Host" : "IMAP ჰოსტი",
-    "IMAP security" : "IMAP უსაფრთხოება",
     "None" : "არც ერთი",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP პორტი",
     "IMAP User" : "IMAP მომხმარებელი",
     "IMAP Password" : "IMAP პაროლი",
     "SMTP Host" : "SMTP ჰოსტი",
-    "SMTP security" : "SMTP უსაფრთხოება",
     "SMTP Port" : "SMTP პორტი",
     "SMTP User" : "SMTP მომხმარებელი",
     "SMTP Password" : "SMTP პაროლი",
     "Connect" : "დაკავშირება",
+    "Add mail account" : "საფოსტო ანგარიშის დამატება",
+    "Use Gravatar and favicon avatars" : "მოიხმარეთ Gravatar და favicon ავატარები",
+    "Keyboard shortcuts" : "კლავიატურის კომბინაციები",
     "from" : "ვისგან",
     "to" : "ვის",
     "cc" : "კკ",
     "bcc" : "ბკკ",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "შენიშნეთ რომ წერილი მიღებულია \"დაუბრუნებელი\" მისამართიდან, ასე რომ თქვენი პასუხი სავარაუდოდ არ იქნება წაკითხული.",
     "Subject" : "სათაური",
-    "Save all to Files" : "ყველაფრის ფაილებში შენახვა",
-    "Add mail account" : "საფოსტო ანგარიშის დამატება",
-    "Use Gravatar and favicon avatars" : "მოიხმარეთ Gravatar და favicon ავატარები",
-    "No search results for" : "ძიების შედეგები არაა",
-    "The images have been blocked to protect your privacy." : "სურათები თქვენი კონფიდენციალურობის დასაცავად დაიბლოკა",
-    "Show images from this sender" : "ამ გამომგზავნელისგან სურათების ჩვენება",
-    "Forward" : "გადამისამართება",
+    "Sending …" : "იგზავნება …",
+    "Message sent!" : "წერილი გაგზავნილია!",
+    "Send" : "გაგზავნა",
     "Upload attachment" : "დანართის ატვირთვა",
     "Add attachment from Files" : "დანართის დამატება ფაილებიდან",
+    "Choose a file to add as attachment" : "დანართად დასამატებლად აირჩიეთ ფაილი",
+    "Delete" : "გაუქმება",
+    "Could not load your message" : "თქვენი წერილის ჩატვირთვა ვერ მოხერხდა",
     "Import into calendar" : "იმპორტი კალენდარში",
     "Download attachment" : "დანართის გადმოწერა",
-    "Save to Files" : "შენახვა ფაილებში"
+    "Save to Files" : "შენახვა ფაილებში",
+    "Choose a folder to store the attachment in" : "გთხოვთ აირჩიოთ დირექტორია, სადაც მოთავსდება დანართი",
+    "Save all to Files" : "ყველაფრის ფაილებში შენახვა",
+    "The images have been blocked to protect your privacy." : "სურათები თქვენი კონფიდენციალურობის დასაცავად დაიბლოკა",
+    "New message" : "ახალი წერილი",
+    "Settings" : "პარამეტრები",
+    "Speed up your Mail experience with these quick shortcuts." : "მოიხმარეთ ეს კომბინაციები ფოსტასთან უფრო სწრაფად სამუშაოდ.",
+    "Compose new message" : "ახალი წერილის შედგენა",
+    "Newer message" : "უფრო ახალი წერილი",
+    "Older message" : "ძველი წერილი",
+    "Toggle star" : "ვარსკლავის გადართვა",
+    "Toggle unread" : "წაუკითხავის გადართვა",
+    "Search" : "ძიება",
+    "Refresh" : "განახლება",
+    "Connect your mail account" : "დააკავშირეთ თქვენი ელ-ფოსტის ანგარიში",
+    "Show all folders" : "ყველა დირექტორიის ჩვენება",
+    "Collapse folders" : "დირექტორიების კოლაფსი",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n ახალი წერილი\n{from}-ისგან","%n ახალი წერილი\n{from}-ისგან"],
+    "Nextcloud Mail" : "Nextcloud ფოსტა",
+    "All inboxes" : "ყველა ინბოქსი",
+    "Could not load {tag}{name}{endtag}" : "{tag}{name}{endtag} ვერ ჩაიტვირთა",
+    "There was a problem loading {tag}{name}{endtag}" : "{tag}{name}{endtag}-ის ჩატვირთვისას მოხდა შეცდომა",
+    "Could not load the desired message" : "სასურველი წერილის ჩატვირთვა ვერ მოხერხდა",
+    "Could not load the message" : "წერილის ჩატვირთვა ვერ მოხერხდა",
+    "Error loading message" : "წერილის ჩატვირთვისას წარმოიშვა შეცდომა",
+    "Forwarding to %s" : "გადაგზავნილია %s-ზე",
+    "Click here if you are not automatically redirected within the next few seconds." : "იმ შემთხვევაში, თუ რამდენიმე წამის განმავლობაში არ მოხდება ავტომატური გადამისამართება დააწკაპუნეთ აქ.",
+    "Redirect" : "გადამისამართება",
+    "The link leads to %s" : "ბმულს მიყევხართ %s-ისკენ",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "თუ არ გსურთ ესტუმროთ იმ გვერდს, შეგიძლიათ დაუბრუნდეთ <a href=\"%s\">ფოსტას</a>.",
+    "Continue to %s" : "%s-ისკენ გაგრძელება"
 },
 "nplurals=2; plural=(n!=1);");
diff --git a/l10n/ka_GE.json b/l10n/ka_GE.json
index e9ac2d150..b033f8f92 100644
--- a/l10n/ka_GE.json
+++ b/l10n/ka_GE.json
@@ -1,55 +1,5 @@
 { "translations": {
     "Mail" : "ფოსტა",
-    "Loading accounts" : "ანგარიშების ჩატვირთვა",
-    "Error while loading the accounts." : "ანგარიშების ჩატვირთვისას წარმოიქმნა შეცდომა.",
-    "Can not load this folder." : "ამ დირექტორიის ჩატვირთვა ვერ მოხერხდა.",
-    "Searching for {query}" : "ვეძებთ {query}-ის",
-    "Error while deleting message." : "წერილების გაუქმებისას წარმოიშვა შეცდომა",
-    "Forwarded message" : "წერილის გადამისამართება",
-    "Choose a folder to store the attachment in" : "გთხოვთ აირჩიოთ დირექტორია, სადაც მოთავსდება დანართი",
-    "Attachments saved to Files." : "დანართები შენახულია ფაილებში.",
-    "Attachment saved to Files." : "დანართი შენახულია ფაილებში.",
-    "Error while saving attachments to Files." : "დანართების ფაილებში შენახვისას წარმოიშვა შეცდომა.",
-    "Error while saving attachment to Files." : "დანართის ფაილებში შენახვისას წარმოიშვა შეცდომა.",
-    "Message flag could not be set." : "წერილის დროშა ვერ დაყენდა.",
-    "Could not move message." : "წერილის გადატანა ვერ მოხერხდა.",
-    "Invalid account" : "არასწორი ანგარიში",
-    "Invalid folder" : "არასწორი დირექტორია",
-    "Error while creating the account: " : "ანგარიშის შექმნისას წარმოიშვა შეცდომა:",
-    "Unknown error" : "უცნობი შეცდომა",
-    "Error while updating the account: " : "ანგარიშის განახლებისას წარმოიშვა შეცდომა:",
-    "All inboxes" : "ყველა ინბოქსი",
-    "you" : "თქვენ",
-    "Send message to {email}" : "გაუგზავნეთ წერილი {email}-ს",
-    "Could not load {tag}{name}{endtag}" : "{tag}{name}{endtag} ვერ ჩაიტვირთა",
-    "There was a problem loading {tag}{name}{endtag}" : "{tag}{name}{endtag}-ის ჩატვირთვისას მოხდა შეცდომა",
-    "Could not load your message" : "თქვენი წერილის ჩატვირთვა ვერ მოხერხდა",
-    "Could not load the desired message" : "სასურველი წერილის ჩატვირთვა ვერ მოხერხდა",
-    "Could not load the message" : "წერილის ჩატვირთვა ვერ მოხერხდა",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n ახალი წერილი\n{from}-ისგან","%n ახალი წერილი\n{from}-ისგან"],
-    "Nextcloud Mail" : "Nextcloud ფოსტა",
-    "Save" : "შენახვა",
-    "Saved" : "შენახულია",
-    "Show all folders" : "ყველა დირექტორიის ჩვენება",
-    "Collapse folders" : "დირექტორიების კოლაფსი",
-    "Error while deleting account." : "ანგარიშის გაუქმებისას წარმოიშვა შეცდომა.",
-    "Choose a file to add as attachment" : "დანართად დასამატებლად აირჩიეთ ფაილი",
-    "An error occurred while uploading {fname}" : "{fname}-ის ატვირთვისას წარმოიშვა შეცდომა",
-    "Reply" : "პასუხი",
-    "Send" : "გაგზავნა",
-    "Sending …" : "იგზავნება …",
-    "Message sent!" : "წერილი გაგზავნილია!",
-    "Server error" : "სერვერის შეცდომა",
-    "An unknown error occurred" : "გამოჩნდა ამოუცნობი შეცდომა",
-    "Opening HTML drafts is not supported yet." : "HTML მონახაზის გახსნა ჯერ მხარდაჭერილი არაა.",
-    "No writable calendars found" : "ჩაწერადი კალენდრები ვერ იქნა ნაპოვნი",
-    "Error while importing the calendar event" : "კალენდრის მოვლენის იმპორტირებისას წარმოიშვა შეცდომა",
-    "Error while downloading calendar event" : "კალენდრის მოვლენის ჩამოტვირთვისას წარმოიშვა შეცდომა",
-    "& others" : "და სხვები",
-    "Error while loading messages." : "წერილების ჩატვირთვისას წარმოიშვა შეცდომა.",
-    "Error while refreshing messages." : "წერილების განახლებისას წარმოიშვა შეცდომა.",
-    "Setting up your account" : "ანგარიშის დაყენება",
     "Inbox" : "ინბოქსი",
     "Sent" : "გაგზავნილი",
     "Drafts" : "მონახაზები",
@@ -62,67 +12,69 @@
     "Updating account failed: " : "ანგარიშის განახლება ვერ მოხერხდა:",
     "Creating account failed: " : "ანგარიშების შექმნა ვერ მოხერხდა:",
     "Delete permanently" : "სამუდამოდ წაშლა",
-    "Error loading message" : "წერილის ჩატვირთვისას წარმოიშვა შეცდომა",
-    "Settings" : "პარამეტრები",
-    "Forwarding to %s" : "გადაგზავნილია %s-ზე",
-    "Click here if you are not automatically redirected within the next few seconds." : "იმ შემთხვევაში, თუ რამდენიმე წამის განმავლობაში არ მოხდება ავტომატური გადამისამართება დააწკაპუნეთ აქ.",
-    "Redirect" : "გადამისამართება",
-    "The link leads to %s" : "ბმულს მიყევხართ %s-ისკენ",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "თუ არ გსურთ ესტუმროთ იმ გვერდს, შეგიძლიათ დაუბრუნდეთ <a href=\"%s\">ფოსტას</a>.",
-    "Continue to %s" : "%s-ისკენ გაგრძელება",
-    "Delete account" : "ანგარიშის გაუქმება",
-    "Try again" : "სცადეთ ახლიდან",
-    "New message" : "ახალი წერილი",
-    "Account Settings" : "ანგარიშის პარამეტრები",
-    "Aliases" : "სხვანაირი სახელი",
-    "Mail address" : "ფოსტის მისამართი",
-    "Display Name" : "დისპლეი სახელი",
-    "Account" : "ანგარიში",
-    "Delete" : "გაუქმება",
-    "Keyboard shortcuts" : "კლავიატურის კომბინაციები",
-    "Speed up your Mail experience with these quick shortcuts." : "მოიხმარეთ ეს კომბინაციები ფოსტასთან უფრო სწრაფად სამუშაოდ.",
-    "Compose new message" : "ახალი წერილის შედგენა",
-    "Newer message" : "უფრო ახალი წერილი",
-    "Older message" : "ძველი წერილი",
-    "Toggle star" : "ვარსკლავის გადართვა",
-    "Toggle unread" : "წაუკითხავის გადართვა",
-    "Search" : "ძიება",
-    "Refresh" : "განახლება",
-    "Connect your mail account" : "დააკავშირეთ თქვენი ელ-ფოსტის ანგარიში",
     "Name" : "სახელი",
     "Mail Address" : "ფოსტის მისამართი",
     "Password" : "პაროლი",
-    "Manual configuration" : "კონფიგურირება ხელით",
     "IMAP Host" : "IMAP ჰოსტი",
-    "IMAP security" : "IMAP უსაფრთხოება",
     "None" : "არც ერთი",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP პორტი",
     "IMAP User" : "IMAP მომხმარებელი",
     "IMAP Password" : "IMAP პაროლი",
     "SMTP Host" : "SMTP ჰოსტი",
-    "SMTP security" : "SMTP უსაფრთხოება",
     "SMTP Port" : "SMTP პორტი",
     "SMTP User" : "SMTP მომხმარებელი",
     "SMTP Password" : "SMTP პაროლი",
     "Connect" : "დაკავშირება",
+    "Add mail account" : "საფოსტო ანგარიშის დამატება",
+    "Use Gravatar and favicon avatars" : "მოიხმარეთ Gravatar და favicon ავატარები",
+    "Keyboard shortcuts" : "კლავიატურის კომბინაციები",
     "from" : "ვისგან",
     "to" : "ვის",
     "cc" : "კკ",
     "bcc" : "ბკკ",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "შენიშნეთ რომ წერილი მიღებულია \"დაუბრუნებელი\" მისამართიდან, ასე რომ თქვენი პასუხი სავარაუდოდ არ იქნება წაკითხული.",
     "Subject" : "სათაური",
-    "Save all to Files" : "ყველაფრის ფაილებში შენახვა",
-    "Add mail account" : "საფოსტო ანგარიშის დამატება",
-    "Use Gravatar and favicon avatars" : "მოიხმარეთ Gravatar და favicon ავატარები",
-    "No search results for" : "ძიების შედეგები არაა",
-    "The images have been blocked to protect your privacy." : "სურათები თქვენი კონფიდენციალურობის დასაცავად დაიბლოკა",
-    "Show images from this sender" : "ამ გამომგზავნელისგან სურათების ჩვენება",
-    "Forward" : "გადამისამართება",
+    "Sending …" : "იგზავნება …",
+    "Message sent!" : "წერილი გაგზავნილია!",
+    "Send" : "გაგზავნა",
     "Upload attachment" : "დანართის ატვირთვა",
     "Add attachment from Files" : "დანართის დამატება ფაილებიდან",
+    "Choose a file to add as attachment" : "დანართად დასამატებლად აირჩიეთ ფაილი",
+    "Delete" : "გაუქმება",
+    "Could not load your message" : "თქვენი წერილის ჩატვირთვა ვერ მოხერხდა",
     "Import into calendar" : "იმპორტი კალენდარში",
     "Download attachment" : "დანართის გადმოწერა",
-    "Save to Files" : "შენახვა ფაილებში"
+    "Save to Files" : "შენახვა ფაილებში",
+    "Choose a folder to store the attachment in" : "გთხოვთ აირჩიოთ დირექტორია, სადაც მოთავსდება დანართი",
+    "Save all to Files" : "ყველაფრის ფაილებში შენახვა",
+    "The images have been blocked to protect your privacy." : "სურათები თქვენი კონფიდენციალურობის დასაცავად დაიბლოკა",
+    "New message" : "ახალი წერილი",
+    "Settings" : "პარამეტრები",
+    "Speed up your Mail experience with these quick shortcuts." : "მოიხმარეთ ეს კომბინაციები ფოსტასთან უფრო სწრაფად სამუშაოდ.",
+    "Compose new message" : "ახალი წერილის შედგენა",
+    "Newer message" : "უფრო ახალი წერილი",
+    "Older message" : "ძველი წერილი",
+    "Toggle star" : "ვარსკლავის გადართვა",
+    "Toggle unread" : "წაუკითხავის გადართვა",
+    "Search" : "ძიება",
+    "Refresh" : "განახლება",
+    "Connect your mail account" : "დააკავშირეთ თქვენი ელ-ფოსტის ანგარიში",
+    "Show all folders" : "ყველა დირექტორიის ჩვენება",
+    "Collapse folders" : "დირექტორიების კოლაფსი",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n ახალი წერილი\n{from}-ისგან","%n ახალი წერილი\n{from}-ისგან"],
+    "Nextcloud Mail" : "Nextcloud ფოსტა",
+    "All inboxes" : "ყველა ინბოქსი",
+    "Could not load {tag}{name}{endtag}" : "{tag}{name}{endtag} ვერ ჩაიტვირთა",
+    "There was a problem loading {tag}{name}{endtag}" : "{tag}{name}{endtag}-ის ჩატვირთვისას მოხდა შეცდომა",
+    "Could not load the desired message" : "სასურველი წერილის ჩატვირთვა ვერ მოხერხდა",
+    "Could not load the message" : "წერილის ჩატვირთვა ვერ მოხერხდა",
+    "Error loading message" : "წერილის ჩატვირთვისას წარმოიშვა შეცდომა",
+    "Forwarding to %s" : "გადაგზავნილია %s-ზე",
+    "Click here if you are not automatically redirected within the next few seconds." : "იმ შემთხვევაში, თუ რამდენიმე წამის განმავლობაში არ მოხდება ავტომატური გადამისამართება დააწკაპუნეთ აქ.",
+    "Redirect" : "გადამისამართება",
+    "The link leads to %s" : "ბმულს მიყევხართ %s-ისკენ",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "თუ არ გსურთ ესტუმროთ იმ გვერდს, შეგიძლიათ დაუბრუნდეთ <a href=\"%s\">ფოსტას</a>.",
+    "Continue to %s" : "%s-ისკენ გაგრძელება"
 },"pluralForm" :"nplurals=2; plural=(n!=1);"
 }
\ No newline at end of file
diff --git a/l10n/ko.js b/l10n/ko.js
index 079b5b406..8ecfee081 100644
--- a/l10n/ko.js
+++ b/l10n/ko.js
@@ -2,56 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "메일",
-    "Loading accounts" : "계정 불러오는 중",
-    "Error while loading the accounts." : "계정을 불러오는 중 오류가 발생했습니다.",
-    "Can not load this folder." : "이 폴더를 불러올 수 없습니다.",
-    "Searching for {query}" : "{query} 검색",
-    "Error while deleting message." : "메시지를 삭제하는 중 오류가 발생했습니다.",
-    "Forwarded message" : "전달된 메시지",
-    "Choose a folder to store the attachment in" : "첨부 항목을 저장할 폴더 선택",
-    "Attachments saved to Files." : "첨부 파일이 클라우드에 저장되었습니다.",
-    "Attachment saved to Files." : "첨부 파일이 클라우드에 저장되었습니다.",
-    "Error while saving attachments to Files." : "첨부 파일을 클라우드에 저장하는 중 오류가 발생했습니다.",
-    "Error while saving attachment to Files." : "첨부 파일을 클라우드에 저장하는 중 오류가 발생했습니다.",
-    "Message flag could not be set." : "메시지 플래그를 설정할 수 없습니다.",
-    "Could not move message." : "메시지를 이동할 수 없습니다.",
-    "Invalid account" : "잘못된 계정",
-    "Invalid folder" : "잘못된 폴더",
-    "Error while creating the account: " : "계정 생성 중 오류 발생:",
-    "Unknown error" : "알 수 없는 오류",
-    "Error while updating the account: " : "계정 업데이트 중 오류 발생:",
-    "All inboxes" : "모든 받은 편지함",
-    "you" : "나",
-    "Send message to {email}" : "{email}(으)로 이메일 보내기",
-    "Could not load {tag}{name}{endtag}" : "{tag}{name}{endtag}을(를) 불러올 수 없음",
-    "There was a problem loading {tag}{name}{endtag}" : "{tag}{name}{endtag}을(를) 불러오는 중 문제 발생",
-    "Could not load your message" : "메시지를 불러올 수 없음",
-    "Could not load the desired message" : "원하는 메시지를 불러올 수 없음",
-    "Could not load the message" : "메시지를 불러올 수 없음",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["새 메일 %n개\n보낸 사람: {from}"],
-    "Nextcloud Mail" : "Nextcloud 메일",
-    "Save" : "저장",
-    "Saved" : "저장됨",
-    "Show all folders" : "모든 폴더 보기",
-    "Collapse folders" : "폴더 접기",
-    "Error while deleting account." : "계정을 삭제하는 중 오류가 발생했습니다.",
-    "Choose a file to add as attachment" : "첨부할 파일을 선택하십시오",
-    "An error occurred while uploading {fname}" : "{fname}을 업로드하는 중 오류 발생",
-    "Reply" : "답장",
-    "Send" : "보내기",
-    "Sending …" : "보내는 중...",
-    "Message sent!" : "메시지를 보냈습니다!",
-    "Server error" : "서버 오류",
-    "An unknown error occurred" : "알 수 없는 오류가 발생했습니다",
-    "Opening HTML drafts is not supported yet." : "HTML 임시 보관 메시지를 여는 것은 지원되지 않습니다.",
-    "No writable calendars found" : "기록할 수 있는 달력을 찾을 수 없음",
-    "Error while importing the calendar event" : "달력 행사를 가져 오는 중 오류 발생",
-    "Error while downloading calendar event" : "달력 행사를 다운로드하는 중 오류 발생",
-    "& others" : "및 그 외",
-    "Error while loading messages." : "메시지를 불러오는 중 오류가 발생했습니다.",
-    "Error while refreshing messages." : "메시지를 새로 고치는 중 오류가 발생했습니다.",
-    "Setting up your account" : "계정 설정 중",
     "Inbox" : "받은 편지함",
     "Sent" : "보낸 편지함",
     "Drafts" : "임시 보관함",
@@ -64,67 +14,69 @@ OC.L10N.register(
     "Updating account failed: " : "계정 업데이트 실패:",
     "Creating account failed: " : "계정 생성 실패: ",
     "Delete permanently" : "영구히 삭제",
-    "Error loading message" : "메시지 불러오기 오류",
-    "Settings" : "설정",
-    "Forwarding to %s" : "%s 전달",
-    "Click here if you are not automatically redirected within the next few seconds." : "자동으로 이동하지 않는 경우 여기를 클릭하십시오.",
-    "Redirect" : "넘겨주기",
-    "The link leads to %s" : "이 링크가 %s을(를) 향함",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "해당 페이지를 방문하지 않으려면 <a href=\"%s\">메일</a>로 돌아갈 수 있습니다.",
-    "Continue to %s" : "%s(으)로 이동",
-    "Delete account" : "계정 삭제",
-    "Try again" : "다시 시도",
-    "New message" : "새로운 메시지",
-    "Account Settings" : "계정 설정",
-    "Aliases" : "별칭",
-    "Mail address" : "메일 주소",
-    "Display Name" : "표시 이름",
-    "Account" : "계정",
-    "Delete" : "삭제",
-    "Keyboard shortcuts" : "키보드 단축키",
-    "Speed up your Mail experience with these quick shortcuts." : "빠른 단축키로 메일 사용을 더 빠르게 할 수 있습니다.",
-    "Compose new message" : "새 메시지 작성",
-    "Newer message" : "새로운 메시지",
-    "Older message" : "오래된 메시지",
-    "Toggle star" : "별표 전환",
-    "Toggle unread" : "읽음/읽지 않음 전환",
-    "Search" : "검색",
-    "Refresh" : "새로 고침",
-    "Connect your mail account" : "메일 계정에 연결",
     "Name" : "이름",
     "Mail Address" : "메일 주소",
     "Password" : "암호",
-    "Manual configuration" : "직접 설정",
     "IMAP Host" : "IMAP 호스트",
-    "IMAP security" : "IMAP 보안",
     "None" : "없음",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP 포트",
     "IMAP User" : "IMAP 사용자",
     "IMAP Password" : "IMAP 암호",
     "SMTP Host" : "SMTP 호스트",
-    "SMTP security" : "SMTP 보안",
     "SMTP Port" : "SMTP 포트",
     "SMTP User" : "SMTP 사용자",
     "SMTP Password" : "SMTP 암호",
     "Connect" : "연결",
+    "Add mail account" : "메일 계정 추가",
+    "Use Gravatar and favicon avatars" : "Gravatar 및 파비콘 아바타 사용",
+    "Keyboard shortcuts" : "키보드 단축키",
     "from" : "보낸 사람",
     "to" : "받는 사람",
     "cc" : "참조",
     "bcc" : "숨은 참조",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "발신 전용 주소에서 보낸 이메일이기 때문에 수신자가 답장을 읽지 않을 수도 있습니다.",
     "Subject" : "제목",
-    "Save all to Files" : "모두 저장",
-    "Add mail account" : "메일 계정 추가",
-    "Use Gravatar and favicon avatars" : "Gravatar 및 파비콘 아바타 사용",
-    "No search results for" : "다음에 대한 검색 결과 없음",
-    "The images have been blocked to protect your privacy." : "개인 정보를 보호하기 위해 사진을 차단했습니다.",
-    "Show images from this sender" : "이 발신자의 사진 표시",
-    "Forward" : "전달",
+    "Sending …" : "보내는 중...",
+    "Message sent!" : "메시지를 보냈습니다!",
+    "Send" : "보내기",
     "Upload attachment" : "첨부 파일 업로드",
     "Add attachment from Files" : "파일 앱에서 첨부 파일 추가",
+    "Choose a file to add as attachment" : "첨부할 파일을 선택하십시오",
+    "Delete" : "삭제",
+    "Could not load your message" : "메시지를 불러올 수 없음",
     "Import into calendar" : "달력으로 가져오기",
     "Download attachment" : "첨부 파일 다운로드",
-    "Save to Files" : "파일에 저장"
+    "Save to Files" : "파일에 저장",
+    "Choose a folder to store the attachment in" : "첨부 항목을 저장할 폴더 선택",
+    "Save all to Files" : "모두 저장",
+    "The images have been blocked to protect your privacy." : "개인 정보를 보호하기 위해 사진을 차단했습니다.",
+    "New message" : "새로운 메시지",
+    "Settings" : "설정",
+    "Speed up your Mail experience with these quick shortcuts." : "빠른 단축키로 메일 사용을 더 빠르게 할 수 있습니다.",
+    "Compose new message" : "새 메시지 작성",
+    "Newer message" : "새로운 메시지",
+    "Older message" : "오래된 메시지",
+    "Toggle star" : "별표 전환",
+    "Toggle unread" : "읽음/읽지 않음 전환",
+    "Search" : "검색",
+    "Refresh" : "새로 고침",
+    "Connect your mail account" : "메일 계정에 연결",
+    "Show all folders" : "모든 폴더 보기",
+    "Collapse folders" : "폴더 접기",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["새 메일 %n개\n보낸 사람: {from}"],
+    "Nextcloud Mail" : "Nextcloud 메일",
+    "All inboxes" : "모든 받은 편지함",
+    "Could not load {tag}{name}{endtag}" : "{tag}{name}{endtag}을(를) 불러올 수 없음",
+    "There was a problem loading {tag}{name}{endtag}" : "{tag}{name}{endtag}을(를) 불러오는 중 문제 발생",
+    "Could not load the desired message" : "원하는 메시지를 불러올 수 없음",
+    "Could not load the message" : "메시지를 불러올 수 없음",
+    "Error loading message" : "메시지 불러오기 오류",
+    "Forwarding to %s" : "%s 전달",
+    "Click here if you are not automatically redirected within the next few seconds." : "자동으로 이동하지 않는 경우 여기를 클릭하십시오.",
+    "Redirect" : "넘겨주기",
+    "The link leads to %s" : "이 링크가 %s을(를) 향함",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "해당 페이지를 방문하지 않으려면 <a href=\"%s\">메일</a>로 돌아갈 수 있습니다.",
+    "Continue to %s" : "%s(으)로 이동"
 },
 "nplurals=1; plural=0;");
diff --git a/l10n/ko.json b/l10n/ko.json
index 1493c7277..d9f6d0a30 100644
--- a/l10n/ko.json
+++ b/l10n/ko.json
@@ -1,55 +1,5 @@
 { "translations": {
     "Mail" : "메일",
-    "Loading accounts" : "계정 불러오는 중",
-    "Error while loading the accounts." : "계정을 불러오는 중 오류가 발생했습니다.",
-    "Can not load this folder." : "이 폴더를 불러올 수 없습니다.",
-    "Searching for {query}" : "{query} 검색",
-    "Error while deleting message." : "메시지를 삭제하는 중 오류가 발생했습니다.",
-    "Forwarded message" : "전달된 메시지",
-    "Choose a folder to store the attachment in" : "첨부 항목을 저장할 폴더 선택",
-    "Attachments saved to Files." : "첨부 파일이 클라우드에 저장되었습니다.",
-    "Attachment saved to Files." : "첨부 파일이 클라우드에 저장되었습니다.",
-    "Error while saving attachments to Files." : "첨부 파일을 클라우드에 저장하는 중 오류가 발생했습니다.",
-    "Error while saving attachment to Files." : "첨부 파일을 클라우드에 저장하는 중 오류가 발생했습니다.",
-    "Message flag could not be set." : "메시지 플래그를 설정할 수 없습니다.",
-    "Could not move message." : "메시지를 이동할 수 없습니다.",
-    "Invalid account" : "잘못된 계정",
-    "Invalid folder" : "잘못된 폴더",
-    "Error while creating the account: " : "계정 생성 중 오류 발생:",
-    "Unknown error" : "알 수 없는 오류",
-    "Error while updating the account: " : "계정 업데이트 중 오류 발생:",
-    "All inboxes" : "모든 받은 편지함",
-    "you" : "나",
-    "Send message to {email}" : "{email}(으)로 이메일 보내기",
-    "Could not load {tag}{name}{endtag}" : "{tag}{name}{endtag}을(를) 불러올 수 없음",
-    "There was a problem loading {tag}{name}{endtag}" : "{tag}{name}{endtag}을(를) 불러오는 중 문제 발생",
-    "Could not load your message" : "메시지를 불러올 수 없음",
-    "Could not load the desired message" : "원하는 메시지를 불러올 수 없음",
-    "Could not load the message" : "메시지를 불러올 수 없음",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["새 메일 %n개\n보낸 사람: {from}"],
-    "Nextcloud Mail" : "Nextcloud 메일",
-    "Save" : "저장",
-    "Saved" : "저장됨",
-    "Show all folders" : "모든 폴더 보기",
-    "Collapse folders" : "폴더 접기",
-    "Error while deleting account." : "계정을 삭제하는 중 오류가 발생했습니다.",
-    "Choose a file to add as attachment" : "첨부할 파일을 선택하십시오",
-    "An error occurred while uploading {fname}" : "{fname}을 업로드하는 중 오류 발생",
-    "Reply" : "답장",
-    "Send" : "보내기",
-    "Sending …" : "보내는 중...",
-    "Message sent!" : "메시지를 보냈습니다!",
-    "Server error" : "서버 오류",
-    "An unknown error occurred" : "알 수 없는 오류가 발생했습니다",
-    "Opening HTML drafts is not supported yet." : "HTML 임시 보관 메시지를 여는 것은 지원되지 않습니다.",
-    "No writable calendars found" : "기록할 수 있는 달력을 찾을 수 없음",
-    "Error while importing the calendar event" : "달력 행사를 가져 오는 중 오류 발생",
-    "Error while downloading calendar event" : "달력 행사를 다운로드하는 중 오류 발생",
-    "& others" : "및 그 외",
-    "Error while loading messages." : "메시지를 불러오는 중 오류가 발생했습니다.",
-    "Error while refreshing messages." : "메시지를 새로 고치는 중 오류가 발생했습니다.",
-    "Setting up your account" : "계정 설정 중",
     "Inbox" : "받은 편지함",
     "Sent" : "보낸 편지함",
     "Drafts" : "임시 보관함",
@@ -62,67 +12,69 @@
     "Updating account failed: " : "계정 업데이트 실패:",
     "Creating account failed: " : "계정 생성 실패: ",
     "Delete permanently" : "영구히 삭제",
-    "Error loading message" : "메시지 불러오기 오류",
-    "Settings" : "설정",
-    "Forwarding to %s" : "%s 전달",
-    "Click here if you are not automatically redirected within the next few seconds." : "자동으로 이동하지 않는 경우 여기를 클릭하십시오.",
-    "Redirect" : "넘겨주기",
-    "The link leads to %s" : "이 링크가 %s을(를) 향함",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "해당 페이지를 방문하지 않으려면 <a href=\"%s\">메일</a>로 돌아갈 수 있습니다.",
-    "Continue to %s" : "%s(으)로 이동",
-    "Delete account" : "계정 삭제",
-    "Try again" : "다시 시도",
-    "New message" : "새로운 메시지",
-    "Account Settings" : "계정 설정",
-    "Aliases" : "별칭",
-    "Mail address" : "메일 주소",
-    "Display Name" : "표시 이름",
-    "Account" : "계정",
-    "Delete" : "삭제",
-    "Keyboard shortcuts" : "키보드 단축키",
-    "Speed up your Mail experience with these quick shortcuts." : "빠른 단축키로 메일 사용을 더 빠르게 할 수 있습니다.",
-    "Compose new message" : "새 메시지 작성",
-    "Newer message" : "새로운 메시지",
-    "Older message" : "오래된 메시지",
-    "Toggle star" : "별표 전환",
-    "Toggle unread" : "읽음/읽지 않음 전환",
-    "Search" : "검색",
-    "Refresh" : "새로 고침",
-    "Connect your mail account" : "메일 계정에 연결",
     "Name" : "이름",
     "Mail Address" : "메일 주소",
     "Password" : "암호",
-    "Manual configuration" : "직접 설정",
     "IMAP Host" : "IMAP 호스트",
-    "IMAP security" : "IMAP 보안",
     "None" : "없음",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP 포트",
     "IMAP User" : "IMAP 사용자",
     "IMAP Password" : "IMAP 암호",
     "SMTP Host" : "SMTP 호스트",
-    "SMTP security" : "SMTP 보안",
     "SMTP Port" : "SMTP 포트",
     "SMTP User" : "SMTP 사용자",
     "SMTP Password" : "SMTP 암호",
     "Connect" : "연결",
+    "Add mail account" : "메일 계정 추가",
+    "Use Gravatar and favicon avatars" : "Gravatar 및 파비콘 아바타 사용",
+    "Keyboard shortcuts" : "키보드 단축키",
     "from" : "보낸 사람",
     "to" : "받는 사람",
     "cc" : "참조",
     "bcc" : "숨은 참조",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "발신 전용 주소에서 보낸 이메일이기 때문에 수신자가 답장을 읽지 않을 수도 있습니다.",
     "Subject" : "제목",
-    "Save all to Files" : "모두 저장",
-    "Add mail account" : "메일 계정 추가",
-    "Use Gravatar and favicon avatars" : "Gravatar 및 파비콘 아바타 사용",
-    "No search results for" : "다음에 대한 검색 결과 없음",
-    "The images have been blocked to protect your privacy." : "개인 정보를 보호하기 위해 사진을 차단했습니다.",
-    "Show images from this sender" : "이 발신자의 사진 표시",
-    "Forward" : "전달",
+    "Sending …" : "보내는 중...",
+    "Message sent!" : "메시지를 보냈습니다!",
+    "Send" : "보내기",
     "Upload attachment" : "첨부 파일 업로드",
     "Add attachment from Files" : "파일 앱에서 첨부 파일 추가",
+    "Choose a file to add as attachment" : "첨부할 파일을 선택하십시오",
+    "Delete" : "삭제",
+    "Could not load your message" : "메시지를 불러올 수 없음",
     "Import into calendar" : "달력으로 가져오기",
     "Download attachment" : "첨부 파일 다운로드",
-    "Save to Files" : "파일에 저장"
+    "Save to Files" : "파일에 저장",
+    "Choose a folder to store the attachment in" : "첨부 항목을 저장할 폴더 선택",
+    "Save all to Files" : "모두 저장",
+    "The images have been blocked to protect your privacy." : "개인 정보를 보호하기 위해 사진을 차단했습니다.",
+    "New message" : "새로운 메시지",
+    "Settings" : "설정",
+    "Speed up your Mail experience with these quick shortcuts." : "빠른 단축키로 메일 사용을 더 빠르게 할 수 있습니다.",
+    "Compose new message" : "새 메시지 작성",
+    "Newer message" : "새로운 메시지",
+    "Older message" : "오래된 메시지",
+    "Toggle star" : "별표 전환",
+    "Toggle unread" : "읽음/읽지 않음 전환",
+    "Search" : "검색",
+    "Refresh" : "새로 고침",
+    "Connect your mail account" : "메일 계정에 연결",
+    "Show all folders" : "모든 폴더 보기",
+    "Collapse folders" : "폴더 접기",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["새 메일 %n개\n보낸 사람: {from}"],
+    "Nextcloud Mail" : "Nextcloud 메일",
+    "All inboxes" : "모든 받은 편지함",
+    "Could not load {tag}{name}{endtag}" : "{tag}{name}{endtag}을(를) 불러올 수 없음",
+    "There was a problem loading {tag}{name}{endtag}" : "{tag}{name}{endtag}을(를) 불러오는 중 문제 발생",
+    "Could not load the desired message" : "원하는 메시지를 불러올 수 없음",
+    "Could not load the message" : "메시지를 불러올 수 없음",
+    "Error loading message" : "메시지 불러오기 오류",
+    "Forwarding to %s" : "%s 전달",
+    "Click here if you are not automatically redirected within the next few seconds." : "자동으로 이동하지 않는 경우 여기를 클릭하십시오.",
+    "Redirect" : "넘겨주기",
+    "The link leads to %s" : "이 링크가 %s을(를) 향함",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "해당 페이지를 방문하지 않으려면 <a href=\"%s\">메일</a>로 돌아갈 수 있습니다.",
+    "Continue to %s" : "%s(으)로 이동"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/l10n/lt_LT.js b/l10n/lt_LT.js
index 4ee5db207..a57e6a918 100644
--- a/l10n/lt_LT.js
+++ b/l10n/lt_LT.js
@@ -1,57 +1,6 @@
 OC.L10N.register(
     "mail",
     {
-    "Mail" : "Elektroninis paštas",
-    "Loading accounts" : "Įkeliamos paskyros",
-    "Error while loading the accounts." : "Klaida, įkeliant paskyras.",
-    "Can not load this folder." : "Nepavyksta įkelti šio aplanko.",
-    "Searching for {query}" : "Ieškoma {query}",
-    "Error while deleting message." : "Klaida, ištrinant laišką.",
-    "Forwarded message" : "Persiųstas laiškas",
-    "Choose a folder to store the attachment in" : "Pasirinkite aplanką, kuriame išsaugoti priedą",
-    "Attachments saved to Files." : "Priedai įrašyti į Failus.",
-    "Attachment saved to Files." : "Priedas įrašytas į Failus.",
-    "Error while saving attachments to Files." : "Klaida, įrašant priedus į Failus.",
-    "Error while saving attachment to Files." : "Klaida, įrašant priedą į Failus.",
-    "Message flag could not be set." : "Laiškas negali būti pažymėtas",
-    "Could not move message." : "Nepavyko perkelti laiško.",
-    "Invalid account" : "Neteisinga paskyra",
-    "Invalid folder" : "Neteisingas aplankas",
-    "Error while creating the account: " : "Klaida kuriant paskyrą: ",
-    "Unknown error" : "Nežinoma klaida",
-    "Error while updating the account: " : "Klaida atnaujinant paskyrą: ",
-    "All inboxes" : "Visos pašto dėžutės",
-    "you" : "jūs",
-    "Send message to {email}" : "Nusiųsti žinutę į {email}",
-    "Could not load {tag}{name}{endtag}" : "Nepavyko įkelti {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Įvyko klaida bandant parodyti {tag}{name}{endtag}",
-    "Could not load your message" : "Nepavyko įkelti jūsų laiško",
-    "Could not load the desired message" : "Nepavyko įkelti pageidaujamo laiško",
-    "Could not load the message" : "Nepavyko įkelti laiško",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n naujas laiškas \nnuo {from}","%n nauji laiškai \nnuo {from}","%n naujų laiškų \nnuo {from}","%n naujų laiškų \nnuo {from}"],
-    "Nextcloud Mail" : "Nextcloud el. paštas",
-    "Save" : "Įrašyti",
-    "Saved" : "Įrašyta",
-    "Show all folders" : "Rodyti visus aplankus",
-    "Collapse folders" : "Suskleisti aplankus",
-    "Error while deleting account." : "Klaida, ištrinant paskyrą.",
-    "Choose a file to add as attachment" : "Pasirinkite failą, kurį prisegsite prie laiško",
-    "An error occurred while uploading {fname}" : "Įkeliant {fname}, įvyko klaida",
-    "Reply" : "Atsakyti",
-    "Send" : "Siųsti",
-    "Sending …" : "Siunčiama …",
-    "Message sent!" : "Laiškas išsiųstas!",
-    "Server error" : "Serverio klaida",
-    "An unknown error occurred" : "Įvyko nežinoma klaida",
-    "Opening HTML drafts is not supported yet." : "HTML juodraščių atvėrimas kol kas nepalaikomas.",
-    "No writable calendars found" : "Nerasta kalendorių redagavimui",
-    "Error while importing the calendar event" : "Klaida, importuojant kalendoriaus įvykį",
-    "Error while downloading calendar event" : "Klaida, atsisiunčiant kalendoriaus įvykį",
-    "& others" : "ir kiti",
-    "Error while loading messages." : "Klaida, įkeliant laiškus.",
-    "Error while refreshing messages." : "Klaida, atnaujinant laiškus.",
-    "Setting up your account" : "Prijungiama jūsų paskyra",
     "Inbox" : "Dėžutė",
     "Sent" : "Išsiųsta",
     "Drafts" : "Juodraščiai",
@@ -65,68 +14,70 @@ OC.L10N.register(
     "Creating account failed: " : "Paskyros kūrimas nepavyko:",
     "Delete permanently" : "Ištrinti negrįžtamai",
     "IMAP web client" : "IMAP saityno klientas",
-    "Error loading message" : "Klaida, įkeliant laišką",
-    "Settings" : "Nustatymai",
-    "Forwarding to %s" : "Persiunčiama į %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Jeigu per artimiausias kelias sekundes nesate automatiškai nukreipiami, spustelėkite čia.",
-    "Redirect" : "Nukreipti",
-    "The link leads to %s" : "Nuoroda veda į %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Jeigu jūs nenorite lankytis tame puslapyje, galite grįžti į <a href=\"%s\">Paštą</a>.",
-    "Continue to %s" : "Tęsti į %s",
-    "Delete account" : "Ištrinti paskyrą",
-    "Try again" : "Bandykite dar kartą",
-    "New message" : "Naujas laiškas",
-    "Account Settings" : "Paskyros nustatymai",
-    "Aliases" : "Pseudonimai",
-    "Mail address" : "El. pašto adresas",
-    "Display Name" : "Rodomas vardas",
-    "Account" : "Paskyra",
-    "Delete" : "Ištrinti",
-    "Keyboard shortcuts" : "Klaviatūros greitieji klavišai",
-    "Speed up your Mail experience with these quick shortcuts." : "Padidinkite savo našumą naudodamiesi šiomis nuorodomis.",
-    "Compose new message" : "Rašyti naują laišką",
-    "Newer message" : "Naujesni laiškai",
-    "Older message" : "Senesni laiškai",
-    "Toggle star" : "Perjungti laiško žymėjimą, kaip pažymėtą žvaigždute",
-    "Toggle unread" : "Perjungti laiško žymėjimą, kaip neskaityto",
-    "Search" : "Ieškoti",
-    "Refresh" : "Atnaujinti",
-    "Connect your mail account" : "Priregistruoti elektroninio pašto paskyrą",
     "Name" : "Vardas",
     "Mail Address" : "Elektroninio pašto adresas",
     "Password" : "Slaptažodis",
-    "Manual configuration" : "Rankinė konfigūracija",
     "IMAP Host" : "IMAP serveris",
-    "IMAP security" : "IMAP saugumas",
     "None" : "Nėra",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP prievadas",
     "IMAP User" : "IMAP naudotojo vardas",
     "IMAP Password" : "IMAP slaptažodis",
     "SMTP Host" : "SMTP serveris",
-    "SMTP security" : "SMTP saugumas",
     "SMTP Port" : "SMTP prievadas",
     "SMTP User" : "SMTP naudotojo vardas",
     "SMTP Password" : "SMTP slaptažodis",
     "Connect" : "Prisijungti",
+    "Add mail account" : "Pridėti pašto paskyrą",
+    "Use Gravatar and favicon avatars" : "Naudoti Gravatar ir svetainių piktogramų avatarus",
+    "Keyboard shortcuts" : "Klaviatūros greitieji klavišai",
     "from" : "nuo",
     "to" : "į",
     "cc" : "cc",
     "bcc" : "bcc",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Turėkite omenyje, kad laiškas atėjo iš adreso, kuris nėra skirtas atsakyti, taigi jūsų atsakymas, tikriausiai, nebus perskaitytas.",
     "Subject" : "Tema",
-    "Save all to Files" : "Įrašyti visus į Failus",
-    "Add mail account" : "Pridėti pašto paskyrą",
-    "Use Gravatar and favicon avatars" : "Naudoti Gravatar ir svetainių piktogramų avatarus",
-    "No search results for" : "Nėra paieškos rezultatų, skirtų",
-    "The images have been blocked to protect your privacy." : "Tam, kad būtų apsaugotas jūsų privatumas, paveikslai buvo užblokuoti.",
-    "Show images from this sender" : "Rodyti paveikslus nuo šio siuntėjo",
-    "Forward" : "Persiųsti",
-    "No messages in this folder" : "Šiame aplankė pranešimų nėra",
+    "Sending …" : "Siunčiama …",
+    "Message sent!" : "Laiškas išsiųstas!",
+    "Send" : "Siųsti",
     "Upload attachment" : "Įkelti priedą",
     "Add attachment from Files" : "Pridėti priedą iš Failų",
+    "Choose a file to add as attachment" : "Pasirinkite failą, kurį prisegsite prie laiško",
+    "No messages in this folder" : "Šiame aplankė pranešimų nėra",
+    "Delete" : "Ištrinti",
+    "Could not load your message" : "Nepavyko įkelti jūsų laiško",
     "Import into calendar" : "Importuoti į kalendorių",
     "Download attachment" : "Atsisiųsti priedą",
-    "Save to Files" : "Įrašyti į Failus"
+    "Save to Files" : "Įrašyti į Failus",
+    "Choose a folder to store the attachment in" : "Pasirinkite aplanką, kuriame išsaugoti priedą",
+    "Save all to Files" : "Įrašyti visus į Failus",
+    "The images have been blocked to protect your privacy." : "Tam, kad būtų apsaugotas jūsų privatumas, paveikslai buvo užblokuoti.",
+    "New message" : "Naujas laiškas",
+    "Settings" : "Nustatymai",
+    "Speed up your Mail experience with these quick shortcuts." : "Padidinkite savo našumą naudodamiesi šiomis nuorodomis.",
+    "Compose new message" : "Rašyti naują laišką",
+    "Newer message" : "Naujesni laiškai",
+    "Older message" : "Senesni laiškai",
+    "Toggle star" : "Perjungti laiško žymėjimą, kaip pažymėtą žvaigždute",
+    "Toggle unread" : "Perjungti laiško žymėjimą, kaip neskaityto",
+    "Search" : "Ieškoti",
+    "Refresh" : "Atnaujinti",
+    "Connect your mail account" : "Priregistruoti elektroninio pašto paskyrą",
+    "Show all folders" : "Rodyti visus aplankus",
+    "Collapse folders" : "Suskleisti aplankus",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n naujas laiškas \nnuo {from}","%n nauji laiškai \nnuo {from}","%n naujų laiškų \nnuo {from}","%n naujų laiškų \nnuo {from}"],
+    "Nextcloud Mail" : "Nextcloud el. paštas",
+    "All inboxes" : "Visos pašto dėžutės",
+    "Could not load {tag}{name}{endtag}" : "Nepavyko įkelti {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Įvyko klaida bandant parodyti {tag}{name}{endtag}",
+    "Could not load the desired message" : "Nepavyko įkelti pageidaujamo laiško",
+    "Could not load the message" : "Nepavyko įkelti laiško",
+    "Error loading message" : "Klaida, įkeliant laišką",
+    "Forwarding to %s" : "Persiunčiama į %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Jeigu per artimiausias kelias sekundes nesate automatiškai nukreipiami, spustelėkite čia.",
+    "Redirect" : "Nukreipti",
+    "The link leads to %s" : "Nuoroda veda į %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Jeigu jūs nenorite lankytis tame puslapyje, galite grįžti į <a href=\"%s\">Paštą</a>.",
+    "Continue to %s" : "Tęsti į %s"
 },
 "nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);");
diff --git a/l10n/lt_LT.json b/l10n/lt_LT.json
index 64eafdd12..5ceb2713a 100644
--- a/l10n/lt_LT.json
+++ b/l10n/lt_LT.json
@@ -1,55 +1,4 @@
 { "translations": {
-    "Mail" : "Elektroninis paštas",
-    "Loading accounts" : "Įkeliamos paskyros",
-    "Error while loading the accounts." : "Klaida, įkeliant paskyras.",
-    "Can not load this folder." : "Nepavyksta įkelti šio aplanko.",
-    "Searching for {query}" : "Ieškoma {query}",
-    "Error while deleting message." : "Klaida, ištrinant laišką.",
-    "Forwarded message" : "Persiųstas laiškas",
-    "Choose a folder to store the attachment in" : "Pasirinkite aplanką, kuriame išsaugoti priedą",
-    "Attachments saved to Files." : "Priedai įrašyti į Failus.",
-    "Attachment saved to Files." : "Priedas įrašytas į Failus.",
-    "Error while saving attachments to Files." : "Klaida, įrašant priedus į Failus.",
-    "Error while saving attachment to Files." : "Klaida, įrašant priedą į Failus.",
-    "Message flag could not be set." : "Laiškas negali būti pažymėtas",
-    "Could not move message." : "Nepavyko perkelti laiško.",
-    "Invalid account" : "Neteisinga paskyra",
-    "Invalid folder" : "Neteisingas aplankas",
-    "Error while creating the account: " : "Klaida kuriant paskyrą: ",
-    "Unknown error" : "Nežinoma klaida",
-    "Error while updating the account: " : "Klaida atnaujinant paskyrą: ",
-    "All inboxes" : "Visos pašto dėžutės",
-    "you" : "jūs",
-    "Send message to {email}" : "Nusiųsti žinutę į {email}",
-    "Could not load {tag}{name}{endtag}" : "Nepavyko įkelti {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Įvyko klaida bandant parodyti {tag}{name}{endtag}",
-    "Could not load your message" : "Nepavyko įkelti jūsų laiško",
-    "Could not load the desired message" : "Nepavyko įkelti pageidaujamo laiško",
-    "Could not load the message" : "Nepavyko įkelti laiško",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n naujas laiškas \nnuo {from}","%n nauji laiškai \nnuo {from}","%n naujų laiškų \nnuo {from}","%n naujų laiškų \nnuo {from}"],
-    "Nextcloud Mail" : "Nextcloud el. paštas",
-    "Save" : "Įrašyti",
-    "Saved" : "Įrašyta",
-    "Show all folders" : "Rodyti visus aplankus",
-    "Collapse folders" : "Suskleisti aplankus",
-    "Error while deleting account." : "Klaida, ištrinant paskyrą.",
-    "Choose a file to add as attachment" : "Pasirinkite failą, kurį prisegsite prie laiško",
-    "An error occurred while uploading {fname}" : "Įkeliant {fname}, įvyko klaida",
-    "Reply" : "Atsakyti",
-    "Send" : "Siųsti",
-    "Sending …" : "Siunčiama …",
-    "Message sent!" : "Laiškas išsiųstas!",
-    "Server error" : "Serverio klaida",
-    "An unknown error occurred" : "Įvyko nežinoma klaida",
-    "Opening HTML drafts is not supported yet." : "HTML juodraščių atvėrimas kol kas nepalaikomas.",
-    "No writable calendars found" : "Nerasta kalendorių redagavimui",
-    "Error while importing the calendar event" : "Klaida, importuojant kalendoriaus įvykį",
-    "Error while downloading calendar event" : "Klaida, atsisiunčiant kalendoriaus įvykį",
-    "& others" : "ir kiti",
-    "Error while loading messages." : "Klaida, įkeliant laiškus.",
-    "Error while refreshing messages." : "Klaida, atnaujinant laiškus.",
-    "Setting up your account" : "Prijungiama jūsų paskyra",
     "Inbox" : "Dėžutė",
     "Sent" : "Išsiųsta",
     "Drafts" : "Juodraščiai",
@@ -63,68 +12,70 @@
     "Creating account failed: " : "Paskyros kūrimas nepavyko:",
     "Delete permanently" : "Ištrinti negrįžtamai",
     "IMAP web client" : "IMAP saityno klientas",
-    "Error loading message" : "Klaida, įkeliant laišką",
-    "Settings" : "Nustatymai",
-    "Forwarding to %s" : "Persiunčiama į %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Jeigu per artimiausias kelias sekundes nesate automatiškai nukreipiami, spustelėkite čia.",
-    "Redirect" : "Nukreipti",
-    "The link leads to %s" : "Nuoroda veda į %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Jeigu jūs nenorite lankytis tame puslapyje, galite grįžti į <a href=\"%s\">Paštą</a>.",
-    "Continue to %s" : "Tęsti į %s",
-    "Delete account" : "Ištrinti paskyrą",
-    "Try again" : "Bandykite dar kartą",
-    "New message" : "Naujas laiškas",
-    "Account Settings" : "Paskyros nustatymai",
-    "Aliases" : "Pseudonimai",
-    "Mail address" : "El. pašto adresas",
-    "Display Name" : "Rodomas vardas",
-    "Account" : "Paskyra",
-    "Delete" : "Ištrinti",
-    "Keyboard shortcuts" : "Klaviatūros greitieji klavišai",
-    "Speed up your Mail experience with these quick shortcuts." : "Padidinkite savo našumą naudodamiesi šiomis nuorodomis.",
-    "Compose new message" : "Rašyti naują laišką",
-    "Newer message" : "Naujesni laiškai",
-    "Older message" : "Senesni laiškai",
-    "Toggle star" : "Perjungti laiško žymėjimą, kaip pažymėtą žvaigždute",
-    "Toggle unread" : "Perjungti laiško žymėjimą, kaip neskaityto",
-    "Search" : "Ieškoti",
-    "Refresh" : "Atnaujinti",
-    "Connect your mail account" : "Priregistruoti elektroninio pašto paskyrą",
     "Name" : "Vardas",
     "Mail Address" : "Elektroninio pašto adresas",
     "Password" : "Slaptažodis",
-    "Manual configuration" : "Rankinė konfigūracija",
     "IMAP Host" : "IMAP serveris",
-    "IMAP security" : "IMAP saugumas",
     "None" : "Nėra",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP prievadas",
     "IMAP User" : "IMAP naudotojo vardas",
     "IMAP Password" : "IMAP slaptažodis",
     "SMTP Host" : "SMTP serveris",
-    "SMTP security" : "SMTP saugumas",
     "SMTP Port" : "SMTP prievadas",
     "SMTP User" : "SMTP naudotojo vardas",
     "SMTP Password" : "SMTP slaptažodis",
     "Connect" : "Prisijungti",
+    "Add mail account" : "Pridėti pašto paskyrą",
+    "Use Gravatar and favicon avatars" : "Naudoti Gravatar ir svetainių piktogramų avatarus",
+    "Keyboard shortcuts" : "Klaviatūros greitieji klavišai",
     "from" : "nuo",
     "to" : "į",
     "cc" : "cc",
     "bcc" : "bcc",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Turėkite omenyje, kad laiškas atėjo iš adreso, kuris nėra skirtas atsakyti, taigi jūsų atsakymas, tikriausiai, nebus perskaitytas.",
     "Subject" : "Tema",
-    "Save all to Files" : "Įrašyti visus į Failus",
-    "Add mail account" : "Pridėti pašto paskyrą",
-    "Use Gravatar and favicon avatars" : "Naudoti Gravatar ir svetainių piktogramų avatarus",
-    "No search results for" : "Nėra paieškos rezultatų, skirtų",
-    "The images have been blocked to protect your privacy." : "Tam, kad būtų apsaugotas jūsų privatumas, paveikslai buvo užblokuoti.",
-    "Show images from this sender" : "Rodyti paveikslus nuo šio siuntėjo",
-    "Forward" : "Persiųsti",
-    "No messages in this folder" : "Šiame aplankė pranešimų nėra",
+    "Sending …" : "Siunčiama …",
+    "Message sent!" : "Laiškas išsiųstas!",
+    "Send" : "Siųsti",
     "Upload attachment" : "Įkelti priedą",
     "Add attachment from Files" : "Pridėti priedą iš Failų",
+    "Choose a file to add as attachment" : "Pasirinkite failą, kurį prisegsite prie laiško",
+    "No messages in this folder" : "Šiame aplankė pranešimų nėra",
+    "Delete" : "Ištrinti",
+    "Could not load your message" : "Nepavyko įkelti jūsų laiško",
     "Import into calendar" : "Importuoti į kalendorių",
     "Download attachment" : "Atsisiųsti priedą",
-    "Save to Files" : "Įrašyti į Failus"
+    "Save to Files" : "Įrašyti į Failus",
+    "Choose a folder to store the attachment in" : "Pasirinkite aplanką, kuriame išsaugoti priedą",
+    "Save all to Files" : "Įrašyti visus į Failus",
+    "The images have been blocked to protect your privacy." : "Tam, kad būtų apsaugotas jūsų privatumas, paveikslai buvo užblokuoti.",
+    "New message" : "Naujas laiškas",
+    "Settings" : "Nustatymai",
+    "Speed up your Mail experience with these quick shortcuts." : "Padidinkite savo našumą naudodamiesi šiomis nuorodomis.",
+    "Compose new message" : "Rašyti naują laišką",
+    "Newer message" : "Naujesni laiškai",
+    "Older message" : "Senesni laiškai",
+    "Toggle star" : "Perjungti laiško žymėjimą, kaip pažymėtą žvaigždute",
+    "Toggle unread" : "Perjungti laiško žymėjimą, kaip neskaityto",
+    "Search" : "Ieškoti",
+    "Refresh" : "Atnaujinti",
+    "Connect your mail account" : "Priregistruoti elektroninio pašto paskyrą",
+    "Show all folders" : "Rodyti visus aplankus",
+    "Collapse folders" : "Suskleisti aplankus",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n naujas laiškas \nnuo {from}","%n nauji laiškai \nnuo {from}","%n naujų laiškų \nnuo {from}","%n naujų laiškų \nnuo {from}"],
+    "Nextcloud Mail" : "Nextcloud el. paštas",
+    "All inboxes" : "Visos pašto dėžutės",
+    "Could not load {tag}{name}{endtag}" : "Nepavyko įkelti {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Įvyko klaida bandant parodyti {tag}{name}{endtag}",
+    "Could not load the desired message" : "Nepavyko įkelti pageidaujamo laiško",
+    "Could not load the message" : "Nepavyko įkelti laiško",
+    "Error loading message" : "Klaida, įkeliant laišką",
+    "Forwarding to %s" : "Persiunčiama į %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Jeigu per artimiausias kelias sekundes nesate automatiškai nukreipiami, spustelėkite čia.",
+    "Redirect" : "Nukreipti",
+    "The link leads to %s" : "Nuoroda veda į %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Jeigu jūs nenorite lankytis tame puslapyje, galite grįžti į <a href=\"%s\">Paštą</a>.",
+    "Continue to %s" : "Tęsti į %s"
 },"pluralForm" :"nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);"
 }
\ No newline at end of file
diff --git a/l10n/lv.js b/l10n/lv.js
index 26dfeea66..0c34efeab 100644
--- a/l10n/lv.js
+++ b/l10n/lv.js
@@ -2,43 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "E-pasts",
-    "Error while loading the accounts." : "Kļūda ielādējot kontus.",
-    "Searching for {query}" : "Meklējot {query}",
-    "Error while deleting message." : "Kļūda dzēšot vēstuli.",
-    "Forwarded message" : "Pārsūtīta ziņa",
-    "Choose a folder to store the attachment in" : "Izvēlieties mapi, kurā saglabāt pielikumus",
-    "Attachments saved to Files." : "Pielikumi saglabāti datnēs.",
-    "Attachment saved to Files." : "Pielikumi saglabāti datnēs.",
-    "Error while saving attachments to Files." : "Kļūda, saglabājot pielikumus datnēs.",
-    "Error while saving attachment to Files." : "Kļūda, saglabājot pielikumus datnēs.",
-    "Message flag could not be set." : "Nevar iestatīt ziņojuma karodziņu.",
-    "Could not move message." : "Nevar pārvietot ziņu.",
-    "Invalid account" : "Nederīgs konts",
-    "Invalid folder" : "Nederīga mape",
-    "Unknown error" : "Nezināma kļūda",
-    "All inboxes" : "Visas iesūtnes",
-    "you" : "Jūs",
-    "Send message to {email}" : "Sūtīt ziņu uz {email}",
-    "Could not load {tag}{name}{endtag}" : "Nevarēja ielādēt {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Radusies problēma, ielādējot {tag}{name}{endtag}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "Save" : "Saglabāt",
-    "Show all folders" : "Rādīt visas mapes",
-    "Collapse folders" : "Sakļaut mapes",
-    "Error while deleting account." : "Kļūda dzēšot kontu.",
-    "Choose a file to add as attachment" : "Izvēlēties datni ko pievienot kā pielikumu",
-    "Reply" : "Atbildēt",
-    "Send" : "Sūtīt",
-    "Sending …" : "Sūta …",
-    "Message sent!" : "Vēstule aizsūtīta!",
-    "Server error" : "Servera kļūda",
-    "An unknown error occurred" : "Radusies nezināma kļūda",
-    "Opening HTML drafts is not supported yet." : "HTML dokumentu projektus atvēršana vēl netiek atbalstīta.",
-    "No writable calendars found" : "Nav ierakstāmu kalendāru",
-    "Error while importing the calendar event" : "Kļūda, importējot kalendāra notikumu",
-    "Error while downloading calendar event" : "Kļūda ielādējot kalendāra notikumu",
-    "& others" : "un citiem",
-    "Error while loading messages." : "Kļūda ielādējot vēstules.",
     "Inbox" : "Iesūtne",
     "Sent" : "Izsūtne",
     "Drafts" : "Melnraksti",
@@ -50,51 +13,51 @@ OC.L10N.register(
     "Auto detect failed. Please use manual mode." : "Automātiski noteikt neizdevās. Lūdzu, izmantojiet manuālo režīmu.",
     "Creating account failed: " : "Konta izveide neizdevās:",
     "Delete permanently" : "Dzēst pavisam",
-    "Error loading message" : "Kļūda ielādējot vēstuli",
-    "Settings" : "Iestatījumi",
-    "Forwarding to %s" : "Pārsūtīt uz %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Noklikšķiniet šeit, ja netiekat pārvirzīts automātiski dažu sekunžu laikā.",
-    "Redirect" : "Novirzīt",
-    "The link leads to %s" : "Saite, kas ved uz %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Ja nevēlaties apmeklēt šo lapu, varat atgriezties pie <a href=\"%s\">e-pasta</a>.",
-    "Continue to %s" : "Turpināt %s",
-    "Delete account" : "Dzēst kontu",
-    "New message" : "Jauna ziņa",
-    "Account Settings" : "Konta iestatījumi",
-    "Aliases" : "Aizstājvārdi",
-    "Mail address" : "E-pasta adrese",
-    "Display Name" : "Ekrāna vārds",
-    "Connect your mail account" : "Pievienojiet savu e-pasta kontu",
     "Name" : "Nosaukums",
     "Mail Address" : "E-pasta adrese",
     "Password" : "Parole",
-    "Manual configuration" : "Manuāla konfigurēšana",
     "IMAP Host" : "IMAP serveris",
-    "IMAP security" : "IMAP drošība",
     "None" : "Neviens",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP Port",
     "IMAP User" : "IMAP lietotājs",
     "IMAP Password" : "IMAP parole",
     "SMTP Host" : "SMTP serveris",
-    "SMTP security" : "SMTP drošība",
     "SMTP Port" : "SMTP Port",
     "SMTP User" : "SMTP lietotājs",
     "SMTP Password" : "SMTP parole",
     "Connect" : "Savienoties",
+    "Add mail account" : "Pievienot e-pasta kontu",
     "from" : "no",
     "to" : "kam",
     "cc" : "kopija",
     "bcc" : "diskrētā kopija",
     "Subject" : "Temats",
-    "Save all to Files" : "Saglabāt visus failus",
-    "Add mail account" : "Pievienot e-pasta kontu",
-    "No search results for" : "Nav meklēšanas rezultātu",
-    "The images have been blocked to protect your privacy." : "Attēli tiek bloķēti, lai aizsargātu jūsu konfidencialitāti.",
-    "Show images from this sender" : "Rādīt attēlus no šī sūtītāja",
-    "Forward" : "Pārsūtīt",
+    "Sending …" : "Sūta …",
+    "Message sent!" : "Vēstule aizsūtīta!",
+    "Send" : "Sūtīt",
+    "Choose a file to add as attachment" : "Izvēlēties datni ko pievienot kā pielikumu",
     "Import into calendar" : "Importēt kalendārā",
     "Download attachment" : "Lejupielādēt pielikumu",
-    "Save to Files" : "Saglabāt failus"
+    "Save to Files" : "Saglabāt failus",
+    "Choose a folder to store the attachment in" : "Izvēlieties mapi, kurā saglabāt pielikumus",
+    "Save all to Files" : "Saglabāt visus failus",
+    "The images have been blocked to protect your privacy." : "Attēli tiek bloķēti, lai aizsargātu jūsu konfidencialitāti.",
+    "New message" : "Jauna ziņa",
+    "Settings" : "Iestatījumi",
+    "Connect your mail account" : "Pievienojiet savu e-pasta kontu",
+    "Show all folders" : "Rādīt visas mapes",
+    "Collapse folders" : "Sakļaut mapes",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "All inboxes" : "Visas iesūtnes",
+    "Could not load {tag}{name}{endtag}" : "Nevarēja ielādēt {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Radusies problēma, ielādējot {tag}{name}{endtag}",
+    "Error loading message" : "Kļūda ielādējot vēstuli",
+    "Forwarding to %s" : "Pārsūtīt uz %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Noklikšķiniet šeit, ja netiekat pārvirzīts automātiski dažu sekunžu laikā.",
+    "Redirect" : "Novirzīt",
+    "The link leads to %s" : "Saite, kas ved uz %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Ja nevēlaties apmeklēt šo lapu, varat atgriezties pie <a href=\"%s\">e-pasta</a>.",
+    "Continue to %s" : "Turpināt %s"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);");
diff --git a/l10n/lv.json b/l10n/lv.json
index ff8081b45..34eaf9bd2 100644
--- a/l10n/lv.json
+++ b/l10n/lv.json
@@ -1,42 +1,5 @@
 { "translations": {
     "Mail" : "E-pasts",
-    "Error while loading the accounts." : "Kļūda ielādējot kontus.",
-    "Searching for {query}" : "Meklējot {query}",
-    "Error while deleting message." : "Kļūda dzēšot vēstuli.",
-    "Forwarded message" : "Pārsūtīta ziņa",
-    "Choose a folder to store the attachment in" : "Izvēlieties mapi, kurā saglabāt pielikumus",
-    "Attachments saved to Files." : "Pielikumi saglabāti datnēs.",
-    "Attachment saved to Files." : "Pielikumi saglabāti datnēs.",
-    "Error while saving attachments to Files." : "Kļūda, saglabājot pielikumus datnēs.",
-    "Error while saving attachment to Files." : "Kļūda, saglabājot pielikumus datnēs.",
-    "Message flag could not be set." : "Nevar iestatīt ziņojuma karodziņu.",
-    "Could not move message." : "Nevar pārvietot ziņu.",
-    "Invalid account" : "Nederīgs konts",
-    "Invalid folder" : "Nederīga mape",
-    "Unknown error" : "Nezināma kļūda",
-    "All inboxes" : "Visas iesūtnes",
-    "you" : "Jūs",
-    "Send message to {email}" : "Sūtīt ziņu uz {email}",
-    "Could not load {tag}{name}{endtag}" : "Nevarēja ielādēt {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Radusies problēma, ielādējot {tag}{name}{endtag}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "Save" : "Saglabāt",
-    "Show all folders" : "Rādīt visas mapes",
-    "Collapse folders" : "Sakļaut mapes",
-    "Error while deleting account." : "Kļūda dzēšot kontu.",
-    "Choose a file to add as attachment" : "Izvēlēties datni ko pievienot kā pielikumu",
-    "Reply" : "Atbildēt",
-    "Send" : "Sūtīt",
-    "Sending …" : "Sūta …",
-    "Message sent!" : "Vēstule aizsūtīta!",
-    "Server error" : "Servera kļūda",
-    "An unknown error occurred" : "Radusies nezināma kļūda",
-    "Opening HTML drafts is not supported yet." : "HTML dokumentu projektus atvēršana vēl netiek atbalstīta.",
-    "No writable calendars found" : "Nav ierakstāmu kalendāru",
-    "Error while importing the calendar event" : "Kļūda, importējot kalendāra notikumu",
-    "Error while downloading calendar event" : "Kļūda ielādējot kalendāra notikumu",
-    "& others" : "un citiem",
-    "Error while loading messages." : "Kļūda ielādējot vēstules.",
     "Inbox" : "Iesūtne",
     "Sent" : "Izsūtne",
     "Drafts" : "Melnraksti",
@@ -48,51 +11,51 @@
     "Auto detect failed. Please use manual mode." : "Automātiski noteikt neizdevās. Lūdzu, izmantojiet manuālo režīmu.",
     "Creating account failed: " : "Konta izveide neizdevās:",
     "Delete permanently" : "Dzēst pavisam",
-    "Error loading message" : "Kļūda ielādējot vēstuli",
-    "Settings" : "Iestatījumi",
-    "Forwarding to %s" : "Pārsūtīt uz %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Noklikšķiniet šeit, ja netiekat pārvirzīts automātiski dažu sekunžu laikā.",
-    "Redirect" : "Novirzīt",
-    "The link leads to %s" : "Saite, kas ved uz %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Ja nevēlaties apmeklēt šo lapu, varat atgriezties pie <a href=\"%s\">e-pasta</a>.",
-    "Continue to %s" : "Turpināt %s",
-    "Delete account" : "Dzēst kontu",
-    "New message" : "Jauna ziņa",
-    "Account Settings" : "Konta iestatījumi",
-    "Aliases" : "Aizstājvārdi",
-    "Mail address" : "E-pasta adrese",
-    "Display Name" : "Ekrāna vārds",
-    "Connect your mail account" : "Pievienojiet savu e-pasta kontu",
     "Name" : "Nosaukums",
     "Mail Address" : "E-pasta adrese",
     "Password" : "Parole",
-    "Manual configuration" : "Manuāla konfigurēšana",
     "IMAP Host" : "IMAP serveris",
-    "IMAP security" : "IMAP drošība",
     "None" : "Neviens",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP Port",
     "IMAP User" : "IMAP lietotājs",
     "IMAP Password" : "IMAP parole",
     "SMTP Host" : "SMTP serveris",
-    "SMTP security" : "SMTP drošība",
     "SMTP Port" : "SMTP Port",
     "SMTP User" : "SMTP lietotājs",
     "SMTP Password" : "SMTP parole",
     "Connect" : "Savienoties",
+    "Add mail account" : "Pievienot e-pasta kontu",
     "from" : "no",
     "to" : "kam",
     "cc" : "kopija",
     "bcc" : "diskrētā kopija",
     "Subject" : "Temats",
-    "Save all to Files" : "Saglabāt visus failus",
-    "Add mail account" : "Pievienot e-pasta kontu",
-    "No search results for" : "Nav meklēšanas rezultātu",
-    "The images have been blocked to protect your privacy." : "Attēli tiek bloķēti, lai aizsargātu jūsu konfidencialitāti.",
-    "Show images from this sender" : "Rādīt attēlus no šī sūtītāja",
-    "Forward" : "Pārsūtīt",
+    "Sending …" : "Sūta …",
+    "Message sent!" : "Vēstule aizsūtīta!",
+    "Send" : "Sūtīt",
+    "Choose a file to add as attachment" : "Izvēlēties datni ko pievienot kā pielikumu",
     "Import into calendar" : "Importēt kalendārā",
     "Download attachment" : "Lejupielādēt pielikumu",
-    "Save to Files" : "Saglabāt failus"
+    "Save to Files" : "Saglabāt failus",
+    "Choose a folder to store the attachment in" : "Izvēlieties mapi, kurā saglabāt pielikumus",
+    "Save all to Files" : "Saglabāt visus failus",
+    "The images have been blocked to protect your privacy." : "Attēli tiek bloķēti, lai aizsargātu jūsu konfidencialitāti.",
+    "New message" : "Jauna ziņa",
+    "Settings" : "Iestatījumi",
+    "Connect your mail account" : "Pievienojiet savu e-pasta kontu",
+    "Show all folders" : "Rādīt visas mapes",
+    "Collapse folders" : "Sakļaut mapes",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "All inboxes" : "Visas iesūtnes",
+    "Could not load {tag}{name}{endtag}" : "Nevarēja ielādēt {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Radusies problēma, ielādējot {tag}{name}{endtag}",
+    "Error loading message" : "Kļūda ielādējot vēstuli",
+    "Forwarding to %s" : "Pārsūtīt uz %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Noklikšķiniet šeit, ja netiekat pārvirzīts automātiski dažu sekunžu laikā.",
+    "Redirect" : "Novirzīt",
+    "The link leads to %s" : "Saite, kas ved uz %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Ja nevēlaties apmeklēt šo lapu, varat atgriezties pie <a href=\"%s\">e-pasta</a>.",
+    "Continue to %s" : "Turpināt %s"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/l10n/mn.js b/l10n/mn.js
index 055d2b496..810163d2c 100644
--- a/l10n/mn.js
+++ b/l10n/mn.js
@@ -2,28 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "шуудан",
-    "Error while loading the accounts." : "аккаунт ачаалах үед алдаа гарлаа.",
-    "Forwarded message" : "дамжуулагдсан мэдээ",
-    "Choose a folder to store the attachment in" : "-д хавсралт хадгалах фолдер сонгоно уу",
-    "Attachments saved to Files." : "Хавсралт файлд хадгалагдсан.",
-    "Attachment saved to Files." : "Хавсралт файлд хадгалагдсан.",
-    "Error while saving attachments to Files." : "Алдаа файлуудыг хавсралтанд хадгалаж байна.",
-    "Error while saving attachment to Files." : "Алдаа файлуудыг хавсралтанд хадгалаж байна.",
-    "Message flag could not be set." : "Зурвас шинж тэмдэг тохируулах боломжгүй байна.",
-    "Could not move message." : "зурвас зөөх боломжгүй ",
-    "Invalid account" : "буруу аккаунт",
-    "Invalid folder" : "буруу хавтас",
-    "Unknown error" : "үл мэдэгдэх алдаа",
-    "you" : "та",
-    "Save" : "хадгалах",
-    "Show all folders" : "Бүх хавтас харуулах",
-    "Reply" : "хариулт",
-    "Send" : "илгээх",
-    "Sending …" : "илгээмж",
-    "Message sent!" : "зурвас илгээсэн",
-    "Server error" : "серверийн алдаа",
-    "An unknown error occurred" : "Үл мэдэгдэх алдаа гарлаа",
-    "& others" : "бусад",
     "Inbox" : "ирсэн",
     "Sent" : "илгээсэн",
     "Drafts" : "ноорог",
@@ -34,33 +12,33 @@ OC.L10N.register(
     "Favorites" : "дуртай",
     "Creating account failed: " : "аккаунт үүсгэж чадсангүй:",
     "Delete permanently" : "бүр мөсөн устгах",
-    "Error loading message" : "алдаатай ачааллах зурвас",
-    "Settings" : "тохиргоо",
-    "New message" : "шинэ зурвас",
-    "Mail address" : "шуудангийн хаяг",
-    "Connect your mail account" : "Таны мэйл бүртгэлийг холбоно",
     "Name" : "нэр",
     "Mail Address" : "шуудангийн хаяг",
     "Password" : "нууц үг",
-    "Manual configuration" : "гараар тохируулах",
     "None" : "юу ч үгүй",
     "IMAP Port" : "интернет мессеж хандалтын протокол -ийн порт",
     "IMAP User" : "интернет мессеж хандалтын протокол -ийн хэрэглэгч",
     "IMAP Password" : "интернет мессеж хандалтын протокол -ийн нууц үг",
     "SMTP Host" : "Энгийн мэйл дамжуулах протокол-ийн хост",
-    "SMTP security" : "Энгийн мэйл дамжуулах протокол-ийн нууцлал",
     "SMTP Port" : "Энгийн мэйл дамжуулах протокол-ийн порт",
     "SMTP User" : "Энгийн мэйл дамжуулах протокол-ийн хэрэглэгч",
     "SMTP Password" : "Энгийн мэйл дамжуулах протокол-ийн нууц үг",
     "Connect" : "холбох",
+    "Add mail account" : "шуудангийн хаяг нэмэх",
     "from" : "тэндээс",
     "Subject" : "Сэдэв",
+    "Sending …" : "илгээмж",
+    "Message sent!" : "зурвас илгээсэн",
+    "Send" : "илгээх",
+    "Download attachment" : "Татаж авах хавсралт",
+    "Save to Files" : "Файлд хадгална",
+    "Choose a folder to store the attachment in" : "-д хавсралт хадгалах фолдер сонгоно уу",
     "Save all to Files" : "бүх файлыг хадгалах",
-    "Add mail account" : "шуудангийн хаяг нэмэх",
-    "No search results for" : "хайлтын үр дүн байхгүй",
     "The images have been blocked to protect your privacy." : " таны хувийн нууцыг хамгаалахын тулд дүрсийг хаасан байна.",
-    "Forward" : "дамжих",
-    "Download attachment" : "Татаж авах хавсралт",
-    "Save to Files" : "Файлд хадгална"
+    "New message" : "шинэ зурвас",
+    "Settings" : "тохиргоо",
+    "Connect your mail account" : "Таны мэйл бүртгэлийг холбоно",
+    "Show all folders" : "Бүх хавтас харуулах",
+    "Error loading message" : "алдаатай ачааллах зурвас"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/mn.json b/l10n/mn.json
index b9ee933df..283f039bf 100644
--- a/l10n/mn.json
+++ b/l10n/mn.json
@@ -1,27 +1,5 @@
 { "translations": {
     "Mail" : "шуудан",
-    "Error while loading the accounts." : "аккаунт ачаалах үед алдаа гарлаа.",
-    "Forwarded message" : "дамжуулагдсан мэдээ",
-    "Choose a folder to store the attachment in" : "-д хавсралт хадгалах фолдер сонгоно уу",
-    "Attachments saved to Files." : "Хавсралт файлд хадгалагдсан.",
-    "Attachment saved to Files." : "Хавсралт файлд хадгалагдсан.",
-    "Error while saving attachments to Files." : "Алдаа файлуудыг хавсралтанд хадгалаж байна.",
-    "Error while saving attachment to Files." : "Алдаа файлуудыг хавсралтанд хадгалаж байна.",
-    "Message flag could not be set." : "Зурвас шинж тэмдэг тохируулах боломжгүй байна.",
-    "Could not move message." : "зурвас зөөх боломжгүй ",
-    "Invalid account" : "буруу аккаунт",
-    "Invalid folder" : "буруу хавтас",
-    "Unknown error" : "үл мэдэгдэх алдаа",
-    "you" : "та",
-    "Save" : "хадгалах",
-    "Show all folders" : "Бүх хавтас харуулах",
-    "Reply" : "хариулт",
-    "Send" : "илгээх",
-    "Sending …" : "илгээмж",
-    "Message sent!" : "зурвас илгээсэн",
-    "Server error" : "серверийн алдаа",
-    "An unknown error occurred" : "Үл мэдэгдэх алдаа гарлаа",
-    "& others" : "бусад",
     "Inbox" : "ирсэн",
     "Sent" : "илгээсэн",
     "Drafts" : "ноорог",
@@ -32,33 +10,33 @@
     "Favorites" : "дуртай",
     "Creating account failed: " : "аккаунт үүсгэж чадсангүй:",
     "Delete permanently" : "бүр мөсөн устгах",
-    "Error loading message" : "алдаатай ачааллах зурвас",
-    "Settings" : "тохиргоо",
-    "New message" : "шинэ зурвас",
-    "Mail address" : "шуудангийн хаяг",
-    "Connect your mail account" : "Таны мэйл бүртгэлийг холбоно",
     "Name" : "нэр",
     "Mail Address" : "шуудангийн хаяг",
     "Password" : "нууц үг",
-    "Manual configuration" : "гараар тохируулах",
     "None" : "юу ч үгүй",
     "IMAP Port" : "интернет мессеж хандалтын протокол -ийн порт",
     "IMAP User" : "интернет мессеж хандалтын протокол -ийн хэрэглэгч",
     "IMAP Password" : "интернет мессеж хандалтын протокол -ийн нууц үг",
     "SMTP Host" : "Энгийн мэйл дамжуулах протокол-ийн хост",
-    "SMTP security" : "Энгийн мэйл дамжуулах протокол-ийн нууцлал",
     "SMTP Port" : "Энгийн мэйл дамжуулах протокол-ийн порт",
     "SMTP User" : "Энгийн мэйл дамжуулах протокол-ийн хэрэглэгч",
     "SMTP Password" : "Энгийн мэйл дамжуулах протокол-ийн нууц үг",
     "Connect" : "холбох",
+    "Add mail account" : "шуудангийн хаяг нэмэх",
     "from" : "тэндээс",
     "Subject" : "Сэдэв",
+    "Sending …" : "илгээмж",
+    "Message sent!" : "зурвас илгээсэн",
+    "Send" : "илгээх",
+    "Download attachment" : "Татаж авах хавсралт",
+    "Save to Files" : "Файлд хадгална",
+    "Choose a folder to store the attachment in" : "-д хавсралт хадгалах фолдер сонгоно уу",
     "Save all to Files" : "бүх файлыг хадгалах",
-    "Add mail account" : "шуудангийн хаяг нэмэх",
-    "No search results for" : "хайлтын үр дүн байхгүй",
     "The images have been blocked to protect your privacy." : " таны хувийн нууцыг хамгаалахын тулд дүрсийг хаасан байна.",
-    "Forward" : "дамжих",
-    "Download attachment" : "Татаж авах хавсралт",
-    "Save to Files" : "Файлд хадгална"
+    "New message" : "шинэ зурвас",
+    "Settings" : "тохиргоо",
+    "Connect your mail account" : "Таны мэйл бүртгэлийг холбоно",
+    "Show all folders" : "Бүх хавтас харуулах",
+    "Error loading message" : "алдаатай ачааллах зурвас"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/nb.js b/l10n/nb.js
index 43427bfee..63593c3c9 100644
--- a/l10n/nb.js
+++ b/l10n/nb.js
@@ -2,56 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "E-post",
-    "Loading accounts" : "Laster kontoer",
-    "Error while loading the accounts." : "Feil ved innlasting av kontoene.",
-    "Can not load this folder." : "Kan ikke laste denne mappen.",
-    "Searching for {query}" : "Søker etter {query}",
-    "Error while deleting message." : "Feil ved sletting av melding.",
-    "Forwarded message" : "Videresendt melding",
-    "Choose a folder to store the attachment in" : "Velg en mappe å lagre vedlegget i",
-    "Attachments saved to Files." : "Vedleggene ble lagret i Filer.",
-    "Attachment saved to Files." : "Vedlegget ble lagret i Filer.",
-    "Error while saving attachments to Files." : "Feil ved lagring av vedleggene i Filer.",
-    "Error while saving attachment to Files." : "Feil ved lagring av vedlegget i filer.",
-    "Message flag could not be set." : "Meldingsflagget kunne ikke settes.",
-    "Could not move message." : "Kunne ikke flytte melding.",
-    "Invalid account" : "Ugyldig konto",
-    "Invalid folder" : "Ugyldig mappe",
-    "Error while creating the account: " : "Feil under opprettelse av kontoen:",
-    "Unknown error" : "Ukjent feil",
-    "Error while updating the account: " : "Feil under oppdatering av kontoen:",
-    "All inboxes" : "Alle innbokser",
-    "you" : "du",
-    "Send message to {email}" : "Send melding til {email}",
-    "Could not load {tag}{name}{endtag}" : "Kunne ikke laste {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Det oppstod et problem under lasting av {tag}{name}{endtag}",
-    "Could not load your message" : "Kunne ikke laste meldingene dine",
-    "Could not load the desired message" : "Kunne ikke laste den ønskede meldingen",
-    "Could not load the message" : "Kunne ikka laste meldingen",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n ny melding \nfra {from}","%n nye meldinger \nfra {from}"],
-    "Nextcloud Mail" : "Nextcloud Mail",
-    "Save" : "Lagre",
-    "Saved" : "Lagret",
-    "Show all folders" : "Vis alle mapper",
-    "Collapse folders" : "Skjul mapper",
-    "Error while deleting account." : "Feil ved sletting av konto.",
-    "Choose a file to add as attachment" : "Velg en fil å legge til som vedlegg",
-    "An error occurred while uploading {fname}" : "En feil inntraff under opplasting av {fname}",
-    "Reply" : "Svar",
-    "Send" : "Send",
-    "Sending …" : "Sender…",
-    "Message sent!" : "Melding sendt!",
-    "Server error" : "Tjenerfeil",
-    "An unknown error occurred" : "En ukjent feil oppstod",
-    "Opening HTML drafts is not supported yet." : "Åpning av HTML-kladd er ikke støttet ennå.",
-    "No writable calendars found" : "Ingen skrivbare kalendere funnet",
-    "Error while importing the calendar event" : "Feil ved importering av kalenderhendelse",
-    "Error while downloading calendar event" : "Feil ved nedlasting av kalenderhendelse",
-    "& others" : "og andre",
-    "Error while loading messages." : "Feil ved innlasting av meldinger.",
-    "Error while refreshing messages." : "Feil under gjenoppfrisking av meldinger.",
-    "Setting up your account" : "Oppsett av kontoen din",
     "Inbox" : "Innboks",
     "Sent" : "Sendt",
     "Drafts" : "Kladd",
@@ -64,68 +14,70 @@ OC.L10N.register(
     "Updating account failed: " : "Oppdatering av konto mislyktes:",
     "Creating account failed: " : "Oppretting av konto mislyktes:",
     "Delete permanently" : "Slett for godt",
-    "Error loading message" : "Feil ved innlasting av melding",
-    "Settings" : "Innstillinger",
-    "Forwarding to %s" : "Videresender til %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Klikk her hvis du ikke blir videresendt automatisk innen noen få sekunder.",
-    "Redirect" : "Videresend",
-    "The link leads to %s" : "Denne lenken leder til %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Hvis du ikke ønsker å besøke den siden, kan du returnere til <a href=\"%s\">E-post</a>.",
-    "Continue to %s" : "Fortsett til %s",
-    "Delete account" : "Slett konto",
-    "Try again" : "Prøv igjen",
-    "New message" : "Ny melding",
-    "Account Settings" : "Kontoinnstillinger",
-    "Aliases" : "Aliaser",
-    "Mail address" : "E-postadresse",
-    "Display Name" : "Visningsnavn",
-    "Account" : "Konto",
-    "Delete" : "Slett",
-    "Keyboard shortcuts" : "Tastatursnarveier",
-    "Speed up your Mail experience with these quick shortcuts." : "Arbeid raskere i Mail med disse raske snarveiene",
-    "Compose new message" : "Lag ny melding",
-    "Newer message" : "Nyere melding",
-    "Older message" : "Eldre melding",
-    "Toggle star" : "Merk med stjerne",
-    "Toggle unread" : "Merk som ulest",
-    "Search" : "Søk",
-    "Refresh" : "Oppdater",
-    "Connect your mail account" : "Koble til din e-postkonto",
     "Name" : "Navn",
     "Mail Address" : "E-postadresse",
     "Password" : "Passord",
-    "Manual configuration" : "Manuelt oppsett",
     "IMAP Host" : "IMAP vert",
-    "IMAP security" : "IMAP sikkerhet",
     "None" : "Ingen",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP Port",
     "IMAP User" : "IMAP Bruker",
     "IMAP Password" : "IMAP Passord",
     "SMTP Host" : "SMTP vert",
-    "SMTP security" : "SMTP sikkerhet",
     "SMTP Port" : "SMTP Port",
     "SMTP User" : "SMTP Bruker",
     "SMTP Password" : "SMTP Passord",
     "Connect" : "Koble til",
+    "Add mail account" : "Legg til e-postkonto",
+    "Use Gravatar and favicon avatars" : "Bruk Gravatar- og favikon-avatarer",
+    "Keyboard shortcuts" : "Tastatursnarveier",
     "from" : "fra",
     "to" : "ti",
     "cc" : "cc",
     "bcc" : "bcc",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Vær oppmerksom på at e-posten kom fra en \"ikke svar\" adresse slik at ditt svar blir muligens ikke lest.",
     "Subject" : "Emne",
-    "Save all to Files" : "Lagre alle i Filer",
-    "Add mail account" : "Legg til e-postkonto",
-    "Use Gravatar and favicon avatars" : "Bruk Gravatar- og favikon-avatarer",
-    "No search results for" : "Ingen søkeresultater for",
-    "The images have been blocked to protect your privacy." : "Bildene har blitt blokkert for å beskytte privatlivet.",
-    "Show images from this sender" : "Vis bilder fra denne avsenderen",
-    "Forward" : "Videresend",
-    "No messages in this folder" : "Ingen meldinger i denne mappen",
+    "Sending …" : "Sender…",
+    "Message sent!" : "Melding sendt!",
+    "Send" : "Send",
     "Upload attachment" : "Last opp vedlegg",
     "Add attachment from Files" : "Legg til vedlegg fra Filer",
+    "Choose a file to add as attachment" : "Velg en fil å legge til som vedlegg",
+    "No messages in this folder" : "Ingen meldinger i denne mappen",
+    "Delete" : "Slett",
+    "Could not load your message" : "Kunne ikke laste meldingene dine",
     "Import into calendar" : "Importer til kalender",
     "Download attachment" : "Last ned vedlegg",
-    "Save to Files" : "Lagre i Filer"
+    "Save to Files" : "Lagre i Filer",
+    "Choose a folder to store the attachment in" : "Velg en mappe å lagre vedlegget i",
+    "Save all to Files" : "Lagre alle i Filer",
+    "The images have been blocked to protect your privacy." : "Bildene har blitt blokkert for å beskytte privatlivet.",
+    "New message" : "Ny melding",
+    "Settings" : "Innstillinger",
+    "Speed up your Mail experience with these quick shortcuts." : "Arbeid raskere i Mail med disse raske snarveiene",
+    "Compose new message" : "Lag ny melding",
+    "Newer message" : "Nyere melding",
+    "Older message" : "Eldre melding",
+    "Toggle star" : "Merk med stjerne",
+    "Toggle unread" : "Merk som ulest",
+    "Search" : "Søk",
+    "Refresh" : "Oppdater",
+    "Connect your mail account" : "Koble til din e-postkonto",
+    "Show all folders" : "Vis alle mapper",
+    "Collapse folders" : "Skjul mapper",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n ny melding \nfra {from}","%n nye meldinger \nfra {from}"],
+    "Nextcloud Mail" : "Nextcloud Mail",
+    "All inboxes" : "Alle innbokser",
+    "Could not load {tag}{name}{endtag}" : "Kunne ikke laste {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Det oppstod et problem under lasting av {tag}{name}{endtag}",
+    "Could not load the desired message" : "Kunne ikke laste den ønskede meldingen",
+    "Could not load the message" : "Kunne ikka laste meldingen",
+    "Error loading message" : "Feil ved innlasting av melding",
+    "Forwarding to %s" : "Videresender til %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Klikk her hvis du ikke blir videresendt automatisk innen noen få sekunder.",
+    "Redirect" : "Videresend",
+    "The link leads to %s" : "Denne lenken leder til %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Hvis du ikke ønsker å besøke den siden, kan du returnere til <a href=\"%s\">E-post</a>.",
+    "Continue to %s" : "Fortsett til %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/nb.json b/l10n/nb.json
index 867ea86ec..37e1c9ac0 100644
--- a/l10n/nb.json
+++ b/l10n/nb.json
@@ -1,55 +1,5 @@
 { "translations": {
     "Mail" : "E-post",
-    "Loading accounts" : "Laster kontoer",
-    "Error while loading the accounts." : "Feil ved innlasting av kontoene.",
-    "Can not load this folder." : "Kan ikke laste denne mappen.",
-    "Searching for {query}" : "Søker etter {query}",
-    "Error while deleting message." : "Feil ved sletting av melding.",
-    "Forwarded message" : "Videresendt melding",
-    "Choose a folder to store the attachment in" : "Velg en mappe å lagre vedlegget i",
-    "Attachments saved to Files." : "Vedleggene ble lagret i Filer.",
-    "Attachment saved to Files." : "Vedlegget ble lagret i Filer.",
-    "Error while saving attachments to Files." : "Feil ved lagring av vedleggene i Filer.",
-    "Error while saving attachment to Files." : "Feil ved lagring av vedlegget i filer.",
-    "Message flag could not be set." : "Meldingsflagget kunne ikke settes.",
-    "Could not move message." : "Kunne ikke flytte melding.",
-    "Invalid account" : "Ugyldig konto",
-    "Invalid folder" : "Ugyldig mappe",
-    "Error while creating the account: " : "Feil under opprettelse av kontoen:",
-    "Unknown error" : "Ukjent feil",
-    "Error while updating the account: " : "Feil under oppdatering av kontoen:",
-    "All inboxes" : "Alle innbokser",
-    "you" : "du",
-    "Send message to {email}" : "Send melding til {email}",
-    "Could not load {tag}{name}{endtag}" : "Kunne ikke laste {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Det oppstod et problem under lasting av {tag}{name}{endtag}",
-    "Could not load your message" : "Kunne ikke laste meldingene dine",
-    "Could not load the desired message" : "Kunne ikke laste den ønskede meldingen",
-    "Could not load the message" : "Kunne ikka laste meldingen",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n ny melding \nfra {from}","%n nye meldinger \nfra {from}"],
-    "Nextcloud Mail" : "Nextcloud Mail",
-    "Save" : "Lagre",
-    "Saved" : "Lagret",
-    "Show all folders" : "Vis alle mapper",
-    "Collapse folders" : "Skjul mapper",
-    "Error while deleting account." : "Feil ved sletting av konto.",
-    "Choose a file to add as attachment" : "Velg en fil å legge til som vedlegg",
-    "An error occurred while uploading {fname}" : "En feil inntraff under opplasting av {fname}",
-    "Reply" : "Svar",
-    "Send" : "Send",
-    "Sending …" : "Sender…",
-    "Message sent!" : "Melding sendt!",
-    "Server error" : "Tjenerfeil",
-    "An unknown error occurred" : "En ukjent feil oppstod",
-    "Opening HTML drafts is not supported yet." : "Åpning av HTML-kladd er ikke støttet ennå.",
-    "No writable calendars found" : "Ingen skrivbare kalendere funnet",
-    "Error while importing the calendar event" : "Feil ved importering av kalenderhendelse",
-    "Error while downloading calendar event" : "Feil ved nedlasting av kalenderhendelse",
-    "& others" : "og andre",
-    "Error while loading messages." : "Feil ved innlasting av meldinger.",
-    "Error while refreshing messages." : "Feil under gjenoppfrisking av meldinger.",
-    "Setting up your account" : "Oppsett av kontoen din",
     "Inbox" : "Innboks",
     "Sent" : "Sendt",
     "Drafts" : "Kladd",
@@ -62,68 +12,70 @@
     "Updating account failed: " : "Oppdatering av konto mislyktes:",
     "Creating account failed: " : "Oppretting av konto mislyktes:",
     "Delete permanently" : "Slett for godt",
-    "Error loading message" : "Feil ved innlasting av melding",
-    "Settings" : "Innstillinger",
-    "Forwarding to %s" : "Videresender til %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Klikk her hvis du ikke blir videresendt automatisk innen noen få sekunder.",
-    "Redirect" : "Videresend",
-    "The link leads to %s" : "Denne lenken leder til %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Hvis du ikke ønsker å besøke den siden, kan du returnere til <a href=\"%s\">E-post</a>.",
-    "Continue to %s" : "Fortsett til %s",
-    "Delete account" : "Slett konto",
-    "Try again" : "Prøv igjen",
-    "New message" : "Ny melding",
-    "Account Settings" : "Kontoinnstillinger",
-    "Aliases" : "Aliaser",
-    "Mail address" : "E-postadresse",
-    "Display Name" : "Visningsnavn",
-    "Account" : "Konto",
-    "Delete" : "Slett",
-    "Keyboard shortcuts" : "Tastatursnarveier",
-    "Speed up your Mail experience with these quick shortcuts." : "Arbeid raskere i Mail med disse raske snarveiene",
-    "Compose new message" : "Lag ny melding",
-    "Newer message" : "Nyere melding",
-    "Older message" : "Eldre melding",
-    "Toggle star" : "Merk med stjerne",
-    "Toggle unread" : "Merk som ulest",
-    "Search" : "Søk",
-    "Refresh" : "Oppdater",
-    "Connect your mail account" : "Koble til din e-postkonto",
     "Name" : "Navn",
     "Mail Address" : "E-postadresse",
     "Password" : "Passord",
-    "Manual configuration" : "Manuelt oppsett",
     "IMAP Host" : "IMAP vert",
-    "IMAP security" : "IMAP sikkerhet",
     "None" : "Ingen",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP Port",
     "IMAP User" : "IMAP Bruker",
     "IMAP Password" : "IMAP Passord",
     "SMTP Host" : "SMTP vert",
-    "SMTP security" : "SMTP sikkerhet",
     "SMTP Port" : "SMTP Port",
     "SMTP User" : "SMTP Bruker",
     "SMTP Password" : "SMTP Passord",
     "Connect" : "Koble til",
+    "Add mail account" : "Legg til e-postkonto",
+    "Use Gravatar and favicon avatars" : "Bruk Gravatar- og favikon-avatarer",
+    "Keyboard shortcuts" : "Tastatursnarveier",
     "from" : "fra",
     "to" : "ti",
     "cc" : "cc",
     "bcc" : "bcc",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Vær oppmerksom på at e-posten kom fra en \"ikke svar\" adresse slik at ditt svar blir muligens ikke lest.",
     "Subject" : "Emne",
-    "Save all to Files" : "Lagre alle i Filer",
-    "Add mail account" : "Legg til e-postkonto",
-    "Use Gravatar and favicon avatars" : "Bruk Gravatar- og favikon-avatarer",
-    "No search results for" : "Ingen søkeresultater for",
-    "The images have been blocked to protect your privacy." : "Bildene har blitt blokkert for å beskytte privatlivet.",
-    "Show images from this sender" : "Vis bilder fra denne avsenderen",
-    "Forward" : "Videresend",
-    "No messages in this folder" : "Ingen meldinger i denne mappen",
+    "Sending …" : "Sender…",
+    "Message sent!" : "Melding sendt!",
+    "Send" : "Send",
     "Upload attachment" : "Last opp vedlegg",
     "Add attachment from Files" : "Legg til vedlegg fra Filer",
+    "Choose a file to add as attachment" : "Velg en fil å legge til som vedlegg",
+    "No messages in this folder" : "Ingen meldinger i denne mappen",
+    "Delete" : "Slett",
+    "Could not load your message" : "Kunne ikke laste meldingene dine",
     "Import into calendar" : "Importer til kalender",
     "Download attachment" : "Last ned vedlegg",
-    "Save to Files" : "Lagre i Filer"
+    "Save to Files" : "Lagre i Filer",
+    "Choose a folder to store the attachment in" : "Velg en mappe å lagre vedlegget i",
+    "Save all to Files" : "Lagre alle i Filer",
+    "The images have been blocked to protect your privacy." : "Bildene har blitt blokkert for å beskytte privatlivet.",
+    "New message" : "Ny melding",
+    "Settings" : "Innstillinger",
+    "Speed up your Mail experience with these quick shortcuts." : "Arbeid raskere i Mail med disse raske snarveiene",
+    "Compose new message" : "Lag ny melding",
+    "Newer message" : "Nyere melding",
+    "Older message" : "Eldre melding",
+    "Toggle star" : "Merk med stjerne",
+    "Toggle unread" : "Merk som ulest",
+    "Search" : "Søk",
+    "Refresh" : "Oppdater",
+    "Connect your mail account" : "Koble til din e-postkonto",
+    "Show all folders" : "Vis alle mapper",
+    "Collapse folders" : "Skjul mapper",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n ny melding \nfra {from}","%n nye meldinger \nfra {from}"],
+    "Nextcloud Mail" : "Nextcloud Mail",
+    "All inboxes" : "Alle innbokser",
+    "Could not load {tag}{name}{endtag}" : "Kunne ikke laste {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Det oppstod et problem under lasting av {tag}{name}{endtag}",
+    "Could not load the desired message" : "Kunne ikke laste den ønskede meldingen",
+    "Could not load the message" : "Kunne ikka laste meldingen",
+    "Error loading message" : "Feil ved innlasting av melding",
+    "Forwarding to %s" : "Videresender til %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Klikk her hvis du ikke blir videresendt automatisk innen noen få sekunder.",
+    "Redirect" : "Videresend",
+    "The link leads to %s" : "Denne lenken leder til %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Hvis du ikke ønsker å besøke den siden, kan du returnere til <a href=\"%s\">E-post</a>.",
+    "Continue to %s" : "Fortsett til %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/nl.js b/l10n/nl.js
index f58c64b03..90167528c 100644
--- a/l10n/nl.js
+++ b/l10n/nl.js
@@ -2,56 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "E-mail",
-    "Loading accounts" : "Accounts laden",
-    "Error while loading the accounts." : "Fout tijdens het laden van de accounts.",
-    "Can not load this folder." : "Kan deze map niet laden.",
-    "Searching for {query}" : "Zoeken naar {query}",
-    "Error while deleting message." : "Fout bij verwijderen bericht.",
-    "Forwarded message" : "Doorgestuurd bericht",
-    "Choose a folder to store the attachment in" : "Kies een map op de bijlage in op te slaan",
-    "Attachments saved to Files." : "Bjilagen opgeslagen in Bestanden.",
-    "Attachment saved to Files." : "Bijlage opgeslagen in Bestanden.",
-    "Error while saving attachments to Files." : "Fout bij opslaan bijlagen in Bestanden.",
-    "Error while saving attachment to Files." : "Fout bij opslaan bijlage in Bestanden.",
-    "Message flag could not be set." : "Bericht kon niet als gemarkeerd worden.",
-    "Could not move message." : "Kon bericht niet verplaatsen",
-    "Invalid account" : "Ongeldig account",
-    "Invalid folder" : "Ongeldige map",
-    "Error while creating the account: " : "Fout bij het creëren van een account:",
-    "Unknown error" : "Onbekende fout",
-    "Error while updating the account: " : "Fout tijdens het bijwerken van account:",
-    "All inboxes" : "Alle postvakken",
-    "you" : "jou",
-    "Send message to {email}" : "Verstuur email aan {email}",
-    "Could not load {tag}{name}{endtag}" : "Kon niet laden {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Er is een probleem bij het laden {tag}{name}{endtag}",
-    "Could not load your message" : "Kon je bericht niet laden",
-    "Could not load the desired message" : "Kon het gewenste bericht niet laden",
-    "Could not load the message" : "Kon het bericht niet laden",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n nieuw bericht \nvan {from}","%n niewe berichten \nvan {from}"],
-    "Nextcloud Mail" : "Nextcloud E-mail",
-    "Save" : "Opslaan",
-    "Saved" : "Opgeslagen",
-    "Show all folders" : "Laat alle mappen zien",
-    "Collapse folders" : "Mappen inklappen",
-    "Error while deleting account." : "Fout bij verwijderen account.",
-    "Choose a file to add as attachment" : "Kies een bestand om als bijlage toe te voegen",
-    "An error occurred while uploading {fname}" : "Er trad een fout op bij het uploaden van {fname}",
-    "Reply" : "Antwoord",
-    "Send" : "Versturen",
-    "Sending …" : "Versturen ...",
-    "Message sent!" : "Bericht verzonden!",
-    "Server error" : "Serverfout",
-    "An unknown error occurred" : "Een onbekend probleem vond plaats",
-    "Opening HTML drafts is not supported yet." : "Openen concept HTML wordt nog niet ondersteund.",
-    "No writable calendars found" : "Geen beschijfbare agenda's gevonden",
-    "Error while importing the calendar event" : "Fout bij importeren agenda-afspraak",
-    "Error while downloading calendar event" : "Fout bij downloaden agenda-afspraak",
-    "& others" : "& anderen",
-    "Error while loading messages." : "Fout bij laden berichten.",
-    "Error while refreshing messages." : "Foutmelding tijdens verversen van berichten.",
-    "Setting up your account" : "Je account opzetten",
     "Inbox" : "Postvak in",
     "Sent" : "Verzonden",
     "Drafts" : "Concepten",
@@ -66,69 +16,70 @@ OC.L10N.register(
     "Delete permanently" : "Definitief verwijderen",
     "IMAP web client" : "IMAP web client",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Gebruiksvriendelijke e-mailclient die verbindt met je mailserver via IMAP en SMTP.",
-    "Error loading message" : "Fout bij laden bericht",
-    "Settings" : "Instellingen",
-    "Forwarding to %s" : "Doorsturen aan %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Klik hier als je binnen enkele seconden niet automatisch wordt doorgestuurd.",
-    "Redirect" : "Omleiden",
-    "The link leads to %s" : "De link verwijst naar %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Als je die pagina niet wilt bezoeken, kun je teruggaan naar <a href=\"%s\">E-mail</a>.",
-    "Continue to %s" : "Verder naar %s",
-    "Delete account" : "Verwijder account",
-    "Try again" : "Probeer opnieuw",
-    "New message" : "Nieuw bericht",
-    "Account Settings" : "Account instellingen",
-    "Aliases" : "Aliassen",
-    "Mail address" : "E-mailadres",
-    "Display Name" : "Weergavenaam",
-    "Account" : "Account",
-    "Toggle read" : "Omschakelen leesmodus",
-    "Delete" : "Verwijderen",
-    "Keyboard shortcuts" : "Sneltoetsen",
-    "Speed up your Mail experience with these quick shortcuts." : "Versnel je e-mail-ervaring met deze handige snelkoppelingen.",
-    "Compose new message" : "Opstellen nieuw bericht",
-    "Newer message" : "Recenter bericht",
-    "Older message" : "Ouder bericht",
-    "Toggle star" : "Omschakelen ster",
-    "Toggle unread" : "Omschakelen ongelezen",
-    "Search" : "Zoeken",
-    "Refresh" : "Verversen",
-    "Connect your mail account" : "verbind je e-mailaccount",
     "Name" : "Naam",
     "Mail Address" : "E-mailadres",
     "Password" : "Wachtwoord",
-    "Manual configuration" : "Handmatig configureren",
     "IMAP Host" : "IMAP host",
-    "IMAP security" : "IMAP security",
     "None" : "Geen",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP poort",
     "IMAP User" : "IMAP gebruikersnaam",
     "IMAP Password" : "IMAP wachtwoord",
     "SMTP Host" : "SMTP host",
-    "SMTP security" : "SMTP security",
     "SMTP Port" : "SMTP poort",
     "SMTP User" : "SMTP gebruikersnaam",
     "SMTP Password" : "SMTP wachtwoord",
     "Connect" : "Verbinden",
+    "Add mail account" : "Voeg e-mail account toe",
+    "Use Gravatar and favicon avatars" : "Gebruik Gravatar en favicon avatars",
+    "Keyboard shortcuts" : "Sneltoetsen",
     "from" : "van",
     "to" : "aan",
     "cc" : "cc",
     "bcc" : "bcc",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Let op: het e-mailbericht kwam van een niet-antwoord adres, waardoor je antwoord vermoedelijk niet zal worden gelezen.",
     "Subject" : "Onderwerp",
-    "Save all to Files" : "Sla alles op in Bestanden",
-    "Add mail account" : "Voeg e-mail account toe",
-    "Use Gravatar and favicon avatars" : "Gebruik Gravatar en favicon avatars",
-    "No search results for" : "Geen resultaten gevonden voor",
-    "The images have been blocked to protect your privacy." : "De afbeeldingen zijn geblokkeerd om je privacy te beschermen",
-    "Show images from this sender" : "Laat afbeeldingen zien van deze afzender",
-    "Forward" : "Doorsturen",
-    "No messages in this folder" : "Geen berichten in deze map",
+    "Sending …" : "Versturen ...",
+    "Message sent!" : "Bericht verzonden!",
+    "Send" : "Versturen",
     "Upload attachment" : "Bijlage uploaden",
     "Add attachment from Files" : "Bijlage toevoegen vanuit Bestanden",
+    "Choose a file to add as attachment" : "Kies een bestand om als bijlage toe te voegen",
+    "No messages in this folder" : "Geen berichten in deze map",
+    "Delete" : "Verwijderen",
+    "Could not load your message" : "Kon je bericht niet laden",
     "Import into calendar" : "Toevoegen aan agenda",
     "Download attachment" : "Download bijlage",
-    "Save to Files" : "Opslaan in Bestanden"
+    "Save to Files" : "Opslaan in Bestanden",
+    "Choose a folder to store the attachment in" : "Kies een map op de bijlage in op te slaan",
+    "Save all to Files" : "Sla alles op in Bestanden",
+    "The images have been blocked to protect your privacy." : "De afbeeldingen zijn geblokkeerd om je privacy te beschermen",
+    "New message" : "Nieuw bericht",
+    "Settings" : "Instellingen",
+    "Speed up your Mail experience with these quick shortcuts." : "Versnel je e-mail-ervaring met deze handige snelkoppelingen.",
+    "Compose new message" : "Opstellen nieuw bericht",
+    "Newer message" : "Recenter bericht",
+    "Older message" : "Ouder bericht",
+    "Toggle star" : "Omschakelen ster",
+    "Toggle unread" : "Omschakelen ongelezen",
+    "Search" : "Zoeken",
+    "Refresh" : "Verversen",
+    "Connect your mail account" : "verbind je e-mailaccount",
+    "Show all folders" : "Laat alle mappen zien",
+    "Collapse folders" : "Mappen inklappen",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n nieuw bericht \nvan {from}","%n niewe berichten \nvan {from}"],
+    "Nextcloud Mail" : "Nextcloud E-mail",
+    "All inboxes" : "Alle postvakken",
+    "Could not load {tag}{name}{endtag}" : "Kon niet laden {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Er is een probleem bij het laden {tag}{name}{endtag}",
+    "Could not load the desired message" : "Kon het gewenste bericht niet laden",
+    "Could not load the message" : "Kon het bericht niet laden",
+    "Error loading message" : "Fout bij laden bericht",
+    "Forwarding to %s" : "Doorsturen aan %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Klik hier als je binnen enkele seconden niet automatisch wordt doorgestuurd.",
+    "Redirect" : "Omleiden",
+    "The link leads to %s" : "De link verwijst naar %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Als je die pagina niet wilt bezoeken, kun je teruggaan naar <a href=\"%s\">E-mail</a>.",
+    "Continue to %s" : "Verder naar %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/nl.json b/l10n/nl.json
index a4bf46ca9..d62f17b57 100644
--- a/l10n/nl.json
+++ b/l10n/nl.json
@@ -1,55 +1,5 @@
 { "translations": {
     "Mail" : "E-mail",
-    "Loading accounts" : "Accounts laden",
-    "Error while loading the accounts." : "Fout tijdens het laden van de accounts.",
-    "Can not load this folder." : "Kan deze map niet laden.",
-    "Searching for {query}" : "Zoeken naar {query}",
-    "Error while deleting message." : "Fout bij verwijderen bericht.",
-    "Forwarded message" : "Doorgestuurd bericht",
-    "Choose a folder to store the attachment in" : "Kies een map op de bijlage in op te slaan",
-    "Attachments saved to Files." : "Bjilagen opgeslagen in Bestanden.",
-    "Attachment saved to Files." : "Bijlage opgeslagen in Bestanden.",
-    "Error while saving attachments to Files." : "Fout bij opslaan bijlagen in Bestanden.",
-    "Error while saving attachment to Files." : "Fout bij opslaan bijlage in Bestanden.",
-    "Message flag could not be set." : "Bericht kon niet als gemarkeerd worden.",
-    "Could not move message." : "Kon bericht niet verplaatsen",
-    "Invalid account" : "Ongeldig account",
-    "Invalid folder" : "Ongeldige map",
-    "Error while creating the account: " : "Fout bij het creëren van een account:",
-    "Unknown error" : "Onbekende fout",
-    "Error while updating the account: " : "Fout tijdens het bijwerken van account:",
-    "All inboxes" : "Alle postvakken",
-    "you" : "jou",
-    "Send message to {email}" : "Verstuur email aan {email}",
-    "Could not load {tag}{name}{endtag}" : "Kon niet laden {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Er is een probleem bij het laden {tag}{name}{endtag}",
-    "Could not load your message" : "Kon je bericht niet laden",
-    "Could not load the desired message" : "Kon het gewenste bericht niet laden",
-    "Could not load the message" : "Kon het bericht niet laden",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n nieuw bericht \nvan {from}","%n niewe berichten \nvan {from}"],
-    "Nextcloud Mail" : "Nextcloud E-mail",
-    "Save" : "Opslaan",
-    "Saved" : "Opgeslagen",
-    "Show all folders" : "Laat alle mappen zien",
-    "Collapse folders" : "Mappen inklappen",
-    "Error while deleting account." : "Fout bij verwijderen account.",
-    "Choose a file to add as attachment" : "Kies een bestand om als bijlage toe te voegen",
-    "An error occurred while uploading {fname}" : "Er trad een fout op bij het uploaden van {fname}",
-    "Reply" : "Antwoord",
-    "Send" : "Versturen",
-    "Sending …" : "Versturen ...",
-    "Message sent!" : "Bericht verzonden!",
-    "Server error" : "Serverfout",
-    "An unknown error occurred" : "Een onbekend probleem vond plaats",
-    "Opening HTML drafts is not supported yet." : "Openen concept HTML wordt nog niet ondersteund.",
-    "No writable calendars found" : "Geen beschijfbare agenda's gevonden",
-    "Error while importing the calendar event" : "Fout bij importeren agenda-afspraak",
-    "Error while downloading calendar event" : "Fout bij downloaden agenda-afspraak",
-    "& others" : "& anderen",
-    "Error while loading messages." : "Fout bij laden berichten.",
-    "Error while refreshing messages." : "Foutmelding tijdens verversen van berichten.",
-    "Setting up your account" : "Je account opzetten",
     "Inbox" : "Postvak in",
     "Sent" : "Verzonden",
     "Drafts" : "Concepten",
@@ -64,69 +14,70 @@
     "Delete permanently" : "Definitief verwijderen",
     "IMAP web client" : "IMAP web client",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Gebruiksvriendelijke e-mailclient die verbindt met je mailserver via IMAP en SMTP.",
-    "Error loading message" : "Fout bij laden bericht",
-    "Settings" : "Instellingen",
-    "Forwarding to %s" : "Doorsturen aan %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Klik hier als je binnen enkele seconden niet automatisch wordt doorgestuurd.",
-    "Redirect" : "Omleiden",
-    "The link leads to %s" : "De link verwijst naar %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Als je die pagina niet wilt bezoeken, kun je teruggaan naar <a href=\"%s\">E-mail</a>.",
-    "Continue to %s" : "Verder naar %s",
-    "Delete account" : "Verwijder account",
-    "Try again" : "Probeer opnieuw",
-    "New message" : "Nieuw bericht",
-    "Account Settings" : "Account instellingen",
-    "Aliases" : "Aliassen",
-    "Mail address" : "E-mailadres",
-    "Display Name" : "Weergavenaam",
-    "Account" : "Account",
-    "Toggle read" : "Omschakelen leesmodus",
-    "Delete" : "Verwijderen",
-    "Keyboard shortcuts" : "Sneltoetsen",
-    "Speed up your Mail experience with these quick shortcuts." : "Versnel je e-mail-ervaring met deze handige snelkoppelingen.",
-    "Compose new message" : "Opstellen nieuw bericht",
-    "Newer message" : "Recenter bericht",
-    "Older message" : "Ouder bericht",
-    "Toggle star" : "Omschakelen ster",
-    "Toggle unread" : "Omschakelen ongelezen",
-    "Search" : "Zoeken",
-    "Refresh" : "Verversen",
-    "Connect your mail account" : "verbind je e-mailaccount",
     "Name" : "Naam",
     "Mail Address" : "E-mailadres",
     "Password" : "Wachtwoord",
-    "Manual configuration" : "Handmatig configureren",
     "IMAP Host" : "IMAP host",
-    "IMAP security" : "IMAP security",
     "None" : "Geen",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP poort",
     "IMAP User" : "IMAP gebruikersnaam",
     "IMAP Password" : "IMAP wachtwoord",
     "SMTP Host" : "SMTP host",
-    "SMTP security" : "SMTP security",
     "SMTP Port" : "SMTP poort",
     "SMTP User" : "SMTP gebruikersnaam",
     "SMTP Password" : "SMTP wachtwoord",
     "Connect" : "Verbinden",
+    "Add mail account" : "Voeg e-mail account toe",
+    "Use Gravatar and favicon avatars" : "Gebruik Gravatar en favicon avatars",
+    "Keyboard shortcuts" : "Sneltoetsen",
     "from" : "van",
     "to" : "aan",
     "cc" : "cc",
     "bcc" : "bcc",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Let op: het e-mailbericht kwam van een niet-antwoord adres, waardoor je antwoord vermoedelijk niet zal worden gelezen.",
     "Subject" : "Onderwerp",
-    "Save all to Files" : "Sla alles op in Bestanden",
-    "Add mail account" : "Voeg e-mail account toe",
-    "Use Gravatar and favicon avatars" : "Gebruik Gravatar en favicon avatars",
-    "No search results for" : "Geen resultaten gevonden voor",
-    "The images have been blocked to protect your privacy." : "De afbeeldingen zijn geblokkeerd om je privacy te beschermen",
-    "Show images from this sender" : "Laat afbeeldingen zien van deze afzender",
-    "Forward" : "Doorsturen",
-    "No messages in this folder" : "Geen berichten in deze map",
+    "Sending …" : "Versturen ...",
+    "Message sent!" : "Bericht verzonden!",
+    "Send" : "Versturen",
     "Upload attachment" : "Bijlage uploaden",
     "Add attachment from Files" : "Bijlage toevoegen vanuit Bestanden",
+    "Choose a file to add as attachment" : "Kies een bestand om als bijlage toe te voegen",
+    "No messages in this folder" : "Geen berichten in deze map",
+    "Delete" : "Verwijderen",
+    "Could not load your message" : "Kon je bericht niet laden",
     "Import into calendar" : "Toevoegen aan agenda",
     "Download attachment" : "Download bijlage",
-    "Save to Files" : "Opslaan in Bestanden"
+    "Save to Files" : "Opslaan in Bestanden",
+    "Choose a folder to store the attachment in" : "Kies een map op de bijlage in op te slaan",
+    "Save all to Files" : "Sla alles op in Bestanden",
+    "The images have been blocked to protect your privacy." : "De afbeeldingen zijn geblokkeerd om je privacy te beschermen",
+    "New message" : "Nieuw bericht",
+    "Settings" : "Instellingen",
+    "Speed up your Mail experience with these quick shortcuts." : "Versnel je e-mail-ervaring met deze handige snelkoppelingen.",
+    "Compose new message" : "Opstellen nieuw bericht",
+    "Newer message" : "Recenter bericht",
+    "Older message" : "Ouder bericht",
+    "Toggle star" : "Omschakelen ster",
+    "Toggle unread" : "Omschakelen ongelezen",
+    "Search" : "Zoeken",
+    "Refresh" : "Verversen",
+    "Connect your mail account" : "verbind je e-mailaccount",
+    "Show all folders" : "Laat alle mappen zien",
+    "Collapse folders" : "Mappen inklappen",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n nieuw bericht \nvan {from}","%n niewe berichten \nvan {from}"],
+    "Nextcloud Mail" : "Nextcloud E-mail",
+    "All inboxes" : "Alle postvakken",
+    "Could not load {tag}{name}{endtag}" : "Kon niet laden {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Er is een probleem bij het laden {tag}{name}{endtag}",
+    "Could not load the desired message" : "Kon het gewenste bericht niet laden",
+    "Could not load the message" : "Kon het bericht niet laden",
+    "Error loading message" : "Fout bij laden bericht",
+    "Forwarding to %s" : "Doorsturen aan %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Klik hier als je binnen enkele seconden niet automatisch wordt doorgestuurd.",
+    "Redirect" : "Omleiden",
+    "The link leads to %s" : "De link verwijst naar %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Als je die pagina niet wilt bezoeken, kun je teruggaan naar <a href=\"%s\">E-mail</a>.",
+    "Continue to %s" : "Verder naar %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/oc.js b/l10n/oc.js
deleted file mode 100644
index 83e0a1e28..000000000
--- a/l10n/oc.js
+++ /dev/null
@@ -1,43 +0,0 @@
-OC.L10N.register(
-    "mail",
-    {
-    "Mail" : "Mail",
-    "Error while loading the accounts." : "Error al moment del cargament dels comptes.",
-    "Error while deleting message." : "Error al moment de la supression del messatge.",
-    "Forwarded message" : "Messatge transferit",
-    "Choose a folder to store the attachment in" : "Causissètz lo dorsièr dins lo qual enregistrar la pèça junta",
-    "Attachments saved to Files." : "Pèças juntas enregistradas dins los Fichièrs.",
-    "Attachment saved to Files." : "Pèça junta enregistrada dins los Fichièrs.",
-    "Error while saving attachments to Files." : "Error al moment de l'enregistrament de las pèças juntas dins los Fichièrs.",
-    "Error while saving attachment to Files." : "Error al moment de l'enregistrament de la pèça junta dins los Fichièrs.",
-    "Unknown error" : "Error desconeguda",
-    "All inboxes" : "Totas las bóstias",
-    "you" : "vos",
-    "Send message to {email}" : "Mandar un mail a {email}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "Error while deleting account." : "Error al moment de la supression del compte.",
-    "Choose a file to add as attachment" : "Causissètz un fichièr de jónher al messatge",
-    "Reply" : "Respondre",
-    "Send" : "Mandar",
-    "Sending …" : "Mandadís ...",
-    "Message sent!" : "Messatge mandat !",
-    "Server error" : "Error del servidor",
-    "Opening HTML drafts is not supported yet." : "La dobertura de borrolhons al format HTML es pas presa en carga pel moment.",
-    "& others" : "e d'autres",
-    "Error while loading messages." : "Error al moment del cargament dels messatges.",
-    "Inbox" : "Bóstia de recepcion",
-    "Sent" : "Mandats",
-    "Drafts" : "Borrolhons",
-    "Archive" : "Archius",
-    "Trash" : "Escobilhièr",
-    "Junk" : "Indesirables",
-    "All" : "Totes",
-    "Favorites" : "Favorits",
-    "Auto detect failed. Please use manual mode." : "L'autodeteccion a fracassat. Utilizatz lo mòde manual.",
-    "Creating account failed: " : "La creacion del compte a fracassat :",
-    "Delete permanently" : "Suprimir definitivament",
-    "Error loading message" : "Error al moment del cargament del messatge",
-    "Continue to %s" : "Contunhar cap a %s",
-    "Connect" : "Connectar"
-},
-"nplurals=2; plural=(n > 1);");
diff --git a/l10n/oc.json b/l10n/oc.json
deleted file mode 100644
index 286d2c97f..000000000
--- a/l10n/oc.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{ "translations": {
-    "Mail" : "Mail",
-    "Error while loading the accounts." : "Error al moment del cargament dels comptes.",
-    "Error while deleting message." : "Error al moment de la supression del messatge.",
-    "Forwarded message" : "Messatge transferit",
-    "Choose a folder to store the attachment in" : "Causissètz lo dorsièr dins lo qual enregistrar la pèça junta",
-    "Attachments saved to Files." : "Pèças juntas enregistradas dins los Fichièrs.",
-    "Attachment saved to Files." : "Pèça junta enregistrada dins los Fichièrs.",
-    "Error while saving attachments to Files." : "Error al moment de l'enregistrament de las pèças juntas dins los Fichièrs.",
-    "Error while saving attachment to Files." : "Error al moment de l'enregistrament de la pèça junta dins los Fichièrs.",
-    "Unknown error" : "Error desconeguda",
-    "All inboxes" : "Totas las bóstias",
-    "you" : "vos",
-    "Send message to {email}" : "Mandar un mail a {email}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "Error while deleting account." : "Error al moment de la supression del compte.",
-    "Choose a file to add as attachment" : "Causissètz un fichièr de jónher al messatge",
-    "Reply" : "Respondre",
-    "Send" : "Mandar",
-    "Sending …" : "Mandadís ...",
-    "Message sent!" : "Messatge mandat !",
-    "Server error" : "Error del servidor",
-    "Opening HTML drafts is not supported yet." : "La dobertura de borrolhons al format HTML es pas presa en carga pel moment.",
-    "& others" : "e d'autres",
-    "Error while loading messages." : "Error al moment del cargament dels messatges.",
-    "Inbox" : "Bóstia de recepcion",
-    "Sent" : "Mandats",
-    "Drafts" : "Borrolhons",
-    "Archive" : "Archius",
-    "Trash" : "Escobilhièr",
-    "Junk" : "Indesirables",
-    "All" : "Totes",
-    "Favorites" : "Favorits",
-    "Auto detect failed. Please use manual mode." : "L'autodeteccion a fracassat. Utilizatz lo mòde manual.",
-    "Creating account failed: " : "La creacion del compte a fracassat :",
-    "Delete permanently" : "Suprimir definitivament",
-    "Error loading message" : "Error al moment del cargament del messatge",
-    "Continue to %s" : "Contunhar cap a %s",
-    "Connect" : "Connectar"
-},"pluralForm" :"nplurals=2; plural=(n > 1);"
-}
\ No newline at end of file
diff --git a/l10n/pl.js b/l10n/pl.js
index 7e296fe11..56541be79 100644
--- a/l10n/pl.js
+++ b/l10n/pl.js
@@ -2,56 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Poczta",
-    "Loading accounts" : "Ładowanie kont",
-    "Error while loading the accounts." : "Błąd podczas ładowania kont.",
-    "Can not load this folder." : "Nie można załadować tego folderu.",
-    "Searching for {query}" : "Wyszukiwanie {query}",
-    "Error while deleting message." : "Błąd podczas usuwania wiadomości.",
-    "Forwarded message" : "Wiadomość przekazana",
-    "Choose a folder to store the attachment in" : "Proszę wybrać folder do zapisania załącznika",
-    "Attachments saved to Files." : "Załączniki zapisane do plików.",
-    "Attachment saved to Files." : "Załącznik zapisany do plików.",
-    "Error while saving attachments to Files." : "Błąd podczas zapisu załączników do plików.",
-    "Error while saving attachment to Files." : "Błąd podczas zapisu załącznika do plików.",
-    "Message flag could not be set." : "Nie można oznaczyć wiadomości.",
-    "Could not move message." : "Nie można przenieść wiadomości.",
-    "Invalid account" : "Nieprawidłowe konto",
-    "Invalid folder" : "Nieprawidłowy folder",
-    "Error while creating the account: " : "Błąd podczas tworzenia konta:",
-    "Unknown error" : "Nieznany błąd",
-    "Error while updating the account: " : "Błąd podczas aktualizacji konta: ",
-    "All inboxes" : "Wszystkie skrzynki odbiorcze",
-    "you" : "Ty",
-    "Send message to {email}" : "Wyślij wiadomość do {email}",
-    "Could not load {tag}{name}{endtag}" : "Nie można załadować {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Wystąpił problem podczas wczytywania {tag}{name}{endtag}",
-    "Could not load your message" : "Nie można załadować wiadomości",
-    "Could not load the desired message" : "Nie można wczytać żądanej wiadomości",
-    "Could not load the message" : "Nie można załadować wiadomości",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n nowa wiadomość\nod {from}","%n nowe wiadomości \nod {from}","%n nowych wiadomości \nod {from}","%n nowych wiadomości \nod {from}"],
-    "Nextcloud Mail" : "Poczta Nextcloud",
-    "Save" : "Zapisz",
-    "Saved" : "Zapisano",
-    "Show all folders" : "Wyświetl wszystkie foldery",
-    "Collapse folders" : "Zwiń foldery",
-    "Error while deleting account." : "Błąd podczas usuwania konta.",
-    "Choose a file to add as attachment" : "Wybierz plik aby dodać jako załącznik",
-    "An error occurred while uploading {fname}" : "Wystąpił błąd podczas wysyłania {fname}",
-    "Reply" : "Odpowiedz",
-    "Send" : "Wyślij",
-    "Sending …" : "Wysyłanie…",
-    "Message sent!" : "Wiadomość wysłana!",
-    "Server error" : "Błąd serwera",
-    "An unknown error occurred" : "Wystąpił nieznany błąd",
-    "Opening HTML drafts is not supported yet." : "Otwieranie wiadomości roboczych w HTML nie jest jeszcze wspierane.",
-    "No writable calendars found" : "Nie znaleziono zapisywalnych kalendarzy.",
-    "Error while importing the calendar event" : "Wystąpił błąd podczas importowania zdarzenia z kalendarza",
-    "Error while downloading calendar event" : "Wystąpił błąd podczas pobierania zdarzenia z kalendarza",
-    "& others" : "& inni",
-    "Error while loading messages." : "Błąd podczas ładowania wiadomości.",
-    "Error while refreshing messages." : "Błąd podczas odświeżania wiadomości.",
-    "Setting up your account" : "Skonfiguruj swoje konto",
     "Inbox" : "Odbiorcza",
     "Sent" : "Wysłane",
     "Drafts" : "Szkice",
@@ -66,69 +16,70 @@ OC.L10N.register(
     "Delete permanently" : "Trwale usuń",
     "IMAP web client" : "Klient webowy IMAP",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Łatwy w użytkowaniu klient IMAP i SMTP, który łączy się z Twoim serwerem pocztowym.",
-    "Error loading message" : "Błąd podczas ładowania wiadomości",
-    "Settings" : "Ustawienia",
-    "Forwarding to %s" : "Prześlij do %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Kliknij tutaj, jeśli nie są automatycznie przekierowywane w ciągu kilku sekund.",
-    "Redirect" : "Przekieruj",
-    "The link leads to %s" : "Link prowadzi do %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Jeśli nie chcesz odwiedzić tej strony, możesz powrócić do <a href=\"%s\">Poczty</a>.",
-    "Continue to %s" : "Kontynuuj do %s",
-    "Delete account" : "Usuń konto",
-    "Try again" : "Spróbuj ponownie",
-    "New message" : "Nowa wiadomość",
-    "Account Settings" : "Ustawienia konta",
-    "Aliases" : "Aliasy",
-    "Mail address" : "Adres mailowy",
-    "Display Name" : "Wyświetlana nazwa",
-    "Account" : "Konto",
-    "Toggle read" : "Oznacz jako przeczytane/nieprzeczytane",
-    "Delete" : "Usuń",
-    "Keyboard shortcuts" : "Skróty klawiaturowe",
-    "Speed up your Mail experience with these quick shortcuts." : "Aby przyspieszyć korzystanie z Poczty użyj tych skrótów.",
-    "Compose new message" : "Napisz nową wiadomość",
-    "Newer message" : "Nowsza wiadomość",
-    "Older message" : "Starsza wiadomość",
-    "Toggle star" : "Oznacz gwiazdką",
-    "Toggle unread" : "Oznacz jako nieprzeczytane",
-    "Search" : "Szukaj",
-    "Refresh" : "Odśwież",
-    "Connect your mail account" : "Podłącz konto pocztowe",
     "Name" : "Nazwa",
     "Mail Address" : "Adres mailowy",
     "Password" : "Hasło",
-    "Manual configuration" : "Ręczna konfiguracja",
     "IMAP Host" : "IMAP Host",
-    "IMAP security" : "zabezpieczenie IMAP",
     "None" : "Brak",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Port IMAP",
     "IMAP User" : "Użytkownik IMAP",
     "IMAP Password" : "Hasło IMAP",
     "SMTP Host" : "SMTP Host",
-    "SMTP security" : "zabezpieczenie SMTP",
     "SMTP Port" : "Port SMTP",
     "SMTP User" : "Użytkownik SMTP",
     "SMTP Password" : "Hasło SMTP",
     "Connect" : "Połącz",
+    "Add mail account" : "Dodaj konto mailowe",
+    "Use Gravatar and favicon avatars" : "Używaj awatarów Gravatar i favicon",
+    "Keyboard shortcuts" : "Skróty klawiaturowe",
     "from" : "od",
     "to" : "do",
     "cc" : "cc",
     "bcc" : "bcc",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Zauważ, że mail przyszedł z adresu noreply, stąd Twoja odpowiedź na tą wiadomość prawdopodobnie nie zostanie odczytana.",
     "Subject" : "Temat",
-    "Save all to Files" : "Zapisz wszystko do plików",
-    "Add mail account" : "Dodaj konto mailowe",
-    "Use Gravatar and favicon avatars" : "Używaj awatarów Gravatar i favicon",
-    "No search results for" : "Brak wyników wyszukiwania",
-    "The images have been blocked to protect your privacy." : "Obrazy zostały zablokowane by chronić Twoją prywatność.",
-    "Show images from this sender" : "Zobacz zdjęcia od tego nadawcy",
-    "Forward" : "Prześlij dalej",
-    "No messages in this folder" : "Brak wiadomości w tym folderze",
+    "Sending …" : "Wysyłanie…",
+    "Message sent!" : "Wiadomość wysłana!",
+    "Send" : "Wyślij",
     "Upload attachment" : "Dodaj załącznik",
     "Add attachment from Files" : "Dodaj załącznik z Pliki",
+    "Choose a file to add as attachment" : "Wybierz plik aby dodać jako załącznik",
+    "No messages in this folder" : "Brak wiadomości w tym folderze",
+    "Delete" : "Usuń",
+    "Could not load your message" : "Nie można załadować wiadomości",
     "Import into calendar" : "Importuj do kalendarza",
     "Download attachment" : "Pobierz załącznik",
-    "Save to Files" : "Zapisz do plików"
+    "Save to Files" : "Zapisz do plików",
+    "Choose a folder to store the attachment in" : "Proszę wybrać folder do zapisania załącznika",
+    "Save all to Files" : "Zapisz wszystko do plików",
+    "The images have been blocked to protect your privacy." : "Obrazy zostały zablokowane by chronić Twoją prywatność.",
+    "New message" : "Nowa wiadomość",
+    "Settings" : "Ustawienia",
+    "Speed up your Mail experience with these quick shortcuts." : "Aby przyspieszyć korzystanie z Poczty użyj tych skrótów.",
+    "Compose new message" : "Napisz nową wiadomość",
+    "Newer message" : "Nowsza wiadomość",
+    "Older message" : "Starsza wiadomość",
+    "Toggle star" : "Oznacz gwiazdką",
+    "Toggle unread" : "Oznacz jako nieprzeczytane",
+    "Search" : "Szukaj",
+    "Refresh" : "Odśwież",
+    "Connect your mail account" : "Podłącz konto pocztowe",
+    "Show all folders" : "Wyświetl wszystkie foldery",
+    "Collapse folders" : "Zwiń foldery",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n nowa wiadomość\nod {from}","%n nowe wiadomości \nod {from}","%n nowych wiadomości \nod {from}","%n nowych wiadomości \nod {from}"],
+    "Nextcloud Mail" : "Poczta Nextcloud",
+    "All inboxes" : "Wszystkie skrzynki odbiorcze",
+    "Could not load {tag}{name}{endtag}" : "Nie można załadować {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Wystąpił problem podczas wczytywania {tag}{name}{endtag}",
+    "Could not load the desired message" : "Nie można wczytać żądanej wiadomości",
+    "Could not load the message" : "Nie można załadować wiadomości",
+    "Error loading message" : "Błąd podczas ładowania wiadomości",
+    "Forwarding to %s" : "Prześlij do %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Kliknij tutaj, jeśli nie są automatycznie przekierowywane w ciągu kilku sekund.",
+    "Redirect" : "Przekieruj",
+    "The link leads to %s" : "Link prowadzi do %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Jeśli nie chcesz odwiedzić tej strony, możesz powrócić do <a href=\"%s\">Poczty</a>.",
+    "Continue to %s" : "Kontynuuj do %s"
 },
 "nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);");
diff --git a/l10n/pl.json b/l10n/pl.json
index d2c962387..3058dc7d0 100644
--- a/l10n/pl.json
+++ b/l10n/pl.json
@@ -1,55 +1,5 @@
 { "translations": {
     "Mail" : "Poczta",
-    "Loading accounts" : "Ładowanie kont",
-    "Error while loading the accounts." : "Błąd podczas ładowania kont.",
-    "Can not load this folder." : "Nie można załadować tego folderu.",
-    "Searching for {query}" : "Wyszukiwanie {query}",
-    "Error while deleting message." : "Błąd podczas usuwania wiadomości.",
-    "Forwarded message" : "Wiadomość przekazana",
-    "Choose a folder to store the attachment in" : "Proszę wybrać folder do zapisania załącznika",
-    "Attachments saved to Files." : "Załączniki zapisane do plików.",
-    "Attachment saved to Files." : "Załącznik zapisany do plików.",
-    "Error while saving attachments to Files." : "Błąd podczas zapisu załączników do plików.",
-    "Error while saving attachment to Files." : "Błąd podczas zapisu załącznika do plików.",
-    "Message flag could not be set." : "Nie można oznaczyć wiadomości.",
-    "Could not move message." : "Nie można przenieść wiadomości.",
-    "Invalid account" : "Nieprawidłowe konto",
-    "Invalid folder" : "Nieprawidłowy folder",
-    "Error while creating the account: " : "Błąd podczas tworzenia konta:",
-    "Unknown error" : "Nieznany błąd",
-    "Error while updating the account: " : "Błąd podczas aktualizacji konta: ",
-    "All inboxes" : "Wszystkie skrzynki odbiorcze",
-    "you" : "Ty",
-    "Send message to {email}" : "Wyślij wiadomość do {email}",
-    "Could not load {tag}{name}{endtag}" : "Nie można załadować {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Wystąpił problem podczas wczytywania {tag}{name}{endtag}",
-    "Could not load your message" : "Nie można załadować wiadomości",
-    "Could not load the desired message" : "Nie można wczytać żądanej wiadomości",
-    "Could not load the message" : "Nie można załadować wiadomości",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n nowa wiadomość\nod {from}","%n nowe wiadomości \nod {from}","%n nowych wiadomości \nod {from}","%n nowych wiadomości \nod {from}"],
-    "Nextcloud Mail" : "Poczta Nextcloud",
-    "Save" : "Zapisz",
-    "Saved" : "Zapisano",
-    "Show all folders" : "Wyświetl wszystkie foldery",
-    "Collapse folders" : "Zwiń foldery",
-    "Error while deleting account." : "Błąd podczas usuwania konta.",
-    "Choose a file to add as attachment" : "Wybierz plik aby dodać jako załącznik",
-    "An error occurred while uploading {fname}" : "Wystąpił błąd podczas wysyłania {fname}",
-    "Reply" : "Odpowiedz",
-    "Send" : "Wyślij",
-    "Sending …" : "Wysyłanie…",
-    "Message sent!" : "Wiadomość wysłana!",
-    "Server error" : "Błąd serwera",
-    "An unknown error occurred" : "Wystąpił nieznany błąd",
-    "Opening HTML drafts is not supported yet." : "Otwieranie wiadomości roboczych w HTML nie jest jeszcze wspierane.",
-    "No writable calendars found" : "Nie znaleziono zapisywalnych kalendarzy.",
-    "Error while importing the calendar event" : "Wystąpił błąd podczas importowania zdarzenia z kalendarza",
-    "Error while downloading calendar event" : "Wystąpił błąd podczas pobierania zdarzenia z kalendarza",
-    "& others" : "& inni",
-    "Error while loading messages." : "Błąd podczas ładowania wiadomości.",
-    "Error while refreshing messages." : "Błąd podczas odświeżania wiadomości.",
-    "Setting up your account" : "Skonfiguruj swoje konto",
     "Inbox" : "Odbiorcza",
     "Sent" : "Wysłane",
     "Drafts" : "Szkice",
@@ -64,69 +14,70 @@
     "Delete permanently" : "Trwale usuń",
     "IMAP web client" : "Klient webowy IMAP",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Łatwy w użytkowaniu klient IMAP i SMTP, który łączy się z Twoim serwerem pocztowym.",
-    "Error loading message" : "Błąd podczas ładowania wiadomości",
-    "Settings" : "Ustawienia",
-    "Forwarding to %s" : "Prześlij do %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Kliknij tutaj, jeśli nie są automatycznie przekierowywane w ciągu kilku sekund.",
-    "Redirect" : "Przekieruj",
-    "The link leads to %s" : "Link prowadzi do %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Jeśli nie chcesz odwiedzić tej strony, możesz powrócić do <a href=\"%s\">Poczty</a>.",
-    "Continue to %s" : "Kontynuuj do %s",
-    "Delete account" : "Usuń konto",
-    "Try again" : "Spróbuj ponownie",
-    "New message" : "Nowa wiadomość",
-    "Account Settings" : "Ustawienia konta",
-    "Aliases" : "Aliasy",
-    "Mail address" : "Adres mailowy",
-    "Display Name" : "Wyświetlana nazwa",
-    "Account" : "Konto",
-    "Toggle read" : "Oznacz jako przeczytane/nieprzeczytane",
-    "Delete" : "Usuń",
-    "Keyboard shortcuts" : "Skróty klawiaturowe",
-    "Speed up your Mail experience with these quick shortcuts." : "Aby przyspieszyć korzystanie z Poczty użyj tych skrótów.",
-    "Compose new message" : "Napisz nową wiadomość",
-    "Newer message" : "Nowsza wiadomość",
-    "Older message" : "Starsza wiadomość",
-    "Toggle star" : "Oznacz gwiazdką",
-    "Toggle unread" : "Oznacz jako nieprzeczytane",
-    "Search" : "Szukaj",
-    "Refresh" : "Odśwież",
-    "Connect your mail account" : "Podłącz konto pocztowe",
     "Name" : "Nazwa",
     "Mail Address" : "Adres mailowy",
     "Password" : "Hasło",
-    "Manual configuration" : "Ręczna konfiguracja",
     "IMAP Host" : "IMAP Host",
-    "IMAP security" : "zabezpieczenie IMAP",
     "None" : "Brak",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Port IMAP",
     "IMAP User" : "Użytkownik IMAP",
     "IMAP Password" : "Hasło IMAP",
     "SMTP Host" : "SMTP Host",
-    "SMTP security" : "zabezpieczenie SMTP",
     "SMTP Port" : "Port SMTP",
     "SMTP User" : "Użytkownik SMTP",
     "SMTP Password" : "Hasło SMTP",
     "Connect" : "Połącz",
+    "Add mail account" : "Dodaj konto mailowe",
+    "Use Gravatar and favicon avatars" : "Używaj awatarów Gravatar i favicon",
+    "Keyboard shortcuts" : "Skróty klawiaturowe",
     "from" : "od",
     "to" : "do",
     "cc" : "cc",
     "bcc" : "bcc",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Zauważ, że mail przyszedł z adresu noreply, stąd Twoja odpowiedź na tą wiadomość prawdopodobnie nie zostanie odczytana.",
     "Subject" : "Temat",
-    "Save all to Files" : "Zapisz wszystko do plików",
-    "Add mail account" : "Dodaj konto mailowe",
-    "Use Gravatar and favicon avatars" : "Używaj awatarów Gravatar i favicon",
-    "No search results for" : "Brak wyników wyszukiwania",
-    "The images have been blocked to protect your privacy." : "Obrazy zostały zablokowane by chronić Twoją prywatność.",
-    "Show images from this sender" : "Zobacz zdjęcia od tego nadawcy",
-    "Forward" : "Prześlij dalej",
-    "No messages in this folder" : "Brak wiadomości w tym folderze",
+    "Sending …" : "Wysyłanie…",
+    "Message sent!" : "Wiadomość wysłana!",
+    "Send" : "Wyślij",
     "Upload attachment" : "Dodaj załącznik",
     "Add attachment from Files" : "Dodaj załącznik z Pliki",
+    "Choose a file to add as attachment" : "Wybierz plik aby dodać jako załącznik",
+    "No messages in this folder" : "Brak wiadomości w tym folderze",
+    "Delete" : "Usuń",
+    "Could not load your message" : "Nie można załadować wiadomości",
     "Import into calendar" : "Importuj do kalendarza",
     "Download attachment" : "Pobierz załącznik",
-    "Save to Files" : "Zapisz do plików"
+    "Save to Files" : "Zapisz do plików",
+    "Choose a folder to store the attachment in" : "Proszę wybrać folder do zapisania załącznika",
+    "Save all to Files" : "Zapisz wszystko do plików",
+    "The images have been blocked to protect your privacy." : "Obrazy zostały zablokowane by chronić Twoją prywatność.",
+    "New message" : "Nowa wiadomość",
+    "Settings" : "Ustawienia",
+    "Speed up your Mail experience with these quick shortcuts." : "Aby przyspieszyć korzystanie z Poczty użyj tych skrótów.",
+    "Compose new message" : "Napisz nową wiadomość",
+    "Newer message" : "Nowsza wiadomość",
+    "Older message" : "Starsza wiadomość",
+    "Toggle star" : "Oznacz gwiazdką",
+    "Toggle unread" : "Oznacz jako nieprzeczytane",
+    "Search" : "Szukaj",
+    "Refresh" : "Odśwież",
+    "Connect your mail account" : "Podłącz konto pocztowe",
+    "Show all folders" : "Wyświetl wszystkie foldery",
+    "Collapse folders" : "Zwiń foldery",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n nowa wiadomość\nod {from}","%n nowe wiadomości \nod {from}","%n nowych wiadomości \nod {from}","%n nowych wiadomości \nod {from}"],
+    "Nextcloud Mail" : "Poczta Nextcloud",
+    "All inboxes" : "Wszystkie skrzynki odbiorcze",
+    "Could not load {tag}{name}{endtag}" : "Nie można załadować {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Wystąpił problem podczas wczytywania {tag}{name}{endtag}",
+    "Could not load the desired message" : "Nie można wczytać żądanej wiadomości",
+    "Could not load the message" : "Nie można załadować wiadomości",
+    "Error loading message" : "Błąd podczas ładowania wiadomości",
+    "Forwarding to %s" : "Prześlij do %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Kliknij tutaj, jeśli nie są automatycznie przekierowywane w ciągu kilku sekund.",
+    "Redirect" : "Przekieruj",
+    "The link leads to %s" : "Link prowadzi do %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Jeśli nie chcesz odwiedzić tej strony, możesz powrócić do <a href=\"%s\">Poczty</a>.",
+    "Continue to %s" : "Kontynuuj do %s"
 },"pluralForm" :"nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);"
 }
\ No newline at end of file
diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js
index 3a55ddd4c..08f11933a 100644
--- a/l10n/pt_BR.js
+++ b/l10n/pt_BR.js
@@ -2,56 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "E-mail",
-    "Loading accounts" : "Carregando contas",
-    "Error while loading the accounts." : "Erro ao carregar as contas.",
-    "Can not load this folder." : "Não foi possível carregar esta pasta.",
-    "Searching for {query}" : "Pesquisando por {query}",
-    "Error while deleting message." : "Erro ao excluir mensagem.",
-    "Forwarded message" : "Mensagem encaminhada",
-    "Choose a folder to store the attachment in" : "Escolha uma pasta para armazenar os anexos",
-    "Attachments saved to Files." : "Anexo salvos em Arquivos.",
-    "Attachment saved to Files." : "Anexo salvo em Arquivos.",
-    "Error while saving attachments to Files." : "Erro ao salvar anexos em Arquivos.",
-    "Error while saving attachment to Files." : "Erro ao salvar anexos em Arquivos.",
-    "Message flag could not be set." : "Marcação da mensagem não pôde ser definida.",
-    "Could not move message." : "Não foi possível mover a mensagem.",
-    "Invalid account" : "Conta inválida",
-    "Invalid folder" : "Pasta inválida",
-    "Error while creating the account: " : "Erro ao criar a conta:",
-    "Unknown error" : "Erro desconhecido",
-    "Error while updating the account: " : "Erro ao atualizar a conta:",
-    "All inboxes" : "Todas as caixas de entrada",
-    "you" : "você",
-    "Send message to {email}" : "Enviar mensagem para {email}",
-    "Could not load {tag}{name}{endtag}" : "Não foi possível carregar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Ocorreu um problema ao carregar {tag}{name}{endtag}",
-    "Could not load your message" : "Não foi possível carregar sua mensagem",
-    "Could not load the desired message" : "Não foi possível carregar a mensagem desejada",
-    "Could not load the message" : "Não foi possível carregar a mensagem",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n nova mensagem \nde {from}","%n novas mensagens \nde {from}"],
-    "Nextcloud Mail" : "E-mail Nextcloud",
-    "Save" : "Salvar",
-    "Saved" : "Salvo",
-    "Show all folders" : "Mostrar todas as pastas",
-    "Collapse folders" : "Esconder as pastas",
-    "Error while deleting account." : "Erro ao excluir a conta.",
-    "Choose a file to add as attachment" : "Escolha um arquivo para adicionar como anexo",
-    "An error occurred while uploading {fname}" : "Um erro ocorreu ao enviar {fname}",
-    "Reply" : "Responder",
-    "Send" : "Enviar",
-    "Sending …" : "Enviando...",
-    "Message sent!" : "Mensagem enviada!",
-    "Server error" : "Erro no servidor",
-    "An unknown error occurred" : "Ocorreu um erro desconhecido",
-    "Opening HTML drafts is not supported yet." : "A abertura de rascunhos do HTML ainda não é suportada.",
-    "No writable calendars found" : "Não foi encontrado nenhum calendário que possa ser editado",
-    "Error while importing the calendar event" : "Erro ao importar o evento de calendário",
-    "Error while downloading calendar event" : "Erro ao baixar evento de calendário",
-    "& others" : "& outros",
-    "Error while loading messages." : "Erro ao carregar mensagens.",
-    "Error while refreshing messages." : "Erro ao atualizar as mensagens.",
-    "Setting up your account" : "Configurando sua conta",
     "Inbox" : "Caixa de Entrada",
     "Sent" : "Enviados",
     "Drafts" : "Rascunhos",
@@ -66,69 +16,70 @@ OC.L10N.register(
     "Delete permanently" : "Excluir permanentemente",
     "IMAP web client" : "Cliente web IMAP",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Cliente de e-mail fácil de usar que se conecta ao seu servidor de e-mail via IMAP e SMTP.",
-    "Error loading message" : "Erro carregando mensagem",
-    "Settings" : "Configurações",
-    "Forwarding to %s" : "Encaminhando para %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Clique aqui se você não for redirecionado automaticamente em alguns segundos",
-    "Redirect" : "Redirecionar",
-    "The link leads to %s" : "O link leva a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Se você não quiser visitar essa página, você pode retornar ao <a href=\"%s\">e-mail</a>.",
-    "Continue to %s" : "Continue para %s",
-    "Delete account" : "Excluir conta",
-    "Try again" : "Tentar novamente",
-    "New message" : "Nova mensagem",
-    "Account Settings" : "Configurações de conta",
-    "Aliases" : "Apelido",
-    "Mail address" : "Endereço de e-mail",
-    "Display Name" : "Nome",
-    "Account" : "Conta",
-    "Toggle read" : "Alternar leitura",
-    "Delete" : "Excluir",
-    "Keyboard shortcuts" : "Atalhos de teclado",
-    "Speed up your Mail experience with these quick shortcuts." : "Acelere o uso de seu e-mail com estes atalhos rápidos.",
-    "Compose new message" : "Redigir nova mensagem",
-    "Newer message" : "Mensagem mais recente",
-    "Older message" : "Mensagem mais antiga",
-    "Toggle star" : "Alterna para estrela",
-    "Toggle unread" : "Alterna para não lido",
-    "Search" : "Pesquisar",
-    "Refresh" : "Atualizar",
-    "Connect your mail account" : "Conectar sua conta de e-mail",
     "Name" : "Nome",
     "Mail Address" : "Endereço de e-mail",
     "Password" : "Senha",
-    "Manual configuration" : "Configuração manual",
     "IMAP Host" : "Host IMAP",
-    "IMAP security" : "Segurança IMAP",
     "None" : "Não",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Porto IMAP",
     "IMAP User" : "Usuário IMAP",
     "IMAP Password" : "Senha IMAP",
     "SMTP Host" : "Host SMTP",
-    "SMTP security" : "Segurança SMTP",
     "SMTP Port" : "Porto SMTP",
     "SMTP User" : "Usuário SMTP",
     "SMTP Password" : "Senha SMTP",
     "Connect" : "Conectar",
+    "Add mail account" : "Adicionar conta de e-mail",
+    "Use Gravatar and favicon avatars" : "Usar Gravatar e avatares para favicon",
+    "Keyboard shortcuts" : "Atalhos de teclado",
     "from" : "de",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Observe que o e-mail veio de um endereço no-reply então sua resposta provavelmente não será lida.",
     "Subject" : "Assunto",
-    "Save all to Files" : "Salvar tudo para Arquivos",
-    "Add mail account" : "Adicionar conta de e-mail",
-    "Use Gravatar and favicon avatars" : "Usar Gravatar e avatares para favicon",
-    "No search results for" : "Nenhum resultado de busca para",
-    "The images have been blocked to protect your privacy." : "As imagens foram bloqueadas para proteger sua privacidade",
-    "Show images from this sender" : "Mostre imagens desse remetente",
-    "Forward" : "Encaminhar",
-    "No messages in this folder" : "Sem mensagens nesta pasta",
+    "Sending …" : "Enviando...",
+    "Message sent!" : "Mensagem enviada!",
+    "Send" : "Enviar",
     "Upload attachment" : "Enviar anexo",
     "Add attachment from Files" : "Adicionar anexo a partir de arquivos",
+    "Choose a file to add as attachment" : "Escolha um arquivo para adicionar como anexo",
+    "No messages in this folder" : "Sem mensagens nesta pasta",
+    "Delete" : "Excluir",
+    "Could not load your message" : "Não foi possível carregar sua mensagem",
     "Import into calendar" : "Importar para o calendário",
     "Download attachment" : "Baixar anexo",
-    "Save to Files" : "Salvar para arquivos"
+    "Save to Files" : "Salvar para arquivos",
+    "Choose a folder to store the attachment in" : "Escolha uma pasta para armazenar os anexos",
+    "Save all to Files" : "Salvar tudo para Arquivos",
+    "The images have been blocked to protect your privacy." : "As imagens foram bloqueadas para proteger sua privacidade",
+    "New message" : "Nova mensagem",
+    "Settings" : "Configurações",
+    "Speed up your Mail experience with these quick shortcuts." : "Acelere o uso de seu e-mail com estes atalhos rápidos.",
+    "Compose new message" : "Redigir nova mensagem",
+    "Newer message" : "Mensagem mais recente",
+    "Older message" : "Mensagem mais antiga",
+    "Toggle star" : "Alterna para estrela",
+    "Toggle unread" : "Alterna para não lido",
+    "Search" : "Pesquisar",
+    "Refresh" : "Atualizar",
+    "Connect your mail account" : "Conectar sua conta de e-mail",
+    "Show all folders" : "Mostrar todas as pastas",
+    "Collapse folders" : "Esconder as pastas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n nova mensagem \nde {from}","%n novas mensagens \nde {from}"],
+    "Nextcloud Mail" : "E-mail Nextcloud",
+    "All inboxes" : "Todas as caixas de entrada",
+    "Could not load {tag}{name}{endtag}" : "Não foi possível carregar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Ocorreu um problema ao carregar {tag}{name}{endtag}",
+    "Could not load the desired message" : "Não foi possível carregar a mensagem desejada",
+    "Could not load the message" : "Não foi possível carregar a mensagem",
+    "Error loading message" : "Erro carregando mensagem",
+    "Forwarding to %s" : "Encaminhando para %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Clique aqui se você não for redirecionado automaticamente em alguns segundos",
+    "Redirect" : "Redirecionar",
+    "The link leads to %s" : "O link leva a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Se você não quiser visitar essa página, você pode retornar ao <a href=\"%s\">e-mail</a>.",
+    "Continue to %s" : "Continue para %s"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json
index 8a9e938a0..da111b9e7 100644
--- a/l10n/pt_BR.json
+++ b/l10n/pt_BR.json
@@ -1,55 +1,5 @@
 { "translations": {
     "Mail" : "E-mail",
-    "Loading accounts" : "Carregando contas",
-    "Error while loading the accounts." : "Erro ao carregar as contas.",
-    "Can not load this folder." : "Não foi possível carregar esta pasta.",
-    "Searching for {query}" : "Pesquisando por {query}",
-    "Error while deleting message." : "Erro ao excluir mensagem.",
-    "Forwarded message" : "Mensagem encaminhada",
-    "Choose a folder to store the attachment in" : "Escolha uma pasta para armazenar os anexos",
-    "Attachments saved to Files." : "Anexo salvos em Arquivos.",
-    "Attachment saved to Files." : "Anexo salvo em Arquivos.",
-    "Error while saving attachments to Files." : "Erro ao salvar anexos em Arquivos.",
-    "Error while saving attachment to Files." : "Erro ao salvar anexos em Arquivos.",
-    "Message flag could not be set." : "Marcação da mensagem não pôde ser definida.",
-    "Could not move message." : "Não foi possível mover a mensagem.",
-    "Invalid account" : "Conta inválida",
-    "Invalid folder" : "Pasta inválida",
-    "Error while creating the account: " : "Erro ao criar a conta:",
-    "Unknown error" : "Erro desconhecido",
-    "Error while updating the account: " : "Erro ao atualizar a conta:",
-    "All inboxes" : "Todas as caixas de entrada",
-    "you" : "você",
-    "Send message to {email}" : "Enviar mensagem para {email}",
-    "Could not load {tag}{name}{endtag}" : "Não foi possível carregar {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Ocorreu um problema ao carregar {tag}{name}{endtag}",
-    "Could not load your message" : "Não foi possível carregar sua mensagem",
-    "Could not load the desired message" : "Não foi possível carregar a mensagem desejada",
-    "Could not load the message" : "Não foi possível carregar a mensagem",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n nova mensagem \nde {from}","%n novas mensagens \nde {from}"],
-    "Nextcloud Mail" : "E-mail Nextcloud",
-    "Save" : "Salvar",
-    "Saved" : "Salvo",
-    "Show all folders" : "Mostrar todas as pastas",
-    "Collapse folders" : "Esconder as pastas",
-    "Error while deleting account." : "Erro ao excluir a conta.",
-    "Choose a file to add as attachment" : "Escolha um arquivo para adicionar como anexo",
-    "An error occurred while uploading {fname}" : "Um erro ocorreu ao enviar {fname}",
-    "Reply" : "Responder",
-    "Send" : "Enviar",
-    "Sending …" : "Enviando...",
-    "Message sent!" : "Mensagem enviada!",
-    "Server error" : "Erro no servidor",
-    "An unknown error occurred" : "Ocorreu um erro desconhecido",
-    "Opening HTML drafts is not supported yet." : "A abertura de rascunhos do HTML ainda não é suportada.",
-    "No writable calendars found" : "Não foi encontrado nenhum calendário que possa ser editado",
-    "Error while importing the calendar event" : "Erro ao importar o evento de calendário",
-    "Error while downloading calendar event" : "Erro ao baixar evento de calendário",
-    "& others" : "& outros",
-    "Error while loading messages." : "Erro ao carregar mensagens.",
-    "Error while refreshing messages." : "Erro ao atualizar as mensagens.",
-    "Setting up your account" : "Configurando sua conta",
     "Inbox" : "Caixa de Entrada",
     "Sent" : "Enviados",
     "Drafts" : "Rascunhos",
@@ -64,69 +14,70 @@
     "Delete permanently" : "Excluir permanentemente",
     "IMAP web client" : "Cliente web IMAP",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Cliente de e-mail fácil de usar que se conecta ao seu servidor de e-mail via IMAP e SMTP.",
-    "Error loading message" : "Erro carregando mensagem",
-    "Settings" : "Configurações",
-    "Forwarding to %s" : "Encaminhando para %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Clique aqui se você não for redirecionado automaticamente em alguns segundos",
-    "Redirect" : "Redirecionar",
-    "The link leads to %s" : "O link leva a %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Se você não quiser visitar essa página, você pode retornar ao <a href=\"%s\">e-mail</a>.",
-    "Continue to %s" : "Continue para %s",
-    "Delete account" : "Excluir conta",
-    "Try again" : "Tentar novamente",
-    "New message" : "Nova mensagem",
-    "Account Settings" : "Configurações de conta",
-    "Aliases" : "Apelido",
-    "Mail address" : "Endereço de e-mail",
-    "Display Name" : "Nome",
-    "Account" : "Conta",
-    "Toggle read" : "Alternar leitura",
-    "Delete" : "Excluir",
-    "Keyboard shortcuts" : "Atalhos de teclado",
-    "Speed up your Mail experience with these quick shortcuts." : "Acelere o uso de seu e-mail com estes atalhos rápidos.",
-    "Compose new message" : "Redigir nova mensagem",
-    "Newer message" : "Mensagem mais recente",
-    "Older message" : "Mensagem mais antiga",
-    "Toggle star" : "Alterna para estrela",
-    "Toggle unread" : "Alterna para não lido",
-    "Search" : "Pesquisar",
-    "Refresh" : "Atualizar",
-    "Connect your mail account" : "Conectar sua conta de e-mail",
     "Name" : "Nome",
     "Mail Address" : "Endereço de e-mail",
     "Password" : "Senha",
-    "Manual configuration" : "Configuração manual",
     "IMAP Host" : "Host IMAP",
-    "IMAP security" : "Segurança IMAP",
     "None" : "Não",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Porto IMAP",
     "IMAP User" : "Usuário IMAP",
     "IMAP Password" : "Senha IMAP",
     "SMTP Host" : "Host SMTP",
-    "SMTP security" : "Segurança SMTP",
     "SMTP Port" : "Porto SMTP",
     "SMTP User" : "Usuário SMTP",
     "SMTP Password" : "Senha SMTP",
     "Connect" : "Conectar",
+    "Add mail account" : "Adicionar conta de e-mail",
+    "Use Gravatar and favicon avatars" : "Usar Gravatar e avatares para favicon",
+    "Keyboard shortcuts" : "Atalhos de teclado",
     "from" : "de",
     "to" : "para",
     "cc" : "cc",
     "bcc" : "cco",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Observe que o e-mail veio de um endereço no-reply então sua resposta provavelmente não será lida.",
     "Subject" : "Assunto",
-    "Save all to Files" : "Salvar tudo para Arquivos",
-    "Add mail account" : "Adicionar conta de e-mail",
-    "Use Gravatar and favicon avatars" : "Usar Gravatar e avatares para favicon",
-    "No search results for" : "Nenhum resultado de busca para",
-    "The images have been blocked to protect your privacy." : "As imagens foram bloqueadas para proteger sua privacidade",
-    "Show images from this sender" : "Mostre imagens desse remetente",
-    "Forward" : "Encaminhar",
-    "No messages in this folder" : "Sem mensagens nesta pasta",
+    "Sending …" : "Enviando...",
+    "Message sent!" : "Mensagem enviada!",
+    "Send" : "Enviar",
     "Upload attachment" : "Enviar anexo",
     "Add attachment from Files" : "Adicionar anexo a partir de arquivos",
+    "Choose a file to add as attachment" : "Escolha um arquivo para adicionar como anexo",
+    "No messages in this folder" : "Sem mensagens nesta pasta",
+    "Delete" : "Excluir",
+    "Could not load your message" : "Não foi possível carregar sua mensagem",
     "Import into calendar" : "Importar para o calendário",
     "Download attachment" : "Baixar anexo",
-    "Save to Files" : "Salvar para arquivos"
+    "Save to Files" : "Salvar para arquivos",
+    "Choose a folder to store the attachment in" : "Escolha uma pasta para armazenar os anexos",
+    "Save all to Files" : "Salvar tudo para Arquivos",
+    "The images have been blocked to protect your privacy." : "As imagens foram bloqueadas para proteger sua privacidade",
+    "New message" : "Nova mensagem",
+    "Settings" : "Configurações",
+    "Speed up your Mail experience with these quick shortcuts." : "Acelere o uso de seu e-mail com estes atalhos rápidos.",
+    "Compose new message" : "Redigir nova mensagem",
+    "Newer message" : "Mensagem mais recente",
+    "Older message" : "Mensagem mais antiga",
+    "Toggle star" : "Alterna para estrela",
+    "Toggle unread" : "Alterna para não lido",
+    "Search" : "Pesquisar",
+    "Refresh" : "Atualizar",
+    "Connect your mail account" : "Conectar sua conta de e-mail",
+    "Show all folders" : "Mostrar todas as pastas",
+    "Collapse folders" : "Esconder as pastas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n nova mensagem \nde {from}","%n novas mensagens \nde {from}"],
+    "Nextcloud Mail" : "E-mail Nextcloud",
+    "All inboxes" : "Todas as caixas de entrada",
+    "Could not load {tag}{name}{endtag}" : "Não foi possível carregar {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Ocorreu um problema ao carregar {tag}{name}{endtag}",
+    "Could not load the desired message" : "Não foi possível carregar a mensagem desejada",
+    "Could not load the message" : "Não foi possível carregar a mensagem",
+    "Error loading message" : "Erro carregando mensagem",
+    "Forwarding to %s" : "Encaminhando para %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Clique aqui se você não for redirecionado automaticamente em alguns segundos",
+    "Redirect" : "Redirecionar",
+    "The link leads to %s" : "O link leva a %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Se você não quiser visitar essa página, você pode retornar ao <a href=\"%s\">e-mail</a>.",
+    "Continue to %s" : "Continue para %s"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/l10n/pt_PT.js b/l10n/pt_PT.js
index 2fb7cf268..5d8a4c4ec 100644
--- a/l10n/pt_PT.js
+++ b/l10n/pt_PT.js
@@ -2,36 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Correio",
-    "Error while loading the accounts." : "Erro durante o carregamento das contas.",
-    "Error while deleting message." : "Erro durante a eliminação da mensagem.",
-    "Forwarded message" : "Mensagem reencaminhada",
-    "Choose a folder to store the attachment in" : "Escolha uma pasta para guardar o anexo",
-    "Attachments saved to Files." : "Anexos guardados em Ficheiros.",
-    "Attachment saved to Files." : "Anexo guardado para Ficheiros.",
-    "Error while saving attachments to Files." : "Erro enquanto guardava os anexos para Ficheiros.",
-    "Error while saving attachment to Files." : "Erro enquanto guardava o anexo para Ficheiros.",
-    "Invalid account" : "Conta inválida",
-    "Invalid folder" : "Pasta inválida",
-    "Unknown error" : "Erro desconhecido",
-    "All inboxes" : "Todas as caixas de entrada",
-    "you" : "Você",
-    "Send message to {email}" : "Enviar mensagem para {email}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "Show all folders" : "Mostrar todas as pastas",
-    "Collapse folders" : "Ocultar pastas",
-    "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",
-    "Opening HTML drafts is not supported yet." : "Ainda não é suportada a abertura de rascunhos em HTML.",
-    "No writable calendars found" : "Não foram encontrados calendários graváveis",
-    "Error while importing the calendar event" : "Erro durante a importação de evento de calendário",
-    "Error while downloading calendar event" : "Erro durante a transferência de evento de calendário",
-    "& others" : "e outros",
-    "Error while loading messages." : "Erro durante o carregamento das mensagens.",
     "Inbox" : "Caixa de Entrada",
     "Sent" : "Enviada",
     "Drafts" : "Rascunhos",
@@ -43,13 +13,22 @@ OC.L10N.register(
     "Auto detect failed. Please use manual mode." : "A deteção automática falhou. Por favor, utilize o modo manual",
     "Creating account failed: " : "Não foi possível criar a conta:",
     "Delete permanently" : "Eliminar permanentemente",
-    "Error loading message" : "Erro ao carregar a mensagem",
-    "Click here if you are not automatically redirected within the next few seconds." : "Clique aqui se não for automaticamente redireccionado dentro de segundos.",
-    "Redirect" : "Redirecionar",
-    "Continue to %s" : "Continuar para %s",
     "IMAP Host" : "Anfitrião de IMAP",
     "SMTP Host" : "Anfitrião de SMTP",
     "Connect" : "Ligar",
-    "Download attachment" : "Transferir anexo"
+    "Sending …" : "A enviar...",
+    "Message sent!" : "Mensagem enviada!",
+    "Send" : "Enviar",
+    "Choose a file to add as attachment" : "Escolha um ficheiro para adicionar como anexo",
+    "Download attachment" : "Transferir anexo",
+    "Choose a folder to store the attachment in" : "Escolha uma pasta para guardar o anexo",
+    "Show all folders" : "Mostrar todas as pastas",
+    "Collapse folders" : "Ocultar pastas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "All inboxes" : "Todas as caixas de entrada",
+    "Error loading message" : "Erro ao carregar a mensagem",
+    "Click here if you are not automatically redirected within the next few seconds." : "Clique aqui se não for automaticamente redireccionado dentro de segundos.",
+    "Redirect" : "Redirecionar",
+    "Continue to %s" : "Continuar para %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/pt_PT.json b/l10n/pt_PT.json
index c2406bdcf..59969c2d2 100644
--- a/l10n/pt_PT.json
+++ b/l10n/pt_PT.json
@@ -1,35 +1,5 @@
 { "translations": {
     "Mail" : "Correio",
-    "Error while loading the accounts." : "Erro durante o carregamento das contas.",
-    "Error while deleting message." : "Erro durante a eliminação da mensagem.",
-    "Forwarded message" : "Mensagem reencaminhada",
-    "Choose a folder to store the attachment in" : "Escolha uma pasta para guardar o anexo",
-    "Attachments saved to Files." : "Anexos guardados em Ficheiros.",
-    "Attachment saved to Files." : "Anexo guardado para Ficheiros.",
-    "Error while saving attachments to Files." : "Erro enquanto guardava os anexos para Ficheiros.",
-    "Error while saving attachment to Files." : "Erro enquanto guardava o anexo para Ficheiros.",
-    "Invalid account" : "Conta inválida",
-    "Invalid folder" : "Pasta inválida",
-    "Unknown error" : "Erro desconhecido",
-    "All inboxes" : "Todas as caixas de entrada",
-    "you" : "Você",
-    "Send message to {email}" : "Enviar mensagem para {email}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "Show all folders" : "Mostrar todas as pastas",
-    "Collapse folders" : "Ocultar pastas",
-    "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",
-    "Opening HTML drafts is not supported yet." : "Ainda não é suportada a abertura de rascunhos em HTML.",
-    "No writable calendars found" : "Não foram encontrados calendários graváveis",
-    "Error while importing the calendar event" : "Erro durante a importação de evento de calendário",
-    "Error while downloading calendar event" : "Erro durante a transferência de evento de calendário",
-    "& others" : "e outros",
-    "Error while loading messages." : "Erro durante o carregamento das mensagens.",
     "Inbox" : "Caixa de Entrada",
     "Sent" : "Enviada",
     "Drafts" : "Rascunhos",
@@ -41,13 +11,22 @@
     "Auto detect failed. Please use manual mode." : "A deteção automática falhou. Por favor, utilize o modo manual",
     "Creating account failed: " : "Não foi possível criar a conta:",
     "Delete permanently" : "Eliminar permanentemente",
-    "Error loading message" : "Erro ao carregar a mensagem",
-    "Click here if you are not automatically redirected within the next few seconds." : "Clique aqui se não for automaticamente redireccionado dentro de segundos.",
-    "Redirect" : "Redirecionar",
-    "Continue to %s" : "Continuar para %s",
     "IMAP Host" : "Anfitrião de IMAP",
     "SMTP Host" : "Anfitrião de SMTP",
     "Connect" : "Ligar",
-    "Download attachment" : "Transferir anexo"
+    "Sending …" : "A enviar...",
+    "Message sent!" : "Mensagem enviada!",
+    "Send" : "Enviar",
+    "Choose a file to add as attachment" : "Escolha um ficheiro para adicionar como anexo",
+    "Download attachment" : "Transferir anexo",
+    "Choose a folder to store the attachment in" : "Escolha uma pasta para guardar o anexo",
+    "Show all folders" : "Mostrar todas as pastas",
+    "Collapse folders" : "Ocultar pastas",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "All inboxes" : "Todas as caixas de entrada",
+    "Error loading message" : "Erro ao carregar a mensagem",
+    "Click here if you are not automatically redirected within the next few seconds." : "Clique aqui se não for automaticamente redireccionado dentro de segundos.",
+    "Redirect" : "Redirecionar",
+    "Continue to %s" : "Continuar para %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/ru.js b/l10n/ru.js
index 7d06ffa37..bd7a7af8c 100644
--- a/l10n/ru.js
+++ b/l10n/ru.js
@@ -2,56 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Почта",
-    "Loading accounts" : "Загрузка учётных записей",
-    "Error while loading the accounts." : "Ошибка загрузки учётных записей.",
-    "Can not load this folder." : "Невозможно загрузить эту папку.",
-    "Searching for {query}" : "Поиск {query}",
-    "Error while deleting message." : "Ошибка при удалении сообщения.",
-    "Forwarded message" : "Пересланное сообщение",
-    "Choose a folder to store the attachment in" : "Выберите каталог для хранения вложений",
-    "Attachments saved to Files." : "Вложения сохранены в файлах.",
-    "Attachment saved to Files." : "Вложение сохранено в файлах.",
-    "Error while saving attachments to Files." : "Ошибка сохранения вложений в файлах.",
-    "Error while saving attachment to Files." : "Ошибка сохранения вложения в файлах.",
-    "Message flag could not be set." : "Не удалось установить флажок сообщения.",
-    "Could not move message." : "Невозможно переместить сообщение.",
-    "Invalid account" : "Неверная учётная запись",
-    "Invalid folder" : "Неверная папка",
-    "Error while creating the account: " : "Ошибка создания учётной записи:",
-    "Unknown error" : "Неизвестная ошибка",
-    "Error while updating the account: " : "Ошибка обновления учётной записи:",
-    "All inboxes" : "Все входящие",
-    "you" : "вы",
-    "Send message to {email}" : "Отправить сообщения на {email}",
-    "Could not load {tag}{name}{endtag}" : "Не удалось загрузить {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Проблема при загрузке {tag}{name}{endtag}",
-    "Could not load your message" : "Ошибка получения вашего сообщения",
-    "Could not load the desired message" : "Ошибка получения указанного сообщения",
-    "Could not load the message" : "Ошибка получения этого сообщения",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n новое сообщение \nот {from}","%n новых сообщения \nот {from}","%n новых сообщений \nот {from}","%n новых сообщений \nот {from}"],
-    "Nextcloud Mail" : "Почта Nextcloud",
-    "Save" : "Сохранить",
-    "Saved" : "Сохранено",
-    "Show all folders" : "Показать все папки",
-    "Collapse folders" : "Свернуть папки",
-    "Error while deleting account." : "Ошибка удаления учётной записи.",
-    "Choose a file to add as attachment" : "Выбрать файл для вложения",
-    "An error occurred while uploading {fname}" : "При загрузке {fname} произошла ошибка",
-    "Reply" : "Ответить",
-    "Send" : "Отправить",
-    "Sending …" : "Отправка…",
-    "Message sent!" : "Сообщение отправлено!",
-    "Server error" : "Ошибка сервера",
-    "An unknown error occurred" : "Произошла неизвестная ошибка",
-    "Opening HTML drafts is not supported yet." : "Работа с черновиками HTML пока не поддерживается.",
-    "No writable calendars found" : "Календари доступные для записи не найдены",
-    "Error while importing the calendar event" : "Ошибка при импорте календарного события",
-    "Error while downloading calendar event" : "Ошибка при скачивании календарного события",
-    "& others" : "и другие",
-    "Error while loading messages." : "Ошибка пр загрузке изображений.",
-    "Error while refreshing messages." : "Ошибка обновления списка писем.",
-    "Setting up your account" : "Настраивается учётная запись",
     "Inbox" : "Входящие",
     "Sent" : "Отправленные",
     "Drafts" : "Черновики",
@@ -66,69 +16,70 @@ OC.L10N.register(
     "Delete permanently" : "Удалить окончательно",
     "IMAP web client" : "IMAP веб клиент",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Простой в использовании почтовый клиент, который подключается к вашему почтовому серверу через протоколы IMAP и SMTP.",
-    "Error loading message" : "Ошибка загрузки сообщения",
-    "Settings" : "Настройки",
-    "Forwarding to %s" : "Пересылка на %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Нажмите здесь, если не запустилось автоматическое перенаправление в течение нескольких секунд.",
-    "Redirect" : "Перенаправление",
-    "The link leads to %s" : "Эта ссылка ведёт на %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Если вы не хотите посещать эту страницу, вы можете вернуться в <a href=\"%s\">Почту</a>.",
-    "Continue to %s" : "Продолжать %s",
-    "Delete account" : "Удалить учётную запись",
-    "Try again" : "Попытаться снова",
-    "New message" : "Создать сообщение",
-    "Account Settings" : "Настройки учётной записи",
-    "Aliases" : "Псевдонимы",
-    "Mail address" : "Почтовый адрес",
-    "Display Name" : "Отображаемое имя",
-    "Account" : "Учётная запись",
-    "Toggle read" : "Переключить отметку прочтения",
-    "Delete" : "Удалить",
-    "Keyboard shortcuts" : "Комбинации клавиш",
-    "Speed up your Mail experience with these quick shortcuts." : "Ускорьте работу с почтой использованием этих комбинаций клавиш.",
-    "Compose new message" : "Создать новое сообщение",
-    "Newer message" : "Самое новое сообщение",
-    "Older message" : "Самое старое сообщение",
-    "Toggle star" : "Переключить отметку звёздочкой",
-    "Toggle unread" : "Переключить отметку прочтения",
-    "Search" : "Поиск",
-    "Refresh" : "Обновить",
-    "Connect your mail account" : "Подключить почтовый аккаунт",
     "Name" : "Имя",
     "Mail Address" : "E-mail адрес",
     "Password" : "Пароль",
-    "Manual configuration" : "Ручная настройка",
     "IMAP Host" : "IMAP-сервер",
-    "IMAP security" : "Безопасность IMAP",
     "None" : "Отсутствует",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "порт IMAP",
     "IMAP User" : "IMAP-пользователь",
     "IMAP Password" : "пароль IMAP",
     "SMTP Host" : "сервер SMTP",
-    "SMTP security" : "безопасность SMTP",
     "SMTP Port" : "порт SMTP",
     "SMTP User" : "пользователь SMTP",
     "SMTP Password" : "пароль SMTP",
     "Connect" : "Соединить",
+    "Add mail account" : "Добавить учётную запись",
+    "Use Gravatar and favicon avatars" : "Использовать значки Gravatar и favicon",
+    "Keyboard shortcuts" : "Комбинации клавиш",
     "from" : "от",
     "to" : "кому",
     "cc" : "копия",
     "bcc" : "скрытая копия",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Предупреждение: сообщение было отправлено с адреса, не предусматривающего получения ответов. Ваше сообщение, направленное на этот адрес, возможно никогда не будет прочитано.",
     "Subject" : "Тема",
-    "Save all to Files" : "Сохранить все в файлы",
-    "Add mail account" : "Добавить учётную запись",
-    "Use Gravatar and favicon avatars" : "Использовать значки Gravatar и favicon",
-    "No search results for" : "Ничего не найдено для",
-    "The images have been blocked to protect your privacy." : "Изображения были заблокированы для защиты вашей частной жизни.",
-    "Show images from this sender" : "Показать изображения от этого отправителя",
-    "Forward" : "Переслать",
-    "No messages in this folder" : "В этой папке нет сообщений",
+    "Sending …" : "Отправка…",
+    "Message sent!" : "Сообщение отправлено!",
+    "Send" : "Отправить",
     "Upload attachment" : "Загрузить вложение",
     "Add attachment from Files" : "Выбрать вложение из файлов",
+    "Choose a file to add as attachment" : "Выбрать файл для вложения",
+    "No messages in this folder" : "В этой папке нет сообщений",
+    "Delete" : "Удалить",
+    "Could not load your message" : "Ошибка получения вашего сообщения",
     "Import into calendar" : "Импортировать в календарь",
     "Download attachment" : "Скачать вложение",
-    "Save to Files" : "Сохранить в файлы"
+    "Save to Files" : "Сохранить в файлы",
+    "Choose a folder to store the attachment in" : "Выберите каталог для хранения вложений",
+    "Save all to Files" : "Сохранить все в файлы",
+    "The images have been blocked to protect your privacy." : "Изображения были заблокированы для защиты вашей частной жизни.",
+    "New message" : "Создать сообщение",
+    "Settings" : "Настройки",
+    "Speed up your Mail experience with these quick shortcuts." : "Ускорьте работу с почтой использованием этих комбинаций клавиш.",
+    "Compose new message" : "Создать новое сообщение",
+    "Newer message" : "Самое новое сообщение",
+    "Older message" : "Самое старое сообщение",
+    "Toggle star" : "Переключить отметку звёздочкой",
+    "Toggle unread" : "Переключить отметку прочтения",
+    "Search" : "Поиск",
+    "Refresh" : "Обновить",
+    "Connect your mail account" : "Подключить почтовый аккаунт",
+    "Show all folders" : "Показать все папки",
+    "Collapse folders" : "Свернуть папки",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n новое сообщение \nот {from}","%n новых сообщения \nот {from}","%n новых сообщений \nот {from}","%n новых сообщений \nот {from}"],
+    "Nextcloud Mail" : "Почта Nextcloud",
+    "All inboxes" : "Все входящие",
+    "Could not load {tag}{name}{endtag}" : "Не удалось загрузить {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Проблема при загрузке {tag}{name}{endtag}",
+    "Could not load the desired message" : "Ошибка получения указанного сообщения",
+    "Could not load the message" : "Ошибка получения этого сообщения",
+    "Error loading message" : "Ошибка загрузки сообщения",
+    "Forwarding to %s" : "Пересылка на %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Нажмите здесь, если не запустилось автоматическое перенаправление в течение нескольких секунд.",
+    "Redirect" : "Перенаправление",
+    "The link leads to %s" : "Эта ссылка ведёт на %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Если вы не хотите посещать эту страницу, вы можете вернуться в <a href=\"%s\">Почту</a>.",
+    "Continue to %s" : "Продолжать %s"
 },
 "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);");
diff --git a/l10n/ru.json b/l10n/ru.json
index e81826fbc..943bb7ee6 100644
--- a/l10n/ru.json
+++ b/l10n/ru.json
@@ -1,55 +1,5 @@
 { "translations": {
     "Mail" : "Почта",
-    "Loading accounts" : "Загрузка учётных записей",
-    "Error while loading the accounts." : "Ошибка загрузки учётных записей.",
-    "Can not load this folder." : "Невозможно загрузить эту папку.",
-    "Searching for {query}" : "Поиск {query}",
-    "Error while deleting message." : "Ошибка при удалении сообщения.",
-    "Forwarded message" : "Пересланное сообщение",
-    "Choose a folder to store the attachment in" : "Выберите каталог для хранения вложений",
-    "Attachments saved to Files." : "Вложения сохранены в файлах.",
-    "Attachment saved to Files." : "Вложение сохранено в файлах.",
-    "Error while saving attachments to Files." : "Ошибка сохранения вложений в файлах.",
-    "Error while saving attachment to Files." : "Ошибка сохранения вложения в файлах.",
-    "Message flag could not be set." : "Не удалось установить флажок сообщения.",
-    "Could not move message." : "Невозможно переместить сообщение.",
-    "Invalid account" : "Неверная учётная запись",
-    "Invalid folder" : "Неверная папка",
-    "Error while creating the account: " : "Ошибка создания учётной записи:",
-    "Unknown error" : "Неизвестная ошибка",
-    "Error while updating the account: " : "Ошибка обновления учётной записи:",
-    "All inboxes" : "Все входящие",
-    "you" : "вы",
-    "Send message to {email}" : "Отправить сообщения на {email}",
-    "Could not load {tag}{name}{endtag}" : "Не удалось загрузить {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Проблема при загрузке {tag}{name}{endtag}",
-    "Could not load your message" : "Ошибка получения вашего сообщения",
-    "Could not load the desired message" : "Ошибка получения указанного сообщения",
-    "Could not load the message" : "Ошибка получения этого сообщения",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n новое сообщение \nот {from}","%n новых сообщения \nот {from}","%n новых сообщений \nот {from}","%n новых сообщений \nот {from}"],
-    "Nextcloud Mail" : "Почта Nextcloud",
-    "Save" : "Сохранить",
-    "Saved" : "Сохранено",
-    "Show all folders" : "Показать все папки",
-    "Collapse folders" : "Свернуть папки",
-    "Error while deleting account." : "Ошибка удаления учётной записи.",
-    "Choose a file to add as attachment" : "Выбрать файл для вложения",
-    "An error occurred while uploading {fname}" : "При загрузке {fname} произошла ошибка",
-    "Reply" : "Ответить",
-    "Send" : "Отправить",
-    "Sending …" : "Отправка…",
-    "Message sent!" : "Сообщение отправлено!",
-    "Server error" : "Ошибка сервера",
-    "An unknown error occurred" : "Произошла неизвестная ошибка",
-    "Opening HTML drafts is not supported yet." : "Работа с черновиками HTML пока не поддерживается.",
-    "No writable calendars found" : "Календари доступные для записи не найдены",
-    "Error while importing the calendar event" : "Ошибка при импорте календарного события",
-    "Error while downloading calendar event" : "Ошибка при скачивании календарного события",
-    "& others" : "и другие",
-    "Error while loading messages." : "Ошибка пр загрузке изображений.",
-    "Error while refreshing messages." : "Ошибка обновления списка писем.",
-    "Setting up your account" : "Настраивается учётная запись",
     "Inbox" : "Входящие",
     "Sent" : "Отправленные",
     "Drafts" : "Черновики",
@@ -64,69 +14,70 @@
     "Delete permanently" : "Удалить окончательно",
     "IMAP web client" : "IMAP веб клиент",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Простой в использовании почтовый клиент, который подключается к вашему почтовому серверу через протоколы IMAP и SMTP.",
-    "Error loading message" : "Ошибка загрузки сообщения",
-    "Settings" : "Настройки",
-    "Forwarding to %s" : "Пересылка на %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Нажмите здесь, если не запустилось автоматическое перенаправление в течение нескольких секунд.",
-    "Redirect" : "Перенаправление",
-    "The link leads to %s" : "Эта ссылка ведёт на %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Если вы не хотите посещать эту страницу, вы можете вернуться в <a href=\"%s\">Почту</a>.",
-    "Continue to %s" : "Продолжать %s",
-    "Delete account" : "Удалить учётную запись",
-    "Try again" : "Попытаться снова",
-    "New message" : "Создать сообщение",
-    "Account Settings" : "Настройки учётной записи",
-    "Aliases" : "Псевдонимы",
-    "Mail address" : "Почтовый адрес",
-    "Display Name" : "Отображаемое имя",
-    "Account" : "Учётная запись",
-    "Toggle read" : "Переключить отметку прочтения",
-    "Delete" : "Удалить",
-    "Keyboard shortcuts" : "Комбинации клавиш",
-    "Speed up your Mail experience with these quick shortcuts." : "Ускорьте работу с почтой использованием этих комбинаций клавиш.",
-    "Compose new message" : "Создать новое сообщение",
-    "Newer message" : "Самое новое сообщение",
-    "Older message" : "Самое старое сообщение",
-    "Toggle star" : "Переключить отметку звёздочкой",
-    "Toggle unread" : "Переключить отметку прочтения",
-    "Search" : "Поиск",
-    "Refresh" : "Обновить",
-    "Connect your mail account" : "Подключить почтовый аккаунт",
     "Name" : "Имя",
     "Mail Address" : "E-mail адрес",
     "Password" : "Пароль",
-    "Manual configuration" : "Ручная настройка",
     "IMAP Host" : "IMAP-сервер",
-    "IMAP security" : "Безопасность IMAP",
     "None" : "Отсутствует",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "порт IMAP",
     "IMAP User" : "IMAP-пользователь",
     "IMAP Password" : "пароль IMAP",
     "SMTP Host" : "сервер SMTP",
-    "SMTP security" : "безопасность SMTP",
     "SMTP Port" : "порт SMTP",
     "SMTP User" : "пользователь SMTP",
     "SMTP Password" : "пароль SMTP",
     "Connect" : "Соединить",
+    "Add mail account" : "Добавить учётную запись",
+    "Use Gravatar and favicon avatars" : "Использовать значки Gravatar и favicon",
+    "Keyboard shortcuts" : "Комбинации клавиш",
     "from" : "от",
     "to" : "кому",
     "cc" : "копия",
     "bcc" : "скрытая копия",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Предупреждение: сообщение было отправлено с адреса, не предусматривающего получения ответов. Ваше сообщение, направленное на этот адрес, возможно никогда не будет прочитано.",
     "Subject" : "Тема",
-    "Save all to Files" : "Сохранить все в файлы",
-    "Add mail account" : "Добавить учётную запись",
-    "Use Gravatar and favicon avatars" : "Использовать значки Gravatar и favicon",
-    "No search results for" : "Ничего не найдено для",
-    "The images have been blocked to protect your privacy." : "Изображения были заблокированы для защиты вашей частной жизни.",
-    "Show images from this sender" : "Показать изображения от этого отправителя",
-    "Forward" : "Переслать",
-    "No messages in this folder" : "В этой папке нет сообщений",
+    "Sending …" : "Отправка…",
+    "Message sent!" : "Сообщение отправлено!",
+    "Send" : "Отправить",
     "Upload attachment" : "Загрузить вложение",
     "Add attachment from Files" : "Выбрать вложение из файлов",
+    "Choose a file to add as attachment" : "Выбрать файл для вложения",
+    "No messages in this folder" : "В этой папке нет сообщений",
+    "Delete" : "Удалить",
+    "Could not load your message" : "Ошибка получения вашего сообщения",
     "Import into calendar" : "Импортировать в календарь",
     "Download attachment" : "Скачать вложение",
-    "Save to Files" : "Сохранить в файлы"
+    "Save to Files" : "Сохранить в файлы",
+    "Choose a folder to store the attachment in" : "Выберите каталог для хранения вложений",
+    "Save all to Files" : "Сохранить все в файлы",
+    "The images have been blocked to protect your privacy." : "Изображения были заблокированы для защиты вашей частной жизни.",
+    "New message" : "Создать сообщение",
+    "Settings" : "Настройки",
+    "Speed up your Mail experience with these quick shortcuts." : "Ускорьте работу с почтой использованием этих комбинаций клавиш.",
+    "Compose new message" : "Создать новое сообщение",
+    "Newer message" : "Самое новое сообщение",
+    "Older message" : "Самое старое сообщение",
+    "Toggle star" : "Переключить отметку звёздочкой",
+    "Toggle unread" : "Переключить отметку прочтения",
+    "Search" : "Поиск",
+    "Refresh" : "Обновить",
+    "Connect your mail account" : "Подключить почтовый аккаунт",
+    "Show all folders" : "Показать все папки",
+    "Collapse folders" : "Свернуть папки",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n новое сообщение \nот {from}","%n новых сообщения \nот {from}","%n новых сообщений \nот {from}","%n новых сообщений \nот {from}"],
+    "Nextcloud Mail" : "Почта Nextcloud",
+    "All inboxes" : "Все входящие",
+    "Could not load {tag}{name}{endtag}" : "Не удалось загрузить {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Проблема при загрузке {tag}{name}{endtag}",
+    "Could not load the desired message" : "Ошибка получения указанного сообщения",
+    "Could not load the message" : "Ошибка получения этого сообщения",
+    "Error loading message" : "Ошибка загрузки сообщения",
+    "Forwarding to %s" : "Пересылка на %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Нажмите здесь, если не запустилось автоматическое перенаправление в течение нескольких секунд.",
+    "Redirect" : "Перенаправление",
+    "The link leads to %s" : "Эта ссылка ведёт на %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Если вы не хотите посещать эту страницу, вы можете вернуться в <a href=\"%s\">Почту</a>.",
+    "Continue to %s" : "Продолжать %s"
 },"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"
 }
\ No newline at end of file
diff --git a/l10n/sk.js b/l10n/sk.js
index 558f5fa7f..86f6ff160 100644
--- a/l10n/sk.js
+++ b/l10n/sk.js
@@ -2,56 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Pošta",
-    "Loading accounts" : "Nahrávanie účtov",
-    "Error while loading the accounts." : "Chyba pri načítaní účtov.",
-    "Can not load this folder." : "Nie je možné načítať túto zložku.",
-    "Searching for {query}" : "Vyhľadávam {query}",
-    "Error while deleting message." : "Chyba pri mazaní správy.",
-    "Forwarded message" : "Preposlané správy",
-    "Choose a folder to store the attachment in" : "Vyberte priečinok pre uloženie prílohy",
-    "Attachments saved to Files." : "Prílohy sú uložené do Súborov.",
-    "Attachment saved to Files." : "Príloha je uložená do Súborov.",
-    "Error while saving attachments to Files." : "Chyba pri ukladaní príloh do Súborov.",
-    "Error while saving attachment to Files." : "Chyba pri ukladaní prílohy do Súborov.",
-    "Message flag could not be set." : "Nepodarilo sa nastaviť príznak správy.",
-    "Could not move message." : "Správu nebolo možné presunúť.",
-    "Invalid account" : "Neplatný účet",
-    "Invalid folder" : "Neplatný priečinok",
-    "Error while creating the account: " : "Nastala chyba počas vytvárania účtu:",
-    "Unknown error" : "Neznáma chyba",
-    "Error while updating the account: " : "Chyba pri aktualizácii účtu:",
-    "All inboxes" : "Všetky doručené",
-    "you" : "vy",
-    "Send message to {email}" : "Odoslať správu na {email}",
-    "Could not load {tag}{name}{endtag}" : "Nedá sa načítať {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Vyskytol sa problém pri načítaní {tag}{name}{endtag}",
-    "Could not load your message" : "Nepodarilo sa načítať vašu správu",
-    "Could not load the desired message" : "Nepodarilo sa načítať požadovanú správu",
-    "Could not load the message" : "Správu sa nepodarilo sa načítať",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n nová správa\nod {from}","%n nové správy\nod {from}","%n nových správ\nod {from}","%n nových správ\nod {from}"],
-    "Nextcloud Mail" : "Nextcloud Mail",
-    "Save" : "Uložiť",
-    "Saved" : "Uložené",
-    "Show all folders" : "Zobraziť všetky priečinky",
-    "Collapse folders" : "Zvinúť priečinky",
-    "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.",
-    "An error occurred while uploading {fname}" : "Počas nahrávania {fname} sa vyskytla chyba",
-    "Reply" : "Odpoveď",
-    "Send" : "Odoslať",
-    "Sending …" : "Odosielam ...",
-    "Message sent!" : "Správa odoslaná!",
-    "Server error" : "Chyba servera",
-    "An unknown error occurred" : "Nastala neznáma chyba",
-    "Opening HTML drafts is not supported yet." : "Otváranie HTML šablón ešte nie je podporované.",
-    "No writable calendars found" : "Nenašli sa žiadne kalendáre s právom zápisu",
-    "Error while importing the calendar event" : "Nastala chyba pri importovaní udalosti kalendára",
-    "Error while downloading calendar event" : "Nastala chyba pri sťahovaní udalosti kalendára",
-    "& others" : "& iné",
-    "Error while loading messages." : "Chyba počas načítavania správ.",
-    "Error while refreshing messages." : "Chyba počas obnovovania správ.",
-    "Setting up your account" : "Nastavenie vášho účtu",
     "Inbox" : "Doručené",
     "Sent" : "Odoslané",
     "Drafts" : "Koncept",
@@ -66,68 +16,70 @@ OC.L10N.register(
     "Delete permanently" : "Zmazať  natrvalo",
     "IMAP web client" : "IMAP web klient",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "E-mailový klient, jednoduchý na používanie, ktorý sa pripája k vášmu poskytovateľovi e-mailov pomocou IMAP a SMTP.",
-    "Error loading message" : "Chyba načítavania správy",
-    "Settings" : "Nastavenia",
-    "Forwarding to %s" : "Preposielam na %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Kliknite sem, ak nebudete automaticky presmerovaní v priebehu pár sekúnd.",
-    "Redirect" : "Presmerovať",
-    "The link leads to %s" : "Odkaz smeruje na %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Ak si neprajete navštíviť stránku, možete sa vátiť na <a href=\"%s\">Mail</a>.",
-    "Continue to %s" : "Pokračovať na %s",
-    "Delete account" : "Zmazať účet",
-    "Try again" : "Skúste znovu",
-    "New message" : "Nová správa",
-    "Account Settings" : "Nastavenia účtu",
-    "Aliases" : "Aliasy",
-    "Mail address" : "Emailová adresa",
-    "Display Name" : "Zobrazované meno",
-    "Account" : "Účet",
-    "Delete" : "Zmazať",
-    "Keyboard shortcuts" : "Klávesové skratky",
-    "Speed up your Mail experience with these quick shortcuts." : "Zefektívnite svoju prácu s Mailom pomocou týchto rýchlych skratiek.",
-    "Compose new message" : "Nová správa",
-    "Newer message" : "Novšia správa",
-    "Older message" : "Staršia správa",
-    "Toggle star" : "Prepnúť hviezdičku",
-    "Toggle unread" : "Prepnúť neprečítané",
-    "Search" : "Hľadať",
-    "Refresh" : "Obnoviť",
-    "Connect your mail account" : "Pripojiť Váš mailový účet",
     "Name" : "Meno",
     "Mail Address" : "Emailová adresa",
     "Password" : "Heslo",
-    "Manual configuration" : "Manuálne nastavenia",
     "IMAP Host" : "IMAP hostiteľ",
-    "IMAP security" : "IMAP zabezpečenie",
     "None" : "Žiadny",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP číslo portu",
     "IMAP User" : "IMAP používateľ",
     "IMAP Password" : "IMAP heslo",
     "SMTP Host" : "SMTP hostiteľ",
-    "SMTP security" : "SMTP zabezpečenie",
     "SMTP Port" : "SMTP číslo portu",
     "SMTP User" : "SMTP používateľ",
     "SMTP Password" : "SMTP heslo",
     "Connect" : "Pripojiť",
+    "Add mail account" : "Pridať mailový účet",
+    "Use Gravatar and favicon avatars" : "Použiť Gravatar a favicon avatary",
+    "Keyboard shortcuts" : "Klávesové skratky",
     "from" : "od",
     "to" : "komu",
     "cc" : "kópia",
     "bcc" : "skrytá kópia",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Všimnite si, že mail prišiel z adresy noreply (neodpovedať) takže vašu odpoveď si pravdepodobne nikto neprečíta.",
     "Subject" : "Predmet",
-    "Save all to Files" : "Uložiť všetko do Súborov",
-    "Add mail account" : "Pridať mailový účet",
-    "Use Gravatar and favicon avatars" : "Použiť Gravatar a favicon avatary",
-    "No search results for" : "Žiadne výsledky vyhľadávania pre",
-    "The images have been blocked to protect your privacy." : "Obrázky boli zablokované pre ochranu Vášho súkromia.",
-    "Show images from this sender" : "Zobraziť obrázky od tohoto odosielateľa",
-    "Forward" : "Preposlať",
-    "No messages in this folder" : "Žiadne správy v tomto priečinku!",
+    "Sending …" : "Odosielam ...",
+    "Message sent!" : "Správa odoslaná!",
+    "Send" : "Odoslať",
     "Upload attachment" : "Nahrať prílohu",
     "Add attachment from Files" : "Pridať prílohu zo Súborov",
+    "Choose a file to add as attachment" : "Zvoľte súbor, ktorý chcete pridať ako prílohu.",
+    "No messages in this folder" : "Žiadne správy v tomto priečinku!",
+    "Delete" : "Zmazať",
+    "Could not load your message" : "Nepodarilo sa načítať vašu správu",
     "Import into calendar" : "Importovať do kalendára",
     "Download attachment" : "Stiahnuť prílohu",
-    "Save to Files" : "Uložiť do Súborov"
+    "Save to Files" : "Uložiť do Súborov",
+    "Choose a folder to store the attachment in" : "Vyberte priečinok pre uloženie prílohy",
+    "Save all to Files" : "Uložiť všetko do Súborov",
+    "The images have been blocked to protect your privacy." : "Obrázky boli zablokované pre ochranu Vášho súkromia.",
+    "New message" : "Nová správa",
+    "Settings" : "Nastavenia",
+    "Speed up your Mail experience with these quick shortcuts." : "Zefektívnite svoju prácu s Mailom pomocou týchto rýchlych skratiek.",
+    "Compose new message" : "Nová správa",
+    "Newer message" : "Novšia správa",
+    "Older message" : "Staršia správa",
+    "Toggle star" : "Prepnúť hviezdičku",
+    "Toggle unread" : "Prepnúť neprečítané",
+    "Search" : "Hľadať",
+    "Refresh" : "Obnoviť",
+    "Connect your mail account" : "Pripojiť Váš mailový účet",
+    "Show all folders" : "Zobraziť všetky priečinky",
+    "Collapse folders" : "Zvinúť priečinky",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n nová správa\nod {from}","%n nové správy\nod {from}","%n nových správ\nod {from}","%n nových správ\nod {from}"],
+    "Nextcloud Mail" : "Nextcloud Mail",
+    "All inboxes" : "Všetky doručené",
+    "Could not load {tag}{name}{endtag}" : "Nedá sa načítať {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Vyskytol sa problém pri načítaní {tag}{name}{endtag}",
+    "Could not load the desired message" : "Nepodarilo sa načítať požadovanú správu",
+    "Could not load the message" : "Správu sa nepodarilo sa načítať",
+    "Error loading message" : "Chyba načítavania správy",
+    "Forwarding to %s" : "Preposielam na %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Kliknite sem, ak nebudete automaticky presmerovaní v priebehu pár sekúnd.",
+    "Redirect" : "Presmerovať",
+    "The link leads to %s" : "Odkaz smeruje na %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Ak si neprajete navštíviť stránku, možete sa vátiť na <a href=\"%s\">Mail</a>.",
+    "Continue to %s" : "Pokračovať na %s"
 },
 "nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);");
diff --git a/l10n/sk.json b/l10n/sk.json
index f02810b26..3862ca6e7 100644
--- a/l10n/sk.json
+++ b/l10n/sk.json
@@ -1,55 +1,5 @@
 { "translations": {
     "Mail" : "Pošta",
-    "Loading accounts" : "Nahrávanie účtov",
-    "Error while loading the accounts." : "Chyba pri načítaní účtov.",
-    "Can not load this folder." : "Nie je možné načítať túto zložku.",
-    "Searching for {query}" : "Vyhľadávam {query}",
-    "Error while deleting message." : "Chyba pri mazaní správy.",
-    "Forwarded message" : "Preposlané správy",
-    "Choose a folder to store the attachment in" : "Vyberte priečinok pre uloženie prílohy",
-    "Attachments saved to Files." : "Prílohy sú uložené do Súborov.",
-    "Attachment saved to Files." : "Príloha je uložená do Súborov.",
-    "Error while saving attachments to Files." : "Chyba pri ukladaní príloh do Súborov.",
-    "Error while saving attachment to Files." : "Chyba pri ukladaní prílohy do Súborov.",
-    "Message flag could not be set." : "Nepodarilo sa nastaviť príznak správy.",
-    "Could not move message." : "Správu nebolo možné presunúť.",
-    "Invalid account" : "Neplatný účet",
-    "Invalid folder" : "Neplatný priečinok",
-    "Error while creating the account: " : "Nastala chyba počas vytvárania účtu:",
-    "Unknown error" : "Neznáma chyba",
-    "Error while updating the account: " : "Chyba pri aktualizácii účtu:",
-    "All inboxes" : "Všetky doručené",
-    "you" : "vy",
-    "Send message to {email}" : "Odoslať správu na {email}",
-    "Could not load {tag}{name}{endtag}" : "Nedá sa načítať {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Vyskytol sa problém pri načítaní {tag}{name}{endtag}",
-    "Could not load your message" : "Nepodarilo sa načítať vašu správu",
-    "Could not load the desired message" : "Nepodarilo sa načítať požadovanú správu",
-    "Could not load the message" : "Správu sa nepodarilo sa načítať",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n nová správa\nod {from}","%n nové správy\nod {from}","%n nových správ\nod {from}","%n nových správ\nod {from}"],
-    "Nextcloud Mail" : "Nextcloud Mail",
-    "Save" : "Uložiť",
-    "Saved" : "Uložené",
-    "Show all folders" : "Zobraziť všetky priečinky",
-    "Collapse folders" : "Zvinúť priečinky",
-    "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.",
-    "An error occurred while uploading {fname}" : "Počas nahrávania {fname} sa vyskytla chyba",
-    "Reply" : "Odpoveď",
-    "Send" : "Odoslať",
-    "Sending …" : "Odosielam ...",
-    "Message sent!" : "Správa odoslaná!",
-    "Server error" : "Chyba servera",
-    "An unknown error occurred" : "Nastala neznáma chyba",
-    "Opening HTML drafts is not supported yet." : "Otváranie HTML šablón ešte nie je podporované.",
-    "No writable calendars found" : "Nenašli sa žiadne kalendáre s právom zápisu",
-    "Error while importing the calendar event" : "Nastala chyba pri importovaní udalosti kalendára",
-    "Error while downloading calendar event" : "Nastala chyba pri sťahovaní udalosti kalendára",
-    "& others" : "& iné",
-    "Error while loading messages." : "Chyba počas načítavania správ.",
-    "Error while refreshing messages." : "Chyba počas obnovovania správ.",
-    "Setting up your account" : "Nastavenie vášho účtu",
     "Inbox" : "Doručené",
     "Sent" : "Odoslané",
     "Drafts" : "Koncept",
@@ -64,68 +14,70 @@
     "Delete permanently" : "Zmazať  natrvalo",
     "IMAP web client" : "IMAP web klient",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "E-mailový klient, jednoduchý na používanie, ktorý sa pripája k vášmu poskytovateľovi e-mailov pomocou IMAP a SMTP.",
-    "Error loading message" : "Chyba načítavania správy",
-    "Settings" : "Nastavenia",
-    "Forwarding to %s" : "Preposielam na %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Kliknite sem, ak nebudete automaticky presmerovaní v priebehu pár sekúnd.",
-    "Redirect" : "Presmerovať",
-    "The link leads to %s" : "Odkaz smeruje na %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Ak si neprajete navštíviť stránku, možete sa vátiť na <a href=\"%s\">Mail</a>.",
-    "Continue to %s" : "Pokračovať na %s",
-    "Delete account" : "Zmazať účet",
-    "Try again" : "Skúste znovu",
-    "New message" : "Nová správa",
-    "Account Settings" : "Nastavenia účtu",
-    "Aliases" : "Aliasy",
-    "Mail address" : "Emailová adresa",
-    "Display Name" : "Zobrazované meno",
-    "Account" : "Účet",
-    "Delete" : "Zmazať",
-    "Keyboard shortcuts" : "Klávesové skratky",
-    "Speed up your Mail experience with these quick shortcuts." : "Zefektívnite svoju prácu s Mailom pomocou týchto rýchlych skratiek.",
-    "Compose new message" : "Nová správa",
-    "Newer message" : "Novšia správa",
-    "Older message" : "Staršia správa",
-    "Toggle star" : "Prepnúť hviezdičku",
-    "Toggle unread" : "Prepnúť neprečítané",
-    "Search" : "Hľadať",
-    "Refresh" : "Obnoviť",
-    "Connect your mail account" : "Pripojiť Váš mailový účet",
     "Name" : "Meno",
     "Mail Address" : "Emailová adresa",
     "Password" : "Heslo",
-    "Manual configuration" : "Manuálne nastavenia",
     "IMAP Host" : "IMAP hostiteľ",
-    "IMAP security" : "IMAP zabezpečenie",
     "None" : "Žiadny",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP číslo portu",
     "IMAP User" : "IMAP používateľ",
     "IMAP Password" : "IMAP heslo",
     "SMTP Host" : "SMTP hostiteľ",
-    "SMTP security" : "SMTP zabezpečenie",
     "SMTP Port" : "SMTP číslo portu",
     "SMTP User" : "SMTP používateľ",
     "SMTP Password" : "SMTP heslo",
     "Connect" : "Pripojiť",
+    "Add mail account" : "Pridať mailový účet",
+    "Use Gravatar and favicon avatars" : "Použiť Gravatar a favicon avatary",
+    "Keyboard shortcuts" : "Klávesové skratky",
     "from" : "od",
     "to" : "komu",
     "cc" : "kópia",
     "bcc" : "skrytá kópia",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Všimnite si, že mail prišiel z adresy noreply (neodpovedať) takže vašu odpoveď si pravdepodobne nikto neprečíta.",
     "Subject" : "Predmet",
-    "Save all to Files" : "Uložiť všetko do Súborov",
-    "Add mail account" : "Pridať mailový účet",
-    "Use Gravatar and favicon avatars" : "Použiť Gravatar a favicon avatary",
-    "No search results for" : "Žiadne výsledky vyhľadávania pre",
-    "The images have been blocked to protect your privacy." : "Obrázky boli zablokované pre ochranu Vášho súkromia.",
-    "Show images from this sender" : "Zobraziť obrázky od tohoto odosielateľa",
-    "Forward" : "Preposlať",
-    "No messages in this folder" : "Žiadne správy v tomto priečinku!",
+    "Sending …" : "Odosielam ...",
+    "Message sent!" : "Správa odoslaná!",
+    "Send" : "Odoslať",
     "Upload attachment" : "Nahrať prílohu",
     "Add attachment from Files" : "Pridať prílohu zo Súborov",
+    "Choose a file to add as attachment" : "Zvoľte súbor, ktorý chcete pridať ako prílohu.",
+    "No messages in this folder" : "Žiadne správy v tomto priečinku!",
+    "Delete" : "Zmazať",
+    "Could not load your message" : "Nepodarilo sa načítať vašu správu",
     "Import into calendar" : "Importovať do kalendára",
     "Download attachment" : "Stiahnuť prílohu",
-    "Save to Files" : "Uložiť do Súborov"
+    "Save to Files" : "Uložiť do Súborov",
+    "Choose a folder to store the attachment in" : "Vyberte priečinok pre uloženie prílohy",
+    "Save all to Files" : "Uložiť všetko do Súborov",
+    "The images have been blocked to protect your privacy." : "Obrázky boli zablokované pre ochranu Vášho súkromia.",
+    "New message" : "Nová správa",
+    "Settings" : "Nastavenia",
+    "Speed up your Mail experience with these quick shortcuts." : "Zefektívnite svoju prácu s Mailom pomocou týchto rýchlych skratiek.",
+    "Compose new message" : "Nová správa",
+    "Newer message" : "Novšia správa",
+    "Older message" : "Staršia správa",
+    "Toggle star" : "Prepnúť hviezdičku",
+    "Toggle unread" : "Prepnúť neprečítané",
+    "Search" : "Hľadať",
+    "Refresh" : "Obnoviť",
+    "Connect your mail account" : "Pripojiť Váš mailový účet",
+    "Show all folders" : "Zobraziť všetky priečinky",
+    "Collapse folders" : "Zvinúť priečinky",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n nová správa\nod {from}","%n nové správy\nod {from}","%n nových správ\nod {from}","%n nových správ\nod {from}"],
+    "Nextcloud Mail" : "Nextcloud Mail",
+    "All inboxes" : "Všetky doručené",
+    "Could not load {tag}{name}{endtag}" : "Nedá sa načítať {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Vyskytol sa problém pri načítaní {tag}{name}{endtag}",
+    "Could not load the desired message" : "Nepodarilo sa načítať požadovanú správu",
+    "Could not load the message" : "Správu sa nepodarilo sa načítať",
+    "Error loading message" : "Chyba načítavania správy",
+    "Forwarding to %s" : "Preposielam na %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Kliknite sem, ak nebudete automaticky presmerovaní v priebehu pár sekúnd.",
+    "Redirect" : "Presmerovať",
+    "The link leads to %s" : "Odkaz smeruje na %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Ak si neprajete navštíviť stránku, možete sa vátiť na <a href=\"%s\">Mail</a>.",
+    "Continue to %s" : "Pokračovať na %s"
 },"pluralForm" :"nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);"
 }
\ No newline at end of file
diff --git a/l10n/sl.js b/l10n/sl.js
index df93e394b..3c371f6a7 100644
--- a/l10n/sl.js
+++ b/l10n/sl.js
@@ -2,41 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Elektronska pošta",
-    "Loading accounts" : "Poteka nalaganje računov ...",
-    "Error while loading the accounts." : "Prišlo je do napake med nalaganjem računa.",
-    "Searching for {query}" : "Iščem {query}",
-    "Error while deleting message." : "Napaka med brisanjem sporočila.",
-    "Forwarded message" : "Posreduj sporočilo",
-    "Choose a folder to store the attachment in" : "Izbor mape za shranjevanje prilog.",
-    "Attachments saved to Files." : "Priloge so shranjene med datoteke.",
-    "Attachment saved to Files." : "Priloga je shranjena med datoteke.",
-    "Error while saving attachments to Files." : "Prišlo je do napake med shranjevanjem datoteke v mapo.",
-    "Error while saving attachment to Files." : "Prišlo je do napake med shranjevanjem datotek v mapo.",
-    "Message flag could not be set." : "Zastavice sporočila ni mogoče nastavit.",
-    "Could not move message." : "Ne morem premakniti sporočila.",
-    "Invalid account" : "Neveljaven račun",
-    "Invalid folder" : "Neveljavna mapa",
-    "Unknown error" : "Neznana napaka",
-    "All inboxes" : "Vsi predali",
-    "you" : "vi",
-    "Send message to {email}" : "Pošlji sporočilo na {email}",
-    "Could not load {tag}{name}{endtag}" : "Ne morem naložiti {tag}{name}{endtag}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "Show all folders" : "Pokaži vse mape",
-    "Collapse folders" : "Zloži mape",
-    "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",
-    "Opening HTML drafts is not supported yet." : "Odpiranje osnutkov sporočil v zapisu HTML še ni podprto.",
-    "No writable calendars found" : "Ni najdenih zapisljivih koledarjev.",
-    "Error while importing the calendar event" : "Napaka med uvažanjem dogodka koledarja",
-    "Error while downloading calendar event" : "Napaka med prejemanjem dogodka koledarja",
-    "& others" : "in drugo",
-    "Error while loading messages." : "Prišlo je do napake nalaganja sporočil.",
     "Inbox" : "Dohodna pošta",
     "Sent" : "Poslano",
     "Drafts" : "Osnutki",
@@ -48,20 +13,26 @@ OC.L10N.register(
     "Auto detect failed. Please use manual mode." : "Samodejno zaznavanje je spodletelo. Zaznavo bo treba izvesti ročno.",
     "Creating account failed: " : "Ustvarjanje računa je spodletelo:",
     "Delete permanently" : "Izbriši dokončno",
-    "Error loading message" : "Napaka nalaganja sporočila",
+    "Mail Address" : "Elektronski naslov",
+    "Connect" : "Poveži",
+    "Subject" : "Zadeva",
+    "Sending …" : "Pošiljanje ...",
+    "Message sent!" : "Sporočilo je poslano!",
+    "Send" : "Pošlji",
+    "Choose a file to add as attachment" : "Izbor datoteke za prilogo",
+    "Delete" : "Izbriši",
+    "Choose a folder to store the attachment in" : "Izbor mape za shranjevanje prilog.",
+    "New message" : "Novo obvestilo",
     "Settings" : "Nastavitve",
+    "Show all folders" : "Pokaži vse mape",
+    "Collapse folders" : "Zloži mape",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "All inboxes" : "Vsi predali",
+    "Could not load {tag}{name}{endtag}" : "Ne morem naložiti {tag}{name}{endtag}",
+    "Error loading message" : "Napaka nalaganja sporočila",
     "Redirect" : "Preusmeri",
     "The link leads to %s" : "Povezava vodi na %s",
     "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Če ne želite obiskati te strani, se lahko vrnete na <a href=\"%s\">pošto</a>.",
-    "Continue to %s" : "Nadaljuj na %s",
-    "Delete account" : "Izbriši račun",
-    "New message" : "Novo obvestilo",
-    "Account Settings" : "Nastavitve računa",
-    "Mail address" : "Elektronski naslov",
-    "Account" : "Račun",
-    "Delete" : "Izbriši",
-    "Mail Address" : "Elektronski naslov",
-    "Connect" : "Poveži",
-    "Subject" : "Zadeva"
+    "Continue to %s" : "Nadaljuj na %s"
 },
 "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);");
diff --git a/l10n/sl.json b/l10n/sl.json
index 8d283d494..fd35abb2f 100644
--- a/l10n/sl.json
+++ b/l10n/sl.json
@@ -1,40 +1,5 @@
 { "translations": {
     "Mail" : "Elektronska pošta",
-    "Loading accounts" : "Poteka nalaganje računov ...",
-    "Error while loading the accounts." : "Prišlo je do napake med nalaganjem računa.",
-    "Searching for {query}" : "Iščem {query}",
-    "Error while deleting message." : "Napaka med brisanjem sporočila.",
-    "Forwarded message" : "Posreduj sporočilo",
-    "Choose a folder to store the attachment in" : "Izbor mape za shranjevanje prilog.",
-    "Attachments saved to Files." : "Priloge so shranjene med datoteke.",
-    "Attachment saved to Files." : "Priloga je shranjena med datoteke.",
-    "Error while saving attachments to Files." : "Prišlo je do napake med shranjevanjem datoteke v mapo.",
-    "Error while saving attachment to Files." : "Prišlo je do napake med shranjevanjem datotek v mapo.",
-    "Message flag could not be set." : "Zastavice sporočila ni mogoče nastavit.",
-    "Could not move message." : "Ne morem premakniti sporočila.",
-    "Invalid account" : "Neveljaven račun",
-    "Invalid folder" : "Neveljavna mapa",
-    "Unknown error" : "Neznana napaka",
-    "All inboxes" : "Vsi predali",
-    "you" : "vi",
-    "Send message to {email}" : "Pošlji sporočilo na {email}",
-    "Could not load {tag}{name}{endtag}" : "Ne morem naložiti {tag}{name}{endtag}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "Show all folders" : "Pokaži vse mape",
-    "Collapse folders" : "Zloži mape",
-    "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",
-    "Opening HTML drafts is not supported yet." : "Odpiranje osnutkov sporočil v zapisu HTML še ni podprto.",
-    "No writable calendars found" : "Ni najdenih zapisljivih koledarjev.",
-    "Error while importing the calendar event" : "Napaka med uvažanjem dogodka koledarja",
-    "Error while downloading calendar event" : "Napaka med prejemanjem dogodka koledarja",
-    "& others" : "in drugo",
-    "Error while loading messages." : "Prišlo je do napake nalaganja sporočil.",
     "Inbox" : "Dohodna pošta",
     "Sent" : "Poslano",
     "Drafts" : "Osnutki",
@@ -46,20 +11,26 @@
     "Auto detect failed. Please use manual mode." : "Samodejno zaznavanje je spodletelo. Zaznavo bo treba izvesti ročno.",
     "Creating account failed: " : "Ustvarjanje računa je spodletelo:",
     "Delete permanently" : "Izbriši dokončno",
-    "Error loading message" : "Napaka nalaganja sporočila",
+    "Mail Address" : "Elektronski naslov",
+    "Connect" : "Poveži",
+    "Subject" : "Zadeva",
+    "Sending …" : "Pošiljanje ...",
+    "Message sent!" : "Sporočilo je poslano!",
+    "Send" : "Pošlji",
+    "Choose a file to add as attachment" : "Izbor datoteke za prilogo",
+    "Delete" : "Izbriši",
+    "Choose a folder to store the attachment in" : "Izbor mape za shranjevanje prilog.",
+    "New message" : "Novo obvestilo",
     "Settings" : "Nastavitve",
+    "Show all folders" : "Pokaži vse mape",
+    "Collapse folders" : "Zloži mape",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "All inboxes" : "Vsi predali",
+    "Could not load {tag}{name}{endtag}" : "Ne morem naložiti {tag}{name}{endtag}",
+    "Error loading message" : "Napaka nalaganja sporočila",
     "Redirect" : "Preusmeri",
     "The link leads to %s" : "Povezava vodi na %s",
     "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Če ne želite obiskati te strani, se lahko vrnete na <a href=\"%s\">pošto</a>.",
-    "Continue to %s" : "Nadaljuj na %s",
-    "Delete account" : "Izbriši račun",
-    "New message" : "Novo obvestilo",
-    "Account Settings" : "Nastavitve računa",
-    "Mail address" : "Elektronski naslov",
-    "Account" : "Račun",
-    "Delete" : "Izbriši",
-    "Mail Address" : "Elektronski naslov",
-    "Connect" : "Poveži",
-    "Subject" : "Zadeva"
+    "Continue to %s" : "Nadaljuj na %s"
 },"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"
 }
\ No newline at end of file
diff --git a/l10n/sq.js b/l10n/sq.js
index 24d2a9b13..f45d1b406 100644
--- a/l10n/sq.js
+++ b/l10n/sq.js
@@ -2,46 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Posta",
-    "Error while loading the accounts." : "Gabim gjatë ngarkimit të llogarive.",
-    "Can not load this folder." : "Nuk mund të ngarkohet kjo dosje.",
-    "Searching for {query}" : "Duke kërkuar për {query}",
-    "Error while deleting message." : "Gabim gjatë fshirjes së mesazhit.",
-    "Forwarded message" : "Mesazhi u përcoll",
-    "Choose a folder to store the attachment in" : "Zgjidhni një dosje ku të depozitohet bashkëngjitja",
-    "Attachments saved to Files." : "Bashkëngjitjet u ruajtën te Skedarët.",
-    "Attachment saved to Files." : "Bashkëngjitjet u ruajtën tek dosja.",
-    "Error while saving attachments to Files." : "Gabim teksa ruheshin bashkëngjitje tek dosja.",
-    "Error while saving attachment to Files." : "Gabim teksa ruheshin bashkëngjitje tek dosjet",
-    "Message flag could not be set." : "Mesazhit s’iu vu dot shenjë.",
-    "Could not move message." : "Mesazhi nuk mund të lëvizej.",
-    "Invalid account" : "Llogari e pavlefshme",
-    "Invalid folder" : "Dosje e pavlefshme",
-    "Error while creating the account: " : "Problem gjatë krijimit të llogarisë:",
-    "Unknown error" : "Gabim i panjohur",
-    "All inboxes" : "Krejt kutitë e postës",
-    "you" : "ju",
-    "Send message to {email}" : "Dërgoni mesazh te {email}",
-    "Could not load {tag}{name}{endtag}" : "Nuk mund të ngarkohej {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Pati një problem me ngarkimin e {tag}{name}{endtag}",
-    "{from}\n{subject}" : "{nga}\n{subjekt}",
-    "Save" : "Ruaj",
-    "Show all folders" : "Shfaqi krejt dosjet",
-    "Collapse folders" : "Tkurri dosjet",
-    "Error while deleting account." : "Gabim gjatë fshirjes së llogarisë.",
-    "Choose a file to add as attachment" : "Zgjidhni një kartelë që të shtohet si bashkëngjitje",
-    "Reply" : "Përgjigju",
-    "Send" : "Dërgo",
-    "Sending …" : "Po dërgohet …",
-    "Message sent!" : "Mesazhi u dërgua!",
-    "Server error" : "Gabim shërbyesi",
-    "An unknown error occurred" : "Ndodhi një gabim i panjohur",
-    "Opening HTML drafts is not supported yet." : "Hapja e skicave HTML nuk mbulohet ende.",
-    "No writable calendars found" : "S’u gjetën kalendarë të shkruajtshëm",
-    "Error while importing the calendar event" : "Gabim gjatë importimit të veprimtarisë së kalendarit",
-    "Error while downloading calendar event" : "Gabim gjatë shkarkimit të veprimtarisë së kalendarit",
-    "& others" : "& të tjerë",
-    "Error while loading messages." : "Gabim gjatë ngarkimit të mesazheve.",
-    "Setting up your account" : "Duke krijuar llogarinë tuaj",
     "Inbox" : "Të marrë",
     "Sent" : "Të dërguar",
     "Drafts" : "Skica",
@@ -53,63 +13,61 @@ OC.L10N.register(
     "Auto detect failed. Please use manual mode." : "Vetëzbulimi dështoi. Ju lutemi, përdorni metodën dorazi.",
     "Creating account failed: " : "Krijimi i llogarisë dështoi: ",
     "Delete permanently" : "Fshije përgjithmonë",
-    "Error loading message" : "Gabim në ngarkimin e kartelës",
-    "Settings" : "Konfigurimet",
-    "Forwarding to %s" : "Ridrejto te %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Klikoni këtu nëse nuk ridrejtoheni automatikisht brenda disa sekondave",
-    "Redirect" : "Ridrejtoje",
-    "The link leads to %s" : "Lidhja shpie te %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Nëse s’doni ta vizitoni atë faqe, mund të ktheheni te <a href=\"%s\">Posta</a>.",
-    "Continue to %s" : "Vazhdo te %s",
-    "Delete account" : "Fshij llogarinë",
-    "Try again" : "Provo përsëri",
-    "New message" : "Mesazh i ri",
-    "Account Settings" : "Konfigurimet e llogarisë",
-    "Aliases" : "Emërtimet",
-    "Mail address" : "Adresa e postës elektronike",
-    "Display Name" : "Trego Emrin",
-    "Account" : "Llogari",
-    "Delete" : "Fshij",
-    "Keyboard shortcuts" : "Shkurtoret e tastierës",
-    "Speed up your Mail experience with these quick shortcuts." : "Përmirësoni përvojën tuaj në Mail me këto shkurtore të shpejta.",
-    "Newer message" : "Mesazhe më të reja",
-    "Older message" : "Mesazhe më të vjetra",
-    "Toggle star" : "Toggle star",
-    "Toggle unread" : "Toggle i pa lexuar",
-    "Search" : "Kërko",
-    "Refresh" : "Rifresko",
-    "Connect your mail account" : "Lidhni llogarinë tuaj të postës elektronike",
     "Name" : "Emri",
     "Mail Address" : "Adresa e postës elektronike",
     "Password" : "Fjalëkalimi",
-    "Manual configuration" : "Konfigurim manual",
     "IMAP Host" : "Strehë IMAP",
-    "IMAP security" : "Siguria IMAP",
     "None" : "Asnjë",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Porta IMAP",
     "IMAP User" : "Përdorues IMAP",
     "IMAP Password" : "Fjalëkalimi i IMAP",
     "SMTP Host" : "Streha e SMTP",
-    "SMTP security" : "Siguria e SMTP",
     "SMTP Port" : "Porta SMTP",
     "SMTP User" : "Përdoruesi i SMTP",
     "SMTP Password" : "Fjalëkalimi SMTP",
     "Connect" : "Lidhu",
+    "Add mail account" : "Shto llogarinë e postës elektronike",
+    "Keyboard shortcuts" : "Shkurtoret e tastierës",
     "from" : "nga",
     "to" : "te",
     "cc" : "cc",
     "bcc" : "bcc",
     "Subject" : "Temë",
-    "Save all to Files" : "Ruaji të gjitha te Dosjet",
-    "Add mail account" : "Shto llogarinë e postës elektronike",
-    "No search results for" : "Asnjë rezultat kërkimi për",
-    "The images have been blocked to protect your privacy." : "Imazhet janë bllokuar për të mbrojtur privatësinë tuaj.",
-    "Show images from this sender" : "Trego imazhet nga ky dërgues",
-    "Forward" : "Ridrejto",
+    "Sending …" : "Po dërgohet …",
+    "Message sent!" : "Mesazhi u dërgua!",
+    "Send" : "Dërgo",
     "Upload attachment" : "Ngarko bashkëngjitje",
+    "Choose a file to add as attachment" : "Zgjidhni një kartelë që të shtohet si bashkëngjitje",
+    "Delete" : "Fshij",
     "Import into calendar" : "Importo në kalendar",
     "Download attachment" : "Shkarko bashkëlidhjen",
-    "Save to Files" : "Ruaje te Skedarët"
+    "Save to Files" : "Ruaje te Skedarët",
+    "Choose a folder to store the attachment in" : "Zgjidhni një dosje ku të depozitohet bashkëngjitja",
+    "Save all to Files" : "Ruaji të gjitha te Dosjet",
+    "The images have been blocked to protect your privacy." : "Imazhet janë bllokuar për të mbrojtur privatësinë tuaj.",
+    "New message" : "Mesazh i ri",
+    "Settings" : "Konfigurimet",
+    "Speed up your Mail experience with these quick shortcuts." : "Përmirësoni përvojën tuaj në Mail me këto shkurtore të shpejta.",
+    "Newer message" : "Mesazhe më të reja",
+    "Older message" : "Mesazhe më të vjetra",
+    "Toggle star" : "Toggle star",
+    "Toggle unread" : "Toggle i pa lexuar",
+    "Search" : "Kërko",
+    "Refresh" : "Rifresko",
+    "Connect your mail account" : "Lidhni llogarinë tuaj të postës elektronike",
+    "Show all folders" : "Shfaqi krejt dosjet",
+    "Collapse folders" : "Tkurri dosjet",
+    "{from}\n{subject}" : "{nga}\n{subjekt}",
+    "All inboxes" : "Krejt kutitë e postës",
+    "Could not load {tag}{name}{endtag}" : "Nuk mund të ngarkohej {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Pati një problem me ngarkimin e {tag}{name}{endtag}",
+    "Error loading message" : "Gabim në ngarkimin e kartelës",
+    "Forwarding to %s" : "Ridrejto te %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Klikoni këtu nëse nuk ridrejtoheni automatikisht brenda disa sekondave",
+    "Redirect" : "Ridrejtoje",
+    "The link leads to %s" : "Lidhja shpie te %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Nëse s’doni ta vizitoni atë faqe, mund të ktheheni te <a href=\"%s\">Posta</a>.",
+    "Continue to %s" : "Vazhdo te %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/sq.json b/l10n/sq.json
index f8b9208dd..5f9cc24f4 100644
--- a/l10n/sq.json
+++ b/l10n/sq.json
@@ -1,45 +1,5 @@
 { "translations": {
     "Mail" : "Posta",
-    "Error while loading the accounts." : "Gabim gjatë ngarkimit të llogarive.",
-    "Can not load this folder." : "Nuk mund të ngarkohet kjo dosje.",
-    "Searching for {query}" : "Duke kërkuar për {query}",
-    "Error while deleting message." : "Gabim gjatë fshirjes së mesazhit.",
-    "Forwarded message" : "Mesazhi u përcoll",
-    "Choose a folder to store the attachment in" : "Zgjidhni një dosje ku të depozitohet bashkëngjitja",
-    "Attachments saved to Files." : "Bashkëngjitjet u ruajtën te Skedarët.",
-    "Attachment saved to Files." : "Bashkëngjitjet u ruajtën tek dosja.",
-    "Error while saving attachments to Files." : "Gabim teksa ruheshin bashkëngjitje tek dosja.",
-    "Error while saving attachment to Files." : "Gabim teksa ruheshin bashkëngjitje tek dosjet",
-    "Message flag could not be set." : "Mesazhit s’iu vu dot shenjë.",
-    "Could not move message." : "Mesazhi nuk mund të lëvizej.",
-    "Invalid account" : "Llogari e pavlefshme",
-    "Invalid folder" : "Dosje e pavlefshme",
-    "Error while creating the account: " : "Problem gjatë krijimit të llogarisë:",
-    "Unknown error" : "Gabim i panjohur",
-    "All inboxes" : "Krejt kutitë e postës",
-    "you" : "ju",
-    "Send message to {email}" : "Dërgoni mesazh te {email}",
-    "Could not load {tag}{name}{endtag}" : "Nuk mund të ngarkohej {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Pati një problem me ngarkimin e {tag}{name}{endtag}",
-    "{from}\n{subject}" : "{nga}\n{subjekt}",
-    "Save" : "Ruaj",
-    "Show all folders" : "Shfaqi krejt dosjet",
-    "Collapse folders" : "Tkurri dosjet",
-    "Error while deleting account." : "Gabim gjatë fshirjes së llogarisë.",
-    "Choose a file to add as attachment" : "Zgjidhni një kartelë që të shtohet si bashkëngjitje",
-    "Reply" : "Përgjigju",
-    "Send" : "Dërgo",
-    "Sending …" : "Po dërgohet …",
-    "Message sent!" : "Mesazhi u dërgua!",
-    "Server error" : "Gabim shërbyesi",
-    "An unknown error occurred" : "Ndodhi një gabim i panjohur",
-    "Opening HTML drafts is not supported yet." : "Hapja e skicave HTML nuk mbulohet ende.",
-    "No writable calendars found" : "S’u gjetën kalendarë të shkruajtshëm",
-    "Error while importing the calendar event" : "Gabim gjatë importimit të veprimtarisë së kalendarit",
-    "Error while downloading calendar event" : "Gabim gjatë shkarkimit të veprimtarisë së kalendarit",
-    "& others" : "& të tjerë",
-    "Error while loading messages." : "Gabim gjatë ngarkimit të mesazheve.",
-    "Setting up your account" : "Duke krijuar llogarinë tuaj",
     "Inbox" : "Të marrë",
     "Sent" : "Të dërguar",
     "Drafts" : "Skica",
@@ -51,63 +11,61 @@
     "Auto detect failed. Please use manual mode." : "Vetëzbulimi dështoi. Ju lutemi, përdorni metodën dorazi.",
     "Creating account failed: " : "Krijimi i llogarisë dështoi: ",
     "Delete permanently" : "Fshije përgjithmonë",
-    "Error loading message" : "Gabim në ngarkimin e kartelës",
-    "Settings" : "Konfigurimet",
-    "Forwarding to %s" : "Ridrejto te %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Klikoni këtu nëse nuk ridrejtoheni automatikisht brenda disa sekondave",
-    "Redirect" : "Ridrejtoje",
-    "The link leads to %s" : "Lidhja shpie te %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Nëse s’doni ta vizitoni atë faqe, mund të ktheheni te <a href=\"%s\">Posta</a>.",
-    "Continue to %s" : "Vazhdo te %s",
-    "Delete account" : "Fshij llogarinë",
-    "Try again" : "Provo përsëri",
-    "New message" : "Mesazh i ri",
-    "Account Settings" : "Konfigurimet e llogarisë",
-    "Aliases" : "Emërtimet",
-    "Mail address" : "Adresa e postës elektronike",
-    "Display Name" : "Trego Emrin",
-    "Account" : "Llogari",
-    "Delete" : "Fshij",
-    "Keyboard shortcuts" : "Shkurtoret e tastierës",
-    "Speed up your Mail experience with these quick shortcuts." : "Përmirësoni përvojën tuaj në Mail me këto shkurtore të shpejta.",
-    "Newer message" : "Mesazhe më të reja",
-    "Older message" : "Mesazhe më të vjetra",
-    "Toggle star" : "Toggle star",
-    "Toggle unread" : "Toggle i pa lexuar",
-    "Search" : "Kërko",
-    "Refresh" : "Rifresko",
-    "Connect your mail account" : "Lidhni llogarinë tuaj të postës elektronike",
     "Name" : "Emri",
     "Mail Address" : "Adresa e postës elektronike",
     "Password" : "Fjalëkalimi",
-    "Manual configuration" : "Konfigurim manual",
     "IMAP Host" : "Strehë IMAP",
-    "IMAP security" : "Siguria IMAP",
     "None" : "Asnjë",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Porta IMAP",
     "IMAP User" : "Përdorues IMAP",
     "IMAP Password" : "Fjalëkalimi i IMAP",
     "SMTP Host" : "Streha e SMTP",
-    "SMTP security" : "Siguria e SMTP",
     "SMTP Port" : "Porta SMTP",
     "SMTP User" : "Përdoruesi i SMTP",
     "SMTP Password" : "Fjalëkalimi SMTP",
     "Connect" : "Lidhu",
+    "Add mail account" : "Shto llogarinë e postës elektronike",
+    "Keyboard shortcuts" : "Shkurtoret e tastierës",
     "from" : "nga",
     "to" : "te",
     "cc" : "cc",
     "bcc" : "bcc",
     "Subject" : "Temë",
-    "Save all to Files" : "Ruaji të gjitha te Dosjet",
-    "Add mail account" : "Shto llogarinë e postës elektronike",
-    "No search results for" : "Asnjë rezultat kërkimi për",
-    "The images have been blocked to protect your privacy." : "Imazhet janë bllokuar për të mbrojtur privatësinë tuaj.",
-    "Show images from this sender" : "Trego imazhet nga ky dërgues",
-    "Forward" : "Ridrejto",
+    "Sending …" : "Po dërgohet …",
+    "Message sent!" : "Mesazhi u dërgua!",
+    "Send" : "Dërgo",
     "Upload attachment" : "Ngarko bashkëngjitje",
+    "Choose a file to add as attachment" : "Zgjidhni një kartelë që të shtohet si bashkëngjitje",
+    "Delete" : "Fshij",
     "Import into calendar" : "Importo në kalendar",
     "Download attachment" : "Shkarko bashkëlidhjen",
-    "Save to Files" : "Ruaje te Skedarët"
+    "Save to Files" : "Ruaje te Skedarët",
+    "Choose a folder to store the attachment in" : "Zgjidhni një dosje ku të depozitohet bashkëngjitja",
+    "Save all to Files" : "Ruaji të gjitha te Dosjet",
+    "The images have been blocked to protect your privacy." : "Imazhet janë bllokuar për të mbrojtur privatësinë tuaj.",
+    "New message" : "Mesazh i ri",
+    "Settings" : "Konfigurimet",
+    "Speed up your Mail experience with these quick shortcuts." : "Përmirësoni përvojën tuaj në Mail me këto shkurtore të shpejta.",
+    "Newer message" : "Mesazhe më të reja",
+    "Older message" : "Mesazhe më të vjetra",
+    "Toggle star" : "Toggle star",
+    "Toggle unread" : "Toggle i pa lexuar",
+    "Search" : "Kërko",
+    "Refresh" : "Rifresko",
+    "Connect your mail account" : "Lidhni llogarinë tuaj të postës elektronike",
+    "Show all folders" : "Shfaqi krejt dosjet",
+    "Collapse folders" : "Tkurri dosjet",
+    "{from}\n{subject}" : "{nga}\n{subjekt}",
+    "All inboxes" : "Krejt kutitë e postës",
+    "Could not load {tag}{name}{endtag}" : "Nuk mund të ngarkohej {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Pati një problem me ngarkimin e {tag}{name}{endtag}",
+    "Error loading message" : "Gabim në ngarkimin e kartelës",
+    "Forwarding to %s" : "Ridrejto te %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Klikoni këtu nëse nuk ridrejtoheni automatikisht brenda disa sekondave",
+    "Redirect" : "Ridrejtoje",
+    "The link leads to %s" : "Lidhja shpie te %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Nëse s’doni ta vizitoni atë faqe, mund të ktheheni te <a href=\"%s\">Posta</a>.",
+    "Continue to %s" : "Vazhdo te %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/sr.js b/l10n/sr.js
index 0192ae095..59c32dd34 100644
--- a/l10n/sr.js
+++ b/l10n/sr.js
@@ -2,56 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Пошта",
-    "Loading accounts" : "Учитавам налоге",
-    "Error while loading the accounts." : "Грешка при учитавању налога.",
-    "Can not load this folder." : "Не могу да учитам фасциклу.",
-    "Searching for {query}" : "Тражим по упиту {query}",
-    "Error while deleting message." : "Грешка при брисању поруке.",
-    "Forwarded message" : "Прослеђена порука",
-    "Choose a folder to store the attachment in" : "Изаберите фасциклу за смештање прилога",
-    "Attachments saved to Files." : "Прилози сачувани у фајловима.",
-    "Attachment saved to Files." : "Прилог сачуван у фајловима.",
-    "Error while saving attachments to Files." : "Грешка при упису прилога у фајлове.",
-    "Error while saving attachment to Files." : "Грешка при упису прилога у фајлове.",
-    "Message flag could not be set." : "Не могу да ставим заставицу на поруку.",
-    "Could not move message." : "Не могу да померим поруку.",
-    "Invalid account" : "Неисправан налог",
-    "Invalid folder" : "Неисправна фасцикла",
-    "Error while creating the account: " : "Грешка приликом креирања налога:",
-    "Unknown error" : "Непозната грешка",
-    "Error while updating the account: " : "Грешка приликом ажурирања налога:",
-    "All inboxes" : "Сва сандучета",
-    "you" : "Ви",
-    "Send message to {email}" : "Пошаљи поруку на {email}",
-    "Could not load {tag}{name}{endtag}" : "Не могу да учитам {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Десио се проблем приликом учитавања {tag}{name}{endtag}",
-    "Could not load your message" : "Неуспело учитавање поруке",
-    "Could not load the desired message" : "Неуспело учитавање жељене поруке",
-    "Could not load the message" : "Неуспело учитавање поруке",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n порука\nод {from}","%n поруке\nод {from}","%n порука\nод {from}"],
-    "Nextcloud Mail" : "Некстклауд Пошта",
-    "Save" : "Сачувај",
-    "Saved" : "Сачувано",
-    "Show all folders" : "Прикажи све фасцикле",
-    "Collapse folders" : "Сажми фасцикле",
-    "Error while deleting account." : "Грешка при брисању налога.",
-    "Choose a file to add as attachment" : "Изаберите фајл за прилог",
-    "An error occurred while uploading {fname}" : "Грешка приликом отпремања {fname}",
-    "Reply" : "Одговори",
-    "Send" : "Пошаљи",
-    "Sending …" : "Шаљем …",
-    "Message sent!" : "Порука послата!",
-    "Server error" : "Грешка на серверу",
-    "An unknown error occurred" : "Десила се непозната грешка",
-    "Opening HTML drafts is not supported yet." : "Отварање HTML нацрта још није подржано.",
-    "No writable calendars found" : "Нема календара у који је могуће писање",
-    "Error while importing the calendar event" : "Грешка приликом увоза догађаја из календара",
-    "Error while downloading calendar event" : "Грешка приликом скидања догађаја из календара",
-    "& others" : "и осталих",
-    "Error while loading messages." : "Грешка при учитавању порука.",
-    "Error while refreshing messages." : "Грешка приликом освежавања порука.",
-    "Setting up your account" : "Подешавање Вашег налога",
     "Inbox" : "Долазне",
     "Sent" : "Послате",
     "Drafts" : "Недовршене",
@@ -66,69 +16,70 @@ OC.L10N.register(
     "Delete permanently" : "Обриши заувек",
     "IMAP web client" : "IMAP веб клијент",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Једноставан клијент е-поште који се повезује са Вашим сервером е-поште преко IMAP-а и SMTP-а.",
-    "Error loading message" : "Грешка при учитавању поруке",
-    "Settings" : "Подешавања",
-    "Forwarding to %s" : "Прослеђивање на %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Кликните овде ако нисте аутоматски преусмерени у наредних неколико секунди.",
-    "Redirect" : "Преусмеравање",
-    "The link leads to %s" : "Веза води на %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Ако не желите да посетите ту страну, можете се вратити на <a href=\"%s\">Пошту</a>.",
-    "Continue to %s" : "Настави на %s",
-    "Delete account" : "Обриши налог",
-    "Try again" : "Покушајте поново",
-    "New message" : "Нова порука",
-    "Account Settings" : "Поставке налога",
-    "Aliases" : "Алијаси",
-    "Mail address" : "Адреса поште",
-    "Display Name" : "Име за приказ",
-    "Account" : "Налог",
-    "Toggle read" : "Укључи/искључи прочитано",
-    "Delete" : "Избриши",
-    "Keyboard shortcuts" : "Пречице на тастатури",
-    "Speed up your Mail experience with these quick shortcuts." : "Убрзајте рад са Поштом са овим брзим пречицама.",
-    "Compose new message" : "Напиши нову поруку",
-    "Newer message" : "Новије поруке",
-    "Older message" : "Старије поруке",
-    "Toggle star" : "Додај/склони звездицу",
-    "Toggle unread" : "Означи као прочитано/непрочитано",
-    "Search" : "Претражи",
-    "Refresh" : "Освежи",
-    "Connect your mail account" : "Повежи се на налог е-поште",
     "Name" : "Име",
     "Mail Address" : "Адреса е-поште",
     "Password" : "Лозинка",
-    "Manual configuration" : "Ручна конфигурација",
     "IMAP Host" : "IMAP домаћин",
-    "IMAP security" : "Тип IMAP безбедности",
     "None" : "Ниједна",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP порт",
     "IMAP User" : "IMAP корисничко име",
     "IMAP Password" : "IMAP лозинка",
     "SMTP Host" : "SMTP домаћин",
-    "SMTP security" : "Тип SMTP безбедности",
     "SMTP Port" : "SMTP порт",
     "SMTP User" : "SMTP корисничко име",
     "SMTP Password" : "SMTP лозинка",
     "Connect" : "Повежи се",
+    "Add mail account" : "Додај налог е-поште",
+    "Use Gravatar and favicon avatars" : "Користи Граватар и аватаре favicon-а",
+    "Keyboard shortcuts" : "Пречице на тастатури",
     "from" : "од",
     "to" : "за",
     "cc" : "индиго копија",
     "bcc" : "невидљива индиго копија",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Ова е-пошта је стигла са адресе на којој има \"noreply\", што значи да вероватно неће бити прочитана ако одговорите на њу.",
     "Subject" : "Наслов",
-    "Save all to Files" : "Сачувај све у фајлове",
-    "Add mail account" : "Додај налог е-поште",
-    "Use Gravatar and favicon avatars" : "Користи Граватар и аватаре favicon-а",
-    "No search results for" : "Нема резултата претраге",
-    "The images have been blocked to protect your privacy." : "Слике су блокиране да заштите Вашу приватност.",
-    "Show images from this sender" : "Прикажи слике од пошаљиоца",
-    "Forward" : "Проследи",
-    "No messages in this folder" : "Нема порука у овој фасцикли",
+    "Sending …" : "Шаљем …",
+    "Message sent!" : "Порука послата!",
+    "Send" : "Пошаљи",
     "Upload attachment" : "Закачи прилог",
     "Add attachment from Files" : "Додај прилог из фајлова",
+    "Choose a file to add as attachment" : "Изаберите фајл за прилог",
+    "No messages in this folder" : "Нема порука у овој фасцикли",
+    "Delete" : "Избриши",
+    "Could not load your message" : "Неуспело учитавање поруке",
     "Import into calendar" : "Увези у календар",
     "Download attachment" : "Скини прилог",
-    "Save to Files" : "Сачувај у фајлове"
+    "Save to Files" : "Сачувај у фајлове",
+    "Choose a folder to store the attachment in" : "Изаберите фасциклу за смештање прилога",
+    "Save all to Files" : "Сачувај све у фајлове",
+    "The images have been blocked to protect your privacy." : "Слике су блокиране да заштите Вашу приватност.",
+    "New message" : "Нова порука",
+    "Settings" : "Подешавања",
+    "Speed up your Mail experience with these quick shortcuts." : "Убрзајте рад са Поштом са овим брзим пречицама.",
+    "Compose new message" : "Напиши нову поруку",
+    "Newer message" : "Новије поруке",
+    "Older message" : "Старије поруке",
+    "Toggle star" : "Додај/склони звездицу",
+    "Toggle unread" : "Означи као прочитано/непрочитано",
+    "Search" : "Претражи",
+    "Refresh" : "Освежи",
+    "Connect your mail account" : "Повежи се на налог е-поште",
+    "Show all folders" : "Прикажи све фасцикле",
+    "Collapse folders" : "Сажми фасцикле",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n порука\nод {from}","%n поруке\nод {from}","%n порука\nод {from}"],
+    "Nextcloud Mail" : "Некстклауд Пошта",
+    "All inboxes" : "Сва сандучета",
+    "Could not load {tag}{name}{endtag}" : "Не могу да учитам {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Десио се проблем приликом учитавања {tag}{name}{endtag}",
+    "Could not load the desired message" : "Неуспело учитавање жељене поруке",
+    "Could not load the message" : "Неуспело учитавање поруке",
+    "Error loading message" : "Грешка при учитавању поруке",
+    "Forwarding to %s" : "Прослеђивање на %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Кликните овде ако нисте аутоматски преусмерени у наредних неколико секунди.",
+    "Redirect" : "Преусмеравање",
+    "The link leads to %s" : "Веза води на %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Ако не желите да посетите ту страну, можете се вратити на <a href=\"%s\">Пошту</a>.",
+    "Continue to %s" : "Настави на %s"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/l10n/sr.json b/l10n/sr.json
index 78729e2ad..cfe931e53 100644
--- a/l10n/sr.json
+++ b/l10n/sr.json
@@ -1,55 +1,5 @@
 { "translations": {
     "Mail" : "Пошта",
-    "Loading accounts" : "Учитавам налоге",
-    "Error while loading the accounts." : "Грешка при учитавању налога.",
-    "Can not load this folder." : "Не могу да учитам фасциклу.",
-    "Searching for {query}" : "Тражим по упиту {query}",
-    "Error while deleting message." : "Грешка при брисању поруке.",
-    "Forwarded message" : "Прослеђена порука",
-    "Choose a folder to store the attachment in" : "Изаберите фасциклу за смештање прилога",
-    "Attachments saved to Files." : "Прилози сачувани у фајловима.",
-    "Attachment saved to Files." : "Прилог сачуван у фајловима.",
-    "Error while saving attachments to Files." : "Грешка при упису прилога у фајлове.",
-    "Error while saving attachment to Files." : "Грешка при упису прилога у фајлове.",
-    "Message flag could not be set." : "Не могу да ставим заставицу на поруку.",
-    "Could not move message." : "Не могу да померим поруку.",
-    "Invalid account" : "Неисправан налог",
-    "Invalid folder" : "Неисправна фасцикла",
-    "Error while creating the account: " : "Грешка приликом креирања налога:",
-    "Unknown error" : "Непозната грешка",
-    "Error while updating the account: " : "Грешка приликом ажурирања налога:",
-    "All inboxes" : "Сва сандучета",
-    "you" : "Ви",
-    "Send message to {email}" : "Пошаљи поруку на {email}",
-    "Could not load {tag}{name}{endtag}" : "Не могу да учитам {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Десио се проблем приликом учитавања {tag}{name}{endtag}",
-    "Could not load your message" : "Неуспело учитавање поруке",
-    "Could not load the desired message" : "Неуспело учитавање жељене поруке",
-    "Could not load the message" : "Неуспело учитавање поруке",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n порука\nод {from}","%n поруке\nод {from}","%n порука\nод {from}"],
-    "Nextcloud Mail" : "Некстклауд Пошта",
-    "Save" : "Сачувај",
-    "Saved" : "Сачувано",
-    "Show all folders" : "Прикажи све фасцикле",
-    "Collapse folders" : "Сажми фасцикле",
-    "Error while deleting account." : "Грешка при брисању налога.",
-    "Choose a file to add as attachment" : "Изаберите фајл за прилог",
-    "An error occurred while uploading {fname}" : "Грешка приликом отпремања {fname}",
-    "Reply" : "Одговори",
-    "Send" : "Пошаљи",
-    "Sending …" : "Шаљем …",
-    "Message sent!" : "Порука послата!",
-    "Server error" : "Грешка на серверу",
-    "An unknown error occurred" : "Десила се непозната грешка",
-    "Opening HTML drafts is not supported yet." : "Отварање HTML нацрта још није подржано.",
-    "No writable calendars found" : "Нема календара у који је могуће писање",
-    "Error while importing the calendar event" : "Грешка приликом увоза догађаја из календара",
-    "Error while downloading calendar event" : "Грешка приликом скидања догађаја из календара",
-    "& others" : "и осталих",
-    "Error while loading messages." : "Грешка при учитавању порука.",
-    "Error while refreshing messages." : "Грешка приликом освежавања порука.",
-    "Setting up your account" : "Подешавање Вашег налога",
     "Inbox" : "Долазне",
     "Sent" : "Послате",
     "Drafts" : "Недовршене",
@@ -64,69 +14,70 @@
     "Delete permanently" : "Обриши заувек",
     "IMAP web client" : "IMAP веб клијент",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Једноставан клијент е-поште који се повезује са Вашим сервером е-поште преко IMAP-а и SMTP-а.",
-    "Error loading message" : "Грешка при учитавању поруке",
-    "Settings" : "Подешавања",
-    "Forwarding to %s" : "Прослеђивање на %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Кликните овде ако нисте аутоматски преусмерени у наредних неколико секунди.",
-    "Redirect" : "Преусмеравање",
-    "The link leads to %s" : "Веза води на %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Ако не желите да посетите ту страну, можете се вратити на <a href=\"%s\">Пошту</a>.",
-    "Continue to %s" : "Настави на %s",
-    "Delete account" : "Обриши налог",
-    "Try again" : "Покушајте поново",
-    "New message" : "Нова порука",
-    "Account Settings" : "Поставке налога",
-    "Aliases" : "Алијаси",
-    "Mail address" : "Адреса поште",
-    "Display Name" : "Име за приказ",
-    "Account" : "Налог",
-    "Toggle read" : "Укључи/искључи прочитано",
-    "Delete" : "Избриши",
-    "Keyboard shortcuts" : "Пречице на тастатури",
-    "Speed up your Mail experience with these quick shortcuts." : "Убрзајте рад са Поштом са овим брзим пречицама.",
-    "Compose new message" : "Напиши нову поруку",
-    "Newer message" : "Новије поруке",
-    "Older message" : "Старије поруке",
-    "Toggle star" : "Додај/склони звездицу",
-    "Toggle unread" : "Означи као прочитано/непрочитано",
-    "Search" : "Претражи",
-    "Refresh" : "Освежи",
-    "Connect your mail account" : "Повежи се на налог е-поште",
     "Name" : "Име",
     "Mail Address" : "Адреса е-поште",
     "Password" : "Лозинка",
-    "Manual configuration" : "Ручна конфигурација",
     "IMAP Host" : "IMAP домаћин",
-    "IMAP security" : "Тип IMAP безбедности",
     "None" : "Ниједна",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP порт",
     "IMAP User" : "IMAP корисничко име",
     "IMAP Password" : "IMAP лозинка",
     "SMTP Host" : "SMTP домаћин",
-    "SMTP security" : "Тип SMTP безбедности",
     "SMTP Port" : "SMTP порт",
     "SMTP User" : "SMTP корисничко име",
     "SMTP Password" : "SMTP лозинка",
     "Connect" : "Повежи се",
+    "Add mail account" : "Додај налог е-поште",
+    "Use Gravatar and favicon avatars" : "Користи Граватар и аватаре favicon-а",
+    "Keyboard shortcuts" : "Пречице на тастатури",
     "from" : "од",
     "to" : "за",
     "cc" : "индиго копија",
     "bcc" : "невидљива индиго копија",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Ова е-пошта је стигла са адресе на којој има \"noreply\", што значи да вероватно неће бити прочитана ако одговорите на њу.",
     "Subject" : "Наслов",
-    "Save all to Files" : "Сачувај све у фајлове",
-    "Add mail account" : "Додај налог е-поште",
-    "Use Gravatar and favicon avatars" : "Користи Граватар и аватаре favicon-а",
-    "No search results for" : "Нема резултата претраге",
-    "The images have been blocked to protect your privacy." : "Слике су блокиране да заштите Вашу приватност.",
-    "Show images from this sender" : "Прикажи слике од пошаљиоца",
-    "Forward" : "Проследи",
-    "No messages in this folder" : "Нема порука у овој фасцикли",
+    "Sending …" : "Шаљем …",
+    "Message sent!" : "Порука послата!",
+    "Send" : "Пошаљи",
     "Upload attachment" : "Закачи прилог",
     "Add attachment from Files" : "Додај прилог из фајлова",
+    "Choose a file to add as attachment" : "Изаберите фајл за прилог",
+    "No messages in this folder" : "Нема порука у овој фасцикли",
+    "Delete" : "Избриши",
+    "Could not load your message" : "Неуспело учитавање поруке",
     "Import into calendar" : "Увези у календар",
     "Download attachment" : "Скини прилог",
-    "Save to Files" : "Сачувај у фајлове"
+    "Save to Files" : "Сачувај у фајлове",
+    "Choose a folder to store the attachment in" : "Изаберите фасциклу за смештање прилога",
+    "Save all to Files" : "Сачувај све у фајлове",
+    "The images have been blocked to protect your privacy." : "Слике су блокиране да заштите Вашу приватност.",
+    "New message" : "Нова порука",
+    "Settings" : "Подешавања",
+    "Speed up your Mail experience with these quick shortcuts." : "Убрзајте рад са Поштом са овим брзим пречицама.",
+    "Compose new message" : "Напиши нову поруку",
+    "Newer message" : "Новије поруке",
+    "Older message" : "Старије поруке",
+    "Toggle star" : "Додај/склони звездицу",
+    "Toggle unread" : "Означи као прочитано/непрочитано",
+    "Search" : "Претражи",
+    "Refresh" : "Освежи",
+    "Connect your mail account" : "Повежи се на налог е-поште",
+    "Show all folders" : "Прикажи све фасцикле",
+    "Collapse folders" : "Сажми фасцикле",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n порука\nод {from}","%n поруке\nод {from}","%n порука\nод {from}"],
+    "Nextcloud Mail" : "Некстклауд Пошта",
+    "All inboxes" : "Сва сандучета",
+    "Could not load {tag}{name}{endtag}" : "Не могу да учитам {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Десио се проблем приликом учитавања {tag}{name}{endtag}",
+    "Could not load the desired message" : "Неуспело учитавање жељене поруке",
+    "Could not load the message" : "Неуспело учитавање поруке",
+    "Error loading message" : "Грешка при учитавању поруке",
+    "Forwarding to %s" : "Прослеђивање на %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Кликните овде ако нисте аутоматски преусмерени у наредних неколико секунди.",
+    "Redirect" : "Преусмеравање",
+    "The link leads to %s" : "Веза води на %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Ако не желите да посетите ту страну, можете се вратити на <a href=\"%s\">Пошту</a>.",
+    "Continue to %s" : "Настави на %s"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/l10n/sv.js b/l10n/sv.js
index 0960a9bbe..8b8d7d9b2 100644
--- a/l10n/sv.js
+++ b/l10n/sv.js
@@ -2,56 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "E-post",
-    "Loading accounts" : "Laddar konton",
-    "Error while loading the accounts." : "Fel vid inläsning av konton.",
-    "Can not load this folder." : "Kan inte ladda denna mapp.",
-    "Searching for {query}" : "Söker efter {query}",
-    "Error while deleting message." : "Fel vid radering av  meddelande.",
-    "Forwarded message" : "Vidarebefordrat meddelande",
-    "Choose a folder to store the attachment in" : "Välj en mapp att spara den bifogade filen i",
-    "Attachments saved to Files." : "Bilagorna har sparats till filer.",
-    "Attachment saved to Files." : "Bilagan har sparats till filer.",
-    "Error while saving attachments to Files." : "Ett fel uppstod när bilagorna sparades till filer.",
-    "Error while saving attachment to Files." : "Ett fel uppstod när bilagan sparades till filer.",
-    "Message flag could not be set." : "Meddelandeflaggan kunde inte ställas in.",
-    "Could not move message." : "Kunde inte flytta meddelande.",
-    "Invalid account" : "Felaktigt konto",
-    "Invalid folder" : "Felaktig mapp",
-    "Error while creating the account: " : "Fel när kontot skulle skapas:",
-    "Unknown error" : "Okänt fel",
-    "Error while updating the account: " : "Fel medan kontot uppdaterades:",
-    "All inboxes" : "alla inkorgar",
-    "you" : "du",
-    "Send message to {email}" : "Skicka meddelande till {email}",
-    "Could not load {tag}{name}{endtag}" : "Kunde inte ladda {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Det blev ett problem när vi skulle ladda {tag}{name}{endtag}",
-    "Could not load your message" : "Kunde inte ladda ditt meddelande",
-    "Could not load the desired message" : "Kunde inte ladda önskat meddelande",
-    "Could not load the message" : "Kunde inte ladda meddelandet",
-    "{from}\n{subject}" : "{från}\n{ämne}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n nytt meddelande \nfrån {from}","%n nya meddelanden \nfrån {from}"],
-    "Nextcloud Mail" : "Nextcloud Mail",
-    "Save" : "Spara",
-    "Saved" : "Sparad",
-    "Show all folders" : "Visa alla kataloger",
-    "Collapse folders" : "Dölj mappar",
-    "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",
-    "An error occurred while uploading {fname}" : "Ett fel inträffade när {fname} laddades upp",
-    "Reply" : "Svara",
-    "Send" : "Skicka",
-    "Sending …" : "Skickar ...",
-    "Message sent!" : "Meddelande skickat!",
-    "Server error" : "Serverfel",
-    "An unknown error occurred" : "Ett okänt fel uppstod",
-    "Opening HTML drafts is not supported yet." : "Att öppna HTML-utkast stöds inte än.",
-    "No writable calendars found" : "Inga skrivbara kalendrar hittade",
-    "Error while importing the calendar event" : "Fel vid import av kalenderhändelse",
-    "Error while downloading calendar event" : "Fel vid nedladdning av kalenderhändelse",
-    "& others" : "& andra",
-    "Error while loading messages." : "Fel vid inläsning av meddelanden.",
-    "Error while refreshing messages." : "Fel när meddelande uppdaterades.",
-    "Setting up your account" : "Sätter upp ditt konto",
     "Inbox" : "Inkorg",
     "Sent" : "Skickat",
     "Drafts" : "Utkast",
@@ -66,69 +16,70 @@ OC.L10N.register(
     "Delete permanently" : "Radera permanent",
     "IMAP web client" : "IMAP webbklient",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Lättanvänd e-postklient som ansluter till din e-postserver via IMAP och SMTP.",
-    "Error loading message" : "Fel vid inläsning av meddelande",
-    "Settings" : "Inställningar",
-    "Forwarding to %s" : "Vidarebefordrar till %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Klicka här om du inte blir omdirigerad inom några sekunder.",
-    "Redirect" : "Omdirigera",
-    "The link leads to %s" : "Länken pekar mot %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Om du inte vill besöka denna sidan så kan du gå tillbaka till <a href=\"%s\">Mail</a>",
-    "Continue to %s" : "Fortsätt till %s",
-    "Delete account" : "Radera konto",
-    "Try again" : "Försök igen",
-    "New message" : "Nytt meddelande",
-    "Account Settings" : "Kontoinställningar",
-    "Aliases" : "Alias",
-    "Mail address" : "E-postadress",
-    "Display Name" : "Visningsnamn",
-    "Account" : "Konto",
-    "Toggle read" : "Växla läst",
-    "Delete" : "Ta bort",
-    "Keyboard shortcuts" : "Tangentbordsgenvägar",
-    "Speed up your Mail experience with these quick shortcuts." : "Snabba upp din E-post-upplevelse med dessa genvägar.",
-    "Compose new message" : "Skapa nytt meddelande",
-    "Newer message" : "Nyare meddelande",
-    "Older message" : "Äldre meddelande",
-    "Toggle star" : "Växla stjärna",
-    "Toggle unread" : "Växla oläst",
-    "Search" : "Sök",
-    "Refresh" : "Uppdatera",
-    "Connect your mail account" : "Anslut ditt e-postkonto",
     "Name" : "Namn",
     "Mail Address" : "E-postadress",
     "Password" : "Lösenord",
-    "Manual configuration" : "Manuellt konfiguration",
     "IMAP Host" : "IMAP-värd",
-    "IMAP security" : "IMAP säkerhet",
     "None" : "Ingen",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP-port",
     "IMAP User" : "Användare",
     "IMAP Password" : "IMAP-lösenord",
     "SMTP Host" : "SMTP Host",
-    "SMTP security" : "SMTP-säkerhet",
     "SMTP Port" : "SMTP-port",
     "SMTP User" : "SMTP-användare",
     "SMTP Password" : "SMTP-lösenord",
     "Connect" : "Anslut",
+    "Add mail account" : "Lägg till e-postkonto",
+    "Use Gravatar and favicon avatars" : "Använd Gravatar och favicon avatarer",
+    "Keyboard shortcuts" : "Tangentbordsgenvägar",
     "from" : "Från",
     "to" : "till",
     "cc" : "cc",
     "bcc" : "bcc",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Observera att avsändaren är en noreply-adress så ditt svar kommer antagligen inte att läsas.",
     "Subject" : "Ämne",
-    "Save all to Files" : "Spara allt till dina filer",
-    "Add mail account" : "Lägg till e-postkonto",
-    "Use Gravatar and favicon avatars" : "Använd Gravatar och favicon avatarer",
-    "No search results for" : "Inga sökresultat hittades för",
-    "The images have been blocked to protect your privacy." : "Bilderna har blockerats av säkerhetsskäl.",
-    "Show images from this sender" : "Visa bilder från denna avsändare",
-    "Forward" : "Vidarebefodra",
-    "No messages in this folder" : "Inga meddelanden i denna mapp",
+    "Sending …" : "Skickar ...",
+    "Message sent!" : "Meddelande skickat!",
+    "Send" : "Skicka",
     "Upload attachment" : "Ladda upp bilaga",
     "Add attachment from Files" : "Lägg till bilaga från Filer",
+    "Choose a file to add as attachment" : "Välj en fil att lägga som bilaga",
+    "No messages in this folder" : "Inga meddelanden i denna mapp",
+    "Delete" : "Ta bort",
+    "Could not load your message" : "Kunde inte ladda ditt meddelande",
     "Import into calendar" : "Importera till kalender",
     "Download attachment" : "Ladda ned bilaga",
-    "Save to Files" : "Spara fil till dina filer"
+    "Save to Files" : "Spara fil till dina filer",
+    "Choose a folder to store the attachment in" : "Välj en mapp att spara den bifogade filen i",
+    "Save all to Files" : "Spara allt till dina filer",
+    "The images have been blocked to protect your privacy." : "Bilderna har blockerats av säkerhetsskäl.",
+    "New message" : "Nytt meddelande",
+    "Settings" : "Inställningar",
+    "Speed up your Mail experience with these quick shortcuts." : "Snabba upp din E-post-upplevelse med dessa genvägar.",
+    "Compose new message" : "Skapa nytt meddelande",
+    "Newer message" : "Nyare meddelande",
+    "Older message" : "Äldre meddelande",
+    "Toggle star" : "Växla stjärna",
+    "Toggle unread" : "Växla oläst",
+    "Search" : "Sök",
+    "Refresh" : "Uppdatera",
+    "Connect your mail account" : "Anslut ditt e-postkonto",
+    "Show all folders" : "Visa alla kataloger",
+    "Collapse folders" : "Dölj mappar",
+    "{from}\n{subject}" : "{från}\n{ämne}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n nytt meddelande \nfrån {from}","%n nya meddelanden \nfrån {from}"],
+    "Nextcloud Mail" : "Nextcloud Mail",
+    "All inboxes" : "alla inkorgar",
+    "Could not load {tag}{name}{endtag}" : "Kunde inte ladda {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Det blev ett problem när vi skulle ladda {tag}{name}{endtag}",
+    "Could not load the desired message" : "Kunde inte ladda önskat meddelande",
+    "Could not load the message" : "Kunde inte ladda meddelandet",
+    "Error loading message" : "Fel vid inläsning av meddelande",
+    "Forwarding to %s" : "Vidarebefordrar till %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Klicka här om du inte blir omdirigerad inom några sekunder.",
+    "Redirect" : "Omdirigera",
+    "The link leads to %s" : "Länken pekar mot %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Om du inte vill besöka denna sidan så kan du gå tillbaka till <a href=\"%s\">Mail</a>",
+    "Continue to %s" : "Fortsätt till %s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/sv.json b/l10n/sv.json
index 338c2d41d..9784841c3 100644
--- a/l10n/sv.json
+++ b/l10n/sv.json
@@ -1,55 +1,5 @@
 { "translations": {
     "Mail" : "E-post",
-    "Loading accounts" : "Laddar konton",
-    "Error while loading the accounts." : "Fel vid inläsning av konton.",
-    "Can not load this folder." : "Kan inte ladda denna mapp.",
-    "Searching for {query}" : "Söker efter {query}",
-    "Error while deleting message." : "Fel vid radering av  meddelande.",
-    "Forwarded message" : "Vidarebefordrat meddelande",
-    "Choose a folder to store the attachment in" : "Välj en mapp att spara den bifogade filen i",
-    "Attachments saved to Files." : "Bilagorna har sparats till filer.",
-    "Attachment saved to Files." : "Bilagan har sparats till filer.",
-    "Error while saving attachments to Files." : "Ett fel uppstod när bilagorna sparades till filer.",
-    "Error while saving attachment to Files." : "Ett fel uppstod när bilagan sparades till filer.",
-    "Message flag could not be set." : "Meddelandeflaggan kunde inte ställas in.",
-    "Could not move message." : "Kunde inte flytta meddelande.",
-    "Invalid account" : "Felaktigt konto",
-    "Invalid folder" : "Felaktig mapp",
-    "Error while creating the account: " : "Fel när kontot skulle skapas:",
-    "Unknown error" : "Okänt fel",
-    "Error while updating the account: " : "Fel medan kontot uppdaterades:",
-    "All inboxes" : "alla inkorgar",
-    "you" : "du",
-    "Send message to {email}" : "Skicka meddelande till {email}",
-    "Could not load {tag}{name}{endtag}" : "Kunde inte ladda {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Det blev ett problem när vi skulle ladda {tag}{name}{endtag}",
-    "Could not load your message" : "Kunde inte ladda ditt meddelande",
-    "Could not load the desired message" : "Kunde inte ladda önskat meddelande",
-    "Could not load the message" : "Kunde inte ladda meddelandet",
-    "{from}\n{subject}" : "{från}\n{ämne}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n nytt meddelande \nfrån {from}","%n nya meddelanden \nfrån {from}"],
-    "Nextcloud Mail" : "Nextcloud Mail",
-    "Save" : "Spara",
-    "Saved" : "Sparad",
-    "Show all folders" : "Visa alla kataloger",
-    "Collapse folders" : "Dölj mappar",
-    "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",
-    "An error occurred while uploading {fname}" : "Ett fel inträffade när {fname} laddades upp",
-    "Reply" : "Svara",
-    "Send" : "Skicka",
-    "Sending …" : "Skickar ...",
-    "Message sent!" : "Meddelande skickat!",
-    "Server error" : "Serverfel",
-    "An unknown error occurred" : "Ett okänt fel uppstod",
-    "Opening HTML drafts is not supported yet." : "Att öppna HTML-utkast stöds inte än.",
-    "No writable calendars found" : "Inga skrivbara kalendrar hittade",
-    "Error while importing the calendar event" : "Fel vid import av kalenderhändelse",
-    "Error while downloading calendar event" : "Fel vid nedladdning av kalenderhändelse",
-    "& others" : "& andra",
-    "Error while loading messages." : "Fel vid inläsning av meddelanden.",
-    "Error while refreshing messages." : "Fel när meddelande uppdaterades.",
-    "Setting up your account" : "Sätter upp ditt konto",
     "Inbox" : "Inkorg",
     "Sent" : "Skickat",
     "Drafts" : "Utkast",
@@ -64,69 +14,70 @@
     "Delete permanently" : "Radera permanent",
     "IMAP web client" : "IMAP webbklient",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "Lättanvänd e-postklient som ansluter till din e-postserver via IMAP och SMTP.",
-    "Error loading message" : "Fel vid inläsning av meddelande",
-    "Settings" : "Inställningar",
-    "Forwarding to %s" : "Vidarebefordrar till %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "Klicka här om du inte blir omdirigerad inom några sekunder.",
-    "Redirect" : "Omdirigera",
-    "The link leads to %s" : "Länken pekar mot %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Om du inte vill besöka denna sidan så kan du gå tillbaka till <a href=\"%s\">Mail</a>",
-    "Continue to %s" : "Fortsätt till %s",
-    "Delete account" : "Radera konto",
-    "Try again" : "Försök igen",
-    "New message" : "Nytt meddelande",
-    "Account Settings" : "Kontoinställningar",
-    "Aliases" : "Alias",
-    "Mail address" : "E-postadress",
-    "Display Name" : "Visningsnamn",
-    "Account" : "Konto",
-    "Toggle read" : "Växla läst",
-    "Delete" : "Ta bort",
-    "Keyboard shortcuts" : "Tangentbordsgenvägar",
-    "Speed up your Mail experience with these quick shortcuts." : "Snabba upp din E-post-upplevelse med dessa genvägar.",
-    "Compose new message" : "Skapa nytt meddelande",
-    "Newer message" : "Nyare meddelande",
-    "Older message" : "Äldre meddelande",
-    "Toggle star" : "Växla stjärna",
-    "Toggle unread" : "Växla oläst",
-    "Search" : "Sök",
-    "Refresh" : "Uppdatera",
-    "Connect your mail account" : "Anslut ditt e-postkonto",
     "Name" : "Namn",
     "Mail Address" : "E-postadress",
     "Password" : "Lösenord",
-    "Manual configuration" : "Manuellt konfiguration",
     "IMAP Host" : "IMAP-värd",
-    "IMAP security" : "IMAP säkerhet",
     "None" : "Ingen",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP-port",
     "IMAP User" : "Användare",
     "IMAP Password" : "IMAP-lösenord",
     "SMTP Host" : "SMTP Host",
-    "SMTP security" : "SMTP-säkerhet",
     "SMTP Port" : "SMTP-port",
     "SMTP User" : "SMTP-användare",
     "SMTP Password" : "SMTP-lösenord",
     "Connect" : "Anslut",
+    "Add mail account" : "Lägg till e-postkonto",
+    "Use Gravatar and favicon avatars" : "Använd Gravatar och favicon avatarer",
+    "Keyboard shortcuts" : "Tangentbordsgenvägar",
     "from" : "Från",
     "to" : "till",
     "cc" : "cc",
     "bcc" : "bcc",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Observera att avsändaren är en noreply-adress så ditt svar kommer antagligen inte att läsas.",
     "Subject" : "Ämne",
-    "Save all to Files" : "Spara allt till dina filer",
-    "Add mail account" : "Lägg till e-postkonto",
-    "Use Gravatar and favicon avatars" : "Använd Gravatar och favicon avatarer",
-    "No search results for" : "Inga sökresultat hittades för",
-    "The images have been blocked to protect your privacy." : "Bilderna har blockerats av säkerhetsskäl.",
-    "Show images from this sender" : "Visa bilder från denna avsändare",
-    "Forward" : "Vidarebefodra",
-    "No messages in this folder" : "Inga meddelanden i denna mapp",
+    "Sending …" : "Skickar ...",
+    "Message sent!" : "Meddelande skickat!",
+    "Send" : "Skicka",
     "Upload attachment" : "Ladda upp bilaga",
     "Add attachment from Files" : "Lägg till bilaga från Filer",
+    "Choose a file to add as attachment" : "Välj en fil att lägga som bilaga",
+    "No messages in this folder" : "Inga meddelanden i denna mapp",
+    "Delete" : "Ta bort",
+    "Could not load your message" : "Kunde inte ladda ditt meddelande",
     "Import into calendar" : "Importera till kalender",
     "Download attachment" : "Ladda ned bilaga",
-    "Save to Files" : "Spara fil till dina filer"
+    "Save to Files" : "Spara fil till dina filer",
+    "Choose a folder to store the attachment in" : "Välj en mapp att spara den bifogade filen i",
+    "Save all to Files" : "Spara allt till dina filer",
+    "The images have been blocked to protect your privacy." : "Bilderna har blockerats av säkerhetsskäl.",
+    "New message" : "Nytt meddelande",
+    "Settings" : "Inställningar",
+    "Speed up your Mail experience with these quick shortcuts." : "Snabba upp din E-post-upplevelse med dessa genvägar.",
+    "Compose new message" : "Skapa nytt meddelande",
+    "Newer message" : "Nyare meddelande",
+    "Older message" : "Äldre meddelande",
+    "Toggle star" : "Växla stjärna",
+    "Toggle unread" : "Växla oläst",
+    "Search" : "Sök",
+    "Refresh" : "Uppdatera",
+    "Connect your mail account" : "Anslut ditt e-postkonto",
+    "Show all folders" : "Visa alla kataloger",
+    "Collapse folders" : "Dölj mappar",
+    "{from}\n{subject}" : "{från}\n{ämne}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n nytt meddelande \nfrån {from}","%n nya meddelanden \nfrån {from}"],
+    "Nextcloud Mail" : "Nextcloud Mail",
+    "All inboxes" : "alla inkorgar",
+    "Could not load {tag}{name}{endtag}" : "Kunde inte ladda {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Det blev ett problem när vi skulle ladda {tag}{name}{endtag}",
+    "Could not load the desired message" : "Kunde inte ladda önskat meddelande",
+    "Could not load the message" : "Kunde inte ladda meddelandet",
+    "Error loading message" : "Fel vid inläsning av meddelande",
+    "Forwarding to %s" : "Vidarebefordrar till %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "Klicka här om du inte blir omdirigerad inom några sekunder.",
+    "Redirect" : "Omdirigera",
+    "The link leads to %s" : "Länken pekar mot %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Om du inte vill besöka denna sidan så kan du gå tillbaka till <a href=\"%s\">Mail</a>",
+    "Continue to %s" : "Fortsätt till %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/th.js b/l10n/th.js
index 7aa266299..f372863a0 100644
--- a/l10n/th.js
+++ b/l10n/th.js
@@ -2,37 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "จดหมาย",
-    "Error while loading the accounts." : "ข้อผิดพลาดในขณะที่โหลดบัญชี",
-    "Error while deleting message." : "ข้อผิดพลาดขณะลบข้อความ",
-    "Forwarded message" : "ส่งต่อข้อความ",
-    "Choose a folder to store the attachment in" : "เลือกโฟลเดอร์ที่จะเก็บสิ่งที่แนบมาใน",
-    "Attachments saved to Files." : "สิ่งที่แนบมาถูกบันทึกไว้ในไฟล์",
-    "Attachment saved to Files." : "สิ่งที่แนบมาถูกบันทึกไว้ในไฟล์",
-    "Error while saving attachments to Files." : "ข้อผิดพลาดขณะกำลังบันทึกสิ่งที่แนบไปยังไฟล์",
-    "Error while saving attachment to Files." : "ข้อผิดพลาดขณะกำลังบันทึกสิ่งที่แนบไปยังไฟล์",
-    "Message flag could not be set." : "ไม่สามารถตั้งค่าสถานะของข้อความ",
-    "Invalid account" : "บัญชีไม่ถูกต้อง",
-    "Invalid folder" : "โฟลเดอร์ไม่ถูกต้อง",
-    "Unknown error" : "ข้อผิดพลาดที่ไม่ทราบสาเหตุ",
-    "All inboxes" : "กล่องจดหมายทั้งหมด",
-    "you" : "คุณ",
-    "Send message to {email}" : "ส่งข้อความไปยัง {email}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "Show all folders" : "แสดงโฟลเดอร์ทั้งหมด",
-    "Collapse folders" : "ยุบโฟลเดอร์",
-    "Error while deleting account." : "ข้อผิดพลาดขณะลบบัญชี",
-    "Choose a file to add as attachment" : "เลือกไฟล์ที่ต้องการแนบ",
-    "Reply" : "ตอบกลับ",
-    "Send" : "ส่ง",
-    "Sending …" : "กำลังส่ง ...",
-    "Message sent!" : "ส่งข้อความ!",
-    "Server error" : "ข้อผิดพลาดของเซิร์ฟเวอร์",
-    "Opening HTML drafts is not supported yet." : "เปิดแบบร่าง HTML ยังไม่รองรับในตอนนี้",
-    "No writable calendars found" : "ไม่พบปฏิทินที่สามารถเขียนได้",
-    "Error while importing the calendar event" : "ข้อผิดพลาดขณะนำเข้ากิจกรรมในปฏิทิน",
-    "Error while downloading calendar event" : "ข้อผิดพลาดขณะดาวน์โหลดเหตุการณ์ปฏิทิน",
-    "& others" : "และอื่นๆ",
-    "Error while loading messages." : "ข้อผิดพลาดขณะโหลดข้อความ",
     "Inbox" : "กล่องขาเข้า",
     "Sent" : "ส่ง",
     "Drafts" : "แบบร่าง",
@@ -44,11 +13,20 @@ OC.L10N.register(
     "Auto detect failed. Please use manual mode." : "ตรวจจับอัตโนมัติล้มเหลว กรุณาใช้โหมดควบคุมด้วยตนเอง",
     "Creating account failed: " : "สร้างบัญชีล้มเหลว:",
     "Delete permanently" : "ลบแบบถาวร",
+    "Connect" : "เชื่อมต่อ",
+    "Sending …" : "กำลังส่ง ...",
+    "Message sent!" : "ส่งข้อความ!",
+    "Send" : "ส่ง",
+    "Choose a file to add as attachment" : "เลือกไฟล์ที่ต้องการแนบ",
+    "Choose a folder to store the attachment in" : "เลือกโฟลเดอร์ที่จะเก็บสิ่งที่แนบมาใน",
+    "Show all folders" : "แสดงโฟลเดอร์ทั้งหมด",
+    "Collapse folders" : "ยุบโฟลเดอร์",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "All inboxes" : "กล่องจดหมายทั้งหมด",
     "Error loading message" : "กิดข้อผิดพลาดในการโหลด",
     "Redirect" : "เปลี่ยนเส้นทาง",
     "The link leads to %s" : "ลิงค์ที่จะนำไปยัง %s",
     "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "หากคุณไม่ต้องการเข้าชมหน้านั้นคุณสามารถกลับไปที่หน้า <a href=\"%s\">จดหมาย</a>",
-    "Continue to %s" : "ดำเนินการต่อไปที่ %s",
-    "Connect" : "เชื่อมต่อ"
+    "Continue to %s" : "ดำเนินการต่อไปที่ %s"
 },
 "nplurals=1; plural=0;");
diff --git a/l10n/th.json b/l10n/th.json
index 8f45d9225..791f83367 100644
--- a/l10n/th.json
+++ b/l10n/th.json
@@ -1,36 +1,5 @@
 { "translations": {
     "Mail" : "จดหมาย",
-    "Error while loading the accounts." : "ข้อผิดพลาดในขณะที่โหลดบัญชี",
-    "Error while deleting message." : "ข้อผิดพลาดขณะลบข้อความ",
-    "Forwarded message" : "ส่งต่อข้อความ",
-    "Choose a folder to store the attachment in" : "เลือกโฟลเดอร์ที่จะเก็บสิ่งที่แนบมาใน",
-    "Attachments saved to Files." : "สิ่งที่แนบมาถูกบันทึกไว้ในไฟล์",
-    "Attachment saved to Files." : "สิ่งที่แนบมาถูกบันทึกไว้ในไฟล์",
-    "Error while saving attachments to Files." : "ข้อผิดพลาดขณะกำลังบันทึกสิ่งที่แนบไปยังไฟล์",
-    "Error while saving attachment to Files." : "ข้อผิดพลาดขณะกำลังบันทึกสิ่งที่แนบไปยังไฟล์",
-    "Message flag could not be set." : "ไม่สามารถตั้งค่าสถานะของข้อความ",
-    "Invalid account" : "บัญชีไม่ถูกต้อง",
-    "Invalid folder" : "โฟลเดอร์ไม่ถูกต้อง",
-    "Unknown error" : "ข้อผิดพลาดที่ไม่ทราบสาเหตุ",
-    "All inboxes" : "กล่องจดหมายทั้งหมด",
-    "you" : "คุณ",
-    "Send message to {email}" : "ส่งข้อความไปยัง {email}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "Show all folders" : "แสดงโฟลเดอร์ทั้งหมด",
-    "Collapse folders" : "ยุบโฟลเดอร์",
-    "Error while deleting account." : "ข้อผิดพลาดขณะลบบัญชี",
-    "Choose a file to add as attachment" : "เลือกไฟล์ที่ต้องการแนบ",
-    "Reply" : "ตอบกลับ",
-    "Send" : "ส่ง",
-    "Sending …" : "กำลังส่ง ...",
-    "Message sent!" : "ส่งข้อความ!",
-    "Server error" : "ข้อผิดพลาดของเซิร์ฟเวอร์",
-    "Opening HTML drafts is not supported yet." : "เปิดแบบร่าง HTML ยังไม่รองรับในตอนนี้",
-    "No writable calendars found" : "ไม่พบปฏิทินที่สามารถเขียนได้",
-    "Error while importing the calendar event" : "ข้อผิดพลาดขณะนำเข้ากิจกรรมในปฏิทิน",
-    "Error while downloading calendar event" : "ข้อผิดพลาดขณะดาวน์โหลดเหตุการณ์ปฏิทิน",
-    "& others" : "และอื่นๆ",
-    "Error while loading messages." : "ข้อผิดพลาดขณะโหลดข้อความ",
     "Inbox" : "กล่องขาเข้า",
     "Sent" : "ส่ง",
     "Drafts" : "แบบร่าง",
@@ -42,11 +11,20 @@
     "Auto detect failed. Please use manual mode." : "ตรวจจับอัตโนมัติล้มเหลว กรุณาใช้โหมดควบคุมด้วยตนเอง",
     "Creating account failed: " : "สร้างบัญชีล้มเหลว:",
     "Delete permanently" : "ลบแบบถาวร",
+    "Connect" : "เชื่อมต่อ",
+    "Sending …" : "กำลังส่ง ...",
+    "Message sent!" : "ส่งข้อความ!",
+    "Send" : "ส่ง",
+    "Choose a file to add as attachment" : "เลือกไฟล์ที่ต้องการแนบ",
+    "Choose a folder to store the attachment in" : "เลือกโฟลเดอร์ที่จะเก็บสิ่งที่แนบมาใน",
+    "Show all folders" : "แสดงโฟลเดอร์ทั้งหมด",
+    "Collapse folders" : "ยุบโฟลเดอร์",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "All inboxes" : "กล่องจดหมายทั้งหมด",
     "Error loading message" : "กิดข้อผิดพลาดในการโหลด",
     "Redirect" : "เปลี่ยนเส้นทาง",
     "The link leads to %s" : "ลิงค์ที่จะนำไปยัง %s",
     "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "หากคุณไม่ต้องการเข้าชมหน้านั้นคุณสามารถกลับไปที่หน้า <a href=\"%s\">จดหมาย</a>",
-    "Continue to %s" : "ดำเนินการต่อไปที่ %s",
-    "Connect" : "เชื่อมต่อ"
+    "Continue to %s" : "ดำเนินการต่อไปที่ %s"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/l10n/tr.js b/l10n/tr.js
index bdc2fe667..7e8a084a7 100644
--- a/l10n/tr.js
+++ b/l10n/tr.js
@@ -2,56 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "Posta",
-    "Loading accounts" : "Hesaplar yükleniyor",
-    "Error while loading the accounts." : "Hesaplar yüklenirken sorun çıktı.",
-    "Can not load this folder." : "Bu klasör yüklenemedi.",
-    "Searching for {query}" : "{query} aranıyor",
-    "Error while deleting message." : "İleti silinirken sorun çıktı.",
-    "Forwarded message" : "İletilmiş ileti",
-    "Choose a folder to store the attachment in" : "Ek dosyasının depolanacağı bir klasör seçin",
-    "Attachments saved to Files." : "Ek Dosya Dosyalara kaydedildi.",
-    "Attachment saved to Files." : "Ek Dosya Dosyalara kaydedildi.",
-    "Error while saving attachments to Files." : "Ek dosyalar Dosyalara kaydedilirken sorun çıktı.",
-    "Error while saving attachment to Files." : "Ek dosya Dosyalara kaydedilirken sorun çıktı.",
-    "Message flag could not be set." : "İleti işareti ayarlanamadı.",
-    "Could not move message." : "İleti taşınamadı.",
-    "Invalid account" : "Hesap geçersiz",
-    "Invalid folder" : "Klasör geçersiz",
-    "Error while creating the account: " : "Hesap eklenirken sorun çıktı:",
-    "Unknown error" : "Bilinmeyen bir sorun çıktı",
-    "Error while updating the account: " : "Hesap güncellenirken sorun çıktı:",
-    "All inboxes" : "Tüm gelen kutuları",
-    "you" : "siz",
-    "Send message to {email}" : "{email} adresine ileti gönder",
-    "Could not load {tag}{name}{endtag}" : "{tag}{name}{endtag} yüklenemedi",
-    "There was a problem loading {tag}{name}{endtag}" : "{tag}{name}{endtag} yüklenirken bir sorun çıktı",
-    "Could not load your message" : "İletiniz yüklenemedi",
-    "Could not load the desired message" : "İstenilen ileti yüklenemedi",
-    "Could not load the message" : "İleti yüklenemedi",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n yeni ileti\ngönderen {from}","%n yeni ileti\ngönderen {from}"],
-    "Nextcloud Mail" : "Nextcloud Posta",
-    "Save" : "Kaydet",
-    "Saved" : "Kaydedildi",
-    "Show all folders" : "Tüm klasörleri görüntüle",
-    "Collapse folders" : "Klasörleri daralt",
-    "Error while deleting account." : "Hesap silinirken sorun çıktı.",
-    "Choose a file to add as attachment" : "Eklenecek ek dosyasını seçin",
-    "An error occurred while uploading {fname}" : "{fname} yüklenirken bir sorun çıktı",
-    "Reply" : "Yanıtla",
-    "Send" : "Gönder",
-    "Sending …" : "Gönderiliyor...",
-    "Message sent!" : "İleti gönderildi!",
-    "Server error" : "Sunucu sorunu",
-    "An unknown error occurred" : "Bilinmeyen bir sorun çıktı",
-    "Opening HTML drafts is not supported yet." : "HTML taslaklarının açılması henüz desteklenmiyor.",
-    "No writable calendars found" : "Yazılabilecek bir takvim bulunamadı",
-    "Error while importing the calendar event" : "Takvim etkinliği içe aktarılırken sorun çıktı",
-    "Error while downloading calendar event" : "Takvim etkinliği indirilirken sorun çıktı",
-    "& others" : "ve diğer",
-    "Error while loading messages." : "İletiler yüklenirken sorun çıktı.",
-    "Error while refreshing messages." : "İletiler yenilenirken sorun çıktı.",
-    "Setting up your account" : "Hesabınız ayarlanıyor",
     "Inbox" : "Gelen Kutusu",
     "Sent" : "Gönderilenler",
     "Drafts" : "Taslaklar",
@@ -66,69 +16,70 @@ OC.L10N.register(
     "Delete permanently" : "Kalıcı olarak sil",
     "IMAP web client" : "IMAP web istemcisi",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "E-posta sunucunuz ile IMAP ve SMTP bağlantısı kuran kullanımı kolay bir e-posta istemcisi.",
-    "Error loading message" : "İleti yüklenirken sorun çıktı",
-    "Settings" : "Ayarlar",
-    "Forwarding to %s" : "%s adresine iletiliyor",
-    "Click here if you are not automatically redirected within the next few seconds." : "Bir kaç saniye içinde otomatik olarak yönlendirilmezseniz buraya tıklayın.",
-    "Redirect" : "Yönlendir",
-    "The link leads to %s" : "Bağlantı %s adresine gidiyor",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Bu sayfayı ziyaret etmek istemiyorsanız, <a href=\"%s\">posta uygulamasına</a> geri dönebilirsiniz.",
-    "Continue to %s" : "%s sayfasına geç",
-    "Delete account" : "Hesabı sil",
-    "Try again" : "Yeniden deneyin",
-    "New message" : "Yeni ileti",
-    "Account Settings" : "Hesap Ayarları",
-    "Aliases" : "Kısaltmalar",
-    "Mail address" : "Posta adresi",
-    "Display Name" : "Görüntülenecek Ad",
-    "Account" : "Hesap",
-    "Toggle read" : "Okunmuş işaretini değiştir",
-    "Delete" : "Sil",
-    "Keyboard shortcuts" : "Tuş takımı kısayolları",
-    "Speed up your Mail experience with these quick shortcuts." : "Kısayol tuşlarını kullanarak e-posta deneyiminizi hızlandırabilirsiniz.",
-    "Compose new message" : "Yeni ileti gönder",
-    "Newer message" : "Daha yeni ileti",
-    "Older message" : "Daha eski ileti",
-    "Toggle star" : "Yıldızı değiştir",
-    "Toggle unread" : "Okunmamış işaretini değiştir",
-    "Search" : "Arama",
-    "Refresh" : "Yenlle",
-    "Connect your mail account" : "Posta hesabınızı bağlayın",
     "Name" : "Ad",
     "Mail Address" : "Posta Adresi",
     "Password" : "Parola",
-    "Manual configuration" : "El ile yapılandırma",
     "IMAP Host" : "IMAP Sunucusu",
-    "IMAP security" : "IMAP Güvenliği",
     "None" : "Yok",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP Kapı Numarası",
     "IMAP User" : "IMAP Kullanıcı Adı",
     "IMAP Password" : "IMAP Parolası",
     "SMTP Host" : "SMTP Sunucusu",
-    "SMTP security" : "SMTP Güvenliği",
     "SMTP Port" : "SMTP Kapı Numarası",
     "SMTP User" : "SMTP Kullanıcı Adı",
     "SMTP Password" : "SMTP Parolası",
     "Connect" : "Bağlan",
+    "Add mail account" : "Posta hesabi ekle",
+    "Use Gravatar and favicon avatars" : "Gravatar ve favicon avatarları kullanılsın",
+    "Keyboard shortcuts" : "Tuş takımı kısayolları",
     "from" : "kimden",
     "to" : "kime",
     "cc" : "kopya",
     "bcc" : "gizli kopya",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Posta noreply adresinden gönderildiğinden yanıtınızın okunmayabileceğini unutmayın",
     "Subject" : "Konu",
-    "Save all to Files" : "Tümünü dosyalara kaydet",
-    "Add mail account" : "Posta hesabi ekle",
-    "Use Gravatar and favicon avatars" : "Gravatar ve favicon avatarları kullanılsın",
-    "No search results for" : "Şu aramadan bir sonuç alınamadı",
-    "The images have been blocked to protect your privacy." : "Gizliliğinizi korumak için görsellerin görüntülenmesi engellendi.",
-    "Show images from this sender" : "Bu gönderenden gelen görseller görüntülensin",
-    "Forward" : "İlet",
-    "No messages in this folder" : "Bu klasörde herhangi bir ileti yok",
+    "Sending …" : "Gönderiliyor...",
+    "Message sent!" : "İleti gönderildi!",
+    "Send" : "Gönder",
     "Upload attachment" : "Ek dosya yükle",
     "Add attachment from Files" : "Dosyalardan ek dosya ekle",
+    "Choose a file to add as attachment" : "Eklenecek ek dosyasını seçin",
+    "No messages in this folder" : "Bu klasörde herhangi bir ileti yok",
+    "Delete" : "Sil",
+    "Could not load your message" : "İletiniz yüklenemedi",
     "Import into calendar" : "Şu takvimin içine aktar",
     "Download attachment" : "Ek dosyayı indir",
-    "Save to Files" : "Dosyalara Kaydet"
+    "Save to Files" : "Dosyalara Kaydet",
+    "Choose a folder to store the attachment in" : "Ek dosyasının depolanacağı bir klasör seçin",
+    "Save all to Files" : "Tümünü dosyalara kaydet",
+    "The images have been blocked to protect your privacy." : "Gizliliğinizi korumak için görsellerin görüntülenmesi engellendi.",
+    "New message" : "Yeni ileti",
+    "Settings" : "Ayarlar",
+    "Speed up your Mail experience with these quick shortcuts." : "Kısayol tuşlarını kullanarak e-posta deneyiminizi hızlandırabilirsiniz.",
+    "Compose new message" : "Yeni ileti gönder",
+    "Newer message" : "Daha yeni ileti",
+    "Older message" : "Daha eski ileti",
+    "Toggle star" : "Yıldızı değiştir",
+    "Toggle unread" : "Okunmamış işaretini değiştir",
+    "Search" : "Arama",
+    "Refresh" : "Yenlle",
+    "Connect your mail account" : "Posta hesabınızı bağlayın",
+    "Show all folders" : "Tüm klasörleri görüntüle",
+    "Collapse folders" : "Klasörleri daralt",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n yeni ileti\ngönderen {from}","%n yeni ileti\ngönderen {from}"],
+    "Nextcloud Mail" : "Nextcloud Posta",
+    "All inboxes" : "Tüm gelen kutuları",
+    "Could not load {tag}{name}{endtag}" : "{tag}{name}{endtag} yüklenemedi",
+    "There was a problem loading {tag}{name}{endtag}" : "{tag}{name}{endtag} yüklenirken bir sorun çıktı",
+    "Could not load the desired message" : "İstenilen ileti yüklenemedi",
+    "Could not load the message" : "İleti yüklenemedi",
+    "Error loading message" : "İleti yüklenirken sorun çıktı",
+    "Forwarding to %s" : "%s adresine iletiliyor",
+    "Click here if you are not automatically redirected within the next few seconds." : "Bir kaç saniye içinde otomatik olarak yönlendirilmezseniz buraya tıklayın.",
+    "Redirect" : "Yönlendir",
+    "The link leads to %s" : "Bağlantı %s adresine gidiyor",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Bu sayfayı ziyaret etmek istemiyorsanız, <a href=\"%s\">posta uygulamasına</a> geri dönebilirsiniz.",
+    "Continue to %s" : "%s sayfasına geç"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/l10n/tr.json b/l10n/tr.json
index 071c5e88d..d7dea6b77 100644
--- a/l10n/tr.json
+++ b/l10n/tr.json
@@ -1,55 +1,5 @@
 { "translations": {
     "Mail" : "Posta",
-    "Loading accounts" : "Hesaplar yükleniyor",
-    "Error while loading the accounts." : "Hesaplar yüklenirken sorun çıktı.",
-    "Can not load this folder." : "Bu klasör yüklenemedi.",
-    "Searching for {query}" : "{query} aranıyor",
-    "Error while deleting message." : "İleti silinirken sorun çıktı.",
-    "Forwarded message" : "İletilmiş ileti",
-    "Choose a folder to store the attachment in" : "Ek dosyasının depolanacağı bir klasör seçin",
-    "Attachments saved to Files." : "Ek Dosya Dosyalara kaydedildi.",
-    "Attachment saved to Files." : "Ek Dosya Dosyalara kaydedildi.",
-    "Error while saving attachments to Files." : "Ek dosyalar Dosyalara kaydedilirken sorun çıktı.",
-    "Error while saving attachment to Files." : "Ek dosya Dosyalara kaydedilirken sorun çıktı.",
-    "Message flag could not be set." : "İleti işareti ayarlanamadı.",
-    "Could not move message." : "İleti taşınamadı.",
-    "Invalid account" : "Hesap geçersiz",
-    "Invalid folder" : "Klasör geçersiz",
-    "Error while creating the account: " : "Hesap eklenirken sorun çıktı:",
-    "Unknown error" : "Bilinmeyen bir sorun çıktı",
-    "Error while updating the account: " : "Hesap güncellenirken sorun çıktı:",
-    "All inboxes" : "Tüm gelen kutuları",
-    "you" : "siz",
-    "Send message to {email}" : "{email} adresine ileti gönder",
-    "Could not load {tag}{name}{endtag}" : "{tag}{name}{endtag} yüklenemedi",
-    "There was a problem loading {tag}{name}{endtag}" : "{tag}{name}{endtag} yüklenirken bir sorun çıktı",
-    "Could not load your message" : "İletiniz yüklenemedi",
-    "Could not load the desired message" : "İstenilen ileti yüklenemedi",
-    "Could not load the message" : "İleti yüklenemedi",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n yeni ileti\ngönderen {from}","%n yeni ileti\ngönderen {from}"],
-    "Nextcloud Mail" : "Nextcloud Posta",
-    "Save" : "Kaydet",
-    "Saved" : "Kaydedildi",
-    "Show all folders" : "Tüm klasörleri görüntüle",
-    "Collapse folders" : "Klasörleri daralt",
-    "Error while deleting account." : "Hesap silinirken sorun çıktı.",
-    "Choose a file to add as attachment" : "Eklenecek ek dosyasını seçin",
-    "An error occurred while uploading {fname}" : "{fname} yüklenirken bir sorun çıktı",
-    "Reply" : "Yanıtla",
-    "Send" : "Gönder",
-    "Sending …" : "Gönderiliyor...",
-    "Message sent!" : "İleti gönderildi!",
-    "Server error" : "Sunucu sorunu",
-    "An unknown error occurred" : "Bilinmeyen bir sorun çıktı",
-    "Opening HTML drafts is not supported yet." : "HTML taslaklarının açılması henüz desteklenmiyor.",
-    "No writable calendars found" : "Yazılabilecek bir takvim bulunamadı",
-    "Error while importing the calendar event" : "Takvim etkinliği içe aktarılırken sorun çıktı",
-    "Error while downloading calendar event" : "Takvim etkinliği indirilirken sorun çıktı",
-    "& others" : "ve diğer",
-    "Error while loading messages." : "İletiler yüklenirken sorun çıktı.",
-    "Error while refreshing messages." : "İletiler yenilenirken sorun çıktı.",
-    "Setting up your account" : "Hesabınız ayarlanıyor",
     "Inbox" : "Gelen Kutusu",
     "Sent" : "Gönderilenler",
     "Drafts" : "Taslaklar",
@@ -64,69 +14,70 @@
     "Delete permanently" : "Kalıcı olarak sil",
     "IMAP web client" : "IMAP web istemcisi",
     "Easy to use email client which connects to your mail server via IMAP and SMTP." : "E-posta sunucunuz ile IMAP ve SMTP bağlantısı kuran kullanımı kolay bir e-posta istemcisi.",
-    "Error loading message" : "İleti yüklenirken sorun çıktı",
-    "Settings" : "Ayarlar",
-    "Forwarding to %s" : "%s adresine iletiliyor",
-    "Click here if you are not automatically redirected within the next few seconds." : "Bir kaç saniye içinde otomatik olarak yönlendirilmezseniz buraya tıklayın.",
-    "Redirect" : "Yönlendir",
-    "The link leads to %s" : "Bağlantı %s adresine gidiyor",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Bu sayfayı ziyaret etmek istemiyorsanız, <a href=\"%s\">posta uygulamasına</a> geri dönebilirsiniz.",
-    "Continue to %s" : "%s sayfasına geç",
-    "Delete account" : "Hesabı sil",
-    "Try again" : "Yeniden deneyin",
-    "New message" : "Yeni ileti",
-    "Account Settings" : "Hesap Ayarları",
-    "Aliases" : "Kısaltmalar",
-    "Mail address" : "Posta adresi",
-    "Display Name" : "Görüntülenecek Ad",
-    "Account" : "Hesap",
-    "Toggle read" : "Okunmuş işaretini değiştir",
-    "Delete" : "Sil",
-    "Keyboard shortcuts" : "Tuş takımı kısayolları",
-    "Speed up your Mail experience with these quick shortcuts." : "Kısayol tuşlarını kullanarak e-posta deneyiminizi hızlandırabilirsiniz.",
-    "Compose new message" : "Yeni ileti gönder",
-    "Newer message" : "Daha yeni ileti",
-    "Older message" : "Daha eski ileti",
-    "Toggle star" : "Yıldızı değiştir",
-    "Toggle unread" : "Okunmamış işaretini değiştir",
-    "Search" : "Arama",
-    "Refresh" : "Yenlle",
-    "Connect your mail account" : "Posta hesabınızı bağlayın",
     "Name" : "Ad",
     "Mail Address" : "Posta Adresi",
     "Password" : "Parola",
-    "Manual configuration" : "El ile yapılandırma",
     "IMAP Host" : "IMAP Sunucusu",
-    "IMAP security" : "IMAP Güvenliği",
     "None" : "Yok",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP Kapı Numarası",
     "IMAP User" : "IMAP Kullanıcı Adı",
     "IMAP Password" : "IMAP Parolası",
     "SMTP Host" : "SMTP Sunucusu",
-    "SMTP security" : "SMTP Güvenliği",
     "SMTP Port" : "SMTP Kapı Numarası",
     "SMTP User" : "SMTP Kullanıcı Adı",
     "SMTP Password" : "SMTP Parolası",
     "Connect" : "Bağlan",
+    "Add mail account" : "Posta hesabi ekle",
+    "Use Gravatar and favicon avatars" : "Gravatar ve favicon avatarları kullanılsın",
+    "Keyboard shortcuts" : "Tuş takımı kısayolları",
     "from" : "kimden",
     "to" : "kime",
     "cc" : "kopya",
     "bcc" : "gizli kopya",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "Posta noreply adresinden gönderildiğinden yanıtınızın okunmayabileceğini unutmayın",
     "Subject" : "Konu",
-    "Save all to Files" : "Tümünü dosyalara kaydet",
-    "Add mail account" : "Posta hesabi ekle",
-    "Use Gravatar and favicon avatars" : "Gravatar ve favicon avatarları kullanılsın",
-    "No search results for" : "Şu aramadan bir sonuç alınamadı",
-    "The images have been blocked to protect your privacy." : "Gizliliğinizi korumak için görsellerin görüntülenmesi engellendi.",
-    "Show images from this sender" : "Bu gönderenden gelen görseller görüntülensin",
-    "Forward" : "İlet",
-    "No messages in this folder" : "Bu klasörde herhangi bir ileti yok",
+    "Sending …" : "Gönderiliyor...",
+    "Message sent!" : "İleti gönderildi!",
+    "Send" : "Gönder",
     "Upload attachment" : "Ek dosya yükle",
     "Add attachment from Files" : "Dosyalardan ek dosya ekle",
+    "Choose a file to add as attachment" : "Eklenecek ek dosyasını seçin",
+    "No messages in this folder" : "Bu klasörde herhangi bir ileti yok",
+    "Delete" : "Sil",
+    "Could not load your message" : "İletiniz yüklenemedi",
     "Import into calendar" : "Şu takvimin içine aktar",
     "Download attachment" : "Ek dosyayı indir",
-    "Save to Files" : "Dosyalara Kaydet"
+    "Save to Files" : "Dosyalara Kaydet",
+    "Choose a folder to store the attachment in" : "Ek dosyasının depolanacağı bir klasör seçin",
+    "Save all to Files" : "Tümünü dosyalara kaydet",
+    "The images have been blocked to protect your privacy." : "Gizliliğinizi korumak için görsellerin görüntülenmesi engellendi.",
+    "New message" : "Yeni ileti",
+    "Settings" : "Ayarlar",
+    "Speed up your Mail experience with these quick shortcuts." : "Kısayol tuşlarını kullanarak e-posta deneyiminizi hızlandırabilirsiniz.",
+    "Compose new message" : "Yeni ileti gönder",
+    "Newer message" : "Daha yeni ileti",
+    "Older message" : "Daha eski ileti",
+    "Toggle star" : "Yıldızı değiştir",
+    "Toggle unread" : "Okunmamış işaretini değiştir",
+    "Search" : "Arama",
+    "Refresh" : "Yenlle",
+    "Connect your mail account" : "Posta hesabınızı bağlayın",
+    "Show all folders" : "Tüm klasörleri görüntüle",
+    "Collapse folders" : "Klasörleri daralt",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n yeni ileti\ngönderen {from}","%n yeni ileti\ngönderen {from}"],
+    "Nextcloud Mail" : "Nextcloud Posta",
+    "All inboxes" : "Tüm gelen kutuları",
+    "Could not load {tag}{name}{endtag}" : "{tag}{name}{endtag} yüklenemedi",
+    "There was a problem loading {tag}{name}{endtag}" : "{tag}{name}{endtag} yüklenirken bir sorun çıktı",
+    "Could not load the desired message" : "İstenilen ileti yüklenemedi",
+    "Could not load the message" : "İleti yüklenemedi",
+    "Error loading message" : "İleti yüklenirken sorun çıktı",
+    "Forwarding to %s" : "%s adresine iletiliyor",
+    "Click here if you are not automatically redirected within the next few seconds." : "Bir kaç saniye içinde otomatik olarak yönlendirilmezseniz buraya tıklayın.",
+    "Redirect" : "Yönlendir",
+    "The link leads to %s" : "Bağlantı %s adresine gidiyor",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "Bu sayfayı ziyaret etmek istemiyorsanız, <a href=\"%s\">posta uygulamasına</a> geri dönebilirsiniz.",
+    "Continue to %s" : "%s sayfasına geç"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/l10n/uk.js b/l10n/uk.js
deleted file mode 100644
index 23a900a45..000000000
--- a/l10n/uk.js
+++ /dev/null
@@ -1,46 +0,0 @@
-OC.L10N.register(
-    "mail",
-    {
-    "Mail" : "Повідомлення",
-    "Error while loading the accounts." : "Помилка завантаження облікового запису",
-    "Error while deleting message." : "Помилка видалення повідомлення.",
-    "Forwarded message" : "Пререадресоване повідомлення",
-    "Choose a folder to store the attachment in" : "Оберіть теку для зберігання вкладень",
-    "Attachments saved to Files." : "Вкладення збережені до Файлів.",
-    "Attachment saved to Files." : "Вкладення збережено до Файлів.",
-    "Error while saving attachments to Files." : "Помилка збереження вкладень до Файлів.",
-    "Error while saving attachment to Files." : "Помилка збереження вкладення до Файлів.",
-    "Invalid folder" : "Невірна тека",
-    "Unknown error" : "Невідома помилка",
-    "All inboxes" : "Всі вхідні",
-    "you" : "ви",
-    "Send message to {email}" : "Надіслати повідомлення {email}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "Show all folders" : "Переглянути всі теки",
-    "Collapse folders" : "Згорнути теки",
-    "Error while deleting account." : "Помилка при видалені облікового запису.",
-    "Choose a file to add as attachment" : "Обрати файл для вкладення",
-    "Reply" : "Відповісти",
-    "Send" : "Надіслати",
-    "Sending …" : "Надсилання...",
-    "Message sent!" : "Повідомлення відправлено!",
-    "Server error" : "Помилка серверу",
-    "Opening HTML drafts is not supported yet." : "Відкриті HTML чернетки поки не підтримуються.",
-    "& others" : "та інші",
-    "Error while loading messages." : "Помилка завантаження повідомлень.",
-    "Inbox" : "Вхідні",
-    "Sent" : "Надіслані",
-    "Drafts" : "Чорновики",
-    "Archive" : "Архів",
-    "Trash" : "Смітник",
-    "Junk" : "Спам",
-    "All" : "Всі",
-    "Favorites" : "Улюблені",
-    "Auto detect failed. Please use manual mode." : "Авто-виявлення не спрацювало. Будь ласка, скористайтесь ручний режимом.",
-    "Creating account failed: " : "Помилка створення облікового запису:",
-    "Delete permanently" : "Видалити назавжди",
-    "Error loading message" : "Помилка завантаження повідомлення.",
-    "Continue to %s" : "Подовження за %s",
-    "Connect" : "З'єднати"
-},
-"nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);");
diff --git a/l10n/uk.json b/l10n/uk.json
deleted file mode 100644
index 20f2a8d09..000000000
--- a/l10n/uk.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{ "translations": {
-    "Mail" : "Повідомлення",
-    "Error while loading the accounts." : "Помилка завантаження облікового запису",
-    "Error while deleting message." : "Помилка видалення повідомлення.",
-    "Forwarded message" : "Пререадресоване повідомлення",
-    "Choose a folder to store the attachment in" : "Оберіть теку для зберігання вкладень",
-    "Attachments saved to Files." : "Вкладення збережені до Файлів.",
-    "Attachment saved to Files." : "Вкладення збережено до Файлів.",
-    "Error while saving attachments to Files." : "Помилка збереження вкладень до Файлів.",
-    "Error while saving attachment to Files." : "Помилка збереження вкладення до Файлів.",
-    "Invalid folder" : "Невірна тека",
-    "Unknown error" : "Невідома помилка",
-    "All inboxes" : "Всі вхідні",
-    "you" : "ви",
-    "Send message to {email}" : "Надіслати повідомлення {email}",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "Show all folders" : "Переглянути всі теки",
-    "Collapse folders" : "Згорнути теки",
-    "Error while deleting account." : "Помилка при видалені облікового запису.",
-    "Choose a file to add as attachment" : "Обрати файл для вкладення",
-    "Reply" : "Відповісти",
-    "Send" : "Надіслати",
-    "Sending …" : "Надсилання...",
-    "Message sent!" : "Повідомлення відправлено!",
-    "Server error" : "Помилка серверу",
-    "Opening HTML drafts is not supported yet." : "Відкриті HTML чернетки поки не підтримуються.",
-    "& others" : "та інші",
-    "Error while loading messages." : "Помилка завантаження повідомлень.",
-    "Inbox" : "Вхідні",
-    "Sent" : "Надіслані",
-    "Drafts" : "Чорновики",
-    "Archive" : "Архів",
-    "Trash" : "Смітник",
-    "Junk" : "Спам",
-    "All" : "Всі",
-    "Favorites" : "Улюблені",
-    "Auto detect failed. Please use manual mode." : "Авто-виявлення не спрацювало. Будь ласка, скористайтесь ручний режимом.",
-    "Creating account failed: " : "Помилка створення облікового запису:",
-    "Delete permanently" : "Видалити назавжди",
-    "Error loading message" : "Помилка завантаження повідомлення.",
-    "Continue to %s" : "Подовження за %s",
-    "Connect" : "З'єднати"
-},"pluralForm" :"nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);"
-}
\ No newline at end of file
diff --git a/l10n/zh_CN.js b/l10n/zh_CN.js
index fb59508f9..e891e3920 100644
--- a/l10n/zh_CN.js
+++ b/l10n/zh_CN.js
@@ -2,56 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "邮件",
-    "Loading accounts" : "加载账户中",
-    "Error while loading the accounts." : "载入账户时出错。",
-    "Can not load this folder." : "不能读取这个文件夹",
-    "Searching for {query}" : "正在搜索 {query}",
-    "Error while deleting message." : "删除消息时出错。",
-    "Forwarded message" : "转发的消息",
-    "Choose a folder to store the attachment in" : "选择附件保存的文件夹",
-    "Attachments saved to Files." : "附件已保存到文件。",
-    "Attachment saved to Files." : "附件已保存到文件。",
-    "Error while saving attachments to Files." : "保存附件到文件时发生错误。",
-    "Error while saving attachment to Files." : "保存附件到文件时发生错误。",
-    "Message flag could not be set." : "无法设置消息标记。",
-    "Could not move message." : "无法移动消息。",
-    "Invalid account" : "无效的账户。",
-    "Invalid folder" : "无效的文件夹",
-    "Error while creating the account: " : "创建账户时出错：",
-    "Unknown error" : "未知错误",
-    "Error while updating the account: " : "更新账户时出错：",
-    "All inboxes" : "所有收件箱",
-    "you" : "您",
-    "Send message to {email}" : "发送消息至 {email}",
-    "Could not load {tag}{name}{endtag}" : "无法加载 {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "加载 {tag}{name}{endtag} 时出现问题",
-    "Could not load your message" : "无法加载您的消息",
-    "Could not load the desired message" : "无法加载想要的消息",
-    "Could not load the message" : "无法加载该消息",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["来自 {from} 的 %n 条新消息"],
-    "Nextcloud Mail" : "Nextcloud 邮件",
-    "Save" : "保存",
-    "Saved" : "已保存",
-    "Show all folders" : "显示全部文件夹",
-    "Collapse folders" : "折叠文件夹",
-    "Error while deleting account." : "删除账户时出错",
-    "Choose a file to add as attachment" : "选择文件添加为附件",
-    "An error occurred while uploading {fname}" : "上传是发生错误 {fname}",
-    "Reply" : "回复",
-    "Send" : "发送",
-    "Sending …" : "正在发送…",
-    "Message sent!" : "消息已发送！",
-    "Server error" : "服务器错误",
-    "An unknown error occurred" : "遇到未知错误",
-    "Opening HTML drafts is not supported yet." : "暂时未能打开HTML格式的草稿，请见谅。",
-    "No writable calendars found" : "未找到可写的日历",
-    "Error while importing the calendar event" : "导入日历事件错误",
-    "Error while downloading calendar event" : "下载日历事件错误",
-    "& others" : "和其他",
-    "Error while loading messages." : "载入消息时发生错误。",
-    "Error while refreshing messages." : "刷新消息时发生错误。",
-    "Setting up your account" : "设置你的账户",
     "Inbox" : "收件箱",
     "Sent" : "已发送",
     "Drafts" : "草稿",
@@ -65,70 +15,71 @@ OC.L10N.register(
     "Creating account failed: " : "未能创建账户：",
     "Delete permanently" : "永久删除",
     "IMAP web client" : "IMAP 网页客户端",
-    "Easy to use email client which connects to your mail server via IMAP and SMTP." : "使用邮件客户端更容易通过 IMAP 和 SMTP 连接到你的邮件服务器.",
-    "Error loading message" : "载入电邮时发生错误",
-    "Settings" : "设置",
-    "Forwarding to %s" : "转发给 %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "如果您在接下来几秒钟内未被自动重定向，请点击此处。",
-    "Redirect" : "重定向",
-    "The link leads to %s" : "链接指向 %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "如果您不想访问此网页，您可以返回到<a href=\"%s\">邮件</a>应用。",
-    "Continue to %s" : "继续 %s",
-    "Delete account" : "删除账户",
-    "Try again" : "重试",
-    "New message" : "新建消息",
-    "Account Settings" : "账户设置",
-    "Aliases" : "别名",
-    "Mail address" : "邮箱",
-    "Display Name" : "显示名称",
-    "Account" : "账户",
-    "Toggle read" : "切换已读标识",
-    "Delete" : "删除",
-    "Keyboard shortcuts" : "键盘快捷方式",
-    "Speed up your Mail experience with these quick shortcuts." : "利用这些快捷方式使您的邮件使用过程更加迅捷",
-    "Compose new message" : "撰写新消息",
-    "Newer message" : "更新的信息",
-    "Older message" : "更早的信息",
-    "Toggle star" : "切换星标",
-    "Toggle unread" : "切换未读",
-    "Search" : "搜索",
-    "Refresh" : "刷新",
-    "Connect your mail account" : "连接您的邮件账户",
+    "Easy to use email client which connects to your mail server via IMAP and SMTP." : "使用邮件客户端更容易通过 IMAP 和 SMTP 连接到您的邮件服务器。",
     "Name" : "姓名",
     "Mail Address" : "邮箱",
     "Password" : "密码",
-    "Manual configuration" : "手动配置",
     "IMAP Host" : "IMAP 主机",
-    "IMAP security" : "IMAP 安全",
     "None" : "无",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP 端口",
     "IMAP User" : "IMAP 用户",
     "IMAP Password" : "IMAP 密码",
     "SMTP Host" : "SMTP 主机",
-    "SMTP security" : "SMTP 安全",
     "SMTP Port" : "SMTP 端口",
     "SMTP User" : "SMTP 用户",
     "SMTP Password" : "SMTP 密码",
     "Connect" : "连接",
+    "Add mail account" : "添加邮件账户",
+    "Use Gravatar and favicon avatars" : "使用 Gravatar 和 favicon 形象",
+    "Keyboard shortcuts" : "键盘快捷方式",
     "from" : "发件人",
     "to" : "收件人",
     "cc" : "抄送",
     "bcc" : "密送",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "标记的邮件来自一个无法回复的地址，你的回复可能无法被阅读.",
     "Subject" : "主题",
-    "Save all to Files" : "全部保存到文件",
-    "Add mail account" : "添加邮件账户",
-    "Use Gravatar and favicon avatars" : "使用 Gravatar 和 favicon 形象",
-    "No search results for" : "未找到搜索结果",
-    "The images have been blocked to protect your privacy." : "图片已被禁用，以保护您的隐私。",
-    "Show images from this sender" : "显示此发件人的图片",
-    "Forward" : "转发",
-    "No messages in this folder" : "该文件夹内没有消息",
+    "Sending …" : "正在发送…",
+    "Message sent!" : "消息已发送！",
+    "Send" : "发送",
     "Upload attachment" : "上传附件",
     "Add attachment from Files" : "从文件添加附件",
+    "Choose a file to add as attachment" : "选择文件添加为附件",
+    "No messages in this folder" : "该文件夹内没有消息",
+    "Delete" : "删除",
+    "Could not load your message" : "无法加载您的消息",
     "Import into calendar" : "导入到日历",
     "Download attachment" : "下载附件",
-    "Save to Files" : "保存到“文件”"
+    "Save to Files" : "保存到“文件”",
+    "Choose a folder to store the attachment in" : "选择附件保存的文件夹",
+    "Save all to Files" : "全部保存到文件",
+    "The images have been blocked to protect your privacy." : "图片已被禁用，以保护您的隐私。",
+    "New message" : "新建消息",
+    "Settings" : "设置",
+    "Speed up your Mail experience with these quick shortcuts." : "利用这些快捷方式使您的邮件使用过程更加迅捷",
+    "Compose new message" : "撰写新消息",
+    "Newer message" : "更新的信息",
+    "Older message" : "更早的信息",
+    "Toggle star" : "切换星标",
+    "Toggle unread" : "切换未读",
+    "Search" : "搜索",
+    "Refresh" : "刷新",
+    "Connect your mail account" : "连接您的邮件账户",
+    "Show all folders" : "显示全部文件夹",
+    "Collapse folders" : "折叠文件夹",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["来自 {from} 的 %n 条新消息"],
+    "Nextcloud Mail" : "Nextcloud 邮件",
+    "All inboxes" : "所有收件箱",
+    "Could not load {tag}{name}{endtag}" : "无法加载 {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "加载 {tag}{name}{endtag} 时出现问题",
+    "Could not load the desired message" : "无法加载想要的消息",
+    "Could not load the message" : "无法加载该消息",
+    "Error loading message" : "载入电邮时发生错误",
+    "Forwarding to %s" : "转发给 %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "如果您在接下来几秒钟内未被自动重定向，请点击此处。",
+    "Redirect" : "重定向",
+    "The link leads to %s" : "链接指向 %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "如果您不想访问此网页，您可以返回到<a href=\"%s\">邮件</a>应用。",
+    "Continue to %s" : "继续 %s"
 },
 "nplurals=1; plural=0;");
diff --git a/l10n/zh_CN.json b/l10n/zh_CN.json
index a097458c4..b1ae754ad 100644
--- a/l10n/zh_CN.json
+++ b/l10n/zh_CN.json
@@ -1,55 +1,5 @@
 { "translations": {
     "Mail" : "邮件",
-    "Loading accounts" : "加载账户中",
-    "Error while loading the accounts." : "载入账户时出错。",
-    "Can not load this folder." : "不能读取这个文件夹",
-    "Searching for {query}" : "正在搜索 {query}",
-    "Error while deleting message." : "删除消息时出错。",
-    "Forwarded message" : "转发的消息",
-    "Choose a folder to store the attachment in" : "选择附件保存的文件夹",
-    "Attachments saved to Files." : "附件已保存到文件。",
-    "Attachment saved to Files." : "附件已保存到文件。",
-    "Error while saving attachments to Files." : "保存附件到文件时发生错误。",
-    "Error while saving attachment to Files." : "保存附件到文件时发生错误。",
-    "Message flag could not be set." : "无法设置消息标记。",
-    "Could not move message." : "无法移动消息。",
-    "Invalid account" : "无效的账户。",
-    "Invalid folder" : "无效的文件夹",
-    "Error while creating the account: " : "创建账户时出错：",
-    "Unknown error" : "未知错误",
-    "Error while updating the account: " : "更新账户时出错：",
-    "All inboxes" : "所有收件箱",
-    "you" : "您",
-    "Send message to {email}" : "发送消息至 {email}",
-    "Could not load {tag}{name}{endtag}" : "无法加载 {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "加载 {tag}{name}{endtag} 时出现问题",
-    "Could not load your message" : "无法加载您的消息",
-    "Could not load the desired message" : "无法加载想要的消息",
-    "Could not load the message" : "无法加载该消息",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["来自 {from} 的 %n 条新消息"],
-    "Nextcloud Mail" : "Nextcloud 邮件",
-    "Save" : "保存",
-    "Saved" : "已保存",
-    "Show all folders" : "显示全部文件夹",
-    "Collapse folders" : "折叠文件夹",
-    "Error while deleting account." : "删除账户时出错",
-    "Choose a file to add as attachment" : "选择文件添加为附件",
-    "An error occurred while uploading {fname}" : "上传是发生错误 {fname}",
-    "Reply" : "回复",
-    "Send" : "发送",
-    "Sending …" : "正在发送…",
-    "Message sent!" : "消息已发送！",
-    "Server error" : "服务器错误",
-    "An unknown error occurred" : "遇到未知错误",
-    "Opening HTML drafts is not supported yet." : "暂时未能打开HTML格式的草稿，请见谅。",
-    "No writable calendars found" : "未找到可写的日历",
-    "Error while importing the calendar event" : "导入日历事件错误",
-    "Error while downloading calendar event" : "下载日历事件错误",
-    "& others" : "和其他",
-    "Error while loading messages." : "载入消息时发生错误。",
-    "Error while refreshing messages." : "刷新消息时发生错误。",
-    "Setting up your account" : "设置你的账户",
     "Inbox" : "收件箱",
     "Sent" : "已发送",
     "Drafts" : "草稿",
@@ -63,70 +13,71 @@
     "Creating account failed: " : "未能创建账户：",
     "Delete permanently" : "永久删除",
     "IMAP web client" : "IMAP 网页客户端",
-    "Easy to use email client which connects to your mail server via IMAP and SMTP." : "使用邮件客户端更容易通过 IMAP 和 SMTP 连接到你的邮件服务器.",
-    "Error loading message" : "载入电邮时发生错误",
-    "Settings" : "设置",
-    "Forwarding to %s" : "转发给 %s",
-    "Click here if you are not automatically redirected within the next few seconds." : "如果您在接下来几秒钟内未被自动重定向，请点击此处。",
-    "Redirect" : "重定向",
-    "The link leads to %s" : "链接指向 %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "如果您不想访问此网页，您可以返回到<a href=\"%s\">邮件</a>应用。",
-    "Continue to %s" : "继续 %s",
-    "Delete account" : "删除账户",
-    "Try again" : "重试",
-    "New message" : "新建消息",
-    "Account Settings" : "账户设置",
-    "Aliases" : "别名",
-    "Mail address" : "邮箱",
-    "Display Name" : "显示名称",
-    "Account" : "账户",
-    "Toggle read" : "切换已读标识",
-    "Delete" : "删除",
-    "Keyboard shortcuts" : "键盘快捷方式",
-    "Speed up your Mail experience with these quick shortcuts." : "利用这些快捷方式使您的邮件使用过程更加迅捷",
-    "Compose new message" : "撰写新消息",
-    "Newer message" : "更新的信息",
-    "Older message" : "更早的信息",
-    "Toggle star" : "切换星标",
-    "Toggle unread" : "切换未读",
-    "Search" : "搜索",
-    "Refresh" : "刷新",
-    "Connect your mail account" : "连接您的邮件账户",
+    "Easy to use email client which connects to your mail server via IMAP and SMTP." : "使用邮件客户端更容易通过 IMAP 和 SMTP 连接到您的邮件服务器。",
     "Name" : "姓名",
     "Mail Address" : "邮箱",
     "Password" : "密码",
-    "Manual configuration" : "手动配置",
     "IMAP Host" : "IMAP 主机",
-    "IMAP security" : "IMAP 安全",
     "None" : "无",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP 端口",
     "IMAP User" : "IMAP 用户",
     "IMAP Password" : "IMAP 密码",
     "SMTP Host" : "SMTP 主机",
-    "SMTP security" : "SMTP 安全",
     "SMTP Port" : "SMTP 端口",
     "SMTP User" : "SMTP 用户",
     "SMTP Password" : "SMTP 密码",
     "Connect" : "连接",
+    "Add mail account" : "添加邮件账户",
+    "Use Gravatar and favicon avatars" : "使用 Gravatar 和 favicon 形象",
+    "Keyboard shortcuts" : "键盘快捷方式",
     "from" : "发件人",
     "to" : "收件人",
     "cc" : "抄送",
     "bcc" : "密送",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "标记的邮件来自一个无法回复的地址，你的回复可能无法被阅读.",
     "Subject" : "主题",
-    "Save all to Files" : "全部保存到文件",
-    "Add mail account" : "添加邮件账户",
-    "Use Gravatar and favicon avatars" : "使用 Gravatar 和 favicon 形象",
-    "No search results for" : "未找到搜索结果",
-    "The images have been blocked to protect your privacy." : "图片已被禁用，以保护您的隐私。",
-    "Show images from this sender" : "显示此发件人的图片",
-    "Forward" : "转发",
-    "No messages in this folder" : "该文件夹内没有消息",
+    "Sending …" : "正在发送…",
+    "Message sent!" : "消息已发送！",
+    "Send" : "发送",
     "Upload attachment" : "上传附件",
     "Add attachment from Files" : "从文件添加附件",
+    "Choose a file to add as attachment" : "选择文件添加为附件",
+    "No messages in this folder" : "该文件夹内没有消息",
+    "Delete" : "删除",
+    "Could not load your message" : "无法加载您的消息",
     "Import into calendar" : "导入到日历",
     "Download attachment" : "下载附件",
-    "Save to Files" : "保存到“文件”"
+    "Save to Files" : "保存到“文件”",
+    "Choose a folder to store the attachment in" : "选择附件保存的文件夹",
+    "Save all to Files" : "全部保存到文件",
+    "The images have been blocked to protect your privacy." : "图片已被禁用，以保护您的隐私。",
+    "New message" : "新建消息",
+    "Settings" : "设置",
+    "Speed up your Mail experience with these quick shortcuts." : "利用这些快捷方式使您的邮件使用过程更加迅捷",
+    "Compose new message" : "撰写新消息",
+    "Newer message" : "更新的信息",
+    "Older message" : "更早的信息",
+    "Toggle star" : "切换星标",
+    "Toggle unread" : "切换未读",
+    "Search" : "搜索",
+    "Refresh" : "刷新",
+    "Connect your mail account" : "连接您的邮件账户",
+    "Show all folders" : "显示全部文件夹",
+    "Collapse folders" : "折叠文件夹",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["来自 {from} 的 %n 条新消息"],
+    "Nextcloud Mail" : "Nextcloud 邮件",
+    "All inboxes" : "所有收件箱",
+    "Could not load {tag}{name}{endtag}" : "无法加载 {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "加载 {tag}{name}{endtag} 时出现问题",
+    "Could not load the desired message" : "无法加载想要的消息",
+    "Could not load the message" : "无法加载该消息",
+    "Error loading message" : "载入电邮时发生错误",
+    "Forwarding to %s" : "转发给 %s",
+    "Click here if you are not automatically redirected within the next few seconds." : "如果您在接下来几秒钟内未被自动重定向，请点击此处。",
+    "Redirect" : "重定向",
+    "The link leads to %s" : "链接指向 %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "如果您不想访问此网页，您可以返回到<a href=\"%s\">邮件</a>应用。",
+    "Continue to %s" : "继续 %s"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/l10n/zh_TW.js b/l10n/zh_TW.js
index 1a9447953..ce1e41b11 100644
--- a/l10n/zh_TW.js
+++ b/l10n/zh_TW.js
@@ -2,56 +2,6 @@ OC.L10N.register(
     "mail",
     {
     "Mail" : "電子郵件",
-    "Loading accounts" : "載入帳號中",
-    "Error while loading the accounts." : "載入帳號時發生錯誤",
-    "Can not load this folder." : "無法載入此收件匣",
-    "Searching for {query}" : "以 {query} 搜尋",
-    "Error while deleting message." : "刪除信件時發生錯誤",
-    "Forwarded message" : "轉寄的信件",
-    "Choose a folder to store the attachment in" : "選擇存放附件的目錄",
-    "Attachments saved to Files." : "附件已儲存至檔案",
-    "Attachment saved to Files." : "附件已儲存至檔案",
-    "Error while saving attachments to Files." : "儲存附件至檔案時發生錯誤",
-    "Error while saving attachment to Files." : "儲存附件至檔案時發生錯誤",
-    "Message flag could not be set." : "無法設定信件標籤",
-    "Could not move message." : "無法移動信件",
-    "Invalid account" : "無效的帳號",
-    "Invalid folder" : "無效的收件匣",
-    "Error while creating the account: " : "在建立該帳號時發生了異常：",
-    "Unknown error" : "未知的錯誤",
-    "Error while updating the account: " : "更新帳戶時發生錯誤",
-    "All inboxes" : "所有收件匣",
-    "you" : "您",
-    "Send message to {email}" : "寄信給 {email}",
-    "Could not load {tag}{name}{endtag}" : "無法載入 {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "載入 {tag}{name}{endtag} 時出現問題",
-    "Could not load your message" : "無法載入您的信件",
-    "Could not load the desired message" : "無法載入所選的信件",
-    "Could not load the message" : "無法載入信件",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n則新信件\n來自 {from}"],
-    "Nextcloud Mail" : "Nextcloud 郵件",
-    "Save" : "儲存",
-    "Saved" : "已儲存",
-    "Show all folders" : "顯示所有收件匣",
-    "Collapse folders" : "收合收件匣",
-    "Error while deleting account." : "刪除帳號時發生錯誤",
-    "Choose a file to add as attachment" : "選擇檔案作為附件",
-    "An error occurred while uploading {fname}" : "上傳 {fname} 發生錯誤",
-    "Reply" : "回覆",
-    "Send" : "傳送",
-    "Sending …" : "傳送中…",
-    "Message sent!" : "信件已寄出",
-    "Server error" : "伺服器錯誤",
-    "An unknown error occurred" : "發生未知的錯誤",
-    "Opening HTML drafts is not supported yet." : "目前尚未支援開啟 HTML 草稿",
-    "No writable calendars found" : "查無可寫入的日曆",
-    "Error while importing the calendar event" : "匯入日曆事件時發生錯誤",
-    "Error while downloading calendar event" : "下載日曆事件時發生錯誤",
-    "& others" : "和其他人",
-    "Error while loading messages." : "載入信件時發生錯誤",
-    "Error while refreshing messages." : "重新整理信件時發生錯誤",
-    "Setting up your account" : "設定您的帳號",
     "Inbox" : "收件匣",
     "Sent" : "寄件備份",
     "Drafts" : "草稿",
@@ -64,68 +14,70 @@ OC.L10N.register(
     "Updating account failed: " : "更新帳戶失敗",
     "Creating account failed: " : "建立帳號失敗：",
     "Delete permanently" : "永久刪除",
-    "Error loading message" : "載入信件錯誤",
-    "Settings" : "設定",
-    "Forwarding to %s" : "正在轉寄給%s",
-    "Click here if you are not automatically redirected within the next few seconds." : "如果未在幾秒內跳轉，請點擊這裡",
-    "Redirect" : "跳轉",
-    "The link leads to %s" : "該連結導向至 %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "若不想拜訪該頁，您可以回到<a href=\"%s\">郵件</a>",
-    "Continue to %s" : "前往 %s",
-    "Delete account" : "刪除帳號",
-    "Try again" : "再試試",
-    "New message" : "新信件",
-    "Account Settings" : "帳號設定",
-    "Aliases" : "別名",
-    "Mail address" : "郵件地址",
-    "Display Name" : "顯示名稱",
-    "Account" : "帳戶",
-    "Delete" : "刪除",
-    "Keyboard shortcuts" : "快速鍵",
-    "Speed up your Mail experience with these quick shortcuts." : "使用快速鍵來加速您的操作體驗",
-    "Compose new message" : "撰寫新信件",
-    "Newer message" : "較新的信件",
-    "Older message" : "較舊的信件",
-    "Toggle star" : "加上/移除星號",
-    "Toggle unread" : "標示未讀/已讀",
-    "Search" : "搜尋",
-    "Refresh" : "重整",
-    "Connect your mail account" : "連結外部信箱",
     "Name" : "名字",
     "Mail Address" : "郵件地址",
     "Password" : "密碼",
-    "Manual configuration" : "手動設定",
     "IMAP Host" : "IMAP 主機",
-    "IMAP security" : "IMAP 安全性",
     "None" : "無",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP 連接埠",
     "IMAP User" : "IMAP 帳號",
     "IMAP Password" : "IMAP 密碼",
     "SMTP Host" : "SMTP 主機",
-    "SMTP security" : "SMTP 安全性",
     "SMTP Port" : "SMTP 連接埠",
     "SMTP User" : "SMTP 帳號",
     "SMTP Password" : "SMTP 密碼",
     "Connect" : "連線",
+    "Add mail account" : "新增郵件帳戶",
+    "Use Gravatar and favicon avatars" : "使用個人化大頭貼與網站圖示",
+    "Keyboard shortcuts" : "快速鍵",
     "from" : "自",
     "to" : "至",
     "cc" : "副本",
     "bcc" : "密件副本",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "請注意，此郵件來自一個 noreply 地址，因此您的回覆很可能不會被閱讀",
     "Subject" : "主旨",
-    "Save all to Files" : "全部儲存至檔案",
-    "Add mail account" : "新增郵件帳戶",
-    "Use Gravatar and favicon avatars" : "使用個人化大頭貼與網站圖示",
-    "No search results for" : "沒有搜尋到結果：",
-    "The images have been blocked to protect your privacy." : "為維護您的隱私，圖片將不會被載入",
-    "Show images from this sender" : "顯示來自此寄件者的圖片",
-    "Forward" : "轉寄",
-    "No messages in this folder" : "此收件匣中沒有信件",
+    "Sending …" : "傳送中…",
+    "Message sent!" : "信件已寄出",
+    "Send" : "傳送",
     "Upload attachment" : "上傳附件",
     "Add attachment from Files" : "從雲端檔案中加入附件",
+    "Choose a file to add as attachment" : "選擇檔案作為附件",
+    "No messages in this folder" : "此收件匣中沒有信件",
+    "Delete" : "刪除",
+    "Could not load your message" : "無法載入您的信件",
     "Import into calendar" : "匯入到日曆",
     "Download attachment" : "下載附檔",
-    "Save to Files" : "儲存至雲端檔案"
+    "Save to Files" : "儲存至雲端檔案",
+    "Choose a folder to store the attachment in" : "選擇存放附件的目錄",
+    "Save all to Files" : "全部儲存至檔案",
+    "The images have been blocked to protect your privacy." : "為維護您的隱私，圖片將不會被載入",
+    "New message" : "新信件",
+    "Settings" : "設定",
+    "Speed up your Mail experience with these quick shortcuts." : "使用快速鍵來加速您的操作體驗",
+    "Compose new message" : "撰寫新信件",
+    "Newer message" : "較新的信件",
+    "Older message" : "較舊的信件",
+    "Toggle star" : "加上/移除星號",
+    "Toggle unread" : "標示未讀/已讀",
+    "Search" : "搜尋",
+    "Refresh" : "重整",
+    "Connect your mail account" : "連結外部信箱",
+    "Show all folders" : "顯示所有收件匣",
+    "Collapse folders" : "收合收件匣",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n則新信件\n來自 {from}"],
+    "Nextcloud Mail" : "Nextcloud 郵件",
+    "All inboxes" : "所有收件匣",
+    "Could not load {tag}{name}{endtag}" : "無法載入 {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "載入 {tag}{name}{endtag} 時出現問題",
+    "Could not load the desired message" : "無法載入所選的信件",
+    "Could not load the message" : "無法載入信件",
+    "Error loading message" : "載入信件錯誤",
+    "Forwarding to %s" : "正在轉寄給%s",
+    "Click here if you are not automatically redirected within the next few seconds." : "如果未在幾秒內跳轉，請點擊這裡",
+    "Redirect" : "跳轉",
+    "The link leads to %s" : "該連結導向至 %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "若不想拜訪該頁，您可以回到<a href=\"%s\">郵件</a>",
+    "Continue to %s" : "前往 %s"
 },
 "nplurals=1; plural=0;");
diff --git a/l10n/zh_TW.json b/l10n/zh_TW.json
index d1d7838fb..c1c80b2e3 100644
--- a/l10n/zh_TW.json
+++ b/l10n/zh_TW.json
@@ -1,55 +1,5 @@
 { "translations": {
     "Mail" : "電子郵件",
-    "Loading accounts" : "載入帳號中",
-    "Error while loading the accounts." : "載入帳號時發生錯誤",
-    "Can not load this folder." : "無法載入此收件匣",
-    "Searching for {query}" : "以 {query} 搜尋",
-    "Error while deleting message." : "刪除信件時發生錯誤",
-    "Forwarded message" : "轉寄的信件",
-    "Choose a folder to store the attachment in" : "選擇存放附件的目錄",
-    "Attachments saved to Files." : "附件已儲存至檔案",
-    "Attachment saved to Files." : "附件已儲存至檔案",
-    "Error while saving attachments to Files." : "儲存附件至檔案時發生錯誤",
-    "Error while saving attachment to Files." : "儲存附件至檔案時發生錯誤",
-    "Message flag could not be set." : "無法設定信件標籤",
-    "Could not move message." : "無法移動信件",
-    "Invalid account" : "無效的帳號",
-    "Invalid folder" : "無效的收件匣",
-    "Error while creating the account: " : "在建立該帳號時發生了異常：",
-    "Unknown error" : "未知的錯誤",
-    "Error while updating the account: " : "更新帳戶時發生錯誤",
-    "All inboxes" : "所有收件匣",
-    "you" : "您",
-    "Send message to {email}" : "寄信給 {email}",
-    "Could not load {tag}{name}{endtag}" : "無法載入 {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "載入 {tag}{name}{endtag} 時出現問題",
-    "Could not load your message" : "無法載入您的信件",
-    "Could not load the desired message" : "無法載入所選的信件",
-    "Could not load the message" : "無法載入信件",
-    "{from}\n{subject}" : "{from}\n{subject}",
-    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n則新信件\n來自 {from}"],
-    "Nextcloud Mail" : "Nextcloud 郵件",
-    "Save" : "儲存",
-    "Saved" : "已儲存",
-    "Show all folders" : "顯示所有收件匣",
-    "Collapse folders" : "收合收件匣",
-    "Error while deleting account." : "刪除帳號時發生錯誤",
-    "Choose a file to add as attachment" : "選擇檔案作為附件",
-    "An error occurred while uploading {fname}" : "上傳 {fname} 發生錯誤",
-    "Reply" : "回覆",
-    "Send" : "傳送",
-    "Sending …" : "傳送中…",
-    "Message sent!" : "信件已寄出",
-    "Server error" : "伺服器錯誤",
-    "An unknown error occurred" : "發生未知的錯誤",
-    "Opening HTML drafts is not supported yet." : "目前尚未支援開啟 HTML 草稿",
-    "No writable calendars found" : "查無可寫入的日曆",
-    "Error while importing the calendar event" : "匯入日曆事件時發生錯誤",
-    "Error while downloading calendar event" : "下載日曆事件時發生錯誤",
-    "& others" : "和其他人",
-    "Error while loading messages." : "載入信件時發生錯誤",
-    "Error while refreshing messages." : "重新整理信件時發生錯誤",
-    "Setting up your account" : "設定您的帳號",
     "Inbox" : "收件匣",
     "Sent" : "寄件備份",
     "Drafts" : "草稿",
@@ -62,68 +12,70 @@
     "Updating account failed: " : "更新帳戶失敗",
     "Creating account failed: " : "建立帳號失敗：",
     "Delete permanently" : "永久刪除",
-    "Error loading message" : "載入信件錯誤",
-    "Settings" : "設定",
-    "Forwarding to %s" : "正在轉寄給%s",
-    "Click here if you are not automatically redirected within the next few seconds." : "如果未在幾秒內跳轉，請點擊這裡",
-    "Redirect" : "跳轉",
-    "The link leads to %s" : "該連結導向至 %s",
-    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "若不想拜訪該頁，您可以回到<a href=\"%s\">郵件</a>",
-    "Continue to %s" : "前往 %s",
-    "Delete account" : "刪除帳號",
-    "Try again" : "再試試",
-    "New message" : "新信件",
-    "Account Settings" : "帳號設定",
-    "Aliases" : "別名",
-    "Mail address" : "郵件地址",
-    "Display Name" : "顯示名稱",
-    "Account" : "帳戶",
-    "Delete" : "刪除",
-    "Keyboard shortcuts" : "快速鍵",
-    "Speed up your Mail experience with these quick shortcuts." : "使用快速鍵來加速您的操作體驗",
-    "Compose new message" : "撰寫新信件",
-    "Newer message" : "較新的信件",
-    "Older message" : "較舊的信件",
-    "Toggle star" : "加上/移除星號",
-    "Toggle unread" : "標示未讀/已讀",
-    "Search" : "搜尋",
-    "Refresh" : "重整",
-    "Connect your mail account" : "連結外部信箱",
     "Name" : "名字",
     "Mail Address" : "郵件地址",
     "Password" : "密碼",
-    "Manual configuration" : "手動設定",
     "IMAP Host" : "IMAP 主機",
-    "IMAP security" : "IMAP 安全性",
     "None" : "無",
     "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP 連接埠",
     "IMAP User" : "IMAP 帳號",
     "IMAP Password" : "IMAP 密碼",
     "SMTP Host" : "SMTP 主機",
-    "SMTP security" : "SMTP 安全性",
     "SMTP Port" : "SMTP 連接埠",
     "SMTP User" : "SMTP 帳號",
     "SMTP Password" : "SMTP 密碼",
     "Connect" : "連線",
+    "Add mail account" : "新增郵件帳戶",
+    "Use Gravatar and favicon avatars" : "使用個人化大頭貼與網站圖示",
+    "Keyboard shortcuts" : "快速鍵",
     "from" : "自",
     "to" : "至",
     "cc" : "副本",
     "bcc" : "密件副本",
-    "Note that the mail came from a noreply address so your reply will probably not be read." : "請注意，此郵件來自一個 noreply 地址，因此您的回覆很可能不會被閱讀",
     "Subject" : "主旨",
-    "Save all to Files" : "全部儲存至檔案",
-    "Add mail account" : "新增郵件帳戶",
-    "Use Gravatar and favicon avatars" : "使用個人化大頭貼與網站圖示",
-    "No search results for" : "沒有搜尋到結果：",
-    "The images have been blocked to protect your privacy." : "為維護您的隱私，圖片將不會被載入",
-    "Show images from this sender" : "顯示來自此寄件者的圖片",
-    "Forward" : "轉寄",
-    "No messages in this folder" : "此收件匣中沒有信件",
+    "Sending …" : "傳送中…",
+    "Message sent!" : "信件已寄出",
+    "Send" : "傳送",
     "Upload attachment" : "上傳附件",
     "Add attachment from Files" : "從雲端檔案中加入附件",
+    "Choose a file to add as attachment" : "選擇檔案作為附件",
+    "No messages in this folder" : "此收件匣中沒有信件",
+    "Delete" : "刪除",
+    "Could not load your message" : "無法載入您的信件",
     "Import into calendar" : "匯入到日曆",
     "Download attachment" : "下載附檔",
-    "Save to Files" : "儲存至雲端檔案"
+    "Save to Files" : "儲存至雲端檔案",
+    "Choose a folder to store the attachment in" : "選擇存放附件的目錄",
+    "Save all to Files" : "全部儲存至檔案",
+    "The images have been blocked to protect your privacy." : "為維護您的隱私，圖片將不會被載入",
+    "New message" : "新信件",
+    "Settings" : "設定",
+    "Speed up your Mail experience with these quick shortcuts." : "使用快速鍵來加速您的操作體驗",
+    "Compose new message" : "撰寫新信件",
+    "Newer message" : "較新的信件",
+    "Older message" : "較舊的信件",
+    "Toggle star" : "加上/移除星號",
+    "Toggle unread" : "標示未讀/已讀",
+    "Search" : "搜尋",
+    "Refresh" : "重整",
+    "Connect your mail account" : "連結外部信箱",
+    "Show all folders" : "顯示所有收件匣",
+    "Collapse folders" : "收合收件匣",
+    "{from}\n{subject}" : "{from}\n{subject}",
+    "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n則新信件\n來自 {from}"],
+    "Nextcloud Mail" : "Nextcloud 郵件",
+    "All inboxes" : "所有收件匣",
+    "Could not load {tag}{name}{endtag}" : "無法載入 {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "載入 {tag}{name}{endtag} 時出現問題",
+    "Could not load the desired message" : "無法載入所選的信件",
+    "Could not load the message" : "無法載入信件",
+    "Error loading message" : "載入信件錯誤",
+    "Forwarding to %s" : "正在轉寄給%s",
+    "Click here if you are not automatically redirected within the next few seconds." : "如果未在幾秒內跳轉，請點擊這裡",
+    "Redirect" : "跳轉",
+    "The link leads to %s" : "該連結導向至 %s",
+    "If you don’t want to visit that page, you can return to <a href=\"%s\">Mail</a>." : "若不想拜訪該頁，您可以回到<a href=\"%s\">郵件</a>",
+    "Continue to %s" : "前往 %s"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file