diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 36971437c..c0f735642 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -324,7 +324,6 @@ http://k9mail.googlecode.com/.
     <string name="global_settings_confirm_action_send">Senden</string>
 
     <string name="global_settings_notification_hide_subject_title">Betreff in Benachrichtigungen verbergen</string>
-    <string name="global_settings_notification_hide_subject_summary">Verbergen des Betreffes in Benachrichtigungen</string>
     <string name="global_settings_notification_hide_subject_never">Niemals</string>
     <string name="global_settings_notification_hide_subject_when_locked">Wenn der Bildschirm gesperrt ist</string>
     <string name="global_settings_notification_hide_subject_always">Immer</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a41a21b90..88a74e120 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -327,7 +327,6 @@ http://k9mail.googlecode.com/
     <string name="global_settings_confirm_action_send">Send</string>
 
     <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>
-    <string name="global_settings_notification_hide_subject_summary">When to hide the subject in the notification bar.</string>
     <string name="global_settings_notification_hide_subject_never">Never</string>
     <string name="global_settings_notification_hide_subject_when_locked">When phone is locked</string>
     <string name="global_settings_notification_hide_subject_always">Always</string>
diff --git a/res/xml/global_preferences.xml b/res/xml/global_preferences.xml
index 7b30b20d8..9c634b378 100644
--- a/res/xml/global_preferences.xml
+++ b/res/xml/global_preferences.xml
@@ -351,11 +351,9 @@
         <ListPreference
             android:persistent="false"
             android:key="notification_hide_subject"
-            android:defaultValue="NEVER"
             android:entries="@array/global_settings_notification_hide_subject_entries"
             android:entryValues="@array/global_settings_notification_hide_subject_values"
-            android:title="@string/global_settings_notification_hide_subject_title"
-            android:summary="@string/global_settings_notification_hide_subject_summary"/>
+            android:title="@string/global_settings_notification_hide_subject_title"/>
 
     </PreferenceScreen>
 
diff --git a/src/com/fsck/k9/activity/setup/Prefs.java b/src/com/fsck/k9/activity/setup/Prefs.java
index bf054aaf0..dbac3f1b3 100644
--- a/src/com/fsck/k9/activity/setup/Prefs.java
+++ b/src/com/fsck/k9/activity/setup/Prefs.java
@@ -217,8 +217,8 @@ public class Prefs extends K9PreferenceActivity {
                                             K9.confirmMarkAllAsRead()
                                         });
 
-        mNotificationHideSubject = (ListPreference) findPreference(PREFERENCE_NOTIFICATION_HIDE_SUBJECT);
-        mNotificationHideSubject.setValue(K9.getNotificationHideSubject().toString());
+        mNotificationHideSubject = setupListPreference(PREFERENCE_NOTIFICATION_HIDE_SUBJECT,
+                K9.getNotificationHideSubject().toString());
 
         mMeasureAccounts = (CheckBoxPreference)findPreference(PREFERENCE_MEASURE_ACCOUNTS);
         mMeasureAccounts.setChecked(K9.measureAccounts());