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 aa2652713..e052d7d15 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
@@ -210,8 +210,8 @@ public ChatConversationPanel(ChatConversationContainer chatContainer)
         String copyLinkString
             = GuiActivator.getResources().getI18NString("service.gui.COPY_LINK");
 
-        copyLinkItem =
-            new JMenuItem(copyLinkString,
+        copyLinkItem
+            = new JMenuItem(copyLinkString,
                 new ImageIcon(ImageLoader.getImage(ImageLoader.COPY_ICON)));
 
         copyLinkItem.addActionListener(new ActionListener()
@@ -423,10 +423,8 @@ else if (messageType.equals(Chat.OUTGOING_MESSAGE))
             endHeaderTag = "</h3>";
 
             chatString
-                += dateString
-                    + GuiActivator
-                        .getResources().getI18NString("service.gui.ME")
-                    + " at " + GuiUtils.formatTime(date) + endHeaderTag
+                += dateString + contactName + " at "
+                    + GuiUtils.formatTime(date) + endHeaderTag
                     + startDivTag + startPlainTextTag
                     + formatMessage(message, contentType, keyword)
                     + endPlainTextTag + endDivTag;
@@ -502,8 +500,7 @@ else if (messageType.equals(Chat.HISTORY_OUTGOING_MESSAGE))
 
             chatString
                 += dateString
-                    + GuiActivator
-                        .getResources().getI18NString("service.gui.ME")
+                    + contactName
                     + " at " + GuiUtils.formatTime(date) + endHeaderTag
                     + startHistoryDivTag + startPlainTextTag
                     + formatMessage(message, contentType, keyword)