diff --git a/management/univention-self-service/debian/changelog b/management/univention-self-service/debian/changelog
index 3781363fa2..ff258f30cb 100644
--- a/management/univention-self-service/debian/changelog
+++ b/management/univention-self-service/debian/changelog
@@ -1,3 +1,9 @@
+univention-self-service (5.0.11-3) unstable; urgency=medium
+
+  * Bug #57512: add Message-ID to emails sent by the Self Service
+
+ -- Christian Castens <castens@univention.de>  Mon, 03 Feb 2025 14:22:38 +0200
+
 univention-self-service (5.0.11-2) unstable; urgency=medium
 
   [ Arvid ]
diff --git a/management/univention-self-service/umc/python/passwordreset/sending/send_email.py b/management/univention-self-service/umc/python/passwordreset/sending/send_email.py
index 5f1579c8f7..fa1f3d6218 100644
--- a/management/univention-self-service/umc/python/passwordreset/sending/send_email.py
+++ b/management/univention-self-service/umc/python/passwordreset/sending/send_email.py
@@ -52,7 +52,7 @@ import email.charset
 import os.path
 import smtplib
 from email.mime.nonmultipart import MIMENonMultipart
-from email.utils import formatdate
+from email.utils import formatdate, make_msgid
 
 from six.moves.urllib_parse import quote
 
@@ -126,6 +126,7 @@ class SendEmail(UniventionSelfServiceTokenEmitter):
         msg["Date"] = formatdate(localtime=True)
         msg["From"] = self.ucr.get("umc/self-service/passwordreset/email/sender_address", f"Password Reset Service <noreply@{fqdn}>")
         msg["To"] = self.data["address"]
+        msg["Message-ID"] = make_msgid()
         msg.set_payload(txt, charset=cs)
 
         smtp = smtplib.SMTP(self.server)