diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index bdd267c4ee..59cdb61fd6 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -253,13 +253,11 @@ module.exports = React.createClass({
);
- if (SettingsStore.isFeatureEnabled("feature_rich_quoting")) {
- replyButton = (
-
- { _t('Reply') }
-
- );
- }
+ replyButton = (
+
+ { _t('Reply') }
+
+ );
if (this.state.canPin) {
pinButton = (
diff --git a/src/components/views/elements/ReplyThread.js b/src/components/views/elements/ReplyThread.js
index 6714de81a4..f9f3f4ca97 100644
--- a/src/components/views/elements/ReplyThread.js
+++ b/src/components/views/elements/ReplyThread.js
@@ -160,7 +160,7 @@ export default class ReplyThread extends React.Component {
}
static makeThread(parentEv, onWidgetLoad, ref) {
- if (!SettingsStore.isFeatureEnabled("feature_rich_quoting") || !ReplyThread.getParentEventId(parentEv)) {
+ if (!ReplyThread.getParentEventId(parentEv)) {
return ;
}
return ;
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index 60377a47d7..20cf2b69f4 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -423,8 +423,7 @@ module.exports = React.createClass({
const mxEvent = this.props.mxEvent;
const content = mxEvent.getContent();
- const stripReply = SettingsStore.isFeatureEnabled("feature_rich_quoting") &&
- ReplyThread.getParentEventId(mxEvent);
+ const stripReply = ReplyThread.getParentEventId(mxEvent);
let body = HtmlUtils.bodyToHtml(content, this.props.highlights, {
disableBigEmoji: SettingsStore.getValue('TextualBody.disableBigEmoji'),
// Part of Replies fallback support
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 57d433e55c..c59bee641f 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -1181,7 +1181,7 @@ export default class MessageComposerInput extends React.Component {
return (
- { SettingsStore.isFeatureEnabled("feature_rich_quoting") &&
}
+
this.autocomplete = e}
room={this.props.room}
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 039bd78d79..40bb2dd57e 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -76,12 +76,6 @@ export const SETTINGS = {
// // level is always appended to the end.
// supportedLevelsAreOrdered: false,
// },
- "feature_rich_quoting": {
- isFeature: true,
- displayName: _td("Message Replies"),
- supportedLevels: LEVELS_FEATURE,
- default: false,
- },
"feature_pinning": {
isFeature: true,
displayName: _td("Message Pinning"),