Merge pull request #5978 from vector-im/t3chguy/nvl/rich_quoting

Iterative fixes on Rich Quoting

src/components/views/context_menus/MessageContextMenu.js

@@ -232,6 +232,14 @@ module.exports = React.createClass({
                     </div>
                 );
 
+                if (SettingsStore.isFeatureEnabled("feature_rich_quoting")) {
+                    replyButton = (
+                        <div className="mx_MessageContextMenu_field" onClick={this.onReplyClick}>
+                            { _t('Reply') }
+                        </div>
+                    );
+                }
+
                 if (this.state.canPin) {
                     pinButton = (
                         <div className="mx_MessageContextMenu_field" onClick={this.onPinClick}>
@@ -280,14 +288,6 @@ module.exports = React.createClass({
                     { _t('Quote') }
                 </div>
             );
-
-            if (SettingsStore.isFeatureEnabled("feature_rich_quoting")) {
-                replyButton = (
-                    <div className="mx_MessageContextMenu_field" onClick={this.onReplyClick}>
-                        { _t('Reply') }
-                    </div>
-                );
-            }
         }
 
         // Bridges can provide a 'external_url' to link back to the source.

src/skins/vector/css/matrix-react-sdk/views/rooms/_QuotePreview.scss

@@ -28,6 +28,7 @@
 
 .mx_QuotePreview_cancel {
     float: right;
+    cursor: pointer;
 }
 
 .mx_QuotePreview_clear {