diff --git a/retroshare-gui/src/gui/chat/ChatStyle.cpp b/retroshare-gui/src/gui/chat/ChatStyle.cpp
index 6efd82330..d86ecc4a1 100644
--- a/retroshare-gui/src/gui/chat/ChatStyle.cpp
+++ b/retroshare-gui/src/gui/chat/ChatStyle.cpp
@@ -195,7 +195,7 @@ QString ChatStyle::formatMessage(enumFormatMessage type, QString &name, QDateTim
 
     if (style.isEmpty()) {
         // default style
-        style = "<table width='100%'><tr><td><b>%name%</b></td><td width='130' align='right'>%timestamp%</td></tr></table><table width='100%'><tr><td>%message%</td></tr></table>";
+        style = "<table width='100%'><tr><td><b>%name%</b></td><td width='130' align='right'>%time%</td></tr></table><table width='100%'><tr><td>%message%</td></tr></table>";
     }
 
     unsigned int formatFlag = 0;
@@ -232,16 +232,9 @@ QString ChatStyle::formatMessage(enumFormatMessage type, QString &name, QDateTim
 //	}
 //    }
 
-    // if the message is on same date show only time
-    QString timeFormat;
-//    if (timestamp.daysTo(QDateTime::currentDateTime()) == 0) {
-//        timeFormat = "hh:mm:ss";
-//    } else {
-        timeFormat = "dd.MM.yyyy hh:mm:ss";
-//    }
-
     QString formatMsg = style.replace("%name%", name)
-                             .replace("%timestamp%", timestamp.toString(timeFormat))
+                             .replace("%date%", timestamp.date().toString("dd.MM.yyyy"))
+                             .replace("%time%", timestamp.time().toString("hh:mm:ss"))
                              .replace("%message%", msg);
 
     return formatMsg;
diff --git a/retroshare-gui/src/gui/qss/chat/history/hincoming.htm b/retroshare-gui/src/gui/qss/chat/history/hincoming.htm
index fce27c7b7..c668e565a 100644
--- a/retroshare-gui/src/gui/qss/chat/history/hincoming.htm
+++ b/retroshare-gui/src/gui/qss/chat/history/hincoming.htm
@@ -4,7 +4,7 @@
 <table class='hincomingTable' width='100%'>
 <tr>
 <td class='header hincomingHeader'>%name%</td>
-<td width='130' align='right' class='time hincomingTime'>[%timestamp%]</td>
+<td width='130' align='right' class='time hincomingTime'>[%date% %time%]</td>
 </tr>
 </table>
 <table class='hincomingTable' width='100%'>
diff --git a/retroshare-gui/src/gui/qss/chat/history/houtgoing.htm b/retroshare-gui/src/gui/qss/chat/history/houtgoing.htm
index bb2de9957..4c2e0c1c0 100644
--- a/retroshare-gui/src/gui/qss/chat/history/houtgoing.htm
+++ b/retroshare-gui/src/gui/qss/chat/history/houtgoing.htm
@@ -4,7 +4,7 @@
 <table class='houtgoingTable' width='100%'>
 <tr>
 <td class='header houtgoingHeader'>%name%</td>
-<td width='130' align='right' class='time houtgoingTime'>[%timestamp%]</td>
+<td width='130' align='right' class='time houtgoingTime'>[%date% %time%]</td>
 </tr>
 </table>
 <table class='houtgoingTable' width='100%'>
diff --git a/retroshare-gui/src/gui/qss/chat/history/incoming.htm b/retroshare-gui/src/gui/qss/chat/history/incoming.htm
index 71c308421..ca1efd722 100644
--- a/retroshare-gui/src/gui/qss/chat/history/incoming.htm
+++ b/retroshare-gui/src/gui/qss/chat/history/incoming.htm
@@ -4,7 +4,7 @@
 <table class='incomingTable' width='100%'>
 <tr>
 <td class='header incomingHeader'>%name%</td>
-<td width='130' align='right' class='time incomingTime'>[%timestamp%]</td>
+<td width='130' align='right' class='time incomingTime'>[%date% %time%]</td>
 </tr>
 </table>
 <table class='incomingTable' width='100%'>
diff --git a/retroshare-gui/src/gui/qss/chat/history/outgoing.htm b/retroshare-gui/src/gui/qss/chat/history/outgoing.htm
index 99425b5dc..2f86ebba7 100644
--- a/retroshare-gui/src/gui/qss/chat/history/outgoing.htm
+++ b/retroshare-gui/src/gui/qss/chat/history/outgoing.htm
@@ -4,7 +4,7 @@
 <table class='outgoingTable' width='100%'>
 <tr>
 <td class='header outgoingHeader'>%name%</td>
-<td width='130' align='right' class='time outgoingTime'>[%timestamp%]</td>
+<td width='130' align='right' class='time outgoingTime'>[%date% %time%]</td>
 </tr>
 </table>
 <table class='outgoingTable' width='100%'>
diff --git a/retroshare-gui/src/gui/qss/chat/private/hincoming.htm b/retroshare-gui/src/gui/qss/chat/private/hincoming.htm
index 10e6fb431..fdf4b60c6 100644
--- a/retroshare-gui/src/gui/qss/chat/private/hincoming.htm
+++ b/retroshare-gui/src/gui/qss/chat/private/hincoming.htm
@@ -4,7 +4,7 @@
 <table class='header hincomingHeader' width='100%'>
 <tr>
 <td class='name'>%name%</td>
-<td width='130' align='right' class='time'>%timestamp%</td>
+<td width='130' align='right' class='time'>%date% %time%</td>
 </tr>
 </table>
 <table width='100%'>
diff --git a/retroshare-gui/src/gui/qss/chat/private/houtgoing.htm b/retroshare-gui/src/gui/qss/chat/private/houtgoing.htm
index 70e7a9d8d..3a8c63b20 100644
--- a/retroshare-gui/src/gui/qss/chat/private/houtgoing.htm
+++ b/retroshare-gui/src/gui/qss/chat/private/houtgoing.htm
@@ -4,7 +4,7 @@
 <table class='header houtgoingHeader' width='100%'>
 <tr>
 <td class='name'>%name%</td>
-<td width='130' align='right' class='time'>%timestamp%</td>
+<td width='130' align='right' class='time'>%date% %time%</td>
 </tr>
 </table>
 <table width='100%'>
diff --git a/retroshare-gui/src/gui/qss/chat/private/incoming.htm b/retroshare-gui/src/gui/qss/chat/private/incoming.htm
index 8c9aeb130..a0281c500 100644
--- a/retroshare-gui/src/gui/qss/chat/private/incoming.htm
+++ b/retroshare-gui/src/gui/qss/chat/private/incoming.htm
@@ -4,7 +4,7 @@
 <table class='incomingHeader' width='100%'>
 <tr>
 <td class='name'>%name%</td>
-<td width='130' align='right' class='time'>%timestamp%</td>
+<td width='130' align='right' class='time'>%time%</td>
 </tr>
 </table>
 <table width='100%'>
diff --git a/retroshare-gui/src/gui/qss/chat/private/outgoing.htm b/retroshare-gui/src/gui/qss/chat/private/outgoing.htm
index b2b3abe48..7bf036a26 100644
--- a/retroshare-gui/src/gui/qss/chat/private/outgoing.htm
+++ b/retroshare-gui/src/gui/qss/chat/private/outgoing.htm
@@ -4,7 +4,7 @@
 <table class='outgoingHeader' width='100%'>
 <tr>
 <td class='name'>%name%</td>
-<td width='130' align='right' class='time'>%timestamp%</td>
+<td width='130' align='right' class='time'>%time%</td>
 </tr>
 </table>
 <table width='100%'>
diff --git a/retroshare-gui/src/gui/qss/chat/public/hincoming.htm b/retroshare-gui/src/gui/qss/chat/public/hincoming.htm
index f0db8bc95..6b20807d5 100644
--- a/retroshare-gui/src/gui/qss/chat/public/hincoming.htm
+++ b/retroshare-gui/src/gui/qss/chat/public/hincoming.htm
@@ -2,6 +2,6 @@
 %css-style%
 </style>
 
-<span class='hincomingTime'>%timestamp%</span>
+<span class='hincomingTime'>%date% %time%</span>
 <span class='hincomingName'><strong>%name%</strong></span>
 %message%
diff --git a/retroshare-gui/src/gui/qss/chat/public/houtgoing.htm b/retroshare-gui/src/gui/qss/chat/public/houtgoing.htm
index 17ce35d38..b9c22da01 100644
--- a/retroshare-gui/src/gui/qss/chat/public/houtgoing.htm
+++ b/retroshare-gui/src/gui/qss/chat/public/houtgoing.htm
@@ -2,6 +2,6 @@
 %css-style%
 </style>
 
-<span class='houtgoingTime'>%timestamp%</span>
+<span class='houtgoingTime'>%date% %time%</span>
 <span class='houtgoingName'><strong>%name%</strong></span>
 %message%
diff --git a/retroshare-gui/src/gui/qss/chat/public/incoming.htm b/retroshare-gui/src/gui/qss/chat/public/incoming.htm
index ef2ae9ee7..f65d02b56 100644
--- a/retroshare-gui/src/gui/qss/chat/public/incoming.htm
+++ b/retroshare-gui/src/gui/qss/chat/public/incoming.htm
@@ -2,6 +2,6 @@
 %css-style%
 </style>
 
-<span class='incomingTime'>%timestamp%</span>
+<span class='incomingTime'>%time%</span>
 <span class='incomingName'><strong>%name%</strong></span>
 %message%
diff --git a/retroshare-gui/src/gui/qss/chat/public/outgoing.htm b/retroshare-gui/src/gui/qss/chat/public/outgoing.htm
index 09c86bfee..59e07d67f 100644
--- a/retroshare-gui/src/gui/qss/chat/public/outgoing.htm
+++ b/retroshare-gui/src/gui/qss/chat/public/outgoing.htm
@@ -2,6 +2,6 @@
 %css-style%
 </style>
 
-<span class='outgoingTime'>%timestamp%</span>
+<span class='outgoingTime'>%time%</span>
 <span class='outgoingName'><strong>%name%</strong></span>
 %message%