diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WTextEditorDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WTextEditorDialog.java
index ea62e8ead3..a37a2deb30 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WTextEditorDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WTextEditorDialog.java
@@ -273,7 +273,11 @@ public class WTextEditorDialog extends Window implements EventListener<Event>{
 				.and(Sanitizers.LINKS)
 				.and(Sanitizers.STYLES)
 				.and(Sanitizers.TABLES);
-		return policy.sanitize(untrustedHTML);
-	}
 
+		String ret = policy.sanitize(untrustedHTML);
+		ret = ret.replaceAll("&#35;", "#");
+		ret = ret.replaceAll("&#64;", "@");
+
+		return ret;
+	}
 }