diff --git a/RAAspotter.py b/RAAspotter.py
index 37c24c5d43064a603bd091bfba91b488e7515c45..e9e06b9a052f9bfdbe8219135ca4efc31d36b410 100644
--- a/RAAspotter.py
+++ b/RAAspotter.py
@@ -22,7 +22,7 @@ from stem.control import Controller
 
 import hashlib
 import smtplib
-from email.message import EmailMessage
+import email
 
 from mastodon import Mastodon
 
@@ -387,11 +387,13 @@ class RAAspotter:
   def mailer(self):
     if self.smtp_configured and self.found:
       try:
-        message = EmailMessage()
+        message = email.message.EmailMessage()
         message.set_content(open(self.output_file_path).read())
 
         message['Subject'] = self.email_object
         message['From'] = self.email_from
+        message['Message-ID'] = email.utils.make_msgid(domain=self.email_from.split('@')[-1])
+        message['Date'] = email.utils.formatdate()
 
         context = ssl.create_default_context()