diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 51176fb87..331f4528d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -76,9 +76,7 @@
         <activity
             android:name="com.android.mail.compose.ComposeActivity"
             android:label="@string/app_name"
-            android:theme="@android:style/Theme.Holo.Light"
-            android:enabled="false"
-            >
+            android:theme="@android:style/Theme.Holo.Light">
             <intent-filter>
                 <action
                     android:name="android.intent.action.VIEW" />
@@ -327,6 +325,7 @@
         <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" />
+              <action android:name="android.accounts.LOGIN_ACCOUNTS_CHANGED" />
           </intent-filter>
         </receiver>