diff --git a/src/com/fsck/k9/preferences/GlobalSettings.java b/src/com/fsck/k9/preferences/GlobalSettings.java
index 21e0ac9d3..57fc7ad07 100644
--- a/src/com/fsck/k9/preferences/GlobalSettings.java
+++ b/src/com/fsck/k9/preferences/GlobalSettings.java
@@ -277,12 +277,12 @@ public class GlobalSettings {
             Boolean keyguardPrivacy = (Boolean) settings.get("keyguardPrivacy");
             if (keyguardPrivacy != null && keyguardPrivacy) {
                 // current setting: only show subject when unlocked
-                settings.put("hideSubjectMode", NotificationHideSubject.WHEN_LOCKED);
+                settings.put("notificationHideSubjectMode", NotificationHideSubject.WHEN_LOCKED);
             } else {
                 // always show subject [old default]
-                settings.put("hideSubjectMode", NotificationHideSubject.NEVER);
+                settings.put("notificationHideSubjectMode", NotificationHideSubject.NEVER);
             }
-            return new HashSet<String>(Arrays.asList("hideSubjectMode"));
+            return new HashSet<String>(Arrays.asList("keyguardPrivacy"));
         }
     }