diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogSearch.java b/app/src/main/java/eu/faircode/email/FragmentDialogSearch.java
index 3a8a4cdeb3..618d128d1d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogSearch.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogSearch.java
@@ -106,14 +106,14 @@ public class FragmentDialogSearch extends FragmentDialogBase {
         final CheckBox cbNotes = dview.findViewById(R.id.cbNotes);
         final CheckBox cbHeaders = dview.findViewById(R.id.cbHeaders);
         final CheckBox cbHtml = dview.findViewById(R.id.cbHtml);
+        final CheckBox cbSearchTrash = dview.findViewById(R.id.cbSearchTrash);
+        final CheckBox cbSearchJunk = dview.findViewById(R.id.cbSearchJunk);
         final CheckBox cbUnseen = dview.findViewById(R.id.cbUnseen);
         final CheckBox cbFlagged = dview.findViewById(R.id.cbFlagged);
         final CheckBox cbHidden = dview.findViewById(R.id.cbHidden);
         final CheckBox cbEncrypted = dview.findViewById(R.id.cbEncrypted);
         final CheckBox cbAttachments = dview.findViewById(R.id.cbAttachments);
         final Spinner spMessageSize = dview.findViewById(R.id.spMessageSize);
-        final CheckBox cbSearchTrash = dview.findViewById(R.id.cbSearchTrash);
-        final CheckBox cbSearchJunk = dview.findViewById(R.id.cbSearchJunk);
         final Button btnBefore = dview.findViewById(R.id.btnBefore);
         final Button btnAfter = dview.findViewById(R.id.btnAfter);
         final TextView tvBefore = dview.findViewById(R.id.tvBefore);
@@ -242,16 +242,9 @@ public class FragmentDialogSearch extends FragmentDialogBase {
         cbSearchIndex.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                cbSenders.setEnabled(!isChecked);
-                cbRecipients.setEnabled(!isChecked);
-                cbSubject.setEnabled(!isChecked);
-                cbKeywords.setEnabled(!isChecked);
-                cbMessage.setEnabled(!isChecked);
                 cbNotes.setEnabled(!isChecked);
                 cbHeaders.setEnabled(!isChecked);
                 cbHtml.setEnabled(!isChecked);
-                cbUnseen.setEnabled(!isChecked);
-                cbFlagged.setEnabled(!isChecked);
                 cbHidden.setEnabled(!isChecked);
                 cbEncrypted.setEnabled(!isChecked);
                 cbAttachments.setEnabled(!isChecked);
@@ -301,6 +294,20 @@ public class FragmentDialogSearch extends FragmentDialogBase {
             }
         });
 
+        cbSearchTrash.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                prefs.edit().putBoolean("last_search_trash", isChecked).apply();
+            }
+        });
+
+        cbSearchJunk.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                prefs.edit().putBoolean("last_search_junk", isChecked).apply();
+            }
+        });
+
         spMessageSize.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
@@ -318,20 +325,6 @@ public class FragmentDialogSearch extends FragmentDialogBase {
             }
         });
 
-        cbSearchTrash.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                prefs.edit().putBoolean("last_search_trash", isChecked).apply();
-            }
-        });
-
-        cbSearchJunk.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                prefs.edit().putBoolean("last_search_junk", isChecked).apply();
-            }
-        });
-
         btnAfter.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
diff --git a/app/src/main/res/layout/dialog_search.xml b/app/src/main/res/layout/dialog_search.xml
index 7298d4f63f..9c90159df7 100644
--- a/app/src/main/res/layout/dialog_search.xml
+++ b/app/src/main/res/layout/dialog_search.xml
@@ -251,7 +251,6 @@
             android:id="@+id/cbSenders"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
             android:layout_marginTop="12dp"
             android:checked="true"
             android:text="@string/title_search_in_senders"
@@ -264,7 +263,6 @@
             android:id="@+id/cbRecipients"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
             android:layout_marginTop="12dp"
             android:checked="true"
             android:text="@string/title_search_in_recipients"
@@ -277,7 +275,6 @@
             android:id="@+id/cbSubject"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
             android:layout_marginTop="12dp"
             android:checked="true"
             android:text="@string/title_search_in_subject"
@@ -290,7 +287,6 @@
             android:id="@+id/cbKeywords"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
             android:layout_marginTop="12dp"
             android:text="@string/title_search_in_keywords"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
@@ -302,7 +298,6 @@
             android:id="@+id/cbMessage"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
             android:layout_marginTop="12dp"
             android:checked="true"
             android:text="@string/title_search_in_message"
@@ -315,7 +310,6 @@
             android:id="@+id/tvSearchTextHint"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
             android:layout_marginTop="6dp"
             android:text="@string/title_search_text_hint"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
@@ -328,7 +322,6 @@
             android:id="@+id/cbNotes"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
             android:layout_marginTop="12dp"
             android:checked="true"
             android:text="@string/title_search_in_notes"
@@ -341,7 +334,6 @@
             android:id="@+id/cbHeaders"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
             android:layout_marginTop="12dp"
             android:text="@string/title_search_in_headers"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
@@ -353,7 +345,6 @@
             android:id="@+id/cbHtml"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
             android:layout_marginTop="12dp"
             android:text="@string/title_search_in_html"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
@@ -361,22 +352,44 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbHeaders" />
 
+        <CheckBox
+            android:id="@+id/cbSearchTrash"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:checked="true"
+            android:text="@string/title_search_in_trash"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/cbHtml" />
+
+        <CheckBox
+            android:id="@+id/cbSearchJunk"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:checked="true"
+            android:text="@string/title_search_in_junk"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/cbSearchTrash" />
+
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvAnd"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
             android:layout_marginTop="12dp"
             android:text="@string/title_search_with"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/cbHtml" />
+            app:layout_constraintTop_toBottomOf="@id/cbSearchJunk" />
 
         <CheckBox
             android:id="@+id/cbUnseen"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
             android:layout_marginTop="12dp"
             android:text="@string/title_search_with_unseen"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
@@ -388,7 +401,6 @@
             android:id="@+id/cbFlagged"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
             android:layout_marginTop="12dp"
             android:text="@string/title_search_with_flagged"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
@@ -400,7 +412,6 @@
             android:id="@+id/cbHidden"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
             android:layout_marginTop="12dp"
             android:text="@string/title_search_with_hidden"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
@@ -412,7 +423,6 @@
             android:id="@+id/cbEncrypted"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
             android:layout_marginTop="12dp"
             android:text="@string/title_search_with_encrypted"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
@@ -424,7 +434,6 @@
             android:id="@+id/cbAttachments"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
             android:layout_marginTop="12dp"
             android:text="@string/title_search_with_attachments"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
@@ -436,7 +445,6 @@
             android:id="@+id/tvMessageSize"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
             android:layout_marginTop="12dp"
             android:text="@string/title_search_with_size"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
@@ -449,7 +457,6 @@
             android:id="@+id/spMessageSize"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
             android:layout_marginTop="12dp"
             android:entries="@array/sizeNames"
             android:visibility="gone"
@@ -460,7 +467,6 @@
             android:id="@+id/tvSizeHint"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
             android:layout_marginTop="6dp"
             android:text="@string/title_search_size_hint"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
@@ -470,28 +476,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/spMessageSize" />
 
-        <CheckBox
-            android:id="@+id/cbSearchTrash"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="@string/title_search_in_trash"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvSizeHint" />
-
-        <CheckBox
-            android:id="@+id/cbSearchJunk"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="@string/title_search_in_junk"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/cbSearchTrash" />
-
         <Button
             android:id="@+id/btnAfter"
             style="?android:attr/buttonStyleSmall"
@@ -502,7 +486,7 @@
             android:text="@string/title_search_with_after"
             app:layout_constraintEnd_toStartOf="@id/btnBefore"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/cbSearchJunk" />
+            app:layout_constraintTop_toBottomOf="@id/tvSizeHint" />
 
         <Button
             android:id="@+id/btnBefore"
