diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp
index ecdfec13e..4d8e5bc52 100644
--- a/retroshare-gui/src/gui/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/MessagesDialog.cpp
@@ -646,8 +646,16 @@ void MessagesDialog::insertMessages()
 		{
 			QDateTime qtime;
 			qtime.setTime_t(it->ts);
+			if (it->ts > 86400)
+			{
+			QString timestamp = qtime.toString("hh:mm:ss");
+			item3 -> setText(timestamp);
+			}
+			else
+			{
 			QString timestamp = qtime.toString("dd.MM.yyyy hh:mm:ss");
 			item3 -> setText(timestamp);
+			}
 		}
 
 		//  From ....