diff --git a/lib/nntp/tiny/mbox.py b/lib/nntp/tiny/mbox.py
index 99a2d8a..d94e495 100644
--- a/lib/nntp/tiny/mbox.py
+++ b/lib/nntp/tiny/mbox.py
@@ -1,6 +1,7 @@
 import re
 import enum
-import dateparser
+
+from dateparser.search import search_dates
 
 class MBoxReaderError(Exception):
     pass
@@ -100,10 +101,10 @@ class MBoxMessage():
         self.line = line
 
     def header(self, key: str):
-        return self.headers[key.lower()]
+        return self.headers.get(key.lower())
 
     def date(self):
-        return dateparser.parse(self.headers['date'])
+        return search_dates(self.headers['date'])[0][1]
 
     def is_first_line(self):
         return len(self.headers) == 1 and (self.body == '' or self.body is None)