diff --git a/lib/nntp/tiny/message.py b/lib/nntp/tiny/message.py
index 882b49c..c23fc40 100644
--- a/lib/nntp/tiny/message.py
+++ b/lib/nntp/tiny/message.py
@@ -373,7 +373,11 @@ class Message(DatabaseTable):
         if self.sender is None:
             return False
 
-        if self.message_id is None:
+        message_id = self.message_id
+
+        if message_id is None:
+            return False
+        elif message_id[0] != '<' or message_id[-1] != '>':
             return False
 
         if self.subject is None: