diff --git a/src/client.js b/src/client.js
index 05751b9..71e25a5 100644
--- a/src/client.js
+++ b/src/client.js
@@ -73,6 +73,7 @@ function init() {
     isRead = isRead || state.windows.modal.open
       && state.windows.args[0].chatChannel === channelId;
 
+    // TODO ping doesn't work since update
     const isPing = (nameRegExp && text.match(nameRegExp));
     store.dispatch(receiveChatMessage(
       name,
diff --git a/src/core/ChatMessageBuffer.js b/src/core/ChatMessageBuffer.js
index 1ff4b22..15c48b9 100644
--- a/src/core/ChatMessageBuffer.js
+++ b/src/core/ChatMessageBuffer.js
@@ -90,6 +90,7 @@ class ChatMessageBuffer {
         'uid',
         'name',
         'flag',
+        'createdAt',
       ],
       where: { cid },
       limit,
@@ -101,16 +102,18 @@ class ChatMessageBuffer {
     while (i > 0) {
       i -= 1;
       const {
-        name,
         message,
-        flag,
         uid,
+        name,
+        flag,
+        createdAt,
       } = messagesModel[i];
       messages.push([
         name,
         message,
         flag,
         uid,
+        createdAt,
       ]);
     }
     return messages;