diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index b1354c56c..af5aadb8d 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -61,23 +61,24 @@
         <item>60</item>  
     </string-array>
     
-    <!-- Mail sync window size for EAS accounts -->
+    <!-- Mail sync window sizes for EAS accounts -->
+    <!-- Note, "all" (value 6) is not presented in UI. -->
     <string-array name="account_settings_mail_window_entries">
         <item>@string/account_setup_options_mail_window_1day</item>
         <item>@string/account_setup_options_mail_window_3days</item>
         <item>@string/account_setup_options_mail_window_1week</item>
         <item>@string/account_setup_options_mail_window_2weeks</item>
         <item>@string/account_setup_options_mail_window_1month</item>
-        <item>@string/account_setup_options_mail_window_all</item>
     </string-array>
 
+    <!-- Mail sync window size codes for EAS accounts -->
+    <!-- Note, "all" (value 6) is not presented in UI. -->
     <string-array name="account_settings_mail_window_values" translatable="false">
         <item>1</item>
         <item>2</item>
         <item>3</item>
         <item>4</item>
         <item>5</item>
-        <item>6</item>  
     </string-array>
     
 </resources>
diff --git a/src/com/android/email/activity/setup/AccountSetupAccountType.java b/src/com/android/email/activity/setup/AccountSetupAccountType.java
index 335d639ca..addf1e8b5 100644
--- a/src/com/android/email/activity/setup/AccountSetupAccountType.java
+++ b/src/com/android/email/activity/setup/AccountSetupAccountType.java
@@ -127,7 +127,7 @@ public class AccountSetupAccountType extends Activity implements OnClickListener
         // TODO: Confirm correct delete policy for exchange
         mAccount.setDeletePolicy(Account.DELETE_POLICY_ON_DELETE);
         mAccount.setAutomaticCheckIntervalMinutes(Account.CHECK_INTERVAL_PUSH);
-        mAccount.setSyncWindow(Account.SYNC_WINDOW_3_DAYS);
+        mAccount.setSyncWindow(Account.SYNC_WINDOW_1_DAY);
         AccountSetupExchange.actionIncomingSettings(this, mAccount, mMakeDefault);
         finish();
     }