diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 68f2c12ef..2d75c1633 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -398,7 +398,7 @@ public class MessageList extends K9Activity implements MessageListFragmentListen
             // check if this intent comes from the system search ( remote )
             if (Intent.ACTION_SEARCH.equals(intent.getAction())) {
                 //Query was received from Search Dialog
-                String query = intent.getStringExtra(SearchManager.QUERY);
+                String query = intent.getStringExtra(SearchManager.QUERY).trim();
 
                 mSearch = new LocalSearch(getString(R.string.search_results));
                 mSearch.setManualSearch(true);