diff --git a/main.js b/main.js
index 67ad3f6..2d3ec97 100644
--- a/main.js
+++ b/main.js
@@ -101,7 +101,10 @@ getrows_sqlite3("chats", function(data)
 getrows_sqlite3("messages", function(data)
 {
   // Push all the messages to the chats
-  chats[data.channel].messages.push(data.message);
+  chats[data.channel].messages.push({
+    message: data.message,
+    from: data.from
+  });
 });
 
 console.log("Server ready.");