diff --git a/modules/advanced_search/site.js b/modules/advanced_search/site.js
index 0591788a71..eb467682b5 100644
--- a/modules/advanced_search/site.js
+++ b/modules/advanced_search/site.js
@@ -150,7 +150,7 @@ var expand_adv_folder_list = function(path) {
     var detail = Hm_Utils.parse_folder_path(path, 'imap');
     var list = $('.imap_'+detail.server_id+'_'+Hm_Utils.clean_selector(detail.folder), $('.adv_folder_list'));
     if ($('li', list).length === 0) {
-        $('.expand_link', list).html('-');
+        $('.expand_link', list).html('<i class="bi bi-file-minus-fill"></i>');
         if (detail) {
             Hm_Ajax.request(
                 [{'name': 'hm_ajax_hook', 'value': 'ajax_imap_folder_expand'},
diff --git a/modules/imap/functions.php b/modules/imap/functions.php
index 1648d9f4b8..fceaaaf87b 100644
--- a/modules/imap/functions.php
+++ b/modules/imap/functions.php
@@ -111,7 +111,7 @@ function prepare_imap_message_list($msgs, $mod, $type) {
  * @return string
  */
 if (!hm_exists('format_imap_folder_section')) {
-function format_imap_folder_section($folders, $id, $output_mod) {
+function format_imap_folder_section($folders, $id, $output_mod, $with_input = false) {
     $results = '<ul class="inner_list">';
     $manage = $output_mod->get('imap_folder_manage_link');
     foreach ($folders as $folder_name => $folder) {
@@ -124,23 +124,31 @@ function format_imap_folder_section($folders, $id, $output_mod) {
             $results .= '<i class="bi bi-folder2-open"></i> ';
         }
         if (!$folder['noselect']) {
+            if (!$folder['clickable']) {
+                $attrs = 'tabindex="0"';
+                if (!$with_input && isset($folder['subscribed']) && !$folder['subscribed']) {
+                    $attrs .= ' class="folder-disabled"';
+                }
+            } else {
+                $attrs = 'data-id="imap_'.$id.'_'.$output_mod->html_safe($folder_name).
+                '" href="?page=message_list&amp;list_path='.
+                urlencode('imap_'.$id.'_'.$output_mod->html_safe($folder_name)).'"';
+            }
             if (strlen($output_mod->html_safe($folder['basename']))>15) {
-                $results .= '<a data-id="imap_'.$id.'_'.$output_mod->html_safe($folder_name).
-                    '" href="?page=message_list&amp;list_path='.
-                    urlencode('imap_'.$id.'_'.$output_mod->html_safe($folder_name)).
-                    '"title="'.$output_mod->html_safe($folder['basename']).
+                $results .= '<a ' . $attrs .
+                    ' title="'.$output_mod->html_safe($folder['basename']).
                     '">'.substr($output_mod->html_safe($folder['basename']),0,15).'...</a>';
             }
-            else{
-                $results .= '<a data-id="imap_'.$id.'_'.$output_mod->html_safe($folder_name).
-                    '" href="?page=message_list&amp;list_path='.
-                    urlencode('imap_'.$id.'_'.$output_mod->html_safe($folder_name)).
-                    '">'.$output_mod->html_safe($folder['basename']).'</a>';
+            else {
+                $results .= '<a ' . $attrs. '>'.$output_mod->html_safe($folder['basename']).'</a>';
             }
         }
         else {
             $results .= $output_mod->html_safe($folder['basename']);
         }
+        if ($with_input) {
+            $results .= '<input type="checkbox" value="1" class="folder_subscription" id="'.$output_mod->html_safe($folder_name).'" name="'.$folder_name.'" '.($folder['subscribed']? 'checked="checked"': '').($folder['special']? ' disabled="disabled"': '').' />';
+        }
         $results .= '<span class="unread_count unread_imap_'.$id.'_'.$output_mod->html_safe($folder_name).'"></span></li>';
     }
     if ($manage) {
diff --git a/modules/imap/handler_modules.php b/modules/imap/handler_modules.php
index be7b72f8c3..752d22f82a 100644
--- a/modules/imap/handler_modules.php
+++ b/modules/imap/handler_modules.php
@@ -721,16 +721,22 @@ public function process() {
                 $prefetched[] = $form['imap_server_id'];
                 $this->session->set('imap_prefetched_ids', array_unique($prefetched, SORT_NUMERIC));
             }
+            $with_subscription = isset($this->request->post['subscription_state']) && $this->request->post['subscription_state'];
             if ($page_cache) {
                 $this->out('imap_expanded_folder_data', $page_cache);
                 $this->out('imap_expanded_folder_id', $form['imap_server_id']);
                 $this->out('imap_expanded_folder_path', $path);
+                $this->out('with_input', $with_subscription);
                 return;
             }
             $cache = Hm_IMAP_List::get_cache($this->cache, $form['imap_server_id']);
             $imap = Hm_IMAP_List::connect($form['imap_server_id'], $cache);
             if (imap_authed($imap)) {
-                $msgs = $imap->get_folder_list_by_level(hex2bin($folder));
+                $only_subscribed = $this->user_config->get('only_subscribed_folders_setting', false);
+                if ($with_subscription) {
+                    $only_subscribed = false;
+                }
+                $msgs = $imap->get_folder_list_by_level(hex2bin($folder), $only_subscribed, $with_subscription);
                 if (isset($msgs[$folder])) {
                     unset($msgs[$folder]);
                 }
@@ -738,6 +744,7 @@ public function process() {
                 $this->out('imap_expanded_folder_data', $msgs);
                 $this->out('imap_expanded_folder_id', $form['imap_server_id']);
                 $this->out('imap_expanded_folder_path', $path);
+                $this->out('with_input', $with_subscription);
             }
             else {
                 Hm_Msgs::add(sprintf('ERRCould not authenticate to the selected %s server (%s)', $imap->server_type, $this->user_config->get('imap_servers')[$form['imap_server_id']]['user']));
diff --git a/modules/imap/hm-imap.php b/modules/imap/hm-imap.php
index 481aee2740..6c592881a9 100644
--- a/modules/imap/hm-imap.php
+++ b/modules/imap/hm-imap.php
@@ -427,14 +427,19 @@ public function get_mailbox_list($lsub=false, $mailbox='', $keyword='*') {
                 $can_have_kids = true;
                 $has_kids = false;
                 $marked = false;
+                $special = false;
                 $folder_sort_by = 'ARRIVAL';
                 $check_for_new = false;
 
                 /* full folder name, includes an absolute path of parent folders */
-                $folder = $this->utf7_decode($vals[(count($vals) - 1)]);
+                if ($lsub && in_array("\HasChildren", $vals)) {
+                    $folder = $this->utf7_decode($vals[array_search(".", $vals) + 1]);
+                } else {
+                    $folder = $this->utf7_decode($vals[(count($vals) - 1)]);
+                }
 
                 /* sometimes LIST responses have dupes */
-                if (isset($folders[$folder]) || !$folder) {
+                if (isset($folders[$folder]) || !$folder || $folder === '*') {
                     continue;
                 }
 
@@ -486,7 +491,6 @@ public function get_mailbox_list($lsub=false, $mailbox='', $keyword='*') {
 
                 /* special use mailbox extension */
                 if ($this->is_supported('SPECIAL-USE')) {
-                    $special = false;
                     foreach ($this->special_use_mailboxes as $name => $value) {
                         if (stristr($flags, $name)) {
                             $special = $name;
@@ -518,12 +522,22 @@ public function get_mailbox_list($lsub=false, $mailbox='', $keyword='*') {
                 /* store the results in the big folder list struct */
                 if (strtolower($folder) == 'inbox') {
                     $inbox = true;
+                    $special = true;
                 }
-                $folders[$folder] = array('parent' => $parent, 'delim' => $delim, 'name' => $folder,
-                                        'name_parts' => $folder_parts, 'basename' => $base_name,
-                                        'realname' => $folder, 'namespace' => $namespace, 'marked' => $marked,
-                                        'noselect' => $no_select, 'can_have_kids' => $can_have_kids,
-                                        'has_kids' => $has_kids);
+                $folders[$folder] = array(
+                    'parent' => $parent,
+                    'delim' => $delim,
+                    'name' => $folder,
+                    'name_parts' => $folder_parts,
+                    'basename' => $base_name,
+                    'realname' => $folder,
+                    'namespace' => $namespace,
+                    'marked' => $marked,
+                    'noselect' => $no_select,
+                    'can_have_kids' => $can_have_kids,
+                    'has_kids' => $has_kids,
+                    'special' => (bool) $special
+                );
 
                 /* store a parent list used below */
                 if ($parent && !in_array($parent, $parents)) {
@@ -685,6 +699,19 @@ public function get_mailbox_status($mailbox, $args=array('UNSEEN', 'UIDVALIDITY'
         return $attributes;
     }
 
+     /**
+     * Subscribe/Unsubscribe folder
+     * @param string $mailbox IMAP mailbox to check
+     * @param string $action boolean
+     * @return boolean failure or success
+     */
+    public function mailbox_subscription($mailbox, $action) {
+        $command = ($action? 'SUBSCRIBE': 'UNSUBSCRIBE').' "'.$this->utf7_encode($mailbox).'"'."\r\n";
+        $this->send_command($command);
+        $response = $this->get_response(false, true);
+        return $this->check_response($response, true);
+    }
+
     /* ------------------ SELECTED STATE COMMANDS -------------------------- */
 
     /**
@@ -2127,18 +2154,32 @@ public function get_mailbox_page($mailbox, $sort, $rev, $filter, $offset=0, $lim
      * @param string $level mailbox name or empty string for the top level
      * @return array list of matching folders
      */
-    public function get_folder_list_by_level($level='') {
+    public function get_folder_list_by_level($level='', $only_subscribed=false, $with_input = false) {
         $result = array();
-        $folders = $this->get_mailbox_list(false, $level, '%');
+        $folders = $this->get_mailbox_list($only_subscribed, $level, '%');
         foreach ($folders as $name => $folder) {
             $result[$name] = array(
+                'name' => $folder['name'],
                 'delim' => $folder['delim'],
                 'basename' => $folder['basename'],
                 'children' => $folder['has_kids'],
                 'noselect' => $folder['noselect'],
                 'id' => bin2hex($folder['basename']),
                 'name_parts' => $folder['name_parts'],
+                'clickable' => !$with_input,
             );
+            if ($with_input) {
+                $result[$name]['special'] = $folder['special'];
+            }
+        }
+        if ($only_subscribed || $with_input) {
+            $subscribed_folders = array_column($this->get_mailbox_list(true), 'name');
+            foreach ($result as $key => $folder) {
+                $result[$key]['subscribed'] = in_array($folder['name'], $subscribed_folders);
+                if (!$with_input) {
+                    $result[$key]['clickable'] = $result[$key]['subscribed'];
+                }
+            }
         }
         return $result;
     }
diff --git a/modules/imap/output_modules.php b/modules/imap/output_modules.php
index ecc02b0243..6482581f39 100644
--- a/modules/imap/output_modules.php
+++ b/modules/imap/output_modules.php
@@ -765,8 +765,9 @@ class Hm_Output_filter_expanded_folder_data extends Hm_Output_Module {
     protected function output() {
         $res = '';
         $folder_data = $this->get('imap_expanded_folder_data', array());
+        $with_input = $this->get('with_input', false);
         if (!empty($folder_data)) {
-            $res .= format_imap_folder_section($folder_data, $this->get('imap_expanded_folder_id'), $this);
+            $res .= format_imap_folder_section($folder_data, $this->get('imap_expanded_folder_id'), $this, $with_input);
             $this->out('imap_expanded_folder_formatted', $res);
         }
     }
@@ -1110,7 +1111,7 @@ protected function output() {
         if (!array_key_exists('auto_advance_email', $settings) || (array_key_exists('auto_advance_email', $settings) && $settings['auto_advance_email'])) {
             $checked = ' checked="checked"';
         } else {
-            $reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><img alt="Refresh" class="refresh_list reset_default_value_checkbox" src="'.Hm_Image_Sources::$refresh.'" /></span>';
+            $reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_checkbox"></i></span>';
         }
         $res = '<tr class="general_setting"><td><label class="form-check-label" for="auto_advance_email">'.
             $this->trans('Show next email instead of your inbox after performing action (delete, archive, move, etc)').'</label></td>'.
diff --git a/modules/imap/site.css b/modules/imap/site.css
index 93d5b3e669..ffd3fc4e01 100644
--- a/modules/imap/site.css
+++ b/modules/imap/site.css
@@ -200,3 +200,5 @@
   .fade-in {
     animation-name: fadeIn;
   }
+
+
diff --git a/modules/imap/site.js b/modules/imap/site.js
index 58b8f77160..0e2f688f86 100644
--- a/modules/imap/site.js
+++ b/modules/imap/site.js
@@ -1007,7 +1007,7 @@ var expand_imap_move_to_folders = function(path, context) {
     var detail = Hm_Utils.parse_folder_path(path, 'imap');
     var list = $('.imap_'+detail.server_id+'_'+Hm_Utils.clean_selector(detail.folder), $('.move_to_location'));
     if ($('li', list).length === 0) {
-        $('.expand_link', list).html('-');
+        $('.expand_link', list).html('<i class="bi bi-file-minus-fill"></i>');
         if (detail) {
             Hm_Ajax.request(
                 [{'name': 'hm_ajax_hook', 'value': 'ajax_imap_folder_expand'},
diff --git a/modules/imap_folders/modules.php b/modules/imap_folders/modules.php
index c5df4710e3..e8cc04b923 100644
--- a/modules/imap_folders/modules.php
+++ b/modules/imap_folders/modules.php
@@ -322,6 +322,7 @@ public function process() {
         if (array_key_exists('imap_server_id', $this->request->get)) {
             var_dump($this->request->get['imap_server_id']);
             $this->out('folder_server', $this->request->get['imap_server_id']);
+            $this->out('page', $this->request->get['page']);
         }
     }
 }
@@ -335,6 +336,44 @@ public function process() {
     }
 }
 
+/**
+ * @subpackage imap_folders/handler
+ */
+class Hm_Handler_process_imap_folder_subscription extends Hm_Handler_Module {
+    public function process() {
+        list($success, $form) = $this->process_form(array('folder', 'subscription_state'));
+        if ($success) {
+            $imap_server_id = $this->request->get['imap_server_id'];
+            $cache = Hm_IMAP_List::get_cache($this->cache, $imap_server_id);
+            $imap = Hm_IMAP_List::connect($imap_server_id, $cache);
+            if (imap_authed($imap)) {
+                $folder = hex2bin($form['folder']);
+                $success = $imap->mailbox_subscription($folder, $form['subscription_state']);
+                if ($success) {
+                    Hm_Msgs::add(sprintf('%s to %s', $form['subscription_state']? 'Subscribed': 'Unsubscribed', $folder));
+                    $this->cache->del('imap_folders_imap_'.$imap_server_id.'_');
+                } else {
+                    Hm_Msgs::add(sprintf('ERRAn error occurred %s to %s', $form['subscription_state']? 'subscribing': 'unsubscribing', $folder));
+                }
+                $this->out('imap_folder_subscription', $success);
+            }
+        }
+    }
+}
+
+/**
+ * Process input from the folder subscription setting in the settings page
+ * @subpackage imap/handler
+ */
+class Hm_Handler_process_only_subscribed_folders_setting extends Hm_Handler_Module {
+    public function process() {
+        function only_subscribed_folders_setting_callback($val) {
+            return $val;
+        }
+        process_site_setting('only_subscribed_folders', $this, 'only_subscribed_folders_setting_callback', false, true);
+    }
+}
+
 /**
  * @subpackage imap_folders/output
  */
@@ -342,7 +381,7 @@ class Hm_Output_folders_server_select extends Hm_Output_Module {
     protected function output() {
         $server_id = $this->get('folder_server', '');
         $res = '<div class="folders_page mt-4 row mb-4"><div class="col-lg-5 col-sm-12"><form id="form_folder_imap" method="get">';
-        $res .= '<input type="hidden" name="page" value="folders" />';
+        $res .= '<input type="hidden" name="page" value="'.$this->get('page', 'folders').'" />';
         $res .= '<div class="form-floating"><select class="form-select" id="imap_server_folder" name="imap_server_id">';
         $res .= '<option ';
         if (empty($server_id)) {
@@ -653,7 +692,44 @@ protected function output() {
                 </div>
             </div>';
 
-        return $res;
+            $res .= '</div>';
+    }
+}
+
+class Hm_Output_folders_folder_subscription extends Hm_Output_Module {
+    protected function output() {
+        if ($this->get('only_subscribed_folders_setting', 0) && ($server = $this->get('folder_server')) !== NULL) {
+            $res = '<div class="folder_row"><a href="#" class="subscribe_parent_folder" style="display:none;">';
+            $res .= $this->trans('Select Folder').'</a><span class="subscribe_parent"></span></div>';
+            $res .= '<ul class="folders subscribe_parent_folder_select"><li class="subscribe_title"></li></ul>';
+            $res .= '<input type="hidden" value="" id="subscribe_parent" />';
+            return $res;
+        }
+    }
+}
+
+/**
+ * @subpackage imap_folders/handler
+ */
+class Hm_Handler_get_only_subscribed_folders_setting extends Hm_Handler_Module {
+    public function process() {
+        $this->out('only_subscribed_folders_setting', $this->user_config->get('only_subscribed_folders_setting', 0));
+    }
+}
+
+/**
+ * @subpackage imap_folders/output
+ */
+class Hm_Output_folders_folder_subscription_button extends Hm_Output_Module {
+    protected function output() {
+        if ($this->get('only_subscribed_folders_setting', 0)) {
+            $server = $this->get('folder_server');
+            $results = '<div class="folder_subscription_btn"><a href="?page=folders_subscription';
+            $results .= !is_null($server)? '&imap_server_id='.$server: '';
+            $results .= '" title="'.$this->trans('Folders subscription').'"><i class="bi bi-gear-fill account_icon float-end"></i> ';
+            $results .= '</a></div>';
+            return $results;
+        }
     }
 }
 
@@ -691,6 +767,16 @@ protected function output() {
     }
 }
 
+/**
+ * @subpackage imap_folders/output
+ */
+class Hm_Output_folders_subscription_content_start extends Hm_Output_Module {
+    protected function output() {
+        $res = '<div class="content_title">'.$this->trans('Folders subscription').'</div>';
+        return $res;
+    }
+}
+
 /**
  * @subpackage imap_folders/output
  */
@@ -720,6 +806,25 @@ protected function output() {
     }
 }
 
+/**
+ * Option to enable/disable showing only subscribed folders
+ * @subpackage imap/output
+ */
+class Hm_Output_imap_only_subscribed_folders_setting extends Hm_Output_Module {
+    protected function output() {
+        $checked = '';
+        $reset = '';
+        $settings = $this->get('user_settings', array());
+        if (array_key_exists('only_subscribed_folders', $settings) && $settings['only_subscribed_folders']) {
+            $checked = ' checked="checked"';
+            $reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_checkbox"></i></span>';
+        }
+        return '<tr class="general_setting"><td><label for="only_subscribed_folders">'.
+            $this->trans('Showing subscribed folders only').'</label></td>'.
+            '<td><input type="checkbox" '.$checked.' id="only_subscribed_folders" name="only_subscribed_folders" value="1" class="form-check-input" />'.$reset.'</td></tr>';
+    }
+}
+
 if (!hm_exists('get_sieve_linked_mailbox')) {
     function get_sieve_linked_mailbox ($imap_account, $module) {
         if (!$module->module_is_supported('sievefilters') && $module->user_config->get('enable_sieve_filter_setting', true)) {
diff --git a/modules/imap_folders/setup.php b/modules/imap_folders/setup.php
index 66e979d412..8f769bf14a 100644
--- a/modules/imap_folders/setup.php
+++ b/modules/imap_folders/setup.php
@@ -17,12 +17,14 @@
 add_handler('folders', 'folders_server_id', true, 'imap_folders', 'load_user_data', 'after');
 add_handler('folders', 'special_folders', true, 'imap_folders', 'folders_server_id', 'after');
 add_output('folders', 'folders_content_start', true, 'imap_folders', 'content_section_start', 'after');
-add_output('folders', 'folders_server_select', true, 'imap_folders', 'folders_content_start', 'after');
+add_output('folders', 'folders_server_select', true, 'imap_folders', 'folders_folder_subscription_button', 'after');
 add_output('folders', 'folders_create_dialog', true, 'imap_folders', 'folders_server_select', 'after');
 add_output('folders', 'folders_rename_dialog', true, 'imap_folders', 'folders_create_dialog', 'after');
 add_output('folders', 'folders_delete_dialog', true, 'imap_folders', 'folders_rename_dialog', 'after');
+add_output('folders', 'folders_folder_subscription_button', true, 'imap_folders', 'folders_content_start', 'after');
 
 add_handler('ajax_imap_folder_expand', 'add_folder_manage_link', true, 'imap_folders', 'imap_folder_expand', 'after');
+add_handler('folders', 'get_only_subscribed_folders_setting', true, 'imap_folders');
 
 // Commented out during development
 add_output('folders', 'folders_trash_dialog', true, 'imap_folders', 'folders_delete_dialog', 'after');
@@ -30,6 +32,7 @@
 add_output('folders', 'folders_archive_dialog', true, 'imap_folders', 'folders_sent_dialog', 'after');
 add_output('folders', 'folders_draft_dialog', true, 'imap_folders', 'folders_archive_dialog', 'after');
 add_output('folders', 'folders_junk_dialog', true, 'imap_folders', 'folders_draft_dialog', 'after');
+add_output('folders', 'folders_folder_subscription', true, 'imap_folders', 'folders_server_select', 'after');
 
 add_handler('compose', 'special_folders', true, 'imap_folders', 'load_user_data', 'after');
 
@@ -69,25 +72,47 @@
 add_handler('ajax_hm_folders', 'imap_folder_check', true, 'imap_folders', 'load_user_data', 'after');
 add_output('ajax_hm_folders', 'folders_page_link', true, 'imap_folders', 'settings_menu_end', 'before');
 
+add_handler('settings', 'process_only_subscribed_folders_setting', true, 'imap', 'date', 'after');
+add_output('settings', 'imap_only_subscribed_folders_setting', true, 'imap', 'original_folder_setting', 'after');
+
+setup_base_page('folders_subscription', 'core');
+add_handler('folders_subscription', 'folders_server_id', true, 'imap_folders', 'load_user_data', 'after');
+add_handler('folders_subscription', 'special_folders', true, 'imap_folders', 'folders_server_id', 'after');
+add_handler('folders_subscription', 'get_only_subscribed_folders_setting', true, 'imap_folders');
+add_output('folders_subscription', 'folders_subscription_content_start', true, 'imap_folders', 'content_section_start', 'after');
+add_output('folders_subscription', 'folders_server_select', true, 'imap_folders', 'folders_subscription_content_start', 'after');
+add_output('folders_subscription', 'folders_folder_subscription', true, 'imap_folders', 'folders_server_select', 'after');
+
+setup_base_ajax_page('ajax_imap_folder_subscription', 'core');
+add_handler('ajax_imap_folder_subscription', 'load_imap_servers_from_config', true, 'imap', 'load_user_data', 'after');
+add_handler('ajax_imap_folder_subscription', 'process_imap_folder_subscription', true, 'imap_folders', 'load_imap_servers_from_config', 'after');
+add_handler('ajax_imap_folder_subscription', 'save_user_data', true, 'core', 'process_special_folder', 'after');
+
 return array(
     'allowed_pages' => array(
         'folders',
+        'folders_subscription',
         'ajax_imap_folders_delete',
         'ajax_imap_folders_create',
         'ajax_imap_folders_rename',
         'ajax_imap_special_folder',
         'ajax_imap_clear_special_folder',
-        'ajax_imap_accept_special_folders'
+        'ajax_imap_accept_special_folders',
+        'ajax_imap_folder_subscription'
     ),
     'allowed_output' => array(
         'imap_folders_success' => array(FILTER_VALIDATE_INT, false),
-        'imap_special_name' => array(FILTER_DEFAULT, false)
+        'imap_special_name' => array(FILTER_DEFAULT, false),
+        'imap_folder_subscription' => array(FILTER_DEFAULT, false),
     ),
     'allowed_get' => array(),
     'allowed_post' => array(
         'parent' => FILTER_DEFAULT,
         'new_folder' => FILTER_DEFAULT,
         'special_folder_type' => FILTER_DEFAULT,
-        'imap_service_name' => FILTER_DEFAULT
+        'imap_service_name' => FILTER_DEFAULT,
+        'subscription_state' => FILTER_VALIDATE_BOOLEAN,
+        'folder' => FILTER_DEFAULT,
+        'only_subscribed_folders' => FILTER_VALIDATE_BOOLEAN,
     )
 );
diff --git a/modules/imap_folders/site.css b/modules/imap_folders/site.css
index 2ea2004d31..3d9d0558cc 100644
--- a/modules/imap_folders/site.css
+++ b/modules/imap_folders/site.css
@@ -9,3 +9,15 @@
 #draft_val, #sent_val, #trash_val, #junk_val { padding-left: 20px; }
 .manage_folder_icon { vertical-align: -3px; opacity: .3 }
 .manage_folder_link { color: #999 !important; }
+
+.folder_subscription_btn { position: absolute; right: 20px; top: 20px; }
+.folders_subscription { padding-left: 10px; width: 100%; display: inline-block; }
+.folders_subscription input { float: right; }
+
+@media (min-width: 687px) {
+    .folders_subscription { width: 30% }
+}
+
+@media (min-width: 1201px) {
+    .folders_subscription { width: 25% }
+}
diff --git a/modules/imap_folders/site.js b/modules/imap_folders/site.js
index 7d33448a35..8fd8e21988 100644
--- a/modules/imap_folders/site.js
+++ b/modules/imap_folders/site.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var folder_page_folder_list = function(container, title, link_class, target, id_dest) {
+var folder_page_folder_list = function(container, title, link_class, target, id_dest, subscription = false) {
     var id = $('#imap_server_folder').val();
     var folder_location = $('.'+container);
     $('li', folder_location).not('.'+title).remove();
@@ -9,7 +9,7 @@ var folder_page_folder_list = function(container, title, link_class, target, id_
     $('.imap_folder_link', folders).addClass(link_class).removeClass('imap_folder_link');
     folder_location.prepend(folders);
     folder_location.show();
-    $('.'+link_class, folder_location).on("click", function() { return expand_folders_page_list($(this).data('target'), container, link_class, target, id_dest); });
+    $('.'+link_class, folder_location).on("click", function() { return expand_folders_page_list($(this).data('target'), container, link_class, target, id_dest, subscription); });
     $('a', folder_location).not('.'+link_class).not('.close').off('click');
     $('a', folder_location).not('.'+link_class).not('.close').on("click", function() { set_folders_page_value($(this).data('id'), container, target, id_dest); return false; });
     $('.close', folder_location).on("click", function() {
@@ -22,17 +22,17 @@ var folder_page_folder_list = function(container, title, link_class, target, id_
     return false;
 };
 
-
-var expand_folders_page_list = function(path, container, link_class, target, id_dest) {
+var expand_folders_page_list = function(path, container, link_class, target, id_dest, lsub) {
     var detail = Hm_Utils.parse_folder_path(path, 'imap');
     var list = $('.imap_'+detail.server_id+'_'+Hm_Utils.clean_selector(detail.folder), $('.'+container));
     if ($('li', list).length === 0) {
-        $('.expand_link', list).html('-');
+        $('.expand_link', list).html('<i class="bi bi-file-minus-fill"></i>');
         if (detail) {
             Hm_Ajax.request(
                 [{'name': 'hm_ajax_hook', 'value': 'ajax_imap_folder_expand'},
                 {'name': 'imap_server_id', 'value': detail.server_id},
-                {'name': 'folder', 'value': detail.folder}],
+                {'name': 'folder', 'value': detail.folder},
+                {'name': 'subscription_state', 'value': lsub}],
                 function(res) {
                     if (res.imap_expanded_folder_path) {
                         var folder_location = $('.'+container);
@@ -41,9 +41,12 @@ var expand_folders_page_list = function(path, container, link_class, target, id_
                         $('.'+Hm_Utils.clean_selector(res.imap_expanded_folder_path), folder_location).append(folders);
                         $('.imap_folder_link', folder_location).addClass(link_class).removeClass('imap_folder_link');
                         $('.'+link_class, folder_location).off('click');
-                        $('.'+link_class, folder_location).on("click", function() { return expand_folders_page_list($(this).data('target'), container, link_class, target, id_dest); });
+                        $('.'+link_class, folder_location).on("click", function() { return expand_folders_page_list($(this).data('target'), container, link_class, target, id_dest, lsub); });
                         $('a', folder_location).not('.'+link_class).not('.close').off('click');
                         $('a', folder_location).not('.'+link_class).not('.close').on("click", function() { set_folders_page_value($(this).data('id'), container, target, id_dest); return false; });
+                        if (lsub) {
+                            $('.folder_subscription').on("change", function() { folder_subscribe(this.id, $('#'+this.id).is(':checked')); return false; });
+                        }
                     }
                 }
             );
@@ -214,6 +217,23 @@ var assign_special_folder = function(id, folder, type, callback) {
     );
 };
 
+var folder_subscribe = function(name, state) {
+    Hm_Ajax.request(
+        [{'name': 'hm_ajax_hook', 'value': 'ajax_imap_folder_subscription'},
+        {'name': 'subscription_state', 'value': state},
+        {'name': 'folder', 'value': name}],
+        function(res) {
+            var el = $('#'+name);
+            if (!res.imap_folder_subscription) {
+                el.prop('checked', !el.prop('checked'));
+            } else {
+                el.prev().toggleClass('folder-disabled');
+                Hm_Folders.reload_folders(true);
+            }
+        }
+    );
+};
+
 var folder_page_create = function() {
     var par = $('#create_parent').val();
     var folder = $('#create_value').val().trim();
@@ -244,12 +264,24 @@ var folder_page_create = function() {
 };
 
 $(function() {
-    if (hm_page_name() == 'folders') {
+    if (hm_page_name() == 'folders' || hm_page_name() == 'folders_subscription') {
         $('#imap_server_folder').on("change", function() {
             $(this).parent().parent().submit();
         });
+    }
+    if (hm_page_name() == 'folders') {
         $('.settings_subtitle').on("click", function() { return Hm_Utils.toggle_page_section($(this).data('target')); });
     }
+    if (hm_page_name() == 'folders_subscription') {
+        $('.subscribe_parent_folder').on("click", function() { return folder_page_folder_list('subscribe_parent_folder_select', 'subscribe_title', 'imap_parent_folder_link', '', 'subscribe_parent', true); });
+        $('.subscribe_parent_folder').trigger('click');
+        $($('.subscribe_parent_folder_select .imap_parent_folder_link')[0]).trigger('click');
+        const selected_imap_server = $('#imap_server_folder').val();
+        const email_folder_server = $(`.email_folders .imap_${selected_imap_server}_ .inner_list`);
+        if (email_folder_server && $(email_folder_server[0]).children().length) {
+            $($('.subscribe_parent_folder_select .imap_parent_folder_link')[0]).trigger('click');
+        }
+    }
     $('.select_parent_folder').on("click", function() { return folder_page_folder_list('parent_folder_select', 'parent_title', 'imap_parent_folder_link', 'selected_parent', 'create_parent'); });
     $('.select_rename_folder').on("click", function() { return folder_page_folder_list('rename_folder_select', 'rename_title', 'imap_rename_folder_link', 'selected_rename', 'rename_source'); });
     $('.select_delete_folder').on("click", function() { return folder_page_folder_list('delete_folder_select', 'delete_title', 'imap_delete_folder_link', 'selected_delete', 'delete_source'); });