diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
index 1f6a3878fb..1862ae6a3c 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
@@ -92,7 +92,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
             "crash_reports_asked", "review_asked", "review_later", "why",
             "reply_hint", "html_always_images", "print_html_confirmed",
             "selected_folders", "move_1_confirmed", "move_n_confirmed",
-            "last_search",
+            "last_search_senders", "last_search_recipients", "last_search_subject", "last_search_keywords", "last_search_message", "last_search",
             "identities_asked", "cc_bcc", "inline_image_hint", "compose_reference", "send_dialog",
             "setup_reminder", "setup_advanced"
     };
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 82baeddde3..2ceb4a62d8 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -796,18 +796,20 @@
     <string name="title_signature_store">Хранилище</string>
     <string name="title_search">Търсене</string>
     <string name="title_search_for_hint">Въведете текст</string>
+    <string name="title_search_more">Още опции</string>
     <string name="title_search_use_index">Използвай индекс за търсене</string>
     <string name="title_search_in_senders">В подетели (от)</string>
     <string name="title_search_in_recipients">В получатели (до, cc)</string>
     <string name="title_search_in_subject">В темата</string>
     <string name="title_search_in_keywords">В ключови думи (ако се поддържа)</string>
     <string name="title_search_in_message">В текста на съобщението</string>
-    <string name="title_search_with">И</string>
     <string name="title_search_with_unseen">Непрочетени</string>
     <string name="title_search_with_flagged">Със звезда</string>
     <string name="title_search_with_hidden">Скрито (само на устройство)</string>
     <string name="title_search_with_encrypted">Шифровано (само на устройство)</string>
     <string name="title_search_with_attachments">С прикачени файлове (само на устройство)</string>
+    <string name="title_search_with_before">Преди</string>
+    <string name="title_search_with_after">След</string>
     <string name="title_search_flag_unseen">непрочетени</string>
     <string name="title_search_flag_flagged">със звезда</string>
     <string name="title_search_flag_hidden">скрити</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 2c145bb4db..e72491ed38 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -179,9 +179,9 @@
     <string name="title_setup_data">Spořič dat je zapnutý</string>
     <string name="title_setup_inbox">Přejít ke zprávám</string>
     <string name="title_setup_go">Přejít</string>
-    <string name="title_setup_to_do">Zbývá dokončit</string>
+    <string name="title_setup_to_do">Dokončit</string>
     <string name="title_setup_done">Hotovo</string>
-    <string name="title_setup_still">Stále zbývá dokončit</string>
+    <string name="title_setup_still">Zbývá dokončit</string>
     <string name="title_setup_error">Chyba</string>
     <string name="title_setup_export">Export nastavení</string>
     <string name="title_setup_import">Import nastavení</string>
@@ -372,7 +372,7 @@
     <string name="title_advanced_light">Použít oznamovací LED</string>
     <string name="title_advanced_sound">Vybrat zvuk oznámení</string>
     <string name="title_advanced_confirm_links">Potvrzovat otevírání odkazů</string>
-    <string name="title_advanced_browse_links">Otvírejte odkazy na Androidu</string>
+    <string name="title_advanced_browse_links">Přenechat otevírání odkazů Androidu</string>
     <string name="title_advanced_confirm_images">Potvrzovat zobrazení obrázků</string>
     <string name="title_advanced_confirm_html">Automaticky zobrazit zprávy přeformátované</string>
     <string name="title_advanced_tracking">Automaticky rozpoznat a zakázat sledovací obrázky</string>
@@ -818,7 +818,26 @@
     <string name="title_signature_outdated">Tento veřejný klíč není v současné době platný</string>
     <string name="title_signature_store">Uložit</string>
     <string name="title_search">Hledat</string>
+    <string name="title_search_for_hint">Zadejte text</string>
+    <string name="title_search_more">Více možností</string>
     <string name="title_search_use_index">Použít index vyhledávání</string>
