diff --git a/src/App/DynamicProperty.cpp b/src/App/DynamicProperty.cpp
index 38aed4d11..310444f44 100644
--- a/src/App/DynamicProperty.cpp
+++ b/src/App/DynamicProperty.cpp
@@ -289,12 +289,16 @@ std::string DynamicProperty::encodeAttribute(const std::string& str) const
             tmp += "<";
         else if (*it == '"')
             tmp += """;
+        else if (*it == '\'')
+            tmp += "'";
         else if (*it == '&')
             tmp += "&";
         else if (*it == '>')
             tmp += ">";
+        else if (*it == '\r')
+            tmp += "
";
         else if (*it == '\n')
-            tmp += " ";
+            tmp += "
";
         else
             tmp += *it;
     }
diff --git a/src/App/Property.cpp b/src/App/Property.cpp
index 479877b65..a1ec25442 100644
--- a/src/App/Property.cpp
+++ b/src/App/Property.cpp
@@ -122,6 +122,8 @@ std::string Property::encodeAttribute(const std::string& str)
             tmp += "<";
         else if (*it == '"')
             tmp += """;
+        else if (*it == '\'')
+            tmp += "'";
         else if (*it == '&')
             tmp += "&";
         else if (*it == '>')