diff --git a/integration_test/mixin/provisioning_label_scenario_mixin.dart b/integration_test/mixin/provisioning_label_scenario_mixin.dart
index 395302d7a..9e45e7d80 100644
--- a/integration_test/mixin/provisioning_label_scenario_mixin.dart
+++ b/integration_test/mixin/provisioning_label_scenario_mixin.dart
@@ -23,10 +23,12 @@ mixin ProvisioningLabelScenarioMixin {
     final accountId = dashboardController?.accountId.value;
     final labelController = dashboardController?.labelController;
 
-    if (createLabelInteractor == null || accountId == null) {
+    if (dashboardController == null ||
+        createLabelInteractor == null ||
+        accountId == null) {
       log(
         'ProvisioningLabelScenarioMixin::provisionLabels '
-        'skipped: missing CreateNewLabelInteractor or accountId',
+        'skipped: missing dashboardController, CreateNewLabelInteractor, or accountId',
       );
       return [];
     }
diff --git a/integration_test/scenarios/search/search_email_with_tag_scenario.dart b/integration_test/scenarios/search/search_email_with_tag_scenario.dart
index 45494fef3..463657882 100644
--- a/integration_test/scenarios/search/search_email_with_tag_scenario.dart
+++ b/integration_test/scenarios/search/search_email_with_tag_scenario.dart
@@ -76,6 +76,7 @@ class SearchEmailWithTagScenario extends BaseTestScenario
     required String tagDisplayName,
     required int emailCount,
   }) async {
+    // Emails provisioned by buildEmailsForLabel include the tag name in the subject
     final listEmailTileWithTag = $.tester.widgetList<EmailTileBuilder>(
       $(EmailTileBuilder).which<EmailTileBuilder>((widget) =>
           widget.presentationEmail.subject?.contains(tagDisplayName) == true),
diff --git a/lib/features/base/widget/popup_menu/popup_menu_item_action_widget.dart b/lib/features/base/widget/popup_menu/popup_menu_item_action_widget.dart
index c86959522..e64673fb8 100644
--- a/lib/features/base/widget/popup_menu/popup_menu_item_action_widget.dart
+++ b/lib/features/base/widget/popup_menu/popup_menu_item_action_widget.dart
@@ -221,7 +221,7 @@ class _PopupMenuItemActionWidgetState extends State<PopupMenuItemActionWidget> {
             child: Row(
               children: [
                 if (iconWidget != null) iconWidget,
-                if (!isArrangeRTL && selectedIconWidget != null)
+                if (!isArrangeRTL && isSelected && selectedIconWidget != null)
                   Padding(
                     padding: const EdgeInsetsDirectional.only(end: 16),
                     child: selectedIconWidget,
diff --git a/lib/features/composer/presentation/model/create_email_request.dart b/lib/features/composer/presentation/model/create_email_request.dart
index 83a2a15eb..4c02690ba 100644
--- a/lib/features/composer/presentation/model/create_email_request.dart
+++ b/lib/features/composer/presentation/model/create_email_request.dart
@@ -114,7 +114,7 @@ class CreateEmailRequest with EquatableMixin {
     templateEmailId,
     answerForwardEmailId,
     unsubscribeEmailId,
-    references,
+    messageId,
     references,
     emailSendingQueue,
     displayMode,
diff --git a/lib/features/email/presentation/email_view.dart b/lib/features/email/presentation/email_view.dart
index f03b3e71a..f1f077f10 100644
--- a/lib/features/email/presentation/email_view.dart
+++ b/lib/features/email/presentation/email_view.dart
@@ -262,15 +262,13 @@ class EmailView extends GetWidget<SingleEmailController> {
             final isLabelAvailable = controller
                 .mailboxDashBoardController.isLabelAvailable;
 
-            final labelController =
-                controller.mailboxDashBoardController.labelController;
+            final listLabels =
+                controller.mailboxDashBoardController.labelController.labels;
 
             List<Label>? emailLabels;
 
             if (isLabelAvailable) {
-              emailLabels = presentationEmail.getLabelList(
-                labelController.labels,
-              );
+              emailLabels = presentationEmail.getLabelList(listLabels);
             }
 
             return EmailSubjectWidget(
diff --git a/lib/features/mailbox/presentation/base_mailbox_view.dart b/lib/features/mailbox/presentation/base_mailbox_view.dart
index cbbbd19f0..69e211b92 100644
--- a/lib/features/mailbox/presentation/base_mailbox_view.dart
+++ b/lib/features/mailbox/presentation/base_mailbox_view.dart
@@ -349,18 +349,14 @@ abstract class BaseMailboxView extends GetWidget<MailboxController>
 
   Widget buildLabelsBar(BuildContext context, bool isDesktop) {
     return Obx(() {
-      final isLabelCapabilitySupported = controller
+      final isLabelAvailable = controller
           .mailboxDashBoardController
-          .isLabelCapabilitySupported;
+          .isLabelAvailable;
 
       final labelController =
           controller.mailboxDashBoardController.labelController;
 
-      final isLabelSettingEnabled = labelController
-          .isLabelSettingEnabled
-          .isTrue;
-
-      if (isLabelCapabilitySupported && isLabelSettingEnabled) {
+      if (isLabelAvailable) {
         final accountId = controller.accountId;
         final labelListExpandMode = labelController.labelListExpandMode.value;
         final countLabels = labelController.labels.length;
diff --git a/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart b/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart
index c1454e79c..7a462f80e 100644
--- a/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart
+++ b/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart
@@ -2360,11 +2360,7 @@ class MailboxDashBoardController extends ReloadableController
         _deleteFolderSearchFilter();
         break;
       case QuickSearchFilter.starred:
-        deleteStarredSearchFilter();
-        break;
       case QuickSearchFilter.unread:
-        deleteUnreadSearchFilter();
-        break;
       case QuickSearchFilter.labels:
         deleteQuickSearchFilter(filter: searchFilter);
         break;
diff --git a/lib/features/mailbox_dashboard/presentation/extensions/select_search_filter_action_extension.dart b/lib/features/mailbox_dashboard/presentation/extensions/select_search_filter_action_extension.dart
index 26e3e5be8..a7662a0a6 100644
--- a/lib/features/mailbox_dashboard/presentation/extensions/select_search_filter_action_extension.dart
+++ b/lib/features/mailbox_dashboard/presentation/extensions/select_search_filter_action_extension.dart
@@ -39,6 +39,12 @@ extension SelectSearchFilterActionExtension on MailboxDashBoardController {
       case QuickSearchFilter.labels:
         searchController.updateFilterEmail(labelOption: const None());
         break;
+      case QuickSearchFilter.starred:
+        deleteStarredSearchFilter();
+        break;
+      case QuickSearchFilter.unread:
+        deleteUnreadSearchFilter();
+        break;
       default:
         break;
     }
diff --git a/lib/features/mailbox_dashboard/presentation/model/search/search_email_filter.dart b/lib/features/mailbox_dashboard/presentation/model/search/search_email_filter.dart
index d338ea6e9..338d39fc3 100644
--- a/lib/features/mailbox_dashboard/presentation/model/search/search_email_filter.dart
+++ b/lib/features/mailbox_dashboard/presentation/model/search/search_email_filter.dart
@@ -151,8 +151,8 @@ class SearchEmailFilter with EquatableMixin, OptionParamMixin {
           Operator.AND,
           hasKeyword.map((e) => EmailFilterCondition(hasKeyword: e)).toSet(),
         ),
-      if (label != null)
-        EmailFilterCondition(hasKeyword: label!.keyword?.value),
+      if (label?.keyword?.value != null)
+        EmailFilterCondition(hasKeyword: label!.keyword!.value),
       if (moreFilterCondition != null && moreFilterCondition.hasCondition)
         moreFilterCondition
     };
diff --git a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_input_form.dart b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_input_form.dart
index 46c9c36d2..90ab52a29 100644
--- a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_input_form.dart
+++ b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_input_form.dart
@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
+import 'package:tmail_ui_user/features/base/model/filter_filter.dart';
 import 'package:tmail_ui_user/features/base/widget/default_field/default_autocomplete_input_field_widget.dart';
 import 'package:tmail_ui_user/features/base/widget/default_field/default_button_arrow_down_field_with_tab_key_widget.dart';
 import 'package:tmail_ui_user/features/base/widget/default_field/default_date_drop_down_field_widget.dart';
 import 'package:tmail_ui_user/features/base/widget/default_field/default_input_field_with_tab_key_widget.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/advanced_filter_controller.dart';
-import 'package:tmail_ui_user/features/base/model/filter_filter.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/advanced_search/update_label_in_advanced_search_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/labels/handle_logic_label_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/email_receive_time_type.dart';