+    <string name="title_search_in_senders">V odesílatelích (od)</string>
+    <string name="title_search_in_recipients">V příjemcích (komu, kopie)</string>
+    <string name="title_search_in_subject">V předmětu</string>
+    <string name="title_search_in_keywords">V klíčových slovech (je-li podporováno)</string>
+    <string name="title_search_in_message">V textu zprávy</string>
+    <string name="title_search_with_unseen">Nepřečteno</string>
+    <string name="title_search_with_flagged">S hvězdičkou</string>
+    <string name="title_search_with_hidden">Skryto (pouze v zařízení)</string>
+    <string name="title_search_with_encrypted">Šifrováno (pouze v zařízení)</string>
+    <string name="title_search_with_attachments">S přílohami (pouze v zařízení)</string>
+    <string name="title_search_with_before">Před</string>
+    <string name="title_search_with_after">Po</string>
+    <string name="title_search_flag_unseen">nepřečteno</string>
+    <string name="title_search_flag_flagged">hvězdička</string>
+    <string name="title_search_flag_hidden">skryto</string>
+    <string name="title_search_flag_encrypted">šifrováno</string>
+    <string name="title_search_flag_attachments">přílohy</string>
     <string name="title_search_device">Hledat v zařízení</string>
     <string name="title_search_server">Hledat na serveru</string>
     <string name="title_search_in">Hledat v</string>
@@ -831,13 +850,13 @@
     <string name="title_sort_on_subject">Předmět</string>
     <string name="title_sort_on_size">Velikost</string>
     <string name="title_sort_on_attachments">Přílohy</string>
-    <string name="title_sort_on_hidden">Skryté</string>
+    <string name="title_sort_on_hidden">Skryto</string>
     <string name="title_sort_ascending">Od nejstarších</string>
     <string name="title_filter">Odfiltrovat</string>
     <string name="title_filter_seen">Přečteno</string>
     <string name="title_filter_unflagged">Bez hvězdičky</string>
     <string name="title_filter_unknown">Neznámí odesílatelé</string>
-    <string name="title_filter_hidden">Skryté</string>
+    <string name="title_filter_hidden">Skryto</string>
     <string name="title_filter_duplicates">Duplikáty</string>
     <string name="title_compact">Kompaktní zobrazení</string>
     <string name="title_zoom">Velikost textu</string>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index d3f6ea4e78..fba2cd082c 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -803,7 +803,6 @@
     <string name="title_search_in_subject">I Emne</string>
     <string name="title_search_in_keywords">I nøgleord (hvis understøttet)</string>
     <string name="title_search_in_message">I beskedtekst</string>
-    <string name="title_search_with">Og</string>
     <string name="title_search_with_unseen">Ulæst</string>
     <string name="title_search_with_flagged">Stjernemarkeret</string>
     <string name="title_search_with_hidden">Skjult (kun på enheden)</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index c624745501..5d2896c263 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -798,18 +798,20 @@ Protokolle, die dem Standard nicht entsprechen, wie „Microsoft Exchange Web Se
     <string name="title_signature_store">Speichern</string>
     <string name="title_search">Suche</string>
     <string name="title_search_for_hint">Text eingeben</string>
+    <string name="title_search_more">Weitere Optionen</string>
     <string name="title_search_use_index">Suchindex verwenden</string>
     <string name="title_search_in_senders">In Absendern (von)</string>
     <string name="title_search_in_recipients">In Empfängern (An, CC)</string>
     <string name="title_search_in_subject">Im Betreff</string>
     <string name="title_search_in_keywords">In Schlagwörtern (wenn unterstützt)</string>
     <string name="title_search_in_message">Im Nachrichtentext</string>
-    <string name="title_search_with">Und</string>
     <string name="title_search_with_unseen">Ungelesen</string>
     <string name="title_search_with_flagged">Gekennzeichnet</string>
     <string name="title_search_with_hidden">Ausgeblendet (nur auf dem Gerät)</string>
     <string name="title_search_with_encrypted">Verschlüsselt (nur auf dem Gerät)</string>
     <string name="title_search_with_attachments">Mit Anhängen (nur auf dem Gerät)</string>
