diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8f68b4477..1843cd71f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -13,11 +13,9 @@
     <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Delete all old messages now?</string>
     <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Are you sure you would like to immediately trim all conversation threads to the %s most recent messages?</string>
     <string name="ApplicationPreferencesActivity_delete">Delete</string>
-    <string name="ApplicationPreferencesActivity_disable_storage_encryption">Disable storage encryption?</string>
-    <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
-        Warning, this will disable storage encryption for all messages and keys. Your encrypted
-        sessions will continue to function, but anyone with physical access to your device will be
-        able to access them.
+    <string name="ApplicationPreferencesActivity_disable_passphrase">Disable passphrase?</string>
+    <string name="ApplicationPreferencesActivity_disable_lock_screen">
+        Disable lock screen for messages?
     </string>
     <string name="ApplicationPreferencesActivity_disable">Disable</string>
     <string name="ApplicationPreferencesActivity_unregistering">Unregistering</string>
diff --git a/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java
index 4f9b53cd1..25a072ffc 100644
--- a/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java
+++ b/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java
@@ -137,8 +137,8 @@ public class AppProtectionPreferenceFragment extends PreferenceFragment {
     public boolean onPreferenceChange(final Preference preference, Object newValue) {
       if (((CheckBoxPreference)preference).isChecked()) {
         AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(getActivity());
-        builder.setTitle(R.string.ApplicationPreferencesActivity_disable_storage_encryption);
-        builder.setMessage(R.string.ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages);
+        builder.setTitle(R.string.ApplicationPreferencesActivity_disable_passphrase);
+        builder.setMessage(R.string.ApplicationPreferencesActivity_disable_lock_screen);
         builder.setIconAttribute(R.attr.dialog_alert_icon);
         builder.setPositiveButton(R.string.ApplicationPreferencesActivity_disable, new DialogInterface.OnClickListener() {
           @Override