diff --git a/modules/core/functions.php b/modules/core/functions.php
index 62e2e828fb..4358a7a165 100644
--- a/modules/core/functions.php
+++ b/modules/core/functions.php
@@ -656,6 +656,36 @@ function nexter_formats() {
     return $values;
 }}
 
+if (!hm_exists('schedule_dropdown')) {
+function schedule_dropdown($output, $send_now = false) {
+    $values = nexter_formats();
+
+    $txt = '';
+    if ($send_now) {
+        $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('Schedule sending').'</button>';
+    }
+    $txt .= '<ul class="dropdown-menu nexter_dropdown schedule_dropdown" aria-labelledby="dropdownMenuNexterDate">';
+    foreach ($values as $format) {
+        $labels = get_nexter_date($format, true);
+        $txt .= '<li><a href="#" class="nexter_date_helper 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>';
+    }
+    $txt .= '<li><hr class="dropdown-divider"></li>';
+    $txt .= '<li><label for="nexter_input_date" class="nexter_date_picker dropdown-item cursor-pointer">'.$output->trans('Pick a date').'</label>';
+    $txt .= '<input id="nexter_input_date" type="datetime-local" min="'.date('Y-m-d\Th:m').'" class="nexter_input_date" style="visibility: hidden; position: absolute; height: 0;">';
+    $txt .= '<input class="nexter_input" style="display:none;"></li>';
+    if ($send_now) {
+        $txt .= '<li><hr class="dropdown-divider"></li>';
+        $txt .= '<li><a href="#" data-value="now" class="nexter_date_helper dropdown-item"">'.$output->trans('Send now').'</a></li>';
+    }
+    $txt .= '</ul>';
+    if ($send_now) {
+        $txt .= '</div>';
+    }
+
+    return $txt;
+}}
+
 /**
  * @subpackage imap/functions
  */