@@ -514,7 +498,7 @@
             android:text="@string/title_search_with_before"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/btnAfter"
-            app:layout_constraintTop_toBottomOf="@id/cbSearchJunk" />
+            app:layout_constraintTop_toBottomOf="@id/tvSizeHint" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvAfter"
diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml
index d5f637b198..634ce90504 100644
--- a/app/src/main/res/values-ar-rBH/strings.xml
+++ b/app/src/main/res/values-ar-rBH/strings.xml
@@ -297,7 +297,7 @@
     <string name="title_decrypt">فك التعمية</string>
     <string name="title_no_openpgp">لم يتم العثور على OpenKeychain</string>
     <string name="title_search">بحث</string>
-    <string name="title_search_in_trash" comment="title_search_in_trash&#10;Title for option to enable/disable searching in the trash folder&#10;">في القمامة</string>
+    <string name="title_search_in_trash">في القمامة</string>
     <string name="title_sort_on">الفرز حسب</string>
     <string name="title_sort_on_time">التاريخ</string>
     <string name="title_sort_on_unread">غير مقروءة</string>
diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml
index d5f637b198..634ce90504 100644
--- a/app/src/main/res/values-ar-rEG/strings.xml
+++ b/app/src/main/res/values-ar-rEG/strings.xml
@@ -297,7 +297,7 @@
     <string name="title_decrypt">فك التعمية</string>
     <string name="title_no_openpgp">لم يتم العثور على OpenKeychain</string>
     <string name="title_search">بحث</string>
-    <string name="title_search_in_trash" comment="title_search_in_trash&#10;Title for option to enable/disable searching in the trash folder&#10;">في القمامة</string>
+    <string name="title_search_in_trash">في القمامة</string>
     <string name="title_sort_on">الفرز حسب</string>
     <string name="title_sort_on_time">التاريخ</string>
     <string name="title_sort_on_unread">غير مقروءة</string>
diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml
index 4ae5dcbfb7..b815afa805 100644
--- a/app/src/main/res/values-ar-rYE/strings.xml
+++ b/app/src/main/res/values-ar-rYE/strings.xml
@@ -345,7 +345,7 @@
     <string name="title_decrypt">فك التعمية</string>
     <string name="title_no_openpgp">لم يتم العثور على OpenKeychain</string>
     <string name="title_search">بحث</string>
-    <string name="title_search_in_trash" comment="title_search_in_trash&#10;Title for option to enable/disable searching in the trash folder&#10;">في القمامة</string>
+    <string name="title_search_in_trash">في القمامة</string>
     <string name="title_sort_on">الفرز حسب</string>
     <string name="title_sort_on_time">التاريخ</string>
     <string name="title_sort_on_unread">غير مقروءة</string>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 93f7507c79..492337f40e 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -795,10 +795,6 @@
     <string name="title_signature_store">Хранилище</string>
     <string name="title_search">Търсене</string>
     <string name="title_search_for_hint">Въведете текст</string>
-    <string name="title_search_hint">        Първоначално търсенето ще прегледа съобщенията, съхранявани на вашето устройство.
-        За да търсите и в сървъра, натиснете бутона „търсене отново“.
-    </string>
-    <string name="title_search_index_hint">Търсене чрез индекса за търсене е бързо, но ще намери само цели думи</string>
     <string name="title_search_text_hint">Търсене на текст в съобщения, когато има голям брой съобщения, може да не работи на някои сървъри</string>
     <string name="title_search_size_hint">Търсене на съобщения по размер, когато има голям брой съобщения, може да не работи на някои сървъри</string>
     <string name="title_search_more">Още опции</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 0c1f7cd6b4..051be9f5fc 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -1059,10 +1059,6 @@
     <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_hint">        Hledání se zpočátku zaměří na zprávy uložené ve vašem zařízení.
-        Pro hledání i na serveru, stiskněte tlačítko „Hledat znovu“.
-    </string>
-    <string name="title_search_index_hint">Hledání s pomocí indexu vyhledávání je rychlé, ale najde pouze celá slova</string>
     <string name="title_search_text_hint">Hledání textu ve zprávách, při velkém počtu zpráv, nemusí fungovat na některých serverech</string>
     <string name="title_search_size_hint">Vyhledávání zpráv podle velikosti, při velkém počtu zpráv, nemusí fungovat na některých serverech</string>
     <string name="title_search_more">Více možností</string>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index 267e42a460..35d8212a5b 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -1017,10 +1017,6 @@
     <string name="title_signature_store">Gem</string>
     <string name="title_search">Søg</string>
     <string name="title_search_for_hint">Angiv tekst</string>
-    <string name="title_search_hint">        Søgning sker indledningsvis efter beskeder gemt på din enhed.
-         For også at søge på serveren, tryk på knappen \'søg igen\'.
-    </string>
-    <string name="title_search_index_hint">Søgning via søgeindekset er hurtig, men vil kun finde hele ord</string>
     <string name="title_search_text_hint">Søgning efter tekst i beskeder, når der er et stort antal heraf, fungerer muligvis ikke på alle servere</string>
     <string name="title_search_size_hint">Søgning efter beskeder efter størrelse, når der er et stort antal heraf, fungerer muligvis ikke på alle servere</string>
     <string name="title_search_more">Flere valgmuligheder</string>
@@ -1037,8 +1033,8 @@
     <string name="title_search_with_encrypted">Krypteret (kun på enheden)</string>
     <string name="title_search_with_attachments">Med vedhæftninger (kun på enheden)</string>
     <string name="title_search_with_size">Beskedstørrelse over</string>
-    <string name="title_search_in_trash" comment="title_search_in_trash&#10;Title for option to enable/disable searching in the trash folder&#10;">I papirkurven</string>
-    <string name="title_search_in_junk" comment="title_search_in_junk&#10;Title for option to enable/disable searching in the spam folder&#10;">I Spam</string>
+    <string name="title_search_in_trash">I papirkurven</string>
+    <string name="title_search_in_junk">I Spam</string>
     <string name="title_search_with_before">Før</string>
     <string name="title_search_with_after">Efter</string>
     <string name="title_search_flag_unseen">ulæst</string>
diff --git a/app/src/main/res/values-de-rAT/strings.xml b/app/src/main/res/values-de-rAT/strings.xml
index 454faa070d..24cec4083e 100644
--- a/app/src/main/res/values-de-rAT/strings.xml
+++ b/app/src/main/res/values-de-rAT/strings.xml
@@ -1042,8 +1042,6 @@
     <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_hint">Bei der Suche werden zunächst die auf Ihrem Gerät gespeicherten Nachrichten durchsucht. Um auch die Nachrichten auf dem Server zu durchsuchen, tippen Sie auf die Schaltfläche „Erneut suchen“.    </string>
-    <string name="title_search_index_hint">Die Suche über den Suchindex ist schnell, wird aber nur für ganze Wörter durchgeführt</string>
     <string name="title_search_text_hint">Das Suchen nach Text in Nachrichten funktioniert bei einer großen Anzahl von Nachrichten auf einigen Servern möglicherweise nicht</string>
     <string name="title_search_size_hint">Die Nachrichtensuche nach Größe funktioniert, bei einer großen Anzahl von Nachrichten, auf einigen Servern möglicherweise nicht</string>
     <string name="title_search_more">Weitere Optionen</string>
@@ -1061,8 +1059,8 @@
     <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_size">Nachrichtengröße größer als</string>
-    <string name="title_search_in_trash" comment="title_search_in_trash&#10;Title for option to enable/disable searching in the trash folder&#10;">Im Papierkorb</string>
-    <string name="title_search_in_junk" comment="title_search_in_junk&#10;Title for option to enable/disable searching in the spam folder&#10;">Im Spam-Ordner</string>
+    <string name="title_search_in_trash">Im Papierkorb</string>
+    <string name="title_search_in_junk">Im Spam-Ordner</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>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 454faa070d..24cec4083e 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -1042,8 +1042,6 @@
     <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_hint">Bei der Suche werden zunächst die auf Ihrem Gerät gespeicherten Nachrichten durchsucht. Um auch die Nachrichten auf dem Server zu durchsuchen, tippen Sie auf die Schaltfläche „Erneut suchen“.    </string>
