diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc
index acdbf6000..b24fa22a2 100644
--- a/program/steps/mail/move_del.inc
+++ b/program/steps/mail/move_del.inc
@@ -19,6 +19,10 @@
 
 */
 
+// count pages before changing anything
+$old_count = $IMAP->messagecount();
+$old_pages = ceil($old_count / $IMAP->page_size);
+
 // move messages
 if ($_action=='moveto' && !empty($_POST['_uid']) && !empty($_POST['_target_mbox']))
 {
@@ -78,7 +82,7 @@ if ($_action=='moveto' && $target)
 $OUTPUT->command('set_quota', $IMAP->get_quota());
 
 // add new rows from next page (if any)
-if ($_POST['_from']!='show' && $pages>1 && $IMAP->list_page < $pages)
+if ($_POST['_from']!='show' && $old_pages>1 && $IMAP->list_page < $old_pages)
 {
   $sort_col   = isset($_SESSION['sort_col'])   ? $_SESSION['sort_col']   : $CONFIG['message_sort_col'];
   $sort_order = isset($_SESSION['sort_order']) ? $_SESSION['sort_order'] : $CONFIG['message_sort_order'];
diff --git a/skins/default/mail.css b/skins/default/mail.css
index 45dc95099..fb130ce6c 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -282,7 +282,8 @@ td.formlinks a:visited
   font-weight: bold;
 }
 
-#mailboxlist li.selected
+#mailboxlist li.selected,
+#mailboxlist li.droptarget li.selected
 {
   background-color: #929292;
 }