diff --git a/application/Espo/Services/Email.php b/application/Espo/Services/Email.php
index e9972b9261..f150011199 100644
--- a/application/Espo/Services/Email.php
+++ b/application/Espo/Services/Email.php
@@ -716,7 +716,10 @@ class Email extends Record implements
 
         $update = $this->entityManager->getQueryBuilder()->update()
             ->in('EmailUser')
-            ->set(['folderId' => $folderId])
+            ->set([
+                'folderId' => $folderId,
+                'inTrash' => false,
+            ])
             ->where([
                 'deleted' => false,
                 'userId' => $userId,
diff --git a/client/src/views/email/record/row-actions/default.js b/client/src/views/email/record/row-actions/default.js
index c48b2ee902..76e018b430 100644
--- a/client/src/views/email/record/row-actions/default.js
+++ b/client/src/views/email/record/row-actions/default.js
@@ -93,9 +93,8 @@ define('views/email/record/row-actions/default', 'views/record/row-actions/defau
                         }
                     });
                 }
-
-
             }
+
             if (this.model.get('isUsers')) {
                 if (!this.model.get('isImportant')) {
                     if (!this.model.get('inTrash')) {
@@ -117,17 +116,17 @@ define('views/email/record/row-actions/default', 'views/record/row-actions/defau
                     });
                 }
             }
+
             if (this.model.get('isUsers') && this.model.get('status') !== 'Draft') {
-                if (!this.model.get('inTrash')) {
-                    list.push({
-                        action: 'moveToFolder',
-                        label: 'Move to Folder',
-                        data: {
-                            id: this.model.id
-                        }
-                    });
-                }
+                list.push({
+                    action: 'moveToFolder',
+                    label: 'Move to Folder',
+                    data: {
+                        id: this.model.id
+                    }
+                });
             }
+
             if (this.options.acl.delete) {
                 list.push({
                     action: 'quickRemove',
@@ -137,6 +136,7 @@ define('views/email/record/row-actions/default', 'views/record/row-actions/defau
                     }
                 });
             }
+
             return list;
         },