From 3c0db75c7976b07425724e1faa7d5c8a270d303f Mon Sep 17 00:00:00 2001
From: Merci Jacob <68013195+mercihabam@users.noreply.github.com>
Date: Mon, 17 Feb 2025 14:22:53 +0200
Subject: [PATCH] fix(frontend/backend): address some of the many blocking
 issues (#1443)

* fix(frontend): prevent Cypht-related mobile nav CSS attributes from overriding third-party styles

* fix(backend): showing server sieve capabilities

* fix(frontend): git revision link not opening the remote url

* fix(frontend): fadeOutAndRemove should not only be extended to cash but also to jQuery

* fix(frontend): refresh ui state when adding a server

* fix(backend): adding accounts via files imports

* fix(backend): downloading server accounts sample files in third-party softwares

* fix elements spacing of the search page

* fix(backend): offline error message when hihandling a message action or deleting a folder

* fix(frontend): hide the refresh icon on the search page as it's replaced by the update button

* fix(frontend): delete a saved search term

* fix(backend): undefined array key warnings when listing folders' messages

* fix(frontend): ensure that a search operation updates the cached pages results

* fix(frontend): ensure that a filter operation updates the cached pages results

* fix(frontend): when opening an unread message, the counter does not get updated

* fix(frontend): Snooze - Pick a date does not show a date picke

* fix(frontend): remove the deleted message from the store when a delete action has been performed
---
 .../data/server_accounts_sample.csv           |  0
 .../data/server_accounts_sample.yaml          |  0
 index.php                                     |  1 +
 modules/core/js_modules/Hm_MessagesStore.js   | 15 +++-
 modules/core/js_modules/[cash]/extend.js      |  8 --
 modules/core/js_modules/actions/pagination.js |  8 +-
 .../js_modules/actions/sortCombinedLists.js   |  6 +-
 modules/core/js_modules/route_handlers.js     |  2 +-
 modules/core/js_modules/utils/sortable.js     |  4 +-
 modules/core/message_list_functions.php       |  4 +-
 modules/core/navigation/navigation.js         |  8 +-
 modules/core/navigation/utils.js              | 13 ++--
 modules/core/site.css                         | 24 +++++-
 modules/core/site.js                          | 41 +++++++---
 modules/developer/modules.php                 |  2 +-
 modules/github/js_modules/route_handlers.js   |  4 +-
 modules/imap/functions.php                    |  4 +-
 modules/imap/handler_modules.php              | 39 ++++++++--
 modules/imap/js_modules/route_handlers.js     |  8 +-
 modules/imap/site.js                          | 77 +++++++++++--------
 modules/imap_folders/modules.php              |  3 +-
 modules/nux/modules.php                       |  6 +-
 modules/nux/site.js                           |  7 +-
 modules/saved_searches/site.css               |  1 -
 modules/saved_searches/site.js                |  2 +-
 modules/sievefilters/modules.php              |  2 +-
 modules/smtp/hm-smtp.php                      |  2 +-
 .../modules/core/message_list_functions.php   |  6 +-
 tests/phpunit/modules/core/output_modules.php | 28 +++----
 29 files changed, 205 insertions(+), 120 deletions(-)
 rename {modules/nux/assets => assets}/data/server_accounts_sample.csv (100%)
 rename {modules/nux/assets => assets}/data/server_accounts_sample.yaml (100%)

diff --git a/modules/nux/assets/data/server_accounts_sample.csv b/assets/data/server_accounts_sample.csv
similarity index 100%
rename from modules/nux/assets/data/server_accounts_sample.csv
rename to assets/data/server_accounts_sample.csv
diff --git a/modules/nux/assets/data/server_accounts_sample.yaml b/assets/data/server_accounts_sample.yaml
similarity index 100%
rename from modules/nux/assets/data/server_accounts_sample.yaml
rename to assets/data/server_accounts_sample.yaml
diff --git a/index.php b/index.php
index 4e10632cb3..2675751b00 100644
--- a/index.php
+++ b/index.php
@@ -22,6 +22,7 @@
 define('SITE_ID', '');
 define('JS_HASH', '');
 define('CSS_HASH', '');
+define('ASSETS_PATH', APP_PATH.'assets/');
 
 /* show all warnings in debug mode */
 if (DEBUG_MODE) {
diff --git a/modules/core/js_modules/Hm_MessagesStore.js b/modules/core/js_modules/Hm_MessagesStore.js
index ff4b5422f1..508fbf74d1 100644
--- a/modules/core/js_modules/Hm_MessagesStore.js
+++ b/modules/core/js_modules/Hm_MessagesStore.js
@@ -15,9 +15,9 @@ class Hm_MessagesStore {
      * @property {RowObject} 1 - An object containing the row message and the IMAP key
      */
 
-    constructor(path, page = 1, rows = {}, abortController = new AbortController()) {
+    constructor(path, page = 1, filter = '', rows = {}, abortController = new AbortController()) {
         this.path = path;
-        this.list = path + '_' + page;
+        this.list = path + '_' + (filter ? filter + '_': '') + page;
         this.rows = rows;
         this.count = 0;
         this.flagAsReadOnOpen = true;
@@ -140,6 +140,17 @@ class Hm_MessagesStore {
         }
         
     }
+    
+    updateRow(uid, html) {
+        const rows = Object.entries(this.rows);
+        const row = this.getRowByUid(uid)?.value;
+        if (row) {
+            const objectRows = Object.fromEntries(rows);
+            objectRows[row[0]]['0'] = html;
+            this.rows = objectRows;
+            this.#saveToLocalStorage();
+        }
+    }
 
     #fetch(hideLoadingState = false) {
         return new Promise((resolve, reject) => {
diff --git a/modules/core/js_modules/[cash]/extend.js b/modules/core/js_modules/[cash]/extend.js
index a1b29a427b..8f3ba950eb 100644
--- a/modules/core/js_modules/[cash]/extend.js
+++ b/modules/core/js_modules/[cash]/extend.js
@@ -40,14 +40,6 @@ $.fn.fadeOut = function(timeout = 600) {
     return this.css("opacity", 0)
     .css("transition", `opacity ${timeout}ms`)
 };
-$.fn.fadeOutAndRemove = function(timeout = 600) {
-    this.fadeOut(timeout)
-    var tm = setTimeout(() => {
-        this.remove();
-        clearTimeout(tm)
-    }, timeout);
-    return this;
-};
 
 $.fn.modal = function(action) {
     const modalElement = this[0];
diff --git a/modules/core/js_modules/actions/pagination.js b/modules/core/js_modules/actions/pagination.js
index 4bc70951b7..ffd7798387 100644
--- a/modules/core/js_modules/actions/pagination.js
+++ b/modules/core/js_modules/actions/pagination.js
@@ -20,7 +20,7 @@ async function nextPage() {
 
     const nextPage = parseInt(currentPage) + 1;
 
-    const store = new Hm_MessagesStore(getListPathParam(), currentPage);
+    const store = new Hm_MessagesStore(getListPathParam(), currentPage, `${getParam('keyword')}_${getParam('filter')}`);
     store.load(false, false, true);
 
     await changePage(nextPage, this, store.offsets);
@@ -33,7 +33,7 @@ async function previousPage() {
 
     let offsets = '';
     if (previousPage > 1) {
-        const store = new Hm_MessagesStore(getListPathParam(), previousPage - 1);
+        const store = new Hm_MessagesStore(getListPathParam(), previousPage - 1, `${getParam('keyword')}_${getParam('filter')}`);
         store.load(false, false, true);
         offsets = store.offsets;
     }
@@ -61,11 +61,11 @@ async function changePage(toPage, button, offsets) {
     history.pushState(history.state, "", url.toString());
     window.location.next = url.search;
 
-    const messagesStore = new Hm_MessagesStore(getListPathParam(), toPage);
+    const messagesStore = new Hm_MessagesStore(getListPathParam(), toPage, `${getParam('keyword')}_${getParam('filter')}`);
     try {
         await messagesStore.load();
         Hm_Utils.tbody().attr('id', messagesStore.list);
-        display_imap_mailbox(messagesStore.rows, null, messagesStore.list);
+        display_imap_mailbox(messagesStore.rows, null, messagesStore.list, messagesStore);
         $(".pagination .current").text(toPage);
     } catch (error) {
         Hm_Notices.show("Failed to fetch content", "danger");
diff --git a/modules/core/js_modules/actions/sortCombinedLists.js b/modules/core/js_modules/actions/sortCombinedLists.js
index 97b55add64..7e7f2b1a51 100644
--- a/modules/core/js_modules/actions/sortCombinedLists.js
+++ b/modules/core/js_modules/actions/sortCombinedLists.js
@@ -2,13 +2,13 @@ async function sortCombinedLists(sortValue) {
     const url = new URL(window.location.href);
     url.searchParams.set('sort', sortValue);
     
-    history.pushState(null, null, url.toString());
+    history.pushState(history.state, null, url.toString());
     location.next = url.search;
-    const messagesStore = new Hm_MessagesStore(getListPathParam(), getParam('page'));
+    const messagesStore = new Hm_MessagesStore(getListPathParam(), getParam('page'), `${getParam('keyword')}_${getParam('filter')}`);
     try {
         await messagesStore.load(true);
         Hm_Utils.tbody().attr('id', messagesStore.list);
-        display_imap_mailbox(messagesStore.rows, null, messagesStore.list);
+        display_imap_mailbox(messagesStore.rows, messagesStore.list, messagesStore);
     } catch (error) {
         Hm_Notices.show('Failed to load messages', 'danger');
     }
diff --git a/modules/core/js_modules/route_handlers.js b/modules/core/js_modules/route_handlers.js
index 83e5472def..607f3b8f9a 100644
--- a/modules/core/js_modules/route_handlers.js
+++ b/modules/core/js_modules/route_handlers.js
@@ -70,7 +70,7 @@ function applyInfoPageHandlers() {
 function applyMessaleListPageHandlers(routeParams) {
     sortHandlerForMessageListAndSearchPage();
     Hm_Message_List.set_row_events();
-    const messagesStore = new Hm_MessagesStore(routeParams.list_path, routeParams.list_page);
+    const messagesStore = new Hm_MessagesStore(routeParams.list_path, routeParams.list_page, `${routeParams.keyword}_${routeParams.filter}`);
     Hm_Utils.tbody().attr('id', messagesStore.list);
 
     $('.core_msg_control').on("click", function(e) {
diff --git a/modules/core/js_modules/utils/sortable.js b/modules/core/js_modules/utils/sortable.js
index 120b204ba1..447c352493 100644
--- a/modules/core/js_modules/utils/sortable.js
+++ b/modules/core/js_modules/utils/sortable.js
@@ -76,13 +76,13 @@ function handleMessagesDragAndDrop() {
                 {'name': 'imap_move_page', 'value': page},
                 {'name': 'imap_move_action', 'value': 'move'}],
                 async (res) =>{
-                    const store = new Hm_MessagesStore(getListPathParam(), Hm_Utils.get_url_page_number());
+                    const store = new Hm_MessagesStore(getListPathParam(), Hm_Utils.get_url_page_number(), `${getParam('keyword')}_${getParam('filter')}`);
                     await store.load(false, true, true);
                     const moveResponses = Object.values(res['move_responses']);
                     moveResponses.forEach((response) => {
                         store.removeRow(response.oldUid);
                     });
-                    display_imap_mailbox(store.rows, store.list);
+                    display_imap_mailbox(store.rows, store.list, store);
                 }
             );
     
diff --git a/modules/core/message_list_functions.php b/modules/core/message_list_functions.php
index 7950c36860..e3395294a8 100644
--- a/modules/core/message_list_functions.php
+++ b/modules/core/message_list_functions.php
@@ -446,7 +446,7 @@ function message_since_dropdown($since, $name, $output_mod, $original_default_va
         '-1 year' => 'Last year',
         '-5 years' => 'Last 5 years'
     );
-    $res = '<select name="'.$name.'" id="'.$name.'" class="message_list_since form-select form-select-sm w-auto" data-default-value="'.$original_default_value.'">';
+    $res = '<select name="'.$name.'" id="'.$name.'" class="message_list_since form-select form-select-sm" data-default-value="'.$original_default_value.'">';
     $reset = '';
     foreach ($times as $val => $label) {
         $res .= '<option';
@@ -606,7 +606,7 @@ function search_field_selection($current, $output_mod) {
         'TO' => 'To',
         'CC' => 'Cc',
     );
-    $res = '<select class="form-select form-select-sm w-auto" id="search_fld" name="search_fld">';
+    $res = '<select class="form-select form-select-sm" id="search_fld" name="search_fld">';
     foreach ($flds as $val => $name) {
         $res .= '<option ';
         if ($current == $val) {
diff --git a/modules/core/navigation/navigation.js b/modules/core/navigation/navigation.js
index 1af9ccedfc..4f89aade1f 100644
--- a/modules/core/navigation/navigation.js
+++ b/modules/core/navigation/navigation.js
@@ -11,6 +11,9 @@ window.addEventListener('popstate', function(event) {
         $('#cypht-main').replaceWith(event.state.main);
         loadCustomScripts(event.state.head);
     }
+
+    window.location.next = window.location.search;
+    
     const unMountCallback = renderPage(window.location.href);
 
     if (unMountCallback) {
@@ -44,8 +47,8 @@ $(document).on('click', 'a', function(event) {
     }
 });
 
-async function navigate(url) {
-    showRoutingToast();
+async function navigate(url, loaderMessage) {
+    showRoutingToast(loaderMessage);
 
     try {
         const response = await fetch(url, {
@@ -114,6 +117,7 @@ function renderPage(href) {
     if (page) {
         const route = ROUTES.find(route => route.page === page);
         const routeParams = Object.fromEntries(searchParams.entries());
+        
         if (route) {
             const unMountCallback = route.handler(routeParams, url.hash?.substring(1));
             return unMountCallback;
diff --git a/modules/core/navigation/utils.js b/modules/core/navigation/utils.js
index 9cb9479247..828f0d838b 100644
--- a/modules/core/navigation/utils.js
+++ b/modules/core/navigation/utils.js
@@ -1,6 +1,6 @@
-function showRoutingToast() {
+function showRoutingToast(message = 'Redirecting...') {
     if (window.routingToast) hideRoutingToast();
-    window.routingToast = showLoaderToast('Redirecting...');
+    window.routingToast = showLoaderToast(message);
 }
 
 function hideRoutingToast() {
@@ -8,18 +8,19 @@ function hideRoutingToast() {
     window.routingToast = null;
 }
 
+// Undefined is used as the default value instead of null to comply with the route handlers, which also use undefined as the default value.
 function getListPathParam() {
-    return new URLSearchParams(window.location.search).get('list_path')
+    return new URLSearchParams(window.location.next || window.location.search).get('list_path') ?? undefined;
 }
 
 function getMessageUidParam() {
-    return new URLSearchParams(window.location.search).get('uid')
+    return new URLSearchParams(window.location.next || window.location.search).get('uid') ?? undefined;
 }
 
 function getPageNameParam() {
-    return new URLSearchParams(window.location.search).get('page')
+    return new URLSearchParams(window.location.next || window.location.search).get('page') ?? undefined;
 }
 
 function getParam(param) {
-    return new URLSearchParams(window.location.search).get(param)
+    return new URLSearchParams(window.location.next || window.location.search).get(param) ?? undefined;
 }
diff --git a/modules/core/site.css b/modules/core/site.css
index 612b492aa4..c6fb21d536 100644
--- a/modules/core/site.css
+++ b/modules/core/site.css
@@ -495,6 +495,7 @@ button {
   padding-bottom: 10px;
   padding-top: 20px;
   letter-spacing: -1px;
+  gap: 1rem;
 }
 .header_subject .content_title {
   color: #555;
@@ -737,6 +738,7 @@ button {
   color: #999;
   display: inline;
   padding-left: 15px;
+  width: 100%;
 }
 .search_form input,
 .search_form select {
@@ -985,6 +987,8 @@ div.unseen,
   display: flex;
   max-height: 35rem;
   align-items: center;
+  flex-wrap: wrap;
+  gap: 0.5rem;
 }
 .mobile .list_meta,
 .mobile .search_form {
@@ -1095,20 +1099,24 @@ div.unseen,
   margin: 0px;
   margin-top: 5px;
 }
+.mobile .search_form > form {
+  flex-wrap: wrap;
+  gap: 0.5rem;
+}
 .mobile .search_form label {
   display: none;
 }
 .mobile .search_update {
   clear: both;
 }
-.mobile .search_content .refresh_list {
-  display: none;
+.mobile .search_content .list_controls {
+  display: none !important;
 }
 .mobile .search_content .content_title {
   max-height: 500px;
 }
 .mobile .search_form select {
-  width: 30px;
+  width: calc(50% - 0.5rem);
 }
 .mobile .search_content {
   padding-top: 30px;
@@ -1381,7 +1389,7 @@ div.unseen,
   --bs-popover-header-color: var(--bs-white);
 }
 
-.mobile nav {
+.mobile nav.folder_cell {
   position: absolute;
   inset: 0;
   width: 100%;
@@ -1500,3 +1508,11 @@ a[disabled] {
   background-color: var(--bs-primary);
   color: var(--bs-white);
 }
+
+.mobile .search_content .message_table {
+  margin-top: 10rem;
+}
+
+.search_content .refresh_link {
+  display: none;
+}
diff --git a/modules/core/site.js b/modules/core/site.js
index e11c170417..77ea50514d 100644
--- a/modules/core/site.js
+++ b/modules/core/site.js
@@ -1,5 +1,14 @@
 'use strict';
 
+$.fn.fadeOutAndRemove = function(timeout = 600) {
+    this.fadeOut(timeout)
+    var tm = setTimeout(() => {
+        this.remove();
+        clearTimeout(tm)
+    }, timeout);
+    return this;
+};
+
 /* swipe event handler */
 var swipe_event = function(el, callback, direction) {
     var start_x, start_y, dist_x, dist_y, threshold = 150, restraint = 100,
@@ -238,13 +247,11 @@ var Hm_Ajax_Request = function() { return {
             if (res.folder_status) {
                 for (const name in res.folder_status) {
                     if (name === getListPathParam()) {
-                        Hm_Folders.unread_counts[name] = res.folder_status[name]['unseen'];
-                        Hm_Folders.update_unread_counts();
-                        const messages = new Hm_MessagesStore(name, Hm_Utils.get_url_page_number());
+                        const messages = new Hm_MessagesStore(name, Hm_Utils.get_url_page_number(), `${getParam('keyword')}_${getParam('filter')}`);
                         messages.load().then(() => {
                             if (messages.count != res.folder_status[name].messages) {
                                 messages.load(true).then(() => {
-                                    display_imap_mailbox(messages.rows, messages.list);
+                                    display_imap_mailbox(messages.rows, messages.list, messages);
                                 })
                             }
                         });
@@ -566,11 +573,21 @@ function Message_List() {
         fixLtrInRtl();
     };
 
-    this.update = function(msgs, id) {
+    this.update = function(msgs, id, store) {
         Hm_Utils.tbody(id).html('');
         for (const index in msgs) {
             const row = msgs[index][0];
-            Hm_Utils.tbody(id).append(row);
+            Hm_Utils.tbody(id).append(row).find('a').each(function() {
+                const link = $(this);
+                const filterParams = ["keyword", "filter"];
+                const url = new URL(link.attr('href'), location.href);
+                filterParams.forEach(param => {
+                    url.searchParams.set(param, getParam(param));
+                });
+                link.attr('href', url.toString());
+                const row = link.closest('tr');
+                store.updateRow(row.data('uid'), row.prop('outerHTML'));
+            });
         }
     };
 
@@ -712,6 +729,11 @@ function Message_List() {
         var class_name = false;
         var index;
         for (index in selected) {
+            const uid = selected[index].split('_')[2];
+            const store = new Hm_MessagesStore(getListPathParam(), Hm_Utils.get_url_page_number(), `${getParam('keyword')}_${getParam('filter')}`);
+            store.load();
+            store.removeRow(uid);
+            
             class_name = selected[index];
             $('.'+Hm_Utils.clean_selector(class_name)).remove();
             if (action_type == 'delete') {
@@ -899,9 +921,6 @@ function Message_List() {
                 true
             );
         }
-        if (!updated) {
-            self.update_after_action(action_type, selected);
-        }
     };
 
     this.prev_next_links = function(msgUid, lisPath = getListPathParam()) {
@@ -909,7 +928,7 @@ function Message_List() {
         let nextUrl;
                 
         const target = $('.msg_headers tr').last();
-        const messages = new Hm_MessagesStore(lisPath, Hm_Utils.get_url_page_number());
+        const messages = new Hm_MessagesStore(lisPath, Hm_Utils.get_url_page_number(), `${getParam('keyword')}_${getParam('filter')}`);
         messages.load(false, true);
         const next = messages.getNextRowForMessage(msgUid);
         const prev = messages.getPreviousRowForMessage(msgUid);
@@ -1483,7 +1502,7 @@ var Hm_Utils = {
             if (force_on) {
                 $(class_name).css('display', 'none');
             }
-            $(class_name).toggle();
+            $(`[data-bs-target="${class_name}"]`).trigger('click');            
             Hm_Utils.save_to_local_storage('formatted_folder_list', $('.folder_list').html());
         }
         return false;
diff --git a/modules/developer/modules.php b/modules/developer/modules.php
index 60cf2fe337..e0f95c5e9e 100644
--- a/modules/developer/modules.php
+++ b/modules/developer/modules.php
@@ -194,7 +194,7 @@ protected function output() {
                 '<tr><th class="text-secondary fw-light text-nowrap">Zend version</th><td>'.$server_info['zend_version'].'</td></tr>'.
                 '<tr><th class="text-secondary fw-light text-nowrap">SAPI</th><td>'.$server_info['sapi'].'</td></tr>'.
                 '<tr><th class="text-secondary fw-light text-nowrap">Enabled Modules</th><td>'.str_replace(',', ', ', implode(',', $this->get('router_module_list'))).'</td></tr>'.
-                '<tr><th class="text-secondary fw-light text-nowrap">Git version</th><td>'.$server_info['branch_name'].' at revision <a href="'.$server_info['commit_url'].'">'.$server_info['commit_hash'].'</a> ('.$server_info['commit_date'].')</td></tr>'.
+                '<tr><th class="text-secondary fw-light text-nowrap">Git version</th><td>'.$server_info['branch_name'].' at revision <a href="'.$server_info['commit_url'].'" data-external="true">'.$server_info['commit_hash'].'</a> ('.$server_info['commit_date'].')</td></tr>'.
                 '</table></div>';
         }
         return '';
diff --git a/modules/github/js_modules/route_handlers.js b/modules/github/js_modules/route_handlers.js
index 44744526fa..90e8c8ea74 100644
--- a/modules/github/js_modules/route_handlers.js
+++ b/modules/github/js_modules/route_handlers.js
@@ -31,7 +31,7 @@ function applyGithubMessageListPageHandler(routeParams) {
     if (routeParams.list_path === 'github_all') {
         const dataSources = hm_data_sources().map((source) => source.id);
         dataSources.forEach((id) => {
-            const messages = new Hm_MessagesStore('github_' + id);
+            const messages = new Hm_MessagesStore('github_' + id, Hm_Utils.get_url_page_number(), `${getParam('keyword')}_${getParam('filter')}`);
             messages.load().then(store => {
                 for (const row of Object.values(store.rows)) {
                     Hm_Utils.tbody().append(row['0']);
@@ -58,7 +58,7 @@ function applyGithubMessageListPageHandler(routeParams) {
 
 function refreshAll(dataSources, background = false, abortController) {
     dataSources.forEach((id) => {
-        const messages = new Hm_MessagesStore('github_' + id, Hm_Utils.get_url_page_number(), {}, abortController);
+        const messages = new Hm_MessagesStore('github_' + id, Hm_Utils.get_url_page_number(), `${getParam('keyword')}_${getParam('filter')}`, {}, abortController);
         messages.load(true, background).then(store => {
             const rows = Object.values(store.rows);
             for (const index in rows) {
diff --git a/modules/imap/functions.php b/modules/imap/functions.php
index 5c600ba5e3..ae6c0d6572 100644
--- a/modules/imap/functions.php
+++ b/modules/imap/functions.php
@@ -1464,8 +1464,8 @@ function snooze_dropdown($output, $unsnooze = false) {
     $values = nexter_formats();
 
     $txt = '<div class="dropdown d-inline-block">
-                <button type="button" class="btn btn-light btn-sm dropdown-toggle" id="dropdownMenuNexterDate" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="true">'.$output->trans('Snooze').'</button>
-                <ul class="dropdown-menu nexter_dropdown snooze_dropdown" aria-labelledby="dropdownMenuNexterDate">';
+                <button type="button" class="btn btn-outline-success btn-sm dropdown-toggle" id="dropdownMenuSnooze" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="true" data-bs-auto-close="outside">'.$output->trans('Snooze').'</button>
+                <ul class="dropdown-menu" aria-labelledby="dropdownMenuSnooze">';
     foreach ($values as $format) {
         $labels = get_scheduled_date($format, true);
         $txt .= '<li><a href="#" class="nexter_date_helper_snooze dropdown-item d-flex justify-content-between gap-5" data-value="'.$format.'"><span>'.$output->trans($labels[0]).'</span> <span class="text-end">'.$labels[1].'</span></a></li>';
diff --git a/modules/imap/handler_modules.php b/modules/imap/handler_modules.php
index a7e3e81601..61f0d11749 100644
--- a/modules/imap/handler_modules.php
+++ b/modules/imap/handler_modules.php
@@ -1120,7 +1120,7 @@ public function process() {
                         }
 
                         foreach ($folders as $folder => $uids) {
-                            $status['imap_'.$server.'_'.$folder] = $imap->folder_state;
+                            $status['imap_'.$server.'_'.$folder] = $mailbox->get_folder_state();
 
                             if ($mailbox->is_imap() && $form['action_type'] == 'delete' && $trash_folder && $trash_folder != hex2bin($folder)) {
                                 if (! $mailbox->message_action(hex2bin($folder), 'MOVE', $uids, $trash_folder)['status']) {
@@ -1213,6 +1213,13 @@ class Hm_Handler_imap_combined_inbox extends Hm_Handler_Module {
      * Returns list of message data for the Everthing page
      */
     public function process() {
+        $defaultGetParams = [
+            'list_page' => 1,
+            'sort' => 'arrival',
+            'offsets' => ''
+        ];
+        $this->request->get = array_merge($defaultGetParams, $this->request->get);
+
         list($success, $form) = $this->process_form(array('imap_server_ids'));
 
         if ($success) {
@@ -1292,6 +1299,14 @@ class Hm_Handler_imap_filter_by_type extends Hm_Handler_Module {
      * Fetch flagged messages from an IMAP server
      */
     public function process() {
+        $defaultGetParams = [
+            'list_page' => 1,
+            'sort' => 'arrival',
+            'offsets' => '',
+            'keyword' => ''
+        ];
+        $this->request->get = array_merge($defaultGetParams, $this->request->get);
+
         $data_sources = imap_data_sources();
         $ids = array_map(function($ds) { return $ds['id']; }, $data_sources);
 
@@ -1311,8 +1326,8 @@ public function process() {
 
         list($sort, $reverse) = process_sort_arg($this->request->get['sort'], $this->user_config->get('default_sort_order_setting', 'arrival'));
         $list_page = (int) $this->request->get['list_page'];
-        $offsets = $this->request->get['offsets'] ?? '';
-        $keyword = $this->request->get['keyword'] ?? '';
+        $offsets = $this->request->get['offsets'];
+        $keyword = $this->request->get['keyword'];
 
         $maxPerSource = round($limit / count($data_sources));
         $offset = 0;
@@ -2065,17 +2080,25 @@ class Hm_Handler_imap_folder_data extends Hm_Handler_Module {
      * Returns list of message data for the sent page
      */
     public function process() {
+        $defaultParams = [
+            'list_page' => 1,
+            'keyword' => '',
+            'offsets' => '',
+            'sort' => 'arrival'
+        ];
+        $this->request->get = array_merge($defaultParams, $this->request->get);
+        $path = $this->request->get['list_path'];
+        $keyword = $this->request->get['keyword'];
+        $list_page = (int) $this->request->get['list_page'];
+        $offsets = $this->request->get['offsets'];
+
         list($success, $form) = $this->process_form(array('imap_server_ids'));
         if ($success) {
             $ids = explode(',', $form['imap_server_ids']);
         } else {
-            $data_sources = imap_sources($this, $this->request->get['list_path']);
+            $data_sources = imap_sources($this, $path);
             $ids = array_map(function($ds) { return $ds['id']; }, $data_sources);
         }
-        $path = $this->request->get['list_path'];
-        $keyword = $this->request->get['keyword'] ?? '';
-        $list_page = (int) $this->request->get['list_page'] ?? 1;
-        $offsets = $this->request->get['offsets'] ?? '';
 
         $limit = $this->user_config->get($path.'_per_source_setting', DEFAULT_PER_SOURCE);
         $date = process_since_argument($this->user_config->get($path.'_since_setting', DEFAULT_SINCE));
diff --git a/modules/imap/js_modules/route_handlers.js b/modules/imap/js_modules/route_handlers.js
index 9e3b00edd1..76a1868ca1 100644
--- a/modules/imap/js_modules/route_handlers.js
+++ b/modules/imap/js_modules/route_handlers.js
@@ -17,10 +17,12 @@ function applyImapMessageListPageHandlers(routeParams) {
 }
 
 function applyImapMessageContentPageHandlers(routeParams) {
-    imap_setup_message_view_page(routeParams.uid, null, routeParams.list_path, routeParams.list_parent, imap_setup_tags);
-    imap_setup_snooze();
+    imap_setup_message_view_page(routeParams.uid, null, routeParams.list_path, routeParams.list_parent, () => {
+        imap_setup_tags();
+        imap_setup_snooze();
+    });
 
-    const messages = new Hm_MessagesStore(routeParams.list_path, routeParams.list_page);
+    const messages = new Hm_MessagesStore(routeParams.list_path, routeParams.list_page, `${routeParams.keyword}_${routeParams.filter}`);
     messages.load(false);
     const next = messages.getNextRowForMessage(routeParams.uid);
     const prev = messages.getPreviousRowForMessage(routeParams.uid);
diff --git a/modules/imap/site.js b/modules/imap/site.js
index c29d94a6d7..e63e4e076c 100644
--- a/modules/imap/site.js
+++ b/modules/imap/site.js
@@ -133,6 +133,10 @@ var imap_delete_message = function(state, supplied_uid, supplied_detail) {
             {'name': 'folder', 'value': detail.folder}],
             function(res) {
                 if (!res.imap_delete_error) {
+                    const listPath = getParam('list_parent') || getListPathParam();
+                    const store = new Hm_MessagesStore(listPath, Hm_Utils.get_url_page_number(), `${getParam('keyword')}_${getParam('filter')}`);
+                    store.load();
+                    store.removeRow(uid);
                     if (Hm_Utils.get_from_global('msg_uid', false)) {
                         return;
                     }
@@ -143,12 +147,7 @@ var imap_delete_message = function(state, supplied_uid, supplied_detail) {
                         Hm_Utils.redirect(nlink.attr('href'));
                     }
                     else {
-                        if (!hm_list_parent()) {
-                            Hm_Utils.redirect("?page=message_list&list_path="+getListPathParam());
-                        }
-                        else {
-                            Hm_Utils.redirect("?page=message_list&list_path="+hm_list_parent());
-                        }
+                        Hm_Utils.redirect("?page=message_list&list_path="+listPath);
                     }
                 }
             }
@@ -377,13 +376,24 @@ var remove_from_cached_imap_pages = function(msg_cache_key) {
 }
 
 async function select_imap_folder(path, page = 1,reload, processInTheBackground = false, abortController = null) {
-    const messages = new Hm_MessagesStore(path, page, null, abortController);
+    const messages = new Hm_MessagesStore(path, page, `${getParam('keyword')}_${getParam('filter')}`, null, abortController);
     await messages.load(reload, processInTheBackground).then(() => {
         if (processInTheBackground) {
             const rows = Object.values(messages.rows);            
             for (const index in rows) {
-                const row = rows[index]?.[0];               
-                const rowUid = $(row).data('uid');
+                const row = $(rows[index]?.[0]);            
+                const rowUid = row.data('uid');
+                row.find('a').each(function() {
+                    const link = $(this);
+                    const filterParams = ["keyword", "filter"];
+                    const url = new URL(link.attr('href'), location.href);
+                    filterParams.forEach(param => {
+                        url.searchParams.set(param, getParam(param));
+                    });
+                    link.attr('href', url.toString());
+                    const row = link.closest('tr');
+                    messages.updateRow(rowUid, row.prop('outerHTML'));
+                });
                 const tableRow = Hm_Utils.tbody(messages.list).find(`tr[data-uid="${rowUid}"]`);
                 if (!tableRow.length) {
                     if (Hm_Utils.rows(messages.list).length >= index) {
@@ -401,7 +411,7 @@ async function select_imap_folder(path, page = 1,reload, processInTheBackground
                 }
             });
         } else {
-            display_imap_mailbox(messages.rows, messages.list);
+            display_imap_mailbox(messages.rows, messages.list, messages);
         }
         if (messages.pages) {
             showPagination(messages.pages);
@@ -435,12 +445,12 @@ var setup_imap_folder_page = async function(listPath, listPage = 1) {
         e.preventDefault();
         $('#imap_filter_form').trigger('submit');
     });
-    $('.imap_keyword').on('search', function(e) {
+    $('.imap_keyword').on('change', function(e) {
         e.preventDefault();
         $('#imap_filter_form').trigger('submit');
     });
 
-    const hadLocalData = new Hm_MessagesStore(listPath, listPage).hasLocalData();
+    const hadLocalData = new Hm_MessagesStore(listPath, listPage, `${getParam('keyword')}_${getParam('filter')}`).hasLocalData();
     await select_imap_folder(listPath, listPage);
 
     handleMessagesDragAndDrop();
@@ -464,21 +474,25 @@ $(document).on('submit', '#imap_filter_form', async function(event) {
     event.preventDefault();
     const url = new URL(location.href);
     url.search = $(this).serialize();
-    history.replaceState(null, '', url);
+    history.pushState(history.state, "", url.toString());
     location.next = url.search;
-    try {
-        const messages = new Hm_MessagesStore(getListPathParam(), Hm_Utils.get_url_page_number());
-        await messages.load(true);
-        display_imap_mailbox(messages.rows, messages.list);
+    try {        
+        const messages = new Hm_MessagesStore(getListPathParam(), Hm_Utils.get_url_page_number(), `${getParam('keyword')}_${getParam('filter')}`);
+        await messages.load(!messages.hasLocalData());
+        Hm_Utils.tbody().attr('id', messages.list);
+        display_imap_mailbox(messages.rows, messages.list, messages);
+        if (messages.pages) {
+            showPagination(messages.pages);
+        }
     } catch (error) {
         // Show error message. TODO: No message utility yet, implement it later.
     }
 });
 
-var display_imap_mailbox = function(rows, id) {
+var display_imap_mailbox = function(rows, id, store) {
     Hm_Message_List.toggle_msg_controls();
     if (rows) {
-        Hm_Message_List.update(rows, id);
+        Hm_Message_List.update(rows, id, store);
         Hm_Message_List.check_empty_list();
         $('input[type=checkbox]').on("click", function(e) {
             Hm_Message_List.toggle_msg_controls();
@@ -510,9 +524,9 @@ function getMessageStorageKey(uid) {
 async function markPrefetchedMessagesAsRead(uid) {
     const listPath = getListPathParam();
     const detail = Hm_Utils.parse_folder_path(listPath, 'imap');
-    const msgId = `${detail.type}_${detail.server_id}_${uid}_${detail.folder}`;
+    const msgId = `${detail.type}_${detail.server_id}_${uid}_${detail.folder}`;    
 
-    const messages = new Hm_MessagesStore(listPath, Hm_Utils.get_url_page_number());
+    const messages = new Hm_MessagesStore(listPath, Hm_Utils.get_url_page_number(), `${getParam('keyword')}_${getParam('filter')}`);
     await messages.load(false, true);
     if (!messages.flagAsReadOnOpen) {
         return;
@@ -741,6 +755,9 @@ var imap_message_view_finished = function(msg_uid, detail, listParent, skip_link
             Hm_Message_List.adjust_unread_total(-1);
         }
     }
+
+    markPrefetchedMessagesAsRead(msg_uid);
+
     $('.all_headers').on("click", function() { return Hm_Utils.toggle_long_headers(); });
     $('.small_headers').on("click", function() { return Hm_Utils.toggle_long_headers(); });
     $('#flag_msg').on("click", function() { return imap_flag_message($(this).data('state')); });
@@ -805,16 +822,10 @@ var imap_setup_message_view_page = function(uid, details, list_path, listParent,
     if (!uid) {
         uid = getMessageUidParam();
     }
-    const callbackFn = (...args) => {        
-        markPrefetchedMessagesAsRead(uid);
-        if (callback) {
-            callback(...args);
-        }
-    };
     
     const msg_content = get_local_message_content(uid, list_path);
     if (!msg_content) {
-        get_message_content(false, uid, list_path, listParent, details, callbackFn);
+        get_message_content(false, uid, list_path, listParent, details, callback);
     }
     else {
         const msgResponse = JSON.parse(msg_content);
@@ -967,7 +978,7 @@ var imap_perform_move_copy = function(dest_id, context, action = null) {
             {'name': 'imap_move_action', 'value': action}],
             async function(res) {
                 var index;
-                const store = new Hm_MessagesStore(getListPathParam(), Hm_Utils.get_url_page_number());
+                const store = new Hm_MessagesStore(getListPathParam(), Hm_Utils.get_url_page_number(), `${getParam('keyword')}_${getParam('filter')}`);
                 await store.load(false, true, true);
                 const moveResponses = Object.values(res['move_responses']);
                 moveResponses.forEach((response) => {
@@ -981,7 +992,7 @@ var imap_perform_move_copy = function(dest_id, context, action = null) {
                         }
                     }
                     if (getListPathParam().substr(0, 4) === 'imap') {
-                        display_imap_mailbox(store.rows, store.list);
+                        display_imap_mailbox(store.rows, store.list, store);
                     }
                     else {
                         Hm_Message_List.load_sources();
@@ -1115,7 +1126,7 @@ function imap_setup_tags() {
 }
 
 var imap_setup_snooze = function() {
-    $(document).on('click', '.snooze_date_picker', function(e) {
+    $('.snooze_date_picker').on('click', function(e) {
         document.querySelector('.snooze_input_date').showPicker();
     });
     $('.snooze_helper').on('click', function(e) {
@@ -1162,14 +1173,14 @@ var imap_setup_snooze = function() {
                 const snoozedMessages = Object.values(res['snoozed_messages']);
                 if (snoozedMessages.length) {
                     const path = getParam("list_parent") || getListPathParam();
-                    const store = new Hm_MessagesStore(path, Hm_Utils.get_url_page_number());
+                    const store = new Hm_MessagesStore(path, Hm_Utils.get_url_page_number(), `${getParam('keyword')}_${getParam('filter')}`);
                     await store.load(false, true, true);
                     
                     snoozedMessages.forEach((msg) => {
                         store.removeRow(msg);
                     });
                     if (getPageNameParam() == 'message_list') {
-                        display_imap_mailbox(store.rows, store.list);
+                        display_imap_mailbox(store.rows, store.list, store);
                     }
 
                     Hm_Folders.reload_folders(true);
diff --git a/modules/imap_folders/modules.php b/modules/imap_folders/modules.php
index 525e91ceee..aaee080a1c 100644
--- a/modules/imap_folders/modules.php
+++ b/modules/imap_folders/modules.php
@@ -840,7 +840,8 @@ function get_sieve_linked_mailbox ($imap_account, $module) {
         list($sieve_host, $sieve_port) = parse_sieve_config_host($imap_account['sieve_config_host']);
         $client = new \PhpSieveManager\ManageSieve\Client($sieve_host, $sieve_port);
         try {
-            $client->connect($imap_account['user'], $imap_account['pass'], $imap_account['sieve_tls'], "", "PLAIN");
+            $tls = isset($imap_account['sieve_tls']) ? $imap_account['sieve_tls'] : false;
+            $client->connect($imap_account['user'], $imap_account['pass'], $tls, "", "PLAIN");
             $scripts = $client->listScripts();
             $folders = [];
             foreach ($scripts as $s) {
diff --git a/modules/nux/modules.php b/modules/nux/modules.php
index 762ac65a2f..a2d608afc1 100644
--- a/modules/nux/modules.php
+++ b/modules/nux/modules.php
@@ -405,6 +405,8 @@ public function process()
                         continue;
                     }
 
+                    Hm_Profiles::init($this);
+
                     add_profile(
                         $server_name,
                         $server['profile']['signature'],
@@ -470,8 +472,8 @@ protected function output() {
             return '';
         }
         $notice = $this->trans('Please ensure your YAML or CSV  file follows the correct format');
-        $yaml_file_sample_path = WEB_ROOT . 'modules/nux/assets/data/server_accounts_sample.yaml';
-        $csv_file_sample_path = WEB_ROOT . 'modules/nux/assets/data/server_accounts_sample.csv';
+        $yaml_file_sample_path = ASSETS_PATH . 'data/server_accounts_sample.yaml';
+        $csv_file_sample_path = ASSETS_PATH . 'data/server_accounts_sample.csv';
 
         return '<div class="quick_add_multiple_section">' .
             '<div class="row"><div class="col col-lg-6"><div class="form-floating mb-3">' .
diff --git a/modules/nux/site.js b/modules/nux/site.js
index ae229cdc4f..f61b6f58f6 100644
--- a/modules/nux/site.js
+++ b/modules/nux/site.js
@@ -47,18 +47,21 @@ var nux_add_account = function() {
 
 var display_final_nux_step = function(res) {
     if (res.nux_account_added) {
+        $('.server_section[data-target=".quick_add_section"]').trigger('click');
         if (res.nux_server_id) {
             Hm_Ajax.request(
                 [{'name': 'hm_ajax_hook', 'value': 'ajax_imap_accept_special_folders'},
                 {'name': 'imap_server_id', value: res.nux_server_id},
                 {'name': 'imap_service_name', value: res.nux_service_name}],
                 function () {
-                    Hm_Utils.redirect();
+                    Hm_Folders.reload_folders(true, '.email_folders');
                 }
             );
         } else {
-            Hm_Utils.redirect();
+            Hm_Folders.reload_folders(true, '.email_folders');
         }
+        // refresh data of the same page as well
+        navigate(window.location.href, "Refreshing...");
     }
 };
 
diff --git a/modules/saved_searches/site.css b/modules/saved_searches/site.css
index c5484df237..6157d1963c 100644
--- a/modules/saved_searches/site.css
+++ b/modules/saved_searches/site.css
@@ -2,7 +2,6 @@
 .saved_searches_form input { margin-left: 3px; margin-right: 3px; }
 .update_search_label img { opacity: .5; position: absolute; right: 105px; top: 21px; }
 .update_saved_search_title { color: #666; font-size: 110%; padding: 5px; margin-bottom: 10px; }
-.save_search i, .delete_search img { opacity: .5; position: absolute; right: 75px; top: 22px; }
 .update_search img { opacity: .5; position: absolute; right: 135px; top: 22px; }
 
 .mobile .save_search, .mobile .update_search_label, .mobile .delete_search, .mobile .add_search { display: none !important; }
diff --git a/modules/saved_searches/site.js b/modules/saved_searches/site.js
index e7de25d734..e889987a60 100644
--- a/modules/saved_searches/site.js
+++ b/modules/saved_searches/site.js
@@ -19,7 +19,7 @@ var delete_search = function(event) {
     if (!hm_delete_prompt()) {
         return false;
     }
-    var name = $('.search_name').val();
+    var name = $('.search_terms').val();
     event.preventDefault();
     if (name.length) {
         Hm_Ajax.request(
diff --git a/modules/sievefilters/modules.php b/modules/sievefilters/modules.php
index b0c3df5aa0..dd598be926 100644
--- a/modules/sievefilters/modules.php
+++ b/modules/sievefilters/modules.php
@@ -1319,7 +1319,7 @@ public function process() {
                         continue;
                     }
 
-                    $client = initialize_sieve_client_factory(null, null, $imap_account);
+                    $client = initialize_sieve_client_factory($this->config, null, $imap_account);
 
                     if ($client) {
                         $this->out('sieve_server_capabilities', $client->getCapabilities());
diff --git a/modules/smtp/hm-smtp.php b/modules/smtp/hm-smtp.php
index bd8c19972d..45bcaa861e 100644
--- a/modules/smtp/hm-smtp.php
+++ b/modules/smtp/hm-smtp.php
@@ -31,7 +31,7 @@ public static function service_connect($id, $server, $user, $pass, $cache=false)
             'tls'       => $server['tls'],
             'username'  => $user,
             'password'  => $pass,
-            'type'      => array_key_exists('type', $server) ? $server['type'] : 'smtp',
+            'type'      => array_key_exists('type', $server) && !empty($server['type']) ? $server['type'] : 'smtp',
         );
         if (array_key_exists('auth', $server)) {
             $config['auth'] = $server['auth'];
diff --git a/tests/phpunit/modules/core/message_list_functions.php b/tests/phpunit/modules/core/message_list_functions.php
index 6c67482c71..c613b6390f 100644
--- a/tests/phpunit/modules/core/message_list_functions.php
+++ b/tests/phpunit/modules/core/message_list_functions.php
@@ -115,7 +115,7 @@ public function test_message_controls() {
      */
     public function test_message_since_dropdown() {
         $mod = new Hm_Output_Test(array('foo' => 'bar', 'bar' => 'foo'), array('bar'));
-        $this->assertEquals('<select name="foo" id="foo" class="message_list_since form-select form-select-sm w-auto" data-default-value="-1 week"><option value="today">Today</option><option selected="selected" value="-1 week">Last 7 days</option><option value="-2 weeks">Last 2 weeks</option><option value="-4 weeks">Last 4 weeks</option><option value="-6 weeks">Last 6 weeks</option><option value="-6 months">Last 6 months</option><option value="-1 year">Last year</option><option value="-5 years">Last 5 years</option></select>', message_since_dropdown('-1 week', 'foo', $mod));
+        $this->assertEquals('<select name="foo" id="foo" class="message_list_since form-select form-select-sm" data-default-value="-1 week"><option value="today">Today</option><option selected="selected" value="-1 week">Last 7 days</option><option value="-2 weeks">Last 2 weeks</option><option value="-4 weeks">Last 4 weeks</option><option value="-6 weeks">Last 6 weeks</option><option value="-6 months">Last 6 months</option><option value="-1 year">Last year</option><option value="-5 years">Last 5 years</option></select>', message_since_dropdown('-1 week', 'foo', $mod));
     }
     /**
      * @preserveGlobalState disabled
@@ -160,7 +160,7 @@ public function test_validate_search_field() {
      */
     public function test_search_field_selection() {
         $mod = new Hm_Output_Test(array('foo' => 'bar', 'bar' => 'foo'), array('bar'));
-        $this->assertEquals('<select class="form-select form-select-sm w-auto" id="search_fld" name="search_fld"><option selected="selected" value="TEXT">Entire message</option><option value="BODY">Message body</option><option value="SUBJECT">Subject</option><option value="FROM">From</option><option value="TO">To</option><option value="CC">Cc</option></select>', search_field_selection('TEXT', $mod));
-        $this->assertEquals('<select class="form-select form-select-sm w-auto" id="search_fld" name="search_fld"><option value="TEXT">Entire message</option><option value="BODY">Message body</option><option value="SUBJECT">Subject</option><option value="FROM">From</option><option value="TO">To</option><option value="CC">Cc</option></select>', search_field_selection('foo', $mod));
+        $this->assertEquals('<select class="form-select form-select-sm" id="search_fld" name="search_fld"><option selected="selected" value="TEXT">Entire message</option><option value="BODY">Message body</option><option value="SUBJECT">Subject</option><option value="FROM">From</option><option value="TO">To</option><option value="CC">Cc</option></select>', search_field_selection('TEXT', $mod));
+        $this->assertEquals('<select class="form-select form-select-sm" id="search_fld" name="search_fld"><option value="TEXT">Entire message</option><option value="BODY">Message body</option><option value="SUBJECT">Subject</option><option value="FROM">From</option><option value="TO">To</option><option value="CC">Cc</option></select>', search_field_selection('foo', $mod));
     }
 }
diff --git a/tests/phpunit/modules/core/output_modules.php b/tests/phpunit/modules/core/output_modules.php
index f473f2a228..062b88243d 100644
--- a/tests/phpunit/modules/core/output_modules.php
+++ b/tests/phpunit/modules/core/output_modules.php
@@ -69,7 +69,7 @@ public function test_search_form_start() {
     public function test_search_form_content() {
         $test = new Output_Test('search_form_content', 'core');
         $res = $test->run();
-        $this->assertEquals(array('<input type="hidden" name="page" value="search" /> <label class="screen_reader" for="search_terms">Search Terms</label><input required placeholder="Search Terms" id="search_terms" type="search" class="search_terms form-control form-control-sm" name="search_terms" value="" /> <label class="screen_reader" for="search_fld">Search Field</label><select class="form-select form-select-sm w-auto" id="search_fld" name="search_fld"><option selected="selected" value="TEXT">Entire message</option><option value="BODY">Message body</option><option value="SUBJECT">Subject</option><option value="FROM">From</option><option value="TO">To</option><option value="CC">Cc</option></select> <label class="screen_reader" for="search_since">Search Since</label><select name="search_since" id="search_since" class="message_list_since form-select form-select-sm w-auto" data-default-value="-1 week"><option value="today">Today</option><option selected="selected" value="-1 week">Last 7 days</option><option value="-2 weeks">Last 2 weeks</option><option value="-4 weeks">Last 4 weeks</option><option value="-6 weeks">Last 6 weeks</option><option value="-6 months">Last 6 months</option><option value="-1 year">Last year</option><option value="-5 years">Last 5 years</option></select><select name="sort" style="width: 150px" class="combined_sort form-select form-select-sm"><option value="arrival">Arrival Date &darr;</option><option value="-arrival">Arrival Date &uarr;</option><option value="date">Sent Date &darr;</option><option value="-date">Sent Date &uarr;</option><option value="from">From &darr;</option><option value="-from">From &uarr;</option><option value="to">To &darr;</option><option value="-to">To &uarr;</option><option value="subject">Subject &darr;</option><option value="-subject">Subject &uarr;</option></select> | <input type="submit" class="search_update btn btn-primary btn-sm" value="Update" /> <input type="button" class="search_reset btn btn-light border btn-sm" value="Reset" />'), $res->output_response);
+        $this->assertEquals(array('<input type="hidden" name="page" value="search" /> <label class="screen_reader" for="search_terms">Search Terms</label><input required placeholder="Search Terms" id="search_terms" type="search" class="search_terms form-control form-control-sm" name="search_terms" value="" /> <label class="screen_reader" for="search_fld">Search Field</label><select class="form-select form-select-sm" id="search_fld" name="search_fld"><option selected="selected" value="TEXT">Entire message</option><option value="BODY">Message body</option><option value="SUBJECT">Subject</option><option value="FROM">From</option><option value="TO">To</option><option value="CC">Cc</option></select> <label class="screen_reader" for="search_since">Search Since</label><select name="search_since" id="search_since" class="message_list_since form-select form-select-sm" data-default-value="-1 week"><option value="today">Today</option><option selected="selected" value="-1 week">Last 7 days</option><option value="-2 weeks">Last 2 weeks</option><option value="-4 weeks">Last 4 weeks</option><option value="-6 weeks">Last 6 weeks</option><option value="-6 months">Last 6 months</option><option value="-1 year">Last year</option><option value="-5 years">Last 5 years</option></select><select name="sort" style="width: 150px" class="combined_sort form-select form-select-sm"><option value="arrival">Arrival Date &darr;</option><option value="-arrival">Arrival Date &uarr;</option><option value="date">Sent Date &darr;</option><option value="-date">Sent Date &uarr;</option><option value="from">From &darr;</option><option value="-from">From &uarr;</option><option value="to">To &darr;</option><option value="-to">To &uarr;</option><option value="subject">Subject &darr;</option><option value="-subject">Subject &uarr;</option></select> | <input type="submit" class="search_update btn btn-primary btn-sm" value="Update" /> <input type="button" class="search_reset btn btn-light border btn-sm" value="Reset" />'), $res->output_response);
     }
     /**
      * @preserveGlobalState disabled
@@ -614,10 +614,10 @@ public function test_unread_source_max_setting() {
     public function test_unread_since_setting() {
         $test = new Output_Test('unread_since_setting', 'core');
         $res = $test->run();
-        $this->assertEquals(array('<tr class="unread_setting"><td><label for="unread_since">Show messages received since</label></td><td><select name="unread_since" id="unread_since" class="message_list_since form-select form-select-sm w-auto" data-default-value="-1 week"><option value="today">Today</option><option selected="selected" value="-1 week">Last 7 days</option><option value="-2 weeks">Last 2 weeks</option><option value="-4 weeks">Last 4 weeks</option><option value="-6 weeks">Last 6 weeks</option><option value="-6 months">Last 6 months</option><option value="-1 year">Last year</option><option value="-5 years">Last 5 years</option></select></td></tr>'), $res->output_response);
+        $this->assertEquals(array('<tr class="unread_setting"><td><label for="unread_since">Show messages received since</label></td><td><select name="unread_since" id="unread_since" class="message_list_since form-select form-select-sm" data-default-value="-1 week"><option value="today">Today</option><option selected="selected" value="-1 week">Last 7 days</option><option value="-2 weeks">Last 2 weeks</option><option value="-4 weeks">Last 4 weeks</option><option value="-6 weeks">Last 6 weeks</option><option value="-6 months">Last 6 months</option><option value="-1 year">Last year</option><option value="-5 years">Last 5 years</option></select></td></tr>'), $res->output_response);
         $test->handler_response = array('user_settings' => array('unread_since' => '-2 weeks'));
         $res = $test->run();
-        $this->assertEquals(array('<tr class="unread_setting"><td><label for="unread_since">Show messages received since</label></td><td><select name="unread_since" id="unread_since" class="message_list_since form-select form-select-sm w-auto" data-default-value="-1 week"><option value="today">Today</option><option value="-1 week">Last 7 days</option><option selected="selected" value="-2 weeks">Last 2 weeks</option><option value="-4 weeks">Last 4 weeks</option><option value="-6 weeks">Last 6 weeks</option><option value="-6 months">Last 6 months</option><option value="-1 year">Last year</option><option value="-5 years">Last 5 years</option></select><span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_select"></i></span></td></tr>'), $res->output_response);
+        $this->assertEquals(array('<tr class="unread_setting"><td><label for="unread_since">Show messages received since</label></td><td><select name="unread_since" id="unread_since" class="message_list_since form-select form-select-sm" data-default-value="-1 week"><option value="today">Today</option><option value="-1 week">Last 7 days</option><option selected="selected" value="-2 weeks">Last 2 weeks</option><option value="-4 weeks">Last 4 weeks</option><option value="-6 weeks">Last 6 weeks</option><option value="-6 months">Last 6 months</option><option value="-1 year">Last year</option><option value="-5 years">Last 5 years</option></select><span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_select"></i></span></td></tr>'), $res->output_response);
     }
     /**
      * @preserveGlobalState disabled
@@ -626,10 +626,10 @@ public function test_unread_since_setting() {
     public function test_junk_since_setting() {
         $test = new Output_Test('junk_since_setting', 'core');
         $res = $test->run();
-        $this->assertEquals(array('<tr class="junk_setting"><td><label for="junk_since">Show junk messages since</label></td><td><select name="junk_since" id="junk_since" class="message_list_since form-select form-select-sm w-auto" data-default-value="-1 week"><option value="today">Today</option><option selected="selected" value="-1 week">Last 7 days</option><option value="-2 weeks">Last 2 weeks</option><option value="-4 weeks">Last 4 weeks</option><option value="-6 weeks">Last 6 weeks</option><option value="-6 months">Last 6 months</option><option value="-1 year">Last year</option><option value="-5 years">Last 5 years</option></select></td></tr>'), $res->output_response);
+        $this->assertEquals(array('<tr class="junk_setting"><td><label for="junk_since">Show junk messages since</label></td><td><select name="junk_since" id="junk_since" class="message_list_since form-select form-select-sm" data-default-value="-1 week"><option value="today">Today</option><option selected="selected" value="-1 week">Last 7 days</option><option value="-2 weeks">Last 2 weeks</option><option value="-4 weeks">Last 4 weeks</option><option value="-6 weeks">Last 6 weeks</option><option value="-6 months">Last 6 months</option><option value="-1 year">Last year</option><option value="-5 years">Last 5 years</option></select></td></tr>'), $res->output_response);
         $test->handler_response = array('user_settings' => array('junk_since' => '-2 weeks'));
         $res = $test->run();
-        $this->assertEquals(array('<tr class="junk_setting"><td><label for="junk_since">Show junk messages since</label></td><td><select name="junk_since" id="junk_since" class="message_list_since form-select form-select-sm w-auto" data-default-value="-1 week"><option value="today">Today</option><option value="-1 week">Last 7 days</option><option selected="selected" value="-2 weeks">Last 2 weeks</option><option value="-4 weeks">Last 4 weeks</option><option value="-6 weeks">Last 6 weeks</option><option value="-6 months">Last 6 months</option><option value="-1 year">Last year</option><option value="-5 years">Last 5 years</option></select><span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_select"></i></span></td></tr>'), $res->output_response);
+        $this->assertEquals(array('<tr class="junk_setting"><td><label for="junk_since">Show junk messages since</label></td><td><select name="junk_since" id="junk_since" class="message_list_since form-select form-select-sm" data-default-value="-1 week"><option value="today">Today</option><option value="-1 week">Last 7 days</option><option selected="selected" value="-2 weeks">Last 2 weeks</option><option value="-4 weeks">Last 4 weeks</option><option value="-6 weeks">Last 6 weeks</option><option value="-6 months">Last 6 months</option><option value="-1 year">Last year</option><option value="-5 years">Last 5 years</option></select><span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_select"></i></span></td></tr>'), $res->output_response);
     }
     /**
      * @preserveGlobalState disabled
@@ -638,10 +638,10 @@ public function test_junk_since_setting() {
     public function test_drafts_since_setting() {
         $test = new Output_Test('drafts_since_setting', 'core');
         $res = $test->run();
-        $this->assertEquals(array('<tr class="drafts_setting"><td><label for="drafts_since">Show draft messages since</label></td><td><select name="drafts_since" id="drafts_since" class="message_list_since form-select form-select-sm w-auto" data-default-value="-1 week"><option value="today">Today</option><option selected="selected" value="-1 week">Last 7 days</option><option value="-2 weeks">Last 2 weeks</option><option value="-4 weeks">Last 4 weeks</option><option value="-6 weeks">Last 6 weeks</option><option value="-6 months">Last 6 months</option><option value="-1 year">Last year</option><option value="-5 years">Last 5 years</option></select></td></tr>'), $res->output_response);
+        $this->assertEquals(array('<tr class="drafts_setting"><td><label for="drafts_since">Show draft messages since</label></td><td><select name="drafts_since" id="drafts_since" class="message_list_since form-select form-select-sm" data-default-value="-1 week"><option value="today">Today</option><option selected="selected" value="-1 week">Last 7 days</option><option value="-2 weeks">Last 2 weeks</option><option value="-4 weeks">Last 4 weeks</option><option value="-6 weeks">Last 6 weeks</option><option value="-6 months">Last 6 months</option><option value="-1 year">Last year</option><option value="-5 years">Last 5 years</option></select></td></tr>'), $res->output_response);
         $test->handler_response = array('user_settings' => array('drafts_since' => '-2 weeks'));
         $res = $test->run();
-        $this->assertEquals(array('<tr class="drafts_setting"><td><label for="drafts_since">Show draft messages since</label></td><td><select name="drafts_since" id="drafts_since" class="message_list_since form-select form-select-sm w-auto" data-default-value="-1 week"><option value="today">Today</option><option value="-1 week">Last 7 days</option><option selected="selected" value="-2 weeks">Last 2 weeks</option><option value="-4 weeks">Last 4 weeks</option><option value="-6 weeks">Last 6 weeks</option><option value="-6 months">Last 6 months</option><option value="-1 year">Last year</option><option value="-5 years">Last 5 years</option></select><span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_select"></i></span></td></tr>'), $res->output_response);
+        $this->assertEquals(array('<tr class="drafts_setting"><td><label for="drafts_since">Show draft messages since</label></td><td><select name="drafts_since" id="drafts_since" class="message_list_since form-select form-select-sm" data-default-value="-1 week"><option value="today">Today</option><option value="-1 week">Last 7 days</option><option selected="selected" value="-2 weeks">Last 2 weeks</option><option value="-4 weeks">Last 4 weeks</option><option value="-6 weeks">Last 6 weeks</option><option value="-6 months">Last 6 months</option><option value="-1 year">Last year</option><option value="-5 years">Last 5 years</option></select><span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_select"></i></span></td></tr>'), $res->output_response);
     }
     /**
      * @preserveGlobalState disabled
@@ -650,10 +650,10 @@ public function test_drafts_since_setting() {
     public function test_trash_since_setting() {
         $test = new Output_Test('trash_since_setting', 'core');
         $res = $test->run();
-        $this->assertEquals(array('<tr class="trash_setting"><td><label for="trash_since">Show trash messages since</label></td><td><select name="trash_since" id="trash_since" class="message_list_since form-select form-select-sm w-auto" data-default-value="-1 week"><option value="today">Today</option><option selected="selected" value="-1 week">Last 7 days</option><option value="-2 weeks">Last 2 weeks</option><option value="-4 weeks">Last 4 weeks</option><option value="-6 weeks">Last 6 weeks</option><option value="-6 months">Last 6 months</option><option value="-1 year">Last year</option><option value="-5 years">Last 5 years</option></select></td></tr>'), $res->output_response);
+        $this->assertEquals(array('<tr class="trash_setting"><td><label for="trash_since">Show trash messages since</label></td><td><select name="trash_since" id="trash_since" class="message_list_since form-select form-select-sm" data-default-value="-1 week"><option value="today">Today</option><option selected="selected" value="-1 week">Last 7 days</option><option value="-2 weeks">Last 2 weeks</option><option value="-4 weeks">Last 4 weeks</option><option value="-6 weeks">Last 6 weeks</option><option value="-6 months">Last 6 months</option><option value="-1 year">Last year</option><option value="-5 years">Last 5 years</option></select></td></tr>'), $res->output_response);
         $test->handler_response = array('user_settings' => array('trash_since' => '-2 weeks'));
         $res = $test->run();
-        $this->assertEquals(array('<tr class="trash_setting"><td><label for="trash_since">Show trash messages since</label></td><td><select name="trash_since" id="trash_since" class="message_list_since form-select form-select-sm w-auto" data-default-value="-1 week"><option value="today">Today</option><option value="-1 week">Last 7 days</option><option selected="selected" value="-2 weeks">Last 2 weeks</option><option value="-4 weeks">Last 4 weeks</option><option value="-6 weeks">Last 6 weeks</option><option value="-6 months">Last 6 months</option><option value="-1 year">Last year</option><option value="-5 years">Last 5 years</option></select><span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_select"></i></span></td></tr>'), $res->output_response);
+        $this->assertEquals(array('<tr class="trash_setting"><td><label for="trash_since">Show trash messages since</label></td><td><select name="trash_since" id="trash_since" class="message_list_since form-select form-select-sm" data-default-value="-1 week"><option value="today">Today</option><option value="-1 week">Last 7 days</option><option selected="selected" value="-2 weeks">Last 2 weeks</option><option value="-4 weeks">Last 4 weeks</option><option value="-6 weeks">Last 6 weeks</option><option value="-6 months">Last 6 months</option><option value="-1 year">Last year</option><option value="-5 years">Last 5 years</option></select><span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_select"></i></span></td></tr>'), $res->output_response);
     }
 
     /**
@@ -711,10 +711,10 @@ public function test_flagged_source_max_setting() {
     public function test_flagged_since_setting() {
         $test = new Output_Test('flagged_since_setting', 'core');
         $res = $test->run();
-        $this->assertEquals(array('<tr class="flagged_setting"><td><label for="flagged_since">Show messages received since</label></td><td><select name="flagged_since" id="flagged_since" class="message_list_since form-select form-select-sm w-auto" data-default-value="-1 week"><option value="today">Today</option><option selected="selected" value="-1 week">Last 7 days</option><option value="-2 weeks">Last 2 weeks</option><option value="-4 weeks">Last 4 weeks</option><option value="-6 weeks">Last 6 weeks</option><option value="-6 months">Last 6 months</option><option value="-1 year">Last year</option><option value="-5 years">Last 5 years</option></select></td></tr>'), $res->output_response);
+        $this->assertEquals(array('<tr class="flagged_setting"><td><label for="flagged_since">Show messages received since</label></td><td><select name="flagged_since" id="flagged_since" class="message_list_since form-select form-select-sm" data-default-value="-1 week"><option value="today">Today</option><option selected="selected" value="-1 week">Last 7 days</option><option value="-2 weeks">Last 2 weeks</option><option value="-4 weeks">Last 4 weeks</option><option value="-6 weeks">Last 6 weeks</option><option value="-6 months">Last 6 months</option><option value="-1 year">Last year</option><option value="-5 years">Last 5 years</option></select></td></tr>'), $res->output_response);
         $test->handler_response = array('user_settings' => array('flagged_since' => '-2 weeks'));
         $res = $test->run();
-        $this->assertEquals(array('<tr class="flagged_setting"><td><label for="flagged_since">Show messages received since</label></td><td><select name="flagged_since" id="flagged_since" class="message_list_since form-select form-select-sm w-auto" data-default-value="-1 week"><option value="today">Today</option><option value="-1 week">Last 7 days</option><option selected="selected" value="-2 weeks">Last 2 weeks</option><option value="-4 weeks">Last 4 weeks</option><option value="-6 weeks">Last 6 weeks</option><option value="-6 months">Last 6 months</option><option value="-1 year">Last year</option><option value="-5 years">Last 5 years</option></select><span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_select"></i></span></td></tr>'), $res->output_response);
+        $this->assertEquals(array('<tr class="flagged_setting"><td><label for="flagged_since">Show messages received since</label></td><td><select name="flagged_since" id="flagged_since" class="message_list_since form-select form-select-sm" data-default-value="-1 week"><option value="today">Today</option><option value="-1 week">Last 7 days</option><option selected="selected" value="-2 weeks">Last 2 weeks</option><option value="-4 weeks">Last 4 weeks</option><option value="-6 weeks">Last 6 weeks</option><option value="-6 months">Last 6 months</option><option value="-1 year">Last year</option><option value="-5 years">Last 5 years</option></select><span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_select"></i></span></td></tr>'), $res->output_response);
     }
     /**
      * @preserveGlobalState disabled
@@ -752,7 +752,7 @@ public function test_all_email_since_setting() {
         $this->assertEquals(array('user_settings' => array('all_email_since' => '-1 week'), 'router_module_list' => array()), $res->output_response);
         $test->handler_response = array('user_settings' => array('all_email_since' => '-2 weeks'), 'router_module_list' => array('imap'));
         $res = $test->run();
-        $this->assertEquals(array('<tr class="email_setting"><td><label for="all_email_since">Show messages received since</label></td><td><select name="all_email_since" id="all_email_since" class="message_list_since form-select form-select-sm w-auto" data-default-value="-1 week"><option value="today">Today</option><option value="-1 week">Last 7 days</option><option selected="selected" value="-2 weeks">Last 2 weeks</option><option value="-4 weeks">Last 4 weeks</option><option value="-6 weeks">Last 6 weeks</option><option value="-6 months">Last 6 months</option><option value="-1 year">Last year</option><option value="-5 years">Last 5 years</option></select><span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_select"></i></span></td></tr>'), $res->output_response);
+        $this->assertEquals(array('<tr class="email_setting"><td><label for="all_email_since">Show messages received since</label></td><td><select name="all_email_since" id="all_email_since" class="message_list_since form-select form-select-sm" data-default-value="-1 week"><option value="today">Today</option><option value="-1 week">Last 7 days</option><option selected="selected" value="-2 weeks">Last 2 weeks</option><option value="-4 weeks">Last 4 weeks</option><option value="-6 weeks">Last 6 weeks</option><option value="-6 months">Last 6 months</option><option value="-1 year">Last year</option><option value="-5 years">Last 5 years</option></select><span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_select"></i></span></td></tr>'), $res->output_response);
     }
     /**
      * @preserveGlobalState disabled
@@ -761,10 +761,10 @@ public function test_all_email_since_setting() {
     public function test_all_since_setting() {
         $test = new Output_Test('all_since_setting', 'core');
         $res = $test->run();
-        $this->assertEquals(array('<tr class="all_setting"><td><label for="all_since">Show messages received since</label></td><td><select name="all_since" id="all_since" class="message_list_since form-select form-select-sm w-auto" data-default-value="-1 week"><option value="today">Today</option><option selected="selected" value="-1 week">Last 7 days</option><option value="-2 weeks">Last 2 weeks</option><option value="-4 weeks">Last 4 weeks</option><option value="-6 weeks">Last 6 weeks</option><option value="-6 months">Last 6 months</option><option value="-1 year">Last year</option><option value="-5 years">Last 5 years</option></select></td></tr>'), $res->output_response);
+        $this->assertEquals(array('<tr class="all_setting"><td><label for="all_since">Show messages received since</label></td><td><select name="all_since" id="all_since" class="message_list_since form-select form-select-sm" data-default-value="-1 week"><option value="today">Today</option><option selected="selected" value="-1 week">Last 7 days</option><option value="-2 weeks">Last 2 weeks</option><option value="-4 weeks">Last 4 weeks</option><option value="-6 weeks">Last 6 weeks</option><option value="-6 months">Last 6 months</option><option value="-1 year">Last year</option><option value="-5 years">Last 5 years</option></select></td></tr>'), $res->output_response);
         $test->handler_response = array('user_settings' => array('all_since' => '-2 weeks'));
         $res = $test->run();
-        $this->assertEquals(array('<tr class="all_setting"><td><label for="all_since">Show messages received since</label></td><td><select name="all_since" id="all_since" class="message_list_since form-select form-select-sm w-auto" data-default-value="-1 week"><option value="today">Today</option><option value="-1 week">Last 7 days</option><option selected="selected" value="-2 weeks">Last 2 weeks</option><option value="-4 weeks">Last 4 weeks</option><option value="-6 weeks">Last 6 weeks</option><option value="-6 months">Last 6 months</option><option value="-1 year">Last year</option><option value="-5 years">Last 5 years</option></select><span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_select"></i></span></td></tr>'), $res->output_response);
+        $this->assertEquals(array('<tr class="all_setting"><td><label for="all_since">Show messages received since</label></td><td><select name="all_since" id="all_since" class="message_list_since form-select form-select-sm" data-default-value="-1 week"><option value="today">Today</option><option value="-1 week">Last 7 days</option><option selected="selected" value="-2 weeks">Last 2 weeks</option><option value="-4 weeks">Last 4 weeks</option><option value="-6 weeks">Last 6 weeks</option><option value="-6 months">Last 6 months</option><option value="-1 year">Last year</option><option value="-5 years">Last 5 years</option></select><span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_select"></i></span></td></tr>'), $res->output_response);
     }
     /**
      * @preserveGlobalState disabled