diff --git a/app/src/main/java/eu/faircode/email/FragmentOptions.java b/app/src/main/java/eu/faircode/email/FragmentOptions.java
index 57d18acc77..3030bff0de 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptions.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptions.java
@@ -342,6 +342,8 @@ public class FragmentOptions extends FragmentBase {
 
             @Override
             public boolean onQueryTextChange(String newText) {
+                if (newText != null)
+                    newText = newText.trim();
                 searching = newText;
                 suggest(newText);
                 return false;