diff --git a/lib/nntp/tiny/message.py b/lib/nntp/tiny/message.py
index e6defd7..2c95d06 100644
--- a/lib/nntp/tiny/message.py
+++ b/lib/nntp/tiny/message.py
@@ -83,13 +83,6 @@ class Message(DatabaseTable):
     @staticmethod
     def __from_row__(row):
         message = Message()
-        message._headers     = dict()
-        message.id           = row['id']
-        message.newsgroup_id = row['newsgroup_id']
-        message.created_on   = row['created_on']
-        message.message_id   = row['message_id']
-        message.parent_id    = row['parent_id']
-        message.sender       = row['sender']
 
         #
         # Defer parsing the message content until a specific header not already
@@ -97,6 +90,13 @@ class Message(DatabaseTable):
         #
         message.content = row['content']
 
+        message.id           = row['id']
+        message.newsgroup_id = row['newsgroup_id']
+        message.created_on   = row['created_on']
+        message.message_id   = row['message_id']
+        message.parent_id    = row['parent_id']
+        message.sender       = row['sender']
+
         return message
 
     def __values__(self) -> tuple: