diff --git a/application/Espo/Resources/metadata/clientDefs/Email.json b/application/Espo/Resources/metadata/clientDefs/Email.json
index 54b54fe8e5..ae08e8f907 100644
--- a/application/Espo/Resources/metadata/clientDefs/Email.json
+++ b/application/Espo/Resources/metadata/clientDefs/Email.json
@@ -45,7 +45,8 @@
                 },
                 {
                     "label":"Folders",
-                    "link":"#EmailFolder"
+                    "link":"#EmailFolder",
+                    "configCheck": "!emailFoldersDisabled"
                 },
                 {
                     "label":"Filters",
diff --git a/client/src/views/email/list.js b/client/src/views/email/list.js
index 77a63b4dab..6a53532b26 100644
--- a/client/src/views/email/list.js
+++ b/client/src/views/email/list.js
@@ -26,7 +26,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-Espo.define('views/email/list', 'views/list', function (Dep) {
+define('views/email/list', 'views/list', function (Dep) {
 
     return Dep.extend({
 
@@ -65,13 +65,18 @@ Espo.define('views/email/list', 'views/list', function (Dep) {
             }
 
             this.foldersDisabled = this.foldersDisabled ||
-                                   this.getMetadata().get(['scopes', this.folderScope, 'disabled']) ||
-                                   !this.getAcl().checkScope(this.folderScope);
+                this.getConfig().get('emailFoldersDisabled') ||
+                this.getMetadata().get(['scopes', this.folderScope, 'disabled']) ||
+                !this.getAcl().checkScope(this.folderScope);
 
             var params = this.options.params || {};
 
             this.selectedFolderId = params.folder || this.defaultFolderId;
 
+            if (this.foldersDisabled) {
+                this.selectedFolderId = null;
+            }
+
             this.applyFolder();
         },