-    <string name="title_search_index_hint">Die Suche über den Suchindex ist schnell, wird aber nur für ganze Wörter durchgeführt</string>
     <string name="title_search_text_hint">Das Suchen nach Text in Nachrichten funktioniert bei einer großen Anzahl von Nachrichten auf einigen Servern möglicherweise nicht</string>
     <string name="title_search_size_hint">Die Nachrichtensuche nach Größe funktioniert, bei einer großen Anzahl von Nachrichten, auf einigen Servern möglicherweise nicht</string>
     <string name="title_search_more">Weitere Optionen</string>
@@ -1061,8 +1059,8 @@
     <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_size">Nachrichtengröße größer als</string>
-    <string name="title_search_in_trash" comment="title_search_in_trash&#10;Title for option to enable/disable searching in the trash folder&#10;">Im Papierkorb</string>
-    <string name="title_search_in_junk" comment="title_search_in_junk&#10;Title for option to enable/disable searching in the spam folder&#10;">Im Spam-Ordner</string>
+    <string name="title_search_in_trash">Im Papierkorb</string>
+    <string name="title_search_in_junk">Im Spam-Ordner</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>
diff --git a/app/src/main/res/values-de-rLI/strings.xml b/app/src/main/res/values-de-rLI/strings.xml
index 454faa070d..24cec4083e 100644
--- a/app/src/main/res/values-de-rLI/strings.xml
+++ b/app/src/main/res/values-de-rLI/strings.xml
@@ -1042,8 +1042,6 @@
     <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_hint">Bei der Suche werden zunächst die auf Ihrem Gerät gespeicherten Nachrichten durchsucht. Um auch die Nachrichten auf dem Server zu durchsuchen, tippen Sie auf die Schaltfläche „Erneut suchen“.    </string>
-    <string name="title_search_index_hint">Die Suche über den Suchindex ist schnell, wird aber nur für ganze Wörter durchgeführt</string>
     <string name="title_search_text_hint">Das Suchen nach Text in Nachrichten funktioniert bei einer großen Anzahl von Nachrichten auf einigen Servern möglicherweise nicht</string>
     <string name="title_search_size_hint">Die Nachrichtensuche nach Größe funktioniert, bei einer großen Anzahl von Nachrichten, auf einigen Servern möglicherweise nicht</string>
     <string name="title_search_more">Weitere Optionen</string>
@@ -1061,8 +1059,8 @@
     <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_size">Nachrichtengröße größer als</string>
-    <string name="title_search_in_trash" comment="title_search_in_trash&#10;Title for option to enable/disable searching in the trash folder&#10;">Im Papierkorb</string>
-    <string name="title_search_in_junk" comment="title_search_in_junk&#10;Title for option to enable/disable searching in the spam folder&#10;">Im Spam-Ordner</string>
+    <string name="title_search_in_trash">Im Papierkorb</string>
+    <string name="title_search_in_junk">Im Spam-Ordner</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>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index a7a305bca6..f1c27e3b8c 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -1039,10 +1039,6 @@
     <string name="title_signature_store">Αποθήκευση</string>
     <string name="title_search">Αναζήτηση</string>
     <string name="title_search_for_hint">Εισαγωγή κειμένου</string>
-    <string name="title_search_hint">        Η αναζήτηση αρχικά θα ψάξει μηνύματα που είναι αποθηκευμένα στη συσκευή.
-        Για να ψάξετε και μηνύματα στο διακομιστή, πατήστε το κουμπί \'επανάληψη αναζήτησης\'.
-    </string>
-    <string name="title_search_index_hint">Η αναζήτηση μέσω του ευρετηρίου είναι γρήγορη, αλλά θα βρει μόνον ολόκληρες λέξεις</string>
     <string name="title_search_text_hint">Η αναζήτηση κειμένου μέσα σε μηνύματα μπορεί να μη λειτουργήσει σε κάποιους διακομιστές όταν υπάρχει μεγάλος αριθμός μηνυμάτων</string>
     <string name="title_search_size_hint">Η αναζήτηση μηνυμάτων με βάση το μέγεθος μπορεί να μη λειτουργήσει σε κάποιους διακομιστές όταν υπάρχει μεγάλος αριθμός μηνυμάτων</string>
     <string name="title_search_more">Περισσότερες επιλογές</string>
@@ -1060,8 +1056,8 @@
     <string name="title_search_with_encrypted">Κρυπτογραφημένα (μόνο στη συσκευή)</string>
     <string name="title_search_with_attachments">Με συνημμένα (μόνο στη συσκευή)</string>
     <string name="title_search_with_size">Μέγεθος μηνύματος μεγαλύτερο από</string>
-    <string name="title_search_in_trash" comment="title_search_in_trash&#10;Title for option to enable/disable searching in the trash folder&#10;">Στον κάδο απορριμμάτων</string>
-    <string name="title_search_in_junk" comment="title_search_in_junk&#10;Title for option to enable/disable searching in the spam folder&#10;">Στα ανεπιθύμητα</string>
+    <string name="title_search_in_trash">Στον κάδο απορριμμάτων</string>
+    <string name="title_search_in_junk">Στα ανεπιθύμητα</string>
     <string name="title_search_with_before">Πριν από</string>
     <string name="title_search_with_after">Μετά από</string>
     <string name="title_search_flag_unseen">μη αναγνωσμένα</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 1f73b091ad..916f55163b 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -1042,10 +1042,6 @@
     <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_hint">        La búsqueda comenzará por los mensajes almacenados en su dispositivo.
-        Para buscar también en el servidor, toque el botón \'Buscar de nuevo\'.
-    </string>
-    <string name="title_search_index_hint">Buscar a través del índice de búsqueda es rápido, pero sólo encontrará palabras completas</string>
     <string name="title_search_text_hint">Buscar texto en mensajes puede no funcionar en algunos servidores cuando hay un gran número de mensajes</string>
     <string name="title_search_size_hint">Buscar mensajes por tamaño puede no funcionar en algunos servidores cuando hay un gran número de mensajes</string>
     <string name="title_search_more">Más opciones</string>
@@ -1063,8 +1059,8 @@
     <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_size">Tamaño del mensaje mayor que</string>
-    <string name="title_search_in_trash" comment="title_search_in_trash&#10;Title for option to enable/disable searching in the trash folder&#10;">En la papelera</string>
-    <string name="title_search_in_junk" comment="title_search_in_junk&#10;Title for option to enable/disable searching in the spam folder&#10;">En spam</string>
+    <string name="title_search_in_trash">En la papelera</string>
+    <string name="title_search_in_junk">En spam</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>
diff --git a/app/src/main/res/values-eu-rES/strings.xml b/app/src/main/res/values-eu-rES/strings.xml
index 331b5a48ea..4653408d04 100644
--- a/app/src/main/res/values-eu-rES/strings.xml
+++ b/app/src/main/res/values-eu-rES/strings.xml
@@ -798,10 +798,6 @@
     <string name="title_signature_store">Biltegiratu</string>
     <string name="title_search">Bilatu</string>
     <string name="title_search_for_hint">Sartu testua</string>
-    <string name="title_search_hint">        Bilaketak hasiera batean zure gailuan gordetako mezuak aztertuko ditu.
-        Zerbitzarian ere bilatzeko, sakatu \'bilatu berriro\' botoian.
-    </string>
-    <string name="title_search_index_hint">Bilaketa-indizearen bidez bilatzea azkarra da, baina hitz osoak soilik topatuko ditu</string>
     <string name="title_search_text_hint">Mezuetan testua bilatzea, mezu asko daudenean, agian ez dabil zerbitzari guztietan</string>
     <string name="title_search_size_hint">Mezuak neurriagatik bilatzea, mezu asko daudenean, agian ez dabil zerbitzari guztietan</string>
     <string name="title_search_more">Aukera gehiago</string>
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index 53b021215d..b338c6ca96 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -1035,10 +1035,6 @@
     <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_hint">Haku etsii aluksi laitteella olevista viesteistä.
