4 files changed, 4 insertions, 0 deletions
diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index dc4b5e1c0..d8c217693 100755
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -587,6 +587,7 @@ class rcube_template extends rcube_html_page
                     else {
                       $incl = file_get_contents($path);
                     }
+                    $incl = $this->parse_conditions($incl);
                     return $this->parse_xml($incl);
                 }
                 break;
diff --git a/program/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc
index 1cb4be66e..5c0aa9d19 100644
--- a/program/localization/de_CH/labels.inc
+++ b/program/localization/de_CH/labels.inc
@@ -117,6 +117,7 @@ $labels['markread'] = 'Als gelesen';
 $labels['markunread'] = 'Als ungelesen';
 $labels['markflagged'] = 'Stern hinzufügen';
 $labels['markunflagged'] = 'Stern entfernen';
+$labels['messageactions']   = 'Weitere Aktionen...';
 $labels['select'] = 'Auswählen';
 $labels['all'] = 'Alle';
 $labels['none'] = 'Keine';
diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc
index 7db1f395c..53231a677 100644
--- a/program/localization/de_DE/labels.inc
+++ b/program/localization/de_DE/labels.inc
@@ -116,6 +116,7 @@ $labels['markread'] = 'Als gelesen';
 $labels['markunread'] = 'Als ungelesen';
 $labels['markflagged'] = 'Stern hinzufügen';
 $labels['markunflagged'] = 'Stern entfernen';
+$labels['messageactions']   = 'Weitere Aktionen...';
 $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 0ad6584b6..0e26fc67a 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -142,6 +142,7 @@ $labels['markread']         = 'As read';
 $labels['markunread']       = 'As unread';
 $labels['markflagged']      = 'As flagged';
 $labels['markunflagged']    = 'As unflagged';
+$labels['messageactions']   = 'More actions...';
 $labels['messagemenu']      = 'Message menu';
 
 $labels['select'] = 'Select';