diff --git a/application/Espo/SelectManagers/Email.php b/application/Espo/SelectManagers/Email.php
index 280066c9c5..f4a3f4bb10 100644
--- a/application/Espo/SelectManagers/Email.php
+++ b/application/Espo/SelectManagers/Email.php
@@ -121,11 +121,22 @@ class Email extends \Espo\Core\SelectManagers\Base
             'usersMiddle.inTrash=' => false,
             'usersMiddle.folderId' => null,
             array(
-                'status!=' => 'Draft'
+                'status' => ['Archived', 'Sent']
             )
         );
         if (!empty($idList)) {
             $d['fromEmailAddressId!='] = $idList;
+            $d[] = array(
+                'OR' => array(
+                    'status' => 'Archived',
+                    'createdById!=' => $this->getUser()->id
+                )
+            );
+        } else {
+            $d[] = array(
+                'status' => 'Archived',
+                'createdById!=' => $this->getUser()->id
+            );
         }
         $result['whereClause'][] = $d;