From 2a58247b2b12a75f9070ce9d9c83c41d4499c206 Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Fri, 27 Mar 2026 10:16:10 +0700
Subject: [PATCH] feat: Use the displayed email id here, not only
 _currentEmailId.

---
 .../presentation/controller/single_email_controller.dart  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/features/email/presentation/controller/single_email_controller.dart b/lib/features/email/presentation/controller/single_email_controller.dart
index 1efd7cae9..10cf0e792 100644
--- a/lib/features/email/presentation/controller/single_email_controller.dart
+++ b/lib/features/email/presentation/controller/single_email_controller.dart
@@ -344,8 +344,8 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
         );
       } else if (action is RemoveLabelFromEmailAction) {
         mailboxDashBoardController.clearEmailUIAction();
-        if (_currentEmailId == null ||
-            action.emailId != _currentEmailId) {
+        final displayedEmailId = _currentEmailId ?? currentEmail?.id;
+        if (displayedEmailId == null || action.emailId != displayedEmailId) {
           return;
         }
         mailboxDashBoardController.toggleLabelToEmail(
@@ -355,8 +355,8 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
         );
       } else if (action is SyncUpdateLabelForEmailOnMemory) {
         mailboxDashBoardController.clearEmailUIAction();
-        if (_currentEmailId == null ||
-            action.emailId != _currentEmailId) {
+        final displayedEmailId = _currentEmailId ?? currentEmail?.id;
+        if (displayedEmailId == null || action.emailId != displayedEmailId) {
           return;
         }