Select next message after removing one from list

git-svn-id: https://svn.roundcube.net/trunk@828 208e9e7b-5314-0410-a742-e7e81cd9613c

2 files changed, 5 insertions, 4 deletions

diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js
index 40d2f07ed..f3b47df65 100644
--- a/roundcubemail/program/js/app.js
+++ b/roundcubemail/program/js/app.js
@@ -1440,10 +1440,8 @@ function rcube_webmail()
         {
         id = selection[n];
         a_uids[a_uids.length] = id;
-        this.message_list.remove_row(id);
+        this.message_list.remove_row(id, (n == selection.length-1));
         }
-
-      this.message_list.select_next();
       }
       
     // also send search request to get the right messages 
diff --git a/roundcubemail/program/js/list.js b/roundcubemail/program/js/list.js
index 6a083a2e7..ccc0dda72 100644
--- a/roundcubemail/program/js/list.js
+++ b/roundcubemail/program/js/list.js
@@ -132,11 +132,14 @@ clear: function(sel)
 /**
  * 'remove' message row from list (just hide it)
  */
-remove_row: function(uid)
+remove_row: function(uid, sel_next)
 {
   if (this.rows[uid].obj)
     this.rows[uid].obj.style.display = 'none';
 
+  if (sel_next)
+    this.select_next();
+
   this.rows[uid] = null;
 },