diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index 8f8c5471df..b0642c644b 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -924,8 +924,8 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
             if (with_size != null)
                 flags.add(context.getString(R.string.title_search_flag_size,
                         Helper.humanReadableByteCount(with_size)));
-            return (query == null ? "" : query)
-                    + (flags.size() > 0 ? " +" : "")
+            return (query == null ? "" : query + " ")
+                    + (flags.size() > 0 ? "+" : "")
                     + TextUtils.join(",", flags);
         }
 
diff --git a/app/src/main/res/layout/dialog_save_search.xml b/app/src/main/res/layout/dialog_save_search.xml
index 10122e7c2f..d1faee37a3 100644
--- a/app/src/main/res/layout/dialog_save_search.xml
+++ b/app/src/main/res/layout/dialog_save_search.xml
@@ -23,7 +23,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="24dp"
         android:imeOptions="actionDone"
-        android:inputType="textPersonName|textCapWords"
+        android:inputType="textCapSentences"
         android:text="Name"
         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
         app:layout_constraintEnd_toEndOf="parent"