diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b1fc4fdf1..ed0ef5368 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -22,6 +22,11 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.VIBRATE"/>
+ 
+    <!-- Only required if a store implements push mail and needs to keep network open -->
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    
     <permission android:name="com.android.email.permission.READ_ATTACHMENT"
                 android:permissionGroup="android.permission-group.MESSAGES"
                 android:protectionLevel="dangerous"
diff --git a/src/com/android/email/service/MailService.java b/src/com/android/email/service/MailService.java
index 2f9415899..a2f4f3118 100644
--- a/src/com/android/email/service/MailService.java
+++ b/src/com/android/email/service/MailService.java
@@ -163,10 +163,11 @@ public class MailService extends Service {
 
         int shortestInterval = -1;
         for (Account account : Preferences.getPreferences(this).getAccounts()) {
-            if (account.getAutomaticCheckIntervalMinutes() > 0
-                    && (account.getAutomaticCheckIntervalMinutes() < shortestInterval || shortestInterval == -1)) {
-                shortestInterval = account.getAutomaticCheckIntervalMinutes();
+            int interval = account.getAutomaticCheckIntervalMinutes();
+            if (interval > 0 && (interval < shortestInterval || shortestInterval == -1)) {
+                shortestInterval = interval;
             }
+            enablePushMail(account, interval == Account.CHECK_INTERVAL_PUSH);
         }
 
         if (shortestInterval == -1) {