diff --git a/k9mail/src/main/java/com/fsck/k9/activity/FolderList.java b/k9mail/src/main/java/com/fsck/k9/activity/FolderList.java
index e1726444c..bd6aa8092 100644
--- a/k9mail/src/main/java/com/fsck/k9/activity/FolderList.java
+++ b/k9mail/src/main/java/com/fsck/k9/activity/FolderList.java
@@ -1166,8 +1166,8 @@ public class FolderList extends K9ListActivity {
                         }
                         final String valueText = value.displayName.toLowerCase(locale);
 
-                        for (String word : words) {
-                            if (valueText.contains(word)) {
+                        for (int k = 0; k < wordCount; k++) {
+                            if (valueText.contains(words[k])) {
                                 newValues.add(value);
                                 break;
                             }