diff --git a/email_handler.py b/email_handler.py index 3f462e1c..6f5c88fd 100644 --- a/email_handler.py +++ b/email_handler.py @@ -614,6 +614,7 @@ def handle_bounce( alias=alias, website_from=forward_email.website_from, website_email=forward_email.website_email, + refused_email_url=refused_email_url, ), render( "transactional/automatic-disable-alias.html", @@ -621,8 +622,10 @@ def handle_bounce( alias=alias, website_from=forward_email.website_from, website_email=forward_email.website_email, + refused_email_url=refused_email_url, ), - bounced_email=msg, + # cannot include bounce email as it can contain spammy text + # bounced_email=msg, ) diff --git a/templates/emails/transactional/automatic-disable-alias.html b/templates/emails/transactional/automatic-disable-alias.html index d3ff7a50..87140c40 100644 --- a/templates/emails/transactional/automatic-disable-alias.html +++ b/templates/emails/transactional/automatic-disable-alias.html @@ -5,8 +5,9 @@ {{ render_text("There are at least 2 emails sent to your alias " + alias + " from " + website_email + " that have been refused (or bounced) by your email provider.") }} - {{ render_text("This is usually due to the email being considered as spam by your email provider. - The email is included at the end of this message so you can take a look at its content.") }} + {{ render_text("This is usually due to the email being considered as spam by your email provider.") }} + + {{ render_button("View the refused email", refused_email_url) }} {{ render_text('As security measure, we have disabled the alias ' + alias) }} diff --git a/templates/emails/transactional/automatic-disable-alias.txt b/templates/emails/transactional/automatic-disable-alias.txt index 5de9afc7..639da5c1 100644 --- a/templates/emails/transactional/automatic-disable-alias.txt +++ b/templates/emails/transactional/automatic-disable-alias.txt @@ -3,7 +3,9 @@ Hi {{name}} There are at least 2 emails sent to your alias {{alias}} from {{website_from}} that have been refused (or bounced) by your email provider. This is usually due to the email being considered as spam by your email provider. -The email is included at the end of this message so you can take a look at its content. +You can view this email here: +{{ refused_email_url }} + As security measure, we have disabled the alias {{alias}}.