diff --git a/res/values/strings.xml b/res/values/strings.xml
index 44e80e7ad..4cda1bbc7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -646,6 +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="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 886189c32..33a23de34 100644
--- a/res/xml/account_settings_preferences.xml
+++ b/res/xml/account_settings_preferences.xml
@@ -133,6 +133,13 @@
             android:defaultValue="true"
             android:summary="@string/account_settings_sync_remote_deletetions_summary" />
 
+        <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" />
+
         <ListPreference
             android:persistent="false"
             android:key="delete_policy"