diff --git a/email2/AndroidManifest.xml b/email2/AndroidManifest.xml
index 29f4c5619..27f8bb620 100644
--- a/email2/AndroidManifest.xml
+++ b/email2/AndroidManifest.xml
@@ -249,6 +249,13 @@
             <grant-uri-permission android:pathPattern=".*" />
         </provider>
 
+        <!-- The android:name is the name of the Provider class which is stored in
+          UnifiedEmail, and has package name com.android.mail.providers and the class is
+          called SuggestionsProvider. It declares an authority which looks up package name
+          at runtime with getContext().getPackageName() and adds ".SuggestionsProvider" to it. -->
+        <provider android:name="com.android.mail.providers.SuggestionsProvider"
+            android:authorities="com.android.email.SuggestionsProvider" />
+
         <receiver android:name="com.android.mail.providers.protos.boot.AccountReceiver">
           <intent-filter>
               <action android:name="com.android.email2.providers.protos.boot.intent.ACTION_PROVIDER_CREATED" />
diff --git a/email2/res/xml/searchable.xml b/email2/res/xml/searchable.xml
index 66a07c272..3fe25a854 100644
--- a/email2/res/xml/searchable.xml
+++ b/email2/res/xml/searchable.xml
@@ -19,6 +19,7 @@
     android:label="@string/search_title"
     android:hint="@string/search_hint"
     android:icon="@drawable/ic_menu_search_holo_light"
+    android:searchSuggestAuthority="com.android.email.SuggestionsProvider"
+    android:searchSuggestSelection="query LIKE ?"
     android:searchSuggestIntentAction="android.intent.action.SEARCH"
-    android:imeOptions="actionSearch"
-    android:searchSuggestSelection="query LIKE ?" />
+    android:imeOptions="actionSearch" />