diff --git a/data/web/inc/footer.inc.php b/data/web/inc/footer.inc.php
index 9dd5c4b2..b14553b4 100644
--- a/data/web/inc/footer.inc.php
+++ b/data/web/inc/footer.inc.php
@@ -23,7 +23,7 @@ function setLang(sel) {
   $.post( "<?= $_SERVER['REQUEST_URI']; ?>", {lang: sel} );
   window.location.href = window.location.pathname + window.location.search;
 }
-$(window).load(function() {
+$(window).on('load', function() {
   $(".overlay").hide();
 });
 $(document).ready(function() {
diff --git a/data/web/inc/functions.mailbox.inc.php b/data/web/inc/functions.mailbox.inc.php
index 52a7faa7..fbd1917d 100644
--- a/data/web/inc/functions.mailbox.inc.php
+++ b/data/web/inc/functions.mailbox.inc.php
@@ -484,7 +484,7 @@ function mailbox($_action, $_type, $_data = null, $attr = null) {
             );
             return false;
           }
-          if (empty($gotos[0]) && $goto_null == 0) {
+          if (empty($gotos[0]) && ($goto_null + $goto_spam + $goto_ham == 0)) {
             $_SESSION['return'] = array(
               'type' => 'danger',
               'msg' => sprintf($lang['danger']['goto_empty'])