diff --git a/program/lib/Roundcube/html.php b/program/lib/Roundcube/html.php
index a87c2a609f..385691a7de 100644
--- a/program/lib/Roundcube/html.php
+++ b/program/lib/Roundcube/html.php
@@ -63,7 +63,7 @@ public function show()
      *
      * @param string       $tagname Tag name
      * @param array|string $attrib  Tag attributes as key/value pairs, or 'class' attribute value
-     * @param string       $content Optional Tag content (creates a container tag)
+     * @param array|string $content Optional Tag content (creates a container tag)
      * @param array        $allowed List with allowed attributes, omit to allow all
      *
      * @return string The XHTML tag
@@ -81,6 +81,9 @@ public static function tag($tagname, $attrib = [], $content = null, $allowed = n
         if (isset($content) || in_array($tagname, self::$containers)) {
             $suffix = !empty($attrib['noclose']) ? $suffix : '</' . $tagname . '>' . $suffix;
             unset($attrib['noclose'], $attrib['nl']);
+            if (is_array($content)) {
+                $content = implode('', $content);
+            }
 
             return '<' . $tagname . self::attrib_string($attrib, $allowed) . '>' . $content . $suffix;
         }