+    <string name="title_search_with_before">Vor</string>
+    <string name="title_search_with_after">Nach</string>
     <string name="title_search_flag_unseen">ungelesen</string>
     <string name="title_search_flag_flagged">gekennzeichnet</string>
     <string name="title_search_flag_hidden">ausgeblendet</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 768f958f90..1ae5da41b9 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -798,18 +798,20 @@
     <string name="title_signature_store">Almacenar</string>
     <string name="title_search">Buscar</string>
     <string name="title_search_for_hint">Ingrese texto</string>
+    <string name="title_search_more">Más opciones</string>
     <string name="title_search_use_index">Usar índice de búsqueda</string>
     <string name="title_search_in_senders">En remitentes (de)</string>
     <string name="title_search_in_recipients">En destinatarios (a, cc)</string>
     <string name="title_search_in_subject">En asunto</string>
     <string name="title_search_in_keywords">En palabras clave (si es compatible)</string>
     <string name="title_search_in_message">En texto del mensaje</string>
-    <string name="title_search_with">Y</string>
     <string name="title_search_with_unseen">No leído</string>
     <string name="title_search_with_flagged">Destacado</string>
     <string name="title_search_with_hidden">Oculto (en el dispositivo solamente)</string>
     <string name="title_search_with_encrypted">Cifrado (en el dispositivo solamente)</string>
     <string name="title_search_with_attachments">Con archivos adjuntos (sólo en el dispositivo)</string>
+    <string name="title_search_with_before">Antes de</string>
+    <string name="title_search_with_after">Después de</string>
     <string name="title_search_flag_unseen">no leído</string>
     <string name="title_search_flag_flagged">destacado</string>
     <string name="title_search_flag_hidden">oculto</string>
diff --git a/app/src/main/res/values-eu-rES/strings.xml b/app/src/main/res/values-eu-rES/strings.xml
index 1e5c94ad2d..599183e635 100644
--- a/app/src/main/res/values-eu-rES/strings.xml
+++ b/app/src/main/res/values-eu-rES/strings.xml
@@ -800,7 +800,6 @@ Honekin aldeko eta kontrako botoen arteko oreka mantenduko da.
     <string name="title_search_in_subject">Mintzagaian</string>
     <string name="title_search_in_keywords">Hitz-gakoetan (onartuz gero)</string>
     <string name="title_search_in_message">Mezuen testuan</string>
-    <string name="title_search_with">Eta</string>
     <string name="title_search_with_unseen">Irakurri gabea</string>
     <string name="title_search_with_flagged">Izarduna</string>
     <string name="title_search_with_hidden">Ezkutatuta (gailuan soilik)</string>
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index 354ba14344..19e54ae68c 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -794,6 +794,23 @@
     <string name="title_signature_outdated">Tämä julkinen avain ei ole voimassa</string>
     <string name="title_signature_store">Tallenna</string>
     <string name="title_search">Hae</string>
+    <string name="title_search_for_hint">Syötä teksti</string>
+    <string name="title_search_use_index">Käytä haun indeksiä</string>
+    <string name="title_search_in_senders">Lähettäjistä</string>
+    <string name="title_search_in_recipients">Vastaanottajista (vaataanottaja, kopio)</string>
+    <string name="title_search_in_subject">Aiheesta</string>
+    <string name="title_search_in_keywords">Avainsanoista (jos on tuettu)</string>
+    <string name="title_search_in_message">Viestin tekstistä</string>
+    <string name="title_search_with_unseen">Lukematon</string>
+    <string name="title_search_with_flagged">Tähdellinen</string>
+    <string name="title_search_with_hidden">Piilotettu (vain laitteessa)</string>
+    <string name="title_search_with_encrypted">Salattu (vain laitteessa)</string>
+    <string name="title_search_with_attachments">Sisältää liitteen (vain laitteessa)</string>
+    <string name="title_search_flag_unseen">lukematon</string>
+    <string name="title_search_flag_flagged">tähdellinen</string>
+    <string name="title_search_flag_hidden">piilotettu</string>
+    <string name="title_search_flag_encrypted">salattu</string>
+    <string name="title_search_flag_attachments">liitteet</string>
     <string name="title_search_device">Hae laitteesta</string>
     <string name="title_search_server">Hae palvelimella</string>
     <string name="title_search_in">Hae kohteesta</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 4403042f74..0bfb8b150a 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -797,18 +797,20 @@
     <string name="title_signature_store">Enregistrer</string>
     <string name="title_search">Rechercher</string>
     <string name="title_search_for_hint">Saisir le texte</string>
