diff --git a/l10n/ar.js b/l10n/ar.js
index 300a5847b..426bb5f25 100644
--- a/l10n/ar.js
+++ b/l10n/ar.js
@@ -89,6 +89,7 @@ OC.L10N.register(
     "Trusted senders" : "مُرسِلُون مَوثُوقُون",
     "Mail server" : "خادوم البريد",
     "Sieve filter server" : "خادوم فلتر الغربال sieve filter",
+    "Mailbox search" : "البحث في صندوق البريد",
     "Update alias" : "تحديث الاسم المُستعار alias ",
     "Rename alias" : "تغيير تسمية اسم مُستعار alias",
     "Show update alias form" : "عرض نموذج تحديث الاسم المُستعار alias",
@@ -390,6 +391,9 @@ OC.L10N.register(
     "Search in mailbox" : "البحث في صندوق البريد",
     "Close" : "إغلاق",
     "Search parameters" : "بحث البارامترات",
+    "Search subject" : "البحث في موضوع الرسالة",
+    "Body" : "المتن",
+    "Search body" : "البحث في المتن",
     "Pick a start date" : "إختّر تاريخ بداية",
     "Pick an end date" : "إختَر تاريخ نهاية",
     "Select senders" : "حدّد المُرسِلِين",
@@ -403,6 +407,7 @@ OC.L10N.register(
     "Clear" : "إمحُ",
     "Search" : "بحث",
     "Date" : "التاريخ ",
+    "Enable mail body search" : "تمكين البحث في متون الرسائل",
     "Disabled" : "مُعطّل",
     "Enabled" : "مُفعّل",
     "Sieve Host" : "مُضيف تطبيق \"الغربال\" Sieve",
diff --git a/l10n/ar.json b/l10n/ar.json
index bd3e57f2a..64358c544 100644
--- a/l10n/ar.json
+++ b/l10n/ar.json
@@ -87,6 +87,7 @@
     "Trusted senders" : "مُرسِلُون مَوثُوقُون",
     "Mail server" : "خادوم البريد",
     "Sieve filter server" : "خادوم فلتر الغربال sieve filter",
+    "Mailbox search" : "البحث في صندوق البريد",
     "Update alias" : "تحديث الاسم المُستعار alias ",
     "Rename alias" : "تغيير تسمية اسم مُستعار alias",
     "Show update alias form" : "عرض نموذج تحديث الاسم المُستعار alias",
@@ -388,6 +389,9 @@
     "Search in mailbox" : "البحث في صندوق البريد",
     "Close" : "إغلاق",
     "Search parameters" : "بحث البارامترات",
+    "Search subject" : "البحث في موضوع الرسالة",
+    "Body" : "المتن",
+    "Search body" : "البحث في المتن",
     "Pick a start date" : "إختّر تاريخ بداية",
     "Pick an end date" : "إختَر تاريخ نهاية",
     "Select senders" : "حدّد المُرسِلِين",
@@ -401,6 +405,7 @@
     "Clear" : "إمحُ",
     "Search" : "بحث",
     "Date" : "التاريخ ",
+    "Enable mail body search" : "تمكين البحث في متون الرسائل",
     "Disabled" : "مُعطّل",
     "Enabled" : "مُفعّل",
     "Sieve Host" : "مُضيف تطبيق \"الغربال\" Sieve",
diff --git a/l10n/bg.js b/l10n/bg.js
index d7c59e0d2..c8f8a5ae7 100644
--- a/l10n/bg.js
+++ b/l10n/bg.js
@@ -347,6 +347,7 @@ OC.L10N.register(
     "Search in mailbox" : "Търсене в пощенската кутия",
     "Close" : "Затваряне",
     "Search parameters" : "Параметри на търсенето",
+    "Body" : "Съдържание",
     "Pick a start date" : "Избор на начална дата",
     "Pick an end date" : "Избор на крайна дата",
     "Select senders" : "Избор на податели",
diff --git a/l10n/bg.json b/l10n/bg.json
index f6b8cc134..0eac625bb 100644
--- a/l10n/bg.json
+++ b/l10n/bg.json
@@ -345,6 +345,7 @@
     "Search in mailbox" : "Търсене в пощенската кутия",
     "Close" : "Затваряне",
     "Search parameters" : "Параметри на търсенето",
+    "Body" : "Съдържание",
     "Pick a start date" : "Избор на начална дата",
     "Pick an end date" : "Избор на крайна дата",
     "Select senders" : "Избор на податели",
diff --git a/l10n/cs.js b/l10n/cs.js
index 22e718cc8..ee1e25a98 100644
--- a/l10n/cs.js
+++ b/l10n/cs.js
@@ -88,6 +88,7 @@ OC.L10N.register(
     "Trusted senders" : "Důvěryhodní odesílatelé",
     "Mail server" : "E-mailový server",
     "Sieve filter server" : "Filtrovací server sieve",
+    "Mailbox search" : "Hledání ve schránce",
     "Update alias" : "Aktualizovat alternativní název",
     "Rename alias" : "Přejmenovat alternativní název",
     "Show update alias form" : "Zobrazit formulář pro aktualizaci alternativního názvu",
@@ -389,7 +390,9 @@ OC.L10N.register(
     "Search in mailbox" : "Hledat ve schránce",
     "Close" : "Zavřít",
     "Search parameters" : "Parametry hledání",
+    "Search subject" : "Hledat předmět",
     "Body" : "Těle textu",
+    "Search body" : "Hledat v těle zprávy",
     "Pick a start date" : "Vybrat datum začátku",
     "Pick an end date" : "Vybrat datum konce",
     "Select senders" : "Vybrat odesilatele",
@@ -403,6 +406,7 @@ OC.L10N.register(
     "Clear" : "Vyčistit",
     "Search" : "Hledat",
     "Date" : "Datum",
+    "Enable mail body search" : "Zapnout hledání v těle zprávy",
     "Disabled" : "Vypnuto",
     "Enabled" : "Zapnuto",
     "Sieve Host" : "Stroj se sieve",
diff --git a/l10n/cs.json b/l10n/cs.json
index 2030da720..c3fa1c6ac 100644
--- a/l10n/cs.json
+++ b/l10n/cs.json
@@ -86,6 +86,7 @@
     "Trusted senders" : "Důvěryhodní odesílatelé",
     "Mail server" : "E-mailový server",
     "Sieve filter server" : "Filtrovací server sieve",
+    "Mailbox search" : "Hledání ve schránce",
     "Update alias" : "Aktualizovat alternativní název",
     "Rename alias" : "Přejmenovat alternativní název",
     "Show update alias form" : "Zobrazit formulář pro aktualizaci alternativního názvu",
@@ -387,7 +388,9 @@
     "Search in mailbox" : "Hledat ve schránce",
     "Close" : "Zavřít",
     "Search parameters" : "Parametry hledání",
+    "Search subject" : "Hledat předmět",
     "Body" : "Těle textu",
+    "Search body" : "Hledat v těle zprávy",
     "Pick a start date" : "Vybrat datum začátku",
     "Pick an end date" : "Vybrat datum konce",
     "Select senders" : "Vybrat odesilatele",
@@ -401,6 +404,7 @@
     "Clear" : "Vyčistit",
     "Search" : "Hledat",
     "Date" : "Datum",
+    "Enable mail body search" : "Zapnout hledání v těle zprávy",
     "Disabled" : "Vypnuto",
     "Enabled" : "Zapnuto",
     "Sieve Host" : "Stroj se sieve",
diff --git a/l10n/de.js b/l10n/de.js
index 5bf351a25..a5fb1e22b 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -356,7 +356,7 @@ OC.L10N.register(
     "Search in mailbox" : "Im Postfach suchen",
     "Close" : "Schließen",
     "Search parameters" : "Suchparameter",
-    "Body" : "Benötigt keine Übersetzung. Hier wird nur die formelle Übersetzung verwendet (de_DE).",
+    "Body" : "Inhalt",
     "Pick a start date" : "Startdatum wählen",
     "Pick an end date" : "Enddatum wählen",
     "Select senders" : "Absender wählen",
diff --git a/l10n/de.json b/l10n/de.json
index ee361789b..a95ed5643 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -354,7 +354,7 @@
     "Search in mailbox" : "Im Postfach suchen",
     "Close" : "Schließen",
     "Search parameters" : "Suchparameter",
-    "Body" : "Benötigt keine Übersetzung. Hier wird nur die formelle Übersetzung verwendet (de_DE).",
+    "Body" : "Inhalt",
     "Pick a start date" : "Startdatum wählen",
     "Pick an end date" : "Enddatum wählen",
     "Select senders" : "Absender wählen",
diff --git a/l10n/de_DE.js b/l10n/de_DE.js
index 5d68c9283..b266c0a8d 100644
--- a/l10n/de_DE.js
+++ b/l10n/de_DE.js
@@ -89,6 +89,7 @@ OC.L10N.register(
     "Trusted senders" : "Vertrauenswürdige Absender",
     "Mail server" : "Mail-Server",
     "Sieve filter server" : "Sieve-Filterserver",
+    "Mailbox search" : "Postfach durchsuchen",
     "Update alias" : "Alias aktualisieren",
     "Rename alias" : "Alias umbenennen",
     "Show update alias form" : "Update-Alias-Formular anzeigen",
@@ -390,7 +391,9 @@ OC.L10N.register(
     "Search in mailbox" : "Im Postfach suchen",
     "Close" : "Schließen",
     "Search parameters" : "Suchparameter",
+    "Search subject" : "Thema durchsuchen",
     "Body" : "Inhalt",
+    "Search body" : "Nachrichtentext durchsuchen",
     "Pick a start date" : "Startdatum wählen",
     "Pick an end date" : "Enddatum wählen",
     "Select senders" : "Absender wählen",
@@ -404,6 +407,7 @@ OC.L10N.register(
     "Clear" : "Leeren",
     "Search" : "Suchen",
     "Date" : "Datum",
+    "Enable mail body search" : "Nachrichtentext durchsuchen aktivieren",
     "Disabled" : "Deaktiviert",
     "Enabled" : "Aktiviert",
     "Sieve Host" : "Sieve-Host",
diff --git a/l10n/de_DE.json b/l10n/de_DE.json
index f0cf6ce5b..e81efe7d6 100644
--- a/l10n/de_DE.json
+++ b/l10n/de_DE.json
@@ -87,6 +87,7 @@
     "Trusted senders" : "Vertrauenswürdige Absender",
     "Mail server" : "Mail-Server",
     "Sieve filter server" : "Sieve-Filterserver",
+    "Mailbox search" : "Postfach durchsuchen",
     "Update alias" : "Alias aktualisieren",
     "Rename alias" : "Alias umbenennen",
     "Show update alias form" : "Update-Alias-Formular anzeigen",
@@ -388,7 +389,9 @@
     "Search in mailbox" : "Im Postfach suchen",
     "Close" : "Schließen",
     "Search parameters" : "Suchparameter",
+    "Search subject" : "Thema durchsuchen",
     "Body" : "Inhalt",
+    "Search body" : "Nachrichtentext durchsuchen",
     "Pick a start date" : "Startdatum wählen",
     "Pick an end date" : "Enddatum wählen",
     "Select senders" : "Absender wählen",
@@ -402,6 +405,7 @@
     "Clear" : "Leeren",
     "Search" : "Suchen",
     "Date" : "Datum",
+    "Enable mail body search" : "Nachrichtentext durchsuchen aktivieren",
     "Disabled" : "Deaktiviert",
     "Enabled" : "Aktiviert",
     "Sieve Host" : "Sieve-Host",
diff --git a/l10n/en_GB.js b/l10n/en_GB.js
index 28b044335..1fe9083cb 100644
--- a/l10n/en_GB.js
+++ b/l10n/en_GB.js
@@ -89,6 +89,7 @@ OC.L10N.register(
     "Trusted senders" : "Trusted senders",
     "Mail server" : "Mail server",
     "Sieve filter server" : "Sieve filter server",
+    "Mailbox search" : "Mailbox search",
     "Update alias" : "Update alias",
     "Rename alias" : "Rename alias",
     "Show update alias form" : "Show update alias form",
@@ -390,7 +391,9 @@ OC.L10N.register(
     "Search in mailbox" : "Search in mailbox",
     "Close" : "Close",
     "Search parameters" : "Search parameters",
+    "Search subject" : "Search subject",
     "Body" : "Body",
+    "Search body" : "Search body",
     "Pick a start date" : "Pick a start date",
     "Pick an end date" : "Pick an end date",
     "Select senders" : "Select senders",
@@ -404,6 +407,7 @@ OC.L10N.register(
     "Clear" : "Clear",
     "Search" : "Search",
     "Date" : "Date",
+    "Enable mail body search" : "Enable mail body search",
     "Disabled" : "Disabled",
     "Enabled" : "Enabled",
     "Sieve Host" : "Sieve Host",
diff --git a/l10n/en_GB.json b/l10n/en_GB.json
index 0f2d6c55b..e57e951c8 100644
--- a/l10n/en_GB.json
+++ b/l10n/en_GB.json
@@ -87,6 +87,7 @@
     "Trusted senders" : "Trusted senders",
     "Mail server" : "Mail server",
     "Sieve filter server" : "Sieve filter server",
+    "Mailbox search" : "Mailbox search",
     "Update alias" : "Update alias",
     "Rename alias" : "Rename alias",
     "Show update alias form" : "Show update alias form",
@@ -388,7 +389,9 @@
     "Search in mailbox" : "Search in mailbox",
     "Close" : "Close",
     "Search parameters" : "Search parameters",
+    "Search subject" : "Search subject",
     "Body" : "Body",
+    "Search body" : "Search body",
     "Pick a start date" : "Pick a start date",
     "Pick an end date" : "Pick an end date",
     "Select senders" : "Select senders",
@@ -402,6 +405,7 @@
     "Clear" : "Clear",
     "Search" : "Search",
     "Date" : "Date",
+    "Enable mail body search" : "Enable mail body search",
     "Disabled" : "Disabled",
     "Enabled" : "Enabled",
     "Sieve Host" : "Sieve Host",
diff --git a/l10n/fr.js b/l10n/fr.js
index 6b800a3a5..80f6a67cc 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -89,6 +89,7 @@ OC.L10N.register(
     "Trusted senders" : "Expéditeurs fiables",
     "Mail server" : "Serveur de messagerie",
     "Sieve filter server" : "Serveur de filtre Sieve",
+    "Mailbox search" : "Rechercher dans la boite aux lettres",
     "Update alias" : "Mettre à jour l'alias",
     "Rename alias" : "Renommer l'alias",
     "Show update alias form" : "Afficher le formulaire de mise à jour d'alias",
@@ -390,7 +391,9 @@ OC.L10N.register(
     "Search in mailbox" : "Rechercher dans le dossier",
     "Close" : "Fermer",
     "Search parameters" : "Paramètres de recherche",
+    "Search subject" : "Rechercher un sujet",
     "Body" : "Corps",
+    "Search body" : "Rechercher dans le corps",
     "Pick a start date" : "Sélectionner une date de début",
     "Pick an end date" : "Sélectionner une date de fin",
     "Select senders" : "Sélectionner les expéditeurs",
@@ -404,6 +407,7 @@ OC.L10N.register(
     "Clear" : "Effacer",
     "Search" : "Rechercher",
     "Date" : "Date",
+    "Enable mail body search" : "Rechercher dans le corps de l'e-mail",
     "Disabled" : "Désactivé",
     "Enabled" : "Activé",
     "Sieve Host" : "Hôte Sieve",
diff --git a/l10n/fr.json b/l10n/fr.json
index 9fdb7378a..1370b5b10 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -87,6 +87,7 @@
     "Trusted senders" : "Expéditeurs fiables",
     "Mail server" : "Serveur de messagerie",
     "Sieve filter server" : "Serveur de filtre Sieve",
+    "Mailbox search" : "Rechercher dans la boite aux lettres",
     "Update alias" : "Mettre à jour l'alias",
     "Rename alias" : "Renommer l'alias",
     "Show update alias form" : "Afficher le formulaire de mise à jour d'alias",
@@ -388,7 +389,9 @@
     "Search in mailbox" : "Rechercher dans le dossier",
     "Close" : "Fermer",
     "Search parameters" : "Paramètres de recherche",
+    "Search subject" : "Rechercher un sujet",
     "Body" : "Corps",
+    "Search body" : "Rechercher dans le corps",
     "Pick a start date" : "Sélectionner une date de début",
     "Pick an end date" : "Sélectionner une date de fin",
     "Select senders" : "Sélectionner les expéditeurs",
@@ -402,6 +405,7 @@
     "Clear" : "Effacer",
     "Search" : "Rechercher",
     "Date" : "Date",
+    "Enable mail body search" : "Rechercher dans le corps de l'e-mail",
     "Disabled" : "Désactivé",
     "Enabled" : "Activé",
     "Sieve Host" : "Hôte Sieve",
diff --git a/l10n/sr.js b/l10n/sr.js
index 3bddbbc0f..552ffcfd1 100644
--- a/l10n/sr.js
+++ b/l10n/sr.js
@@ -89,6 +89,7 @@ OC.L10N.register(
     "Trusted senders" : "Пошиљаоци којима се верује",
     "Mail server" : "Сервер е-поште",
     "Sieve filter server" : "Сервер сито филтера",
+    "Mailbox search" : "Претрага садучета",
     "Update alias" : "Ажурирај алијас",
     "Rename alias" : "Промени име алијаса",
     "Show update alias form" : "Приказује формулар за ажурирање алијаса",
@@ -390,7 +391,9 @@ OC.L10N.register(
     "Search in mailbox" : "Претражи у сандучету",
     "Close" : "Затвори",
     "Search parameters" : "Параметри претраге",
+    "Search subject" : "Претражи тему",
     "Body" : "Тело",
+    "Search body" : "Претражи тело",
     "Pick a start date" : "Изаберите датум почетка",
     "Pick an end date" : "Изаберите датум краја",
     "Select senders" : "Изабери пошиљаоце",
@@ -404,6 +407,7 @@ OC.L10N.register(
     "Clear" : "Очисти",
     "Search" : "Претражи",
     "Date" : "Датум",
+    "Enable mail body search" : "Укључи претрагу тела поруке",
     "Disabled" : "Искључено",
     "Enabled" : "укључено",
     "Sieve Host" : "Хост сита",
diff --git a/l10n/sr.json b/l10n/sr.json
index e14f7ac10..22ee8a102 100644
--- a/l10n/sr.json
+++ b/l10n/sr.json
@@ -87,6 +87,7 @@
     "Trusted senders" : "Пошиљаоци којима се верује",
     "Mail server" : "Сервер е-поште",
     "Sieve filter server" : "Сервер сито филтера",
+    "Mailbox search" : "Претрага садучета",
     "Update alias" : "Ажурирај алијас",
     "Rename alias" : "Промени име алијаса",
     "Show update alias form" : "Приказује формулар за ажурирање алијаса",
@@ -388,7 +389,9 @@
     "Search in mailbox" : "Претражи у сандучету",
     "Close" : "Затвори",
     "Search parameters" : "Параметри претраге",
+    "Search subject" : "Претражи тему",
     "Body" : "Тело",
+    "Search body" : "Претражи тело",
     "Pick a start date" : "Изаберите датум почетка",
     "Pick an end date" : "Изаберите датум краја",
     "Select senders" : "Изабери пошиљаоце",
@@ -402,6 +405,7 @@
     "Clear" : "Очисти",
     "Search" : "Претражи",
     "Date" : "Датум",
+    "Enable mail body search" : "Укључи претрагу тела поруке",
     "Disabled" : "Искључено",
     "Enabled" : "укључено",
     "Sieve Host" : "Хост сита",
diff --git a/l10n/tr.js b/l10n/tr.js
index 13b076067..f7cc98776 100644
--- a/l10n/tr.js
+++ b/l10n/tr.js
@@ -89,6 +89,7 @@ OC.L10N.register(
     "Trusted senders" : "Güvenilen göndericiler",
     "Mail server" : "E-posta sunucusu",
     "Sieve filter server" : "Sieve süzgeci sunucusu",
+    "Mailbox search" : "E-posta kutusu ara",
     "Update alias" : "Takma adı güncelle",
     "Rename alias" : "Kısaltmayı yeniden adlandır",
     "Show update alias form" : "Takma adı güncelleme formunu görüntüle",
@@ -390,7 +391,9 @@ OC.L10N.register(
     "Search in mailbox" : "E-posta kutusunda ara",
     "Close" : "Kapat",
     "Search parameters" : "Arama parametreleri",
+    "Search subject" : "Konu ara",
     "Body" : "İçerik",
+    "Search body" : "İçerik ara",
     "Pick a start date" : "Bir başlangıç tarihi seçin",
     "Pick an end date" : "Bir bitiş tarihi seçin",
     "Select senders" : "Göndericileri seçin",
@@ -404,6 +407,7 @@ OC.L10N.register(
     "Clear" : "Temizle",
     "Search" : "Arama",
     "Date" : "Tarih",
+    "Enable mail body search" : "E-posta içeriği aranabilsin",
     "Disabled" : "Devre dışı",
     "Enabled" : "Etkin",
     "Sieve Host" : "Sieve sunucusu",
diff --git a/l10n/tr.json b/l10n/tr.json
index 3aef6a91e..be7385f08 100644
--- a/l10n/tr.json
+++ b/l10n/tr.json
@@ -87,6 +87,7 @@
     "Trusted senders" : "Güvenilen göndericiler",
     "Mail server" : "E-posta sunucusu",
     "Sieve filter server" : "Sieve süzgeci sunucusu",
+    "Mailbox search" : "E-posta kutusu ara",
     "Update alias" : "Takma adı güncelle",
     "Rename alias" : "Kısaltmayı yeniden adlandır",
     "Show update alias form" : "Takma adı güncelleme formunu görüntüle",
@@ -388,7 +389,9 @@
     "Search in mailbox" : "E-posta kutusunda ara",
     "Close" : "Kapat",
     "Search parameters" : "Arama parametreleri",
+    "Search subject" : "Konu ara",
     "Body" : "İçerik",
+    "Search body" : "İçerik ara",
     "Pick a start date" : "Bir başlangıç tarihi seçin",
     "Pick an end date" : "Bir bitiş tarihi seçin",
     "Select senders" : "Göndericileri seçin",
@@ -402,6 +405,7 @@
     "Clear" : "Temizle",
     "Search" : "Arama",
     "Date" : "Tarih",
+    "Enable mail body search" : "E-posta içeriği aranabilsin",
     "Disabled" : "Devre dışı",
     "Enabled" : "Etkin",
     "Sieve Host" : "Sieve sunucusu",
diff --git a/l10n/zh_HK.js b/l10n/zh_HK.js
index dc45549b2..5858e5b08 100644
--- a/l10n/zh_HK.js
+++ b/l10n/zh_HK.js
@@ -89,6 +89,7 @@ OC.L10N.register(
     "Trusted senders" : "受信任的寄件人",
     "Mail server" : "郵件伺服器",
     "Sieve filter server" : "Sieve 過濾伺服器",
+    "Mailbox search" : "郵箱搜尋",
     "Update alias" : "更新别名",
     "Rename alias" : "重新命名别名",
     "Show update alias form" : "顯示更新別名表格",
@@ -390,7 +391,9 @@ OC.L10N.register(
     "Search in mailbox" : "在郵箱中搜尋",
     "Close" : "關閉",
     "Search parameters" : "在參數中搜尋",
+    "Search subject" : "搜尋主旨",
     "Body" : "內文",
+    "Search body" : "搜尋正文",
     "Pick a start date" : "挑選開始日期",
     "Pick an end date" : "挑選結束日期",
     "Select senders" : "選擇寄件人",
@@ -404,6 +407,7 @@ OC.L10N.register(
     "Clear" : "清除",
     "Search" : "搜尋",
     "Date" : "日期",
+    "Enable mail body search" : "啟用郵件正文搜尋",
     "Disabled" : "停用",
     "Enabled" : "啟用",
     "Sieve Host" : "Sieve 主機",
diff --git a/l10n/zh_HK.json b/l10n/zh_HK.json
index c8714f857..509ff9280 100644
--- a/l10n/zh_HK.json
+++ b/l10n/zh_HK.json
@@ -87,6 +87,7 @@
     "Trusted senders" : "受信任的寄件人",
     "Mail server" : "郵件伺服器",
     "Sieve filter server" : "Sieve 過濾伺服器",
+    "Mailbox search" : "郵箱搜尋",
     "Update alias" : "更新别名",
     "Rename alias" : "重新命名别名",
     "Show update alias form" : "顯示更新別名表格",
@@ -388,7 +389,9 @@
     "Search in mailbox" : "在郵箱中搜尋",
     "Close" : "關閉",
     "Search parameters" : "在參數中搜尋",
+    "Search subject" : "搜尋主旨",
     "Body" : "內文",
+    "Search body" : "搜尋正文",
     "Pick a start date" : "挑選開始日期",
     "Pick an end date" : "挑選結束日期",
     "Select senders" : "選擇寄件人",
@@ -402,6 +405,7 @@
     "Clear" : "清除",
     "Search" : "搜尋",
     "Date" : "日期",
+    "Enable mail body search" : "啟用郵件正文搜尋",
     "Disabled" : "停用",
     "Enabled" : "啟用",
     "Sieve Host" : "Sieve 主機",
diff --git a/l10n/zh_TW.js b/l10n/zh_TW.js
index 96785e332..9b79f3135 100644
--- a/l10n/zh_TW.js
+++ b/l10n/zh_TW.js
@@ -89,6 +89,7 @@ OC.L10N.register(
     "Trusted senders" : "信任的寄件者",
     "Mail server" : "郵件伺服器",
     "Sieve filter server" : "過濾伺服器",
+    "Mailbox search" : "信箱搜尋",
     "Update alias" : "更新别名",
     "Rename alias" : "重新命名別名",
     "Show update alias form" : "顯示更新別名表格",
@@ -390,7 +391,9 @@ OC.L10N.register(
     "Search in mailbox" : "在郵件匣中搜尋",
     "Close" : "關閉",
     "Search parameters" : "搜尋參數",
+    "Search subject" : "搜尋主旨",
     "Body" : "內文",
+    "Search body" : "搜尋正文",
     "Pick a start date" : "挑選開始日期",
     "Pick an end date" : "挑選結束日期",
     "Select senders" : "選取寄件者",
@@ -404,6 +407,7 @@ OC.L10N.register(
     "Clear" : "清除",
     "Search" : "搜尋",
     "Date" : "日期",
+    "Enable mail body search" : "啟用郵件正文搜尋",
     "Disabled" : "已停用",
     "Enabled" : "已啟用",
     "Sieve Host" : "過濾主機",
diff --git a/l10n/zh_TW.json b/l10n/zh_TW.json
index 829f4d051..6750d2857 100644
--- a/l10n/zh_TW.json
+++ b/l10n/zh_TW.json
@@ -87,6 +87,7 @@
     "Trusted senders" : "信任的寄件者",
     "Mail server" : "郵件伺服器",
     "Sieve filter server" : "過濾伺服器",
+    "Mailbox search" : "信箱搜尋",
     "Update alias" : "更新别名",
     "Rename alias" : "重新命名別名",
     "Show update alias form" : "顯示更新別名表格",
@@ -388,7 +389,9 @@
     "Search in mailbox" : "在郵件匣中搜尋",
     "Close" : "關閉",
     "Search parameters" : "搜尋參數",
+    "Search subject" : "搜尋主旨",
     "Body" : "內文",
+    "Search body" : "搜尋正文",
     "Pick a start date" : "挑選開始日期",
     "Pick an end date" : "挑選結束日期",
     "Select senders" : "選取寄件者",
@@ -402,6 +405,7 @@
     "Clear" : "清除",
     "Search" : "搜尋",
     "Date" : "日期",
+    "Enable mail body search" : "啟用郵件正文搜尋",
     "Disabled" : "已停用",
     "Enabled" : "已啟用",
     "Sieve Host" : "過濾主機",