diff --git a/src/net/java/sip/communicator/impl/gui/main/message/ChatConversationPanel.java b/src/net/java/sip/communicator/impl/gui/main/message/ChatConversationPanel.java
index 4fd0d1417..59d375f8c 100755
--- a/src/net/java/sip/communicator/impl/gui/main/message/ChatConversationPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/message/ChatConversationPanel.java
@@ -118,9 +118,11 @@ public void processMessage(String contactName,
         
         chatString += contactName
         + " at "
-        + calendar.get(Calendar.HOUR_OF_DAY)
+        + processTime(calendar.get(Calendar.HOUR_OF_DAY))
         + ":"
-        + proccessMinutes(calendar.get(Calendar.MINUTE))
+        + processTime(calendar.get(Calendar.MINUTE))
+        + ":"
+        + processTime(calendar.get(Calendar.SECOND))
         + endHeaderTag
         + "<DIV>"
         + processSmilies(processNewLines(processLinks(message))) + "</DIV>";
@@ -210,18 +212,19 @@ private String processSmilies(String message) {
     /**
      * Format time string.
      * 
-     * @param minutes The minutes int.
+     * @param time The time parameter could be hours, minutes or seconds.
      * @return The formatted minutes string.
      */
-	private String proccessMinutes(int minutes){		
-		
-		String minutesString = new Integer(minutes).toString();
-		
-		String resultString = minutesString;
+	private String processTime(int time){		
 		
-		if(minutesString.length() < 2)
-			resultString.concat("0").concat(minutesString);
+		String timeString = new Integer(time).toString();
 		
+		String resultString = "";		
+		if(timeString.length() < 2)
+			resultString = resultString.concat("0").concat(timeString);
+        else
+            resultString = timeString;
+          
 		return resultString;
 	}