diff --git a/res/menu/message_list_option.xml b/res/menu/message_list_option.xml
index 106dfab5a..4fef1630c 100644
--- a/res/menu/message_list_option.xml
+++ b/res/menu/message_list_option.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
+    <item
+        android:id="@+id/search"
+        android:icon="?attr/iconActionSearch"
+        android:showAsAction="always"
+        android:title="@string/search_action"/>
     <item
         android:id="@+id/search_remote"
         android:icon="?attr/iconActionRemoteSearch"
diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 8862314e9..49211c2c1 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -464,6 +464,10 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
                 onEditPrefs();
                 return true;
             }
+            case R.id.search: {
+                mMessageListFragment.onSearchRequested();
+                return true;
+            }
             case R.id.search_remote: {
                 mMessageListFragment.onRemoteSearch();
                 return true;
@@ -519,6 +523,7 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
             return;
         }
 
+        menu.findItem(R.id.search).setVisible(false);
         menu.findItem(R.id.search_remote).setVisible(false);
 
         if (mMessageListFragment == null) {
@@ -548,6 +553,7 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
                 }
 
             } else {
+                menu.findItem(R.id.search).setVisible(true);
                 menu.findItem(R.id.folder_settings).setVisible(true);
                 menu.findItem(R.id.account_settings).setVisible(true);
 
@@ -669,7 +675,7 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
         MessageListFragment fragment = MessageListFragment.newInstance("From " + senderAddress,
                 null, null, senderAddress, null, null, false);
 
-        addMessageListFragment(fragment);
+        addMessageListFragment(fragment, true);
     }
 
     @Override
@@ -714,19 +720,19 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
         }
     }
 
-    @Override
     public void remoteSearch(String searchAccount, String searchFolder, String queryString) {
         MessageListFragment fragment = MessageListFragment.newInstance(searchAccount, searchFolder,
                 queryString, true);
-
-        addMessageListFragment(fragment);
+        mMenu.findItem(R.id.search_remote).setVisible(false);
+        addMessageListFragment(fragment, false);
     }
 
-    private void addMessageListFragment(MessageListFragment fragment) {
+    private void addMessageListFragment(MessageListFragment fragment, boolean addToBackStack) {
         FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
 
         ft.replace(R.id.message_list_container, fragment);
-        ft.addToBackStack(null);
+        if (addToBackStack)
+            ft.addToBackStack(null);
 
         mMessageListFragment = fragment;
         ft.commit();