diff --git a/src/pretix/base/services/mail.py b/src/pretix/base/services/mail.py
index e3c71f8cb..3b6a1149c 100644
--- a/src/pretix/base/services/mail.py
+++ b/src/pretix/base/services/mail.py
@@ -63,6 +63,8 @@ def mail(email: str, subject: str, template: str,
     if email == INVALID_ADDRESS:
         return
 
+    headers = headers or {}
+
     with language(locale):
         if isinstance(context, dict) and order:
             try:
@@ -103,6 +105,9 @@ def mail(email: str, subject: str, template: str,
             htmlctx['event'] = event
             htmlctx['color'] = event.settings.primary_color
 
+            if event.settings.mail_from == settings.DEFAULT_FROM_EMAIL and event.settings.contact_mail:
+                headers['Reply-To'] = event.settings.contact_mail
+
             prefix = event.settings.get('mail_prefix')
             if prefix:
                 subject = "[%s] %s" % (prefix, subject)