diff --git a/css/style.css b/css/style.css
index 80bd036..44d9e1b 100644
--- a/css/style.css
+++ b/css/style.css
@@ -72,6 +72,12 @@
 	float: left;
 }
 
+.msg-date {
+	font-style: italic;
+	font-size: 90%;
+	float: right;
+}
+
 .msg-spacer {
 	clear: both;
 }
diff --git a/js/script.js b/js/script.js
index 37c24bb..01d231e 100644
--- a/js/script.js
+++ b/js/script.js
@@ -16,6 +16,10 @@ function fetchConversation(phoneNumber) {
 			var conversationBuf = "";
 			// Improve JS performance
 			var msgClass = '';
+			var unixDate = '';
+			var formatedDate = '';
+			var months = ['Jan.', 'Feb.', 'Mar.', 'Apr.', 'May', 'Jun.', 'Jul.', 'Aug.', 'Sep.',
+				'Oct.', 'Nov.', 'Dec.'];
 
 			$.each(jsondata["conversation"], function(id, vals) {
 				if (vals["type"] == 1) {
@@ -28,7 +32,14 @@ function fetchConversation(phoneNumber) {
 					msgClass = '';
 				}
 
-				conversationBuf += '<div><div class="' + msgClass + '">' + vals["msg"] + '</div><div class="msg-spacer"></div></div>';
+				// Multiplicate ID to permit date to use it properly
+				msgDate = new Date(id*1);
+				formatedDate = msgDate.getDate() + " " + months[msgDate.getMonth()-1] + " " +
+					msgDate.getHours() + ":" + msgDate.getMinutes();
+
+				conversationBuf += '<div><div class="' + msgClass + '"><div>' + 
+					vals["msg"] + '</div><div class="msg-date">' + 
+					formatedDate + '</div></div><div class="msg-spacer"></div></div>';
 			});
 
 			$('#app-content').html(conversationBuf);