diff --git a/server.py b/server.py
index 557ce3cb9a707089f2cba7cf6bd014e4eebc4b3d..389d0499e3105dbf01eec951318ca99faefa8edc 100755
--- a/server.py
+++ b/server.py
@@ -1296,8 +1296,8 @@ try:
         if signum == 0:
             check_and_send_reminders()
 except ImportError as exc:
+    print("uwsgi not found, falling back to apscheduler for cron-like tasks")
     def make_scheduler():
-        print("uwsgi not found, falling back to apscheduler for cron-like tasks")
         scheduler = BackgroundScheduler()
         scheduler.start()
         scheduler.add_job(
diff --git a/utils.py b/utils.py
index 88bc0ed0aeff0e707b3a0022580373891cb67bff..d68b72cf4470fb3b25660f7b12548328a5bd08cb 100644
--- a/utils.py
+++ b/utils.py
@@ -12,6 +12,8 @@ from datetime import datetime, date, timedelta
 import requests
 from io import BytesIO
 import ipaddress
+from socket import getfqdn
+from uuid import uuid4
 
 import config
 
@@ -81,6 +83,7 @@ class MailManager:
         msg["From"] = self.from_addr
         msg["To"] = to_addr
         msg["Subject"] = subject
+        msg["Message-ID"] = "{}@{}".format(uuid4(), getfqdn())
         msg.attach(MIMEText(content, _charset="utf-8"))
         if appendix is not None:
             for name, file_like in appendix: