diff --git a/modules/core/functions.php b/modules/core/functions.php
index 11c37f56f..c2b5291cc 100644
--- a/modules/core/functions.php
+++ b/modules/core/functions.php
@@ -728,8 +728,8 @@ function schedule_dropdown($output, $send_now = false) {
 /**
  * @subpackage imap/functions
  */
-if (!hm_exists('parse_nexter_header')) {
-    function parse_nexter_header($header, $name)
+if (!hm_exists('parse_delayed_header')) {
+    function parse_delayed_header($header, $name)
     {
         $header = str_replace("$name: ", '', $header);
         $result = [];
diff --git a/modules/core/site.js b/modules/core/site.js
index 652fe26d5..79cb98317 100644
--- a/modules/core/site.js
+++ b/modules/core/site.js
@@ -2412,15 +2412,17 @@ const observeMessageTextMutationAndHandleExternalResources = (inline) => {
 };
 
 function setupActionSchedule(callback) {
-    $(document).on('click', '.nexter_date_picker', function (e) {
+    $('.nexter_date_picker').off('click').on('click', function (e) {
         document.querySelector('.nexter_input_date').showPicker();
     });
-    $(document).on('click', '.nexter_date_helper', function (e) {
+
+    $('.nexter_date_helper').off('click').on('click', function (e) {
         e.preventDefault();
         $('.nexter_input').val($(this).attr('data-value')).trigger('change');
     });
-    $(document).on('input', '.nexter_input_date', function (e) {
-        var now = new Date();
+
+    $('.nexter_input_date').off('input').on('input', function (e) {
+        let now = new Date();
         now.setMinutes(now.getMinutes() + 1);
         $(this).attr('min', now.toJSON().slice(0, 16));
         if (new Date($(this).val()).getTime() <= now.getTime()) {
@@ -2429,36 +2431,53 @@ function setupActionSchedule(callback) {
             $('.nexter_date_picker').css({ 'border': 'unset', 'border-top': '1px solid #ddd' });
         }
     });
-    $(document).on('change', '.nexter_input_date', function (e) {
+
+    $('.nexter_input_date').off('change').on('change', function (e) {
         if ($(this).val() && new Date().getTime() < new Date($(this).val()).getTime()) {
             $('.nexter_input').val($(this).val()).trigger('change');
         }
     });
-    $(document).on('change', '.nexter_input', callback);
+
+    $('.nexter_input').off('change').on('change', callback);
 }
 
 function setupActionSnooze(callback) {
-    $(document).on('click', '.nexter_date_picker_snooze', function (e) {
-        document.querySelector('.nexter_input_date_snooze').showPicker();
-    });
-    $(document).on('click', '.nexter_date_helper_snooze', function (e) {
-        e.preventDefault();
-        $('.nexter_input_snooze').val($(this).attr('data-value')).trigger('change');
-    });
-    $(document).on('input', '.nexter_input_date_snooze', function (e) {
-        var now = new Date();
-        now.setMinutes(now.getMinutes() + 1);
-        $(this).attr('min', now.toJSON().slice(0, 16));
-        if (new Date($(this).val()).getTime() <= now.getTime()) {
-            $('.nexter_date_picker_snooze').css('border', '1px solid red');
-        } else {
-            $('.nexter_date_picker_snooze').css({ 'border': 'unset', 'border-top': '1px solid #ddd' });
-        }
-    });
-    $(document).on('change', '.nexter_input_date_snooze', function (e) {
-        if ($(this).val() && new Date().getTime() < new Date($(this).val()).getTime()) {
-            $('.nexter_input_snooze').val($(this).val()).trigger('change');
-        }
-    });
-    $(document).on('change', '.nexter_input_snooze', callback);
+    $(document)
+        .off('click', '.nexter_date_picker_snooze')
+        .on('click', '.nexter_date_picker_snooze', function () {
+            document.querySelector('.nexter_input_date_snooze').showPicker();
+        });
+
+    $(document)
+        .off('click', '.nexter_date_helper_snooze')
+        .on('click', '.nexter_date_helper_snooze', function (e) {
+            e.preventDefault();
+            $('.nexter_input_snooze').val($(this).attr('data-value')).trigger('change');
+        });
+
+    $(document)
+        .off('input', '.nexter_input_date_snooze')
+        .on('input', '.nexter_input_date_snooze', function () {
+            var now = new Date();
+            now.setMinutes(now.getMinutes() + 1);
+            $(this).attr('min', now.toJSON().slice(0, 16));
+
+            if (new Date($(this).val()).getTime() <= now.getTime()) {
+                $('.nexter_date_picker_snooze').css('border', '1px solid red');
+            } else {
+                $('.nexter_date_picker_snooze').css({ 'border': 'unset', 'border-top': '1px solid #ddd' });
+            }
+        });
+
+    $(document)
+        .off('change', '.nexter_input_date_snooze')
+        .on('change', '.nexter_input_date_snooze', function () {
+            if ($(this).val() && new Date().getTime() < new Date($(this).val()).getTime()) {
+                $('.nexter_input_snooze').val($(this).val()).trigger('change');
+            }
+        });
+
+    $(document)
+        .off('change', '.nexter_input_snooze')
+        .on('change', '.nexter_input_snooze', callback);
 }
diff --git a/modules/imap/functions.php b/modules/imap/functions.php
index b81b12ce7..b7f0f8b2b 100644
--- a/modules/imap/functions.php
+++ b/modules/imap/functions.php
@@ -253,7 +253,7 @@ function format_imap_message_list($msg_list, $output_module, $parent_list=false,
         $is_snoozed = !empty($msg['x_snoozed']) && hex2bin($msg['folder']) == 'Snoozed';
         $is_scheduled = !empty($msg['x_schedule']) && hex2bin($msg['folder']) == 'Scheduled';
         if ($is_snoozed) {
-            $snooze_header = parse_nexter_header('X-Snoozed: '.$msg['x_snoozed'], 'X-Snoozed');
+            $snooze_header = parse_delayed_header('X-Snoozed: '.$msg['x_snoozed'], 'X-Snoozed');
             $date = $snooze_header['until'];
             $timestamp = strtotime($date);
         } elseif ($is_scheduled) {
@@ -1332,7 +1332,7 @@ function snooze_message($mailbox, $msg_id, $folder, $snooze_tag) {
     preg_match("/^X-Snoozed:.*(\r?\n[ \t]+.*)*\r?\n?/im", $msg, $matches);
     if (count($matches)) {
         $msg = str_replace($matches[0], '', $msg);
-        $old_folder = parse_nexter_header($matches[0], 'X-Snoozed')['from'];
+        $old_folder = parse_delayed_header($matches[0], 'X-Snoozed')['from'];
     }
     if ($snooze_tag) {
         $from = $old_folder ?? $folder;
@@ -1359,7 +1359,7 @@ function snooze_message($mailbox, $msg_id, $folder, $snooze_tag) {
             }
         }
     } else {
-        $snooze_headers = parse_nexter_header($matches[0], 'X-Snoozed');
+        $snooze_headers = parse_delayed_header($matches[0], 'X-Snoozed');
         $original_folder = $snooze_headers['from'];
         if ($mailbox->store_message($original_folder, $msg)) {
             $deleteResult = $mailbox->message_action($snooze_folder, 'DELETE', array($msg_id));
@@ -1692,7 +1692,7 @@ function save_sent_msg($handler, $imap_id, $mailbox, $imap_details, $msg, $msg_i
             Hm_Msgs::add('ERRAn error occurred saving the sent message');
         }
 
-        $mailbox_page = $imap->get_messages($sent_folder, 'ARRIVAL', true, 'ALL', 0, 10);
+        $mailbox_page = $mailbox->get_messages($sent_folder, 'ARRIVAL', true, 'ALL', 0, 10);
         foreach ($mailbox_page[1] as $mail) {
             $msg_header = $mailbox->get_message_headers($sent_folder, $mail['uid']);
             if ($msg_header['Message-Id'] === $msg_id) {
diff --git a/modules/imap/handler_modules.php b/modules/imap/handler_modules.php
index 662d04a98..9e32e391f 100644
--- a/modules/imap/handler_modules.php
+++ b/modules/imap/handler_modules.php
@@ -1059,7 +1059,7 @@ public function process() {
                     $msg_headers = $mailbox->get_message_headers($folder, $msg['uid']);
                     if (isset($msg_headers['X-Snoozed'])) {
                         try {
-                            $snooze_headers = parse_nexter_header($msg_headers['X-Snoozed'], 'X-Snoozed');
+                            $snooze_headers = parse_delayed_header($msg_headers['X-Snoozed'], 'X-Snoozed');
                             if (new DateTime($snooze_headers['until']) <= new DateTime()) {
                                 snooze_message($mailbox, $msg['uid'], $folder, null);
                             }
diff --git a/modules/imap/output_modules.php b/modules/imap/output_modules.php
index 1a0ded651..fb58bae0e 100644
--- a/modules/imap/output_modules.php
+++ b/modules/imap/output_modules.php
@@ -206,7 +206,7 @@ protected function output() {
                             $txt .= $this->html_safe($value).'</th></tr>';
                         }
                         elseif ($fld == 'x-snoozed') {
-                            $snooze_header = parse_nexter_header($value, 'X-Snoozed');
+                            $snooze_header = parse_delayed_header($value, 'X-Snoozed');
                             $txt .= '<tr class="header_'.$fld.'"><th>';
                             $txt .= $this->trans('Snoozed').'</th><td>'.$this->trans('Until').' '.$this->html_safe($snooze_header['until']).' <a href="#" data-value="unsnooze" class="unsnooze nexter_date_helper">Unsnooze</a></td></tr>';
                         }
diff --git a/modules/smtp/functions.php b/modules/smtp/functions.php
index b49173cbe..a5013a662 100644
--- a/modules/smtp/functions.php
+++ b/modules/smtp/functions.php
@@ -69,7 +69,6 @@ function get_reply_type($request) {
 function send_scheduled_message($handler, $mailbox, $folder, $msg_id, $send_now = false) {    
     $msg_headers = $mailbox->get_message_headers($folder, $msg_id);    
     $mailbox_details = $mailbox->get_config();  
-    $imap_profile = Hm_IMAP_List::fetch($mailbox_details['user'], $mailbox_details['server']);
     try {
         if (empty($msg_headers['X-Schedule'])) {
             return false;
@@ -86,10 +85,13 @@ function send_scheduled_message($handler, $mailbox, $folder, $msg_id, $send_now
                 }
                 $profile = $profiles[0];
             }
-
-            $smtp = new Hm_Mailbox($imap_profile['id'], $handler->user_config, $handler->session, $imap_profile);
-
-            if ($smtp && $smtp->connect()) {
+            $smtp = Hm_SMTP_List::connect($profile['smtp_id'], false);
+            
+            if (! $smtp || ! $smtp->authed()) {
+                Hm_Msgs::add("ERRFailed to authenticate to the SMTP server");
+                return;
+            }
+            
                 $delivery_receipt = isset($msg_headers['X-Delivery']);
 
                 $recipients = [];
@@ -103,13 +105,11 @@ function send_scheduled_message($handler, $mailbox, $folder, $msg_id, $send_now
                 $from = process_address_fld($msg_headers['From']);
 
                 $err_msg = $smtp->send_message($from[0]['email'], $recipients, $msg_content, $delivery_receipt);
-
                 if (!$err_msg) {
                     $mailbox->delete_message($folder, $msg_id, false);
                     save_sent_msg($handler, $mailbox->get_config()['id'], $mailbox, $mailbox_details, $msg_content, $msg_id, false);
                     return true; 
                 }
-            }
         }
     } catch (Exception $e) {
         Hm_Debug::add(sprintf('ERRCannot send message: %s', $msg_headers['subject']));
diff --git a/modules/smtp/js_modules/route_handlers.js b/modules/smtp/js_modules/route_handlers.js
index 72a824784..5eb22f5c3 100644
--- a/modules/smtp/js_modules/route_handlers.js
+++ b/modules/smtp/js_modules/route_handlers.js
@@ -123,8 +123,7 @@ function applySmtpComposePageHandlers() {
                     save_compose_state(false, true, $('.nexter_input').val(), function(res) {
                         if (res.draft_id) {
                             reset_smtp_form(false);
-                            Hm_Folders.reload_folders(true);
-                            Hm_Utils.redirect();
+                            Hm_Notices.show([hm_trans('Operation successful')]);
                         }
                     });
                 } else {
diff --git a/modules/smtp/modules.php b/modules/smtp/modules.php
index d08e5ded2..9a4ca0809 100644
--- a/modules/smtp/modules.php
+++ b/modules/smtp/modules.php
@@ -1621,7 +1621,7 @@ public function process() {
             $imap_server = Hm_IMAP_List::getForMailbox($imap_server_id);
 
             $mailbox = new Hm_Mailbox($imap_server_id, $this->user_config, $this->session, $imap_server);
-            if ($mailbox && $mailbox->connect()) {
+                if ($mailbox && $mailbox->connect()) {
                 $folder = hex2bin($folder);
                 if (reschedule_message_sending($this, $mailbox, $msg_id, $folder, $new_schedule_date)) {
                     $scheduled_msg_count++;
diff --git a/modules/smtp/site.js b/modules/smtp/site.js
index 16585ac7b..edbb1026f 100644
--- a/modules/smtp/site.js
+++ b/modules/smtp/site.js
@@ -392,8 +392,8 @@ function smtpSettingsPageHandler() {
 
 $(function() {
     if (hm_is_logged()) {
-        var scheduled_msg_count = 0;
-        var sendScheduledMessages = function() { 
+        let scheduled_msg_count = 0;
+        let sendScheduledMessages = function() { 
             Hm_Ajax.request(
                 [{'name': 'hm_ajax_hook', 'value': 'ajax_send_scheduled_messages'}],
                 function(res) {