diff --git a/lib/features/thread/presentation/widgets/empty_emails_widget.dart b/lib/features/thread/presentation/widgets/empty_emails_widget.dart
index 4a2c4b6fd..8da822ed2 100644
--- a/lib/features/thread/presentation/widgets/empty_emails_widget.dart
+++ b/lib/features/thread/presentation/widgets/empty_emails_widget.dart
@@ -78,11 +78,14 @@ class EmptyEmailsWidget extends StatelessWidget {
     );
   }
 
-  bool get _showEmailSubMessage =>
-      (isNetworkConnectionAvailable &&
-          !isFilterMessageActive &&
-          !isSearchActive) ||
-      (isFavoriteFolder && !isFilterMessageActive);
+  bool get _showEmailSubMessage {
+    if (isFilterMessageActive) return false;
+
+    final showNetwork = isNetworkConnectionAvailable && !isSearchActive;
+    final showFavorite = isFavoriteFolder;
+
+    return showNetwork || showFavorite;
+  }
 
   String _getMessageEmptyEmail(AppLocalizations appLocalizations) {
     if (!isNetworkConnectionAvailable) {