diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 557a58412a..c86bcb2ff0 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -178,6 +178,7 @@ export default class MessageComposer extends React.Component {
isQuoting: Boolean(RoomViewStore.getQuotingEvent()),
tombstone: this._getRoomTombstone(),
canSendMessages: this.props.room.maySendMessage(),
+ showCallButtons: SettingsStore.getValue("showCallButtonsInComposer"),
};
}
@@ -325,10 +326,20 @@ export default class MessageComposer extends React.Component {
permalinkCreator={this.props.permalinkCreator} />,
,
,
- callInProgress ? : null,
- callInProgress ? null : ,
- callInProgress ? null : ,
);
+
+ if (this.state.showCallButtons) {
+ if (callInProgress) {
+ controls.push(
+ ,
+ );
+ } else {
+ controls.push(
+ ,
+ ,
+ );
+ }
+ }
} else if (this.state.tombstone) {
const replacementRoomId = this.state.tombstone.getContent()['replacement_room'];
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index ba6df47a04..abcfd21902 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -517,4 +517,8 @@ export const SETTINGS = {
displayName: _td("How fast should messages be downloaded."),
default: 3000,
},
+ "showCallButtonsInComposer": {
+ supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG,
+ default: true,
+ },
};