diff --git a/src/main/java/eu/siacs/conversations/utils/XmlHelper.java b/src/main/java/eu/siacs/conversations/utils/XmlHelper.java
index 198ce28b9..8cd551a0a 100644
--- a/src/main/java/eu/siacs/conversations/utils/XmlHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/XmlHelper.java
@@ -7,7 +7,7 @@ public class XmlHelper {
 		content = content.replace(">", ">");
 		content = content.replace("\"", """);
 		content = content.replace("'", "'");
-		content = content.replaceAll("\\p{Cc}", "");
+		content = content.replaceAll("\\p{Cc}&&[^\n\r\t]", "");
 		return content;
 	}
 }