diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java
index 4e98ef834..ff6859a68 100755
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java
@@ -441,6 +441,12 @@ public String processMessage(ChatMessage chatMessage, String keyword)
         if (contactDisplayName == null
                 || contactDisplayName.trim().length() <= 0)
             contactDisplayName = contactName;
+        else
+        {
+            // for some reason &apos; is not rendered correctly from our ui,
+            // lets use its equivalent. Other similar chars(< > & ") seem ok.
+            contactDisplayName = contactDisplayName.replaceAll("&apos;", "&#39;");
+        }
 
         String contentType = chatMessage.getContentType();
         long date = chatMessage.getDate();