-        Palvelimelta hakeaksesi näpäytä uudelleenhakupainiketta.
-    </string>
-    <string name="title_search_index_hint">Hakuindeksin kautta etsiminen on nopeampaa, mutta se löytää vain kokonaisia sanoja</string>
     <string name="title_search_text_hint">Tekstin haku viesteistä ei välttämättä toimi joillakin palvelimilla, kun viestejä on paljon</string>
     <string name="title_search_size_hint">Viestien haku koon perusteella ei välttämättä toimi joillakin palvelimilla, kun viestejä on paljon</string>
     <string name="title_search_more">Lisää asetuksia</string>
diff --git a/app/src/main/res/values-fr-rCA/strings.xml b/app/src/main/res/values-fr-rCA/strings.xml
index fb6643e1c2..659ad87ec2 100644
--- a/app/src/main/res/values-fr-rCA/strings.xml
+++ b/app/src/main/res/values-fr-rCA/strings.xml
@@ -1042,10 +1042,6 @@
     <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_hint">        La recherche affichera initialement les messages stockés sur votre appareil.
-        Pour rechercher également sur le serveur, appuyez sur le bouton « Rechercher de nouveau ».
-    </string>
-    <string name="title_search_index_hint">La recherche via l’index de recherche est rapide mais elle ne trouvera que des mots entiers</string>
     <string name="title_search_text_hint">La recherche de texte dans les messages peut ne pas fonctionner sur certains serveurs lorsqu’il y a un grand nombre de messages</string>
     <string name="title_search_size_hint">La recherche de messages par taille peut ne pas fonctionner sur certains serveurs lorsqu’il y a un grand nombre de messages</string>
     <string name="title_search_more">Plus d’options</string>
@@ -1063,8 +1059,8 @@
     <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_size">Taille de message supérieure à</string>
-    <string name="title_search_in_trash" comment="title_search_in_trash&#10;Title for option to enable/disable searching in the trash folder&#10;">Dans la corbeille</string>
-    <string name="title_search_in_junk" comment="title_search_in_junk&#10;Title for option to enable/disable searching in the spam folder&#10;">Dans les indésirables</string>
+    <string name="title_search_in_trash">Dans la corbeille</string>
+    <string name="title_search_in_junk">Dans les indésirables</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>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 1f65f787ec..1ee3a9778e 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -1042,10 +1042,6 @@
     <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_hint">        La recherche affichera initialement les messages stockés sur votre appareil.
-        Pour rechercher également sur le serveur, appuyez sur le bouton « Rechercher de nouveau ».
-    </string>
-    <string name="title_search_index_hint">La recherche via l’index de recherche est rapide mais ne trouvera que des mots entiers</string>
     <string name="title_search_text_hint">La recherche de texte dans les messages peut ne pas fonctionner sur certains serveurs lorsqu’il y a un grand nombre de messages</string>
     <string name="title_search_size_hint">La recherche de messages par taille peut ne pas fonctionner sur certains serveurs lorsqu’il y a un grand nombre de messages</string>
     <string name="title_search_more">Plus d\'options</string>
@@ -1063,8 +1059,8 @@
     <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_size">Taille de message supérieure à</string>
-    <string name="title_search_in_trash" comment="title_search_in_trash&#10;Title for option to enable/disable searching in the trash folder&#10;">Dans la corbeille</string>
-    <string name="title_search_in_junk" comment="title_search_in_junk&#10;Title for option to enable/disable searching in the spam folder&#10;">Dans les indésirables</string>
+    <string name="title_search_in_trash">Dans la corbeille</string>
+    <string name="title_search_in_junk">Dans les indésirables</string>
     <string name="title_search_with_before">Avant le</string>
     <string name="title_search_with_after">Après le</string>
     <string name="title_search_flag_unseen">non lus</string>
diff --git a/app/src/main/res/values-fy-rNL/strings.xml b/app/src/main/res/values-fy-rNL/strings.xml
index ef0f0d05ba..50e5790779 100644
--- a/app/src/main/res/values-fy-rNL/strings.xml
+++ b/app/src/main/res/values-fy-rNL/strings.xml
@@ -1026,10 +1026,6 @@
     <string name="title_signature_store">Bewarje</string>
     <string name="title_search">Sykje</string>
     <string name="title_search_for_hint">Tekst ynfiere</string>
-    <string name="title_search_hint">        Sykje sil earst sjen nei berjochten dy\'t op jo apparaat binne opslein.
-        Om de server ek te sykjen, tikje op \'e knop\' opnij sykje \'.
-    </string>
-    <string name="title_search_index_hint">Sykje fia de sykindeks is fluch, mar sil allinich hiele wurden fine</string>
     <string name="title_search_text_hint">Sykje nei tekst yn berjochten, as d\'r in grut oantal berjochten binne, wurket miskien net op guon servers</string>
     <string name="title_search_size_hint">Sykje nei berjochten op grutte, as d\'r in grut oantal berjochten binne, wurket miskien net op guon servers</string>
     <string name="title_search_more">Mear opsjes</string>
diff --git a/app/src/main/res/values-gl-rES/strings.xml b/app/src/main/res/values-gl-rES/strings.xml
index eb8c64a319..d4b7289b59 100644
--- a/app/src/main/res/values-gl-rES/strings.xml
+++ b/app/src/main/res/values-gl-rES/strings.xml
@@ -1021,10 +1021,6 @@
     <string name="title_signature_store">Almacén</string>
     <string name="title_search">Procurar</string>
     <string name="title_search_for_hint">Inserir texto</string>
-    <string name="title_search_hint">        A procura mirará primeiro ás mensaxes almacenadas no seu dispositivo.
-        Para ampliar tamén ao servidor, toque no botón \'procurar de novo\'.
-    </string>
-    <string name="title_search_index_hint">A procura polo índice de busca é rápida, pero só atopará palabras completas</string>
     <string name="title_search_text_hint">Procurar texto nas mensaxes, cando hai un grande número deles, podería non funcionar nalgúns servidores</string>
     <string name="title_search_size_hint">Procurar as mensaxes por tamaño, cando hai un grande número deles, podería non funcionar nalgúns servidores</string>
     <string name="title_search_more">Máis opcións</string>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index 84d4036cd4..180d0cdd8c 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -980,10 +980,6 @@
     <string name="title_signature_store">Áruház</string>
     <string name="title_search">Keresés</string>
     <string name="title_search_for_hint">Írjon be szöveget</string>
-    <string name="title_search_hint">        A keresés alapból csak az eszközön lévő üzeneteket keres.
-        Ahhoz hogy a szervert is keresse, koppintson a \'keresés újra\' gombra.
-    </string>
-    <string name="title_search_index_hint">Keresés a keresési indexen keresztül gyors, de csak teljes szavakat fog találni</string>
     <string name="title_search_text_hint">Magas üzenetszám esetén lehetséges, hogy néhány szerveren az üzenetekben való szövegkeresés nem működik megfelelően</string>
     <string name="title_search_size_hint">Magas üzenetszám esetén lehetséges, hogy néhány szerveren az üzenetek sorba rakása méret szerint nem működik</string>
     <string name="title_search_more">Több opció</string>
diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml
index 639105973c..ba3181be3e 100644
--- a/app/src/main/res/values-in-rID/strings.xml
+++ b/app/src/main/res/values-in-rID/strings.xml
@@ -971,9 +971,6 @@
     <string name="title_signature_store">Sumber</string>
     <string name="title_search">Pencarian</string>
     <string name="title_search_for_hint">Masukkan teks</string>
