diff --git a/src/App/Property.cpp b/src/App/Property.cpp
index 0fd2fc1bb..3b750ff20 100644
--- a/src/App/Property.cpp
+++ b/src/App/Property.cpp
@@ -126,8 +126,10 @@ std::string Property::encodeAttribute(const std::string& str) const
             tmp += "&";
         else if (*it == '>')
             tmp += ">";
+        else if (*it == '\r')
+            tmp += "
";
         else if (*it == '\n')
-            tmp += " ";
+            tmp += "
";
         else
             tmp += *it;
     }