diff --git a/lib/features/thread/presentation/filters/mailbox_filter_builder.dart b/lib/features/thread/presentation/filters/mailbox_filter_builder.dart
index 94b08cd3d..f6b9a4ae6 100644
--- a/lib/features/thread/presentation/filters/mailbox_filter_builder.dart
+++ b/lib/features/thread/presentation/filters/mailbox_filter_builder.dart
@@ -113,21 +113,27 @@ class MailboxFilterBuilder {
   EmailFilterCondition buildDefaultMailboxFilter({UTCDate? before}) {
     switch (filterMessageOption) {
       case FilterMessageOption.all:
-        return EmailFilterCondition(before: before);
+        return EmailFilterCondition(before: before, inMailbox: _mailboxId);
 
       case FilterMessageOption.unread:
         return EmailFilterCondition(
           notKeyword: KeyWordIdentifier.emailSeen.value,
           before: before,
+          inMailbox: _mailboxId,
         );
 
       case FilterMessageOption.attachments:
-        return EmailFilterCondition(hasAttachment: true, before: before);
+        return EmailFilterCondition(
+          hasAttachment: true,
+          before: before,
+          inMailbox: _mailboxId,
+        );
 
       case FilterMessageOption.starred:
         return EmailFilterCondition(
           hasKeyword: KeyWordIdentifier.emailFlagged.value,
           before: before,
+          inMailbox: _mailboxId,
         );
     }
   }