1 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/HighlightQueryCursorAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/HighlightQueryCursorAdapter.java
index fd7a2dc30..4a37a9a3a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/HighlightQueryCursorAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/HighlightQueryCursorAdapter.java
@@ -49,9 +49,9 @@ public abstract class HighlightQueryCursorAdapter extends CursorAdapter {
         Spannable highlight = Spannable.Factory.getInstance().newSpannable(text);
 
         if (mCurQuery != null) {
-            Pattern pattern = Pattern.compile("(?i)" + mCurQuery);
+            Pattern pattern = Pattern.compile("(?i)(" + mCurQuery.trim().replaceAll("\\s+", "|") + ")");
             Matcher matcher = pattern.matcher(text);
-            if (matcher.find()) {
+            while (matcher.find()) {
                 highlight.setSpan(
                         new ForegroundColorSpan(mContext.getResources().getColor(R.color.emphasis)),
                         matcher.start(),