finish previous commit

2 files changed, 11 insertions, 4 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 7b67ed27d..831f444bc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,11 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
 
+2006/11/11 (estadtherr)
+----------
+- fixed deletion/moving of messages from within "show" page
+
+
 2006/11/07 (estadtherr)
 ----------
 - Upgraded to TinyMCE v2.0.8
diff --git a/program/js/app.js b/program/js/app.js
index 50078cfd8..caef29271 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1272,10 +1272,12 @@ function rcube_webmail()
   this.permanently_remove_messages = function()
     {
     // exit if no mailbox specified or if selection is empty
-    var selection = this.message_list.get_selection();
-    if (!(selection.length || this.env.uid))
-      return;
-    
+    if (!this.env.uid)
+      {
+      if (!this.message_list || !this.message_list.get_selection().length)
+        return;
+      }
+
     var a_uids = new Array();
 
     if (this.env.uid)