diff --git a/lib/features/thread/presentation/mixin/base_email_item_tile.dart b/lib/features/thread/presentation/mixin/base_email_item_tile.dart
index 2123caf4c..aca87e340 100644
--- a/lib/features/thread/presentation/mixin/base_email_item_tile.dart
+++ b/lib/features/thread/presentation/mixin/base_email_item_tile.dart
@@ -55,8 +55,8 @@ mixin BaseEmailItemTile {
     }
   }
 
-  bool isSearchEnabled(SearchStatus state, SearchQuery? query) =>
-      state == SearchStatus.ACTIVE && query != null && query.value.isNotEmpty;
+  bool isSearchEnabled(SearchStatus state, bool advancedSearchActivated, SearchQuery? query) =>
+      (state == SearchStatus.ACTIVE || advancedSearchActivated) && query?.value.isNotEmpty == true;
 
   FontWeight buildFontForReadEmail(PresentationEmail email) =>
       !email.hasRead ? FontWeight.w600 : FontWeight.normal;
@@ -80,9 +80,10 @@ mixin BaseEmailItemTile {
       PresentationEmail email,
       PresentationMailbox? mailbox,
       SearchStatus state,
+      bool advancedSearchActivated,
       SearchQuery? query
   ) {
-    if (isSearchEnabled(state, query)) {
+    if (isSearchEnabled(state, advancedSearchActivated, query)) {
       return RichTextBuilder(
           informationSender(email, mailbox),
           query?.value ?? '',
@@ -114,9 +115,10 @@ mixin BaseEmailItemTile {
   Widget buildEmailTitle(
       PresentationEmail email,
       SearchStatus state,
+      bool advancedSearchActivated,
       SearchQuery? query
   ) {
-    if (isSearchEnabled(state, query)) {
+    if (isSearchEnabled(state, advancedSearchActivated, query)) {
       return RichTextBuilder(
           email.getEmailTitle(),
           query?.value ?? '',
@@ -147,9 +149,10 @@ mixin BaseEmailItemTile {
   Widget buildEmailPartialContent(
       PresentationEmail email,
       SearchStatus state,
+      bool advancedSearchActivated,
       SearchQuery? query
   ) {
-    if (isSearchEnabled(state, query)) {
+    if (isSearchEnabled(state, advancedSearchActivated, query)) {
       return RichTextBuilder(
           email.getPartialContent(),
           query?.value ?? '',
diff --git a/lib/features/thread/presentation/widgets/email_tile_builder.dart b/lib/features/thread/presentation/widgets/email_tile_builder.dart
index 0328d2d15..af44e0df2 100644
--- a/lib/features/thread/presentation/widgets/email_tile_builder.dart
+++ b/lib/features/thread/presentation/widgets/email_tile_builder.dart
@@ -80,6 +80,7 @@ class EmailTileBuilder with BaseEmailItemTile {
                     _presentationEmail,
                     mailboxCurrent,
                     _searchStatus,
+                    advancedSearchActivated,
                     _searchQuery)),
                 if (_presentationEmail.hasAttachment == true)
                   Padding(
@@ -103,6 +104,7 @@ class EmailTileBuilder with BaseEmailItemTile {
                         Expanded(child: buildEmailTitle(
                             _presentationEmail,
                             _searchStatus,
+                            advancedSearchActivated,
                             _searchQuery)),
                         buildMailboxContain(
                             _searchStatus,
@@ -121,6 +123,7 @@ class EmailTileBuilder with BaseEmailItemTile {
                       Expanded(child: buildEmailPartialContent(
                           _presentationEmail,
                           _searchStatus,
+                          advancedSearchActivated,
                           _searchQuery)),
                     ])
                 ),
diff --git a/lib/features/thread/presentation/widgets/email_tile_web_builder.dart b/lib/features/thread/presentation/widgets/email_tile_web_builder.dart
index 52215172d..1ee1ef3c9 100644
--- a/lib/features/thread/presentation/widgets/email_tile_web_builder.dart
+++ b/lib/features/thread/presentation/widgets/email_tile_web_builder.dart
@@ -136,6 +136,7 @@ class EmailTileBuilder with BaseEmailItemTile {
                       _presentationEmail,
                       mailboxCurrent,
                       _searchStatus,
+                      advancedSearchActivated,
                       _searchQuery)),
                   if (_presentationEmail.hasAttachment == true)
                     Padding(
@@ -157,6 +158,7 @@ class EmailTileBuilder with BaseEmailItemTile {
                     Expanded(child: buildEmailTitle(
                         _presentationEmail,
                         _searchStatus,
+                        advancedSearchActivated,
                         _searchQuery)),
                     buildMailboxContain(
                         _searchStatus,
@@ -174,6 +176,7 @@ class EmailTileBuilder with BaseEmailItemTile {
                   Expanded(child: buildEmailPartialContent(
                       _presentationEmail,
                       _searchStatus,
+                      advancedSearchActivated,
                       _searchQuery)),
                 ]),
               ]),
@@ -229,6 +232,7 @@ class EmailTileBuilder with BaseEmailItemTile {
                           _presentationEmail,
                           mailboxCurrent,
                           _searchStatus,
+                          advancedSearchActivated,
                           _searchQuery)),
                       if (isHoverItem)
                         const SizedBox(width: 120)
@@ -242,6 +246,7 @@ class EmailTileBuilder with BaseEmailItemTile {
                         Expanded(child: buildEmailTitle(
                             _presentationEmail,
                             _searchStatus,
+                            advancedSearchActivated,
                             _searchQuery)),
                         buildMailboxContain(
                             _searchStatus,
@@ -259,6 +264,7 @@ class EmailTileBuilder with BaseEmailItemTile {
                       Expanded(child: buildEmailPartialContent(
                           _presentationEmail,
                           _searchStatus,
+                          advancedSearchActivated,
                           _searchQuery)),
                     ]),
                   ]),
@@ -347,6 +353,7 @@ class EmailTileBuilder with BaseEmailItemTile {
                   _presentationEmail,
                   mailboxCurrent,
                   _searchStatus,
+                  advancedSearchActivated,
                   _searchQuery)),
             const SizedBox(width: 24),
             Expanded(child: _buildSubjectAndContent()),
@@ -502,11 +509,13 @@ class EmailTileBuilder with BaseEmailItemTile {
                 child: buildEmailTitle(
                     _presentationEmail,
                     _searchStatus,
+                    advancedSearchActivated,
                     _searchQuery)),
         Expanded(child: Container(
             child: buildEmailPartialContent(
                 _presentationEmail,
                 _searchStatus,
+                advancedSearchActivated,
                 _searchQuery))
         ),
       ]);