From 853727541f26a2046facfb67815631cc8ee3b4b9 Mon Sep 17 00:00:00 2001
From: Sergey Mosin <sergey@srgdev.com>
Date: Tue, 5 Dec 2023 14:03:38 -0500
Subject: [PATCH] fix: flag indicators are added to wrong message when another
 message is selected while composing

---
 dev/View/Popup/Compose.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js
index 70d5c4e673..cab8e42113 100644
--- a/dev/View/Popup/Compose.js
+++ b/dev/View/Popup/Compose.js
@@ -500,10 +500,10 @@ export class ComposePopupView extends AbstractViewPopup {
 										'forward': '$forwarded'
 									}[this.aDraftInfo[0]];
 									if (flag) {
-										const aFlags = MessageUserStore.message().flags();
+										const aFlags = oLastMessage.flags();
 										if (aFlags.indexOf(flag) === -1) {
 											aFlags.push(flag);
-											MessageUserStore.message().flags(aFlags);
+											oLastMessage.flags(aFlags);
 										}
 									}
 								}