diff --git a/modules/core/message_list_functions.php b/modules/core/message_list_functions.php
index 7ddfb896ff..fbaa41568d 100644
--- a/modules/core/message_list_functions.php
+++ b/modules/core/message_list_functions.php
@@ -299,11 +299,11 @@ function subject_callback($vals, $style, $output_mod) {
  */
 if (!hm_exists('date_callback')) {
 function date_callback($vals, $style, $output_mod) {
-    $snooze_class = isset($vals[2]) && $vals[2]? ' snoozed_date': '';
+    $nexter_class = isset($vals[2]) && $vals[2]? ' nexter_date': '';
     if ($style == 'news') {
-        return sprintf('<div class="msg_date%s">%s<input type="hidden" class="msg_timestamp" value="%s" /></div>', $snooze_class, $output_mod->html_safe($vals[0]), $output_mod->html_safe($vals[1]));
+        return sprintf('<div class="msg_date%s">%s<input type="hidden" class="msg_timestamp" value="%s" /></div>', $nexter_class, $output_mod->html_safe($vals[0]), $output_mod->html_safe($vals[1]));
     }
-    return sprintf('<td class="msg_date%s" title="%s">%s<input type="hidden" class="msg_timestamp" value="%s" /></td>', $snooze_class, $output_mod->html_safe(date('r', $vals[1])), $output_mod->html_safe($vals[0]), $output_mod->html_safe($vals[1]));
+    return sprintf('<td class="msg_date%s" title="%s">%s<input type="hidden" class="msg_timestamp" value="%s" /></td>', $nexter_class, $output_mod->html_safe(date('r', $vals[1])), $output_mod->html_safe($vals[0]), $output_mod->html_safe($vals[1]));
 }}
 
 /**
diff --git a/modules/core/site.css b/modules/core/site.css
index 0f0cfb08ba..02a6e1d20a 100644
--- a/modules/core/site.css
+++ b/modules/core/site.css
@@ -1271,7 +1271,7 @@ div.unseen,
 .mobile .imap_sort {
   width: 100%;
 }
-.snoozed_date {
+.nexter_date {
   color: var(--bs-primary) !important;
 }
 
diff --git a/modules/core/site.js b/modules/core/site.js
index d74fe67713..93dfcceb3d 100644
--- a/modules/core/site.js
+++ b/modules/core/site.js
@@ -2707,26 +2707,30 @@ const observeMessageTextMutationAndHandleExternalResources = (inline) => {
 };
 
 var setup_nexter_date = function(callback) {
+    var scopedElement = function (el, selector) {
+        return $(el).parent().parent().find(selector);
+    }
     $(document).on('click', '.nexter_date_picker', function(e) {
         document.querySelector('.nexter_input_date').showPicker();
     });
     $(document).on('click', '.nexter_date_helper', function(e) {
         e.preventDefault();
-        $('.nexter_input').val($(this).attr('data-value')).trigger('change');
+        scopedElement(this, '.nexter_input').val($(this).attr('data-value')).trigger('change');
     });
     $(document).on('input', '.nexter_input_date', function(e) {
         var now = new Date();
         now.setMinutes(now.getMinutes() + 1);
         $(this).attr('min', now.toJSON().slice(0, 16));
+        var date_picker = scopedElement(this, '.nexter_date_picker');
         if (new Date($(this).val()).getTime() <= now.getTime()) {
-            $('.nexter_date_picker').css('border', '1px solid red');
+            date_picker.css('border', '1px solid red');
         } else {
-            $('.nexter_date_picker').css({'border': 'unset', 'border-top': '1px solid #ddd'});
+            date_picker.css({'border': 'unset', 'border-top': '1px solid #ddd'});
         }
     });
     $(document).on('change', '.nexter_input_date', function(e) {
         if ($(this).val() && new Date().getTime() < new Date($(this).val()).getTime()) {
-            $('.nexter_input').val($(this).val()).trigger('change');
+            scopedElement(this, '.nexter_input').val($(this).val()).trigger('change');
         }
     });
     $(document).on('change', '.nexter_input', callback);
diff --git a/modules/imap/functions.php b/modules/imap/functions.php
index 52bb3a08eb..460fd99b26 100644
--- a/modules/imap/functions.php
+++ b/modules/imap/functions.php
@@ -225,10 +225,14 @@ function format_imap_message_list($msg_list, $output_module, $parent_list=false,
             $nofrom = ' nofrom';
         }
         $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');
             $date = $snooze_header['until'];
             $timestamp = strtotime($date);
+        } elseif ($is_scheduled) {
+            $date = $msg['x_schedule'];
+            $timestamp = strtotime($date);
         } else {
             if ($list_sort == 'date') {
                 $date_field = 'date';
@@ -303,7 +307,7 @@ function format_imap_message_list($msg_list, $output_module, $parent_list=false,
                     array('safe_output_callback', 'source', $source, $icon),
                     array('safe_output_callback', 'from'.$nofrom, $from, null, str_replace(array($from, '<', '>'), '', $msg['from'])),
                     array('subject_callback', $subject, $url, $flags),
-                    array('date_callback', $date, $timestamp, $is_snoozed),
+                    array('date_callback', $date, $timestamp, $is_snoozed || $is_scheduled),
                     array('icon_callback', $flags)
                 ),
                 $id,
@@ -1325,8 +1329,8 @@ function snooze_dropdown($output, $unsnooze = false) {
     $values = nexter_formats();
 
     $txt = '<div class="dropdown d-inline-block">
-                <button type="button" class="btn btn-outline-success btn-sm dropdown-toggle" id="dropdownMenuNexterDate" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="true">'.$output->trans('Snooze').'</button>
-                <ul class="dropdown-menu" aria-labelledby="dropdownMenuNexterDate">';
+                <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">';
     foreach ($values as $format) {
         $labels = get_nexter_date($format, true);
         $txt .= '<li><a href="#" class="nexter_date_helper 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/output_modules.php b/modules/imap/output_modules.php
index 628fa01fd3..0c3d772f57 100644
--- a/modules/imap/output_modules.php
+++ b/modules/imap/output_modules.php
@@ -370,9 +370,12 @@ protected function output() {
             $txt .= ' | <a class="hlink" id="copy_message" href="#">'.$this->trans('Copy').'</a>';
             $txt .= ' | <a class="hlink" id="move_message" href="#">'.$this->trans('Move').'</a>';
             $txt .= ' | <a class="archive_link hlink" id="archive_message" href="#">'.$this->trans('Archive').'</a>';
+            if (isset($headers['X-Schedule'])) {
+                $txt .= ' | ' . schedule_dropdown($this, true);
+            }
 
             $is_draft = isset($headers['Flags']) && stristr($headers['Flags'], 'draft');
-            if ($this->get('sieve_filters_enabled') && !$is_draft) {
+            if ($this->get('sieve_filters_enabled') && !$is_draft && isset($headers['X-Snoozed'])) {
                 $txt .= ' | ' . snooze_dropdown($this, isset($headers['X-Snoozed']));
                 $server_id = $this->get('msg_server_id');
                 $imap_server = $this->get('imap_accounts')[$server_id];
diff --git a/modules/imap/site.js b/modules/imap/site.js
index 2b8833d2b3..4c057a76cd 100644
--- a/modules/imap/site.js
+++ b/modules/imap/site.js
@@ -1130,7 +1130,7 @@ $(function() {
 
     if (hm_page_name() === 'message_list' || hm_page_name() === 'message') {
         setup_nexter_date(function(e) {
-            $('.snooze_dropdown').hide();
+            $('.nexter_dropdown').hide();
             var ids = [];
             if (hm_page_name() == 'message') {
                 var list_path = hm_list_path().split('_');
@@ -1146,18 +1146,34 @@ $(function() {
                     return;
                 };
             }
-            Hm_Ajax.request(
-                [{'name': 'hm_ajax_hook', 'value': 'ajax_imap_snooze'},
-                {'name': 'imap_snooze_ids', 'value': ids},
-                {'name': 'imap_snooze_until', 'value': $(this).val()}],
-                function(res) {
-                    if (res.snoozed_messages > 0) {
-                        Hm_Folders.reload_folders(true);
-                        var path = hm_list_parent()? hm_list_parent(): hm_list_path();
-                        window.location.replace('?page=message_list&list_path='+path);
+            var reload_and_redirect = function() {
+                Hm_Folders.reload_folders(true);
+                var path = hm_list_parent()? hm_list_parent(): hm_list_path();
+                window.location.replace('?page=message_list&list_path='+path);
+            }
+            if ($(this).parent().parent().is('.snooze_dropdown')) {
+                Hm_Ajax.request(
+                    [{'name': 'hm_ajax_hook', 'value': 'ajax_imap_snooze'},
+                    {'name': 'imap_snooze_ids', 'value': ids},
+                    {'name': 'imap_snooze_until', 'value': $(this).val()}],
+                    function(res) {
+                        if (res.snoozed_messages > 0) {
+                            reload_and_redirect();
+                        }
                     }
-                }
-            );
+                );
+            } else {
+                Hm_Ajax.request(
+                    [{'name': 'hm_ajax_hook', 'value': 'ajax_re_schedule_message_sending'},
+                    {'name': 'scheduled_msg_ids', 'value': ids},
+                    {'name': 'schedule_date', 'value': $(this).val()}],
+                    function(res) {
+                        if (res.scheduled_msg_count > 0) {
+                            reload_and_redirect();
+                        }
+                    }
+                );
+            }
         });
     }
 
diff --git a/modules/smtp/functions.php b/modules/smtp/functions.php
index 568a3882cd..260ad84e87 100644
--- a/modules/smtp/functions.php
+++ b/modules/smtp/functions.php
@@ -42,25 +42,6 @@ function connect_to_smtp_server($address, $name, $port, $user, $pass, $tls, $ser
     }
 }
 
-if (!hm_exists('schedule_dropdown')) {
-function schedule_dropdown($output) {
-    $values = nexter_formats();
-
-    $txt = '<ul class="dropdown-menu" aria-labelledby="dropdownMenuNexterDate">';
-    foreach ($values as $format) {
-        $labels = get_nexter_date($format, true);
-        $txt .= '<li><a href="#" class="nexter_date_helper 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>';
-    }
-    $txt .= '<li><hr class="dropdown-divider"></li>';
-    $txt .= '<li><label for="nexter_input_date" class="nexter_date_picker dropdown-item cursor-pointer">'.$output->trans('Pick a date').'</label>';
-    $txt .= '<input id="nexter_input_date" type="datetime-local" min="'.date('Y-m-d\Th:m').'" class="nexter_input_date" style="visibility: hidden; position: absolute; height: 0;">';
-    $txt .= '<input class="nexter_input" style="display:none;"></li>';
-    $txt .= '</ul>';
-
-    return $txt;
-}}
-
-
 if (!hm_exists('delete_smtp_server')) {
     function delete_smtp_server($smtp_server_id) {
        Hm_SMTP_List::del($smtp_server_id);
diff --git a/modules/smtp/modules.php b/modules/smtp/modules.php
index 1f1f776aaa..20b591d36b 100644
--- a/modules/smtp/modules.php
+++ b/modules/smtp/modules.php
@@ -879,62 +879,12 @@ public function process() {
         foreach (array_keys($servers) as $server_id) {
             $cache = Hm_IMAP_List::get_cache($this->cache, $server_id);
             $imap = Hm_IMAP_List::connect($server_id, $cache);
-            $imap_details = Hm_IMAP_List::dump($server_id);
             if (imap_authed($imap)) {
                 $folder = 'Scheduled';
                 $ret = $imap->get_mailbox_page($folder, 'DATE', false, 'ALL');
                 foreach ($ret[1] as $msg) {
-                    $msg_headers = $imap->get_message_headers($msg['uid']);
-                    try {
-                        if (!empty($msg_headers['X-Schedule'])) {
-                            $scheduled_msg_count++;
-                        } else {
-                            continue;
-                        }
-                        if (new DateTime($msg_headers['X-Schedule']) <= new DateTime()) {
-                            $profile = Hm_Profiles::get($msg_headers['X-Profile-ID']);
-                            if (!$profile) {
-                                $profiles = Hm_Profiles::search('server', $imap_details['server']);
-
-                                if (!$profiles) {
-                                    Hm_Debug::add(sprintf('ERRCannot find profiles corresponding with IMAP server: %s', $imap_details['server']));
-                                    continue;
-                                }
-                                $profile = $profiles[0];
-                            }
-                            
-                            $smtp = Hm_SMTP_List::connect($profile['smtp_id'], false);
-                            
-                            if (smtp_authed($smtp)) {
-                                if (isset($msg_headers['X-Delivery'])) {
-                                    $from_params = 'RET=HDRS';
-                                    $recipients_params = 'NOTIFY=SUCCESS,FAILURE';
-                                } else {
-                                    $from_params = '';
-                                    $recipients_params = '';
-                                }
-                                $recipients = [];
-                                foreach (['To', 'Cc', 'Bcc'] as $fld) {
-                                    if (array_key_exists($fld, $msg_headers)) {
-                                        $recipients = array_merge($recipients, Hm_MIME_Msg::find_addresses($msg_headers[$fld]));
-                                    }
-                                }
-                                $msg_content = $imap->get_message_content($msg['uid'], 0);
-                                $from = process_address_fld($msg_headers['From']);
-                                
-                                $err_msg = $smtp->send_message($from[0]['email'], $recipients, $msg_content, $from_params, $recipients_params);
-
-                                if (!$err_msg) {
-                                    if ($imap->message_action('DELETE', [$msg['uid']])) {
-                                        $imap->message_action('EXPUNGE', [$msg['uid']]);
-                                    }
-                                    save_sent_msg($this, $server_id, $imap, $imap_details, $msg_content, $msg['uid'], false);
-                                    $scheduled_msg_count--;
-                                }
-                            }
-                        }
-                    } catch (Exception $e) {
-                        Hm_Debug::add(sprintf('ERRCannot send message: %s', $msg_headers['subject']));
+                    if (send_scheduled_message($this, $imap, $msg, $server_id)) {
+                        $scheduled_msg_count++;
                     }
                 }
             }
@@ -943,6 +893,48 @@ public function process() {
     }
 }
 
+/**
+ * Changes the schedule of the message
+ * @subpackage smtp/handler
+ */
+class Hm_Handler_re_schedule_message_sending extends Hm_Handler_Module {
+    public function process() {
+        if (!($this->module_is_supported('imap') || $this->module_is_supported('profiles'))) {
+            return;
+        }
+        list($success, $form) = $this->process_form(array('schedule_date', 'scheduled_msg_ids'));
+        if (!$success) {
+            return;
+        }
+        $scheduled_msg_count = 0;
+        if ($form['schedule_date'] != 'now') {
+            $new_schedule_date = get_nexter_date($form['schedule_date']);
+        }
+        $ids = explode(',', $form['scheduled_msg_ids']);
+        foreach ($ids as $msg_part) {
+            list($imap_server_id, $msg_id, $folder) = explode('_', $msg_part);
+            $cache = Hm_IMAP_List::get_cache($this->cache, $imap_server_id);
+            $imap = Hm_IMAP_List::connect($imap_server_id, $cache);
+            if (imap_authed($imap)) {
+                $folder = hex2bin($folder);
+                if (reschedule_message_sending($this, $imap, $msg_id, $folder, $new_schedule_date, $imap_server_id)) {
+                    $scheduled_msg_count++;
+                }
+            }
+        }
+        $this->out('scheduled_msg_count', $scheduled_msg_count);
+        if ($scheduled_msg_count == count($ids)) {
+            $msg = 'Operation successful';
+        } elseif ($scheduled_msg_count > 0) {
+            $msg = 'Some messages have been scheduled for sending';
+        } else {
+            $msg = 'ERRFailed to schedule sending for messages';
+        }
+        Hm_Msgs::add($msg);
+        $this->save_hm_msgs();
+    }
+}
+
 /**
  * @subpackage keyboard_shortcuts/output
  */
@@ -1579,6 +1571,20 @@ protected function output() {
     }
 }
 