-    <string name="title_search_hint">Pencarian pertamakali akan melihat pesan yang disimpan di perangkat Anda.
-        Untuk mencari di server juga, ketuk tombol \'cari lagi\'.    </string>
-    <string name="title_search_index_hint">Pencarian melalui indeks lebih cepat, tetapi akan menemukan kata secara keseluruhan</string>
     <string name="title_search_more">Pilihan lainnya</string>
     <string name="title_search_use_index">Gunakan indeks pencarian</string>
     <string name="title_search_in_senders">Di pengirim (dari)</string>
@@ -988,8 +985,8 @@
     <string name="title_search_with_encrypted">Dienkripsi (hanya di perangkat)</string>
     <string name="title_search_with_attachments">Memiliki lampiran (hanya di perangkat)</string>
     <string name="title_search_with_size">Ukuran pesan lebih besar dari</string>
-    <string name="title_search_in_trash" comment="title_search_in_trash&#10;Title for option to enable/disable searching in the trash folder&#10;">Di tempat sampah</string>
-    <string name="title_search_in_junk" comment="title_search_in_junk&#10;Title for option to enable/disable searching in the spam folder&#10;">Di spam</string>
+    <string name="title_search_in_trash">Di tempat sampah</string>
+    <string name="title_search_in_junk">Di spam</string>
     <string name="title_search_with_before">Sebelum</string>
     <string name="title_search_with_after">Sesudah</string>
     <string name="title_search_flag_unseen">belum dibaca</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 18a5b23e50..4f33a44322 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -1042,10 +1042,6 @@
     <string name="title_signature_store">Memorizza</string>
     <string name="title_search">Cerca</string>
     <string name="title_search_for_hint">Inserisci testo</string>
-    <string name="title_search_hint">        La ricerca inizialmente cercherà i messaggi memorizzati sul tuo dispositivo.
-        Per cercare anche sul server, tocca il pulsante \'cerca di nuovo\'.
-    </string>
-    <string name="title_search_index_hint">La ricerca tramite l\'indice di ricerca è veloce, ma troverà solo parole intere</string>
     <string name="title_search_text_hint">La ricerca del testo nei messaggi, quando ci sono molti messaggi, potrebbe non funzionare su alcuni server</string>
     <string name="title_search_size_hint">La ricerca dei messaggi per dimensione, quando ci sono molti messaggi, potrebbe non funzionare su alcuni server</string>
     <string name="title_search_more">Altre opzioni</string>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index ebe9ca1dcc..1824690967 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -1030,10 +1030,6 @@
     <string name="title_signature_store">署名保存</string>
     <string name="title_search">検索</string>
     <string name="title_search_for_hint">テキストを入力</string>
-    <string name="title_search_hint">        お使いのデバイスに保存されているメッセージを検索します。
-        サーバーも検索するには「もう一度検索」ボタンをタップします
-    </string>
-    <string name="title_search_index_hint">検索インデックスを介した検索は高速ですが単語全体しか検索されません</string>
     <string name="title_search_text_hint">メッセージ内のテキストを検索しています。多数のメッセージがある場合、一部のサーバーで動作しない可能性があります。</string>
     <string name="title_search_size_hint">サイズ別にメッセージを検索しています。メッセージが多い場合、一部のサーバーでは動作しない可能性があります。</string>
     <string name="title_search_more">その他のオプション</string>
@@ -1051,8 +1047,8 @@
     <string name="title_search_with_encrypted">暗号化(デバイスのみ)</string>
     <string name="title_search_with_attachments">添付ファイル付き(デバイスのみ)</string>
     <string name="title_search_with_size">メッセージサイズより大きい</string>
-    <string name="title_search_in_trash" comment="title_search_in_trash&#10;Title for option to enable/disable searching in the trash folder&#10;">ごみ箱内</string>
-    <string name="title_search_in_junk" comment="title_search_in_junk&#10;Title for option to enable/disable searching in the spam folder&#10;">迷惑メール内</string>
+    <string name="title_search_in_trash">ごみ箱内</string>
+    <string name="title_search_in_junk">迷惑メール内</string>
     <string name="title_search_with_before">前へ</string>
     <string name="title_search_with_after">後で</string>
     <string name="title_search_flag_unseen">未読</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index bb87f4b5ef..69992a5d6b 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -1042,10 +1042,10 @@
     <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_hint">        Zoeken zal in eerste instantie berichten bekijken die op uw apparaat zijn opgeslagen.
-        Tik op de \'Opnieuw zoeken\' knop om ook op de server te zoeken.
-    </string>
-    <string name="title_search_index_hint">Zoeken via de zoekindex is snel, maar zal alleen hele woorden vinden</string>
+    <string name="title_search_hint">In eerste instantie wordt de zoekopdracht uitgevoerd op het apparaat.
+Tik op de knop \'opnieuw zoeken\' om ook op de server te zoeken.</string>
+    <string name="title_search_index_hint">Zoeken via de zoekindex gaat snel, maar vindt alleen hele woorden.
+ De onderstaande opties zijn om door te gaan met zoeken op de e-mailserver.</string>
     <string name="title_search_text_hint">Zoeken naar tekst in berichten, wanneer er een groot aantal berichten is, werkt mogelijk niet op sommige servers</string>
     <string name="title_search_size_hint">Zoeken naar berichten op grootte werkt mogelijk niet op sommige servers als er een groot aantal berichten is</string>
     <string name="title_search_more">Meer opties</string>
@@ -1063,8 +1063,8 @@
     <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_size">Berichtgrootte groter dan</string>
-    <string name="title_search_in_trash" comment="title_search_in_trash&#10;Title for option to enable/disable searching in the trash folder&#10;">In prullenbak</string>
-    <string name="title_search_in_junk" comment="title_search_in_junk&#10;Title for option to enable/disable searching in the spam folder&#10;">In spam</string>
+    <string name="title_search_in_trash">In prullenbak</string>
+    <string name="title_search_in_junk">In spam</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>
diff --git a/app/src/main/res/values-nn-rNO/strings.xml b/app/src/main/res/values-nn-rNO/strings.xml
index 669cd72b2a..4fcddd3cbb 100644
--- a/app/src/main/res/values-nn-rNO/strings.xml
+++ b/app/src/main/res/values-nn-rNO/strings.xml
@@ -898,10 +898,6 @@
     <string name="title_signature_store">Lagre</string>
     <string name="title_search">Søk</string>
     <string name="title_search_for_hint">Skriv inn tekst</string>
-    <string name="title_search_hint">        Søk vil først gå gjennom meldinger som er lagret på enheten din.
-        For å søke på tjeneren i tillegg, trykk på \'Søk igjen\'.
-    </string>
-    <string name="title_search_index_hint">Søk via søkeindeksen er raskt, men finner bare hele ord</string>
     <string name="title_search_text_hint">Søk etter tekst i meldinger, når det er et stort antall meldinger, vil kanskje ikke fungere på noen tjenere</string>
     <string name="title_search_size_hint">Søk på meldinger etter størrelse, når det er et stort antall meldinger, vil kanskje ikke fungere på noen tjenere</string>
     <string name="title_search_more">Flere alternativer</string>
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index bc5d295a6c..11bbf61315 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -898,10 +898,6 @@
     <string name="title_signature_store">Lagre</string>
     <string name="title_search">Søk</string>
     <string name="title_search_for_hint">Skriv inn tekst</string>
-    <string name="title_search_hint">        Søk vil først gå gjennom meldinger som er lagret på enheten din.
-        For å søke på tjeneren i tillegg, trykk på \'Søk igjen\'.
-    </string>
-    <string name="title_search_index_hint">Søk via søkeindeksen er raskt, men finner bare hele ord</string>
     <string name="title_search_text_hint">Søk etter tekst i meldinger, når det er et stort antall meldinger, vil kanskje ikke fungere på noen tjenere</string>
     <string name="title_search_size_hint">Søk på meldinger etter størrelse, når det er et stort antall meldinger, vil kanskje ikke fungere på noen tjenere</string>
     <string name="title_search_more">Flere alternativer</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 314398a59c..1476e09e1e 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -1061,10 +1061,6 @@
     <string name="title_signature_store">Zachowaj</string>
     <string name="title_search">Szukaj</string>
     <string name="title_search_for_hint">Wprowadź tekst</string>
