4 files changed, 11 insertions, 3 deletions
diff --git a/program/include/rcmail_template.inc b/program/include/rcmail_template.inc
index d6eb35ca5..301b3f20d 100644
--- a/program/include/rcmail_template.inc
+++ b/program/include/rcmail_template.inc
@@ -453,8 +453,7 @@ class rcmail_template extends rcube_html_page
     {
       // return a button
       case 'button':
-        if ($attrib['command'])
-          return $this->button($attrib);
+        return $this->button($attrib);
         break;
 
       // show a label
@@ -582,7 +581,7 @@ class rcmail_template extends rcube_html_page
 
     $skin_path = $this->config['skin_path'];
 
-    if (!($attrib['command'] || $attrib['name']))
+    if (!($attrib['command'] || $attrib['name'] || $attrib['onclick']))
       return '';
 
     // try to find out the button type
diff --git a/program/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc
index a626d32c0..3d2c81500 100644
--- a/program/localization/de_CH/labels.inc
+++ b/program/localization/de_CH/labels.inc
@@ -110,6 +110,9 @@ $labels['lastmessage']      = 'Die letzte Nachricht anzeigen';
 $labels['lastmessages']     = 'Die letzten Nachrichten anzeigen';
 $labels['backtolist']       = 'Zurück zur Liste';
 $labels['viewsource']       = 'Quelltext anzeigen';
+$labels['markmessages']     = 'Nachrichten markieren';
+$labels['markread']         = 'Als gelesen';
+$labels['markunread']       = 'Als ungelesen';
 
 $labels['select'] = 'Auswählen';
 $labels['all']    = 'Alle';
diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc
index e2b13674f..409c4af8d 100644
--- a/program/localization/de_DE/labels.inc
+++ b/program/localization/de_DE/labels.inc
@@ -87,6 +87,9 @@ $labels['lastmessage'] = 'Die letzte Nachricht anzeigen';
 $labels['lastmessages'] = 'Die letzten Nachrichten anzeigen';
 $labels['backtolist'] = 'Zurück zur Liste';
 $labels['viewsource'] = 'Quelltext anzeigen';
+$labels['markmessages'] = 'Nachrichten markieren';
+$labels['markread'] = 'Als gelesen';
+$labels['markunread'] = 'Als ungelesen';
 $labels['select'] = 'Auswählen';
 $labels['all'] = 'Alle';
 $labels['none'] = 'Keine';
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index 769045fbb..533e40f99 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -109,6 +109,9 @@ $labels['lastmessage']      = 'Show the last message';
 $labels['lastmessages']     = 'Show last set of messages';
 $labels['backtolist']       = 'Back to message list';
 $labels['viewsource']       = 'Show source';
+$labels['markmessages']     = 'Mark messages';
+$labels['markread']         = 'As read';
+$labels['markunread']       = 'As unread';
 
 $labels['select'] = 'Select';
 $labels['all'] = 'All';