+/**
+ * Add scheduled send to the message list controls
+ * @subpackage imap/output
+ */
+class Hm_Output_scheduled_send_msg_control extends Hm_Output_Module {
+    protected function output() {
+        $parts = explode('_', $this->get('list_path'));
+        if ($parts[0] == 'imap' && hex2bin($parts[2]) == 'Scheduled') {
+            $res = schedule_dropdown($this, true);
+            $this->concat('msg_controls_extra', $res);
+        }
+    }
+}
+
 /**
  * @subpackage smtp/functions
  */
@@ -2279,3 +2285,102 @@ function recip_count_check($headers, $omod) {
         Hm_Msgs::add('ERRMessage contains more than the maximum number of recipients, proceed with caution');
     }
 }}
+
+/**
+ * @subpackage smtp/functions
+ */
+if (!hm_exists('send_scheduled_message')) {
+function send_scheduled_message($handler, $imap, $msg, $server_id) {
+    $msg_headers = $imap->get_message_headers($msg['uid']);
+    $imap_details = Hm_IMAP_List::dump($server_id);
+    if (empty($imap_details)) {
+        return;
+    }
+    try {
+        if (empty($msg_headers['X-Schedule'])) {
+            return;
+        }
+        if (new DateTime($msg_headers['X-Schedule']) <= new DateTime()) {
+            $profile = Hm_Profiles::get($msg_headers['X-Profile-ID']);
+            if (!$profile) {
+                $profiles = Hm_Profiles::search('server', $imap_details['server']);
+
+                if (!$profiles) {
+                    Hm_Debug::add(sprintf('ERRCannot find profiles corresponding with IMAP server: %s', $imap_details['server']));
+                    return;
+                }
+                $profile = $profiles[0];
+            }
+            
+            $smtp = Hm_SMTP_List::connect($profile['smtp_id'], false);
+            
+            if (smtp_authed($smtp)) {
+                if (isset($msg_headers['X-Delivery'])) {
+                    $from_params = 'RET=HDRS';
+                    $recipients_params = 'NOTIFY=SUCCESS,FAILURE';
+                } else {
+                    $from_params = '';
+                    $recipients_params = '';
+                }
+                $recipients = [];
+                foreach (['To', 'Cc', 'Bcc'] as $fld) {
+                    if (array_key_exists($fld, $msg_headers)) {
+                        $recipients = array_merge($recipients, Hm_MIME_Msg::find_addresses($msg_headers[$fld]));
+                    }
+                }
+                $msg_content = $imap->get_message_content($msg['uid'], 0);
+                $from = process_address_fld($msg_headers['From']);
+                
+                $err_msg = $smtp->send_message($from[0]['email'], $recipients, $msg_content, $from_params, $recipients_params);
+
+                if (!$err_msg) {
+                    if ($imap->message_action('DELETE', [$msg['uid']])) {
+                        $imap->message_action('EXPUNGE', [$msg['uid']]);
+                    }
+                    save_sent_msg($handler, $server_id, $imap, $imap_details, $msg_content, $msg['uid'], false);
+                    return true;
+                }
+            }
+        }
+    } catch (Exception $e) {
+        Hm_Debug::add(sprintf('ERRCannot send message: %s', $msg_headers['subject']));
+    }
+    return;
+}}
+
+if (!hm_exists('reschedule_message_sending')) {
+function reschedule_message_sending($handler, $imap, $msg_id, $folder, $new_date, $server_id) {
+    if (!$imap->select_mailbox($folder)) {
+        return;
+    }
+    $msg = $imap->get_message_content($msg_id, 0);
+    if ($new_date == 'now') {
+        return send_scheduled_message($handler, $imap, $msg, $server_id);
+    }
+    preg_match("/^X-Schedule:.*(\r?\n[ \t]+.*)*\r?\n?/im", $msg, $matches);
+    if (count($matches)) {
+        $new_date = get_nexter_date($new_date);
+        $msg = str_replace($matches[0], "X-Schedule: {$new_date}\n", $msg);
+    } else {
+        return;
+    }
+    $msg = str_replace("\r\n", "\n", $msg);
+    $msg = str_replace("\n", "\r\n", $msg);
+    $msg = rtrim($msg)."\r\n";
+
+    $schedule_folder = 'Scheduled';
+    if (!count($imap->get_mailbox_status($schedule_folder))) {
+        return;
+    }
+    $res = false;
+    if ($imap->select_mailbox($schedule_folder) && $imap->append_start($schedule_folder, strlen($msg))) {
+        $imap->append_feed($msg."\r\n");
+        if ($imap->append_end()) {
+            if ($imap->select_mailbox($folder) && $imap->message_action('DELETE', array($msg_id))) {
+                $imap->message_action('EXPUNGE', array($msg_id));
+                $res = true;
+            }
+        }
+    }
+    return $res;
+}}
diff --git a/modules/smtp/setup.php b/modules/smtp/setup.php
index 376a6ba935..cc39d00088 100644
--- a/modules/smtp/setup.php
+++ b/modules/smtp/setup.php
@@ -107,6 +107,14 @@
 add_handler('ajax_send_scheduled_messages', 'compose_profile_data',  true, 'profiles');
 add_handler('ajax_send_scheduled_messages', 'send_scheduled_messages', true, 'smtp');
 