-    <string name="title_search_hint">        Wyszukiwanie początkowo obejmie wiadomości zapisane na Twoim urządzeniu.
-        Aby wyszukiwanie objęło również serwer, dotknij przycisku \'Szukaj ponownie\'.
-    </string>
-    <string name="title_search_index_hint">Wyszukiwanie za pomocą indeksu wyszukiwania jest szybkie, ale znajdzie tylko całe słowa</string>
     <string name="title_search_text_hint">Wyszukiwanie tekstu w wiadomościach może nie działać na niektórych serwerach, gdy istnieje duża liczba wiadomości</string>
     <string name="title_search_size_hint">Wyszukiwanie wiadomości według rozmiaru może nie działać na niektórych serwerach, gdy istnieje duża liczba wiadomości</string>
     <string name="title_search_more">Więcej opcji</string>
@@ -1082,8 +1078,8 @@
     <string name="title_search_with_encrypted">Zaszyfrowane (tylko na urządzeniu)</string>
     <string name="title_search_with_attachments">Z załącznikami (tylko na urządzeniu)</string>
     <string name="title_search_with_size">Rozmiar wiadomości większy niż</string>
-    <string name="title_search_in_trash" comment="title_search_in_trash&#10;Title for option to enable/disable searching in the trash folder&#10;">W folderze Kosz</string>
-    <string name="title_search_in_junk" comment="title_search_in_junk&#10;Title for option to enable/disable searching in the spam folder&#10;">W folderze Spam</string>
+    <string name="title_search_in_trash">W folderze Kosz</string>
+    <string name="title_search_in_junk">W folderze Spam</string>
     <string name="title_search_with_before">Przed</string>
     <string name="title_search_with_after">Po</string>
     <string name="title_search_flag_unseen">nieprzeczytane</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index d71f28c0a8..a9b9f9c691 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1010,10 +1010,6 @@
     <string name="title_signature_store">Loja</string>
     <string name="title_search">Pesquisar</string>
     <string name="title_search_for_hint">Digite o texto</string>
-    <string name="title_search_hint">        A pesquisa procurará inicialmente as mensagens salvas no seu dispositivo.
-        Para pesquisar também no servidor, clique no botão \'buscar novamente\'.
-    </string>
-    <string name="title_search_index_hint">Pesquisar no indexador de pesquisa é mais rápido, mas só serão encontradas palavras inteiras</string>
     <string name="title_search_text_hint">Pesquisar por textos em mensagens, quando há um grande número delas, pode não funcionar em alguns servidores</string>
     <string name="title_search_size_hint">Pesquisar por mensagens pelo tamanho, quando há um grande número delas, pode não funcionar em alguns servidores</string>
     <string name="title_search_more">Mais opções</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 474f1d25de..79fe340e4a 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -1051,10 +1051,6 @@
     <string name="title_signature_store">Stocare</string>
     <string name="title_search">Caută</string>
     <string name="title_search_for_hint">Introduceți textul</string>
-    <string name="title_search_hint">        Căutarea se va face inițial în mesajele stocate pe dispozitivul dumneavoastră.
-        Pentru a căuta și pe server apăsați butonul \'căutare din nou\'.
-    </string>
-    <string name="title_search_index_hint">Căutarea prin indexul de căutare este rapidă, dar va găsi doar cuvinte întregi</string>
     <string name="title_search_text_hint">Se caută text în mesaje, atunci când există un număr mare de mesaje, s-ar putea să nu funcționeze pe unele servere</string>
     <string name="title_search_size_hint">Căutarea mesajelor după mărime, când există un număr mare de mesaje, s-ar putea să nu funcționeze pe unele servere</string>
     <string name="title_search_more">Mai multe opțiuni</string>
@@ -1072,8 +1068,8 @@
     <string name="title_search_with_encrypted">Criptat (doar pe dispozitiv)</string>
     <string name="title_search_with_attachments">Cu atașamente (doar pe dispozitiv)</string>
     <string name="title_search_with_size">Dimensiune mesaj mai mare decât</string>
-    <string name="title_search_in_trash" comment="title_search_in_trash&#10;Title for option to enable/disable searching in the trash folder&#10;">În coșul de gunoi</string>
-    <string name="title_search_in_junk" comment="title_search_in_junk&#10;Title for option to enable/disable searching in the spam folder&#10;">În spam</string>
+    <string name="title_search_in_trash">În coșul de gunoi</string>
+    <string name="title_search_in_junk">În spam</string>
     <string name="title_search_with_before">Înainte de</string>
     <string name="title_search_with_after">După</string>
     <string name="title_search_flag_unseen">necitit</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index b1c628653b..b66225cba5 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -1062,10 +1062,6 @@
     <string name="title_signature_store">Хранилище</string>
     <string name="title_search">Поиск</string>
     <string name="title_search_for_hint">Введите текст</string>
-    <string name="title_search_hint">        Поиск изначально ищет сообщения, хранящиеся на вашем устройстве.
-        Чтобы также выполнить поиск на сервере, нажмите кнопку \"Новый поиск\".
-    </string>
-    <string name="title_search_index_hint">Индексированный поиск быстрый, но ищет только целые слова</string>
     <string name="title_search_text_hint">Поиск содержащих определённый текст сообщений при большом их количестве может не работать на некоторых серверах</string>
     <string name="title_search_size_hint">Поиск сообщений по размеру при большом их количестве может не работать на некоторых серверах</string>
     <string name="title_search_more">Дополнительные параметры</string>
@@ -1083,8 +1079,8 @@
     <string name="title_search_with_encrypted">Зашифровано (только на устройстве)</string>
     <string name="title_search_with_attachments">С вложениями (только на устройстве)</string>
     <string name="title_search_with_size">Размер сообщения больше</string>
-    <string name="title_search_in_trash" comment="title_search_in_trash&#10;Title for option to enable/disable searching in the trash folder&#10;">В корзине</string>
-    <string name="title_search_in_junk" comment="title_search_in_junk&#10;Title for option to enable/disable searching in the spam folder&#10;">В спаме</string>
+    <string name="title_search_in_trash">В корзине</string>
+    <string name="title_search_in_junk">В спаме</string>
     <string name="title_search_with_before">Перед</string>
     <string name="title_search_with_after">После</string>
     <string name="title_search_flag_unseen">не прочитано</string>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index 40969d9df6..1ed4f84db8 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -1058,10 +1058,6 @@ Nastavenie vždy toto kompenzuje neustálym sledovaním zmien.</string>
     <string name="title_signature_store">Uložiť</string>
     <string name="title_search">Hľadať</string>
     <string name="title_search_for_hint">Zadajte text</string>
-    <string name="title_search_hint">        Vyhľadávanie začne prehľadávaním správ vo vašom zariadení.
-        Ak chcete prehľadať aj správy uložené na servery, klepnite na tlačidlo \'Hľadať znovu\'.
-    </string>
-    <string name="title_search_index_hint">Prehľadávanie indexu vyhľadávania je veľmi rýchle, ale hľadanie je obmedzené na celé slová</string>
     <string name="title_search_text_hint">Vyhľadávanie v tele správy nemusí na všetkých serveroch fungovať správne, hlavne ak je na servery uložených veľa správ</string>
     <string name="title_search_size_hint">Hľadanie správ podľa veľkosti nemusí správne fungovať na niektorých serveroch, hlavne ak je na servery uložených veľa správ</string>
     <string name="title_search_more">Ďalšie možnosti</string>
@@ -1079,8 +1075,8 @@ Nastavenie vždy toto kompenzuje neustálym sledovaním zmien.</string>
     <string name="title_search_with_encrypted">Zašifrované (len na tomto zariadení)</string>
     <string name="title_search_with_attachments">S prílohamy (len na tomto zariadení)</string>
     <string name="title_search_with_size">Veľkosť správy väčšia než</string>
