Remove quote when editing a message

ts/components/CompositionArea.tsx

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

ts/state/ducks/conversations.ts

@@ -1754,6 +1754,12 @@ function setMessageToEdit(
       return;
     }
 
+    setQuoteByMessageId(conversationId, undefined)(
+      dispatch,
+      getState,
+      undefined
+    );
+
     let attachmentThumbnail: string | undefined;
     if (message.attachments) {
       const thumbnailPath = message.attachments[0]?.thumbnail?.path;