summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2012-09-25 09:39:40 +0200
committerThomas Bruederli <thomas@roundcube.net>2012-09-25 09:39:40 +0200
commit0746d58fcebf1f259d5e4cac72833ea41b86410a (patch)
tree0fd9631ecf0f03697aad3e7bc07192585d36ea0f /program
parent5f8406c76a1efdc50e5613a49ca10b86873fa436 (diff)
Allow to mark/flag messages from full message view screen
Diffstat (limited to 'program')
-rw-r--r--program/js/app.js2
-rw-r--r--program/steps/mail/show.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/program/js/app.js b/program/js/app.js
index cf942e291..4d784e532 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -2447,7 +2447,7 @@ function rcube_webmail()
// set message row status, class and icon
this.set_message = function(uid, flag, status)
{
- var row = this.message_list.rows[uid];
+ var row = this.message_list && this.message_list.rows[uid];
if (!row)
return false;
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index 82c826108..029bc5f8d 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -104,7 +104,7 @@ if ($uid = get_input_value('_uid', RCUBE_INPUT_GET)) {
if (!$OUTPUT->ajax_call)
$OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash',
- 'movingmessage', 'deletingmessage');
+ 'movingmessage', 'deletingmessage', 'markingmessage');
// check for unset disposition notification
if ($MESSAGE->headers->mdn_to