diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index a4ea9e4f06..b0f258f7e3 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -422,10 +422,11 @@ module.exports = React.createClass({
         const mxEvent = this.props.mxEvent;
         const content = mxEvent.getContent();
 
+        const stripReply = SettingsStore.isFeatureEnabled("feature_rich_quoting") && ReplyThread.getInReplyTo(mxEvent);
         let body = HtmlUtils.bodyToHtml(content, this.props.highlights, {
             disableBigEmoji: SettingsStore.getValue('TextualBody.disableBigEmoji'),
             // Part of Replies fallback support
-            stripReplyFallback: Boolean(ReplyThread.getInReplyTo(mxEvent)),
+            stripReplyFallback: stripReply,
         });
 
         if (this.props.highlightLink) {