+    <string name="title_search_more">Plus d\'options</string>
     <string name="title_search_use_index">Utiliser l\'index de recherche</string>
     <string name="title_search_in_senders">Dans les expéditeurs (De)</string>
     <string name="title_search_in_recipients">Dans les destinataires (À, Cc)</string>
     <string name="title_search_in_subject">Dans l\'objet</string>
     <string name="title_search_in_keywords">Dans les mots-clés (si pris en charge)</string>
     <string name="title_search_in_message">Dans le texte du message</string>
-    <string name="title_search_with">Et</string>
     <string name="title_search_with_unseen">Non lus</string>
     <string name="title_search_with_flagged">Suivis</string>
     <string name="title_search_with_hidden">Masqués (uniquement sur l\'appareil)</string>
     <string name="title_search_with_encrypted">Chiffrés (uniquement sur l\'appareil)</string>
     <string name="title_search_with_attachments">Avec des pièces jointes (uniquement sur l\'appareil)</string>
+    <string name="title_search_with_before">Avant</string>
+    <string name="title_search_with_after">Après</string>
     <string name="title_search_flag_unseen">non lus</string>
     <string name="title_search_flag_flagged">suivis</string>
     <string name="title_search_flag_hidden">masqués</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 236fcfc0ec..2bdee4de9e 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -796,18 +796,20 @@
     <string name="title_signature_store">Registra</string>
     <string name="title_search">Cerca</string>
     <string name="title_search_for_hint">Inserisci testo</string>
+    <string name="title_search_more">Altre opzioni</string>
     <string name="title_search_use_index">Usa indice di ricerca</string>
     <string name="title_search_in_senders">Nei mittenti (da)</string>
     <string name="title_search_in_recipients">Nei destinatari (to, cc)</string>
     <string name="title_search_in_subject">Nel soggetto</string>
     <string name="title_search_in_keywords">In parole chiave (se supportato)</string>
     <string name="title_search_in_message">Nel testo del messaggio</string>
-    <string name="title_search_with">E</string>
     <string name="title_search_with_unseen">Non letto</string>
     <string name="title_search_with_flagged">Preferiti</string>
     <string name="title_search_with_hidden">Nascosto (solo su dispositivo)</string>
     <string name="title_search_with_encrypted">Crittografato (solo su dispositivo)</string>
     <string name="title_search_with_attachments">Con allegati (solo su dispositivo)</string>
+    <string name="title_search_with_before">Prima</string>
+    <string name="title_search_with_after">Dopo</string>
     <string name="title_search_flag_unseen">non letto</string>
     <string name="title_search_flag_flagged">preferiti</string>
     <string name="title_search_flag_hidden">nascosto</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index ed567127de..5a74145f02 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -796,18 +796,21 @@
     <string name="title_signature_store">Opslaan</string>
     <string name="title_search">Zoek</string>
     <string name="title_search_for_hint">Voer tekst in</string>
+    <string name="title_search_more">Meer opties</string>
     <string name="title_search_use_index">Gebruik zoekindex</string>
     <string name="title_search_in_senders">In afzenders (van)</string>
     <string name="title_search_in_recipients">In geadresseerden (aan, cc)</string>
     <string name="title_search_in_subject">In onderwerp</string>
     <string name="title_search_in_keywords">In trefwoorden (indien ondersteund)</string>
     <string name="title_search_in_message">In bericht tekst</string>
-    <string name="title_search_with">En</string>
+    <string name="title_search_with">Zoekopdracht beperken tot</string>
     <string name="title_search_with_unseen">Ongelezen</string>
     <string name="title_search_with_flagged">Met ster</string>
     <string name="title_search_with_hidden">Verborgen (alleen op apparaat)</string>
     <string name="title_search_with_encrypted">Versleuteld (alleen op apparaat)</string>
     <string name="title_search_with_attachments">Met bijlagen (alleen op apparaat)</string>
+    <string name="title_search_with_before">Voor</string>
+    <string name="title_search_with_after">Na</string>
     <string name="title_search_flag_unseen">ongelezen</string>
     <string name="title_search_flag_flagged">met ster</string>
     <string name="title_search_flag_hidden">verborgen</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 0bbcf3baef..df57cc4579 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -819,18 +819,20 @@
     <string name="title_signature_store">Хранилище</string>
     <string name="title_search">Поиск</string>
     <string name="title_search_for_hint">Введите текст</string>
+    <string name="title_search_more">Дополнительные параметры</string>
     <string name="title_search_use_index">Использовать поисковый индекс</string>
     <string name="title_search_in_senders">В отправителях (от)</string>
     <string name="title_search_in_recipients">В получателях (кому, скрытые)</string>
     <string name="title_search_in_subject">В теме</string>
     <string name="title_search_in_keywords">В ключевых словах (если возможно)</string>
     <string name="title_search_in_message">В тексте сообщения</string>
-    <string name="title_search_with">И</string>
     <string name="title_search_with_unseen">Не прочитано</string>
     <string name="title_search_with_flagged">Избранное</string>
     <string name="title_search_with_hidden">Скрыто (только на устройстве)</string>
     <string name="title_search_with_encrypted">Зашифровано (только на устройстве)</string>
     <string name="title_search_with_attachments">С вложениями (только на устройстве)</string>
+    <string name="title_search_with_before">Перед</string>
+    <string name="title_search_with_after">После</string>
     <string name="title_search_flag_unseen">не прочитано</string>
     <string name="title_search_flag_flagged">избранное</string>
     <string name="title_search_flag_hidden">скрыто</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 60f399bc5f..14e28708ee 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -785,18 +785,20 @@
     <string name="title_signature_store">保存</string>
     <string name="title_search">搜索</string>
     <string name="title_search_for_hint">输入文本</string>
+    <string name="title_search_more">更多选项</string>
     <string name="title_search_use_index">使用搜索索引</string>
     <string name="title_search_in_senders">搜索发件人(来自)</string>
     <string name="title_search_in_recipients">搜索收件人(发送到、转发)</string>
     <string name="title_search_in_subject">搜索主题</string>
     <string name="title_search_in_keywords">搜索关键词(如果支持)</string>
     <string name="title_search_in_message">搜索消息文本</string>
-    <string name="title_search_with">且</string>
     <string name="title_search_with_unseen">搜索未读消息</string>
     <string name="title_search_with_flagged">搜索星标邮件</string>
     <string name="title_search_with_hidden">搜索隐藏消息(仅设备)</string>
     <string name="title_search_with_encrypted">搜索加密消息(仅设备)</string>
     <string name="title_search_with_attachments">搜索带附件消息(仅设备)</string>
+    <string name="title_search_with_before">之前</string>
+    <string name="title_search_with_after">之后</string>
     <string name="title_search_flag_unseen">未读</string>
     <string name="title_search_flag_flagged">标星</string>
     <string name="title_search_flag_hidden">隐藏</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c90705829e..a14958b7f6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -911,7 +911,7 @@
     <string name="title_search_in_subject">In subject</string>
     <string name="title_search_in_keywords">In keywords (if supported)</string>
     <string name="title_search_in_message">In message text</string>
-    <string name="title_search_with">And</string>
+    <string name="title_search_with">Limit search to</string>
     <string name="title_search_with_unseen">Unread</string>
     <string name="title_search_with_flagged">Starred</string>
     <string name="title_search_with_hidden">Hidden (on device only)</string>