Fixed multi-message move/delete

2 files changed, 8 insertions, 2 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 2d564a588..ce6cb8011 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,10 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
 
+2007/08/29 (richs)
+----------
+- Fixed moving/deleting messages when more than 1 is selected
+
 2007/08/15 (thomasb)
 ----------
 - Applied patch for LDAP contacts listing by Glen Ogilvie
diff --git a/program/js/app.js b/program/js/app.js
index 164ac4a1b..581e25512 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1095,11 +1095,13 @@ function rcube_webmail()
     if (this.env.mailbox == this.env.drafts_mailbox)
       {
       this.enable_command('reply', 'reply-all', 'forward', false);
-      this.enable_command('show', 'delete', 'moveto', selected);
+      this.enable_command('show', selected);
+      this.enable_command('delete', 'moveto', (list.selection.length > 0 ? true : false));
       }
     else
       {
-      this.enable_command('show', 'reply', 'reply-all', 'forward', 'print', 'delete', 'moveto', selected);
+      this.enable_command('show', 'reply', 'reply-all', 'forward', 'print', selected);
+      this.enable_command('delete', 'moveto', (list.selection.length > 0 ? true : false));
       }
 
     // start timer for message preview (wait for double click)