-    <string name="title_search_in_trash" comment="title_search_in_trash&#10;Title for option to enable/disable searching in the trash folder&#10;">V odstránených</string>
-    <string name="title_search_in_junk" comment="title_search_in_junk&#10;Title for option to enable/disable searching in the spam folder&#10;">V nevyžiadaných</string>
+    <string name="title_search_in_trash">V odstránených</string>
+    <string name="title_search_in_junk">V nevyžiadaných</string>
     <string name="title_search_with_before">Pred</string>
     <string name="title_search_with_after">Po</string>
     <string name="title_search_flag_unseen">neprečítané</string>
diff --git a/app/src/main/res/values-sl-rSI/strings.xml b/app/src/main/res/values-sl-rSI/strings.xml
index 24eede5e49..418b22fe82 100644
--- a/app/src/main/res/values-sl-rSI/strings.xml
+++ b/app/src/main/res/values-sl-rSI/strings.xml
@@ -728,10 +728,6 @@
     <string name="title_signature_store">Shramba</string>
     <string name="title_search">Išči</string>
     <string name="title_search_for_hint">Vnesite besedilo</string>
-    <string name="title_search_hint">        Iskanje bo na začetku iskalo po sporočilih, shranjenih na vaši napravi.
-        Če želite iskati tudi na strežniku, se dotaknite gumba \'Ponovno išči\'.
-    </string>
-    <string name="title_search_index_hint">Iskanje preko kazala je hitro, vendar pa bo našlo samo cele besede.</string>
     <string name="title_search_more">Več možnosti</string>
     <string name="title_search_use_index">Uporabi iskalno kazalo</string>
     <string name="title_search_in_senders">Med pošiljatelji (Od)</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 4818b0814e..d97aee45f2 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -1008,10 +1008,6 @@
     <string name="title_signature_store">Spara</string>
     <string name="title_search">Sök</string>
     <string name="title_search_for_hint">Ange text</string>
-    <string name="title_search_hint">        Sökning kommer initialt att titta på meddelanden som lagras på din enhet.
-        För att söka på servern också, tryck på knappen \"Sök igen\".
-    </string>
-    <string name="title_search_index_hint">Sökning via index är snabbt, men kommer bara att hitta hela ord</string>
     <string name="title_search_text_hint">Sökning efter text i meddelanden, när det finns ett stort antal meddelanden, kanske inte fungerar på vissa servrar</string>
     <string name="title_search_size_hint">Sökning efter meddelanden efter storlek, när det finns ett stort antal meddelanden, kanske inte fungerar på vissa servrar</string>
     <string name="title_search_more">Fler alternativ</string>
diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml
index c56f7eea88..3a488e0d26 100644
--- a/app/src/main/res/values-uk-rUA/strings.xml
+++ b/app/src/main/res/values-uk-rUA/strings.xml
@@ -1049,10 +1049,6 @@
     <string name="title_signature_store">Збереження</string>
     <string name="title_search">Пошук</string>
     <string name="title_search_for_hint">Введіть текст</string>
-    <string name="title_search_hint">        Пошук з початку дивиться на повідомлення, збережені на пристрої.
-        Для пошуку також і на сервері, натисніть на кнопку \'Шукати знову\'.
-    </string>
-    <string name="title_search_index_hint">Пошук за допомогою індексу пошуку швидкий, але знайде лише цілі слова</string>
     <string name="title_search_text_hint">Пошук тексту в повідомленнях, при великій кількості повідомлень, може не працювати на деяких серверах</string>
     <string name="title_search_size_hint">Пошук повідомлень за розміром, при великій кількості повідомлень, може не працювати на деяких серверах</string>
     <string name="title_search_more">Більше опцій</string>
@@ -1070,8 +1066,8 @@
     <string name="title_search_with_encrypted">Зашифровані (лише на пристрої)</string>
     <string name="title_search_with_attachments">З вкладеннями (лише на пристрої)</string>
     <string name="title_search_with_size">Розмір повідомлення більше ніж</string>
-    <string name="title_search_in_trash" comment="title_search_in_trash&#10;Title for option to enable/disable searching in the trash folder&#10;">В корзині</string>
-    <string name="title_search_in_junk" comment="title_search_in_junk&#10;Title for option to enable/disable searching in the spam folder&#10;">У спамі</string>
+    <string name="title_search_in_trash">В корзині</string>
+    <string name="title_search_in_junk">У спамі</string>
     <string name="title_search_with_before">До</string>
     <string name="title_search_with_after">Після</string>
     <string name="title_search_flag_unseen">непрочитане</string>
diff --git a/app/src/main/res/values-vi-rVN/strings.xml b/app/src/main/res/values-vi-rVN/strings.xml
index 56f3f26c75..a1e8044887 100644
--- a/app/src/main/res/values-vi-rVN/strings.xml
+++ b/app/src/main/res/values-vi-rVN/strings.xml
@@ -1031,10 +1031,6 @@
     <string name="title_signature_store">Lưu trữ</string>
     <string name="title_search">Tìm kiếm</string>
     <string name="title_search_for_hint">Nhập văn bản</string>
-    <string name="title_search_hint">        Ban đầu, việc tìm kiếm sẽ tìm các thư được lưu trữ trên thiết bị của bạn.
-        Để cũng tìm kiếm máy chủ, nhấn vào nút \'tìm kiếm lại\'.
-    </string>
-    <string name="title_search_index_hint">Việc tìm kiếm qua mục lục tìm kiếm rất nhanh, nhưng sẽ chỉ tìm các từ toàn thể</string>
     <string name="title_search_text_hint">Việc tìm kiếm văn bản trong thư khi có nhiều thư có thể không được trên một số máy chủ</string>
     <string name="title_search_size_hint">Việc tìm kiếm thư theo kích cỡ khi có nhiều thư có thể không được trên một số máy chủ</string>
     <string name="title_search_more">Thêm tuỳ chọn</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 57225904fa..44218a8eed 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1031,10 +1031,6 @@
     <string name="title_signature_store">保存</string>
     <string name="title_search">搜索</string>
     <string name="title_search_for_hint">输入搜索内容</string>
-    <string name="title_search_hint">        搜索将首先查看存储在您的设备上的消息
-        若也要搜索服务器上的内容，请点击“再次搜索”按钮
-    </string>
-    <string name="title_search_index_hint">通过搜索索引搜索很快，但只能找到整个单词</string>
     <string name="title_search_text_hint">当消息数量很多时，在消息中搜索文本可能无法在某些服务器上正常运作</string>
     <string name="title_search_size_hint">消息数量很多时，通过大小搜索消息可能在某些服务器上无法正常运作</string>
     <string name="title_search_more">更多选项</string>
@@ -1052,8 +1048,8 @@
     <string name="title_search_with_encrypted">加密邮件 (仅设备)</string>
     <string name="title_search_with_attachments">带附件的邮件 (仅设备)</string>
     <string name="title_search_with_size">消息大小大于</string>
-    <string name="title_search_in_trash" comment="title_search_in_trash&#10;Title for option to enable/disable searching in the trash folder&#10;">在回收站</string>
-    <string name="title_search_in_junk" comment="title_search_in_junk&#10;Title for option to enable/disable searching in the spam folder&#10;">在垃圾邮件箱</string>
+    <string name="title_search_in_trash">在回收站</string>
+    <string name="title_search_in_junk">在垃圾邮件箱</string>
     <string name="title_search_with_before">早于</string>
     <string name="title_search_with_after">晚于</string>
     <string name="title_search_flag_unseen">未读</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index cfd498868b..a683066437 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -933,9 +933,6 @@
     <string name="title_signature_store">商店</string>
     <string name="title_search">搜尋</string>
     <string name="title_search_for_hint">輸入文字</string>
