diff --git a/src/com/android/email/activity/setup/AccountSetupBasics.java b/src/com/android/email/activity/setup/AccountSetupBasics.java
index d5facd7a8..9d35c37f6 100644
--- a/src/com/android/email/activity/setup/AccountSetupBasics.java
+++ b/src/com/android/email/activity/setup/AccountSetupBasics.java
@@ -250,9 +250,6 @@ public class AccountSetupBasics extends K9Activity
         mAccount.setTrashFolderName(getString(R.string.special_mailbox_name_trash));
         mAccount.setOutboxFolderName(getString(R.string.special_mailbox_name_outbox));
         mAccount.setSentFolderName(getString(R.string.special_mailbox_name_sent));
-        if (incomingUri.toString().startsWith("imap")) {
-            mAccount.setDeletePolicy(Account.DELETE_POLICY_ON_DELETE);
-        }
         AccountSetupCheckSettings.actionCheckSettings(this, mAccount, true, true);
     }
 
diff --git a/src/com/android/email/activity/setup/AccountSetupIncoming.java b/src/com/android/email/activity/setup/AccountSetupIncoming.java
index 7909ef3de..9e8970eac 100644
--- a/src/com/android/email/activity/setup/AccountSetupIncoming.java
+++ b/src/com/android/email/activity/setup/AccountSetupIncoming.java
@@ -216,6 +216,9 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
                 findViewById(R.id.imap_folder_setup_section).setVisibility(View.GONE);
                 findViewById(R.id.webdav_path_prefix_section).setVisibility(View.GONE);
                 findViewById(R.id.webdav_path_debug_section).setVisibility(View.GONE);
+                mAccount.setDeletePolicy(Account.DELETE_POLICY_NEVER);
+                
+                
             } else if (uri.getScheme().startsWith("imap")) {
                 serverLabelView.setText(R.string.account_setup_incoming_imap_server_label);
                 mAccountPorts = imapPorts;
@@ -226,7 +229,7 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
                 }
                 findViewById(R.id.webdav_path_prefix_section).setVisibility(View.GONE);
                 findViewById(R.id.webdav_path_debug_section).setVisibility(View.GONE);
-                
+                mAccount.setDeletePolicy(Account.DELETE_POLICY_ON_DELETE);
             } else if (uri.getScheme().startsWith("webdav")) {
                 serverLabelView.setText(R.string.account_setup_incoming_webdav_server_label);
                 mAccountPorts = webdavPorts;
@@ -257,6 +260,7 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
                         }
                     }
                 }
+                mAccount.setDeletePolicy(Account.DELETE_POLICY_ON_DELETE);
             } else {
                 throw new Exception("Unknown account type: " + mAccount.getStoreUri());
             }