diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4cda1bbc7..5e0d3605b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4,7 +4,7 @@
 
     <!--
          When removing strings from the main file, please cleanup the translations.
-         
+
          This doesn't work on multiline strings, nor strings with the NEW tag.
          find . -name strings.xml | xargs perl -pi -e's!^\s+<string name="string_name_here".+?</string>\s*\z!!'
      -->
@@ -646,9 +646,9 @@ Please submit bug reports, contribute new features and ask questions at
     <string name="account_settings_sync_remote_deletetions_label">Sync server deletions</string>
     <string name="account_settings_sync_remote_deletetions_summary">Remove messages when deleted on server</string>
 
-    <string name="account_settings_spamass_label">Filter using Spamassassin</string>
-    <string name="account_settings_spamass_summary">Move Flagged Spam messages to Spam folder.</string>
-    
+    <string name="account_settings_spamassassin_label">Filter using SpamAssassin</string>
+    <string name="account_settings_spamassassin_summary">Move flagged spam messages to Spam folder</string>
+
     <string name="folder_settings_title">Folder settings</string>
 
     <string name="folder_settings_in_top_group_label">Show in top group</string>
diff --git a/res/xml/account_settings_preferences.xml b/res/xml/account_settings_preferences.xml
index 33a23de34..4f9c5010a 100644
--- a/res/xml/account_settings_preferences.xml
+++ b/res/xml/account_settings_preferences.xml
@@ -135,10 +135,9 @@
 
         <CheckBoxPreference
             android:persistent="false"
-            android:key="account_spamass"
-            android:title="@string/account_settings_spamass_label"
-            android:defaultValue="true"
-            android:summary="@string/account_settings_spamass_summary" />
+            android:key="spamassassin_filtering"
+            android:title="@string/account_settings_spamassassin_label"
+            android:summary="@string/account_settings_spamassassin_summary" />
 
         <ListPreference
             android:persistent="false"