-    <string name="title_search_hint">        搜尋將先查詢儲存在裝置上的訊息。
-         如需搜尋伺服器，請點擊 “再次搜尋” 按鈕。    </string>
-    <string name="title_search_index_hint">通過搜尋索引進行搜尋的速度很快，但只會找到整個單詞</string>
     <string name="title_search_text_hint">當郵件數量很多時，在郵件中搜尋內文可能無法在某些伺服器上進行</string>
     <string name="title_search_size_hint">當郵件數量很多時，按大小搜尋郵件可能在某些伺服器上不起作用</string>
     <string name="title_search_more">更多選項</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 81c6e0b35f..ff1d410639 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1189,10 +1189,13 @@
     <string name="title_search">Search</string>
     <string name="title_search_for_hint">Enter text</string>
     <string name="title_search_hint">
-        Searching will initially look at messages stored on your device.
-        To search the server too, tap on the \'search again\' button.
+        Initially, the search is performed on the device.
+        To search the server too, tap the \'search again\' button.
+    </string>
+    <string name="title_search_index_hint">
+        Searching via the search index is fast, but only finds whole words.
+        The options below are to continue searching the email server.
     </string>
-    <string name="title_search_index_hint">Searching via the search index is fast, but will only find whole words</string>
     <string name="title_search_text_hint">Searching for text in messages, when there are a large number of messages, might not work on some servers</string>
     <string name="title_search_size_hint">Searching for messages by size, when there are a large number of messages, might not work on some servers</string>
     <string name="title_search_more">More options</string>
diff --git a/docs/FAQ-es-rES.md b/docs/FAQ-es-rES.md
index 44d73ba08b..dee9fa7245 100644
--- a/docs/FAQ-es-rES.md
+++ b/docs/FAQ-es-rES.md
@@ -342,29 +342,29 @@ FairEmail mantendrá una lista de direcciones de las que recibe y a las que env
 
 Una notificación permanente de baja prioridad con el número de cuentas monitoreadas y el número de operaciones pendientes (ver la siguiente pregunta) se muestra para evitar que Android mate el servicio que se encarga de recibir correo electrónico continuamente. Esto [ya era necesario](https://developer.android.com/reference/android/app/Service.html#startForeground(int,%20android.app.Notification)), pero con la introducción de [modo doze](https://developer.android.com/training/monitoring-device-state/doze-standby) en Android 6 Marshmallow esto es más necesario que nunca. El modo Doze detendrá todas las aplicaciones cuando la pantalla esté apagada por algún tiempo a menos que la aplicación inicie un servicio de primer plano, lo que requiere mostrar una notificación en la barra de estado.
 
-Most, if not all, other email apps don't show a notification with the "side effect" that new messages are often not or late being reported and that messages are not or late being sent.
+La mayoría, si no todas, de las demás aplicaciones de correo no muestran una notificación con el "efecto secundario" de que los mensajes nuevos a menudo no son reportados o lo hacen en forma tardía y lo mismo ocurre con los envíos.
 
-Android shows icons of high priority status bar notifications first and will hide the icon of FairEmail's notification if there is no space to show icons anymore. In practice this means that the status bar notification doesn't take space in the status bar, unless there is space available.
+Android muestra primero los iconos de las notificaciones de la barra de estado de alta prioridad y ocultará el icono de la notificación de FairEmail si ya no hay espacio para mostrar los iconos. En la práctica esto significa que la notificación de la barra de estado no ocupa espacio en la barra de estado, a menos que haya espacio disponible.
 
-The status bar notification can be disabled via the notification settings of FairEmail:
+La notificación de la barra de estado se puede desactivar a través de la configuración de notificación de FairEmail:
 
 * Android 8 Oreo y posteriores: toque el botón *Canal de recepción* y desactive el canal a través de la configuración de Android (esto no deshabilitará las notificaciones de nuevos mensajes)
 * Android 7 Nougat y antes: habilite *Usa el servicio de segundo plano para sincronizar mensajes*, pero asegúrese de leer el comentario debajo de la configuración
 
-You can switch to periodically synchronization of messages in the receive settings to remove the notification, but be aware that this might use more battery power. See [here](#user-content-faq39) for more details about battery usage.
+Puede cambiar a sincronización periódica de mensajes en la configuración de recepción para eliminar la notificación, pero tenga en cuenta que esto podría aumentar el uso de batería. Vea [aquí](#user-content-faq39) para más detalles sobre el uso de la batería.
 
-Android 8 Oreo might also show a status bar notification with the text *Apps are running in the background*. Please see [here](https://www.reddit.com/r/Android/comments/7vw7l4/psa_turn_off_background_apps_notification/) about how you can disable this notification.
+Android 8 Oreo también podría mostrar una notificación de barra de estado con el texto *Las aplicaciones se están ejecutando en segundo plano*. Por favor, consulte [aquí](https://www.reddit.com/r/Android/comments/7vw7l4/psa_turn_off_background_apps_notification/) sobre cómo puede desactivar esta notificación.
 
-Some people suggested to use [Firebase Cloud Messaging](https://firebase.google.com/docs/cloud-messaging/) (FCM) instead of an Android service with a status bar notification, but this would require email providers to send FCM messages or a central server where all messages are collected sending FCM messages. The first is not going to happen and the last would have significant privacy implications.
+Algunas personas sugirieron usar [Firebase Cloud Messaging](https://firebase.google.com/docs/cloud-messaging/) (FCM) en lugar de un servicio Android con una notificación en la barra de estado, pero esto requeriría que los proveedores de correo enviaran mensajes FCM o un servidor central donde todos los mensajes sean recogidos enviando mensajes FCM. La primera no va a suceder y la última tendría importantes implicaciones en materia de privacidad.
 
-If you came here by clicking on the notification, you should know that the next click will open the unified inbox.
+Si vino aquí haciendo clic en la notificación, debe saber que el siguiente clic abrirá la bandeja de entrada unificada.
 
 <br />
 
 <a name="faq3"></a>
-**(3) What are operations and why are they pending?**
+**(3) ¿Qué son las operaciones y por qué están pendientes?**
 
-The low priority status bar notification shows the number of pending operations, which can be:
+La notificación de la barra de estado de baja prioridad muestra el número de operaciones pendientes, que pueden ser:
 
 * *añadir*: añadir mensaje a la carpeta remota
 * *mover*: mover mensaje a otra carpeta remota
@@ -386,20 +386,20 @@ The low priority status bar notification shows the number of pending operations,
 * *enviar*: enviar mensaje
 * *existe*: comprueba si el mensaje existe
 * *regla*: ejecutar regla en el cuerpo del texto
-* *expunge*: permanently delete messages
+* *eliminar*: borrar mensajes permanentemente
 
-Operations are processed only when there is a connection to the email server or when manually synchronizing. See also [this FAQ](#user-content-faq16).
+Las operaciones sólo se procesan cuando hay una conexión al servidor de correo electrónico o cuando se sincroniza manualmente. Vea también [estas Preguntas Frecuentes](#user-content-faq16).
 
 <br />
 
 <a name="faq4"></a>
-**(4) How can I use an invalid security certificate / empty password / plain text connection?**
+**(4) ¿Cómo puedo utilizar un certificado de seguridad inválido / contraseña vacía / conexión de texto plano?**
 
-*... Untrusted ... not in certificate ...*
+*... No confiable ... no en el certificado ...*
 <br />
-*... Invalid security certificate (Can't verify identity of server) ...*
+*... Certificado de seguridad inválido (no se puede verificar la identidad del servidor) ...*
 
-This can be caused by using an incorrect host name, so first double check the host name in the advanced identity/account settings (tap Manual setup). Please see the documentation of the email provider about the right host name.
+Esto puede ser causado por el uso de un nombre de host incorrecto, así que primero compruebe el nombre de host en la configuración avanzada de la identidad/cuenta (pulse Configuración manual). Please see the documentation of the email provider about the right host name.
 
 You should try to fix this by contacting your provider or by getting a valid security certificate because invalid security certificates are insecure and allow [man-in-the-middle attacks](https://en.wikipedia.org/wiki/Man-in-the-middle_attack). If money is an obstacle, you can get free security certificates from [Let’s Encrypt](https://letsencrypt.org).