diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7276e00ae..aac53db80 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -28,7 +28,7 @@
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:name="K9"
         >
         <meta-data android:name="android.app.default_searchable"
-                   android:value=".Search" />
+                   android:value=".activity.Search" />
 
         <activity
             android:name="com.fsck.k9.activity.Accounts"
@@ -187,7 +187,7 @@
             </intent-filter>
         </activity>
         <!-- Search Activity - searchable -->
-        <activity android:name="Search"
+        <activity android:name="com.fsck.k9.activity.Search"
                   android:label="@string/search_action"
                   android:launchMode="singleTop">
             <intent-filter>
diff --git a/src/com/fsck/k9/activity/Search.java b/src/com/fsck/k9/activity/Search.java
new file mode 100644
index 000000000..ec52bfb06
--- /dev/null
+++ b/src/com/fsck/k9/activity/Search.java
@@ -0,0 +1,8 @@
+package com.fsck.k9.activity;
+import com.fsck.k9.activity.MessageList;
+
+
+public class Search extends MessageList
+{
+
+};