diff --git a/src/org/thoughtcrime/securesms/preferences/SmsMmsPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/SmsMmsPreferenceFragment.java
index a3a4b2bd33..6de3adde73 100644
--- a/src/org/thoughtcrime/securesms/preferences/SmsMmsPreferenceFragment.java
+++ b/src/org/thoughtcrime/securesms/preferences/SmsMmsPreferenceFragment.java
@@ -72,7 +72,10 @@ public class SmsMmsPreferenceFragment extends CorrectedPreferenceFragment {
 
     Preference defaultPreference = findPreference(KITKAT_DEFAULT_PREF);
     if (Util.isDefaultSmsProvider(getActivity())) {
-      defaultPreference.setIntent(new Intent(Settings.ACTION_WIRELESS_SETTINGS));
+      if (VERSION.SDK_INT < VERSION_CODES.M) defaultPreference.setIntent(new Intent(Settings.ACTION_WIRELESS_SETTINGS));
+      if (VERSION.SDK_INT < VERSION_CODES.N) defaultPreference.setIntent(new Intent(Settings.ACTION_SETTINGS));
+      else                                   defaultPreference.setIntent(new Intent(Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS));
+
       defaultPreference.setTitle(getString(R.string.ApplicationPreferencesActivity_sms_enabled));
       defaultPreference.setSummary(getString(R.string.ApplicationPreferencesActivity_touch_to_change_your_default_sms_app));
     } else {