diff --git a/src/channel.cpp b/src/channel.cpp
index fa46d07..0f6ae75 100644
--- a/src/channel.cpp
+++ b/src/channel.cpp
@@ -90,7 +90,10 @@ struct message *NeoComm_get_next_message(const char *channel_name) {
 	*msg = {
 		/*.msg =*/ new_msg->msg.c_str(),
 		/*.sent =*/ new_msg->date,
-		// TODO: add the rest of these
+		/*.from =*/ {
+			/*.nick =*/ "DEFAULT", // TODO: Implement this!!!
+			/*.hash =*/ new_msg->from.to_c_str()
+		}
 	};
 
 	return msg;