diff --git a/phpgwapi/inc/class.translation.inc.php b/phpgwapi/inc/class.translation.inc.php
index 92b750a217..c37621e038 100644
--- a/phpgwapi/inc/class.translation.inc.php
+++ b/phpgwapi/inc/class.translation.inc.php
@@ -982,7 +982,8 @@ class translation
 		if ($_body) {
 			if ($singleton)
 			{
-				$_body = preg_replace('~<'.$tag.'[^>].*? '.$endtag.'~simU','',$_body);
+				//$_body = preg_replace('~<'.$tag.'[^>].*? '.$endtag.'~simU','',$_body);
+				$_body = preg_replace('~<?'.$tag.'[^>].* '.$endtag.'~simU','',$_body); // we are in Ungreedy mode, so we expect * to be ungreedy without specifying ?
 			}
 			else
 			{