+setup_base_ajax_page('ajax_re_schedule_message_sending', 'core');
+add_handler('ajax_re_schedule_message_sending', 'load_imap_servers_from_config', true, 'imap', 'load_user_data', 'after');
+add_handler('ajax_re_schedule_message_sending', 'load_smtp_servers_from_config', true, 'smtp', 'load_user_data', 'after');
+add_handler('ajax_re_schedule_message_sending', 'compose_profile_data',  true, 'profiles');
+add_handler('ajax_re_schedule_message_sending', 're_schedule_message_sending', true, 'smtp');
+
+add_output('message_list', 'scheduled_send_msg_control', true, 'smtp', 'imap_custom_controls', 'after');
+
 return array(
     'allowed_pages' => array(
         'ajax_clear_attachment_chunks',
@@ -117,7 +125,8 @@
         'ajax_attachment_reminder_check',
         'ajax_get_test_chunk',
         'ajax_upload_chunk',
-        'ajax_send_scheduled_messages'
+        'ajax_send_scheduled_messages',
+        'ajax_re_schedule_message_sending'
     ),
     'allowed_get' => array(
         'imap_draft' => FILTER_VALIDATE_INT,
@@ -155,8 +164,6 @@
         'send_tomorrow_morning' => FILTER_DEFAULT,
         'send_today_afternoon' => FILTER_DEFAULT,
         'schedule_sending' => FILTER_DEFAULT,
-        'send_date' => FILTER_DEFAULT,
-        'send_time' => FILTER_DEFAULT,
         'attachment_id' => FILTER_DEFAULT,
         'smtp_compose_type' => FILTER_VALIDATE_INT,
         'new_smtp_name' => FILTER_DEFAULT,
@@ -198,5 +205,7 @@
         'next_email_post' => FILTER_DEFAULT,
         'enable_attachment_reminder' => FILTER_VALIDATE_INT,
         'schedule' => FILTER_DEFAULT,
+        'schedule_date' => FILTER_DEFAULT,
+        'scheduled_msg_ids' => FILTER_DEFAULT,
     )
 );
diff --git a/modules/smtp/site.js b/modules/smtp/site.js
index f2746225f6..bc4d4a3d92 100644
--- a/modules/smtp/site.js
+++ b/modules/smtp/site.js
@@ -647,10 +647,10 @@ $(function () {
     send_scheduled_messages();
     setInterval(send_scheduled_messages, 60000);
 
-    window.onbeforeunload = () => {
-        if (scheduled_msg_count == 0) {
-          return;
+    window.onbeforeunload = (e) => {
+        if (scheduled_msg_count > 0 && e.currentTarget.location.hostname !== document.location.hostname) {
+            return sprintf(hm_trans("You have %d scheduled messages that won\'t be executed if you quit"), scheduled_msg_count);
         }
-        return sprintf(hm_trans("You have %d scheduled messages that won\'t be executed if you quit"), scheduled_msg_count);
-      };
+        return;
+    };
 });