diff --git a/lib/nntp/tiny/message.py b/lib/nntp/tiny/message.py
index 6cc8d08..6f21052 100644
--- a/lib/nntp/tiny/message.py
+++ b/lib/nntp/tiny/message.py
@@ -340,6 +340,9 @@ class Message(DatabaseTable):
         for line in each_line(text):
             self.readline(line)
 
+    def finish(self):
+        self.readline('')
+
     def message_id_assign(self):
         sender = self.sender
 
diff --git a/lib/nntp/tiny/session.py b/lib/nntp/tiny/session.py
index 20ec1c1..9147dbd 100644
--- a/lib/nntp/tiny/session.py
+++ b/lib/nntp/tiny/session.py
@@ -782,6 +782,8 @@ class Session():
             stripped = line.rstrip()
 
             if stripped == '.':
+                message.finish()
+
                 if self._save_message(message):
                     return self.respond(code_received)
                 else: