diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index dfff031f..f2a10674 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -170,10 +170,17 @@ module.exports = React.createClass({
     },
 
     onQuoteClick: function() {
-        dis.dispatch({
-            action: 'quote_event',
-            event: this.props.mxEvent,
-        });
+        if (SettingsStore.isFeatureEnabled("feature_rich_quoting")) {
+            dis.dispatch({
+                action: 'quote_event',
+                event: this.props.mxEvent,
+            });
+        } else {
+            dis.dispatch({
+                action: 'quote',
+                text: this.props.eventTileOps.getInnerText(),
+            });
+        }
         this.closeMenu();
     },