diff --git a/src/com/fsck/k9/Account.java b/src/com/fsck/k9/Account.java
index 800a35e22..6d389f466 100644
--- a/src/com/fsck/k9/Account.java
+++ b/src/com/fsck/k9/Account.java
@@ -193,7 +193,7 @@ public class Account implements BaseAccount {
     private boolean mReplyAfterQuote;
     private boolean mStripSignature;
     private boolean mSyncRemoteDeletions;
-    private boolean mSpamassFilter;
+    private boolean mSpamAssassinFilterEnabled;
     private String mCryptoApp;
     private boolean mCryptoAutoSignature;
     private boolean mCryptoAutoEncrypt;
@@ -303,7 +303,7 @@ public class Account implements BaseAccount {
         mReplyAfterQuote = DEFAULT_REPLY_AFTER_QUOTE;
         mStripSignature = DEFAULT_STRIP_SIGNATURE;
         mSyncRemoteDeletions = true;
-        mSpamassFilter = false;
+        mSpamAssassinFilterEnabled = false;
         mCryptoApp = Apg.NAME;
         mCryptoAutoSignature = false;
         mCryptoAutoEncrypt = false;
@@ -373,8 +373,8 @@ public class Account implements BaseAccount {
         mSpamFolderName = prefs.getString(mUuid  + ".spamFolderName", "Spam");
         mExpungePolicy = prefs.getString(mUuid  + ".expungePolicy", EXPUNGE_IMMEDIATELY);
         mSyncRemoteDeletions = prefs.getBoolean(mUuid  + ".syncRemoteDeletions", true);
-        mSpamassFilter = prefs.getBoolean(mUuid  + ".spamassFilter", false);
-        
+        mSpamAssassinFilterEnabled = prefs.getBoolean(mUuid  + ".spamAssassinFiltering", false);
+
         mMaxPushFolders = prefs.getInt(mUuid + ".maxPushFolders", 10);
         goToUnreadMessageSearch = prefs.getBoolean(mUuid + ".goToUnreadMessageSearch", false);
         mNotificationShowsUnreadCount = prefs.getBoolean(mUuid + ".notificationUnreadCount", true);
@@ -701,7 +701,7 @@ public class Account implements BaseAccount {
         editor.putBoolean(mUuid + ".signatureBeforeQuotedText", this.mIsSignatureBeforeQuotedText);
         editor.putString(mUuid + ".expungePolicy", mExpungePolicy);
         editor.putBoolean(mUuid + ".syncRemoteDeletions", mSyncRemoteDeletions);
-        editor.putBoolean(mUuid + ".spamassfilter", mSpamassFilter);
+        editor.putBoolean(mUuid + ".spamAssassinFiltering", mSpamAssassinFilterEnabled);
         editor.putInt(mUuid + ".maxPushFolders", mMaxPushFolders);
         editor.putString(mUuid + ".searchableFolders", searchableFolders.name());
         editor.putInt(mUuid + ".chipColor", mChipColor);
@@ -1710,12 +1710,12 @@ public class Account implements BaseAccount {
         mSyncRemoteDeletions = syncRemoteDeletions;
     }
 
-    public synchronized boolean spamassFilter() {
-        return mSpamassFilter;
+    public synchronized boolean isSpamAssassinFilterEnabled() {
+        return mSpamAssassinFilterEnabled;
     }
 
-    public synchronized void setSpamassFilter(boolean spamassFilter) {
-        mSpamassFilter = spamassFilter;
+    public synchronized void setSpamAssassinFilterEnabled(boolean enabled) {
+        mSpamAssassinFilterEnabled = enabled;
     }
 
    public synchronized String getLastSelectedFolderName() {
diff --git a/src/com/fsck/k9/activity/setup/AccountSettings.java b/src/com/fsck/k9/activity/setup/AccountSettings.java
index 046c795bc..ea8fb4589 100644
--- a/src/com/fsck/k9/activity/setup/AccountSettings.java
+++ b/src/com/fsck/k9/activity/setup/AccountSettings.java
@@ -109,7 +109,7 @@ public class AccountSettings extends K9PreferenceActivity {
     private static final String PREFERENCE_STRIP_SIGNATURE = "strip_signature";
     private static final String PREFERENCE_SYNC_REMOTE_DELETIONS = "account_sync_remote_deletetions";
     private static final String PREFERENCE_CRYPTO = "crypto";
-    private static final String PREFERENCE_SPAMASS = "account_spamass";
+    private static final String PREFERENCE_SPAMASSASSIN_FILTERING = "spamassassin_filtering";
     private static final String PREFERENCE_CRYPTO_APP = "crypto_app";
     private static final String PREFERENCE_CRYPTO_AUTO_SIGNATURE = "crypto_auto_signature";
     private static final String PREFERENCE_CRYPTO_AUTO_ENCRYPT = "crypto_auto_encrypt";
@@ -391,8 +391,8 @@ public class AccountSettings extends K9PreferenceActivity {
         mSyncRemoteDeletions = (CheckBoxPreference) findPreference(PREFERENCE_SYNC_REMOTE_DELETIONS);
         mSyncRemoteDeletions.setChecked(mAccount.syncRemoteDeletions());
 
-        mSpamassFilter = (CheckBoxPreference) findPreference(PREFERENCE_SPAMASS);
-        mSpamassFilter.setChecked(mAccount.spamassFilter());
+        mSpamassFilter = (CheckBoxPreference) findPreference(PREFERENCE_SPAMASSASSIN_FILTERING);
+        mSpamassFilter.setChecked(mAccount.isSpamAssassinFilterEnabled());
 
         mSearchableFolders = (ListPreference) findPreference(PREFERENCE_SEARCHABLE_FOLDERS);
         mSearchableFolders.setValue(mAccount.getSearchableFolders().name());
@@ -761,7 +761,7 @@ public class AccountSettings extends K9PreferenceActivity {
             mAccount.setExpungePolicy(mExpungePolicy.getValue());
         }
         mAccount.setSyncRemoteDeletions(mSyncRemoteDeletions.isChecked());
-        mAccount.setSpamassFilter(mSpamassFilter.isChecked());
+        mAccount.setSpamAssassinFilterEnabled(mSpamassFilter.isChecked());
         mAccount.setSearchableFolders(Account.Searchable.valueOf(mSearchableFolders.getValue()));
         mAccount.setMessageFormat(Account.MessageFormat.valueOf(mMessageFormat.getValue()));
         mAccount.setAlwaysShowCcBcc(mAlwaysShowCcBcc.isChecked());