diff --git a/src/pretix/base/services/mail.py b/src/pretix/base/services/mail.py
index 362461e9ac..4076bb4e71 100644
--- a/src/pretix/base/services/mail.py
+++ b/src/pretix/base/services/mail.py
@@ -114,6 +114,16 @@ def mail(email: str, subject: str, template: Union[str, LazyI18nString],
subject = "[%s] %s" % (prefix, subject)
body_plain += "\r\n\r\n-- \r\n"
+
+ signature = str(event.settings.get('mail_text_signature'))
+ if signature:
+ signature = signature.format(event=event.name)
+ signature_md = signature.replace('\n', '
\n')
+ signature_md = bleach.linkify(bleach.clean(markdown.markdown(signature_md), tags=bleach.ALLOWED_TAGS + ['p', 'br']))
+ htmlctx['signature'] = signature_md
+ body_plain += signature
+ body_plain += "\r\n\r\n-- \r\n"
+
body_plain += _(
"You are receiving this email because you placed an order for {event}."
).format(event=event.name)
diff --git a/src/pretix/base/settings.py b/src/pretix/base/settings.py
index 3e6b0c5082..abb8d0f3bf 100644
--- a/src/pretix/base/settings.py
+++ b/src/pretix/base/settings.py
@@ -191,6 +191,10 @@ DEFAULTS = {
'default': settings.MAIL_FROM,
'type': str
},
+ 'mail_text_signature': {
+ 'type': LazyI18nString,
+ 'default': ""
+ },
'mail_text_resend_link': {
'type': LazyI18nString,
'default': LazyI18nString.from_gettext(ugettext_noop("""Hello,
diff --git a/src/pretix/base/templates/pretixbase/email/plainwrapper.html b/src/pretix/base/templates/pretixbase/email/plainwrapper.html
index 9e6ec4584e..2371b4bf40 100644
--- a/src/pretix/base/templates/pretixbase/email/plainwrapper.html
+++ b/src/pretix/base/templates/pretixbase/email/plainwrapper.html
@@ -148,6 +148,18 @@
{% endif %}
+ {% if signature %}
+