diff --git a/libraries/src/Mail/MailTemplate.php b/libraries/src/Mail/MailTemplate.php
index 36b22bf2914a6..2b561f3c74cb7 100644
--- a/libraries/src/Mail/MailTemplate.php
+++ b/libraries/src/Mail/MailTemplate.php
@@ -325,9 +325,11 @@ protected function replaceTags($text, $tags)
                     foreach ($matches[0] as $i => $match) {
                         $replacement = '';
 
-                        foreach ($value as $subvalue) {
-                            if (is_array($subvalue)) {
-                                $replacement .= $this->replaceTags($matches[1][$i], $subvalue);
+                        foreach ($value as $name => $subvalue) {
+                            if (is_array($subvalue) && $name == $matches[1][$i]) {
+                                $replacement .= implode("\n", $subvalue);
+                            } elseif (is_string($subvalue) && $name == $matches[1][$i]) {
+                                $replacement .= $subvalue;
                             }
                         }