diff --git a/api/src/Storage/Merge.php b/api/src/Storage/Merge.php
index 26b31aeae6..4ac37f771b 100644
--- a/api/src/Storage/Merge.php
+++ b/api/src/Storage/Merge.php
@@ -1041,8 +1041,9 @@ abstract class Merge
 						$value = preg_replace('/&[^; ]+;/','',$value);
 					}
 				}
-
-				if(!$this->parse_html_styles)
+				if(!$this->parse_html_styles || (
+					strpos($value, "\n") !== FALSE && strpos($value,'<br') === FALSE && strpos($value, '<span') === FALSE
+				))
 				{
 					// Encode special chars so they don't break the file
 					$value = htmlspecialchars($value,ENT_NOQUOTES);