diff --git a/src/calibre/utils/smtp.py b/src/calibre/utils/smtp.py
index 93419e956d..7138b85c6e 100644
--- a/src/calibre/utils/smtp.py
+++ b/src/calibre/utils/smtp.py
@@ -63,7 +63,7 @@ def create_mail(from_, to, subject, text=None, attachment_data=None,
     outer['To'] = to
     outer['From'] = from_
     outer['Date'] = formatdate(localtime=True)
-    outer['Message-Id'] = "<{}@{}>".format(uuid.uuid4(), get_msgid_domain())
+    outer['Message-Id'] = "<{}@{}>".format(uuid.uuid4(), get_msgid_domain(from_))
     outer.preamble = 'You will not see this in a MIME-aware mail reader.\n'
 
     if text is not None: