diff --git a/l10n/af.js b/l10n/af.js
index 1a8dbbe75..77ccf16f4 100644
--- a/l10n/af.js
+++ b/l10n/af.js
@@ -51,7 +51,9 @@ OC.L10N.register(
     "New message" : "Nuwe boodskap",
     "Delete" : "Skrap",
     "Add" : "Voeg by",
+    "Tags" : "Etikette",
     "Search" : "Soek",
+    "Date" : "Datum",
     "Custom" : "Eie",
     "Set" : "Stel in",
     "Remove" : "Verwyder",
diff --git a/l10n/af.json b/l10n/af.json
index 6f1b464e7..4ef870eb3 100644
--- a/l10n/af.json
+++ b/l10n/af.json
@@ -49,7 +49,9 @@
     "New message" : "Nuwe boodskap",
     "Delete" : "Skrap",
     "Add" : "Voeg by",
+    "Tags" : "Etikette",
     "Search" : "Soek",
+    "Date" : "Datum",
     "Custom" : "Eie",
     "Set" : "Stel in",
     "Remove" : "Verwyder",
diff --git a/l10n/ar.js b/l10n/ar.js
index 28311cc19..8ff37a1db 100644
--- a/l10n/ar.js
+++ b/l10n/ar.js
@@ -91,7 +91,10 @@ OC.L10N.register(
     "Delete" : "حذف",
     "Copy to clipboard" : "نسخ الرابط",
     "Add" : "إضافة",
+    "Tags" : "الوسوم",
+    "Clear" : "مسح ",
     "Search" : "بحث",
+    "Date" : "التاريخ ",
     "Disabled" : "معطّل",
     "Enabled" : "مفعلة",
     "Custom" : "مخصّص",
diff --git a/l10n/ar.json b/l10n/ar.json
index 5067455c7..eb90d43a7 100644
--- a/l10n/ar.json
+++ b/l10n/ar.json
@@ -89,7 +89,10 @@
     "Delete" : "حذف",
     "Copy to clipboard" : "نسخ الرابط",
     "Add" : "إضافة",
+    "Tags" : "الوسوم",
+    "Clear" : "مسح ",
     "Search" : "بحث",
+    "Date" : "التاريخ ",
     "Disabled" : "معطّل",
     "Enabled" : "مفعلة",
     "Custom" : "مخصّص",
diff --git a/l10n/ast.js b/l10n/ast.js
index b1bd11c9d..be4faf7e3 100644
--- a/l10n/ast.js
+++ b/l10n/ast.js
@@ -61,7 +61,9 @@ OC.L10N.register(
     "Delete" : "Desaniciar",
     "Copy to clipboard" : "Copiar al cartafueyu",
     "Add" : "Amestar",
+    "Tags" : "Etiquetes",
     "Search" : "Guetar",
+    "Date" : "Date",
     "Disabled" : "Deshabilitáu",
     "Enabled" : "Habilitar",
     "Custom" : "Personalizáu",
diff --git a/l10n/ast.json b/l10n/ast.json
index 7a6fcb796..3661ac37f 100644
--- a/l10n/ast.json
+++ b/l10n/ast.json
@@ -59,7 +59,9 @@
     "Delete" : "Desaniciar",
     "Copy to clipboard" : "Copiar al cartafueyu",
     "Add" : "Amestar",
+    "Tags" : "Etiquetes",
     "Search" : "Guetar",
+    "Date" : "Date",
     "Disabled" : "Deshabilitáu",
     "Enabled" : "Habilitar",
     "Custom" : "Personalizáu",
diff --git a/l10n/az.js b/l10n/az.js
index b1ed22240..3c173d7c2 100644
--- a/l10n/az.js
+++ b/l10n/az.js
@@ -30,7 +30,9 @@ OC.L10N.register(
     "Clear cache" : "Keşi təmizlə",
     "Delete" : "Sil",
     "Add" : "Əlavə etmək",
+    "Tags" : "Işarələr",
     "Search" : "Axtarış",
+    "Date" : "Date",
     "Disabled" : "Dayandırılıb",
     "Enabled" : "İşə salınıb",
     "Remove" : "Sil",
diff --git a/l10n/az.json b/l10n/az.json
index f561a6bad..ae2874ecb 100644
--- a/l10n/az.json
+++ b/l10n/az.json
@@ -28,7 +28,9 @@
     "Clear cache" : "Keşi təmizlə",
     "Delete" : "Sil",
     "Add" : "Əlavə etmək",
+    "Tags" : "Işarələr",
     "Search" : "Axtarış",
+    "Date" : "Date",
     "Disabled" : "Dayandırılıb",
     "Enabled" : "İşə salınıb",
     "Remove" : "Sil",
diff --git a/l10n/bg.js b/l10n/bg.js
index bf1283a1f..7c5fe9606 100644
--- a/l10n/bg.js
+++ b/l10n/bg.js
@@ -148,7 +148,6 @@ OC.L10N.register(
     "Plain text" : "Обикновен текст",
     "Rich text" : "Форматиран текст",
     "No messages in this mailbox" : "Няма съобщения в тази пощенска кутия",
-    "Messages marked as important will show up here" : "Съобщения, които са маркирани като важни, ще се показват тук",
     "Draft: " : "Чернова: ",
     "This message is unread" : "Това съобщение не е прочетено",
     "Unfavorite" : "Премахване от Любими",
@@ -312,7 +311,22 @@ OC.L10N.register(
     "Copy to clipboard" : "Копиране в клипборда",
     "Contact name …" : "Име за контакт …",
     "Add" : "Добавяне",
+    "Search in mailbox" : "Търсене в пощенската кутия",
+    "Search parameters" : "Параметри на търсенето",
+    "Search term" : "Термин за търсене",
+    "Pick a start date" : "Избор на начална дата",
+    "Pick an end date" : "Избор на крайна дата",
+    "Select sender" : "Избор на подател",
+    "Select recipient" : "Избор на получател",
+    "Select cc recipient" : "Избор на сс получател",
+    "Select bcc recipient" : "Избор на  bcc получател",
+    "Tags" : "Етикети",
+    "Select tags" : "Избор на етикети",
+    "Marked as" : "Маркиран/о като",
+    "Has attachments" : "Има прикачени файлове",
+    "Clear" : "Изчистване",
     "Search" : "Търси",
+    "Date" : "Дата",
     "Disabled" : "Изключено",
     "Enabled" : "Включено",
     "Sieve Host" : "Хост сървър на Сито",
diff --git a/l10n/bg.json b/l10n/bg.json
index a787ad1f4..bb55556a9 100644
--- a/l10n/bg.json
+++ b/l10n/bg.json
@@ -146,7 +146,6 @@
     "Plain text" : "Обикновен текст",
     "Rich text" : "Форматиран текст",
     "No messages in this mailbox" : "Няма съобщения в тази пощенска кутия",
-    "Messages marked as important will show up here" : "Съобщения, които са маркирани като важни, ще се показват тук",
     "Draft: " : "Чернова: ",
     "This message is unread" : "Това съобщение не е прочетено",
     "Unfavorite" : "Премахване от Любими",
@@ -310,7 +309,22 @@
     "Copy to clipboard" : "Копиране в клипборда",
     "Contact name …" : "Име за контакт …",
     "Add" : "Добавяне",
+    "Search in mailbox" : "Търсене в пощенската кутия",
+    "Search parameters" : "Параметри на търсенето",
+    "Search term" : "Термин за търсене",
+    "Pick a start date" : "Избор на начална дата",
+    "Pick an end date" : "Избор на крайна дата",
+    "Select sender" : "Избор на подател",
+    "Select recipient" : "Избор на получател",
+    "Select cc recipient" : "Избор на сс получател",
+    "Select bcc recipient" : "Избор на  bcc получател",
+    "Tags" : "Етикети",
+    "Select tags" : "Избор на етикети",
+    "Marked as" : "Маркиран/о като",
+    "Has attachments" : "Има прикачени файлове",
+    "Clear" : "Изчистване",
     "Search" : "Търси",
+    "Date" : "Дата",
     "Disabled" : "Изключено",
     "Enabled" : "Включено",
     "Sieve Host" : "Хост сървър на Сито",
diff --git a/l10n/bn_BD.js b/l10n/bn_BD.js
index f90eef811..76b9d9b75 100644
--- a/l10n/bn_BD.js
+++ b/l10n/bn_BD.js
@@ -31,7 +31,9 @@ OC.L10N.register(
     "Clear cache" : "ক্যাশে পরিষ্কার কর",
     "Delete" : "মুছে",
     "Add" : "যোগ করুন",
+    "Tags" : "ট্যাগ",
     "Search" : "Search",
+    "Date" : "Date",
     "Disabled" : "অকার্যকর",
     "Enabled" : "কার্যকর",
     "Remove" : "অপসারণ",
diff --git a/l10n/bn_BD.json b/l10n/bn_BD.json
index 4c1a30d80..656aa29a3 100644
--- a/l10n/bn_BD.json
+++ b/l10n/bn_BD.json
@@ -29,7 +29,9 @@
     "Clear cache" : "ক্যাশে পরিষ্কার কর",
     "Delete" : "মুছে",
     "Add" : "যোগ করুন",
+    "Tags" : "ট্যাগ",
     "Search" : "Search",
+    "Date" : "Date",
     "Disabled" : "অকার্যকর",
     "Enabled" : "কার্যকর",
     "Remove" : "অপসারণ",
diff --git a/l10n/br.js b/l10n/br.js
index a54469878..69feb881a 100644
--- a/l10n/br.js
+++ b/l10n/br.js
@@ -40,7 +40,10 @@ OC.L10N.register(
     "Clear cache" : "Gwalc'hiñ ar c'hache",
     "Delete" : "Dilemel",
     "Add" : "Ouzhpennañ",
+    "Tags" : "Klavioù",
+    "Clear" : "Netaat",
     "Search" : "Klask",
+    "Date" : "Deiz",
     "Disabled" : "Disaotreañ",
     "Enabled" : "Aotreet",
     "Unset" : "N'eo ket bet lakaet",
diff --git a/l10n/br.json b/l10n/br.json
index 4b2fce728..7a517f14c 100644
--- a/l10n/br.json
+++ b/l10n/br.json
@@ -38,7 +38,10 @@
     "Clear cache" : "Gwalc'hiñ ar c'hache",
     "Delete" : "Dilemel",
     "Add" : "Ouzhpennañ",
+    "Tags" : "Klavioù",
+    "Clear" : "Netaat",
     "Search" : "Klask",
+    "Date" : "Deiz",
     "Disabled" : "Disaotreañ",
     "Enabled" : "Aotreet",
     "Unset" : "N'eo ket bet lakaet",
diff --git a/l10n/bs.js b/l10n/bs.js
index 5e09c36e7..ff092c5c8 100644
--- a/l10n/bs.js
+++ b/l10n/bs.js
@@ -26,6 +26,7 @@ OC.L10N.register(
     "Delete" : "Obriši",
     "Add" : "Dodaj",
     "Search" : "Search",
+    "Date" : "Date",
     "Disabled" : "Onemogućeno",
     "Enabled" : "Aktivirano",
     "Tag already exists" : "Oznaka već postoji",
diff --git a/l10n/bs.json b/l10n/bs.json
index d684946d8..d88450756 100644
--- a/l10n/bs.json
+++ b/l10n/bs.json
@@ -24,6 +24,7 @@
     "Delete" : "Obriši",
     "Add" : "Dodaj",
     "Search" : "Search",
+    "Date" : "Date",
     "Disabled" : "Onemogućeno",
     "Enabled" : "Aktivirano",
     "Tag already exists" : "Oznaka već postoji",
diff --git a/l10n/ca.js b/l10n/ca.js
index fbc0b1e84..8e1c8a26c 100644
--- a/l10n/ca.js
+++ b/l10n/ca.js
@@ -81,7 +81,7 @@ OC.L10N.register(
     "Add mail account" : "Afegeix compte de correu",
     "Use Gravatar and favicon avatars" : "Fes servir avatars de Gravatar i favicon",
     "Register as application for mail links" : "Registra com a aplicació per enllaços de correu",
-    "Show keyboard shortcuts" : "Mostra les tecles de drecera",
+    "Show keyboard shortcuts" : "Mostra les dreceres del teclat",
     "Looking for a way to encrypt your emails?" : "Esteu buscant una manera d'encriptar els vostres correus electrònics?",
     "Install Mailvelope browser extension here" : "Instal·leu l'extensió del navegador Mailvelope aquí",
     "Allow the app to collect data about your interactions. Based on this data, the app will adapt to your preferences. The data will only be stored locally." : "Permet que l'aplicació recopili dades sobre les vostres interaccions. A partir d'aquesta dada, l'aplicació s'adaptarà a les teves preferències. Les dades només s'emmagatzemaran localment.",
@@ -148,7 +148,7 @@ OC.L10N.register(
     "Plain text" : "Text net",
     "Rich text" : "Text enriquit",
     "No messages in this mailbox" : "No hi ha missatges en aquesta bústia",
-    "Messages marked as important will show up here" : "Els missatges marcats com a importants es mostraran aquí",
+    "No messages" : "No hi ha missatges",
     "Draft: " : "Esborrany: ",
     "This message is unread" : "Aquest missatge no s'ha llegit",
     "Unfavorite" : "Treu de favorits",
@@ -312,7 +312,11 @@ OC.L10N.register(
     "Copy to clipboard" : "Copia-ho al porta-papers",
     "Contact name …" : "Nom de contacte …",
     "Add" : "Afegeix",
+    "Tags" : "Etiquetes",
+    "Select tags" : "Selecciona etiquetes",
+    "Clear" : "Neteja",
     "Search" : "Cerca",
+    "Date" : "Data",
     "Disabled" : "Inhabilitat",
     "Enabled" : "Habilitat",
     "Sieve Host" : "Servidor de filtrat Sieve",
diff --git a/l10n/ca.json b/l10n/ca.json
index a86b423b1..62a526852 100644
--- a/l10n/ca.json
+++ b/l10n/ca.json
@@ -79,7 +79,7 @@
     "Add mail account" : "Afegeix compte de correu",
     "Use Gravatar and favicon avatars" : "Fes servir avatars de Gravatar i favicon",
     "Register as application for mail links" : "Registra com a aplicació per enllaços de correu",
-    "Show keyboard shortcuts" : "Mostra les tecles de drecera",
+    "Show keyboard shortcuts" : "Mostra les dreceres del teclat",
     "Looking for a way to encrypt your emails?" : "Esteu buscant una manera d'encriptar els vostres correus electrònics?",
     "Install Mailvelope browser extension here" : "Instal·leu l'extensió del navegador Mailvelope aquí",
     "Allow the app to collect data about your interactions. Based on this data, the app will adapt to your preferences. The data will only be stored locally." : "Permet que l'aplicació recopili dades sobre les vostres interaccions. A partir d'aquesta dada, l'aplicació s'adaptarà a les teves preferències. Les dades només s'emmagatzemaran localment.",
@@ -146,7 +146,7 @@
     "Plain text" : "Text net",
     "Rich text" : "Text enriquit",
     "No messages in this mailbox" : "No hi ha missatges en aquesta bústia",
-    "Messages marked as important will show up here" : "Els missatges marcats com a importants es mostraran aquí",
+    "No messages" : "No hi ha missatges",
     "Draft: " : "Esborrany: ",
     "This message is unread" : "Aquest missatge no s'ha llegit",
     "Unfavorite" : "Treu de favorits",
@@ -310,7 +310,11 @@
     "Copy to clipboard" : "Copia-ho al porta-papers",
     "Contact name …" : "Nom de contacte …",
     "Add" : "Afegeix",
+    "Tags" : "Etiquetes",
+    "Select tags" : "Selecciona etiquetes",
+    "Clear" : "Neteja",
     "Search" : "Cerca",
+    "Date" : "Data",
     "Disabled" : "Inhabilitat",
     "Enabled" : "Habilitat",
     "Sieve Host" : "Servidor de filtrat Sieve",
diff --git a/l10n/cs.js b/l10n/cs.js
index 408faa600..d4bccd702 100644
--- a/l10n/cs.js
+++ b/l10n/cs.js
@@ -148,7 +148,7 @@ OC.L10N.register(
     "Plain text" : "Neformátovaný text",
     "Rich text" : "Formátovaný text",
     "No messages in this mailbox" : "V této schránce nejsou žádné zprávy",
-    "Messages marked as important will show up here" : "Zprávy označené jako důležité ze zobrazí zde",
+    "No messages" : "Žádné zprávy",
     "Draft: " : "Koncept:",
     "This message is unread" : "Tato zpráva je nepřečtená",
     "Unfavorite" : "Odebrat z oblíbených",
@@ -312,7 +312,22 @@ OC.L10N.register(
     "Copy to clipboard" : "Zkopírovat do schránky",
     "Contact name …" : "Jméno kontaktu…",
     "Add" : "Přidat",
+    "Search in mailbox" : "Hledat ve schránce",
+    "Search parameters" : "Parametry hledání",
+    "Search term" : "Hledat pojem",
+    "Pick a start date" : "Vybrat datum začátku",
+    "Pick an end date" : "Vybrat datum konce",
+    "Select sender" : "Vybrat odesilatele",
+    "Select recipient" : "Vybrat příjemce",
+    "Select cc recipient" : "Vybrat příjemce kopie",
+    "Select bcc recipient" : "Vybrat příjemce slepé kopie",
+    "Tags" : "Štítky",
+    "Select tags" : "Výběr štítků",
+    "Marked as" : "Označeno jako",
+    "Has attachments" : "Má přílohy",
+    "Clear" : "Vyčistit",
     "Search" : "Hledat",
+    "Date" : "Datum",
     "Disabled" : "Vypnuto",
     "Enabled" : "Zapnuto",
     "Sieve Host" : "Stroj se sieve",
diff --git a/l10n/cs.json b/l10n/cs.json
index 65a0608c5..9e9bfd70e 100644
--- a/l10n/cs.json
+++ b/l10n/cs.json
@@ -146,7 +146,7 @@
     "Plain text" : "Neformátovaný text",
     "Rich text" : "Formátovaný text",
     "No messages in this mailbox" : "V této schránce nejsou žádné zprávy",
-    "Messages marked as important will show up here" : "Zprávy označené jako důležité ze zobrazí zde",
+    "No messages" : "Žádné zprávy",
     "Draft: " : "Koncept:",
     "This message is unread" : "Tato zpráva je nepřečtená",
     "Unfavorite" : "Odebrat z oblíbených",
@@ -310,7 +310,22 @@
     "Copy to clipboard" : "Zkopírovat do schránky",
     "Contact name …" : "Jméno kontaktu…",
     "Add" : "Přidat",
+    "Search in mailbox" : "Hledat ve schránce",
+    "Search parameters" : "Parametry hledání",
+    "Search term" : "Hledat pojem",
+    "Pick a start date" : "Vybrat datum začátku",
+    "Pick an end date" : "Vybrat datum konce",
+    "Select sender" : "Vybrat odesilatele",
+    "Select recipient" : "Vybrat příjemce",
+    "Select cc recipient" : "Vybrat příjemce kopie",
+    "Select bcc recipient" : "Vybrat příjemce slepé kopie",
+    "Tags" : "Štítky",
+    "Select tags" : "Výběr štítků",
+    "Marked as" : "Označeno jako",
+    "Has attachments" : "Má přílohy",
+    "Clear" : "Vyčistit",
     "Search" : "Hledat",
+    "Date" : "Datum",
     "Disabled" : "Vypnuto",
     "Enabled" : "Zapnuto",
     "Sieve Host" : "Stroj se sieve",
diff --git a/l10n/cy_GB.js b/l10n/cy_GB.js
index 025d58cb3..ba9475183 100644
--- a/l10n/cy_GB.js
+++ b/l10n/cy_GB.js
@@ -72,7 +72,9 @@ OC.L10N.register(
     "No message selected" : "Dim neges wedi'i dewis",
     "Delete" : "Dileu",
     "Add" : "Ychwanegu",
+    "Tags" : "Tagiau",
     "Search" : "Chwilio",
+    "Date" : "Date",
     "Disabled" : "Analluogwyd",
     "Enabled" : "Galluogwyd",
     "Custom" : "Cyfaddas",
diff --git a/l10n/cy_GB.json b/l10n/cy_GB.json
index 6b3ad6731..ec99fdb3b 100644
--- a/l10n/cy_GB.json
+++ b/l10n/cy_GB.json
@@ -70,7 +70,9 @@
     "No message selected" : "Dim neges wedi'i dewis",
     "Delete" : "Dileu",
     "Add" : "Ychwanegu",
+    "Tags" : "Tagiau",
     "Search" : "Chwilio",
+    "Date" : "Date",
     "Disabled" : "Analluogwyd",
     "Enabled" : "Galluogwyd",
     "Custom" : "Cyfaddas",
diff --git a/l10n/da.js b/l10n/da.js
index e64668d17..752cab6fe 100644
--- a/l10n/da.js
+++ b/l10n/da.js
@@ -146,7 +146,7 @@ OC.L10N.register(
     "Plain text" : "Klartekst",
     "Rich text" : "Formateret tekst",
     "No messages in this mailbox" : "Ingen beskeder i denne postkasse",
-    "Messages marked as important will show up here" : "Beskeder markeret som vigtige vises her",
+    "No messages" : "Ingen beskeder",
     "Draft: " : "Kladde:",
     "This message is unread" : "Denne besked er ulæst",
     "Unfavorite" : "U-favorit",
@@ -252,7 +252,11 @@ OC.L10N.register(
     "Delete" : "Slet",
     "Copy to clipboard" : "Kopier til udklipsholder",
     "Add" : "Tilføj",
+    "Tags" : "Mærker",
+    "Select tags" : "Vælg tags",
+    "Clear" : "Ryd",
     "Search" : "Søg",
+    "Date" : "Dato",
     "Disabled" : "Deaktiveret",
     "Enabled" : "Aktiveret",
     "Custom" : "Valgfrit",
diff --git a/l10n/da.json b/l10n/da.json
index c102459cf..59ffa3e82 100644
--- a/l10n/da.json
+++ b/l10n/da.json
@@ -144,7 +144,7 @@
     "Plain text" : "Klartekst",
     "Rich text" : "Formateret tekst",
     "No messages in this mailbox" : "Ingen beskeder i denne postkasse",
-    "Messages marked as important will show up here" : "Beskeder markeret som vigtige vises her",
+    "No messages" : "Ingen beskeder",
     "Draft: " : "Kladde:",
     "This message is unread" : "Denne besked er ulæst",
     "Unfavorite" : "U-favorit",
@@ -250,7 +250,11 @@
     "Delete" : "Slet",
     "Copy to clipboard" : "Kopier til udklipsholder",
     "Add" : "Tilføj",
+    "Tags" : "Mærker",
+    "Select tags" : "Vælg tags",
+    "Clear" : "Ryd",
     "Search" : "Søg",
+    "Date" : "Dato",
     "Disabled" : "Deaktiveret",
     "Enabled" : "Aktiveret",
     "Custom" : "Valgfrit",
diff --git a/l10n/de.js b/l10n/de.js
index 357c0af78..32e209a53 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -148,7 +148,7 @@ OC.L10N.register(
     "Plain text" : "Klartext",
     "Rich text" : "Rich-Text",
     "No messages in this mailbox" : "Keine Nachrichten in diesem Postfach",
-    "Messages marked as important will show up here" : "Als wichtig markierte Nachrichten werden hier angezeigt",
+    "No messages" : "Keine Nachrichten",
     "Draft: " : "Entwurf:",
     "This message is unread" : "Diese Nachricht ist ungelesen",
     "Unfavorite" : "Von Favoriten entfernen",
@@ -312,7 +312,22 @@ OC.L10N.register(
     "Copy to clipboard" : "In die Zwischenablage kopieren",
     "Contact name …" : "Kontakt-Name …",
     "Add" : "Hinzufügen",
+    "Search in mailbox" : "Im Postfach suchen",
+    "Search parameters" : "Suchparameter",
+    "Search term" : "Scuhbegriff",
+    "Pick a start date" : "Startdatum wählen",
+    "Pick an end date" : "Enddatum wählen",
+    "Select sender" : "Absender wählen",
+    "Select recipient" : "Empfänger wählen",
+    "Select cc recipient" : "CC-Empfänger wählen",
+    "Select bcc recipient" : "BCC-Empfänger wählen",
+    "Tags" : "Schlagworte",
+    "Select tags" : "Schlagworte auswählen",
+    "Marked as" : "Markiert als",
+    "Has attachments" : "Hat Anhänge",
+    "Clear" : "Löschen",
     "Search" : "Suchen",
+    "Date" : "Datum",
     "Disabled" : "Deaktiviert",
     "Enabled" : "Aktiviert",
     "Sieve Host" : "Sieve-Host",
diff --git a/l10n/de.json b/l10n/de.json
index bdee60c22..b92b2388d 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -146,7 +146,7 @@
     "Plain text" : "Klartext",
     "Rich text" : "Rich-Text",
     "No messages in this mailbox" : "Keine Nachrichten in diesem Postfach",
-    "Messages marked as important will show up here" : "Als wichtig markierte Nachrichten werden hier angezeigt",
+    "No messages" : "Keine Nachrichten",
     "Draft: " : "Entwurf:",
     "This message is unread" : "Diese Nachricht ist ungelesen",
     "Unfavorite" : "Von Favoriten entfernen",
@@ -310,7 +310,22 @@
     "Copy to clipboard" : "In die Zwischenablage kopieren",
     "Contact name …" : "Kontakt-Name …",
     "Add" : "Hinzufügen",
+    "Search in mailbox" : "Im Postfach suchen",
+    "Search parameters" : "Suchparameter",
+    "Search term" : "Scuhbegriff",
+    "Pick a start date" : "Startdatum wählen",
+    "Pick an end date" : "Enddatum wählen",
+    "Select sender" : "Absender wählen",
+    "Select recipient" : "Empfänger wählen",
+    "Select cc recipient" : "CC-Empfänger wählen",
+    "Select bcc recipient" : "BCC-Empfänger wählen",
+    "Tags" : "Schlagworte",
+    "Select tags" : "Schlagworte auswählen",
+    "Marked as" : "Markiert als",
+    "Has attachments" : "Hat Anhänge",
+    "Clear" : "Löschen",
     "Search" : "Suchen",
+    "Date" : "Datum",
     "Disabled" : "Deaktiviert",
     "Enabled" : "Aktiviert",
     "Sieve Host" : "Sieve-Host",
diff --git a/l10n/de_DE.js b/l10n/de_DE.js
index 835aa2097..f42cc440d 100644
--- a/l10n/de_DE.js
+++ b/l10n/de_DE.js
@@ -148,7 +148,7 @@ OC.L10N.register(
     "Plain text" : "Klartext",
     "Rich text" : "Rich-Text",
     "No messages in this mailbox" : "Keine Nachrichten in diesem Postfach",
-    "Messages marked as important will show up here" : "Als wichtig markierte Nachrichten werden hier angezeigt",
+    "No messages" : "Keine Nachrichten",
     "Draft: " : "Entwurf:",
     "This message is unread" : "Diese Nachricht ist ungelesen",
     "Unfavorite" : "Nicht favorisieren",
@@ -312,7 +312,22 @@ OC.L10N.register(
     "Copy to clipboard" : "In die Zwischenablage kopieren",
     "Contact name …" : "Kontakt-Name …",
     "Add" : "Hinzufügen",
+    "Search in mailbox" : "Im Postfach suchen",
+    "Search parameters" : "Suchparameter",
+    "Search term" : "Scuhbegriff",
+    "Pick a start date" : "Startdatum wählen",
+    "Pick an end date" : "Enddatum wählen",
+    "Select sender" : "Absender wählen",
+    "Select recipient" : "Empfänger wählen",
+    "Select cc recipient" : "CC-Empfänger wählen",
+    "Select bcc recipient" : "BCC-Empfänger wählen",
+    "Tags" : "Schlagworte",
+    "Select tags" : "Schlagworte auswählen",
+    "Marked as" : "Markiert als",
+    "Has attachments" : "Hat Anhänge",
+    "Clear" : "Leeren",
     "Search" : "Suchen",
+    "Date" : "Datum",
     "Disabled" : "Deaktiviert",
     "Enabled" : "Aktiviert",
     "Sieve Host" : "Sieve-Host",
diff --git a/l10n/de_DE.json b/l10n/de_DE.json
index af378ed1d..cfc235fe8 100644
--- a/l10n/de_DE.json
+++ b/l10n/de_DE.json
@@ -146,7 +146,7 @@
     "Plain text" : "Klartext",
     "Rich text" : "Rich-Text",
     "No messages in this mailbox" : "Keine Nachrichten in diesem Postfach",
-    "Messages marked as important will show up here" : "Als wichtig markierte Nachrichten werden hier angezeigt",
+    "No messages" : "Keine Nachrichten",
     "Draft: " : "Entwurf:",
     "This message is unread" : "Diese Nachricht ist ungelesen",
     "Unfavorite" : "Nicht favorisieren",
@@ -310,7 +310,22 @@
     "Copy to clipboard" : "In die Zwischenablage kopieren",
     "Contact name …" : "Kontakt-Name …",
     "Add" : "Hinzufügen",
+    "Search in mailbox" : "Im Postfach suchen",
+    "Search parameters" : "Suchparameter",
+    "Search term" : "Scuhbegriff",
+    "Pick a start date" : "Startdatum wählen",
+    "Pick an end date" : "Enddatum wählen",
+    "Select sender" : "Absender wählen",
+    "Select recipient" : "Empfänger wählen",
+    "Select cc recipient" : "CC-Empfänger wählen",
+    "Select bcc recipient" : "BCC-Empfänger wählen",
+    "Tags" : "Schlagworte",
+    "Select tags" : "Schlagworte auswählen",
+    "Marked as" : "Markiert als",
+    "Has attachments" : "Hat Anhänge",
+    "Clear" : "Leeren",
     "Search" : "Suchen",
+    "Date" : "Datum",
     "Disabled" : "Deaktiviert",
     "Enabled" : "Aktiviert",
     "Sieve Host" : "Sieve-Host",
diff --git a/l10n/el.js b/l10n/el.js
index 0a50d5893..ddd1b34bb 100644
--- a/l10n/el.js
+++ b/l10n/el.js
@@ -125,7 +125,7 @@ OC.L10N.register(
     "Plain text" : "Απλό κείμενο",
     "Rich text" : "Εμπλουτισμένο κείμενο",
     "No messages in this mailbox" : "Δεν υπάρχουν μηνύματα σε αυτό το γραμματοκιβώτιο.",
-    "Messages marked as important will show up here" : "Εδώ θα εμφανίζονται τα μηνύματα που έχουν επισημανθεί ως σημαντικά",
+    "No messages" : "Κανένα μήνυμα",
     "Draft: " : "Πρόχειρο:",
     "Unfavorite" : "Μη αγαπημένο",
     "Favorite" : "Αγαπημένο",
@@ -272,7 +272,11 @@ OC.L10N.register(
     "Copy to clipboard" : "Αντιγραφή στο πρόχειρο",
     "Contact name …" : "Όνομα επαφής ...",
     "Add" : "Προσθήκη",
+    "Tags" : "Ετικέτες",
+    "Select tags" : "Επιλέξτε ετικέτες",
+    "Clear" : "Εκκαθάριση",
     "Search" : "Αναζήτηση",
+    "Date" : "Ημερομηνία",
     "Disabled" : "Απενεργοποιημένο",
     "Enabled" : "Ενεργοποιημένο",
     "IMAP Credentials" : "Διαπιστευτήρια IMAP",
diff --git a/l10n/el.json b/l10n/el.json
index 284bd1006..ef2944084 100644
--- a/l10n/el.json
+++ b/l10n/el.json
@@ -123,7 +123,7 @@
     "Plain text" : "Απλό κείμενο",
     "Rich text" : "Εμπλουτισμένο κείμενο",
     "No messages in this mailbox" : "Δεν υπάρχουν μηνύματα σε αυτό το γραμματοκιβώτιο.",
-    "Messages marked as important will show up here" : "Εδώ θα εμφανίζονται τα μηνύματα που έχουν επισημανθεί ως σημαντικά",
+    "No messages" : "Κανένα μήνυμα",
     "Draft: " : "Πρόχειρο:",
     "Unfavorite" : "Μη αγαπημένο",
     "Favorite" : "Αγαπημένο",
@@ -270,7 +270,11 @@
     "Copy to clipboard" : "Αντιγραφή στο πρόχειρο",
     "Contact name …" : "Όνομα επαφής ...",
     "Add" : "Προσθήκη",
+    "Tags" : "Ετικέτες",
+    "Select tags" : "Επιλέξτε ετικέτες",
+    "Clear" : "Εκκαθάριση",
     "Search" : "Αναζήτηση",
+    "Date" : "Ημερομηνία",
     "Disabled" : "Απενεργοποιημένο",
     "Enabled" : "Ενεργοποιημένο",
     "IMAP Credentials" : "Διαπιστευτήρια IMAP",
diff --git a/l10n/en_GB.js b/l10n/en_GB.js
index d31d828a2..06d246ddd 100644
--- a/l10n/en_GB.js
+++ b/l10n/en_GB.js
@@ -76,7 +76,11 @@ OC.L10N.register(
     "Delete" : "Delete",
     "Copy to clipboard" : "Copy to clipboard",
     "Add" : "Add",
+    "Tags" : "Tags",
+    "Select tags" : "Select tags",
+    "Clear" : "Clear",
     "Search" : "Search",
+    "Date" : "Date",
     "Disabled" : "Disabled",
     "Enabled" : "Enabled",
     "Custom" : "Custom",
diff --git a/l10n/en_GB.json b/l10n/en_GB.json
index 773dc99d6..3df34f97d 100644
--- a/l10n/en_GB.json
+++ b/l10n/en_GB.json
@@ -74,7 +74,11 @@
     "Delete" : "Delete",
     "Copy to clipboard" : "Copy to clipboard",
     "Add" : "Add",
+    "Tags" : "Tags",
+    "Select tags" : "Select tags",
+    "Clear" : "Clear",
     "Search" : "Search",
+    "Date" : "Date",
     "Disabled" : "Disabled",
     "Enabled" : "Enabled",
     "Custom" : "Custom",
diff --git a/l10n/eo.js b/l10n/eo.js
index 107f8e7b6..978f8eafd 100644
--- a/l10n/eo.js
+++ b/l10n/eo.js
@@ -114,7 +114,11 @@ OC.L10N.register(
     "Delete" : "Forigi",
     "Copy to clipboard" : "Kopii tondejen",
     "Add" : "Aldoni",
+    "Tags" : "Etikedoj",
+    "Select tags" : "Elekti etikedojn",
+    "Clear" : "Viŝi",
     "Search" : "Serĉi",
+    "Date" : "Date",
     "Disabled" : "Malŝaltita",
     "Enabled" : "Ŝaltita",
     "Custom" : "Propra",
diff --git a/l10n/eo.json b/l10n/eo.json
index 88e2e54b0..4526bd941 100644
--- a/l10n/eo.json
+++ b/l10n/eo.json
@@ -112,7 +112,11 @@
     "Delete" : "Forigi",
     "Copy to clipboard" : "Kopii tondejen",
     "Add" : "Aldoni",
+    "Tags" : "Etikedoj",
+    "Select tags" : "Elekti etikedojn",
+    "Clear" : "Viŝi",
     "Search" : "Serĉi",
+    "Date" : "Date",
     "Disabled" : "Malŝaltita",
     "Enabled" : "Ŝaltita",
     "Custom" : "Propra",
diff --git a/l10n/es.js b/l10n/es.js
index e1caf1f37..8e4b2986f 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -148,7 +148,7 @@ OC.L10N.register(
     "Plain text" : "Texto simple",
     "Rich text" : "Texto enriquecido",
     "No messages in this mailbox" : "No hay mensajes en esta bandeja",
-    "Messages marked as important will show up here" : "Los mensajes marcados como importantes se mostrarán aquí",
+    "No messages" : "No hay mensajes",
     "Draft: " : "Borrador:",
     "This message is unread" : "Este mensaje no se ha leído",
     "Unfavorite" : "Desmarcar como favorito",
@@ -312,7 +312,11 @@ OC.L10N.register(
     "Copy to clipboard" : "Copiar al portapapeles",
     "Contact name …" : "Nombre del contacto …",
     "Add" : "Añadir",
+    "Tags" : "Etiquetas",
+    "Select tags" : "Selecciona etiquetas",
+    "Clear" : "Borrar",
     "Search" : "Buscar",
+    "Date" : "Fecha",
     "Disabled" : "Desactivado",
     "Enabled" : "Activado",
     "Sieve Host" : "Servidor Sieve",
diff --git a/l10n/es.json b/l10n/es.json
index d3a411f0a..291bd6ef1 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -146,7 +146,7 @@
     "Plain text" : "Texto simple",
     "Rich text" : "Texto enriquecido",
     "No messages in this mailbox" : "No hay mensajes en esta bandeja",
-    "Messages marked as important will show up here" : "Los mensajes marcados como importantes se mostrarán aquí",
+    "No messages" : "No hay mensajes",
     "Draft: " : "Borrador:",
     "This message is unread" : "Este mensaje no se ha leído",
     "Unfavorite" : "Desmarcar como favorito",
@@ -310,7 +310,11 @@
     "Copy to clipboard" : "Copiar al portapapeles",
     "Contact name …" : "Nombre del contacto …",
     "Add" : "Añadir",
+    "Tags" : "Etiquetas",
+    "Select tags" : "Selecciona etiquetas",
+    "Clear" : "Borrar",
     "Search" : "Buscar",
+    "Date" : "Fecha",
     "Disabled" : "Desactivado",
     "Enabled" : "Activado",
     "Sieve Host" : "Servidor Sieve",
diff --git a/l10n/es_419.js b/l10n/es_419.js
index c1e69aa62..a0595d6c0 100644
--- a/l10n/es_419.js
+++ b/l10n/es_419.js
@@ -71,7 +71,9 @@ OC.L10N.register(
     "Copy to clipboard" : "Copiar al portapapeles",
     "Add" : "Agregar",
     "Tags" : "Etiquetas",
+    "Select tags" : "Selecciona las etiquetas",
     "Search" : "Buscar",
+    "Date" : "Fecha",
     "Disabled" : "Deshabilitado",
     "Enabled" : "Habilitado",
     "Custom" : "Personalizado",
diff --git a/l10n/es_419.json b/l10n/es_419.json
index e305bac9f..b2b4f3b8c 100644
--- a/l10n/es_419.json
+++ b/l10n/es_419.json
@@ -69,7 +69,9 @@
     "Copy to clipboard" : "Copiar al portapapeles",
     "Add" : "Agregar",
     "Tags" : "Etiquetas",
+    "Select tags" : "Selecciona las etiquetas",
     "Search" : "Buscar",
+    "Date" : "Fecha",
     "Disabled" : "Deshabilitado",
     "Enabled" : "Habilitado",
     "Custom" : "Personalizado",
diff --git a/l10n/es_AR.js b/l10n/es_AR.js
index 1de9a7a6a..c7635d066 100644
--- a/l10n/es_AR.js
+++ b/l10n/es_AR.js
@@ -69,7 +69,9 @@ OC.L10N.register(
     "Copy to clipboard" : "Copiar al portapapeles",
     "Add" : "Añadir",
     "Tags" : "Etiquetas",
+    "Clear" : "Borrar",
     "Search" : "Buscar",
+    "Date" : "Fecha",
     "Disabled" : "Deshabilitado",
     "Enabled" : "Habilitado",
     "Custom" : "Personalizado",
diff --git a/l10n/es_AR.json b/l10n/es_AR.json
index 00d7ffe3d..4bcbb2b0c 100644
--- a/l10n/es_AR.json
+++ b/l10n/es_AR.json
@@ -67,7 +67,9 @@
     "Copy to clipboard" : "Copiar al portapapeles",
     "Add" : "Añadir",
     "Tags" : "Etiquetas",
+    "Clear" : "Borrar",
     "Search" : "Buscar",
+    "Date" : "Fecha",
     "Disabled" : "Deshabilitado",
     "Enabled" : "Habilitado",
     "Custom" : "Personalizado",
diff --git a/l10n/es_CL.js b/l10n/es_CL.js
index f737cec05..8600320a9 100644
--- a/l10n/es_CL.js
+++ b/l10n/es_CL.js
@@ -71,7 +71,10 @@ OC.L10N.register(
     "Copy to clipboard" : "Copiar al portapapeles",
     "Add" : "Agregar",
     "Tags" : "Etiquetas",
+    "Select tags" : "Selecciona las etiquetas",
+    "Clear" : "Limpiar",
     "Search" : "Buscar",
+    "Date" : "Fecha",
     "Disabled" : "Deshabilitado",
     "Enabled" : "Habilitado",
     "Custom" : "Personalizado",
diff --git a/l10n/es_CL.json b/l10n/es_CL.json
index 626995388..4e9122288 100644
--- a/l10n/es_CL.json
+++ b/l10n/es_CL.json
@@ -69,7 +69,10 @@
     "Copy to clipboard" : "Copiar al portapapeles",
     "Add" : "Agregar",
     "Tags" : "Etiquetas",
+    "Select tags" : "Selecciona las etiquetas",
+    "Clear" : "Limpiar",
     "Search" : "Buscar",
+    "Date" : "Fecha",
     "Disabled" : "Deshabilitado",
     "Enabled" : "Habilitado",
     "Custom" : "Personalizado",
diff --git a/l10n/es_CO.js b/l10n/es_CO.js
index 4c330f1be..fb517f77c 100644
--- a/l10n/es_CO.js
+++ b/l10n/es_CO.js
@@ -71,7 +71,10 @@ OC.L10N.register(
     "Copy to clipboard" : "Copiar al portapapeles",
     "Add" : "Agregar",
     "Tags" : "Etiquetas",
+    "Select tags" : "Selecciona las etiquetas",
+    "Clear" : "Limpiar",
     "Search" : "Buscar",
+    "Date" : "Fecha",
     "Disabled" : "Deshabilitado",
     "Enabled" : "Habilitado",
     "Custom" : "Personalizado",
diff --git a/l10n/es_CO.json b/l10n/es_CO.json
index 7beeab48d..02ed5f6b5 100644
--- a/l10n/es_CO.json
+++ b/l10n/es_CO.json
@@ -69,7 +69,10 @@
     "Copy to clipboard" : "Copiar al portapapeles",
     "Add" : "Agregar",
     "Tags" : "Etiquetas",
+    "Select tags" : "Selecciona las etiquetas",
+    "Clear" : "Limpiar",
     "Search" : "Buscar",
+    "Date" : "Fecha",
     "Disabled" : "Deshabilitado",
     "Enabled" : "Habilitado",
     "Custom" : "Personalizado",
diff --git a/l10n/es_CR.js b/l10n/es_CR.js
index f737cec05..8600320a9 100644
--- a/l10n/es_CR.js
+++ b/l10n/es_CR.js
@@ -71,7 +71,10 @@ OC.L10N.register(
     "Copy to clipboard" : "Copiar al portapapeles",
     "Add" : "Agregar",
     "Tags" : "Etiquetas",
+    "Select tags" : "Selecciona las etiquetas",
+    "Clear" : "Limpiar",
     "Search" : "Buscar",
+    "Date" : "Fecha",
     "Disabled" : "Deshabilitado",
     "Enabled" : "Habilitado",
     "Custom" : "Personalizado",
diff --git a/l10n/es_CR.json b/l10n/es_CR.json
index 626995388..4e9122288 100644
--- a/l10n/es_CR.json
+++ b/l10n/es_CR.json
@@ -69,7 +69,10 @@
     "Copy to clipboard" : "Copiar al portapapeles",
     "Add" : "Agregar",
     "Tags" : "Etiquetas",
+    "Select tags" : "Selecciona las etiquetas",
+    "Clear" : "Limpiar",
     "Search" : "Buscar",
+    "Date" : "Fecha",
     "Disabled" : "Deshabilitado",
     "Enabled" : "Habilitado",
     "Custom" : "Personalizado",
diff --git a/l10n/es_DO.js b/l10n/es_DO.js
index f737cec05..8600320a9 100644
--- a/l10n/es_DO.js
+++ b/l10n/es_DO.js
@@ -71,7 +71,10 @@ OC.L10N.register(
     "Copy to clipboard" : "Copiar al portapapeles",
     "Add" : "Agregar",
     "Tags" : "Etiquetas",
+    "Select tags" : "Selecciona las etiquetas",
+    "Clear" : "Limpiar",
     "Search" : "Buscar",
+    "Date" : "Fecha",
     "Disabled" : "Deshabilitado",
     "Enabled" : "Habilitado",
     "Custom" : "Personalizado",
diff --git a/l10n/es_DO.json b/l10n/es_DO.json
index 626995388..4e9122288 100644
--- a/l10n/es_DO.json
+++ b/l10n/es_DO.json
@@ -69,7 +69,10 @@
     "Copy to clipboard" : "Copiar al portapapeles",
     "Add" : "Agregar",
     "Tags" : "Etiquetas",
+    "Select tags" : "Selecciona las etiquetas",
+    "Clear" : "Limpiar",
     "Search" : "Buscar",
+    "Date" : "Fecha",
     "Disabled" : "Deshabilitado",
     "Enabled" : "Habilitado",
     "Custom" : "Personalizado",
diff --git a/l10n/es_EC.js b/l10n/es_EC.js
index f737cec05..8600320a9 100644
--- a/l10n/es_EC.js
+++ b/l10n/es_EC.js
@@ -71,7 +71,10 @@ OC.L10N.register(
     "Copy to clipboard" : "Copiar al portapapeles",
     "Add" : "Agregar",
     "Tags" : "Etiquetas",
+    "Select tags" : "Selecciona las etiquetas",
+    "Clear" : "Limpiar",
     "Search" : "Buscar",
+    "Date" : "Fecha",
     "Disabled" : "Deshabilitado",
     "Enabled" : "Habilitado",
     "Custom" : "Personalizado",
diff --git a/l10n/es_EC.json b/l10n/es_EC.json
index 626995388..4e9122288 100644
--- a/l10n/es_EC.json
+++ b/l10n/es_EC.json
@@ -69,7 +69,10 @@
     "Copy to clipboard" : "Copiar al portapapeles",
     "Add" : "Agregar",
     "Tags" : "Etiquetas",
+    "Select tags" : "Selecciona las etiquetas",
+    "Clear" : "Limpiar",
     "Search" : "Buscar",
+    "Date" : "Fecha",
     "Disabled" : "Deshabilitado",
     "Enabled" : "Habilitado",
     "Custom" : "Personalizado",
diff --git a/l10n/es_GT.js b/l10n/es_GT.js
index f1b45ba3b..99b85715e 100644
--- a/l10n/es_GT.js
+++ b/l10n/es_GT.js
@@ -109,6 +109,7 @@ OC.L10N.register(
     "Plain text" : "Texto simple",
     "Rich text" : "Texto enriquecido",
     "No messages in this mailbox" : "No hay mensajes en esta bandeja",
+    "No messages" : "No hay mensajes",
     "Draft: " : "Borrador:",
     "Unfavorite" : "Desmarcar como favorito",
     "Favorite" : "Favorito",
@@ -144,7 +145,10 @@ OC.L10N.register(
     "Copy to clipboard" : "Copiar al portapapeles",
     "Add" : "Agregar",
     "Tags" : "Etiquetas",
+    "Select tags" : "Selecciona las etiquetas",
+    "Clear" : "Limpiar",
     "Search" : "Buscar",
+    "Date" : "Fecha",
     "Disabled" : "Deshabilitado",
     "Enabled" : "Habilitado",
     "Custom" : "Personalizado",
diff --git a/l10n/es_GT.json b/l10n/es_GT.json
index cec9088dc..27df5f330 100644
--- a/l10n/es_GT.json
+++ b/l10n/es_GT.json
@@ -107,6 +107,7 @@
     "Plain text" : "Texto simple",
     "Rich text" : "Texto enriquecido",
     "No messages in this mailbox" : "No hay mensajes en esta bandeja",
+    "No messages" : "No hay mensajes",
     "Draft: " : "Borrador:",
     "Unfavorite" : "Desmarcar como favorito",
     "Favorite" : "Favorito",
@@ -142,7 +143,10 @@
     "Copy to clipboard" : "Copiar al portapapeles",
     "Add" : "Agregar",
     "Tags" : "Etiquetas",
+    "Select tags" : "Selecciona las etiquetas",
+    "Clear" : "Limpiar",
     "Search" : "Buscar",
+    "Date" : "Fecha",
     "Disabled" : "Deshabilitado",
     "Enabled" : "Habilitado",
     "Custom" : "Personalizado",
diff --git a/l10n/es_HN.js b/l10n/es_HN.js
index 29e6d61e9..5a1362f5c 100644
--- a/l10n/es_HN.js
+++ b/l10n/es_HN.js
@@ -71,7 +71,10 @@ OC.L10N.register(
     "Copy to clipboard" : "Copiar al portapapeles",
     "Add" : "Agregar",
     "Tags" : "Etiquetas",
+    "Select tags" : "Selecciona las etiquetas",
+    "Clear" : "Limpiar",
     "Search" : "Buscar",
+    "Date" : "Fecha",
     "Disabled" : "Deshabilitado",
     "Enabled" : "Habilitado",
     "Custom" : "Personalizado",
diff --git a/l10n/es_HN.json b/l10n/es_HN.json
index a055cdc45..868ee44e9 100644
--- a/l10n/es_HN.json
+++ b/l10n/es_HN.json
@@ -69,7 +69,10 @@
     "Copy to clipboard" : "Copiar al portapapeles",
     "Add" : "Agregar",
     "Tags" : "Etiquetas",
+    "Select tags" : "Selecciona las etiquetas",
+    "Clear" : "Limpiar",
     "Search" : "Buscar",
+    "Date" : "Fecha",
     "Disabled" : "Deshabilitado",
     "Enabled" : "Habilitado",
     "Custom" : "Personalizado",
diff --git a/l10n/es_MX.js b/l10n/es_MX.js
index 881f1dea5..6e64afb2a 100644
--- a/l10n/es_MX.js
+++ b/l10n/es_MX.js
@@ -72,8 +72,10 @@ OC.L10N.register(
     "Copy to clipboard" : "Copiar al portapapeles",
     "Add" : "Agregar",
     "Tags" : "Etiquetas",
+    "Select tags" : "Selecciona las etiquetas",
     "Clear" : "Limpiar",
     "Search" : "Buscar",
+    "Date" : "Fecha",
     "Disabled" : "Deshabilitado",
     "Enabled" : "Habilitado",
     "Custom" : "Personalizado",
diff --git a/l10n/es_MX.json b/l10n/es_MX.json
index 783fb46de..13f170084 100644
--- a/l10n/es_MX.json
+++ b/l10n/es_MX.json
@@ -70,8 +70,10 @@
     "Copy to clipboard" : "Copiar al portapapeles",
     "Add" : "Agregar",
     "Tags" : "Etiquetas",
+    "Select tags" : "Selecciona las etiquetas",
     "Clear" : "Limpiar",
     "Search" : "Buscar",
+    "Date" : "Fecha",
     "Disabled" : "Deshabilitado",
     "Enabled" : "Habilitado",
     "Custom" : "Personalizado",
diff --git a/l10n/es_NI.js b/l10n/es_NI.js
index 9b1ea46fa..5137f9277 100644
--- a/l10n/es_NI.js
+++ b/l10n/es_NI.js
@@ -71,6 +71,7 @@ OC.L10N.register(
     "Copy to clipboard" : "Copiar al portapapeles",
     "Add" : "Agregar",
     "Tags" : "Etiquetas",
+    "Select tags" : "Selecciona las etiquetas",
     "Search" : "Buscar",
     "Date" : "Fecha",
     "Disabled" : "Deshabilitado",
diff --git a/l10n/es_NI.json b/l10n/es_NI.json
index bc31657c7..c6b83eb32 100644
--- a/l10n/es_NI.json
+++ b/l10n/es_NI.json
@@ -69,6 +69,7 @@
     "Copy to clipboard" : "Copiar al portapapeles",
     "Add" : "Agregar",
     "Tags" : "Etiquetas",
+    "Select tags" : "Selecciona las etiquetas",
     "Search" : "Buscar",
     "Date" : "Fecha",
     "Disabled" : "Deshabilitado",
diff --git a/l10n/es_PA.js b/l10n/es_PA.js
index 6f4f10f90..a45c43c14 100644
--- a/l10n/es_PA.js
+++ b/l10n/es_PA.js
@@ -71,6 +71,7 @@ OC.L10N.register(
     "Copy to clipboard" : "Copiar al portapapeles",
     "Add" : "Agregar",
     "Tags" : "Etiquetas",
+    "Select tags" : "Selecciona las etiquetas",
     "Search" : "Buscar",
     "Date" : "Fecha",
     "Disabled" : "Deshabilitado",
diff --git a/l10n/es_PA.json b/l10n/es_PA.json
index 720638e99..492b4d96f 100644
--- a/l10n/es_PA.json
+++ b/l10n/es_PA.json
@@ -69,6 +69,7 @@
     "Copy to clipboard" : "Copiar al portapapeles",
     "Add" : "Agregar",
     "Tags" : "Etiquetas",
+    "Select tags" : "Selecciona las etiquetas",
     "Search" : "Buscar",
     "Date" : "Fecha",
     "Disabled" : "Deshabilitado",
diff --git a/l10n/es_PE.js b/l10n/es_PE.js
index 9b1ea46fa..5137f9277 100644
--- a/l10n/es_PE.js
+++ b/l10n/es_PE.js
@@ -71,6 +71,7 @@ OC.L10N.register(
     "Copy to clipboard" : "Copiar al portapapeles",
     "Add" : "Agregar",
     "Tags" : "Etiquetas",
+    "Select tags" : "Selecciona las etiquetas",
     "Search" : "Buscar",
     "Date" : "Fecha",
     "Disabled" : "Deshabilitado",
diff --git a/l10n/es_PE.json b/l10n/es_PE.json
index bc31657c7..c6b83eb32 100644
--- a/l10n/es_PE.json
+++ b/l10n/es_PE.json
@@ -69,6 +69,7 @@
     "Copy to clipboard" : "Copiar al portapapeles",
     "Add" : "Agregar",
     "Tags" : "Etiquetas",
+    "Select tags" : "Selecciona las etiquetas",
     "Search" : "Buscar",
     "Date" : "Fecha",
     "Disabled" : "Deshabilitado",
diff --git a/l10n/es_PR.js b/l10n/es_PR.js
index 9b1ea46fa..5137f9277 100644
--- a/l10n/es_PR.js
+++ b/l10n/es_PR.js
@@ -71,6 +71,7 @@ OC.L10N.register(
     "Copy to clipboard" : "Copiar al portapapeles",
     "Add" : "Agregar",
     "Tags" : "Etiquetas",
+    "Select tags" : "Selecciona las etiquetas",
     "Search" : "Buscar",
     "Date" : "Fecha",
     "Disabled" : "Deshabilitado",
diff --git a/l10n/es_PR.json b/l10n/es_PR.json
index bc31657c7..c6b83eb32 100644
--- a/l10n/es_PR.json
+++ b/l10n/es_PR.json
@@ -69,6 +69,7 @@
     "Copy to clipboard" : "Copiar al portapapeles",
     "Add" : "Agregar",
     "Tags" : "Etiquetas",
+    "Select tags" : "Selecciona las etiquetas",
     "Search" : "Buscar",
     "Date" : "Fecha",
     "Disabled" : "Deshabilitado",
diff --git a/l10n/es_PY.js b/l10n/es_PY.js
index 6f4f10f90..a45c43c14 100644
--- a/l10n/es_PY.js
+++ b/l10n/es_PY.js
@@ -71,6 +71,7 @@ OC.L10N.register(
     "Copy to clipboard" : "Copiar al portapapeles",
     "Add" : "Agregar",
     "Tags" : "Etiquetas",
+    "Select tags" : "Selecciona las etiquetas",
     "Search" : "Buscar",
     "Date" : "Fecha",
     "Disabled" : "Deshabilitado",
diff --git a/l10n/es_PY.json b/l10n/es_PY.json
index 720638e99..492b4d96f 100644
--- a/l10n/es_PY.json
+++ b/l10n/es_PY.json
@@ -69,6 +69,7 @@
     "Copy to clipboard" : "Copiar al portapapeles",
     "Add" : "Agregar",
     "Tags" : "Etiquetas",
+    "Select tags" : "Selecciona las etiquetas",
     "Search" : "Buscar",
     "Date" : "Fecha",
     "Disabled" : "Deshabilitado",
diff --git a/l10n/es_SV.js b/l10n/es_SV.js
index a883915ef..8600320a9 100644
--- a/l10n/es_SV.js
+++ b/l10n/es_SV.js
@@ -71,6 +71,7 @@ OC.L10N.register(
     "Copy to clipboard" : "Copiar al portapapeles",
     "Add" : "Agregar",
     "Tags" : "Etiquetas",
+    "Select tags" : "Selecciona las etiquetas",
     "Clear" : "Limpiar",
     "Search" : "Buscar",
     "Date" : "Fecha",
diff --git a/l10n/es_SV.json b/l10n/es_SV.json
index db5c5d22a..4e9122288 100644
--- a/l10n/es_SV.json
+++ b/l10n/es_SV.json
@@ -69,6 +69,7 @@
     "Copy to clipboard" : "Copiar al portapapeles",
     "Add" : "Agregar",
     "Tags" : "Etiquetas",
+    "Select tags" : "Selecciona las etiquetas",
     "Clear" : "Limpiar",
     "Search" : "Buscar",
     "Date" : "Fecha",
diff --git a/l10n/es_UY.js b/l10n/es_UY.js
index 6f4f10f90..a45c43c14 100644
--- a/l10n/es_UY.js
+++ b/l10n/es_UY.js
@@ -71,6 +71,7 @@ OC.L10N.register(
     "Copy to clipboard" : "Copiar al portapapeles",
     "Add" : "Agregar",
     "Tags" : "Etiquetas",
+    "Select tags" : "Selecciona las etiquetas",
     "Search" : "Buscar",
     "Date" : "Fecha",
     "Disabled" : "Deshabilitado",
diff --git a/l10n/es_UY.json b/l10n/es_UY.json
index 720638e99..492b4d96f 100644
--- a/l10n/es_UY.json
+++ b/l10n/es_UY.json
@@ -69,6 +69,7 @@
     "Copy to clipboard" : "Copiar al portapapeles",
     "Add" : "Agregar",
     "Tags" : "Etiquetas",
+    "Select tags" : "Selecciona las etiquetas",
     "Search" : "Buscar",
     "Date" : "Fecha",
     "Disabled" : "Deshabilitado",
diff --git a/l10n/eu.js b/l10n/eu.js
index 7de1982a4..ce53ed8aa 100644
--- a/l10n/eu.js
+++ b/l10n/eu.js
@@ -148,7 +148,7 @@ OC.L10N.register(
     "Plain text" : "Testu arrunta",
     "Rich text" : "Testu aberastua",
     "No messages in this mailbox" : "Mezurik ez postontzi honetan",
-    "Messages marked as important will show up here" : "Garrantzitsu gisa markatutako mezuak hemen agertuko dira",
+    "No messages" : "Mezurik ez",
     "Draft: " : "Zirriborroa: ",
     "This message is unread" : "Mezu hau irakurri gabe dago",
     "Unfavorite" : "Kendu gogokoetatik",
diff --git a/l10n/eu.json b/l10n/eu.json
index 46f809adb..27590314f 100644
--- a/l10n/eu.json
+++ b/l10n/eu.json
@@ -146,7 +146,7 @@
     "Plain text" : "Testu arrunta",
     "Rich text" : "Testu aberastua",
     "No messages in this mailbox" : "Mezurik ez postontzi honetan",
-    "Messages marked as important will show up here" : "Garrantzitsu gisa markatutako mezuak hemen agertuko dira",
+    "No messages" : "Mezurik ez",
     "Draft: " : "Zirriborroa: ",
     "This message is unread" : "Mezu hau irakurri gabe dago",
     "Unfavorite" : "Kendu gogokoetatik",
diff --git a/l10n/fi.js b/l10n/fi.js
index a1c798a75..68c9b707d 100644
--- a/l10n/fi.js
+++ b/l10n/fi.js
@@ -128,7 +128,7 @@ OC.L10N.register(
     "Plain text" : "Raakateksti",
     "Rich text" : "Rikas teksti",
     "No messages in this mailbox" : "Ei viestejä tässä postilaatikossa",
-    "Messages marked as important will show up here" : "Tärkeiksi merkityt viestit näkyvät täällä",
+    "No messages" : "Ei viestejä",
     "Draft: " : "Luonnos: ",
     "This message is unread" : "Tämä viesti on lukematon",
     "Unfavorite" : "Poista suosikeista",
diff --git a/l10n/fi.json b/l10n/fi.json
index 819ff148f..fa4f214e4 100644
--- a/l10n/fi.json
+++ b/l10n/fi.json
@@ -126,7 +126,7 @@
     "Plain text" : "Raakateksti",
     "Rich text" : "Rikas teksti",
     "No messages in this mailbox" : "Ei viestejä tässä postilaatikossa",
-    "Messages marked as important will show up here" : "Tärkeiksi merkityt viestit näkyvät täällä",
+    "No messages" : "Ei viestejä",
     "Draft: " : "Luonnos: ",
     "This message is unread" : "Tämä viesti on lukematon",
     "Unfavorite" : "Poista suosikeista",
diff --git a/l10n/fr.js b/l10n/fr.js
index d24986b8c..67ac6abcb 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -148,7 +148,7 @@ OC.L10N.register(
     "Plain text" : "Texte brut",
     "Rich text" : "Texte riche",
     "No messages in this mailbox" : "Aucun message dans ce dossier",
-    "Messages marked as important will show up here" : "Les messages marqués comme importants s'afficheront ici",
+    "No messages" : "Aucun message",
     "Draft: " : "Brouillon :",
     "This message is unread" : "Ce message est non-lu",
     "Unfavorite" : "Retirer des favoris",
@@ -312,8 +312,19 @@ OC.L10N.register(
     "Copy to clipboard" : "Copier dans le presse-papiers",
     "Contact name …" : "Nom du contact …",
     "Add" : "Ajouter",
+    "Search in mailbox" : "Rechercher dans la boîte aux lettres",
+    "Search parameters" : "Paramètres de recherche",
+    "Search term" : "Terme de recherche",
+    "Pick a start date" : "Sélectionner une date de début",
+    "Pick an end date" : "Sélectionner une date de fin",
+    "Select sender" : "Sélectionner l'expéditeur",
+    "Select recipient" : "Sélectionner le destinataire",
+    "Select cc recipient" : "Sélectionner des destinataires en copie",
+    "Select bcc recipient" : "Sélectionner des destinataires en copie cachée",
     "Tags" : "Étiquettes",
     "Select tags" : "Sélectionner les étiquettes",
+    "Marked as" : "Marquer comme",
+    "Has attachments" : "Possède des pièces jointes",
     "Clear" : "Effacer",
     "Search" : "Rechercher",
     "Date" : "Date",
diff --git a/l10n/fr.json b/l10n/fr.json
index 5139dc3f7..1c2d54c93 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -146,7 +146,7 @@
     "Plain text" : "Texte brut",
     "Rich text" : "Texte riche",
     "No messages in this mailbox" : "Aucun message dans ce dossier",
-    "Messages marked as important will show up here" : "Les messages marqués comme importants s'afficheront ici",
+    "No messages" : "Aucun message",
     "Draft: " : "Brouillon :",
     "This message is unread" : "Ce message est non-lu",
     "Unfavorite" : "Retirer des favoris",
@@ -310,8 +310,19 @@
     "Copy to clipboard" : "Copier dans le presse-papiers",
     "Contact name …" : "Nom du contact …",
     "Add" : "Ajouter",
+    "Search in mailbox" : "Rechercher dans la boîte aux lettres",
+    "Search parameters" : "Paramètres de recherche",
+    "Search term" : "Terme de recherche",
+    "Pick a start date" : "Sélectionner une date de début",
+    "Pick an end date" : "Sélectionner une date de fin",
+    "Select sender" : "Sélectionner l'expéditeur",
+    "Select recipient" : "Sélectionner le destinataire",
+    "Select cc recipient" : "Sélectionner des destinataires en copie",
+    "Select bcc recipient" : "Sélectionner des destinataires en copie cachée",
     "Tags" : "Étiquettes",
     "Select tags" : "Sélectionner les étiquettes",
+    "Marked as" : "Marquer comme",
+    "Has attachments" : "Possède des pièces jointes",
     "Clear" : "Effacer",
     "Search" : "Rechercher",
     "Date" : "Date",
diff --git a/l10n/gl.js b/l10n/gl.js
index 81d31974b..aaf35c08f 100644
--- a/l10n/gl.js
+++ b/l10n/gl.js
@@ -97,6 +97,7 @@ OC.L10N.register(
     "Plain text" : "Texto simple",
     "Rich text" : "Texto mellorado",
     "No messages in this mailbox" : "Non hai mensaxes nesta caixa de correo",
+    "No messages" : "Non hai mensaxes",
     "Draft: " : "Borrador:",
     "Unfavorite" : "Retirar de favoritos",
     "Favorite" : "Favorito",
diff --git a/l10n/gl.json b/l10n/gl.json
index d7bc72f88..7cac2eac8 100644
--- a/l10n/gl.json
+++ b/l10n/gl.json
@@ -95,6 +95,7 @@
     "Plain text" : "Texto simple",
     "Rich text" : "Texto mellorado",
     "No messages in this mailbox" : "Non hai mensaxes nesta caixa de correo",
+    "No messages" : "Non hai mensaxes",
     "Draft: " : "Borrador:",
     "Unfavorite" : "Retirar de favoritos",
     "Favorite" : "Favorito",
diff --git a/l10n/he.js b/l10n/he.js
index 5c27f8a5a..be0c07e9c 100644
--- a/l10n/he.js
+++ b/l10n/he.js
@@ -93,6 +93,7 @@ OC.L10N.register(
     "Plain text" : "טקסט פשוט",
     "Rich text" : "טקסט עשיר",
     "No messages in this mailbox" : "אין הודעות בתיבת הדוא״ל הזאת",
+    "No messages" : "אין הודעות",
     "Draft: " : "טיוטה:",
     "Unfavorite" : "ביטול כמועדף",
     "Favorite" : "סימון כמועדף",
diff --git a/l10n/he.json b/l10n/he.json
index 8313fc146..1da5ab97b 100644
--- a/l10n/he.json
+++ b/l10n/he.json
@@ -91,6 +91,7 @@
     "Plain text" : "טקסט פשוט",
     "Rich text" : "טקסט עשיר",
     "No messages in this mailbox" : "אין הודעות בתיבת הדוא״ל הזאת",
+    "No messages" : "אין הודעות",
     "Draft: " : "טיוטה:",
     "Unfavorite" : "ביטול כמועדף",
     "Favorite" : "סימון כמועדף",
diff --git a/l10n/hr.js b/l10n/hr.js
index ddcd8105f..e3218567a 100644
--- a/l10n/hr.js
+++ b/l10n/hr.js
@@ -107,6 +107,7 @@ OC.L10N.register(
     "Plain text" : "Običan tekst",
     "Rich text" : "Bogat tekst",
     "No messages in this mailbox" : "Nema poruka u ovom sandučiću",
+    "No messages" : "Nema poruka",
     "Draft: " : "Skica: ",
     "Unfavorite" : "Ukloni iz favorita",
     "Favorite" : "Favorit",
diff --git a/l10n/hr.json b/l10n/hr.json
index 26f5f1e8b..8e531b0fa 100644
--- a/l10n/hr.json
+++ b/l10n/hr.json
@@ -105,6 +105,7 @@
     "Plain text" : "Običan tekst",
     "Rich text" : "Bogat tekst",
     "No messages in this mailbox" : "Nema poruka u ovom sandučiću",
+    "No messages" : "Nema poruka",
     "Draft: " : "Skica: ",
     "Unfavorite" : "Ukloni iz favorita",
     "Favorite" : "Favorit",
diff --git a/l10n/hu.js b/l10n/hu.js
index 129f506a3..496fb5e5c 100644
--- a/l10n/hu.js
+++ b/l10n/hu.js
@@ -146,7 +146,7 @@ OC.L10N.register(
     "Plain text" : "Egyszerű szöveg",
     "Rich text" : "Formázott szöveg",
     "No messages in this mailbox" : "Nincs üzenet ebben a postafiókban",
-    "Messages marked as important will show up here" : "A fontosként megjelölt üzenetek itt fognak megjelenni",
+    "No messages" : "Nincs üzenet",
     "Draft: " : "Vázlat: ",
     "This message is unread" : "Ez az üzenet olvasatlan",
     "Unfavorite" : "Nem kedvenc",
diff --git a/l10n/hu.json b/l10n/hu.json
index 4474a24a5..af494d079 100644
--- a/l10n/hu.json
+++ b/l10n/hu.json
@@ -144,7 +144,7 @@
     "Plain text" : "Egyszerű szöveg",
     "Rich text" : "Formázott szöveg",
     "No messages in this mailbox" : "Nincs üzenet ebben a postafiókban",
-    "Messages marked as important will show up here" : "A fontosként megjelölt üzenetek itt fognak megjelenni",
+    "No messages" : "Nincs üzenet",
     "Draft: " : "Vázlat: ",
     "This message is unread" : "Ez az üzenet olvasatlan",
     "Unfavorite" : "Nem kedvenc",
diff --git a/l10n/is.js b/l10n/is.js
index ffd35d9e7..eb805086e 100644
--- a/l10n/is.js
+++ b/l10n/is.js
@@ -81,6 +81,7 @@ OC.L10N.register(
     "Set up an account" : "Setja upp notandaaðgang",
     "Plain text" : "Ósniðinn texti",
     "Rich text" : "Sniðinn texti",
+    "No messages" : "Engin skilaboð",
     "Draft: " : "Drög: ",
     "Unfavorite" : "Taka úr eftirlætum",
     "Favorite" : "Eftirlæti",
diff --git a/l10n/is.json b/l10n/is.json
index 88d29b2f2..02e8b94e3 100644
--- a/l10n/is.json
+++ b/l10n/is.json
@@ -79,6 +79,7 @@
     "Set up an account" : "Setja upp notandaaðgang",
     "Plain text" : "Ósniðinn texti",
     "Rich text" : "Sniðinn texti",
+    "No messages" : "Engin skilaboð",
     "Draft: " : "Drög: ",
     "Unfavorite" : "Taka úr eftirlætum",
     "Favorite" : "Eftirlæti",
diff --git a/l10n/it.js b/l10n/it.js
index deb054055..7caa0b4d4 100644
--- a/l10n/it.js
+++ b/l10n/it.js
@@ -108,6 +108,7 @@ OC.L10N.register(
     "Plain text" : "Testo semplice",
     "Rich text" : "Testo formattato",
     "No messages in this mailbox" : "Nessun messaggio in questa casella di posta",
+    "No messages" : "Nessun messaggio",
     "Draft: " : "Bozza:",
     "Unfavorite" : "Rimuovi preferito",
     "Favorite" : "Preferito",
diff --git a/l10n/it.json b/l10n/it.json
index ee0f5167f..c6fbfc67b 100644
--- a/l10n/it.json
+++ b/l10n/it.json
@@ -106,6 +106,7 @@
     "Plain text" : "Testo semplice",
     "Rich text" : "Testo formattato",
     "No messages in this mailbox" : "Nessun messaggio in questa casella di posta",
+    "No messages" : "Nessun messaggio",
     "Draft: " : "Bozza:",
     "Unfavorite" : "Rimuovi preferito",
     "Favorite" : "Preferito",
diff --git a/l10n/ja.js b/l10n/ja.js
index e2cb685b3..d57e54edd 100644
--- a/l10n/ja.js
+++ b/l10n/ja.js
@@ -92,6 +92,7 @@ OC.L10N.register(
     "Plain text" : "プレーンテキスト",
     "Rich text" : "リッチテキスト",
     "No messages in this mailbox" : "このメールボックスにメッセージはありません",
+    "No messages" : "メッセージはありません",
     "Draft: " : "下書き",
     "Unfavorite" : "お気に入りから外す",
     "Favorite" : "お気に入り",
diff --git a/l10n/ja.json b/l10n/ja.json
index 652fc13fb..6f8930731 100644
--- a/l10n/ja.json
+++ b/l10n/ja.json
@@ -90,6 +90,7 @@
     "Plain text" : "プレーンテキスト",
     "Rich text" : "リッチテキスト",
     "No messages in this mailbox" : "このメールボックスにメッセージはありません",
+    "No messages" : "メッセージはありません",
     "Draft: " : "下書き",
     "Unfavorite" : "お気に入りから外す",
     "Favorite" : "お気に入り",
diff --git a/l10n/ko.js b/l10n/ko.js
index edccae945..72020ea75 100644
--- a/l10n/ko.js
+++ b/l10n/ko.js
@@ -102,6 +102,7 @@ OC.L10N.register(
     "Set up an account" : "계정 설정",
     "Plain text" : "평문",
     "Rich text" : "서식 있는 텍스트",
+    "No messages" : "메시지가 없음",
     "Draft: " : "임시 보관함",
     "Unfavorite" : "즐겨찾기에서 삭제",
     "Favorite" : "즐겨찾기",
diff --git a/l10n/ko.json b/l10n/ko.json
index 88dc634c1..7ee33220a 100644
--- a/l10n/ko.json
+++ b/l10n/ko.json
@@ -100,6 +100,7 @@
     "Set up an account" : "계정 설정",
     "Plain text" : "평문",
     "Rich text" : "서식 있는 텍스트",
+    "No messages" : "메시지가 없음",
     "Draft: " : "임시 보관함",
     "Unfavorite" : "즐겨찾기에서 삭제",
     "Favorite" : "즐겨찾기",
diff --git a/l10n/lt_LT.js b/l10n/lt_LT.js
index 4b12da3ef..b6273df76 100644
--- a/l10n/lt_LT.js
+++ b/l10n/lt_LT.js
@@ -106,6 +106,7 @@ OC.L10N.register(
     "Set up an account" : "Nusistatyti paskyrą",
     "Plain text" : "Grynasis tekstas",
     "Rich text" : "Raiškusis tekstas",
+    "No messages" : "Nėra laiškų",
     "Draft: " : "Juodraštis: ",
     "Unfavorite" : "Nebežymėti kaip mėgstamą",
     "Favorite" : "Mėgstamas",
diff --git a/l10n/lt_LT.json b/l10n/lt_LT.json
index 0a875c88d..f4cc3f30d 100644
--- a/l10n/lt_LT.json
+++ b/l10n/lt_LT.json
@@ -104,6 +104,7 @@
     "Set up an account" : "Nusistatyti paskyrą",
     "Plain text" : "Grynasis tekstas",
     "Rich text" : "Raiškusis tekstas",
+    "No messages" : "Nėra laiškų",
     "Draft: " : "Juodraštis: ",
     "Unfavorite" : "Nebežymėti kaip mėgstamą",
     "Favorite" : "Mėgstamas",
diff --git a/l10n/mk.js b/l10n/mk.js
index 0cc7efd3e..a4b7e1a5d 100644
--- a/l10n/mk.js
+++ b/l10n/mk.js
@@ -127,6 +127,7 @@ OC.L10N.register(
     "Plain text" : "Обичен текст",
     "Rich text" : "Богат текст",
     "No messages in this mailbox" : "Нема пораки во ова сандаче",
+    "No messages" : "Нема пораки",
     "Draft: " : "Шаблон:",
     "Favorite" : "Омилен",
     "Unread" : "Непрочитана",
diff --git a/l10n/mk.json b/l10n/mk.json
index 48858e7e7..9ed6faab0 100644
--- a/l10n/mk.json
+++ b/l10n/mk.json
@@ -125,6 +125,7 @@
     "Plain text" : "Обичен текст",
     "Rich text" : "Богат текст",
     "No messages in this mailbox" : "Нема пораки во ова сандаче",
+    "No messages" : "Нема пораки",
     "Draft: " : "Шаблон:",
     "Favorite" : "Омилен",
     "Unread" : "Непрочитана",
diff --git a/l10n/nb.js b/l10n/nb.js
index a2a6b3257..cfd246fe0 100644
--- a/l10n/nb.js
+++ b/l10n/nb.js
@@ -138,6 +138,7 @@ OC.L10N.register(
     "Plain text" : "Ren tekst",
     "Rich text" : "Rik tekst",
     "No messages in this mailbox" : "Ingen meldinger i denne postboksen",
+    "No messages" : "Ingen meldinger",
     "Draft: " : "Kladd:",
     "Unfavorite" : "Fjern favorittmarkering",
     "Favorite" : "Favoritt",
diff --git a/l10n/nb.json b/l10n/nb.json
index fef0bcadf..2fbe21923 100644
--- a/l10n/nb.json
+++ b/l10n/nb.json
@@ -136,6 +136,7 @@
     "Plain text" : "Ren tekst",
     "Rich text" : "Rik tekst",
     "No messages in this mailbox" : "Ingen meldinger i denne postboksen",
+    "No messages" : "Ingen meldinger",
     "Draft: " : "Kladd:",
     "Unfavorite" : "Fjern favorittmarkering",
     "Favorite" : "Favoritt",
diff --git a/l10n/nl.js b/l10n/nl.js
index 6428d64ce..fd86c7908 100644
--- a/l10n/nl.js
+++ b/l10n/nl.js
@@ -109,6 +109,7 @@ OC.L10N.register(
     "Plain text" : "Platte tekst",
     "Rich text" : "Rijke tekst",
     "No messages in this mailbox" : "Geen berichten in deze inbak",
+    "No messages" : "Geen berichten",
     "Draft: " : "Concept:",
     "Unfavorite" : "Favoriet weghalen",
     "Favorite" : "Favoriet",
diff --git a/l10n/nl.json b/l10n/nl.json
index 04a6cf969..d507f35b0 100644
--- a/l10n/nl.json
+++ b/l10n/nl.json
@@ -107,6 +107,7 @@
     "Plain text" : "Platte tekst",
     "Rich text" : "Rijke tekst",
     "No messages in this mailbox" : "Geen berichten in deze inbak",
+    "No messages" : "Geen berichten",
     "Draft: " : "Concept:",
     "Unfavorite" : "Favoriet weghalen",
     "Favorite" : "Favoriet",
diff --git a/l10n/pl.js b/l10n/pl.js
index 65831e7c5..580b913b0 100644
--- a/l10n/pl.js
+++ b/l10n/pl.js
@@ -146,7 +146,7 @@ OC.L10N.register(
     "Plain text" : "Zwykły tekst",
     "Rich text" : "Tekst sformatowany",
     "No messages in this mailbox" : "Brak wiadomości w skrzynce pocztowej",
-    "Messages marked as important will show up here" : "Tutaj pojawią się wiadomości oznaczone jako ważne",
+    "No messages" : "Brak wiadomości",
     "Draft: " : "Wersja robocza:",
     "This message is unread" : "Ta wiadomość jest nieprzeczytana",
     "Unfavorite" : "Nie ulubione",
diff --git a/l10n/pl.json b/l10n/pl.json
index e05cf84d9..0c1b7803b 100644
--- a/l10n/pl.json
+++ b/l10n/pl.json
@@ -144,7 +144,7 @@
     "Plain text" : "Zwykły tekst",
     "Rich text" : "Tekst sformatowany",
     "No messages in this mailbox" : "Brak wiadomości w skrzynce pocztowej",
-    "Messages marked as important will show up here" : "Tutaj pojawią się wiadomości oznaczone jako ważne",
+    "No messages" : "Brak wiadomości",
     "Draft: " : "Wersja robocza:",
     "This message is unread" : "Ta wiadomość jest nieprzeczytana",
     "Unfavorite" : "Nie ulubione",
diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js
index b5c6cc092..972f53356 100644
--- a/l10n/pt_BR.js
+++ b/l10n/pt_BR.js
@@ -148,7 +148,7 @@ OC.L10N.register(
     "Plain text" : "Texto puro",
     "Rich text" : "Texto rich",
     "No messages in this mailbox" : "Nenhuma mensagem nesta caixa de correio",
-    "Messages marked as important will show up here" : "Mensagens marcadas como importante aparecerão aqui",
+    "No messages" : "Sem mensagens",
     "Draft: " : "Rascunho:",
     "This message is unread" : "Esta mensagem não foi lida.",
     "Unfavorite" : "Não favorito",
diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json
index d8a8ce879..9e732dccc 100644
--- a/l10n/pt_BR.json
+++ b/l10n/pt_BR.json
@@ -146,7 +146,7 @@
     "Plain text" : "Texto puro",
     "Rich text" : "Texto rich",
     "No messages in this mailbox" : "Nenhuma mensagem nesta caixa de correio",
-    "Messages marked as important will show up here" : "Mensagens marcadas como importante aparecerão aqui",
+    "No messages" : "Sem mensagens",
     "Draft: " : "Rascunho:",
     "This message is unread" : "Esta mensagem não foi lida.",
     "Unfavorite" : "Não favorito",
diff --git a/l10n/pt_PT.js b/l10n/pt_PT.js
index 7a4cb4dbd..6da2880a5 100644
--- a/l10n/pt_PT.js
+++ b/l10n/pt_PT.js
@@ -84,6 +84,7 @@ OC.L10N.register(
     "Choose a file to add as attachment" : "Escolha um ficheiro para adicionar como anexo",
     "Set up an account" : "Configurar uma conta",
     "Plain text" : "Texto simples",
+    "No messages" : "Sem mensagens",
     "Draft: " : "Rascunho:",
     "Unfavorite" : "Não favorito",
     "Favorite" : "Favorito",
diff --git a/l10n/pt_PT.json b/l10n/pt_PT.json
index 58e5834a1..fe0a63989 100644
--- a/l10n/pt_PT.json
+++ b/l10n/pt_PT.json
@@ -82,6 +82,7 @@
     "Choose a file to add as attachment" : "Escolha um ficheiro para adicionar como anexo",
     "Set up an account" : "Configurar uma conta",
     "Plain text" : "Texto simples",
+    "No messages" : "Sem mensagens",
     "Draft: " : "Rascunho:",
     "Unfavorite" : "Não favorito",
     "Favorite" : "Favorito",
diff --git a/l10n/ru.js b/l10n/ru.js
index 039b4fb6e..e8acc2d6e 100644
--- a/l10n/ru.js
+++ b/l10n/ru.js
@@ -141,7 +141,7 @@ OC.L10N.register(
     "Plain text" : "Простой текст",
     "Rich text" : "Текст с форматированием",
     "No messages in this mailbox" : "В этой папке нет сообщений",
-    "Messages marked as important will show up here" : "Сообщения, помеченные как важные, будут отображаться здесь",
+    "No messages" : "Нет ни одного сообщения",
     "Draft: " : "Черновик:",
     "This message is unread" : "Это сообщение не прочитано",
     "Unfavorite" : "Убрать из избранного",
diff --git a/l10n/ru.json b/l10n/ru.json
index 7d66b2ba2..5f49d02fa 100644
--- a/l10n/ru.json
+++ b/l10n/ru.json
@@ -139,7 +139,7 @@
     "Plain text" : "Простой текст",
     "Rich text" : "Текст с форматированием",
     "No messages in this mailbox" : "В этой папке нет сообщений",
-    "Messages marked as important will show up here" : "Сообщения, помеченные как важные, будут отображаться здесь",
+    "No messages" : "Нет ни одного сообщения",
     "Draft: " : "Черновик:",
     "This message is unread" : "Это сообщение не прочитано",
     "Unfavorite" : "Убрать из избранного",
diff --git a/l10n/sc.js b/l10n/sc.js
index 5d7e565ca..1c0eb1561 100644
--- a/l10n/sc.js
+++ b/l10n/sc.js
@@ -105,6 +105,7 @@ OC.L10N.register(
     "Plain text" : "Testu simple",
     "Rich text" : "Testu formatadu",
     "No messages in this mailbox" : "Perunu messàgiu in custa casella de posta",
+    "No messages" : "Perunu messàgiu",
     "Draft: " : "Brutacòpia:",
     "Unfavorite" : "Boga dae is preferidos",
     "Favorite" : "Preferidu",
diff --git a/l10n/sc.json b/l10n/sc.json
index 8ff0455e4..2e96d8fa4 100644
--- a/l10n/sc.json
+++ b/l10n/sc.json
@@ -103,6 +103,7 @@
     "Plain text" : "Testu simple",
     "Rich text" : "Testu formatadu",
     "No messages in this mailbox" : "Perunu messàgiu in custa casella de posta",
+    "No messages" : "Perunu messàgiu",
     "Draft: " : "Brutacòpia:",
     "Unfavorite" : "Boga dae is preferidos",
     "Favorite" : "Preferidu",
diff --git a/l10n/sk.js b/l10n/sk.js
index 3ad178df9..48bf93cea 100644
--- a/l10n/sk.js
+++ b/l10n/sk.js
@@ -148,7 +148,7 @@ OC.L10N.register(
     "Plain text" : "Obyčajný text",
     "Rich text" : "Formátovaný text",
     "No messages in this mailbox" : "V tejto poštovej schránke sa nenachádzajú žiadne správy",
-    "Messages marked as important will show up here" : "Tu sa zobrazia správy označené ako dôležité",
+    "No messages" : "Žiadne správy",
     "Draft: " : "Koncept: ",
     "This message is unread" : "Táto správa je neprečítaná",
     "Unfavorite" : "Odstrániť z obľúbených",
diff --git a/l10n/sk.json b/l10n/sk.json
index 6abd1fac9..e0952027c 100644
--- a/l10n/sk.json
+++ b/l10n/sk.json
@@ -146,7 +146,7 @@
     "Plain text" : "Obyčajný text",
     "Rich text" : "Formátovaný text",
     "No messages in this mailbox" : "V tejto poštovej schránke sa nenachádzajú žiadne správy",
-    "Messages marked as important will show up here" : "Tu sa zobrazia správy označené ako dôležité",
+    "No messages" : "Žiadne správy",
     "Draft: " : "Koncept: ",
     "This message is unread" : "Táto správa je neprečítaná",
     "Unfavorite" : "Odstrániť z obľúbených",
diff --git a/l10n/sl.js b/l10n/sl.js
index 50c8d0668..0bc13098b 100644
--- a/l10n/sl.js
+++ b/l10n/sl.js
@@ -116,6 +116,7 @@ OC.L10N.register(
     "Plain text" : "Besedilno",
     "Rich text" : "Obogateno besedilo",
     "No messages in this mailbox" : "V poštnem predalu ni sporočil.",
+    "No messages" : "Ni sporočil",
     "Draft: " : "Osnutek:",
     "Unfavorite" : "Odstrani oznako priljubljeno",
     "Favorite" : "Priljubljeno",
diff --git a/l10n/sl.json b/l10n/sl.json
index 3aea93a7c..d710a109b 100644
--- a/l10n/sl.json
+++ b/l10n/sl.json
@@ -114,6 +114,7 @@
     "Plain text" : "Besedilno",
     "Rich text" : "Obogateno besedilo",
     "No messages in this mailbox" : "V poštnem predalu ni sporočil.",
+    "No messages" : "Ni sporočil",
     "Draft: " : "Osnutek:",
     "Unfavorite" : "Odstrani oznako priljubljeno",
     "Favorite" : "Priljubljeno",
diff --git a/l10n/sr.js b/l10n/sr.js
index 22f508a7e..b0307eb81 100644
--- a/l10n/sr.js
+++ b/l10n/sr.js
@@ -85,6 +85,7 @@ OC.L10N.register(
     "Set up an account" : "Подесите налог",
     "Plain text" : "Обичан текст",
     "Rich text" : "Обогаћени текст",
+    "No messages" : "Нема порука",
     "Draft: " : "Нацрт: ",
     "Unfavorite" : "Није омиљено",
     "Favorite" : "Омиљени",
diff --git a/l10n/sr.json b/l10n/sr.json
index 343fecb42..725cf50e1 100644
--- a/l10n/sr.json
+++ b/l10n/sr.json
@@ -83,6 +83,7 @@
     "Set up an account" : "Подесите налог",
     "Plain text" : "Обичан текст",
     "Rich text" : "Обогаћени текст",
+    "No messages" : "Нема порука",
     "Draft: " : "Нацрт: ",
     "Unfavorite" : "Није омиљено",
     "Favorite" : "Омиљени",
diff --git a/l10n/sv.js b/l10n/sv.js
index cc1ea2a97..3ee8c1497 100644
--- a/l10n/sv.js
+++ b/l10n/sv.js
@@ -113,6 +113,7 @@ OC.L10N.register(
     "Plain text" : "Oformaterad text",
     "Rich text" : "Formaterad text",
     "No messages in this mailbox" : "Inga meddelanden i den här brevlådan",
+    "No messages" : "Inga meddelanden",
     "Draft: " : "Utkast:",
     "Unfavorite" : "Inte favorit",
     "Favorite" : "Favorit",
diff --git a/l10n/sv.json b/l10n/sv.json
index f2064c206..1dad7e503 100644
--- a/l10n/sv.json
+++ b/l10n/sv.json
@@ -111,6 +111,7 @@
     "Plain text" : "Oformaterad text",
     "Rich text" : "Formaterad text",
     "No messages in this mailbox" : "Inga meddelanden i den här brevlådan",
+    "No messages" : "Inga meddelanden",
     "Draft: " : "Utkast:",
     "Unfavorite" : "Inte favorit",
     "Favorite" : "Favorit",
diff --git a/l10n/tr.js b/l10n/tr.js
index b6ffe62b6..b1a8b91e0 100644
--- a/l10n/tr.js
+++ b/l10n/tr.js
@@ -148,7 +148,7 @@ OC.L10N.register(
     "Plain text" : "Düz metin",
     "Rich text" : "Zengin metin",
     "No messages in this mailbox" : "Bu e-posta kutusunda herhangi bir ileti yok",
-    "Messages marked as important will show up here" : "Önemli olarak işaretlenmiş iletiler burada görüntülenir",
+    "No messages" : "Herhangi bir ileti yok",
     "Draft: " : "Taslak",
     "This message is unread" : "Bu ileti okunmamış",
     "Unfavorite" : "Sık kullanılanlardan kaldır",
@@ -312,8 +312,19 @@ OC.L10N.register(
     "Copy to clipboard" : "Panoya kopyala",
     "Contact name …" : "Kişi adı …",
     "Add" : "Ekle",
+    "Search in mailbox" : "Posta kutusunda ara",
+    "Search parameters" : "Arama parametreleri",
+    "Search term" : "Arama ifadesi",
+    "Pick a start date" : "Bir başlangıç tarihi seçin",
+    "Pick an end date" : "Bir bitiş tarihi seçin",
+    "Select sender" : "Göndericiyi seçin",
+    "Select recipient" : "Alıcıyı seçin",
+    "Select cc recipient" : "Kopya alıcısını seçin",
+    "Select bcc recipient" : "Gizli kopya alıcısını seçin",
     "Tags" : "Etiketler",
     "Select tags" : "Etiketleri seçin",
+    "Marked as" : "Şu olarak işaretlenmiş",
+    "Has attachments" : "Ek dosyası olan",
     "Clear" : "Temizle",
     "Search" : "Arama",
     "Date" : "Tarih",
diff --git a/l10n/tr.json b/l10n/tr.json
index ea161940f..3d74dfc39 100644
--- a/l10n/tr.json
+++ b/l10n/tr.json
@@ -146,7 +146,7 @@
     "Plain text" : "Düz metin",
     "Rich text" : "Zengin metin",
     "No messages in this mailbox" : "Bu e-posta kutusunda herhangi bir ileti yok",
-    "Messages marked as important will show up here" : "Önemli olarak işaretlenmiş iletiler burada görüntülenir",
+    "No messages" : "Herhangi bir ileti yok",
     "Draft: " : "Taslak",
     "This message is unread" : "Bu ileti okunmamış",
     "Unfavorite" : "Sık kullanılanlardan kaldır",
@@ -310,8 +310,19 @@
     "Copy to clipboard" : "Panoya kopyala",
     "Contact name …" : "Kişi adı …",
     "Add" : "Ekle",
+    "Search in mailbox" : "Posta kutusunda ara",
+    "Search parameters" : "Arama parametreleri",
+    "Search term" : "Arama ifadesi",
+    "Pick a start date" : "Bir başlangıç tarihi seçin",
+    "Pick an end date" : "Bir bitiş tarihi seçin",
+    "Select sender" : "Göndericiyi seçin",
+    "Select recipient" : "Alıcıyı seçin",
+    "Select cc recipient" : "Kopya alıcısını seçin",
+    "Select bcc recipient" : "Gizli kopya alıcısını seçin",
     "Tags" : "Etiketler",
     "Select tags" : "Etiketleri seçin",
+    "Marked as" : "Şu olarak işaretlenmiş",
+    "Has attachments" : "Ek dosyası olan",
     "Clear" : "Temizle",
     "Search" : "Arama",
     "Date" : "Tarih",
diff --git a/l10n/uk.js b/l10n/uk.js
index bd50c6bf6..dcb7908a9 100644
--- a/l10n/uk.js
+++ b/l10n/uk.js
@@ -107,6 +107,7 @@ OC.L10N.register(
     "Choose a file to share as a link" : "Виберіть файл, яким ви поділитеся через посилання",
     "Plain text" : "Простий текст",
     "Rich text" : "Текст з форматуванням",
+    "No messages" : "Відсутні повідомлення",
     "Draft: " : "Чернетка:",
     "This message is unread" : "Це повідомлення не прочитано",
     "Unfavorite" : "Не улюблене",
diff --git a/l10n/uk.json b/l10n/uk.json
index 6b7f869f9..9ad077b13 100644
--- a/l10n/uk.json
+++ b/l10n/uk.json
@@ -105,6 +105,7 @@
     "Choose a file to share as a link" : "Виберіть файл, яким ви поділитеся через посилання",
     "Plain text" : "Простий текст",
     "Rich text" : "Текст з форматуванням",
+    "No messages" : "Відсутні повідомлення",
     "Draft: " : "Чернетка:",
     "This message is unread" : "Це повідомлення не прочитано",
     "Unfavorite" : "Не улюблене",
diff --git a/l10n/vi.js b/l10n/vi.js
index f8a36eb14..787cd7097 100644
--- a/l10n/vi.js
+++ b/l10n/vi.js
@@ -87,6 +87,7 @@ OC.L10N.register(
     "No message found yet" : "Không có tin nhắn nào được tìm thấy",
     "Set up an account" : "Thiết lập một tài khoản",
     "No messages in this mailbox" : "Không có thư nào trong hộp thư này",
+    "No messages" : "Không có tin nhắn",
     "Draft: " : "Bản nháp: ",
     "Favorite" : "Ưa thích",
     "Read" : "Đọc",
diff --git a/l10n/vi.json b/l10n/vi.json
index 9a8b60542..67b3aa68c 100644
--- a/l10n/vi.json
+++ b/l10n/vi.json
@@ -85,6 +85,7 @@
     "No message found yet" : "Không có tin nhắn nào được tìm thấy",
     "Set up an account" : "Thiết lập một tài khoản",
     "No messages in this mailbox" : "Không có thư nào trong hộp thư này",
+    "No messages" : "Không có tin nhắn",
     "Draft: " : "Bản nháp: ",
     "Favorite" : "Ưa thích",
     "Read" : "Đọc",
diff --git a/l10n/zh_CN.js b/l10n/zh_CN.js
index 9142c8a57..f839c8cc8 100644
--- a/l10n/zh_CN.js
+++ b/l10n/zh_CN.js
@@ -108,6 +108,7 @@ OC.L10N.register(
     "Plain text" : "纯文本",
     "Rich text" : "富文本",
     "No messages in this mailbox" : "此邮箱中没有消息",
+    "No messages" : "没有消息",
     "Draft: " : "草稿: ",
     "Unfavorite" : "取消收藏",
     "Favorite" : "收藏",
diff --git a/l10n/zh_CN.json b/l10n/zh_CN.json
index 1cb75b63f..59ed03235 100644
--- a/l10n/zh_CN.json
+++ b/l10n/zh_CN.json
@@ -106,6 +106,7 @@
     "Plain text" : "纯文本",
     "Rich text" : "富文本",
     "No messages in this mailbox" : "此邮箱中没有消息",
+    "No messages" : "没有消息",
     "Draft: " : "草稿: ",
     "Unfavorite" : "取消收藏",
     "Favorite" : "收藏",
diff --git a/l10n/zh_HK.js b/l10n/zh_HK.js
index 5c5e38217..fc4db168e 100644
--- a/l10n/zh_HK.js
+++ b/l10n/zh_HK.js
@@ -148,7 +148,7 @@ OC.L10N.register(
     "Plain text" : "純文字",
     "Rich text" : "RTF",
     "No messages in this mailbox" : "此信箱中沒有郵件",
-    "Messages marked as important will show up here" : "標記為重要的訊息將在此處顯示",
+    "No messages" : "沒有訊息",
     "Draft: " : "草稿：",
     "This message is unread" : "此訊息未讀",
     "Unfavorite" : "取消我的最愛",
diff --git a/l10n/zh_HK.json b/l10n/zh_HK.json
index 13ea7c6b9..f3c4fc618 100644
--- a/l10n/zh_HK.json
+++ b/l10n/zh_HK.json
@@ -146,7 +146,7 @@
     "Plain text" : "純文字",
     "Rich text" : "RTF",
     "No messages in this mailbox" : "此信箱中沒有郵件",
-    "Messages marked as important will show up here" : "標記為重要的訊息將在此處顯示",
+    "No messages" : "沒有訊息",
     "Draft: " : "草稿：",
     "This message is unread" : "此訊息未讀",
     "Unfavorite" : "取消我的最愛",
diff --git a/l10n/zh_TW.js b/l10n/zh_TW.js
index 6090732ee..ae887f546 100644
--- a/l10n/zh_TW.js
+++ b/l10n/zh_TW.js
@@ -148,7 +148,7 @@ OC.L10N.register(
     "Plain text" : "純文字",
     "Rich text" : "RTF",
     "No messages in this mailbox" : "此信箱中沒有郵件",
-    "Messages marked as important will show up here" : "標記為重要的訊息將會顯示在此處",
+    "No messages" : "沒有郵件",
     "Draft: " : "草稿：",
     "This message is unread" : "此訊息未讀",
     "Unfavorite" : "取消收藏",
@@ -312,8 +312,19 @@ OC.L10N.register(
     "Copy to clipboard" : "複製到剪貼簿",
     "Contact name …" : "聯絡人名稱……",
     "Add" : "新增",
+    "Search in mailbox" : "在郵件匣中搜尋",
+    "Search parameters" : "搜尋參數",
+    "Search term" : "搜尋字詞",
+    "Pick a start date" : "挑選開始日期",
+    "Pick an end date" : "挑選結束日期",
+    "Select sender" : "選取寄件者",
+    "Select recipient" : "選取收件者",
+    "Select cc recipient" : "選取副本收件者",
+    "Select bcc recipient" : "選取密件副本收件者",
     "Tags" : "標籤",
     "Select tags" : "選取標籤",
+    "Marked as" : "已標記為",
+    "Has attachments" : "有附件",
     "Clear" : "清除",
     "Search" : "搜尋",
     "Date" : "日期",
diff --git a/l10n/zh_TW.json b/l10n/zh_TW.json
index 1f6f4d9c5..f7595e4a3 100644
--- a/l10n/zh_TW.json
+++ b/l10n/zh_TW.json
@@ -146,7 +146,7 @@
     "Plain text" : "純文字",
     "Rich text" : "RTF",
     "No messages in this mailbox" : "此信箱中沒有郵件",
-    "Messages marked as important will show up here" : "標記為重要的訊息將會顯示在此處",
+    "No messages" : "沒有郵件",
     "Draft: " : "草稿：",
     "This message is unread" : "此訊息未讀",
     "Unfavorite" : "取消收藏",
@@ -310,8 +310,19 @@
     "Copy to clipboard" : "複製到剪貼簿",
     "Contact name …" : "聯絡人名稱……",
     "Add" : "新增",
+    "Search in mailbox" : "在郵件匣中搜尋",
+    "Search parameters" : "搜尋參數",
+    "Search term" : "搜尋字詞",
+    "Pick a start date" : "挑選開始日期",
+    "Pick an end date" : "挑選結束日期",
+    "Select sender" : "選取寄件者",
+    "Select recipient" : "選取收件者",
+    "Select cc recipient" : "選取副本收件者",
+    "Select bcc recipient" : "選取密件副本收件者",
     "Tags" : "標籤",
     "Select tags" : "選取標籤",
+    "Marked as" : "已標記為",
+    "Has attachments" : "有附件",
     "Clear" : "清除",
     "Search" : "搜尋",
     "Date" : "日期",