diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 414dd7a1a..383b77752 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -80,7 +80,7 @@
         android:name=".EmailApplication"
         android:icon="@mipmap/ic_launcher_mail"
         android:label="@string/app_name"
-        android:requiredAccountType="com.android.exchange,com.android.email"
+        android:requiredAccountType="com.android.exchange,com.android.email.imap,com.android.email.pop3,com.android.email.legacy.imap"
         android:theme="@style/UnifiedEmailTheme"
         android:hardwareAccelerated="true"
         android:allowBackup="false"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2f39425a4..75753720a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -645,9 +645,9 @@
     <string name="email_feedback_uri" translatable="false"></string>
 
     <string name="account_manager_type_exchange" translatable="false">com.android.exchange</string>
-    <string name="account_manager_type_pop3" translatable="false">com.android.email</string>
-    <string name="account_manager_type_imap" translatable="false">com.android.email</string>
-    <string name="account_manager_type_legacy_imap" translatable="false">com.android.email</string>
+    <string name="account_manager_type_pop3" translatable="false">com.android.email.pop3</string>
+    <string name="account_manager_type_imap" translatable="false">com.android.email.imap</string>
+    <string name="account_manager_type_legacy_imap" translatable="false">com.android.email.legacy.imap</string>
     <string name="intent_exchange_action" translatable="false">com.android.email.EXCHANGE_INTENT</string>
     <string name="intent_exchange_cert_action" translatable="false">com.android.email.EXCHANGE_REQUEST_CERT</string>
     <string name="intent_exchange_package" translatable="false">com.android.exchange</string>
diff --git a/res/xml/services.xml b/res/xml/services.xml
index 6059a6218..d3e381af2 100644
--- a/res/xml/services.xml
+++ b/res/xml/services.xml
@@ -70,7 +70,7 @@
     <emailservice
         email:protocol="imap"
         email:name="@string/imap_name"
-        email:accountType="@string/account_manager_type_imap"
+        email:accountType="@string/account_manager_type_legacy_imap"
         email:serviceClass="com.android.email.service.ImapService"
         email:port="143"
         email:portSsl="993"