diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index abc57d7c9..d6932e130 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -181,10 +181,6 @@
             android:label="@string/app_name"
             android:name="com.android.email2.ui.MailActivityEmail"
             android:uiOptions="splitActionBarWhenNarrow">
-            <intent-filter >
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -198,6 +194,17 @@
             <meta-data android:name="android.app.searchable" android:resource="@xml/searchable" />
         </activity>
 
+        <activity-alias android:name="com.android.email.activity.Welcome"
+            android:targetActivity="com.android.email2.ui.MailActivityEmail"
+            android:label="@string/app_name" >
+            <intent-filter >
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.APP_EMAIL" />
+            </intent-filter>
+        </activity-alias>
+
         <activity
             android:name=".provider.FolderPickerActivity"
             android:label="@string/folder_picker_title"