diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatHtmlUtils.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatHtmlUtils.java
index 443e33aa5..29f4251ff 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatHtmlUtils.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatHtmlUtils.java
@@ -742,8 +742,6 @@ private static String createEditedAt(long date)
                 + ")";
     }
 
-
-
     /**
      * Escapes special HTML characters such as <, >, & and " in
      * the specified message.
@@ -757,6 +755,8 @@ public static String escapeHTMLChars(String message)
                 .replace("&", "&")
                 .replace("<", "&lt;")
                 .replace(">", "&gt;")
-                .replace("\"", "&quot;");
+                .replace("\"", "&quot;")
+                .replace("'", "&#x27;")
+                .replace("/", "&#x2F;");
     }
 }