1 files changed, 7 insertions, 0 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/SettingsActivity.java b/src/main/java/de/pixart/messenger/ui/SettingsActivity.java
index 5f10ceea6..9ee11bd0b 100644
--- a/src/main/java/de/pixart/messenger/ui/SettingsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/SettingsActivity.java
@@ -116,6 +116,7 @@ public class SettingsActivity extends XmppActivity implements
         }
 
         PreferenceScreen mainPreferenceScreen = (PreferenceScreen) mSettingsFragment.findPreference("main_screen");
+        PreferenceScreen UIPreferenceScreen = (PreferenceScreen) mSettingsFragment.findPreference("userinterface");
 
         //this feature is only available on Huawei Android 6.
         PreferenceScreen huaweiPreferenceScreen = (PreferenceScreen) mSettingsFragment.findPreference("huawei");
@@ -172,6 +173,12 @@ public class SettingsActivity extends XmppActivity implements
             quickAction.setEntryValues(entryValues.toArray(new CharSequence[entryValues.size()]));
         }
 
+        if (Config.QUICK_SHARE_ATTACHMENT_CHOICE) {
+            if (UIPreferenceScreen != null && quickAction != null) {
+                UIPreferenceScreen.removePreference(quickAction);
+            }
+        }
+
         final Preference removeCertsPreference = mSettingsFragment.findPreference("remove_trusted_certificates");
         if (removeCertsPreference != null) {
             removeCertsPreference.setOnPreferenceClickListener(preference -> {