diff --git a/lib/nntp/tiny/mbox.py b/lib/nntp/tiny/mbox.py
index 8ecca12..5aada48 100644
--- a/lib/nntp/tiny/mbox.py
+++ b/lib/nntp/tiny/mbox.py
@@ -86,12 +86,12 @@ class MBoxReader():
                     ret = self.message
 
                     self.message = Message()
-                    self.message.parse_line(line)
+                    self.message.read_line(line)
 
                     return ret
 
             if self.message:
-                self.message.parse_line(line)
+                self.message.read_line(line)
 
     def messages(self):
         while True:
diff --git a/lib/nntp/tiny/message.py b/lib/nntp/tiny/message.py
index 589e54f..146b579 100644
--- a/lib/nntp/tiny/message.py
+++ b/lib/nntp/tiny/message.py
@@ -81,11 +81,11 @@ class Message(DatabaseTable):
     def __from_row__(row):
         message = Message()
         message.id = row['id']
-        message.parse(row['content'])
+        message.read(row['content'])
 
         return message
 
-    def __values__(self):
+    def __values__(self) -> tuple:
         return (
             self.newsgroup_id,
             self.date(),
@@ -120,7 +120,7 @@ class Message(DatabaseTable):
     def is_first_line(self):
         return len(self.headers) == 1 and (self.body == '' or self.body is None)
 
-    def parse_line(self, line: str):
+    def read_line(self, line: str):
         if self.line is not None:
             self.content += self.line
 
@@ -147,11 +147,15 @@ class Message(DatabaseTable):
 
         self.line = line
 
+    def read(self, text: str):
+        for line in each_line(text):
+            self.read_line(line)
+
     @staticmethod
-    def parse(text: str):
+    def from_text(text: str):
         message = Message()
 
         for line in each_line(text):
-            message.parse_line(line)
+            message.read_line(line)
 
         return message