Allow quotes to be removed when editing a message

ts/components/CompositionArea.tsx

@@ -930,13 +930,9 @@ export function CompositionArea({
                   ? () => scrollToMessage(conversationId, quotedMessageId)
                   : undefined
               }
-              onClose={
-                draftEditMessage
-                  ? undefined
-                  : () => {
-                      setQuoteByMessageId(conversationId, undefined);
-                    }
-              }
+              onClose={() => {
+                setQuoteByMessageId(conversationId, undefined);
+              }}
             />
           </div>
         )}

ts/state/ducks/composer.ts

@@ -749,7 +749,18 @@ export function setQuoteByMessageId(
     }
 
     const draftEditMessage = conversation.get('draftEditMessage');
-    if (draftEditMessage) {
+    // We can remove quotes, but we can't add them
+    if (draftEditMessage && messageId) {
+      return;
+    }
+    if (draftEditMessage && draftEditMessage.quote) {
+      conversation.set({
+        draftEditMessage: {
+          ...draftEditMessage,
+          quote: undefined,
+        },
+      });
+      dispatch(setComposerFocus(conversation.id));
       return;
     }