#1484317

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

1 files changed, 5 insertions, 3 deletions

diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js
index 2d30f300b..9f7b7ee6e 100644
--- a/roundcubemail/program/js/app.js
+++ b/roundcubemail/program/js/app.js
@@ -202,7 +202,7 @@ function rcube_webmail()
           }
 
         if (this.env.messagecount)
-          this.enable_command('select-all', 'select-none', 'sort', 'expunge', true);
+          this.enable_command('select-all', 'select-none', 'expunge', true);
 
         if (this.env.messagecount && (this.env.mailbox==this.env.trash_mailbox || this.env.mailbox==this.env.junk_mailbox))
           this.enable_command('purge', true);
@@ -3500,8 +3500,10 @@ function rcube_webmail()
 
       case 'list':
         if (this.env.messagecount)
-          this.enable_command('purge', (this.env.mailbox==this.env.trash_mailbox || this.env.mailbox==this.env.junk_mailbox));
-        this.msglist_select(this.message_list);
+	  this.enable_command('purge', (this.env.mailbox==this.env.trash_mailbox || this.env.mailbox==this.env.junk_mailbox));
+
+	this.enable_command('sort', (this.env.messagecount > 0));
+	this.msglist_select(this.message_list);
 
       case 'expunge':
         this.enable_command('select-all', 'select-none', 'expunge', this.env.messagecount ? true : false);