diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b26a06777..d8fcb27a1 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -264,6 +264,16 @@
                 <action
                     android:name="com.android.email.intent.action.REPLY" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category
+                    android:name="android.intent.category.DEFAULT" />
+                <data
+                    android:scheme="content"
+                    android:host="ui.email.android.com"
+                    android:pathPrefix="/compose"
+                    />
+            </intent-filter>
         </activity>
 
         <!-- Only used to support pre-HC shortcuts -->
diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java
index 36f9535cb..d03aa82fc 100644
--- a/src/com/android/email/provider/EmailProvider.java
+++ b/src/com/android/email/provider/EmailProvider.java
@@ -2107,11 +2107,11 @@ outer:
             AccountCapabilities.SMART_REPLY |
             AccountCapabilities.UNDO;
 
-    private static final Uri BASE_SETTINGS_URI =
-            Uri.parse("content://ui.email.android.com/settings");
+    private static final Uri BASE_EXTERNAL_URI = Uri.parse("content://ui.email.android.com");
 
-    private static Uri getAccountSettingUri(String account) {
-        return BASE_SETTINGS_URI.buildUpon().appendQueryParameter("account", account).build();
+    private static String getExternalUriString(String segment, String account) {
+        return BASE_EXTERNAL_URI.buildUpon().appendPath(segment)
+                .appendQueryParameter("account", account).build().toString();
     }
 
     /**
@@ -2147,8 +2147,10 @@ outer:
             }
         }
         values.put(UIProvider.AccountColumns.SETTINGS_INTENT_URI,
-                getAccountSettingUri(id).toString());
+                getExternalUriString("settings", id));
         StringBuilder sb = genSelect(sAccountListMap, uiProjection, values);
+        values.put(UIProvider.AccountColumns.COMPOSE_URI,
+                getExternalUriString("compose", id));
         sb.append(" FROM " + Account.TABLE_NAME + " WHERE " + AccountColumns.ID + "=?");
         return sb.toString();
     }