diff --git a/res/values/strings.xml b/res/values/strings.xml
index 897c0b2a33..6c47796a71 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -21,11 +21,11 @@
     </string>
     <string name="ApplicationPreferencesActivity_disable">Disable</string>
     <string name="ApplicationPreferencesActivity_unregistering">Unregistering...</string>
-    <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Unregistering for data based communication</string>
-    <string name="ApplicationPreferencesActivity_disable_push_messages">Disable push messages?</string>
-    <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
-        This will disable push messages by unregistering you from the server.
-        You will need to re-register your phone number to use push messages again in the future.
+    <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">Unregistering from TextSecure messages</string>
+    <string name="ApplicationPreferencesActivity_disable_textsecure_messages">Disable TextSecure messages?</string>
+    <string name="ApplicationPreferencesActivity_this_will_disable_textsecure_messages">
+        This will disable TextSecure messages by unregistering you from the server.
+        You will need to re-register your phone number to use TextSecure messages again in the future.
     </string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Error connecting to server!</string>
     <string name="ApplicationPreferencesActivity_sms_enabled">SMS Enabled</string>
diff --git a/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
index 982f8b25ad..0531a40379 100644
--- a/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
+++ b/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
@@ -133,7 +133,7 @@ public class AdvancedPreferenceFragment extends PreferenceFragment {
       private final CheckBoxPreference checkBoxPreference;
 
       public DisablePushMessagesTask(final CheckBoxPreference checkBoxPreference) {
-        super(getActivity(), R.string.ApplicationPreferencesActivity_unregistering, R.string.ApplicationPreferencesActivity_unregistering_for_data_based_communication);
+        super(getActivity(), R.string.ApplicationPreferencesActivity_unregistering, R.string.ApplicationPreferencesActivity_unregistering_from_textsecure_messages);
         this.checkBoxPreference = checkBoxPreference;
       }
 
@@ -178,8 +178,8 @@ public class AdvancedPreferenceFragment extends PreferenceFragment {
       if (((CheckBoxPreference)preference).isChecked()) {
         AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(getActivity());
         builder.setIconAttribute(R.attr.dialog_info_icon);
-        builder.setTitle(R.string.ApplicationPreferencesActivity_disable_push_messages);
-        builder.setMessage(R.string.ApplicationPreferencesActivity_this_will_disable_push_messages);
+        builder.setTitle(R.string.ApplicationPreferencesActivity_disable_textsecure_messages);
+        builder.setMessage(R.string.ApplicationPreferencesActivity_this_will_disable_textsecure_messages);
         builder.setNegativeButton(android.R.string.cancel, null);
         builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
           @Override