diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 4ddff8f4b0..2d22b591b4 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -423,7 +423,8 @@ export default class MessageComposer extends React.Component {
,
);
- if (SettingsStore.getValue(UIFeature.Widgets)) {
+ if (SettingsStore.getValue(UIFeature.Widgets) &&
+ SettingsStore.getValue("MessageComposerInput.showStickersButton")) {
controls.push();
}
diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
index 4d8493401e..b03ea8763c 100644
--- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
@@ -34,6 +34,7 @@ export default class PreferencesUserSettingsTab extends React.Component {
'MessageComposerInput.suggestEmoji',
'sendTypingNotifications',
'MessageComposerInput.ctrlEnterToSend',
+ 'MessageComposerInput.showStickersButton',
];
static TIMELINE_SETTINGS = [
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index c0939871e2..14906df935 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -783,6 +783,7 @@
"Font size": "Font size",
"Use custom size": "Use custom size",
"Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing",
+ "Show stickers button": "Show stickers button",
"Use a more compact ‘Modern’ layout": "Use a more compact ‘Modern’ layout",
"Show a placeholder for removed messages": "Show a placeholder for removed messages",
"Show join/leave messages (invites/kicks/bans unaffected)": "Show join/leave messages (invites/kicks/bans unaffected)",
diff --git a/src/settings/Settings.ts b/src/settings/Settings.ts
index b239b809fe..3a187d45d8 100644
--- a/src/settings/Settings.ts
+++ b/src/settings/Settings.ts
@@ -240,6 +240,11 @@ export const SETTINGS: {[setting: string]: ISetting} = {
default: true,
invertedSettingName: 'MessageComposerInput.dontSuggestEmoji',
},
+ "MessageComposerInput.showStickersButton": {
+ supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+ displayName: _td('Show stickers button'),
+ default: true,
+ },
// TODO: Wire up appropriately to UI (FTUE notifications)
"Notifications.alwaysShowBadgeCounts": {
supportedLevels: LEVELS_ROOM_OR_ACCOUNT,