From 4ca6b6fc3688cf8cc3d15d3ec573cbdfad901832 Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Fri, 2 Jan 2026 17:51:09 +0700
Subject: [PATCH 1/8] TF-4229 Add widget for label search field

---
 lib/features/base/model/filter_filter.dart    |   5 +
 .../email/presentation/email_view.dart        |  10 +-
 .../presentation/base_mailbox_view.dart       |  11 +-
 .../advanced_filter_controller.dart           |   2 +
 .../mailbox_dashboard_controller.dart         |   8 +-
 ...te_label_in_advanced_search_extension.dart |  12 ++
 .../labels/handle_logic_label_extension.dart  |  18 +++
 .../styles/label_drop_down_style.dart         |  42 ++++++
 .../advanced_search_field_widget.dart         |  14 +-
 .../advanced_search_input_form.dart           |  27 ++++
 .../label_drop_down_button.dart               | 123 ++++++++++++++++++
 .../email/presentation/search_email_view.dart |   8 +-
 .../thread/presentation/thread_view.dart      |  10 +-
 .../presentation/thread_detail_view.dart      |  10 +-
 lib/l10n/intl_messages.arb                    |   6 +
 lib/main/localizations/app_localizations.dart |   7 +
 16 files changed, 272 insertions(+), 41 deletions(-)
 create mode 100644 lib/features/mailbox_dashboard/presentation/extensions/advanced_search/update_label_in_advanced_search_extension.dart
 create mode 100644 lib/features/mailbox_dashboard/presentation/extensions/labels/handle_logic_label_extension.dart
 create mode 100644 lib/features/mailbox_dashboard/presentation/styles/label_drop_down_style.dart
 create mode 100644 lib/features/mailbox_dashboard/presentation/widgets/advanced_search/label_drop_down_button.dart

