diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/InFolder.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/InFolder.php
index 376c53d065..4f0e1b8db0 100644
--- a/application/Espo/Classes/Select/Email/Where/ItemConverters/InFolder.php
+++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/InFolder.php
@@ -201,11 +201,16 @@ class InFolder implements ItemConverter
             return WhereClause::fromRaw([
                 'groupFolderId' => $groupFolderId,
                 'groupStatusFolder' => null,
+                'createdById!=' => $this->user->getId(),
                 'fromEmailAddressId!=' => $this->getEmailAddressIdList(),
                 'status' => [
                     Email::STATUS_ARCHIVED,
                     Email::STATUS_SENT,
                 ],
+                'OR' => [
+                    'status' => Email::STATUS_ARCHIVED,
+                    'createdById!=' => $this->user->getId(),
+                ],
             ]);
         }