Fix a bug introduced with Shift-Del yesterday

2 files changed, 5 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 6117e2bfc..9710fa1dc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,10 @@ CHANGELOG RoundCube Webmail
 ---------------------------
 
 
+2006/11/22 (robin)
+- Fix a bug introduced with Shift-Del yesterday
+
+
 2006/11/21 (robin)
 - Add missing nl_NL translations
 - Translate foldernames in folder form (closes #1484113)
diff --git a/program/js/app.js b/program/js/app.js
index 8157159fd..bc6563ec8 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1343,7 +1343,7 @@ function rcube_webmail()
     // if there is a trash mailbox defined and we're not currently in it:
     if (this.env.trash_mailbox && String(this.env.mailbox).toLowerCase()!=String(this.env.trash_mailbox).toLowerCase())
       // if shift was pressed delete it immediately
-      if (this.message_list.shiftkey)
+      if (this.message_list && this.message_list.shiftkey)
         {
         if (confirm(this.get_label('deletemessagesconfirm')))
           this.permanently_remove_messages();