diff --git a/res/xml/providers.xml b/res/xml/providers.xml
index 62a7f9c75..a00108996 100644
--- a/res/xml/providers.xml
+++ b/res/xml/providers.xml
@@ -174,6 +174,10 @@
         <incoming uri="imap+ssl+://mail.montclair.edu" username="$user" />
         <outgoing uri="smtp+tls+://smtp.montclair.edu" username="$user" />
     </provider>
+    <provider id="gmx.com" label="GMX" domain="gmx.com">
+        <incoming uri="imap+ssl+://imap.gmx.com" username="$email" />
+        <outgoing uri="smtp+ssl+://mail.gmx.com" username="$email" />
+    </provider>
 
     <!-- Yahoo! Mail Variants -->
     <provider id="yahoo" label="Yahoo" domain="yahoo.com">
diff --git a/src/com/fsck/k9/activity/setup/AccountSetupBasics.java b/src/com/fsck/k9/activity/setup/AccountSetupBasics.java
index 27a3781dd..dea801ed1 100644
--- a/src/com/fsck/k9/activity/setup/AccountSetupBasics.java
+++ b/src/com/fsck/k9/activity/setup/AccountSetupBasics.java
@@ -232,6 +232,11 @@ public class AccountSetupBasics extends K9Activity
                 mAccount.setSpamFolderName(getString(R.string.special_mailbox_name_spam));
             }
             mAccount.setSentFolderName(getString(R.string.special_mailbox_name_sent));
+            if (incomingUri.toString().startsWith("imap")) {
+                mAccount.setDeletePolicy(Account.DELETE_POLICY_ON_DELETE);
+            } else if (incomingUri.toString().startsWith("pop3")) {
+                mAccount.setDeletePolicy(Account.DELETE_POLICY_NEVER);
+            }
             AccountSetupCheckSettings.actionCheckSettings(this, mAccount, true, true);
         } catch (UnsupportedEncodingException enc) {
             // This really shouldn't happen since the encoding is hardcoded to UTF-8
@@ -310,6 +315,13 @@ public class AccountSetupBasics extends K9Activity
         mAccount.setDraftsFolderName(getString(R.string.special_mailbox_name_drafts));
         mAccount.setTrashFolderName(getString(R.string.special_mailbox_name_trash));
         mAccount.setSentFolderName(getString(R.string.special_mailbox_name_sent));
+        mAccount.setArchiveFolderName(getString(R.string.special_mailbox_name_archive));
+        // Yahoo! has a special folder for Spam, called "Bulk Mail".
+        if (domain.endsWith(".yahoo.com")) {
+            mAccount.setSpamFolderName("Bulk Mail");
+        } else {
+            mAccount.setSpamFolderName(getString(R.string.special_mailbox_name_spam));
+        }
 
         AccountSetupAccountType.actionSelectAccountType(this, mAccount, mDefaultView.isChecked());
         finish();