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 29f4251ff..2fe344fd3 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
@@ -660,8 +660,10 @@ private static String createSimpleMessageTag(String messageID,
         messageTag.append(createStartPlainTextTag(contentType));
         messageTag.append(message);
         if (isEdited)
-            messageTag.append(" " + createEditedAt(date));
+            messageTag.append("    ");
         messageTag.append(createEndPlainTextTag(contentType));
+        if (isEdited)
+            messageTag.append(createEditedAt(date));
         messageTag.append("</div>");
 
         return messageTag.toString();
@@ -701,8 +703,10 @@ private static String createAdvancedMessageTag( String messageID,
         messageTag.append(createStartPlainTextTag(contentType));
         messageTag.append(message);
         if (isEdited)
-            messageTag.append(" " + createEditedAt(date));
+            messageTag.append("    ");
         messageTag.append(createEndPlainTextTag(contentType));
+        if (isEdited)
+            messageTag.append(createEditedAt(date));
         messageTag.append("</div>");
 
         return messageTag.toString();
@@ -736,10 +740,10 @@ public static String getDateString(long date)
      */
     private static String createEditedAt(long date)
     {
-        return "(" + GuiActivator.getResources()
+        return "<font color=\"#b7b7b7\">(" + GuiActivator.getResources()
                     .getI18NString( "service.gui.EDITED_AT",
                                     new String[]{GuiUtils.formatTime(date)})
-                + ")";
+                + ")</font>";
     }
 
     /**