diff --git a/modules/advanced_search/site.js b/modules/advanced_search/site.js
index 96dd7a37e..b8cf2020f 100644
--- a/modules/advanced_search/site.js
+++ b/modules/advanced_search/site.js
@@ -113,7 +113,7 @@ var adv_select_imap_folder = function(el) {
     folders.show();
 
     folders.find('li').each(function(index) {
-        const wrapper = $('<div class="d-flex justify-content-between"></div>');
+        const wrapper = $('<div class="d-flex justify-content-between wrapper"></div>');
         $(this).wrapInner(wrapper);
         const allSpecialFoldersCheckbox = `
         <span class="form-check">
@@ -130,7 +130,7 @@ var adv_select_imap_folder = function(el) {
         const checkboxesWrapper = $('<div class="d-flex gap-3"></div>');
         checkboxesWrapper.append(allSpecialFoldersCheckbox);
         checkboxesWrapper.append(allFoldersCheckbox);
-        wrapper.append(checkboxesWrapper);
+        $(this).find('.wrapper').append(checkboxesWrapper);
     })
 
     $('.imap_folder_link', folders).addClass('adv_folder_link').removeClass('imap_folder_link');
diff --git a/modules/core/site.js b/modules/core/site.js
index afbffcccd..27b074934 100644
--- a/modules/core/site.js
+++ b/modules/core/site.js
@@ -849,16 +849,17 @@ function Message_List() {
         const next = messages.getNextRowForMessage(msgUid);
         const prev = messages.getPreviousRowForMessage(msgUid);
         if (prev) {
-            const prevSubject = $(prev['0']).find('.subject');
-            phref = prevSubject.find('a').prop('href');
-            const subject = new Option(prevSubject.text()).innerHTML;
+            const prevSubject = $(prev['0']).find('.subject a');
+            phref = prevSubject.prop('href');
+            const subject = prevSubject.text();
             const plink = '<a class="plink" href="'+phref+'"><i class="prevnext bi bi-arrow-left-square-fill"></i> '+subject+'</a>';
             $('<tr class="prev"><th colspan="2">'+plink+'</th></tr>').insertBefore(target);
         }
         if (next) {
-            const nextSubject = $(next['0']).find('.subject');
-            nhref = nextSubject.find('a').prop('href');
-            const subject = new Option(nextSubject.text()).innerHTML;
+            const nextSubject = $(next['0']).find('.subject a');
+            nhref = nextSubject.prop('href');
+            const subject = nextSubject.text();
+            
             const nlink = '<a class="nlink" href="'+nhref+'"><i class="prevnext bi bi-arrow-right-square-fill"></i> '+subject+'</a>';
             $('<tr class="next"><th colspan="2">'+nlink+'</th></tr>').insertBefore(target);
         }