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({
                     </div>
                 );
 
-                if (SettingsStore.isFeatureEnabled("feature_rich_quoting")) {
-                    replyButton = (
-                        <div className="mx_MessageContextMenu_field" onClick={this.onReplyClick}>
-                            { _t('Reply') }
-                        </div>
-                    );
-                }
+                replyButton = (
+                    <div className="mx_MessageContextMenu_field" onClick={this.onReplyClick}>
+                        { _t('Reply') }
+                    </div>
+                );
 
                 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 <div />;
         }
         return <ReplyThread parentEv={parentEv} onWidgetLoad={onWidgetLoad} ref={ref} />;
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 (
             <div className="mx_MessageComposer_input_wrapper">
                 <div className="mx_MessageComposer_autocomplete_wrapper">
-                    { SettingsStore.isFeatureEnabled("feature_rich_quoting") && <ReplyPreview /> }
+                    <ReplyPreview />
                     <Autocomplete
                         ref={(e) => this.autocomplete = e}
                         room={this.props.room}
diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index f3c12edecb..357b007a6f 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -203,7 +203,6 @@
     "Not a valid Riot keyfile": "Невалиден файл с ключ за Riot",
     "Authentication check failed: incorrect password?": "Неуспешна автентикация: неправилна парола?",
     "Failed to join room": "Неуспешно присъединяване към стаята",
-    "Message Replies": "Отговори на съобщението",
     "Message Pinning": "Функция за закачане на съобщения",
     "Disable Emoji suggestions while typing": "Изключване на предложенията за емотиконите при писане",
     "Use compact timeline layout": "Използване на компактно оформление за списъка със съобщения",
diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index 5b3732d725..98d51e99ac 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -209,7 +209,6 @@
     "Not a valid Riot keyfile": "El fitxer no és un fitxer de claus de Riot valid",
     "Authentication check failed: incorrect password?": "Ha fallat l'autenticació: heu introduït correctament la contrasenya?",
     "Failed to join room": "No s'ha pogut entrar a la sala",
-    "Message Replies": "Respostes del missatge",
     "Message Pinning": "Fixació de missatges",
     "Disable Emoji suggestions while typing": "Desactiva els suggeriments d'Emoji mentre s'escriu",
     "Use compact timeline layout": "Utilitza el disseny compacte de la línia de temps",
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 6e1fff98c0..0df2e84897 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -946,7 +946,6 @@
     "Your homeserver's URL": "Die URL deines Homeservers",
     "Your identity server's URL": "Die URL deines Identitätsservers",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
-    "Message Replies": "Antworten auf Nachrichten",
     "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Du wirst nicht in der Lage sein, die Änderung zurückzusetzen, da du dich degradierst. Wenn du der letze Nutzer mit Berechtigungen bist, wird es unmöglich sein die Privilegien zurückzubekommen.",
     "Community IDs cannot not be empty.": "Community-IDs können nicht leer sein.",
     "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Geräte anzeigen</showDevicesText>, <sendAnywayText>trotzdem senden</sendAnywayText> oder <cancelText>abbrechen</cancelText>.",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index e96fd3b887..6d39586c0a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -186,7 +186,6 @@
     "Not a valid Riot keyfile": "Not a valid Riot keyfile",
     "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?",
     "Failed to join room": "Failed to join room",
-    "Message Replies": "Message Replies",
     "Message Pinning": "Message Pinning",
     "Disable Emoji suggestions while typing": "Disable Emoji suggestions while typing",
     "Use compact timeline layout": "Use compact timeline layout",
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 9526e87285..7c13228264 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -932,7 +932,6 @@
     "%(count)s of your messages have not been sent.|one": "Zure mezua ez da bidali.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Birbidali guztiak</resendText> edo <cancelText>baztertu guztiak</cancelText> orain. Mezuak banaka birbidali edo baztertu ditzakezu ere.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Birbidali mezua</resendText> edo <cancelText>baztertu mezua</cancelText> orain.",
-    "Message Replies": "Mezuei erantzunak",
     "Send an encrypted reply…": "Bidali zifratutako erantzun bat…",
     "Send a reply (unencrypted)…": "Bidali erantzun bat (zifratu gabea)…",
     "Send an encrypted message…": "Bidali zifratutako mezu bat…",
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 9e6115b853..cb5bc86515 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -932,7 +932,6 @@
     "%(count)s of your messages have not been sent.|one": "Votre message n'a pas été envoyé.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Tout renvoyer</resendText> ou <cancelText>tout annuler</cancelText> maintenant. Vous pouvez aussi choisir des messages individuels à renvoyer ou annuler.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Renvoyer le message</resendText> ou <cancelText>annuler le message</cancelText> maintenant.",
-    "Message Replies": "Réponses",
     "Send an encrypted reply…": "Envoyer une réponse chiffrée…",
     "Send a reply (unencrypted)…": "Envoyer une réponse (non chiffrée)…",
     "Send an encrypted message…": "Envoyer un message chiffré…",
diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 52feb86b30..ec2643712a 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -232,7 +232,6 @@
     "Disable Notifications": "Deshabilitar notificacións",
     "Enable Notifications": "Habilitar notificacións",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s  %(fullYear)s",
-    "Message Replies": "Respostas a mensaxe",
     "Mirror local video feed": "Copiar fonte de vídeo local",
     "Cannot add any more widgets": "Non pode engadir máis widgets",
     "The maximum permitted number of widgets have already been added to this room.": "Xa se engadeu o número máximo de widgets a esta sala.",
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 425f03b180..4bbfe52d75 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -932,7 +932,6 @@
     "%(count)s of your messages have not been sent.|one": "Az üzeneted nem lett elküldve.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Újraküldöd mind</resendText> vagy <cancelText>elveted mind</cancelText>. Az üzeneteket egyenként is elküldheted vagy elvetheted.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Üzenet újraküldése</resendText> vagy <cancelText>üzenet elvetése</cancelText> most.",
-    "Message Replies": "Üzenet válaszok",
     "Send an encrypted reply…": "Titkosított válasz küldése…",
     "Send a reply (unencrypted)…": "Válasz küldése (titkosítatlanul)…",
     "Send an encrypted message…": "Titkosított üzenet küldése…",
diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json
index a7458a525f..0c6bcb0977 100644
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -717,7 +717,6 @@
     "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s vidžets, kuru mainīja %(senderName)s",
     "%(names)s and %(count)s others are typing|other": "%(names)s un %(count)s citi raksta",
     "%(names)s and %(count)s others are typing|one": "%(names)s un vēl kāds raksta",
-    "Message Replies": "Atbildes uz ziņām",
     "Message Pinning": "Ziņu piekabināšana",
     "Disable Emoji suggestions while typing": "Atspējot Emoji ieteikumus teksta rakstīšanas laikā",
     "Hide avatar changes": "Slēpt avatara izmaiņas",
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 90be5ee923..ea97531832 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -705,7 +705,6 @@
     "%(names)s and %(count)s others are typing|one": "%(names)s en iemand anders is aan het typen",
     "Send": "Verstuur",
     "Message Pinning": "Boodschap vastpinnen",
-    "Message Replies": "Antwoorden op bericht",
     "Disable Emoji suggestions while typing": "Emoji suggesties tijdens het typen uitzetten",
     "Hide avatar changes": "Avatar veranderingen verbergen",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 700c7edecc..c583e795cb 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -681,7 +681,6 @@
     "%(names)s and %(count)s others are typing|other": "%(names)s e %(count)s outras pessoas estão escrevendo",
     "%(names)s and %(count)s others are typing|one": "%(names)s e uma outra pessoa estão escrevendo",
     "Send": "Enviar",
-    "Message Replies": "Respostas",
     "Message Pinning": "Fixar mensagem",
     "Disable Emoji suggestions while typing": "Desativar sugestões de emojis enquanto estiver escrevendo",
     "Hide join/leave messages (invites/kicks/bans unaffected)": "Ocultar mensagens de entrada e de saída (não afeta convites, expulsões e banimentos)",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 48824c7394..a82e5be64e 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -932,7 +932,6 @@
     "%(count)s of your messages have not been sent.|one": "Ваше сообщение не было отправлено.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Отправить все</resendText> или <cancelText>отменить все</cancelText> сейчас. Можно также выбрать отдельные сообщения для отправки или отмены.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Отправить</resendText> или <cancelText>отменить</cancelText> сообщение сейчас.",
-    "Message Replies": "Сообщения-ответы",
     "Send an encrypted reply…": "Отправить зашифрованный ответ…",
     "Send a reply (unencrypted)…": "Отправить ответ (нешифрованный)…",
     "Send an encrypted message…": "Отправить зашифрованное сообщение…",
diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index 4988ac262b..b1f3f4260d 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -929,7 +929,6 @@
     "Flair will not appear": "Príslušnosť ku komunite nebude zobrazená",
     "Display your community flair in rooms configured to show it.": "Zobrazovať vašu príslušnosť ku komunite v miestnostiach, ktoré sú nastavené na zobrazovanie tejto príslušnosti.",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s",
-    "Message Replies": "Odpovede na správy",
     "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Túto zmenu nebudete môcť vrátiť späť pretože  znižujete vašu vlastnú úroveň moci. Ak ste jediný poverený používateľ v miestnosti, nebudete môcť znovu získať úroveň, akú máte teraz.",
     "Send an encrypted reply…": "Odoslať šifrovanú odpoveď…",
     "Send a reply (unencrypted)…": "Odoslať odpoveď (nešifrovanú)…",
diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json
index 86f1faade6..c9f6653e26 100644
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -168,7 +168,6 @@
     "Not a valid Riot keyfile": "Није исправана Riot кључ-датотека",
     "Authentication check failed: incorrect password?": "Провера идентитета није успела: нетачна лозинка?",
     "Failed to join room": "Нисам успео да уђем у собу",
-    "Message Replies": "Одговори",
     "Message Pinning": "Закачене поруке",
     "Disable Emoji suggestions while typing": "Онемогући предлагање емоџија приликом куцања",
     "Use compact timeline layout": "Користи збијени распоред временске линије",
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 2d81d0768b..0fb01a4cc6 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -1019,7 +1019,6 @@
     "Add rooms to the community": "Lägg till rum i communityn",
     "Add to community": "Lägg till i community",
     "Failed to invite users to community": "Det gick inte att bjuda in användare till communityn",
-    "Message Replies": "Meddelandesvar",
     "Mirror local video feed": "Spegelvänd lokal video",
     "Disable Community Filter Panel": "Inaktivera community-filterpanel",
     "Community Invites": "Community-inbjudningar",
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 28a1a35ef1..56d5c1e4dc 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -741,7 +741,6 @@
     "Add rooms to the community": "添加聊天室到社区",
     "Add to community": "添加到社区",
     "Failed to invite users to community": "邀请用户到社区失败",
-    "Message Replies": "消息回复",
     "Disable Peer-to-Peer for 1:1 calls": "在一对一通话中禁用 P2P 对等网络",
     "Enable inline URL previews by default": "默认启用网址预览",
     "Disinvite this user?": "取消邀请此用户？",
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 4250e87c3b..e14268cfa1 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -700,7 +700,6 @@
     "%(names)s and %(count)s others are typing|other": "%(names)s 與其他 %(count)s 個人正在輸入",
     "%(names)s and %(count)s others are typing|one": "%(names)s 與另一個人正在輸入",
     "Send": "傳送",
-    "Message Replies": "訊息回覆",
     "Message Pinning": "訊息釘選",
     "Disable Emoji suggestions while typing": "在輸入時停用繪文字建議",
     "Hide avatar changes": "隱藏大頭貼變更",
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"),