diff --git a/k9mail/src/main/java/com/fsck/k9/account/AccountCreator.java b/k9mail/src/main/java/com/fsck/k9/account/AccountCreator.java
index 6a8f9ead7..d591ccddb 100644
--- a/k9mail/src/main/java/com/fsck/k9/account/AccountCreator.java
+++ b/k9mail/src/main/java/com/fsck/k9/account/AccountCreator.java
@@ -13,7 +13,7 @@ import com.fsck.k9.mail.ServerSettings.Type;
  */
 public class AccountCreator {
 
-    public static DeletePolicy calculateDefaultDeletePolicy(Type type) {
+    public static DeletePolicy getDefaultDeletePolicy(Type type) {
         switch (type) {
             case IMAP: {
                 return DeletePolicy.ON_DELETE;
diff --git a/k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.java b/k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.java
index 93835a0c4..3d2e0bef1 100644
--- a/k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.java
+++ b/k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.java
@@ -321,7 +321,7 @@ public class AccountSetupBasics extends K9Activity
             setupFolderNames(incomingUriTemplate.getHost().toLowerCase(Locale.US));
 
             ServerSettings incomingSettings = RemoteStore.decodeStoreUri(incomingUri.toString());
-            mAccount.setDeletePolicy(AccountCreator.calculateDefaultDeletePolicy(incomingSettings.type));
+            mAccount.setDeletePolicy(AccountCreator.getDefaultDeletePolicy(incomingSettings.type));
 
             // Check incoming here.  Then check outgoing in onActivityResult()
             AccountSetupCheckSettings.actionCheckSettings(this, mAccount, CheckDirection.INCOMING);
diff --git a/k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupIncoming.java b/k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupIncoming.java
index 903dbf302..9b7933bd5 100644
--- a/k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupIncoming.java
+++ b/k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupIncoming.java
@@ -237,7 +237,7 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
                 throw new Exception("Unknown account type: " + mAccount.getStoreUri());
             }
 
-            mAccount.setDeletePolicy(AccountCreator.calculateDefaultDeletePolicy(settings.type));
+            mAccount.setDeletePolicy(AccountCreator.getDefaultDeletePolicy(settings.type));
 
             // Note that mConnectionSecurityChoices is configured above based on server type
             ConnectionSecurityAdapter securityTypesAdapter =