diff --git a/lib/features/base/model/filter_filter.dart b/lib/features/base/model/filter_filter.dart
index 04801db2c5..672a4498c8 100644
--- a/lib/features/base/model/filter_filter.dart
+++ b/lib/features/base/model/filter_filter.dart
@@ -13,6 +13,7 @@ enum FilterField {
   mailBox,
   date,
   sortBy,
+  labels,
   hasAttachment,
   deletionDate,
   receptionDate,
@@ -49,6 +50,8 @@ enum FilterField {
         return appLocalizations.headerRecipients;
       case FilterField.sender:
         return appLocalizations.sender;
+      case FilterField.labels:
+        return appLocalizations.labels;
       default:
         return '';
     }
@@ -77,6 +80,8 @@ enum FilterField {
       case FilterField.recipients:
       case FilterField.sender:
         return appLocalizations.addAnEmailAddress;
+      case FilterField.labels:
+        return appLocalizations.allLabels;
       default:
         return '';
     }
diff --git a/lib/features/email/presentation/email_view.dart b/lib/features/email/presentation/email_view.dart
index 058fb34d46..2d3fd21408 100644
--- a/lib/features/email/presentation/email_view.dart
+++ b/lib/features/email/presentation/email_view.dart
@@ -41,6 +41,7 @@ import 'package:tmail_ui_user/features/email/presentation/widgets/information_se
 import 'package:tmail_ui_user/features/email/presentation/widgets/mail_unsubscribed_banner.dart';
 import 'package:tmail_ui_user/features/email/presentation/widgets/view_entire_message_with_message_clipped_widget.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/handle_open_context_menu_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/extensions/verify_display_overlay_view_on_iframe_extension.dart';
 import 'package:tmail_ui_user/features/manage_account/presentation/extensions/vacation_response_extension.dart';
 import 'package:tmail_ui_user/features/manage_account/presentation/vacation/widgets/vacation_notification_message_widget.dart';
@@ -258,18 +259,15 @@ class EmailView extends GetWidget<SingleEmailController> {
       children: [
         if (!isInsideThreadDetailView || isFirstEmailInThreadDetail)
           Obx(() {
-            final isLabelCapabilitySupported = controller
-                .mailboxDashBoardController.isLabelCapabilitySupported;
+            final isLabelAvailable = controller
+                .mailboxDashBoardController.isLabelAvailable;
 
             final labelController =
                 controller.mailboxDashBoardController.labelController;
 
-            final isLabelSettingEnabled =
-                labelController.isLabelSettingEnabled.isTrue;
-
             List<Label>? emailLabels;
 
-            if (isLabelCapabilitySupported && isLabelSettingEnabled) {
+            if (isLabelAvailable) {
               emailLabels = presentationEmail.getLabelList(
                 labelController.labels,
               );
diff --git a/lib/features/mailbox/presentation/base_mailbox_view.dart b/lib/features/mailbox/presentation/base_mailbox_view.dart
index aabe8b529a..2e123ae436 100644
--- a/lib/features/mailbox/presentation/base_mailbox_view.dart
+++ b/lib/features/mailbox/presentation/base_mailbox_view.dart
@@ -24,6 +24,7 @@ import 'package:tmail_ui_user/features/mailbox/presentation/widgets/mailbox_cate
 import 'package:tmail_ui_user/features/mailbox/presentation/widgets/mailbox_item_widget.dart';
 import 'package:tmail_ui_user/features/mailbox/presentation/widgets/mailbox_loading_bar_widget.dart';
 import 'package:tmail_ui_user/features/mailbox/presentation/widgets/sending_queue_mailbox_widget.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/dashboard_routes.dart';
 
 abstract class BaseMailboxView extends GetWidget<MailboxController>
@@ -381,18 +382,14 @@ abstract class BaseMailboxView extends GetWidget<MailboxController>
 
   Widget buildLabelsList(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 labelListExpandMode = labelController.labelListExpandMode.value;
         final labels = labelController.labels;
 
diff --git a/lib/features/mailbox_dashboard/presentation/controller/advanced_filter_controller.dart b/lib/features/mailbox_dashboard/presentation/controller/advanced_filter_controller.dart
index 4cf01449b6..3f2e0309ab 100644
--- a/lib/features/mailbox_dashboard/presentation/controller/advanced_filter_controller.dart
+++ b/lib/features/mailbox_dashboard/presentation/controller/advanced_filter_controller.dart
@@ -5,6 +5,7 @@ import 'package:get/get.dart';
 import 'package:jmap_dart_client/jmap/core/utc_date.dart';
 import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
 import 'package:jmap_dart_client/jmap/mail/email/keyword_identifier.dart';
+import 'package:labels/labels.dart';
 import 'package:model/model.dart';
 import 'package:super_tag_editor/tag_editor.dart';
 import 'package:tmail_ui_user/features/base/base_controller.dart';
@@ -40,6 +41,7 @@ class AdvancedFilterController extends BaseController {
   final endDate = Rxn<DateTime>();
   final sortOrderType = SearchEmailFilter.defaultSortOrder.obs;
   final selectedFolderName = Rxn<String>();
+  final selectedLabel = Rxn<Label>();
 
   final GlobalKey<TagsEditorState> keyFromEmailTagEditor = GlobalKey<TagsEditorState>();
   final GlobalKey<TagsEditorState> keyToEmailTagEditor = GlobalKey<TagsEditorState>();
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 e17d7f4763..956abb6e4e 100644
--- a/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart
+++ b/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart
@@ -133,6 +133,7 @@ import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/handle_save_email_as_draft_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/handle_store_email_sort_order_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/initialize_app_language.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/extensions/notify_thread_detail_setting_updated.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/open_and_close_composer_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/reopen_composer_cache_extension.dart';
@@ -899,13 +900,6 @@ class MailboxDashBoardController extends ReloadableController
     }
   }
 
-  bool get isLabelCapabilitySupported {
-    if (accountId.value == null || sessionCurrent == null) return false;
-
-    return labelController
-        .isLabelCapabilitySupported(sessionCurrent!, accountId.value!);
-  }
-
   void _handleMailtoURL(MailtoArguments arguments) {
     log('MailboxDashBoardController::_handleMailtoURL:');
     routerParameters.value = arguments.toMapRouter();
diff --git a/lib/features/mailbox_dashboard/presentation/extensions/advanced_search/update_label_in_advanced_search_extension.dart b/lib/features/mailbox_dashboard/presentation/extensions/advanced_search/update_label_in_advanced_search_extension.dart
new file mode 100644
index 0000000000..9a0fdda883
--- /dev/null
+++ b/lib/features/mailbox_dashboard/presentation/extensions/advanced_search/update_label_in_advanced_search_extension.dart
@@ -0,0 +1,12 @@
+import 'package:labels/labels.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/advanced_filter_controller.dart';
+
+extension UpdateLabelInAdvancedSearchExtension on AdvancedFilterController {
+  void setSelectedLabel(Label? newLabel) {
+    if (selectedLabel.value?.id == newLabel?.id) {
+      selectedLabel.value = null;
+    } else {
+      selectedLabel.value = newLabel;
+    }
+  }
+}
diff --git a/lib/features/mailbox_dashboard/presentation/extensions/labels/handle_logic_label_extension.dart b/lib/features/mailbox_dashboard/presentation/extensions/labels/handle_logic_label_extension.dart
new file mode 100644
index 0000000000..74575046e5
--- /dev/null
+++ b/lib/features/mailbox_dashboard/presentation/extensions/labels/handle_logic_label_extension.dart
@@ -0,0 +1,18 @@
+import 'package:get/get.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart';
+
+extension HandleLogicLabelExtension on MailboxDashBoardController {
+  bool get isLabelCapabilitySupported {
+    final accountId = this.accountId.value;
+    final session = sessionCurrent;
+
+    if (accountId == null || session == null) return false;
+
+    return labelController.isLabelCapabilitySupported(session, accountId);
+  }
+
+  bool get isLabelAvailable {
+    return labelController.isLabelSettingEnabled.isTrue &&
+        isLabelCapabilitySupported;
+  }
+}
diff --git a/lib/features/mailbox_dashboard/presentation/styles/label_drop_down_style.dart b/lib/features/mailbox_dashboard/presentation/styles/label_drop_down_style.dart
new file mode 100644
index 0000000000..41caad309b
--- /dev/null
+++ b/lib/features/mailbox_dashboard/presentation/styles/label_drop_down_style.dart
@@ -0,0 +1,42 @@
+import 'package:core/presentation/extensions/color_extension.dart';
+import 'package:core/presentation/utils/theme_utils.dart';
+import 'package:dropdown_button2/dropdown_button2.dart';
+import 'package:flutter/material.dart';
+
+class LabelDropDownStyle {
+  static const int dropdownElevation = 0;
+
+  static const double height = 48;
+  static const double dropdownMaxHeight = 210;
+  static const double scrollbarThickness = 6;
+  static const double checkedIconSize = 20;
+
+  static final Color unCheckedIconColor =
+      AppColor.gray424244.withValues(alpha: 0.72);
+  static const Color checkedIconColor = AppColor.primaryMain;
+
+  static const Offset dropdownOffset = Offset(0.0, -3.0);
+
+  static BoxDecoration dropdownDecoration = BoxDecoration(
+    borderRadius: const BorderRadius.all(Radius.circular(16)),
+    color: Colors.white,
+    border: Border.all(color: AppColor.m3Tertiary60),
+    boxShadow: const [BoxShadow(color: Colors.black12, blurRadius: 24)],
+  );
+
+  static const EdgeInsetsGeometry buttonPadding = EdgeInsetsDirectional.only(
+    start: 12,
+    end: 8,
+  );
+  static const EdgeInsetsGeometry dropdownPadding = EdgeInsets.all(12);
+  static const MenuItemStyleData menuItemStyleData = MenuItemStyleData(
+    height: height,
+    padding: EdgeInsets.symmetric(horizontal: 12),
+  );
+
+  static const Radius dropdownScrollbarRadius = Radius.circular(40);
+
+  static TextStyle menuItemStyle = ThemeUtils.textStyleBodyBody3(
+    color: Colors.black,
+  );
+}
diff --git a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_field_widget.dart b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_field_widget.dart
index 780f5080a5..78f699874a 100644
--- a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_field_widget.dart
+++ b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_field_widget.dart
@@ -8,17 +8,19 @@ class AdvancedSearchFieldWidget extends StatelessWidget {
   final FilterField filterField;
   final Widget child;
   final bool useHeight;
+  final EdgeInsetsGeometry? padding;
 
   const AdvancedSearchFieldWidget({
     super.key,
     required this.filterField,
     required this.child,
     this.useHeight = true,
+    this.padding,
   });
 
   @override
   Widget build(BuildContext context) {
-    final bodyWidget = Row(
+    Widget bodyWidget = Row(
       children: [
         SizedBox(
           width: AdvancedSearchInputFormStyle.labelMaxWidth,
@@ -32,12 +34,16 @@ class AdvancedSearchFieldWidget extends StatelessWidget {
     );
 
     if (useHeight) {
-      return SizedBox(
+      bodyWidget = SizedBox(
         height: AdvancedSearchInputFormStyle.inputFieldHeight,
         child: bodyWidget,
       );
-    } else {
-      return bodyWidget;
     }
+
+    if (padding != null) {
+      bodyWidget = Padding(padding: padding!, child: bodyWidget);
+    }
+
+    return bodyWidget;
   }
 }
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 24babdced7..46c9c36d2d 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
@@ -6,9 +6,12 @@ import 'package:tmail_ui_user/features/base/widget/default_field/default_date_dr
 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';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_field_widget.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_filter_form_bottom_view.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/widgets/advanced_search/label_drop_down_button.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/widgets/advanced_search/sort_by_drop_down_button.dart';
 import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
 
@@ -119,6 +122,30 @@ class AdvancedSearchInputForm extends GetWidget<AdvancedFilterController> {
             )),
           ),
           const SizedBox(height: 12),
+          Obx(() {
+            final isLabelAvailable =
+                controller.mailboxDashBoardController.isLabelAvailable;
+
+            final labels =
+                controller.mailboxDashBoardController.labelController.labels;
+
+            final labelSelected = controller.selectedLabel.value;
+
+            if (isLabelAvailable) {
+              return AdvancedSearchFieldWidget(
+                filterField: FilterField.labels,
+                padding: const EdgeInsets.only(bottom: 12),
+                child: LabelDropDownButton(
+                  imagePaths: controller.imagePaths,
+                  labels: labels,
+                  labelSelected: labelSelected,
+                  onSelectLabelsActions: controller.setSelectedLabel,
+                ),
+              );
+            } else {
+              return const SizedBox.shrink();
+            }
+          }),
           AdvancedSearchFieldWidget(
             filterField: FilterField.date,
             child: Obx(() => DefaultDateDropDownFieldWidget(
diff --git a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/label_drop_down_button.dart b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/label_drop_down_button.dart
new file mode 100644
index 0000000000..ace7ccbb54
--- /dev/null
+++ b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/label_drop_down_button.dart
@@ -0,0 +1,123 @@
+import 'package:core/presentation/extensions/color_extension.dart';
+import 'package:core/presentation/resources/image_paths.dart';
+import 'package:dropdown_button2/dropdown_button2.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:labels/labels.dart';
+import 'package:pointer_interceptor/pointer_interceptor.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/styles/advanced_search_input_form_style.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/styles/label_drop_down_style.dart';
+import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
+
+typedef OnSelectLabelsActions = void Function(Label? label);
+
+class LabelDropDownButton extends StatelessWidget {
+  final ImagePaths imagePaths;
+  final List<Label> labels;
+  final Label? labelSelected;
+  final OnSelectLabelsActions onSelectLabelsActions;
+
+  const LabelDropDownButton({
+    Key? key,
+    required this.imagePaths,
+    required this.labels,
+    required this.labelSelected,
+    required this.onSelectLabelsActions,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return DropdownButtonHideUnderline(
+      child: PointerInterceptor(
+        child: DropdownButton2<Label>(
+          isExpanded: true,
+          items: labels.map((label) {
+            final isSelected = labelSelected?.id == label.id;
+            return DropdownMenuItem<Label>(
+              value: label,
+              child: PointerInterceptor(
+                child: Row(
+                  spacing: 16,
+                  children: [
+                    SvgPicture.asset(
+                      isSelected
+                          ? imagePaths.icCheckboxSelected
+                          : imagePaths.icCheckboxUnselected,
+                      width: LabelDropDownStyle.checkedIconSize,
+                      height: LabelDropDownStyle.checkedIconSize,
+                      colorFilter: isSelected
+                          ? LabelDropDownStyle.checkedIconColor.asFilter()
+                          : LabelDropDownStyle.unCheckedIconColor.asFilter(),
+                      fit: BoxFit.fill,
+                    ),
+                    Expanded(
+                      child: Text(
+                        label.safeDisplayName,
+                        style: LabelDropDownStyle.menuItemStyle,
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            );
+          }).toList(),
+          value: labelSelected,
+          customButton: _buildButton(AppLocalizations.of(context)),
+          onChanged: onSelectLabelsActions,
+          dropdownStyleData: DropdownStyleData(
+            maxHeight: LabelDropDownStyle.dropdownMaxHeight,
+            decoration: LabelDropDownStyle.dropdownDecoration,
+            elevation: LabelDropDownStyle.dropdownElevation,
+            offset: LabelDropDownStyle.dropdownOffset,
+            padding: LabelDropDownStyle.dropdownPadding,
+            scrollbarTheme: ScrollbarThemeData(
+              radius: LabelDropDownStyle.dropdownScrollbarRadius,
+              thickness: WidgetStateProperty.all<double>(
+                LabelDropDownStyle.scrollbarThickness,
+              ),
+              thumbVisibility: WidgetStateProperty.all<bool>(true),
+            ),
+          ),
+          menuItemStyleData: LabelDropDownStyle.menuItemStyleData,
+        ),
+      ),
+    );
+  }
+
+  Widget _buildButton(AppLocalizations appLocalizations) {
+    final displayedName =
+        labelSelected?.safeDisplayName ?? appLocalizations.allLabels;
+
+    return Container(
+      height: AdvancedSearchInputFormStyle.inputFieldHeight,
+      decoration: BoxDecoration(
+        borderRadius: const BorderRadius.all(
+          Radius.circular(
+            AdvancedSearchInputFormStyle.inputFieldBorderRadius,
+          ),
+        ),
+        border: Border.all(
+          color: AdvancedSearchInputFormStyle.inputFieldBorderColor,
+          width: AdvancedSearchInputFormStyle.inputFieldBorderWidth,
+        ),
+        color: AdvancedSearchInputFormStyle.inputFieldBackgroundColor,
+      ),
+      padding: LabelDropDownStyle.buttonPadding,
+      child: Row(
+        children: [
+          Expanded(
+            child: Text(
+              displayedName,
+              style: AdvancedSearchInputFormStyle.inputTextStyle,
+              maxLines: 1,
+              overflow: TextOverflow.ellipsis,
+            ),
+          ),
+          SvgPicture.asset(imagePaths.icDropDown)
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/features/search/email/presentation/search_email_view.dart b/lib/features/search/email/presentation/search_email_view.dart
index c24f02d973..0d654dd8e8 100644
--- a/lib/features/search/email/presentation/search_email_view.dart
+++ b/lib/features/search/email/presentation/search_email_view.dart
@@ -20,6 +20,7 @@ import 'package:tmail_ui_user/features/base/widget/popup_menu/popup_menu_item_ac
 import 'package:tmail_ui_user/features/base/widget/scrollbar_list_view.dart';
 import 'package:tmail_ui_user/features/email/presentation/extensions/presentation_email_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/model/recent_search.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';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/email_sort_order_type.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/quick_search_filter.dart';
@@ -728,16 +729,13 @@ class SearchEmailView extends GetWidget<SearchEmailController>
         final isShowingEmailContent =
             dashboardController.selectedEmail.value?.id == presentationEmail.id;
 
-        final isLabelCapabilitySupported = dashboardController.isLabelCapabilitySupported;
+        final isLabelAvailable = dashboardController.isLabelAvailable;
 
         final labelController = dashboardController.labelController;
 
-        final isLabelSettingEnabled =
-            labelController.isLabelSettingEnabled.isTrue;
-
         List<Label>? emailLabels;
 
-        if (isLabelCapabilitySupported && isLabelSettingEnabled) {
+        if (isLabelAvailable) {
           emailLabels = presentationEmail.getLabelList(
             labelController.labels,
           );
diff --git a/lib/features/thread/presentation/thread_view.dart b/lib/features/thread/presentation/thread_view.dart
index 46004ed9b0..6b7346965c 100644
--- a/lib/features/thread/presentation/thread_view.dart
+++ b/lib/features/thread/presentation/thread_view.dart
@@ -23,6 +23,7 @@ import 'package:tmail_ui_user/features/mailbox/domain/state/mark_as_mailbox_read
 import 'package:tmail_ui_user/features/mailbox/domain/state/move_folder_content_state.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/model/spam_report_state.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/handle_open_context_menu_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/extensions/open_and_close_composer_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/widgets/recover_deleted_message_loading_banner_widget.dart';
 import 'package:tmail_ui_user/features/manage_account/presentation/extensions/vacation_response_extension.dart';
@@ -594,18 +595,15 @@ class ThreadView extends GetWidget<ThreadController>
         direction,
       ),
       child: Obx(() {
-        final isLabelCapabilitySupported = controller
-            .mailboxDashBoardController.isLabelCapabilitySupported;
+        final isLabelAvailable = controller
+            .mailboxDashBoardController.isLabelAvailable;
 
         final labelController =
             controller.mailboxDashBoardController.labelController;
 
-        final isLabelSettingEnabled =
-            labelController.isLabelSettingEnabled.isTrue;
-
         List<Label>? emailLabels;
 
-        if (isLabelCapabilitySupported && isLabelSettingEnabled) {
+        if (isLabelAvailable) {
           emailLabels = presentationEmail.getLabelList(
             labelController.labels,
           );
diff --git a/lib/features/thread_detail/presentation/thread_detail_view.dart b/lib/features/thread_detail/presentation/thread_detail_view.dart
index bfce3f9996..31be12d80f 100644
--- a/lib/features/thread_detail/presentation/thread_detail_view.dart
+++ b/lib/features/thread_detail/presentation/thread_detail_view.dart
@@ -11,6 +11,7 @@ import 'package:tmail_ui_user/features/email/presentation/action/email_ui_action
 import 'package:tmail_ui_user/features/email/presentation/styles/email_view_app_bar_widget_styles.dart';
 import 'package:tmail_ui_user/features/email/presentation/widgets/email_view_bottom_bar_widget.dart';
 import 'package:tmail_ui_user/features/mailbox/presentation/extensions/presentation_mailbox_extension.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/labels/handle_logic_label_extension.dart';
 import 'package:tmail_ui_user/features/manage_account/presentation/extensions/vacation_response_extension.dart';
 import 'package:tmail_ui_user/features/manage_account/presentation/vacation/widgets/vacation_notification_message_widget.dart';
 import 'package:tmail_ui_user/features/thread_detail/domain/state/get_thread_by_id_state.dart';
@@ -101,16 +102,13 @@ class ThreadDetailView extends GetWidget<ThreadDetailController> {
           }
         }),
         Obx(() {
-          final isLabelCapabilitySupported = controller
-              .mailboxDashBoardController.isLabelCapabilitySupported;
+          final isLabelAvailable = controller
+              .mailboxDashBoardController.isLabelAvailable;
 
           final labelController =
               controller.mailboxDashBoardController.labelController;
 
-          final isLabelSettingEnabled =
-              labelController.isLabelSettingEnabled.isTrue;
-
-          final threadChildren = isLabelCapabilitySupported && isLabelSettingEnabled
+          final threadChildren = isLabelAvailable
             ? controller.getThreadDetailEmailViews(labels: labelController.labels)
             : controller.getThreadDetailEmailViews();
 
diff --git a/lib/l10n/intl_messages.arb b/lib/l10n/intl_messages.arb
index a729e839f0..85a2d7f96b 100644
--- a/lib/l10n/intl_messages.arb
+++ b/lib/l10n/intl_messages.arb
@@ -5305,5 +5305,11 @@
     "placeholders": {
       "labelName": {}
     }
+  },
+  "allLabels": "All labels",
+  "@allLabels": {
+    "type": "text",
+    "placeholders_order": [],
+    "placeholders": {}
   }
 }
\ No newline at end of file
diff --git a/lib/main/localizations/app_localizations.dart b/lib/main/localizations/app_localizations.dart
index 83785554d8..1cb9d9460f 100644
--- a/lib/main/localizations/app_localizations.dart
+++ b/lib/main/localizations/app_localizations.dart
@@ -5624,4 +5624,11 @@ class AppLocalizations {
     );
   }
 
+
+  String get allLabels {
+    return Intl.message(
+      'All labels',
+      name: 'allLabels',
+    );
+  }
 }

From e6feb15ce4ae017fc3f4f8a56e03dee28e4f3764 Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Fri, 2 Jan 2026 18:04:49 +0700
Subject: [PATCH 2/8] TF-4229 Implement advanced search email by label

---
 .../controller/advanced_filter_controller.dart      | 13 +++++++++++--
 .../model/search/search_email_filter.dart           | 12 +++++++++++-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/lib/features/mailbox_dashboard/presentation/controller/advanced_filter_controller.dart b/lib/features/mailbox_dashboard/presentation/controller/advanced_filter_controller.dart
index 3f2e0309ab..e68544c251 100644
--- a/lib/features/mailbox_dashboard/presentation/controller/advanced_filter_controller.dart
+++ b/lib/features/mailbox_dashboard/presentation/controller/advanced_filter_controller.dart
@@ -131,6 +131,7 @@ class AdvancedFilterController extends BaseController {
     Option<UTCDate>? endDateOption,
     Option<int>? positionOption,
     Option<EmailSortOrderType>? sortOrderTypeOption,
+    Option<Label>? labelOption,
   }) {
     _memorySearchFilter = _memorySearchFilter.copyWith(
       fromOption: fromOption,
@@ -147,7 +148,9 @@ class AdvancedFilterController extends BaseController {
       startDateOption: startDateOption,
       endDateOption: endDateOption,
       positionOption: positionOption,
-      sortOrderTypeOption: sortOrderTypeOption);
+      sortOrderTypeOption: sortOrderTypeOption,
+      labelOption: labelOption,
+    );
   }
 
   void _synchronizeSearchFilter() {
@@ -190,6 +193,8 @@ class AdvancedFilterController extends BaseController {
       {KeyWordIdentifier.emailFlagged.value},
     );
 
+    final labelOption = optionOf(selectedLabel.value);
+
     _updateMemorySearchFilter(
       textOption: textOption,
       notKeywordOption: notKeywordsOption,
@@ -203,7 +208,8 @@ class AdvancedFilterController extends BaseController {
       unreadOption: unreadOption,
       hasKeywordOption: hasKeywordOption,
       startDateOption: startDateOption,
-      endDateOption: endDateOption
+      endDateOption: endDateOption,
+      labelOption: labelOption,
     );
 
     searchController.synchronizeSearchFilter(_memorySearchFilter);
@@ -314,6 +320,8 @@ class AdvancedFilterController extends BaseController {
         : StringConvert.writeNullToEmpty(
             _memorySearchFilter.mailbox?.getDisplayName(context));
     }
+
+    selectedLabel.value = _memorySearchFilter.label;
   }
 
   void selectDateRange(BuildContext context) {
@@ -482,6 +490,7 @@ class AdvancedFilterController extends BaseController {
     listFromEmailAddress.clear();
     listToEmailAddress.clear();
     _destinationMailboxSelected = null;
+    selectedLabel.value = null;
   }
 
   void _clearAllTextFieldInput() {
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 a04b10c116..45c36dd13f 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
@@ -8,6 +8,7 @@ import 'package:jmap_dart_client/jmap/core/filter/operator/logic_filter_operator
 import 'package:jmap_dart_client/jmap/core/utc_date.dart';
 import 'package:jmap_dart_client/jmap/mail/email/email_filter_condition.dart';
 import 'package:jmap_dart_client/jmap/mail/email/keyword_identifier.dart';
+import 'package:labels/model/label.dart';
 import 'package:model/email/prefix_email_address.dart';
 import 'package:model/extensions/email_filter_condition_extension.dart';
 import 'package:model/extensions/presentation_mailbox_extension.dart';
@@ -35,6 +36,7 @@ class SearchEmailFilter with EquatableMixin, OptionParamMixin {
   final UTCDate? endDate;
   final int? position;
   final EmailSortOrderType sortOrderType;
+  final Label? label;
 
   factory SearchEmailFilter.initial() => SearchEmailFilter();
 
@@ -49,6 +51,7 @@ class SearchEmailFilter with EquatableMixin, OptionParamMixin {
     this.startDate,
     this.endDate,
     this.position,
+    this.label,
     Set<String>? from,
     Set<String>? to,
     EmailReceiveTimeType? emailReceiveTimeType,
@@ -83,6 +86,7 @@ class SearchEmailFilter with EquatableMixin, OptionParamMixin {
     Option<UTCDate>? endDateOption,
     Option<int>? positionOption,
     Option<EmailSortOrderType>? sortOrderTypeOption,
+    Option<Label>? labelOption,
   }) {
     return SearchEmailFilter(
       from: getOptionParam(fromOption, from),
@@ -100,6 +104,7 @@ class SearchEmailFilter with EquatableMixin, OptionParamMixin {
       endDate: getOptionParam(endDateOption, endDate),
       position: getOptionParam(positionOption, position),
       sortOrderType: getOptionParam(sortOrderTypeOption, sortOrderType),
+      label: getOptionParam(labelOption, label),
     );
   }
 
@@ -146,6 +151,8 @@ class SearchEmailFilter with EquatableMixin, OptionParamMixin {
           Operator.AND,
           hasKeyword.map((e) => EmailFilterCondition(hasKeyword: e)).toSet(),
         ),
+      if (label != null)
+        EmailFilterCondition(hasKeyword: label!.keyword),
       if (moreFilterCondition != null && moreFilterCondition.hasCondition)
         moreFilterCondition
     };
@@ -203,6 +210,7 @@ class SearchEmailFilter with EquatableMixin, OptionParamMixin {
     emailReceiveTimeType != EmailReceiveTimeType.allTime ||
     sortOrderType != SearchEmailFilter.defaultSortOrder ||
     (mailbox != null && mailbox?.id != PresentationMailbox.unifiedMailbox.id) ||
+    label != null ||
     hasAttachment ||
     unread;
 
@@ -217,6 +225,7 @@ class SearchEmailFilter with EquatableMixin, OptionParamMixin {
     emailReceiveTimeType == EmailReceiveTimeType.allTime &&
     sortOrderType == SearchEmailFilter.defaultSortOrder &&
     (mailbox == null || mailbox?.id == PresentationMailbox.unifiedMailbox.id) &&
+    label == null &&
     !hasAttachment &&
     !unread;
 
@@ -236,6 +245,7 @@ class SearchEmailFilter with EquatableMixin, OptionParamMixin {
     startDate,
     endDate,
     position,
-    sortOrderType
+    sortOrderType,
+    label,
   ];
 }
\ No newline at end of file

From 402de90cd23671c3d0138e317c8dffb195bd43fe Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Mon, 5 Jan 2026 11:25:29 +0700
Subject: [PATCH 3/8] TF-4229 Implement search by label filter in mobile

---
 .../base/model/popup_menu_item_action.dart    |   2 +
 .../context_menu_dialog_item.dart             |  12 +-
 .../context_menu_item_action.dart             |   2 +
 .../model/search/quick_search_filter.dart     |  17 ++-
 .../search_filters/search_filter_button.dart  |   4 +
 .../update_search_filter_extension.dart       |  54 +++++++
 .../search_label_filter_modal_mixin.dart      |  92 ++++++++++++
 .../model/context_item_label_type_action.dart |  34 +++++
 .../popup_menu_item_label_type_action.dart    |  35 +++++
 .../presentation/search_email_controller.dart | 140 +++++++++++-------
 .../email/presentation/search_email_view.dart |  41 +++--
 11 files changed, 362 insertions(+), 71 deletions(-)
 create mode 100644 lib/features/search/email/presentation/extension/update_search_filter_extension.dart
 create mode 100644 lib/features/search/email/presentation/mixin/search_label_filter_modal_mixin.dart
 create mode 100644 lib/features/search/email/presentation/model/context_item_label_type_action.dart
 create mode 100644 lib/features/search/email/presentation/model/popup_menu_item_label_type_action.dart

diff --git a/lib/features/base/model/popup_menu_item_action.dart b/lib/features/base/model/popup_menu_item_action.dart
index 9e53516689..bcd7f421da 100644
--- a/lib/features/base/model/popup_menu_item_action.dart
+++ b/lib/features/base/model/popup_menu_item_action.dart
@@ -45,6 +45,8 @@ mixin OptionalPopupSelectedIcon<T> {
   Color get selectedIconColor => AppColor.primaryMain;
 
   double get selectedIconSize => 16.0;
+
+  bool get isArrangeRTL => true;
 }
 
 mixin OptionalPopupHoverIcon {
diff --git a/lib/features/base/widget/context_menu/context_menu_dialog_item.dart b/lib/features/base/widget/context_menu/context_menu_dialog_item.dart
index 45f371a72c..c3f94f730f 100644
--- a/lib/features/base/widget/context_menu/context_menu_dialog_item.dart
+++ b/lib/features/base/widget/context_menu/context_menu_dialog_item.dart
@@ -19,6 +19,7 @@ class ContextMenuDialogItem extends StatelessWidget {
     Widget? iconWidget;
     Widget? selectedIconWidget;
     bool isSelected = false;
+    bool isArrangeRTL = true;
 
     if (menuAction is ContextMenuItemActionRequiredIcon) {
       final specificMenuAction =
@@ -47,6 +48,7 @@ class ContextMenuDialogItem extends StatelessWidget {
         ),
       );
       isSelected = specificMenuAction.selectedAction == menuAction.action;
+      isArrangeRTL = specificMenuAction.isArrangeRTL;
     } else if (menuAction is ContextMenuItemActionRequiredFull) {
       final specificMenuAction =
           menuAction as ContextMenuItemActionRequiredFull;
@@ -71,8 +73,12 @@ class ContextMenuDialogItem extends StatelessWidget {
         ),
       );
       isSelected = specificMenuAction.selectedAction == menuAction.action;
+      isArrangeRTL = specificMenuAction.isArrangeRTL;
     }
 
+    final leadingWidget =
+        iconWidget ?? (isArrangeRTL ? const SizedBox(width: 24) : null);
+
     return Material(
       type: MaterialType.transparency,
       child: InkWell(
@@ -81,7 +87,9 @@ class ContextMenuDialogItem extends StatelessWidget {
           height: 48,
           child: Row(
             children: [
-              if (iconWidget != null) iconWidget else const SizedBox(width: 24),
+              if (leadingWidget != null) leadingWidget,
+              if (!isArrangeRTL && selectedIconWidget != null)
+                selectedIconWidget,
               Expanded(
                 child: Text(
                   menuAction.actionName,
@@ -95,7 +103,7 @@ class ContextMenuDialogItem extends StatelessWidget {
                   overflow: TextOverflow.ellipsis,
                 ),
               ),
-              if (isSelected && selectedIconWidget != null)
+              if (isArrangeRTL && isSelected && selectedIconWidget != null)
                 selectedIconWidget
               else
                 const SizedBox(width: 24),
diff --git a/lib/features/base/widget/context_menu/context_menu_item_action.dart b/lib/features/base/widget/context_menu/context_menu_item_action.dart
index 4e3c06972e..107ac9de7f 100644
--- a/lib/features/base/widget/context_menu/context_menu_item_action.dart
+++ b/lib/features/base/widget/context_menu/context_menu_item_action.dart
@@ -31,6 +31,8 @@ mixin OptionalSelectedIcon<T> {
   String get selectedIcon;
 
   Color get selectedIconColor => AppColor.primaryMain;
+
+  bool get isArrangeRTL => true;
 }
 
 abstract class ContextMenuItemActionRequiredIcon<T>
diff --git a/lib/features/mailbox_dashboard/presentation/model/search/quick_search_filter.dart b/lib/features/mailbox_dashboard/presentation/model/search/quick_search_filter.dart
index a26a990347..a80eb33b0d 100644
--- a/lib/features/mailbox_dashboard/presentation/model/search/quick_search_filter.dart
+++ b/lib/features/mailbox_dashboard/presentation/model/search/quick_search_filter.dart
@@ -5,6 +5,8 @@ import 'package:core/presentation/utils/responsive_utils.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:jmap_dart_client/jmap/core/user_name.dart';
 import 'package:jmap_dart_client/jmap/mail/email/keyword_identifier.dart';
+import 'package:labels/extensions/label_extension.dart';
+import 'package:labels/model/label.dart';
 import 'package:model/mailbox/presentation_mailbox.dart';
 import 'package:tmail_ui_user/features/mailbox/presentation/extensions/presentation_mailbox_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/email_receive_time_type.dart';
@@ -22,7 +24,8 @@ enum QuickSearchFilter {
   dateTime,
   from,
   to,
-  folder;
+  folder,
+  labels;
 
   String getTitle(
     BuildContext context, {
@@ -33,7 +36,8 @@ enum QuickSearchFilter {
     Set<String>? listAddressOfFrom,
     UserName? userName,
     Set<String>? listAddressOfTo,
-    PresentationMailbox? mailbox
+    PresentationMailbox? mailbox,
+    Label? label,
   }) {
     switch(this) {
       case QuickSearchFilter.hasAttachment:
@@ -61,6 +65,8 @@ enum QuickSearchFilter {
         return AppLocalizations.of(context).starred;
       case QuickSearchFilter.unread:
         return AppLocalizations.of(context).unread;
+      case QuickSearchFilter.labels:
+        return label?.safeDisplayName ?? AppLocalizations.of(context).allLabels;
     }
   }
 
@@ -86,6 +92,8 @@ enum QuickSearchFilter {
         return isSelected ? imagePaths.icSelectedSB : imagePaths.icUnStar;
       case QuickSearchFilter.unread:
         return isSelected ? imagePaths.icSelectedSB : imagePaths.icUnread;
+      case QuickSearchFilter.labels:
+        return imagePaths.icTag;
     }
   }
 
@@ -152,6 +160,8 @@ enum QuickSearchFilter {
         return searchFilter.hasKeyword.contains(KeyWordIdentifier.emailFlagged.value) == true;
       case QuickSearchFilter.unread:
         return searchFilter.unread;
+      case QuickSearchFilter.labels:
+        return searchFilter.label != null;
     }
   }
 
@@ -171,5 +181,6 @@ enum QuickSearchFilter {
     this == QuickSearchFilter.from ||
     this == QuickSearchFilter.to ||
     this == QuickSearchFilter.folder ||
-    this == QuickSearchFilter.sortBy;
+    this == QuickSearchFilter.sortBy ||
+    this == QuickSearchFilter.labels;
 }
\ No newline at end of file
diff --git a/lib/features/mailbox_dashboard/presentation/widgets/search_filters/search_filter_button.dart b/lib/features/mailbox_dashboard/presentation/widgets/search_filters/search_filter_button.dart
index e2a810a437..94055c772f 100644
--- a/lib/features/mailbox_dashboard/presentation/widgets/search_filters/search_filter_button.dart
+++ b/lib/features/mailbox_dashboard/presentation/widgets/search_filters/search_filter_button.dart
@@ -4,6 +4,7 @@ import 'package:core/presentation/utils/responsive_utils.dart';
 import 'package:core/presentation/views/button/tmail_button_widget.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
+import 'package:labels/model/label.dart';
 import 'package:model/mailbox/presentation_mailbox.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/email_receive_time_type.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/email_sort_order_type.dart';
@@ -29,6 +30,7 @@ class SearchFilterButton extends StatefulWidget {
   final Set<String>? listAddressOfFrom;
   final Set<String>? listAddressOfTo;
   final PresentationMailbox? mailbox;
+  final Label? label;
   final Color? backgroundColor;
   final EdgeInsetsGeometry? buttonPadding;
   final bool isContextMenuAlignEndButton;
@@ -49,6 +51,7 @@ class SearchFilterButton extends StatefulWidget {
     this.listAddressOfFrom,
     this.listAddressOfTo,
     this.mailbox,
+    this.label,
     this.backgroundColor,
     this.buttonPadding,
     this.onSelectSearchFilterAction,
@@ -73,6 +76,7 @@ class _SearchFilterButtonState extends State<SearchFilterButton> {
       sortOrderType: widget.sortOrderType,
       listAddressOfFrom: widget.listAddressOfFrom,
       mailbox: widget.mailbox,
+      label: widget.label,
       listAddressOfTo: widget.listAddressOfTo,
     );
 
diff --git a/lib/features/search/email/presentation/extension/update_search_filter_extension.dart b/lib/features/search/email/presentation/extension/update_search_filter_extension.dart
new file mode 100644
index 0000000000..c30dc72d0f
--- /dev/null
+++ b/lib/features/search/email/presentation/extension/update_search_filter_extension.dart
@@ -0,0 +1,54 @@
+import 'package:dartz/dartz.dart';
+import 'package:labels/model/label.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/email_receive_time_type.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/quick_search_filter.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/search_email_filter.dart';
+import 'package:tmail_ui_user/features/search/email/presentation/search_email_controller.dart';
+
+extension UpdateSearchFilterExtension on SearchEmailController {
+  void deleteQuickSearchFilter({required QuickSearchFilter filter}) {
+    switch (filter) {
+      case QuickSearchFilter.hasAttachment:
+        updateSimpleSearchFilter(hasAttachmentOption: const None());
+        break;
+      case QuickSearchFilter.starred:
+        updateSimpleSearchFilter(hasKeywordOption: const None());
+        break;
+      case QuickSearchFilter.unread:
+        updateSimpleSearchFilter(unreadOption: const None());
+        break;
+      case QuickSearchFilter.sortBy:
+        updateSimpleSearchFilter(
+          sortOrderTypeOption: const Some(SearchEmailFilter.defaultSortOrder),
+        );
+        break;
+      case QuickSearchFilter.dateTime:
+        updateSimpleSearchFilter(
+          emailReceiveTimeTypeOption: const Some(EmailReceiveTimeType.allTime),
+          startDateOption: const None(),
+          endDateOption: const None(),
+        );
+        break;
+      case QuickSearchFilter.from:
+        updateSimpleSearchFilter(fromOption: const None());
+        break;
+      case QuickSearchFilter.to:
+        updateSimpleSearchFilter(toOption: const None());
+        break;
+      case QuickSearchFilter.folder:
+        updateSimpleSearchFilter(mailboxOption: const None());
+        break;
+      case QuickSearchFilter.labels:
+        updateSimpleSearchFilter(labelOption: const None());
+        break;
+      default:
+        break;
+    }
+    searchEmailAction();
+  }
+
+  void onSelectLabelFilter(Label? newLabel) {
+    updateSimpleSearchFilter(labelOption: optionOf(newLabel));
+    searchEmailAction();
+  }
+}
diff --git a/lib/features/search/email/presentation/mixin/search_label_filter_modal_mixin.dart b/lib/features/search/email/presentation/mixin/search_label_filter_modal_mixin.dart
new file mode 100644
index 0000000000..c2b1ecabd3
--- /dev/null
+++ b/lib/features/search/email/presentation/mixin/search_label_filter_modal_mixin.dart
@@ -0,0 +1,92 @@
+import 'package:core/presentation/resources/image_paths.dart';
+import 'package:flutter/material.dart';
+import 'package:labels/model/label.dart';
+import 'package:tmail_ui_user/features/base/mixin/popup_context_menu_action_mixin.dart';
+import 'package:tmail_ui_user/features/base/widget/popup_menu/popup_menu_item_action_widget.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/widgets/advanced_search/label_drop_down_button.dart';
+import 'package:tmail_ui_user/features/search/email/presentation/model/context_item_label_type_action.dart';
+import 'package:tmail_ui_user/features/search/email/presentation/model/popup_menu_item_label_type_action.dart';
+import 'package:tmail_ui_user/main/routes/route_navigation.dart';
+
+mixin SearchLabelFilterModalMixin on PopupContextMenuActionMixin {
+  void openLabelsFilterModal({
+    required BuildContext context,
+    required List<Label> labels,
+    required Label? selectedLabel,
+    required ImagePaths imagePaths,
+    required OnSelectLabelsActions onSelectLabelsActions,
+    RelativeRect? position,
+  }) {
+    if (position != null) {
+      openPopupMenuLabelsFilter(
+        context: context,
+        position: position,
+        labels: labels,
+        selectedLabel: selectedLabel,
+        imagePaths: imagePaths,
+        onSelectLabelsActions: onSelectLabelsActions,
+      );
+    } else {
+      openContextMenuLabelsFilter(
+        context: context,
+        labels: labels,
+        selectedLabel: selectedLabel,
+        imagePaths: imagePaths,
+        onSelectLabelsActions: onSelectLabelsActions,
+      );
+    }
+  }
+
+  void openPopupMenuLabelsFilter({
+    required BuildContext context,
+    required RelativeRect position,
+    required List<Label> labels,
+    required Label? selectedLabel,
+    required ImagePaths imagePaths,
+    required OnSelectLabelsActions onSelectLabelsActions,
+  }) {
+    final popupMenuItems = labels.map((label) {
+      return PopupMenuItem(
+        padding: EdgeInsets.zero,
+        child: PopupMenuItemActionWidget(
+          menuAction: PopupMenuItemLabelTypeAction(
+            label,
+            selectedLabel,
+            imagePaths,
+          ),
+          menuActionClick: (menuAction) {
+            popBack();
+            onSelectLabelsActions(menuAction.action);
+          },
+        ),
+      );
+    }).toList();
+
+    openPopupMenuAction(context, position, popupMenuItems);
+  }
+
+  void openContextMenuLabelsFilter({
+    required BuildContext context,
+    required List<Label> labels,
+    required Label? selectedLabel,
+    required ImagePaths imagePaths,
+    required OnSelectLabelsActions onSelectLabelsActions,
+  }) {
+    final contextMenuActions = labels.map((label) {
+      return ContextItemLabelTypeAction(
+        label,
+        selectedLabel,
+        imagePaths,
+      );
+    }).toList();
+
+    openBottomSheetContextMenuAction(
+      context: context,
+      itemActions: contextMenuActions,
+      onContextMenuActionClick: (menuAction) {
+        popBack();
+        onSelectLabelsActions(menuAction.action);
+      },
+    );
+  }
+}
diff --git a/lib/features/search/email/presentation/model/context_item_label_type_action.dart b/lib/features/search/email/presentation/model/context_item_label_type_action.dart
new file mode 100644
index 0000000000..4d01a92497
--- /dev/null
+++ b/lib/features/search/email/presentation/model/context_item_label_type_action.dart
@@ -0,0 +1,34 @@
+import 'package:core/presentation/extensions/color_extension.dart';
+import 'package:core/presentation/resources/image_paths.dart';
+import 'package:flutter/animation.dart';
+import 'package:labels/labels.dart';
+import 'package:tmail_ui_user/features/base/widget/context_menu/context_menu_item_action.dart';
+
+class ContextItemLabelTypeAction
+    extends ContextMenuItemActionRequiredSelectedIcon<Label> {
+  final ImagePaths imagePaths;
+
+  ContextItemLabelTypeAction(
+    super.action,
+    super.selectedAction,
+    this.imagePaths,
+  );
+
+  bool get isSelected => action.id == selectedAction?.id;
+
+  @override
+  String get actionName => action.safeDisplayName;
+
+  @override
+  String get selectedIcon => isSelected
+      ? imagePaths.icCheckboxSelected
+      : imagePaths.icCheckboxUnselected;
+
+  @override
+  Color get selectedIconColor => isSelected
+      ? AppColor.primaryMain
+      : AppColor.gray424244.withValues(alpha: 0.72);
+
+  @override
+  bool get isArrangeRTL => false;
+}
diff --git a/lib/features/search/email/presentation/model/popup_menu_item_label_type_action.dart b/lib/features/search/email/presentation/model/popup_menu_item_label_type_action.dart
new file mode 100644
index 0000000000..47016e021b
--- /dev/null
+++ b/lib/features/search/email/presentation/model/popup_menu_item_label_type_action.dart
@@ -0,0 +1,35 @@
+import 'package:core/presentation/extensions/color_extension.dart';
+import 'package:core/presentation/resources/image_paths.dart';
+import 'package:flutter/animation.dart';
+import 'package:labels/extensions/label_extension.dart';
+import 'package:labels/model/label.dart';
+import 'package:tmail_ui_user/features/base/model/popup_menu_item_action.dart';
+
+class PopupMenuItemLabelTypeAction
+    extends PopupMenuItemActionRequiredSelectedIcon<Label> {
+  final ImagePaths imagePaths;
+
+  PopupMenuItemLabelTypeAction(
+    super.action,
+    super.selectedAction,
+    this.imagePaths,
+  );
+
+  bool get isSelected => action.id == selectedAction?.id;
+
+  @override
+  String get actionName => action.safeDisplayName;
+
+  @override
+  String get selectedIcon => isSelected
+      ? imagePaths.icCheckboxSelected
+      : imagePaths.icCheckboxUnselected;
+
+  @override
+  Color get selectedIconColor => isSelected
+      ? AppColor.primaryMain
+      : AppColor.gray424244.withValues(alpha: 0.72);
+
+  @override
+  bool get isArrangeRTL => false;
+}
diff --git a/lib/features/search/email/presentation/search_email_controller.dart b/lib/features/search/email/presentation/search_email_controller.dart
index cd80fe38c4..93232d3a3e 100644
--- a/lib/features/search/email/presentation/search_email_controller.dart
+++ b/lib/features/search/email/presentation/search_email_controller.dart
@@ -17,6 +17,7 @@ import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
 import 'package:jmap_dart_client/jmap/core/utc_date.dart';
 import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
 import 'package:jmap_dart_client/jmap/mail/email/keyword_identifier.dart';
+import 'package:labels/model/label.dart';
 import 'package:model/email/email_action_type.dart';
 import 'package:model/email/mark_star_action.dart';
 import 'package:model/email/prefix_email_address.dart';
@@ -61,6 +62,8 @@ import 'package:tmail_ui_user/features/push_notification/presentation/websocket/
 import 'package:tmail_ui_user/features/search/email/domain/state/refresh_changes_search_email_state.dart';
 import 'package:tmail_ui_user/features/search/email/domain/usecases/refresh_changes_search_email_interactor.dart';
 import 'package:tmail_ui_user/features/search/email/presentation/extension/handle_keyboard_shortcut_actions_extension.dart';
+import 'package:tmail_ui_user/features/search/email/presentation/extension/update_search_filter_extension.dart';
+import 'package:tmail_ui_user/features/search/email/presentation/mixin/search_label_filter_modal_mixin.dart';
 import 'package:tmail_ui_user/features/search/email/presentation/model/search_more_state.dart';
 import 'package:tmail_ui_user/features/search/email/presentation/search_email_bindings.dart';
 import 'package:tmail_ui_user/features/thread/domain/constants/thread_constants.dart';
@@ -83,7 +86,8 @@ import 'package:tmail_ui_user/main/routes/route_utils.dart';
 
 class SearchEmailController extends BaseController
     with EmailActionController,
-        DateRangePickerMixin {
+        DateRangePickerMixin,
+        SearchLabelFilterModalMixin {
 
   final networkConnectionController = Get.find<NetworkConnectionController>();
 
@@ -141,6 +145,8 @@ class SearchEmailController extends BaseController
 
   PresentationMailbox? get mailboxFiltered => searchEmailFilter.value.mailbox;
 
+  Label? get labelFiltered => searchEmailFilter.value.label;
+
   Set<String> get listAddressOfToFiltered => searchEmailFilter.value.to;
 
   Set<String> get listAddressOfFromFiltered => searchEmailFilter.value.from;
@@ -452,7 +458,9 @@ class SearchEmailController extends BaseController
     ));
   }
 
-  void _searchEmailAction(BuildContext context) {
+  void searchEmailAction() => _searchEmailAction();
+
+  void _searchEmailAction() {
     textInputSearchFocus.unfocus();
 
     if (session == null || accountId == null) {
@@ -592,16 +600,13 @@ class SearchEmailController extends BaseController
       queryString: recentSearch.value);
   }
 
-  void searchEmailByEmailAddressAction(
-    BuildContext context,
-    EmailAddress emailAddress
-  ) {
+  void searchEmailByEmailAddressAction(EmailAddress emailAddress) {
     textInputSearchController.clear();
     currentSearchText.value = '';
     _updateSimpleSearchFilter(
       textOption: const None(),
       fromOption: Some({emailAddress.emailAddress}));
-    _searchEmailAction(context);
+    _searchEmailAction();
   }
 
   void _searchEmailByQueryString({
@@ -618,30 +623,30 @@ class SearchEmailController extends BaseController
     searchIsRunning.value = false;
     final isMailAddress = EmailUtils.isEmailAddressValid(queryString);
     if (isMailAddress) {
-      searchEmailByEmailAddressAction(context, EmailAddress(null, queryString));
+      searchEmailByEmailAddressAction(EmailAddress(null, queryString));
     } else {
       _updateSimpleSearchFilter(textOption: Some(SearchQuery(queryString)));
-      _searchEmailAction(context);
+      _searchEmailAction();
     }
   }
 
-  void selectHasAttachmentSearchFilter(BuildContext context) {
+  void selectHasAttachmentSearchFilter() {
     _updateSimpleSearchFilter(hasAttachmentOption: const Some(true));
-    _searchEmailAction(context);
+    _searchEmailAction();
   }
 
-  void selectStarredSearchFilter(BuildContext context) {
+  void selectStarredSearchFilter() {
     final listKeyword = listHasKeywordFiltered;
     if (!listKeyword.contains(KeyWordIdentifier.emailFlagged.value)) {
       listKeyword.add(KeyWordIdentifier.emailFlagged.value);
     }
     _updateSimpleSearchFilter(hasKeywordOption: Some(listKeyword));
-    _searchEmailAction(context);
+    _searchEmailAction();
   }
 
-  void selectUnreadSearchFilter(BuildContext context) {
+  void selectUnreadSearchFilter() {
     _updateSimpleSearchFilter(unreadOption: const Some(true));
-    _searchEmailAction(context);
+    _searchEmailAction();
   }
 
   bool checkQuickSearchFilterSelected(QuickSearchFilter filter) {
@@ -675,7 +680,7 @@ class SearchEmailController extends BaseController
           );
 
           _setEmailReceiveTimeType(emailReceiveTimeType);
-          _searchEmailAction(context);
+          _searchEmailAction();
         }
       );
     } else {
@@ -686,18 +691,18 @@ class SearchEmailController extends BaseController
       );
 
       _setEmailReceiveTimeType(emailReceiveTimeType);
-      _searchEmailAction(context);
+      _searchEmailAction();
     }
   }
 
-  void selectSortOrderQuickSearchFilter(BuildContext context, EmailSortOrderType sortOrderType) {
+  void selectSortOrderQuickSearchFilter(EmailSortOrderType sortOrderType) {
     emailSortOrderType.value = sortOrderType;
     _updateSimpleSearchFilter(sortOrderTypeOption: Some(sortOrderType));
     mailboxDashBoardController.storeEmailSortOrder(sortOrderType);
-    _searchEmailAction(context);
+    _searchEmailAction();
   }
 
-  void selectMailboxForSearchFilter(BuildContext context, PresentationMailbox? mailbox) async {
+  void selectMailboxForSearchFilter(PresentationMailbox? mailbox) async {
     final arguments = DestinationPickerArguments(
       mailboxDashBoardController.accountId.value!,
       MailboxActions.select,
@@ -716,9 +721,7 @@ class SearchEmailController extends BaseController
         : Some(destinationMailbox)
     );
 
-    if (context.mounted) {
-      _searchEmailAction(context);
-    }
+    _searchEmailAction();
   }
 
   Future<void> selectContactForSearchFilter(
@@ -776,9 +779,41 @@ class SearchEmailController extends BaseController
         break;
     }
 
-    _searchEmailAction(context);
+    _searchEmailAction();
   }
 
+  void updateSimpleSearchFilter({
+    Option<Set<String>>? fromOption,
+    Option<Set<String>>? toOption,
+    Option<SearchQuery>? textOption,
+    Option<PresentationMailbox>? mailboxOption,
+    Option<EmailReceiveTimeType>? emailReceiveTimeTypeOption,
+    Option<bool>? hasAttachmentOption,
+    Option<bool>? unreadOption,
+    Option<UTCDate>? beforeOption,
+    Option<UTCDate>? startDateOption,
+    Option<UTCDate>? endDateOption,
+    Option<int>? positionOption,
+    Option<Set<String>>? hasKeywordOption,
+    Option<EmailSortOrderType>? sortOrderTypeOption,
+    Option<Label>? labelOption,
+  }) => _updateSimpleSearchFilter(
+    fromOption: fromOption,
+    toOption: toOption,
+    textOption: textOption,
+    mailboxOption: mailboxOption,
+    emailReceiveTimeTypeOption: emailReceiveTimeTypeOption,
+    hasAttachmentOption: hasAttachmentOption,
+    unreadOption: unreadOption,
+    beforeOption: beforeOption,
+    startDateOption: startDateOption,
+    endDateOption: endDateOption,
+    positionOption: positionOption,
+    hasKeywordOption: hasKeywordOption,
+    sortOrderTypeOption: sortOrderTypeOption,
+    labelOption: labelOption,
+  );
+
   void _updateSimpleSearchFilter({
     Option<Set<String>>? fromOption,
     Option<Set<String>>? toOption,
@@ -793,6 +828,7 @@ class SearchEmailController extends BaseController
     Option<int>? positionOption,
     Option<Set<String>>? hasKeywordOption,
     Option<EmailSortOrderType>? sortOrderTypeOption,
+    Option<Label>? labelOption,
   }) {
     searchEmailFilter.value = searchEmailFilter.value.copyWith(
       fromOption: fromOption,
@@ -808,6 +844,7 @@ class SearchEmailController extends BaseController
       positionOption: positionOption,
       hasKeywordOption: hasKeywordOption,
       sortOrderTypeOption: sortOrderTypeOption,
+      labelOption: labelOption,
     );
     searchEmailFilter.refresh();
   }
@@ -1017,45 +1054,48 @@ class SearchEmailController extends BaseController
   ) {
     switch(searchFilter) {
       case QuickSearchFilter.dateTime:
-        _deleteDateTimeSearchFilter(context);
+        _deleteDateTimeSearchFilter();
         break;
       case QuickSearchFilter.sortBy:
-        _deleteSortOrderSearchFilter(context);
+        _deleteSortOrderSearchFilter();
         break;
       case QuickSearchFilter.from:
-        _deleteFromSearchFilter(context);
+        _deleteFromSearchFilter();
         break;
       case QuickSearchFilter.hasAttachment:
-        _deleteHasAttachmentSearchFilter(context);
+        _deleteHasAttachmentSearchFilter();
         break;
       case QuickSearchFilter.to:
-        _deleteToSearchFilter(context);
+        _deleteToSearchFilter();
         break;
       case QuickSearchFilter.folder:
-        _deleteFolderSearchFilter(context);
+        _deleteFolderSearchFilter();
         break;
       case QuickSearchFilter.starred:
-        _deleteStarredSearchFilter(context);
+        _deleteStarredSearchFilter();
         break;
       case QuickSearchFilter.unread:
-        _deleteUnreadSearchFilter(context);
+        _deleteUnreadSearchFilter();
+        break;
+      case QuickSearchFilter.labels:
+        deleteQuickSearchFilter(filter: QuickSearchFilter.labels);
         break;
       default:
         break;
     }
   }
 
-  void _deleteDateTimeSearchFilter(BuildContext context) {
+  void _deleteDateTimeSearchFilter() {
     _updateSimpleSearchFilter(
       emailReceiveTimeTypeOption: const Some(EmailReceiveTimeType.allTime),
       startDateOption: const None(),
       endDateOption: const None(),
     );
     _setEmailReceiveTimeType(EmailReceiveTimeType.allTime);
-    _searchEmailAction(context);
+    _searchEmailAction();
   }
 
-  void _deleteSortOrderSearchFilter(BuildContext context) {
+  void _deleteSortOrderSearchFilter() {
     emailSortOrderType.value = SearchEmailFilter.defaultSortOrder;
     _updateSimpleSearchFilter(
       sortOrderTypeOption: const Some(SearchEmailFilter.defaultSortOrder),
@@ -1063,40 +1103,40 @@ class SearchEmailController extends BaseController
     mailboxDashBoardController.storeEmailSortOrder(
       SearchEmailFilter.defaultSortOrder,
     );
-    _searchEmailAction(context);
+    _searchEmailAction();
   }
 
-  void _deleteFromSearchFilter(BuildContext context) {
+  void _deleteFromSearchFilter() {
     _updateSimpleSearchFilter(fromOption: const None());
-    _searchEmailAction(context);
+    _searchEmailAction();
   }
 
-  void _deleteToSearchFilter(BuildContext context) {
+  void _deleteToSearchFilter() {
     _updateSimpleSearchFilter(toOption: const None());
-    _searchEmailAction(context);
+    _searchEmailAction();
   }
 
-  void _deleteHasAttachmentSearchFilter(BuildContext context) {
+  void _deleteHasAttachmentSearchFilter() {
     _updateSimpleSearchFilter(hasAttachmentOption: const None());
-    _searchEmailAction(context);
+    _searchEmailAction();
   }
 
-  void _deleteFolderSearchFilter(BuildContext context) {
+  void _deleteFolderSearchFilter() {
     _updateSimpleSearchFilter(mailboxOption: const None());
-    _searchEmailAction(context);
+    _searchEmailAction();
   }
 
-  void _deleteStarredSearchFilter(BuildContext context) {
+  void _deleteStarredSearchFilter() {
     _updateSimpleSearchFilter(hasKeywordOption: const None());
-    _searchEmailAction(context);
+    _searchEmailAction();
   }
 
-  void _deleteUnreadSearchFilter(BuildContext context) {
+  void _deleteUnreadSearchFilter() {
     _updateSimpleSearchFilter(unreadOption: const None());
-    _searchEmailAction(context);
+    _searchEmailAction();
   }
 
-  void clearAllSearchFilterApplied(BuildContext context) {
+  void clearAllSearchFilterApplied() {
     textInputSearchController.clear();
     currentSearchText.value = '';
     listRecentSearch.clear();
@@ -1109,7 +1149,7 @@ class SearchEmailController extends BaseController
     searchEmailFilter.value = SearchEmailFilter.withSortOrder(
       emailSortOrderType.value,
     );
-    _searchEmailAction(context);
+    _searchEmailAction();
   }
 
   @override
diff --git a/lib/features/search/email/presentation/search_email_view.dart b/lib/features/search/email/presentation/search_email_view.dart
index 0d654dd8e8..35a97c252c 100644
--- a/lib/features/search/email/presentation/search_email_view.dart
+++ b/lib/features/search/email/presentation/search_email_view.dart
@@ -31,6 +31,7 @@ import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/widgets/se
 import 'package:tmail_ui_user/features/search/email/presentation/extension/handle_email_more_action_extension.dart';
 import 'package:tmail_ui_user/features/search/email/presentation/extension/handle_keyboard_shortcut_actions_extension.dart';
 import 'package:tmail_ui_user/features/search/email/presentation/extension/handle_press_email_selection_action.dart';
+import 'package:tmail_ui_user/features/search/email/presentation/extension/update_search_filter_extension.dart';
 import 'package:tmail_ui_user/features/search/email/presentation/model/context_item_receive_time_type_action.dart';
 import 'package:tmail_ui_user/features/search/email/presentation/model/context_item_sort_order_type_action.dart';
 import 'package:tmail_ui_user/features/search/email/presentation/model/popup_menu_item_date_filter_action.dart';
@@ -277,6 +278,8 @@ class SearchEmailView extends GetWidget<SearchEmailController>
                 children: [
                   _buildSearchFilterButton(context, QuickSearchFilter.folder),
                   SearchEmailViewStyle.searchFilterSizeBoxMargin,
+                  _buildSearchFilterButton(context, QuickSearchFilter.labels),
+                  SearchEmailViewStyle.searchFilterSizeBoxMargin,
                   _buildSearchFilterButton(context, QuickSearchFilter.from),
                   SearchEmailViewStyle.searchFilterSizeBoxMargin,
                   _buildSearchFilterButton(context, QuickSearchFilter.to),
@@ -307,7 +310,7 @@ class SearchEmailView extends GetWidget<SearchEmailController>
                 fontSize: 13,
                 fontWeight: FontWeight.w500
               ),
-              onTapActionCallback: () => controller.clearAllSearchFilterApplied(context)
+              onTapActionCallback: controller.clearAllSearchFilterApplied
             );
           } else {
             return const SizedBox.shrink();
@@ -330,6 +333,7 @@ class SearchEmailView extends GetWidget<SearchEmailController>
       final endDate = controller.endDateFiltered;
       final receiveTimeType = controller.receiveTimeFiltered;
       final mailbox = controller.mailboxFiltered;
+      final label = controller.labelFiltered;
       final listAddressOfTo = controller.listAddressOfToFiltered;
 
       final isSelected = searchFilter.isSelected(
@@ -351,6 +355,7 @@ class SearchEmailView extends GetWidget<SearchEmailController>
         listAddressOfFrom: listAddressOfFrom,
         listAddressOfTo: listAddressOfTo,
         mailbox: mailbox,
+        label: label,
         backgroundColor: searchFilter.getMobileBackgroundColor(isSelected: isSelected),
         onSelectSearchFilterAction: _onSelectSearchFilterAction,
         onDeleteSearchFilterAction: (searchFilter) =>
@@ -385,7 +390,7 @@ class SearchEmailView extends GetWidget<SearchEmailController>
           PrefixEmailAddress.from);
         break;
       case QuickSearchFilter.hasAttachment:
-        controller.selectHasAttachmentSearchFilter(context);
+        controller.selectHasAttachmentSearchFilter();
         break;
       case QuickSearchFilter.to:
         controller.selectContactForSearchFilter(
@@ -393,15 +398,26 @@ class SearchEmailView extends GetWidget<SearchEmailController>
           PrefixEmailAddress.to);
         break;
       case QuickSearchFilter.folder:
-        controller.selectMailboxForSearchFilter(
-          context,
-          controller.mailboxFiltered);
+        controller.selectMailboxForSearchFilter(controller.mailboxFiltered);
         break;
       case QuickSearchFilter.starred:
-        controller.selectStarredSearchFilter(context);
+        controller.selectStarredSearchFilter();
         break;
       case QuickSearchFilter.unread:
-        controller.selectUnreadSearchFilter(context);
+        controller.selectUnreadSearchFilter();
+        break;
+      case QuickSearchFilter.labels:
+        final listLabels = controller.mailboxDashBoardController.labelController.labels;
+        final selectedLabel = controller.labelFiltered;
+
+        controller.openLabelsFilterModal(
+          context: context,
+          position: buttonPosition,
+          labels: listLabels,
+          selectedLabel: selectedLabel,
+          imagePaths: controller.imagePaths,
+          onSelectLabelsActions: controller.onSelectLabelFilter,
+        );
         break;
       default:
         break;
@@ -470,10 +486,7 @@ class SearchEmailView extends GetWidget<SearchEmailController>
           ),
           menuActionClick: (menuAction) {
             popBack();
-            controller.selectSortOrderQuickSearchFilter(
-              context,
-              menuAction.action,
-            );
+            controller.selectSortOrderQuickSearchFilter(menuAction.action);
           },
         ),
       );
@@ -498,10 +511,7 @@ class SearchEmailView extends GetWidget<SearchEmailController>
       itemActions: contextMenuActions,
       onContextMenuActionClick: (menuAction) {
         popBack();
-        controller.selectSortOrderQuickSearchFilter(
-          context,
-          menuAction.action,
-        );
+        controller.selectSortOrderQuickSearchFilter(menuAction.action);
       },
     );
   }
@@ -647,7 +657,6 @@ class SearchEmailView extends GetWidget<SearchEmailController>
           child: InkWell(
             child: ContactQuickSearchItem(emailAddress: emailAddress),
             onTap: () => controller.searchEmailByEmailAddressAction(
-              context,
               emailAddress
             ),
           ),

From adc5f8259757431772748206c80015fc66f18bb5 Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Mon, 5 Jan 2026 12:20:34 +0700
Subject: [PATCH 4/8] TF-4229 Add quick search label filter button in dashboard
 view

---
 .../popup_context_menu_action_mixin.dart      | 11 +++-
 .../popup_menu_item_action_widget.dart        | 11 +++-
 .../mailbox_dashboard_controller.dart         |  7 +-
 .../controller/search_controller.dart         |  5 ++
 .../check_label_available_extension.dart      |  1 +
 ...select_search_filter_action_extension.dart | 18 +++++
 .../mailbox_dashboard_view_web.dart           | 36 +++++++++-
 .../model/search/quick_search_filter.dart     |  4 +-
 .../model/search/search_email_filter.dart     |  2 +-
 .../search_label_filter_modal_mixin.dart      |  3 +-
 .../email/presentation/search_email_view.dart | 66 +++++++++++--------
 11 files changed, 126 insertions(+), 38 deletions(-)

diff --git a/lib/features/base/mixin/popup_context_menu_action_mixin.dart b/lib/features/base/mixin/popup_context_menu_action_mixin.dart
index 6fd561daa6..d03c6dcedd 100644
--- a/lib/features/base/mixin/popup_context_menu_action_mixin.dart
+++ b/lib/features/base/mixin/popup_context_menu_action_mixin.dart
@@ -28,6 +28,7 @@ mixin PopupContextMenuActionMixin {
     required OnContextMenuActionClick onContextMenuActionClick,
     Key? key,
     bool useGroupedActions = false,
+    double? maxHeight,
   }) async {
     return await showModalBottomSheet(
       context: context,
@@ -42,6 +43,9 @@ mixin PopupContextMenuActionMixin {
       ),
       backgroundColor: Colors.white,
       barrierColor: Colors.black.withValues(alpha: 0.2),
+      constraints: BoxConstraints(
+        maxHeight: maxHeight ?? double.infinity,
+      ),
       builder: (_) {
         return PointerInterceptor(
           child: Container(
@@ -63,6 +67,7 @@ mixin PopupContextMenuActionMixin {
     BuildContext context,
     RelativeRect position,
     List<PopupMenuEntry> popupMenuItems,
+    {double? maxHeight}
   ) async {
     return await showMenu(
       context: context,
@@ -74,7 +79,11 @@ mixin PopupContextMenuActionMixin {
       shape: const RoundedRectangleBorder(
         borderRadius: BorderRadius.all(Radius.circular(6)),
       ),
-      constraints: const BoxConstraints(maxWidth: 300, minWidth: 178),
+      constraints: BoxConstraints(
+        maxWidth: 300,
+        minWidth: 178,
+        maxHeight: maxHeight ?? double.infinity,
+      ),
       items: popupMenuItems,
     );
   }
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 38078e13e2..c869595224 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
@@ -46,6 +46,7 @@ class _PopupMenuItemActionWidgetState extends State<PopupMenuItemActionWidget> {
     Widget? iconWidget;
     Widget? selectedIconWidget;
     bool isSelected = false;
+    bool isArrangeRTL = true;
 
     if (widget.menuAction is PopupMenuItemActionRequiredIcon) {
       final specificMenuAction =
@@ -75,6 +76,7 @@ class _PopupMenuItemActionWidgetState extends State<PopupMenuItemActionWidget> {
       );
       isSelected =
           specificMenuAction.selectedAction == widget.menuAction.action;
+      isArrangeRTL = specificMenuAction.isArrangeRTL;
     } else if (widget.menuAction is PopupMenuItemActionRequiredFull) {
       final specificMenuAction =
           widget.menuAction as PopupMenuItemActionRequiredFull;
@@ -100,6 +102,7 @@ class _PopupMenuItemActionWidgetState extends State<PopupMenuItemActionWidget> {
       );
       isSelected =
           specificMenuAction.selectedAction == widget.menuAction.action;
+      isArrangeRTL = specificMenuAction.isArrangeRTL;
     } else if (widget.menuAction
         is PopupMenuItemActionRequiredIconWithMultipleSelected) {
       final specificMenuAction = widget.menuAction
@@ -126,6 +129,7 @@ class _PopupMenuItemActionWidgetState extends State<PopupMenuItemActionWidget> {
       );
       isSelected =
           specificMenuAction.selectedActions.contains(widget.menuAction.action);
+      isArrangeRTL = specificMenuAction.isArrangeRTL;
     }
 
     if (widget.menuAction is PopupMenuItemEmailAction &&
@@ -217,6 +221,11 @@ class _PopupMenuItemActionWidgetState extends State<PopupMenuItemActionWidget> {
             child: Row(
               children: [
                 if (iconWidget != null) iconWidget,
+                if (!isArrangeRTL && selectedIconWidget != null)
+                  Padding(
+                    padding: const EdgeInsetsDirectional.only(end: 16),
+                    child: selectedIconWidget,
+                  ),
                 Expanded(
                   child: Text(
                     widget.menuAction.actionName,
@@ -227,7 +236,7 @@ class _PopupMenuItemActionWidgetState extends State<PopupMenuItemActionWidget> {
                     overflow: TextOverflow.ellipsis,
                   ),
                 ),
-                if (isSelected && selectedIconWidget != null)
+                if (isArrangeRTL && isSelected && selectedIconWidget != null)
                   selectedIconWidget,
               ],
             ),
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 956abb6e4e..f8af1dd01c 100644
--- a/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart
+++ b/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart
@@ -175,6 +175,7 @@ import 'package:tmail_ui_user/features/push_notification/presentation/controller
 import 'package:tmail_ui_user/features/push_notification/presentation/notification/local_notification_manager.dart';
 import 'package:tmail_ui_user/features/push_notification/presentation/services/fcm_service.dart';
 import 'package:tmail_ui_user/features/push_notification/presentation/utils/fcm_utils.dart';
+import 'package:tmail_ui_user/features/search/email/presentation/mixin/search_label_filter_modal_mixin.dart';
 import 'package:tmail_ui_user/features/sending_queue/domain/model/sending_email.dart';
 import 'package:tmail_ui_user/features/sending_queue/domain/state/get_all_sending_email_state.dart';
 import 'package:tmail_ui_user/features/sending_queue/domain/state/update_sending_email_state.dart';
@@ -224,7 +225,8 @@ class MailboxDashBoardController extends ReloadableController
     with ContactSupportMixin,
         OwnEmailAddressMixin,
         SaaSPremiumMixin,
-        AiScribeMixin {
+        AiScribeMixin,
+        SearchLabelFilterModalMixin {
 
   final RemoveEmailDraftsInteractor _removeEmailDraftsInteractor = Get.find<RemoveEmailDraftsInteractor>();
   final EmailReceiveManager _emailReceiveManager = Get.find<EmailReceiveManager>();
@@ -2345,6 +2347,9 @@ class MailboxDashBoardController extends ReloadableController
       case QuickSearchFilter.unread:
         deleteUnreadSearchFilter();
         break;
+      case QuickSearchFilter.labels:
+        deleteQuickSearchFilter(filter: searchFilter);
+        break;
       default:
         break;
     }
diff --git a/lib/features/mailbox_dashboard/presentation/controller/search_controller.dart b/lib/features/mailbox_dashboard/presentation/controller/search_controller.dart
index 6a2ddf2d03..7619cc9fa6 100644
--- a/lib/features/mailbox_dashboard/presentation/controller/search_controller.dart
+++ b/lib/features/mailbox_dashboard/presentation/controller/search_controller.dart
@@ -15,6 +15,7 @@ import 'package:jmap_dart_client/jmap/mail/email/email_comparator.dart';
 import 'package:jmap_dart_client/jmap/mail/email/email_comparator_property.dart';
 import 'package:jmap_dart_client/jmap/mail/email/email_filter_condition.dart';
 import 'package:jmap_dart_client/jmap/mail/email/keyword_identifier.dart';
+import 'package:labels/model/label.dart';
 import 'package:model/email/presentation_email.dart';
 import 'package:model/extensions/email_filter_condition_extension.dart';
 import 'package:model/mailbox/presentation_mailbox.dart';
@@ -209,6 +210,7 @@ class SearchController extends BaseController with DateRangePickerMixin {
     Option<UTCDate>? endDateOption,
     Option<int>? positionOption,
     Option<EmailSortOrderType>? sortOrderTypeOption,
+    Option<Label>? labelOption,
   }) {
     searchEmailFilter.value = searchEmailFilter.value.copyWith(
       fromOption: fromOption,
@@ -226,6 +228,7 @@ class SearchController extends BaseController with DateRangePickerMixin {
       endDateOption: endDateOption,
       positionOption: positionOption,
       sortOrderTypeOption: sortOrderTypeOption,
+      labelOption: labelOption,
     );
     searchEmailFilter.refresh();
   }
@@ -238,6 +241,8 @@ class SearchController extends BaseController with DateRangePickerMixin {
 
   PresentationMailbox? get mailboxFiltered => searchEmailFilter.value.mailbox;
 
+  Label? get labelFiltered => searchEmailFilter.value.label;
+
   Set<String> get listAddressOfToFiltered => searchEmailFilter.value.to;
 
   Set<String> get listAddressOfFromFiltered => searchEmailFilter.value.from;
diff --git a/lib/features/mailbox_dashboard/presentation/extensions/labels/check_label_available_extension.dart b/lib/features/mailbox_dashboard/presentation/extensions/labels/check_label_available_extension.dart
index 421ee169fc..6f176eaf3a 100644
--- a/lib/features/mailbox_dashboard/presentation/extensions/labels/check_label_available_extension.dart
+++ b/lib/features/mailbox_dashboard/presentation/extensions/labels/check_label_available_extension.dart
@@ -1,5 +1,6 @@
 import 'package:get/get.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/labels/handle_logic_label_extension.dart';
 
 extension CheckLabelAvailableExtension on MailboxDashBoardController {
   bool get isLabelFeatureEnabled {
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 20d7974704..26e3e5be8c 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
@@ -1,7 +1,9 @@
 import 'package:dartz/dartz.dart';
 import 'package:jmap_dart_client/jmap/mail/email/keyword_identifier.dart';
+import 'package:labels/model/label.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/action/dashboard_action.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/quick_search_filter.dart';
 
 extension SelectSearchFilterActionExtension on MailboxDashBoardController {
   void selectStarredSearchFilter() {
@@ -31,4 +33,20 @@ extension SelectSearchFilterActionExtension on MailboxDashBoardController {
     searchController.updateFilterEmail(unreadOption: const None());
     dispatchAction(StartSearchEmailAction());
   }
+
+  void deleteQuickSearchFilter({required QuickSearchFilter filter}) {
+    switch (filter) {
+      case QuickSearchFilter.labels:
+        searchController.updateFilterEmail(labelOption: const None());
+        break;
+      default:
+        break;
+    }
+    dispatchAction(StartSearchEmailAction());
+  }
+
+  void onSelectLabelFilter(Label? newLabel) {
+    searchController.updateFilterEmail(labelOption: optionOf(newLabel));
+    dispatchAction(StartSearchEmailAction());
+  }
 }
diff --git a/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart b/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart
index d0fd08b4da..81de9999ac 100644
--- a/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart
+++ b/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart
@@ -22,6 +22,7 @@ import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/action/das
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/base_mailbox_dashboard_view.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/handle_open_context_menu_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/handle_profile_setting_action_type_click_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/extensions/open_and_close_composer_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/select_search_filter_action_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/dashboard_routes.dart';
@@ -643,8 +644,13 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
 
   Widget _buildListButtonQuickSearchFilter(BuildContext context) {
     return Obx(() {
-      if (controller.searchController.isSearchEmailRunning &&
-          controller.dashboardRoute.value == DashboardRoutes.thread) {
+      final isSearchEmailRunning =
+          controller.searchController.isSearchEmailRunning;
+      final isThreadRoute =
+          controller.dashboardRoute.value == DashboardRoutes.thread;
+      final isLabelAvailable = controller.isLabelAvailable;
+
+      if (isSearchEmailRunning && isThreadRoute) {
         return Padding(
           padding: const EdgeInsetsDirectional.only(end: 16),
           child: Row(
@@ -671,6 +677,14 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
                       children: [
                         _buildQuickSearchFilterButton(context, QuickSearchFilter.folder),
                         MailboxDashboardViewWebStyle.searchFilterSizeBoxMargin,
+                        if (isLabelAvailable)
+                          ...[
+                            _buildQuickSearchFilterButton(
+                              context,
+                              QuickSearchFilter.labels,
+                            ),
+                            MailboxDashboardViewWebStyle.searchFilterSizeBoxMargin,
+                          ],
                         _buildQuickSearchFilterButton(context, QuickSearchFilter.from),
                         MailboxDashboardViewWebStyle.searchFilterSizeBoxMargin,
                         _buildQuickSearchFilterButton(context, QuickSearchFilter.to),
@@ -731,6 +745,7 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
       final endDate = controller.searchController.endDateFiltered;
       final receiveTimeType = controller.searchController.receiveTimeFiltered;
       final mailbox = controller.searchController.mailboxFiltered;
+      final label = controller.searchController.labelFiltered;
       final listAddressOfTo = controller.searchController.listAddressOfToFiltered;
       final listHasKeywordFiltered = controller.searchController.listHasKeywordFiltered;
       final unreadFiltered = controller.searchController.unreadFiltered;
@@ -768,13 +783,15 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
         listAddressOfFrom: listAddressOfFrom,
         listAddressOfTo: listAddressOfTo,
         mailbox: mailbox,
+        label: label,
         buttonPadding: buttonPadding,
         backgroundColor: searchFilter == QuickSearchFilter.sortBy
           ? isSelected
               ? AppColor.primaryColor.withValues(alpha: 0.06)
               : AppColor.colorFilterMessageButton.withValues(alpha: 0.6)
           : null,
-        isContextMenuAlignEndButton: isFilterApplied,
+        isContextMenuAlignEndButton:
+          searchFilter != QuickSearchFilter.labels && isFilterApplied,
         onSelectSearchFilterAction: _onSelectSearchFilterAction,
         onDeleteSearchFilterAction: controller.onDeleteSearchFilterAction,
       );
@@ -819,6 +836,19 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
       case QuickSearchFilter.unread:
         controller.selectUnreadSearchFilter();
         break;
+      case QuickSearchFilter.labels:
+        final listLabels = controller.labelController.labels;
+        final selectedLabel = controller.searchController.labelFiltered;
+
+        controller.openLabelsFilterModal(
+          context: context,
+          position: buttonPosition,
+          labels: listLabels,
+          selectedLabel: selectedLabel,
+          imagePaths: controller.imagePaths,
+          onSelectLabelsActions: controller.onSelectLabelFilter,
+        );
+        break;
       default:
         break;
     }
diff --git a/lib/features/mailbox_dashboard/presentation/model/search/quick_search_filter.dart b/lib/features/mailbox_dashboard/presentation/model/search/quick_search_filter.dart
index a80eb33b0d..b3f21b3d52 100644
--- a/lib/features/mailbox_dashboard/presentation/model/search/quick_search_filter.dart
+++ b/lib/features/mailbox_dashboard/presentation/model/search/quick_search_filter.dart
@@ -172,7 +172,9 @@ enum QuickSearchFilter {
     if (responsiveUtils.isMobile(context)) {
       return false;
     } else {
-      return this == QuickSearchFilter.dateTime || this == QuickSearchFilter.sortBy;
+      return this == QuickSearchFilter.dateTime ||
+          this == QuickSearchFilter.sortBy ||
+          this == QuickSearchFilter.labels;
     }
   }
 
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 45c36dd13f..d338ea6e9a 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
@@ -152,7 +152,7 @@ class SearchEmailFilter with EquatableMixin, OptionParamMixin {
           hasKeyword.map((e) => EmailFilterCondition(hasKeyword: e)).toSet(),
         ),
       if (label != null)
-        EmailFilterCondition(hasKeyword: label!.keyword),
+        EmailFilterCondition(hasKeyword: label!.keyword?.value),
       if (moreFilterCondition != null && moreFilterCondition.hasCondition)
         moreFilterCondition
     };
diff --git a/lib/features/search/email/presentation/mixin/search_label_filter_modal_mixin.dart b/lib/features/search/email/presentation/mixin/search_label_filter_modal_mixin.dart
index c2b1ecabd3..ae4ca3638e 100644
--- a/lib/features/search/email/presentation/mixin/search_label_filter_modal_mixin.dart
+++ b/lib/features/search/email/presentation/mixin/search_label_filter_modal_mixin.dart
@@ -62,7 +62,7 @@ mixin SearchLabelFilterModalMixin on PopupContextMenuActionMixin {
       );
     }).toList();
 
-    openPopupMenuAction(context, position, popupMenuItems);
+    openPopupMenuAction(context, position, popupMenuItems, maxHeight: 400);
   }
 
   void openContextMenuLabelsFilter({
@@ -87,6 +87,7 @@ mixin SearchLabelFilterModalMixin on PopupContextMenuActionMixin {
         popBack();
         onSelectLabelsActions(menuAction.action);
       },
+      maxHeight: 400,
     );
   }
 }
diff --git a/lib/features/search/email/presentation/search_email_view.dart b/lib/features/search/email/presentation/search_email_view.dart
index 35a97c252c..a414392f65 100644
--- a/lib/features/search/email/presentation/search_email_view.dart
+++ b/lib/features/search/email/presentation/search_email_view.dart
@@ -266,35 +266,43 @@ class SearchEmailView extends GetWidget<SearchEmailController>
                 scrollbars: false
               ),
               scrollController: controller.listSearchFilterScrollController,
-              child: ListView(
-                key: const Key('search_filter_list_view'),
-                scrollDirection: Axis.horizontal,
-                shrinkWrap: true,
-                controller: controller.listSearchFilterScrollController,
-                padding: SearchEmailViewStyle.getListSearchFilterButtonPadding(
-                  context,
-                  controller.responsiveUtils
-                ),
-                children: [
-                  _buildSearchFilterButton(context, QuickSearchFilter.folder),
-                  SearchEmailViewStyle.searchFilterSizeBoxMargin,
-                  _buildSearchFilterButton(context, QuickSearchFilter.labels),
-                  SearchEmailViewStyle.searchFilterSizeBoxMargin,
-                  _buildSearchFilterButton(context, QuickSearchFilter.from),
-                  SearchEmailViewStyle.searchFilterSizeBoxMargin,
-                  _buildSearchFilterButton(context, QuickSearchFilter.to),
-                  SearchEmailViewStyle.searchFilterSizeBoxMargin,
-                  _buildSearchFilterButton(context, QuickSearchFilter.hasAttachment),
-                  SearchEmailViewStyle.searchFilterSizeBoxMargin,
-                  _buildSearchFilterButton(context, QuickSearchFilter.dateTime),
-                  SearchEmailViewStyle.searchFilterSizeBoxMargin,
-                  _buildSearchFilterButton(context, QuickSearchFilter.starred),
-                  SearchEmailViewStyle.searchFilterSizeBoxMargin,
-                  _buildSearchFilterButton(context, QuickSearchFilter.unread),
-                  SearchEmailViewStyle.searchFilterSizeBoxMargin,
-                  _buildSearchFilterButton(context, QuickSearchFilter.sortBy),
-                ],
-              ),
+              child: Obx(() {
+                final isLabelAvailable =
+                    controller.mailboxDashBoardController.isLabelAvailable;
+
+                return ListView(
+                  key: const Key('search_filter_list_view'),
+                  scrollDirection: Axis.horizontal,
+                  shrinkWrap: true,
+                  controller: controller.listSearchFilterScrollController,
+                  padding: SearchEmailViewStyle.getListSearchFilterButtonPadding(
+                      context,
+                      controller.responsiveUtils
+                  ),
+                  children: [
+                    _buildSearchFilterButton(context, QuickSearchFilter.folder),
+                    SearchEmailViewStyle.searchFilterSizeBoxMargin,
+                    if (isLabelAvailable)
+                     ...[
+                       _buildSearchFilterButton(context, QuickSearchFilter.labels),
+                       SearchEmailViewStyle.searchFilterSizeBoxMargin,
+                     ],
+                    _buildSearchFilterButton(context, QuickSearchFilter.from),
+                    SearchEmailViewStyle.searchFilterSizeBoxMargin,
+                    _buildSearchFilterButton(context, QuickSearchFilter.to),
+                    SearchEmailViewStyle.searchFilterSizeBoxMargin,
+                    _buildSearchFilterButton(context, QuickSearchFilter.hasAttachment),
+                    SearchEmailViewStyle.searchFilterSizeBoxMargin,
+                    _buildSearchFilterButton(context, QuickSearchFilter.dateTime),
+                    SearchEmailViewStyle.searchFilterSizeBoxMargin,
+                    _buildSearchFilterButton(context, QuickSearchFilter.starred),
+                    SearchEmailViewStyle.searchFilterSizeBoxMargin,
+                    _buildSearchFilterButton(context, QuickSearchFilter.unread),
+                    SearchEmailViewStyle.searchFilterSizeBoxMargin,
+                    _buildSearchFilterButton(context, QuickSearchFilter.sortBy),
+                  ],
+                );
+              }),
             ),
           ),
         ),

From 65e83020f1ab1966055d8d4e3fcbd2d9d2dfef43 Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Tue, 6 Jan 2026 00:24:54 +0700
Subject: [PATCH 5/8] TF-4229 refactor(ui): optimize LabelDropDownButton widget
 structure and rebuild scope

---
 .../label_drop_down_button.dart               | 155 +++++++++++-------
 1 file changed, 100 insertions(+), 55 deletions(-)

diff --git a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/label_drop_down_button.dart b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/label_drop_down_button.dart
index ace7ccbb54..774958619a 100644
--- a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/label_drop_down_button.dart
+++ b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/label_drop_down_button.dart
@@ -3,7 +3,8 @@ import 'package:core/presentation/resources/image_paths.dart';
 import 'package:dropdown_button2/dropdown_button2.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
-import 'package:labels/labels.dart';
+import 'package:labels/extensions/label_extension.dart';
+import 'package:labels/model/label.dart';
 import 'package:pointer_interceptor/pointer_interceptor.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/styles/advanced_search_input_form_style.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/styles/label_drop_down_style.dart';
@@ -17,13 +18,13 @@ class LabelDropDownButton extends StatelessWidget {
   final Label? labelSelected;
   final OnSelectLabelsActions onSelectLabelsActions;
 
-  const LabelDropDownButton({
-    Key? key,
+  LabelDropDownButton({
+    super.key,
     required this.imagePaths,
     required this.labels,
     required this.labelSelected,
     required this.onSelectLabelsActions,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -31,67 +32,112 @@ class LabelDropDownButton extends StatelessWidget {
       child: PointerInterceptor(
         child: DropdownButton2<Label>(
           isExpanded: true,
-          items: labels.map((label) {
-            final isSelected = labelSelected?.id == label.id;
-            return DropdownMenuItem<Label>(
-              value: label,
-              child: PointerInterceptor(
-                child: Row(
-                  spacing: 16,
-                  children: [
-                    SvgPicture.asset(
-                      isSelected
-                          ? imagePaths.icCheckboxSelected
-                          : imagePaths.icCheckboxUnselected,
-                      width: LabelDropDownStyle.checkedIconSize,
-                      height: LabelDropDownStyle.checkedIconSize,
-                      colorFilter: isSelected
-                          ? LabelDropDownStyle.checkedIconColor.asFilter()
-                          : LabelDropDownStyle.unCheckedIconColor.asFilter(),
-                      fit: BoxFit.fill,
-                    ),
-                    Expanded(
-                      child: Text(
-                        label.safeDisplayName,
-                        style: LabelDropDownStyle.menuItemStyle,
-                        maxLines: 1,
-                        overflow: TextOverflow.ellipsis,
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-            );
-          }).toList(),
           value: labelSelected,
-          customButton: _buildButton(AppLocalizations.of(context)),
-          onChanged: onSelectLabelsActions,
-          dropdownStyleData: DropdownStyleData(
-            maxHeight: LabelDropDownStyle.dropdownMaxHeight,
-            decoration: LabelDropDownStyle.dropdownDecoration,
-            elevation: LabelDropDownStyle.dropdownElevation,
-            offset: LabelDropDownStyle.dropdownOffset,
-            padding: LabelDropDownStyle.dropdownPadding,
-            scrollbarTheme: ScrollbarThemeData(
-              radius: LabelDropDownStyle.dropdownScrollbarRadius,
-              thickness: WidgetStateProperty.all<double>(
-                LabelDropDownStyle.scrollbarThickness,
-              ),
-              thumbVisibility: WidgetStateProperty.all<bool>(true),
-            ),
+          items: _buildItems(),
+          customButton: _LabelDropdownButtonView(
+            imagePaths: imagePaths,
+            labelSelected: labelSelected,
+            localizations: AppLocalizations.of(context),
           ),
+          onChanged: onSelectLabelsActions,
+          dropdownStyleData: _dropdownStyleData,
           menuItemStyleData: LabelDropDownStyle.menuItemStyleData,
         ),
       ),
     );
   }
 
-  Widget _buildButton(AppLocalizations appLocalizations) {
+  List<DropdownMenuItem<Label>> _buildItems() {
+    return labels.map((label) {
+      return DropdownMenuItem<Label>(
+        value: label,
+        child: _LabelDropdownMenuItem(
+          label: label,
+          isSelected: labelSelected?.id == label.id,
+          imagePaths: imagePaths,
+        ),
+      );
+    }).toList(growable: false);
+  }
+
+  final DropdownStyleData _dropdownStyleData = DropdownStyleData(
+    maxHeight: LabelDropDownStyle.dropdownMaxHeight,
+    decoration: LabelDropDownStyle.dropdownDecoration,
+    elevation: LabelDropDownStyle.dropdownElevation,
+    offset: LabelDropDownStyle.dropdownOffset,
+    padding: LabelDropDownStyle.dropdownPadding,
+    scrollbarTheme: ScrollbarThemeData(
+      radius: LabelDropDownStyle.dropdownScrollbarRadius,
+      thickness: WidgetStateProperty.all<double>(
+        LabelDropDownStyle.scrollbarThickness,
+      ),
+      thumbVisibility: WidgetStateProperty.all<bool>(true),
+    ),
+  );
+}
+
+class _LabelDropdownMenuItem extends StatelessWidget {
+  final Label label;
+  final bool isSelected;
+  final ImagePaths imagePaths;
+
+  const _LabelDropdownMenuItem({
+    required this.label,
+    required this.isSelected,
+    required this.imagePaths,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return PointerInterceptor(
+      child: Row(
+        spacing: 16,
+        children: [
+          SvgPicture.asset(
+            isSelected
+                ? imagePaths.icCheckboxSelected
+                : imagePaths.icCheckboxUnselected,
+            width: LabelDropDownStyle.checkedIconSize,
+            height: LabelDropDownStyle.checkedIconSize,
+            colorFilter: (isSelected
+                    ? LabelDropDownStyle.checkedIconColor
+                    : LabelDropDownStyle.unCheckedIconColor)
+                .asFilter(),
+            fit: BoxFit.fill,
+          ),
+          Expanded(
+            child: Text(
+              label.safeDisplayName,
+              style: LabelDropDownStyle.menuItemStyle,
+              maxLines: 1,
+              overflow: TextOverflow.ellipsis,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _LabelDropdownButtonView extends StatelessWidget {
+  final ImagePaths imagePaths;
+  final Label? labelSelected;
+  final AppLocalizations localizations;
+
+  const _LabelDropdownButtonView({
+    required this.imagePaths,
+    required this.labelSelected,
+    required this.localizations,
+  });
+
+  @override
+  Widget build(BuildContext context) {
     final displayedName =
-        labelSelected?.safeDisplayName ?? appLocalizations.allLabels;
+        labelSelected?.safeDisplayName ?? localizations.allLabels;
 
     return Container(
       height: AdvancedSearchInputFormStyle.inputFieldHeight,
+      padding: LabelDropDownStyle.buttonPadding,
       decoration: BoxDecoration(
         borderRadius: const BorderRadius.all(
           Radius.circular(
@@ -104,7 +150,6 @@ class LabelDropDownButton extends StatelessWidget {
         ),
         color: AdvancedSearchInputFormStyle.inputFieldBackgroundColor,
       ),
-      padding: LabelDropDownStyle.buttonPadding,
       child: Row(
         children: [
           Expanded(
@@ -115,7 +160,7 @@ class LabelDropDownButton extends StatelessWidget {
               overflow: TextOverflow.ellipsis,
             ),
           ),
-          SvgPicture.asset(imagePaths.icDropDown)
+          SvgPicture.asset(imagePaths.icDropDown),
         ],
       ),
     );

From 1802b90f76dd1aa0ab35638fb6160d9d6a98897f Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Wed, 7 Jan 2026 15:07:47 +0700
Subject: [PATCH 6/8] TF-4229 Add integration test on mobile for case
 search_email_with_tag_scenario

---
 integration_test/base/base_test_scenario.dart |   6 +
 .../provisioning_label_scenario_mixin.dart    |  88 +++++++++
 .../mixin/scenario_utils_mixin.dart           |   2 +
 .../models/provisioning_email.dart            |   4 +
 .../models/provisioning_label.dart            |   9 +
 .../robots/label_list_context_menu_robot.dart |  14 ++
 integration_test/robots/label_robot.dart      |  14 ++
 integration_test/robots/search_robot.dart     |   4 +
 .../search_email_with_tag_scenario.dart       |  91 ++++++++++
 .../search/search_email_with_tag_test.dart    |   9 +
 labels/lib/extensions/label_extension.dart    |   2 +-
 .../lib/extensions/list_label_extension.dart  |   4 +
 .../create_email_request_extension.dart       |  26 ++-
 .../model/create_email_request.dart           |   4 +
 .../model/preferences/label_config.dart       |   4 +-
 .../manage_account_dashboard_controller.dart  |   2 +-
 .../search_label_filter_modal_mixin.dart      |   1 +
 .../email/presentation/search_email_view.dart |   6 +-
 .../thread/presentation/thread_view.dart      |   8 +-
 .../composer_repository_impl_test.dart        |   1 +
 .../create_email_request_extension_test.dart  | 169 ++++++++++++++++++
 21 files changed, 449 insertions(+), 19 deletions(-)
 create mode 100644 integration_test/mixin/provisioning_label_scenario_mixin.dart
 create mode 100644 integration_test/models/provisioning_label.dart
 create mode 100644 integration_test/robots/label_list_context_menu_robot.dart
 create mode 100644 integration_test/robots/label_robot.dart
 create mode 100644 integration_test/scenarios/search/search_email_with_tag_scenario.dart
 create mode 100644 integration_test/tests/search/search_email_with_tag_test.dart

diff --git a/integration_test/base/base_test_scenario.dart b/integration_test/base/base_test_scenario.dart
index 30ed32f58d..b69d867b7a 100644
--- a/integration_test/base/base_test_scenario.dart
+++ b/integration_test/base/base_test_scenario.dart
@@ -10,9 +10,15 @@ abstract class BaseTestScenario extends BaseScenario
 
   @override
   Future<void> execute() async {
+    await setupPreLogin();
     await executeLoginScenario();
     await runTestLogic();
+    await disposeAfterTest();
   }
 
+  Future<void> setupPreLogin() async {}
+
   Future<void> runTestLogic();
+
+  Future<void> disposeAfterTest() async {}
 }
diff --git a/integration_test/mixin/provisioning_label_scenario_mixin.dart b/integration_test/mixin/provisioning_label_scenario_mixin.dart
new file mode 100644
index 0000000000..395302d7a5
--- /dev/null
+++ b/integration_test/mixin/provisioning_label_scenario_mixin.dart
@@ -0,0 +1,88 @@
+import 'package:core/utils/app_logger.dart';
+import 'package:jmap_dart_client/jmap/account_id.dart';
+import 'package:labels/labels.dart';
+import 'package:tmail_ui_user/features/labels/domain/state/create_new_label_state.dart';
+import 'package:tmail_ui_user/features/labels/domain/usecases/create_new_label_interactor.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart';
+import 'package:tmail_ui_user/main/routes/route_navigation.dart';
+
+import '../models/provisioning_email.dart';
+import '../models/provisioning_label.dart';
+
+mixin ProvisioningLabelScenarioMixin {
+  Future<List<Label>> provisionLabels(
+    List<ProvisioningLabel> provisioningLabels,
+  ) async {
+    if (provisioningLabels.isEmpty) {
+      return [];
+    }
+
+    final dashboardController = getBinding<MailboxDashBoardController>();
+    final createLabelInteractor = getBinding<CreateNewLabelInteractor>();
+
+    final accountId = dashboardController?.accountId.value;
+    final labelController = dashboardController?.labelController;
+
+    if (createLabelInteractor == null || accountId == null) {
+      log(
+        'ProvisioningLabelScenarioMixin::provisionLabels '
+        'skipped: missing CreateNewLabelInteractor or accountId',
+      );
+      return [];
+    }
+
+    final List<Label?> results = await Future.wait(provisioningLabels.map(
+      (label) => _createLabel(createLabelInteractor, accountId, label),
+    ));
+
+    final List<Label> createdLabels = results.whereType<Label>().toList();
+
+    if (createdLabels.isNotEmpty) {
+      labelController?.getAllLabels(accountId);
+    }
+
+    return createdLabels;
+  }
+
+  Future<Label?> _createLabel(
+    CreateNewLabelInteractor createLabelInteractor,
+    AccountId accountId,
+    ProvisioningLabel provisioningLabel,
+  ) async {
+    final result = await createLabelInteractor
+        .execute(accountId, provisioningLabel.toLabel())
+        .last;
+
+    return result.fold(
+      (_) => null,
+      (success) => success is CreateNewLabelSuccess ? success.newLabel : null,
+    );
+  }
+
+  Future<List<Label>> provisionLabelsByDisplayNames(List<String> labelNames) {
+    return provisionLabels(
+      labelNames.map(ProvisioningLabel.new).toList(),
+    );
+  }
+
+  List<ProvisioningEmail> buildEmailsForLabel({
+    required Label label,
+    required String toEmail,
+    required int count,
+  }) {
+    return List.generate(
+      count,
+      (index) {
+        final emailNumber = index + 1;
+        final displayName = label.safeDisplayName;
+
+        return ProvisioningEmail(
+          toEmail: toEmail,
+          subject: 'Email $emailNumber subject $displayName',
+          content: 'Email $emailNumber content $displayName',
+          labels: [label],
+        );
+      },
+    );
+  }
+}
diff --git a/integration_test/mixin/scenario_utils_mixin.dart b/integration_test/mixin/scenario_utils_mixin.dart
index bc1c4ea2b6..291d0e1b23 100644
--- a/integration_test/mixin/scenario_utils_mixin.dart
+++ b/integration_test/mixin/scenario_utils_mixin.dart
@@ -14,6 +14,7 @@ import 'package:jmap_dart_client/jmap/jmap_request.dart';
 import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
 import 'package:jmap_dart_client/jmap/mail/email/set/set_email_method.dart';
 import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
+import 'package:labels/extensions/list_label_extension.dart';
 import 'package:model/model.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:tmail_ui_user/features/composer/domain/state/upload_attachment_state.dart';
@@ -81,6 +82,7 @@ mixin ScenarioUtilsMixin {
               identity: identity,
               attachments: attachments,
               hasRequestReadReceipt: requestReadReceipt,
+              keywords: provisioningEmail.labels.keywords,
             ),
           )
           .last;
diff --git a/integration_test/models/provisioning_email.dart b/integration_test/models/provisioning_email.dart
index dd84bdf221..d185df0673 100644
--- a/integration_test/models/provisioning_email.dart
+++ b/integration_test/models/provisioning_email.dart
@@ -1,13 +1,17 @@
+import 'package:labels/labels.dart';
+
 class ProvisioningEmail {
   final String toEmail;
   final String subject;
   final String content;
   final List<String> attachmentPaths;
+  final List<Label> labels;
 
   ProvisioningEmail({
     required this.toEmail,
     required this.subject,
     required this.content,
     this.attachmentPaths = const [],
+    this.labels = const [],
   });
 }
\ No newline at end of file
diff --git a/integration_test/models/provisioning_label.dart b/integration_test/models/provisioning_label.dart
new file mode 100644
index 0000000000..90fbb35bbe
--- /dev/null
+++ b/integration_test/models/provisioning_label.dart
@@ -0,0 +1,9 @@
+import 'package:labels/model/label.dart';
+
+class ProvisioningLabel {
+  final String displayName;
+
+  ProvisioningLabel(this.displayName);
+
+  Label toLabel() => Label(displayName: displayName);
+}
diff --git a/integration_test/robots/label_list_context_menu_robot.dart b/integration_test/robots/label_list_context_menu_robot.dart
new file mode 100644
index 0000000000..8f8266bd1c
--- /dev/null
+++ b/integration_test/robots/label_list_context_menu_robot.dart
@@ -0,0 +1,14 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:tmail_ui_user/features/base/widget/context_menu/context_menu_dialog_item.dart';
+
+import '../base/core_robot.dart';
+
+class LabelListContextMenuRobot extends CoreRobot {
+  LabelListContextMenuRobot(super.$);
+
+  Future<void> selectLabelByName(String name) async {
+    final item = $(ContextMenuDialogItem).$(name);
+    await $.scrollUntilVisible(finder: item);
+    await item.tap();
+  }
+}
diff --git a/integration_test/robots/label_robot.dart b/integration_test/robots/label_robot.dart
new file mode 100644
index 0000000000..ab6d55ce07
--- /dev/null
+++ b/integration_test/robots/label_robot.dart
@@ -0,0 +1,14 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:tmail_ui_user/features/mailbox/presentation/widgets/labels/label_list_item.dart';
+
+import '../base/core_robot.dart';
+
+class LabelRobot extends CoreRobot {
+  LabelRobot(super.$);
+
+  Future<void> openLabelByName(String name) async {
+    final item = $(LabelListItem).$(name);
+    await $.scrollUntilVisible(finder: item);
+    await item.tap();
+  }
+}
diff --git a/integration_test/robots/search_robot.dart b/integration_test/robots/search_robot.dart
index 645d99c0b0..fa94a1c078 100644
--- a/integration_test/robots/search_robot.dart
+++ b/integration_test/robots/search_robot.dart
@@ -95,4 +95,8 @@ class SearchRobot extends CoreRobot {
     );
     await $(#mobile_hasAttachment_search_filter_button).tap();
   }
+
+  Future<void> openLabelListModal() async {
+    await $(#mobile_labels_search_filter_button).tap();
+  }
 }
\ No newline at end of file
diff --git a/integration_test/scenarios/search/search_email_with_tag_scenario.dart b/integration_test/scenarios/search/search_email_with_tag_scenario.dart
new file mode 100644
index 0000000000..45494fef32
--- /dev/null
+++ b/integration_test/scenarios/search/search_email_with_tag_scenario.dart
@@ -0,0 +1,91 @@
+import 'package:core/utils/platform_info.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:labels/labels.dart';
+import 'package:tmail_ui_user/features/search/email/presentation/search_email_view.dart';
+import 'package:tmail_ui_user/features/thread/presentation/widgets/email_tile_builder.dart';
+
+import '../../base/base_test_scenario.dart';
+import '../../mixin/provisioning_label_scenario_mixin.dart';
+import '../../robots/label_list_context_menu_robot.dart';
+import '../../robots/search_robot.dart';
+import '../../robots/thread_robot.dart';
+
+class SearchEmailWithTagScenario extends BaseTestScenario
+    with ProvisioningLabelScenarioMixin {
+  const SearchEmailWithTagScenario(super.$);
+
+  @override
+  Future<void> setupPreLogin() async {
+    PlatformInfo.isIntegrationTesting = true;
+  }
+
+  @override
+  Future<void> runTestLogic() async {
+    const emailUser = String.fromEnvironment('BASIC_AUTH_EMAIL');
+
+    final threadRobot = ThreadRobot($);
+    final searchRobot = SearchRobot($);
+    final labelListContextMenuRobot = LabelListContextMenuRobot($);
+
+    final labels = await provisionLabelsByDisplayNames(
+      ['Search Tag 1', 'Search Tag 2', 'Search Tag 3'],
+    );
+    await $.pumpAndSettle();
+
+    int emailCount = 3;
+    for (final label in labels) {
+      await provisionEmail(
+        buildEmailsForLabel(
+          label: label,
+          toEmail: emailUser,
+          count: emailCount,
+        ),
+        requestReadReceipt: false,
+      );
+    }
+    await $.pumpAndSettle(duration: const Duration(seconds: 2));
+
+    await threadRobot.openSearchView();
+    await _expectSearchViewVisible();
+
+    for (final label in labels) {
+      final labelDisplayName = label.safeDisplayName;
+
+      await searchRobot.openLabelListModal();
+      await _expectLabelListContextMenuVisible();
+
+      await labelListContextMenuRobot.selectLabelByName(labelDisplayName);
+      await _expectEmailListDisplayedCorrectByTag(
+        tagDisplayName: labelDisplayName,
+        emailCount: emailCount,
+      );
+
+      await $.pumpAndSettle(duration: const Duration(seconds: 1));
+    }
+  }
+
+  Future<void> _expectSearchViewVisible() async {
+    await expectViewVisible($(SearchEmailView));
+  }
+
+  Future<void> _expectLabelListContextMenuVisible() async {
+    await expectViewVisible($(#label_list_bottom_sheet_context_menu));
+  }
+
+  Future<void> _expectEmailListDisplayedCorrectByTag({
+    required String tagDisplayName,
+    required int emailCount,
+  }) async {
+    final listEmailTileWithTag = $.tester.widgetList<EmailTileBuilder>(
+      $(EmailTileBuilder).which<EmailTileBuilder>((widget) =>
+          widget.presentationEmail.subject?.contains(tagDisplayName) == true),
+    );
+
+    expect(listEmailTileWithTag.length, greaterThanOrEqualTo(emailCount));
+  }
+
+  @override
+  Future<void> disposeAfterTest() async {
+    PlatformInfo.isIntegrationTesting = false;
+  }
+}
diff --git a/integration_test/tests/search/search_email_with_tag_test.dart b/integration_test/tests/search/search_email_with_tag_test.dart
new file mode 100644
index 0000000000..93d8b3a33a
--- /dev/null
+++ b/integration_test/tests/search/search_email_with_tag_test.dart
@@ -0,0 +1,9 @@
+import '../../base/test_base.dart';
+import '../../scenarios/search/search_email_with_tag_scenario.dart';
+
+void main() {
+  TestBase().runPatrolTest(
+    description: 'Should display email list correctly when search with tag',
+    scenarioBuilder: ($) => SearchEmailWithTagScenario($),
+  );
+}
diff --git a/labels/lib/extensions/label_extension.dart b/labels/lib/extensions/label_extension.dart
index 49e3c4a7c0..bb74295013 100644
--- a/labels/lib/extensions/label_extension.dart
+++ b/labels/lib/extensions/label_extension.dart
@@ -15,7 +15,7 @@ extension LabelExtension on Label {
     if (id?.value == moreLabelId) {
       return AppColor.grayBackgroundColor;
     } else {
-      return color?.value.toColor();
+      return color?.value.toColor() ?? AppColor.primaryMain;
     }
   }
 
diff --git a/labels/lib/extensions/list_label_extension.dart b/labels/lib/extensions/list_label_extension.dart
index 0f00c2574d..d8380020ad 100644
--- a/labels/lib/extensions/list_label_extension.dart
+++ b/labels/lib/extensions/list_label_extension.dart
@@ -1,4 +1,5 @@
 import 'package:collection/collection.dart';
+import 'package:jmap_dart_client/jmap/mail/email/keyword_identifier.dart';
 import 'package:labels/extensions/label_extension.dart';
 import 'package:labels/model/label.dart';
 
@@ -13,4 +14,7 @@ extension ListLabelExtension on List<Label> {
   List<String> get displayNameNotNullList => map((label) => label.safeDisplayName)
       .where((name) => name.trim().isNotEmpty)
       .toList();
+
+  List<KeyWordIdentifier> get keywords =>
+      map((label) => label.keyword).nonNulls.toList();
 }
diff --git a/lib/features/composer/presentation/extensions/create_email_request_extension.dart b/lib/features/composer/presentation/extensions/create_email_request_extension.dart
index 090546baeb..6af8e3ea1d 100644
--- a/lib/features/composer/presentation/extensions/create_email_request_extension.dart
+++ b/lib/features/composer/presentation/extensions/create_email_request_extension.dart
@@ -60,18 +60,30 @@ extension CreateEmailRequestExtension on CreateEmailRequest {
   Set<EmailBodyPart> createAttachments() => attachments?.toEmailBodyPart() ?? {};
 
   Map<KeyWordIdentifier, bool>? createKeywords() {
+    if (draftsMailboxId == null &&
+        templateMailboxId == null &&
+        keywords == null) {
+      return null;
+    }
+
+    final result = <KeyWordIdentifier, bool>{};
+
     if (draftsMailboxId != null) {
-      return {
+      result.addAll({
         KeyWordIdentifier.emailDraft: true,
         KeyWordIdentifier.emailSeen: true,
-      };
+      });
     } else if (templateMailboxId != null) {
-      return {
-        KeyWordIdentifier.emailSeen: true,
-      };
-    } else {
-      return null;
+      result[KeyWordIdentifier.emailSeen] = true;
     }
+
+    if (keywords != null) {
+      for (final keyword in keywords!) {
+        result[keyword] = true;
+      }
+    }
+
+    return result;
   }
 
   Map<MailboxId, bool>? createMailboxIds() {
diff --git a/lib/features/composer/presentation/model/create_email_request.dart b/lib/features/composer/presentation/model/create_email_request.dart
index b21069b32e..83a2a15ebf 100644
--- a/lib/features/composer/presentation/model/create_email_request.dart
+++ b/lib/features/composer/presentation/model/create_email_request.dart
@@ -5,6 +5,7 @@ import 'package:jmap_dart_client/jmap/core/session/session.dart';
 import 'package:jmap_dart_client/jmap/identities/identity.dart';
 import 'package:jmap_dart_client/jmap/mail/email/email.dart';
 import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
+import 'package:jmap_dart_client/jmap/mail/email/keyword_identifier.dart';
 import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
 import 'package:model/email/attachment.dart';
 import 'package:model/email/email_action_type.dart';
@@ -47,6 +48,7 @@ class CreateEmailRequest with EquatableMixin {
   final int? savedDraftHash;
   final EmailActionType? savedActionType;
   final EmailId? savedEmailDraftId;
+  final List<KeyWordIdentifier>? keywords;
 
   CreateEmailRequest({
     required this.session,
@@ -83,6 +85,7 @@ class CreateEmailRequest with EquatableMixin {
     this.savedDraftHash,
     this.savedActionType,
     this.savedEmailDraftId,
+    this.keywords,
   });
 
   @override
@@ -121,5 +124,6 @@ class CreateEmailRequest with EquatableMixin {
     savedDraftHash,
     savedActionType,
     savedEmailDraftId,
+    keywords,
   ];
 }
\ No newline at end of file
diff --git a/lib/features/manage_account/domain/model/preferences/label_config.dart b/lib/features/manage_account/domain/model/preferences/label_config.dart
index 4c0a183747..7cf712651e 100644
--- a/lib/features/manage_account/domain/model/preferences/label_config.dart
+++ b/lib/features/manage_account/domain/model/preferences/label_config.dart
@@ -1,3 +1,4 @@
+import 'package:core/utils/platform_info.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/model/preferences/preferences_config.dart';
 
@@ -9,7 +10,8 @@ class LabelConfig extends PreferencesConfig {
 
   LabelConfig({this.isEnabled = false});
 
-  factory LabelConfig.initial() => LabelConfig();
+  factory LabelConfig.initial() =>
+      LabelConfig(isEnabled: PlatformInfo.isIntegrationTesting);
 
   factory LabelConfig.fromJson(Map<String, dynamic> json) =>
       _$LabelConfigFromJson(json);
diff --git a/lib/features/manage_account/presentation/manage_account_dashboard_controller.dart b/lib/features/manage_account/presentation/manage_account_dashboard_controller.dart
index 46b206fa72..8e36a7bd80 100644
--- a/lib/features/manage_account/presentation/manage_account_dashboard_controller.dart
+++ b/lib/features/manage_account/presentation/manage_account_dashboard_controller.dart
@@ -76,7 +76,7 @@ class ManageAccountDashBoardController extends ReloadableController
   final vacationResponse = Rxn<VacationResponse>();
   final dashboardSettingAction = Rxn<UIAction>();
   final octetsQuota = Rxn<Quota>();
-  final isLabelVisibilityEnabled = RxBool(false);
+  final isLabelVisibilityEnabled = RxBool(PlatformInfo.isIntegrationTesting);
 
   Uri? previousUri;
   AccountMenuItem? selectedMenu;
diff --git a/lib/features/search/email/presentation/mixin/search_label_filter_modal_mixin.dart b/lib/features/search/email/presentation/mixin/search_label_filter_modal_mixin.dart
index ae4ca3638e..eb4b7b91a8 100644
--- a/lib/features/search/email/presentation/mixin/search_label_filter_modal_mixin.dart
+++ b/lib/features/search/email/presentation/mixin/search_label_filter_modal_mixin.dart
@@ -81,6 +81,7 @@ mixin SearchLabelFilterModalMixin on PopupContextMenuActionMixin {
     }).toList();
 
     openBottomSheetContextMenuAction(
+      key: const Key('label_list_bottom_sheet_context_menu'),
       context: context,
       itemActions: contextMenuActions,
       onContextMenuActionClick: (menuAction) {
diff --git a/lib/features/search/email/presentation/search_email_view.dart b/lib/features/search/email/presentation/search_email_view.dart
index a414392f65..fbd97b4a8f 100644
--- a/lib/features/search/email/presentation/search_email_view.dart
+++ b/lib/features/search/email/presentation/search_email_view.dart
@@ -748,14 +748,12 @@ class SearchEmailView extends GetWidget<SearchEmailController>
 
         final isLabelAvailable = dashboardController.isLabelAvailable;
 
-        final labelController = dashboardController.labelController;
+        final listLabels = dashboardController.labelController.labels;
 
         List<Label>? emailLabels;
 
         if (isLabelAvailable) {
-          emailLabels = presentationEmail.getLabelList(
-            labelController.labels,
-          );
+          emailLabels = presentationEmail.getLabelList(listLabels);
         }
 
         return EmailTileBuilder(
diff --git a/lib/features/thread/presentation/thread_view.dart b/lib/features/thread/presentation/thread_view.dart
index 6b7346965c..82655cc348 100644
--- a/lib/features/thread/presentation/thread_view.dart
+++ b/lib/features/thread/presentation/thread_view.dart
@@ -598,15 +598,13 @@ class ThreadView extends GetWidget<ThreadController>
         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 EmailTileBuilder(
diff --git a/test/features/composer/data/repository/composer_repository_impl_test.dart b/test/features/composer/data/repository/composer_repository_impl_test.dart
index 1bbd209f91..4d72fa2c6e 100644
--- a/test/features/composer/data/repository/composer_repository_impl_test.dart
+++ b/test/features/composer/data/repository/composer_repository_impl_test.dart
@@ -62,6 +62,7 @@ void main() {
       when(mockCreateEmailRequest.identity).thenReturn(mockIdentity);
       when(mockCreateEmailRequest.replyToRecipients).thenReturn({});
       when(mockCreateEmailRequest.ownEmailAddress).thenReturn('test@example.com');
+      when(mockCreateEmailRequest.keywords).thenReturn(null);
 
       repository = ComposerRepositoryImpl(
         mockAttachmentUploadDataSource,
diff --git a/test/features/composer/presentation/extensions/create_email_request_extension_test.dart b/test/features/composer/presentation/extensions/create_email_request_extension_test.dart
index 8fdbd5db69..88ca01a096 100644
--- a/test/features/composer/presentation/extensions/create_email_request_extension_test.dart
+++ b/test/features/composer/presentation/extensions/create_email_request_extension_test.dart
@@ -1,6 +1,11 @@
 import 'package:flutter_test/flutter_test.dart';
+import 'package:jmap_dart_client/jmap/account_id.dart';
+import 'package:jmap_dart_client/jmap/core/id.dart';
+import 'package:jmap_dart_client/jmap/core/session/session.dart';
 import 'package:jmap_dart_client/jmap/mail/email/email_body_part.dart';
 import 'package:jmap_dart_client/jmap/mail/email/individual_header_identifier.dart';
+import 'package:jmap_dart_client/jmap/mail/email/keyword_identifier.dart';
+import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
 import 'package:model/model.dart';
 import 'package:tmail_ui_user/features/composer/presentation/extensions/create_email_request_extension.dart';
 import 'package:tmail_ui_user/features/composer/presentation/model/create_email_request.dart';
@@ -98,4 +103,168 @@ void main() {
       );
     });
   });
+
+  group('CreateEmailRequestExtension.createKeywords', () {
+    late Session session;
+    late AccountId accountId;
+
+    setUp(() {
+      session = SessionFixtures.aliceSession;
+      accountId = AccountFixtures.aliceAccountId;
+    });
+
+    CreateEmailRequest buildRequest({
+      MailboxId? draftsMailboxId,
+      MailboxId? templateMailboxId,
+      List<KeyWordIdentifier>? keywords,
+    }) {
+      return CreateEmailRequest(
+        session: session,
+        accountId: accountId,
+        emailActionType: EmailActionType.compose,
+        ownEmailAddress: 'user@example.com',
+        subject: 'subject',
+        emailContent: 'content',
+        draftsMailboxId: draftsMailboxId,
+        templateMailboxId: templateMailboxId,
+        keywords: keywords,
+      );
+    }
+
+    test('returns null when drafts, template and keywords are all null', () {
+      final request = buildRequest();
+
+      final result = request.createKeywords();
+
+      expect(result, isNull);
+    });
+
+    test('returns \$draft and \$seen when draftsMailboxId is provided', () {
+      final request = buildRequest(
+        draftsMailboxId: MailboxId(Id('drafts')),
+      );
+
+      final result = request.createKeywords();
+
+      expect(result, {
+        KeyWordIdentifier.emailDraft: true,
+        KeyWordIdentifier.emailSeen: true,
+      });
+    });
+
+    test('returns only \$seen when templateMailboxId is provided', () {
+      final request = buildRequest(
+        templateMailboxId: MailboxId(Id('template')),
+      );
+
+      final result = request.createKeywords();
+
+      expect(result, {
+        KeyWordIdentifier.emailSeen: true,
+      });
+    });
+
+    test('returns only custom keywords when keywords is provided alone', () {
+      final request = buildRequest(
+        keywords: [
+          KeyWordIdentifier.emailFlagged,
+          KeyWordIdentifier.emailAnswered,
+        ],
+      );
+
+      final result = request.createKeywords();
+
+      expect(result, {
+        KeyWordIdentifier.emailFlagged: true,
+        KeyWordIdentifier.emailAnswered: true,
+      });
+    });
+
+    test('merges drafts keywords with custom keywords', () {
+      final request = buildRequest(
+        draftsMailboxId: MailboxId(Id('drafts')),
+        keywords: [
+          KeyWordIdentifier.emailFlagged,
+        ],
+      );
+
+      final result = request.createKeywords();
+
+      expect(result, {
+        KeyWordIdentifier.emailDraft: true,
+        KeyWordIdentifier.emailSeen: true,
+        KeyWordIdentifier.emailFlagged: true,
+      });
+    });
+
+    test('merges template keywords with custom keywords', () {
+      final request = buildRequest(
+        templateMailboxId: MailboxId(Id('template')),
+        keywords: [
+          KeyWordIdentifier.emailFlagged,
+        ],
+      );
+
+      final result = request.createKeywords();
+
+      expect(result, {
+        KeyWordIdentifier.emailSeen: true,
+        KeyWordIdentifier.emailFlagged: true,
+      });
+    });
+
+    test('does not duplicate \$seen if provided in custom keywords', () {
+      final request = buildRequest(
+        templateMailboxId: MailboxId(Id('template')),
+        keywords: [
+          KeyWordIdentifier.emailSeen,
+          KeyWordIdentifier.emailFlagged,
+        ],
+      );
+
+      final result = request.createKeywords();
+
+      expect(result, {
+        KeyWordIdentifier.emailSeen: true,
+        KeyWordIdentifier.emailFlagged: true,
+      });
+    });
+
+    test('does not duplicate \$draft if provided in custom keywords', () {
+      final request = buildRequest(
+        draftsMailboxId: MailboxId(Id('drafts')),
+        keywords: [
+          KeyWordIdentifier.emailDraft,
+        ],
+      );
+
+      final result = request.createKeywords();
+
+      expect(result, {
+        KeyWordIdentifier.emailDraft: true,
+        KeyWordIdentifier.emailSeen: true,
+      });
+    });
+
+    test('handles multiple custom keywords correctly', () {
+      final request = buildRequest(
+        draftsMailboxId: MailboxId(Id('drafts')),
+        keywords: [
+          KeyWordIdentifier.emailFlagged,
+          KeyWordIdentifier.emailAnswered,
+          KeyWordIdentifier.emailForwarded,
+        ],
+      );
+
+      final result = request.createKeywords();
+
+      expect(result, {
+        KeyWordIdentifier.emailDraft: true,
+        KeyWordIdentifier.emailSeen: true,
+        KeyWordIdentifier.emailFlagged: true,
+        KeyWordIdentifier.emailAnswered: true,
+        KeyWordIdentifier.emailForwarded: true,
+      });
+    });
+  });
 }
\ No newline at end of file

From 5acb45144d7dac77dfd342513302956110bf52cd Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Wed, 7 Jan 2026 16:14:04 +0700
Subject: [PATCH 7/8] TF-4229 refactor(label-dropdown): extract checkbox icon
 and label text widgets

---
 .../label_drop_down_button.dart               | 74 ++++++++++++++-----
 1 file changed, 55 insertions(+), 19 deletions(-)

diff --git a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/label_drop_down_button.dart b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/label_drop_down_button.dart
index 774958619a..3811391bd5 100644
--- a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/label_drop_down_button.dart
+++ b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/label_drop_down_button.dart
@@ -93,32 +93,68 @@ class _LabelDropdownMenuItem extends StatelessWidget {
       child: Row(
         spacing: 16,
         children: [
-          SvgPicture.asset(
-            isSelected
-                ? imagePaths.icCheckboxSelected
-                : imagePaths.icCheckboxUnselected,
-            width: LabelDropDownStyle.checkedIconSize,
-            height: LabelDropDownStyle.checkedIconSize,
-            colorFilter: (isSelected
-                    ? LabelDropDownStyle.checkedIconColor
-                    : LabelDropDownStyle.unCheckedIconColor)
-                .asFilter(),
-            fit: BoxFit.fill,
-          ),
-          Expanded(
-            child: Text(
-              label.safeDisplayName,
-              style: LabelDropDownStyle.menuItemStyle,
-              maxLines: 1,
-              overflow: TextOverflow.ellipsis,
-            ),
+          _CheckboxIcon(
+            isSelected: isSelected,
+            imagePaths: imagePaths,
           ),
+          _LabelName(text: label.safeDisplayName),
         ],
       ),
     );
   }
 }
 
+class _CheckboxIcon extends StatelessWidget {
+  final bool isSelected;
+  final ImagePaths imagePaths;
+
+  const _CheckboxIcon({
+    required this.isSelected,
+    required this.imagePaths,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return SvgPicture.asset(
+      _iconPath,
+      width: LabelDropDownStyle.checkedIconSize,
+      height: LabelDropDownStyle.checkedIconSize,
+      colorFilter: _iconColor.asFilter(),
+      fit: BoxFit.fill,
+    );
+  }
+
+  String get _iconPath {
+    return isSelected
+        ? imagePaths.icCheckboxSelected
+        : imagePaths.icCheckboxUnselected;
+  }
+
+  Color get _iconColor {
+    return isSelected
+        ? LabelDropDownStyle.checkedIconColor
+        : LabelDropDownStyle.unCheckedIconColor;
+  }
+}
+
+class _LabelName extends StatelessWidget {
+  final String text;
+
+  const _LabelName({required this.text});
+
+  @override
+  Widget build(BuildContext context) {
+    return Expanded(
+      child: Text(
+        text,
+        style: LabelDropDownStyle.menuItemStyle,
+        maxLines: 1,
+        overflow: TextOverflow.ellipsis,
+      ),
+    );
+  }
+}
+
 class _LabelDropdownButtonView extends StatelessWidget {
   final ImagePaths imagePaths;
   final Label? labelSelected;

From 4a2fbfaabeb0bddde7d123b737a5d4916f01775c Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Wed, 7 Jan 2026 16:35:07 +0700
Subject: [PATCH 8/8] TF-4229 Add `isSelected` && condition to non-RTL
 selectedIconWidget rendering to match RTL behavior.

---
 .../provisioning_label_scenario_mixin.dart     |  6 ++++--
 .../search/search_email_with_tag_scenario.dart |  1 +
 .../popup_menu_item_action_widget.dart         |  2 +-
 .../model/create_email_request.dart            |  2 +-
 .../controller/single_email_controller.dart    |  2 +-
 .../email/presentation/email_view.dart         | 14 ++++++--------
 .../handle_label_for_email_extension.dart      |  6 +++---
 .../presentation/base_mailbox_view.dart        | 12 ++++--------
 .../mailbox_dashboard_controller.dart          |  6 +-----
 .../check_label_available_extension.dart       | 16 ++++++++++++----
 .../labels/handle_logic_label_extension.dart   | 18 ------------------
 .../select_search_filter_action_extension.dart |  6 ++++++
 .../mailbox_dashboard_view_web.dart            |  2 +-
 .../model/search/search_email_filter.dart      |  4 ++--
 .../advanced_search_input_form.dart            |  4 ++--
 .../email/presentation/search_email_view.dart  |  2 +-
 .../thread/presentation/thread_view.dart       |  2 +-
 .../labels/add_label_to_thread_extension.dart  |  2 +-
 .../on_thread_detail_action_click.dart         |  4 ++--
 .../presentation/thread_detail_view.dart       |  2 +-
 20 files changed, 51 insertions(+), 62 deletions(-)
 delete mode 100644 lib/features/mailbox_dashboard/presentation/extensions/labels/handle_logic_label_extension.dart

diff --git a/integration_test/mixin/provisioning_label_scenario_mixin.dart b/integration_test/mixin/provisioning_label_scenario_mixin.dart
index 395302d7a5..9e45e7d803 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 45494fef32..4636578824 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 c869595224..e64673fb84 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 83a2a15ebf..4c02690ba6 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/controller/single_email_controller.dart b/lib/features/email/presentation/controller/single_email_controller.dart
index e5bc91eb02..31bf7eb523 100644
--- a/lib/features/email/presentation/controller/single_email_controller.dart
+++ b/lib/features/email/presentation/controller/single_email_controller.dart
@@ -897,7 +897,7 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
         pressEmailAction(actionType, presentationEmail);
         break;
       case EmailActionType.labelAs:
-        if (!isLabelFeatureEnabled) return;
+        if (!isLabelAvailable) return;
         openAddLabelToEmailDialogModal(presentationEmail);
         break;
       default:
diff --git a/lib/features/email/presentation/email_view.dart b/lib/features/email/presentation/email_view.dart
index 2d3fd21408..dd50080f05 100644
--- a/lib/features/email/presentation/email_view.dart
+++ b/lib/features/email/presentation/email_view.dart
@@ -41,7 +41,7 @@ import 'package:tmail_ui_user/features/email/presentation/widgets/information_se
 import 'package:tmail_ui_user/features/email/presentation/widgets/mail_unsubscribed_banner.dart';
 import 'package:tmail_ui_user/features/email/presentation/widgets/view_entire_message_with_message_clipped_widget.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/handle_open_context_menu_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/extensions/labels/check_label_available_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/verify_display_overlay_view_on_iframe_extension.dart';
 import 'package:tmail_ui_user/features/manage_account/presentation/extensions/vacation_response_extension.dart';
 import 'package:tmail_ui_user/features/manage_account/presentation/vacation/widgets/vacation_notification_message_widget.dart';
@@ -104,7 +104,7 @@ class EmailView extends GetWidget<SingleEmailController> {
                         handleEmailAction: controller.handleEmailAction,
                         additionalActions: [],
                         emailIsRead: presentationEmail.hasRead,
-                        isLabelFeatureEnabled: controller.isLabelFeatureEnabled,
+                        isLabelFeatureEnabled: controller.isLabelAvailable,
                         labels: controller.mailboxDashBoardController.labelController.labels,
                         openBottomSheetContextMenu: controller.mailboxDashBoardController.openBottomSheetContextMenu,
                         openPopupMenu: controller.mailboxDashBoardController.openPopupMenuActionGroup,
@@ -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(
@@ -314,7 +312,7 @@ class EmailView extends GetWidget<SingleEmailController> {
               EmailActionType.deletePermanently,
             ],
             emailIsRead: presentationEmail.hasRead,
-            isLabelFeatureEnabled: controller.isLabelFeatureEnabled,
+            isLabelFeatureEnabled: controller.isLabelAvailable,
             labels: controller.mailboxDashBoardController.labelController.labels,
             openBottomSheetContextMenu: controller.mailboxDashBoardController.openBottomSheetContextMenu,
             openPopupMenu: controller.mailboxDashBoardController.openPopupMenuActionGroup,
diff --git a/lib/features/email/presentation/extensions/handle_label_for_email_extension.dart b/lib/features/email/presentation/extensions/handle_label_for_email_extension.dart
index 5e6ae7ec65..8463fa19b1 100644
--- a/lib/features/email/presentation/extensions/handle_label_for_email_extension.dart
+++ b/lib/features/email/presentation/extensions/handle_label_for_email_extension.dart
@@ -22,8 +22,8 @@ import 'package:tmail_ui_user/features/thread_detail/domain/extensions/list_emai
 import 'package:tmail_ui_user/main/routes/dialog_router.dart';
 
 extension HandleLabelForEmailExtension on SingleEmailController {
-  bool get isLabelFeatureEnabled {
-    return mailboxDashBoardController.isLabelFeatureEnabled;
+  bool get isLabelAvailable {
+    return mailboxDashBoardController.isLabelAvailable;
   }
 
   void toggleLabelToEmail(EmailId emailId, Label label, bool isSelected) {
@@ -213,7 +213,7 @@ extension HandleLabelForEmailExtension on SingleEmailController {
   }
 
   Future<void> openAddLabelToEmailDialogModal(PresentationEmail email) async {
-    if (!isLabelFeatureEnabled) return;
+    if (!isLabelAvailable) return;
     final labels = mailboxDashBoardController.labelController.labels;
     final emailLabels = email.getLabelList(labels);
     final emailId = email.id;
diff --git a/lib/features/mailbox/presentation/base_mailbox_view.dart b/lib/features/mailbox/presentation/base_mailbox_view.dart
index 2e123ae436..be66ff8587 100644
--- a/lib/features/mailbox/presentation/base_mailbox_view.dart
+++ b/lib/features/mailbox/presentation/base_mailbox_view.dart
@@ -24,7 +24,7 @@ import 'package:tmail_ui_user/features/mailbox/presentation/widgets/mailbox_cate
 import 'package:tmail_ui_user/features/mailbox/presentation/widgets/mailbox_item_widget.dart';
 import 'package:tmail_ui_user/features/mailbox/presentation/widgets/mailbox_loading_bar_widget.dart';
 import 'package:tmail_ui_user/features/mailbox/presentation/widgets/sending_queue_mailbox_widget.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/extensions/labels/check_label_available_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/dashboard_routes.dart';
 
 abstract class BaseMailboxView extends GetWidget<MailboxController>
@@ -344,18 +344,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 f8af1dd01c..22eddde8a4 100644
--- a/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart
+++ b/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart
@@ -133,7 +133,7 @@ import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/handle_save_email_as_draft_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/handle_store_email_sort_order_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/initialize_app_language.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/extensions/labels/check_label_available_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/notify_thread_detail_setting_updated.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/open_and_close_composer_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/reopen_composer_cache_extension.dart';
@@ -2342,11 +2342,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/labels/check_label_available_extension.dart b/lib/features/mailbox_dashboard/presentation/extensions/labels/check_label_available_extension.dart
index 6f176eaf3a..ee6fb0ee21 100644
--- a/lib/features/mailbox_dashboard/presentation/extensions/labels/check_label_available_extension.dart
+++ b/lib/features/mailbox_dashboard/presentation/extensions/labels/check_label_available_extension.dart
@@ -1,10 +1,18 @@
 import 'package:get/get.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/labels/handle_logic_label_extension.dart';
 
 extension CheckLabelAvailableExtension on MailboxDashBoardController {
-  bool get isLabelFeatureEnabled {
-    return isLabelCapabilitySupported &&
-        labelController.isLabelSettingEnabled.isTrue;
+  bool get isLabelCapabilitySupported {
+    final accountId = this.accountId.value;
+    final session = sessionCurrent;
+
+    if (accountId == null || session == null) return false;
+
+    return labelController.isLabelCapabilitySupported(session, accountId);
+  }
+
+  bool get isLabelAvailable {
+    return labelController.isLabelSettingEnabled.isTrue &&
+        isLabelCapabilitySupported;
   }
 }
diff --git a/lib/features/mailbox_dashboard/presentation/extensions/labels/handle_logic_label_extension.dart b/lib/features/mailbox_dashboard/presentation/extensions/labels/handle_logic_label_extension.dart
deleted file mode 100644
index 74575046e5..0000000000
--- a/lib/features/mailbox_dashboard/presentation/extensions/labels/handle_logic_label_extension.dart
+++ /dev/null
@@ -1,18 +0,0 @@
-import 'package:get/get.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart';
-
-extension HandleLogicLabelExtension on MailboxDashBoardController {
-  bool get isLabelCapabilitySupported {
-    final accountId = this.accountId.value;
-    final session = sessionCurrent;
-
-    if (accountId == null || session == null) return false;
-
-    return labelController.isLabelCapabilitySupported(session, accountId);
-  }
-
-  bool get isLabelAvailable {
-    return labelController.isLabelSettingEnabled.isTrue &&
-        isLabelCapabilitySupported;
-  }
-}
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 26e3e5be8c..a7662a0a69 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/mailbox_dashboard_view_web.dart b/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart
index 81de9999ac..11f1024228 100644
--- a/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart
+++ b/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart
@@ -22,7 +22,7 @@ import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/action/das
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/base_mailbox_dashboard_view.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/handle_open_context_menu_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/handle_profile_setting_action_type_click_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/extensions/labels/check_label_available_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/open_and_close_composer_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/select_search_filter_action_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/dashboard_routes.dart';
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 d338ea6e9a..338d39fc31 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 46c9c36d2d..bffdc85c12 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,13 +1,13 @@
 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/extensions/labels/check_label_available_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/email_receive_time_type.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_field_widget.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_filter_form_bottom_view.dart';
diff --git a/lib/features/search/email/presentation/search_email_view.dart b/lib/features/search/email/presentation/search_email_view.dart
index fbd97b4a8f..b20c05c3a7 100644
--- a/lib/features/search/email/presentation/search_email_view.dart
+++ b/lib/features/search/email/presentation/search_email_view.dart
@@ -20,7 +20,7 @@ import 'package:tmail_ui_user/features/base/widget/popup_menu/popup_menu_item_ac
 import 'package:tmail_ui_user/features/base/widget/scrollbar_list_view.dart';
 import 'package:tmail_ui_user/features/email/presentation/extensions/presentation_email_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/model/recent_search.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/extensions/labels/check_label_available_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/email_receive_time_type.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/email_sort_order_type.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/quick_search_filter.dart';
diff --git a/lib/features/thread/presentation/thread_view.dart b/lib/features/thread/presentation/thread_view.dart
index 82655cc348..2b79486190 100644
--- a/lib/features/thread/presentation/thread_view.dart
+++ b/lib/features/thread/presentation/thread_view.dart
@@ -23,7 +23,7 @@ import 'package:tmail_ui_user/features/mailbox/domain/state/mark_as_mailbox_read
 import 'package:tmail_ui_user/features/mailbox/domain/state/move_folder_content_state.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/model/spam_report_state.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/handle_open_context_menu_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/extensions/labels/check_label_available_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/open_and_close_composer_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/widgets/recover_deleted_message_loading_banner_widget.dart';
 import 'package:tmail_ui_user/features/manage_account/presentation/extensions/vacation_response_extension.dart';
diff --git a/lib/features/thread_detail/presentation/extension/labels/add_label_to_thread_extension.dart b/lib/features/thread_detail/presentation/extension/labels/add_label_to_thread_extension.dart
index d518c2d9cc..e38754af56 100644
--- a/lib/features/thread_detail/presentation/extension/labels/add_label_to_thread_extension.dart
+++ b/lib/features/thread_detail/presentation/extension/labels/add_label_to_thread_extension.dart
@@ -18,7 +18,7 @@ import 'package:tmail_ui_user/main/routes/dialog_router.dart';
 
 extension AddLabelToThreadExtension on ThreadDetailController {
   Future<void> openAddLabelToEmailDialogModal() async {
-    if (!mailboxDashBoardController.isLabelFeatureEnabled) return;
+    if (!mailboxDashBoardController.isLabelAvailable) return;
 
     final labels = mailboxDashBoardController.labelController.labels;
     if (emailsInThreadDetailInfo.isEmpty || labels.isEmpty) {
diff --git a/lib/features/thread_detail/presentation/extension/on_thread_detail_action_click.dart b/lib/features/thread_detail/presentation/extension/on_thread_detail_action_click.dart
index edcb5a60a0..e847877a00 100644
--- a/lib/features/thread_detail/presentation/extension/on_thread_detail_action_click.dart
+++ b/lib/features/thread_detail/presentation/extension/on_thread_detail_action_click.dart
@@ -125,7 +125,7 @@ extension OnThreadDetailActionClick on ThreadDetailController {
         _moveToMailbox(mailboxId, threadDetailActionType);
         break;
       case EmailActionType.labelAs:
-        if (!mailboxDashBoardController.isLabelFeatureEnabled) return;
+        if (!mailboxDashBoardController.isLabelAvailable) return;
         openAddLabelToEmailDialogModal();
         break;
       default:
@@ -137,7 +137,7 @@ extension OnThreadDetailActionClick on ThreadDetailController {
     if (currentContext == null) return;
 
     final moreActions = [
-      if (mailboxDashBoardController.isLabelFeatureEnabled)
+      if (mailboxDashBoardController.isLabelAvailable)
         EmailActionType.labelAs,
       threadDetailIsRead
           ? EmailActionType.markAsUnread
diff --git a/lib/features/thread_detail/presentation/thread_detail_view.dart b/lib/features/thread_detail/presentation/thread_detail_view.dart
index 31be12d80f..ae24311cf6 100644
--- a/lib/features/thread_detail/presentation/thread_detail_view.dart
+++ b/lib/features/thread_detail/presentation/thread_detail_view.dart
@@ -11,7 +11,7 @@ import 'package:tmail_ui_user/features/email/presentation/action/email_ui_action
 import 'package:tmail_ui_user/features/email/presentation/styles/email_view_app_bar_widget_styles.dart';
 import 'package:tmail_ui_user/features/email/presentation/widgets/email_view_bottom_bar_widget.dart';
 import 'package:tmail_ui_user/features/mailbox/presentation/extensions/presentation_mailbox_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/extensions/labels/check_label_available_extension.dart';
 import 'package:tmail_ui_user/features/manage_account/presentation/extensions/vacation_response_extension.dart';
 import 'package:tmail_ui_user/features/manage_account/presentation/vacation/widgets/vacation_notification_message_widget.dart';
 import 'package:tmail_ui_user/features/thread_detail/domain/state/get_thread_by_id_state.dart';