From 0dfbe1bca45be060377d1a0595ca8d4c323d75a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A0=20Casaj=C3=BAs?= <adria.casajus@proton.ch>
Date: Wed, 16 Feb 2022 18:52:35 +0100
Subject: [PATCH] Add footers to html and txt templates

---
 templates/emails/transactional/account-delete.txt   |  7 ++++---
 templates/emails/transactional/activation.txt       |  7 ++++---
 .../emails/transactional/alias-transferred.txt      |  7 ++++---
 .../cannot-create-alias-directory-disabled.txt      |  7 ++++---
 .../transactional/cannot-create-alias-directory.txt |  6 ++++--
 .../transactional/cannot-create-alias-domain.txt    |  7 ++++---
 templates/emails/transactional/change-email.txt     |  7 ++++---
 .../emails/transactional/code-activation.txt.jinja2 |  7 ++++---
 .../custom-domain-dns-issue.txt.jinja2              |  9 ++++-----
 .../emails/transactional/cycle-email.txt.jinja2     |  7 ++++---
 .../disable-mailbox-warning.txt.jinja2              | 13 ++++---------
 .../emails/transactional/disable-mailbox.txt.jinja2 | 13 ++++---------
 .../email-sent-from-reverse-alias.txt.jinja2        |  7 ++++---
 .../transactional/hibp-new-breaches.txt.jinja2      |  7 ++++---
 .../hotmail-complaint-reply-phase.txt.jinja2        |  7 ++++---
 .../transactional/hotmail-complaint.txt.jinja2      |  7 ++++---
 .../hotmail-transactional-complaint.txt.jinja2      |  7 ++++---
 .../emails/transactional/invalid-totp-login.txt     |  7 ++++---
 .../emails/transactional/mailbox-invalid.txt.jinja2 |  9 ++++-----
 .../transactional/manual-subscription-end.txt       |  9 ++++-----
 .../non-reverse-alias-reply-phase.txt.jinja2        |  9 ++++-----
 .../emails/transactional/reply-error.txt.jinja2     |  9 ++++-----
 .../transactional/reply-must-use-personal-email.txt |  9 ++++-----
 templates/emails/transactional/reset-password.txt   |  6 ++++--
 .../send-from-alias-from-unknown-sender.txt         |  6 ++++--
 .../emails/transactional/spam-email-reply-phase.txt |  6 ++++--
 templates/emails/transactional/spam-email.txt       |  6 ++++--
 templates/emails/transactional/spf-fail.txt         |  7 ++++---
 .../emails/transactional/subscription-cancel.txt    |  2 --
 templates/emails/transactional/subscription-end.txt |  7 ++++---
 templates/emails/transactional/test-email.txt       |  7 +++++--
 templates/emails/transactional/trial-end.txt.jinja2 |  7 ++++---
 .../unsubscribe-block-contact.txt.jinja2            |  7 ++++---
 .../transactional/unsubscribe-disable-alias.txt     |  7 ++++---
 .../emails/transactional/unsubscribe-newsletter.txt | 11 ++++-------
 .../emails/transactional/verify-mailbox-change.txt  |  7 ++++---
 templates/emails/transactional/verify-mailbox.txt   |  7 ++++---
 .../emails/transactional/yahoo-complaint.txt.jinja2 |  7 ++++---
 .../yahoo-transactional-complaint.txt.jinja2        |  4 +---
 39 files changed, 150 insertions(+), 138 deletions(-)

diff --git a/templates/emails/transactional/account-delete.txt b/templates/emails/transactional/account-delete.txt
index 42e8f510..e0bee588 100644
--- a/templates/emails/transactional/account-delete.txt
+++ b/templates/emails/transactional/account-delete.txt
@@ -1,6 +1,7 @@
+{% extends "base.txt.jinja2" %}
+
+{% block content %}
 Your SimpleLogin account has been deleted successfully.
 
 Thank you for having used SimpleLogin.
-
-Best,
-SimpleLogin team.
+{% endblock %}
diff --git a/templates/emails/transactional/activation.txt b/templates/emails/transactional/activation.txt
index ca683580..ecc3f907 100644
--- a/templates/emails/transactional/activation.txt
+++ b/templates/emails/transactional/activation.txt
@@ -1,6 +1,7 @@
+{% extends "base.txt.jinja2" %}
+
+{% block content %}
 Thank you for choosing SimpleLogin.
 
 To get started, please confirm that {{email}} is your email address using this link {{activation_link}} within 1 hour.
-
-Thanks,
-SimpleLogin Team.
+{% endblock %}
diff --git a/templates/emails/transactional/alias-transferred.txt b/templates/emails/transactional/alias-transferred.txt
index 8de029cf..9b42badb 100644
--- a/templates/emails/transactional/alias-transferred.txt
+++ b/templates/emails/transactional/alias-transferred.txt
@@ -1,6 +1,7 @@
+{% extends "base.txt.jinja2" %}
+
+{% block content %}
 {{ alias.email }} has been transferred.
 
 Your (previously) alias {{  alias.email }} has been received by another user.
-
-Best,
-SimpleLogin Team.
+{% endblock %}
diff --git a/templates/emails/transactional/cannot-create-alias-directory-disabled.txt b/templates/emails/transactional/cannot-create-alias-directory-disabled.txt
index 4702c6d7..86a3b61b 100644
--- a/templates/emails/transactional/cannot-create-alias-directory-disabled.txt
+++ b/templates/emails/transactional/cannot-create-alias-directory-disabled.txt
@@ -1,8 +1,9 @@
+{% extends "base.txt.jinja2" %}
+
+{% block content %}
 An email has been sent to the alias {{alias}} that would be created automatically as you own the directory {{directory}}.
 
 As the directory has the on-the-fly alias creation disabled, the alias isn't created.
 
 If you aren't aware of this alias, that probably means someone has discovered about your directory and is abusing it.
-
-Best,
-SimpleLogin team.
+{% endblock %}
diff --git a/templates/emails/transactional/cannot-create-alias-directory.txt b/templates/emails/transactional/cannot-create-alias-directory.txt
index 3d6eee0e..e6fb378f 100644
--- a/templates/emails/transactional/cannot-create-alias-directory.txt
+++ b/templates/emails/transactional/cannot-create-alias-directory.txt
@@ -1,7 +1,9 @@
+{% extends "base.txt.jinja2" %}
+
+{% block content %}
 An email has been sent to the alias {{alias}} that would be created automatically as you own the directory {{directory}}.
 
 However you have reached the alias limit in your current plan, this creation cannot happen.
 
 Please upgrade to premium plan in order to use this feature.
-Best,
-SimpleLogin team.
+{% endblock %}
diff --git a/templates/emails/transactional/cannot-create-alias-domain.txt b/templates/emails/transactional/cannot-create-alias-domain.txt
index ee7aac63..e88ed67e 100644
--- a/templates/emails/transactional/cannot-create-alias-domain.txt
+++ b/templates/emails/transactional/cannot-create-alias-domain.txt
@@ -1,8 +1,9 @@
+{% extends "base.txt.jinja2" %}
+
+{% block content %}
 An email has been sent to the alias {{alias}} that would be created automatically as you own the domain {{domain}}.
 
 However you have reached the alias limit in your current plan, this creation cannot happen.
 
 Please upgrade to premium plan in order to use this feature.
-
-Best,
-SimpleLogin team.
+{% endblock %}
diff --git a/templates/emails/transactional/change-email.txt b/templates/emails/transactional/change-email.txt
index 46ebe36e..3a6290f7 100644
--- a/templates/emails/transactional/change-email.txt
+++ b/templates/emails/transactional/change-email.txt
@@ -1,3 +1,6 @@
+{% extends "base.txt.jinja2" %}
+
+{% block content %}
 You have asked to change your email to {{new_email}}.
 
 Your current email is {{current_email}}.
@@ -5,6 +8,4 @@ Your current email is {{current_email}}.
 To confirm, please click on this link:
 
 {{link}}
-
-Thanks,
-SimpleLogin Team.
+{% endblock %}
\ No newline at end of file
diff --git a/templates/emails/transactional/code-activation.txt.jinja2 b/templates/emails/transactional/code-activation.txt.jinja2
index 990304db..7299ce45 100644
--- a/templates/emails/transactional/code-activation.txt.jinja2
+++ b/templates/emails/transactional/code-activation.txt.jinja2
@@ -1,3 +1,6 @@
+{% extends "base.txt.jinja2" %}
+
+{% block content %}
 Hi,
 
 Thank you for choosing SimpleLogin.
@@ -5,6 +8,4 @@ Thank you for choosing SimpleLogin.
 To get started, please activate your account by entering the following code into the application:
 
 {{code}}
-
-Thanks,
-SimpleLogin Team.
\ No newline at end of file
+{% endblock %}
diff --git a/templates/emails/transactional/custom-domain-dns-issue.txt.jinja2 b/templates/emails/transactional/custom-domain-dns-issue.txt.jinja2
index df30a432..46bd0fc1 100644
--- a/templates/emails/transactional/custom-domain-dns-issue.txt.jinja2
+++ b/templates/emails/transactional/custom-domain-dns-issue.txt.jinja2
@@ -1,11 +1,10 @@
+{% extends "base.txt.jinja2" %}
+
+{% block content %}
 We have detected that your domain {{ custom_domain.domain }} doesn't have the DNS MX records correctly set up.
 
 Please re-run the MX check on {{ domain_dns_url }} and update them if needed.
 
 Without the MX records correctly set up, emails sent to the {{ custom_domain.domain }}'s aliases
   aren't properly and reliably handled.
-
-Feel free reply to this email if you have any question.
-
-Best,
-SimpleLogin team.
\ No newline at end of file
+{% endblock %}
diff --git a/templates/emails/transactional/cycle-email.txt.jinja2 b/templates/emails/transactional/cycle-email.txt.jinja2
index 27c526fa..8da44102 100644
--- a/templates/emails/transactional/cycle-email.txt.jinja2
+++ b/templates/emails/transactional/cycle-email.txt.jinja2
@@ -1,3 +1,6 @@
+{% extends "base.txt.jinja2" %}
+
+{% block content %}
 An email was sent to your alias {{ alias.email }} from its own mailbox {{ from_addr }}.
 
 SimpleLogin doesn't send this email back to your mailbox as it would be refused or hidden anyway by your email service.
@@ -10,6 +13,4 @@ You can view this email here:
 The email is automatically deleted in 7 days.
 
 Please let us know if you have any question.
-
-Best,
-SimpleLogin team.
\ No newline at end of file
+{% endblock %}
diff --git a/templates/emails/transactional/disable-mailbox-warning.txt.jinja2 b/templates/emails/transactional/disable-mailbox-warning.txt.jinja2
index 2e31484a..6c8ef847 100644
--- a/templates/emails/transactional/disable-mailbox-warning.txt.jinja2
+++ b/templates/emails/transactional/disable-mailbox-warning.txt.jinja2
@@ -1,15 +1,10 @@
+{% extends "base.txt.jinja2" %}
+
+{% block content %}
 Issues with {{ mailbox.email }}.
 
 We have detected that your mailbox cannot reliably receive emails from SimpleLogin for a consecutive period of time.
 The mailbox will be disabled in 5 days if the problem isn't solved by then.
 
 Please note that a mailbox can't be a disposable or forwarding email address.
-
-If you have any question, you can reach out to us by replying to this email.
-
-Best,
-SimpleLogin Team.
-
-
-
-
+{% endblock %}
diff --git a/templates/emails/transactional/disable-mailbox.txt.jinja2 b/templates/emails/transactional/disable-mailbox.txt.jinja2
index 29112852..22cb1cf1 100644
--- a/templates/emails/transactional/disable-mailbox.txt.jinja2
+++ b/templates/emails/transactional/disable-mailbox.txt.jinja2
@@ -1,3 +1,6 @@
+{% extends "base.txt.jinja2" %}
+
+{% block content %}
 {{ mailbox.email }} is disabled.
 
 We have detected that your mailbox cannot reliably receive emails from SimpleLogin for a consecutive period of time.
@@ -5,12 +8,4 @@ The mailbox has been therefore disabled.
 You can re-enable it by going to the mailbox page.
 
 Please note that a mailbox can't be a disposable or forwarding email address.
-
-If you have any question, you can reach out to us by replying to this email.
-
-Best,
-SimpleLogin Team.
-
-
-
-
+{% endblock %}
diff --git a/templates/emails/transactional/email-sent-from-reverse-alias.txt.jinja2 b/templates/emails/transactional/email-sent-from-reverse-alias.txt.jinja2
index 7b353b43..3c432ae8 100644
--- a/templates/emails/transactional/email-sent-from-reverse-alias.txt.jinja2
+++ b/templates/emails/transactional/email-sent-from-reverse-alias.txt.jinja2
@@ -1,3 +1,6 @@
+{% extends "base.txt.jinja2" %}
+
+{% block content %}
 We have detected that SimpleLogin is probably used along with another forwarding email service.
 
 Please note that the following use cases aren't supported by SimpleLogin:
@@ -10,6 +13,4 @@ As different email forwarding systems are usually incompatible, using several fo
 with email delivery.
 
 Please let us know if you have any question.
-
-Best,
-SimpleLogin team.
\ No newline at end of file
+{% endblock %}
diff --git a/templates/emails/transactional/hibp-new-breaches.txt.jinja2 b/templates/emails/transactional/hibp-new-breaches.txt.jinja2
index e78ffc1a..fc001c44 100644
--- a/templates/emails/transactional/hibp-new-breaches.txt.jinja2
+++ b/templates/emails/transactional/hibp-new-breaches.txt.jinja2
@@ -1,3 +1,6 @@
+{% extends "base.txt.jinja2" %}
+
+{% block content %}
 {{ breached_aliases|count }} of your aliases are found in data breaches.
 
 {% for alias in breached_aliases[:10] %}
@@ -18,6 +21,4 @@
 {%- endif %}
 
 For more information, please check https://haveibeenpwned.com/.
-
-Best,
-SimpleLogin Team.
+{% endblock %}
diff --git a/templates/emails/transactional/hotmail-complaint-reply-phase.txt.jinja2 b/templates/emails/transactional/hotmail-complaint-reply-phase.txt.jinja2
index 860b89dd..94aa6a63 100644
--- a/templates/emails/transactional/hotmail-complaint-reply-phase.txt.jinja2
+++ b/templates/emails/transactional/hotmail-complaint-reply-phase.txt.jinja2
@@ -1,3 +1,6 @@
+{% extends "base.txt.jinja2" %}
+
+{% block content %}
 Hi,
 
 This is SimpleLogin team.
@@ -9,6 +12,4 @@ Please note that sending non-solicited from a SimpleLogin alias infringes our te
 If somehow the recipient's Hotmail considers a forwarded email as Spam, it helps us a lot if you can ask them to move the email out of their Spam folder.
 
 Looking to hear back from you.
-
-Best,
-SimpleLogin Team.
\ No newline at end of file
+{% endblock %}
diff --git a/templates/emails/transactional/hotmail-complaint.txt.jinja2 b/templates/emails/transactional/hotmail-complaint.txt.jinja2
index b74a933d..7862561c 100644
--- a/templates/emails/transactional/hotmail-complaint.txt.jinja2
+++ b/templates/emails/transactional/hotmail-complaint.txt.jinja2
@@ -1,3 +1,6 @@
+{% extends "base.txt.jinja2" %}
+
+{% block content %}
 Hi,
 
 This is SimpleLogin team.
@@ -14,6 +17,4 @@ If somehow Hotmail considers a forwarded email as Spam, it will help us if you c
 You can also set up a filter to avoid this from happening in the future using this guide at https://simplelogin.io/help/
 
 Looking to hear back from you.
-
-Best,
-SimpleLogin Team.
\ No newline at end of file
+{% endblock %}
diff --git a/templates/emails/transactional/hotmail-transactional-complaint.txt.jinja2 b/templates/emails/transactional/hotmail-transactional-complaint.txt.jinja2
index dcb3bc59..7d936849 100644
--- a/templates/emails/transactional/hotmail-transactional-complaint.txt.jinja2
+++ b/templates/emails/transactional/hotmail-transactional-complaint.txt.jinja2
@@ -1,3 +1,6 @@
+{% extends "base.txt.jinja2" %}
+
+{% block content %}
 Hi,
 
 This is SimpleLogin team.
@@ -17,6 +20,4 @@ If somehow Hotmail considers a forwarded email as Spam, it helps us if you can m
 Please don't put our emails into the Spam folder. This can end up in your account being disabled on SimpleLogin.
 
 Looking to hear back from you.
-
-Best,
-SimpleLogin Team.
\ No newline at end of file
+{% endblock %}
diff --git a/templates/emails/transactional/invalid-totp-login.txt b/templates/emails/transactional/invalid-totp-login.txt
index 257702ea..9b161d96 100644
--- a/templates/emails/transactional/invalid-totp-login.txt
+++ b/templates/emails/transactional/invalid-totp-login.txt
@@ -1,8 +1,9 @@
+{% extends "base.txt.jinja2" %}
+
+{% block content %}
 There has been an unsuccessful attempt to login to your SimpleLogin account.
 An invalid {{type}} code was provided but the email and password were correct.
 
 This request has been blocked. However, if this was not you, please change your password immediately.
 {{URL}}/dashboard/setting#change_password
-
-Thanks,
-SimpleLogin Team.
+{% endblock %}
diff --git a/templates/emails/transactional/mailbox-invalid.txt.jinja2 b/templates/emails/transactional/mailbox-invalid.txt.jinja2
index c9c486dd..739ba7e4 100644
--- a/templates/emails/transactional/mailbox-invalid.txt.jinja2
+++ b/templates/emails/transactional/mailbox-invalid.txt.jinja2
@@ -1,3 +1,6 @@
+{% extends "base.txt.jinja2" %}
+
+{% block content %}
 Your mailbox {{ mailbox.email }} and alias {{alias.email}} cannot have the same domain.
 
 The alias domain should point to SimpleLogin servers so emails sent to it are forwarded by SimpleLogin.
@@ -8,8 +11,4 @@ The mailbox domain should be your "final" email address that can receive emails
 Please either
 - update the mailbox to a final email address on {{ mailbox_url }}
 - remove {{alias.email}} domain from your custom domains
-
-Feel free reply to this email if you have any question.
-
-Best,
-SimpleLogin team.
\ No newline at end of file
+{% endblock %}
diff --git a/templates/emails/transactional/manual-subscription-end.txt b/templates/emails/transactional/manual-subscription-end.txt
index d35fbf7b..13bb1c9d 100644
--- a/templates/emails/transactional/manual-subscription-end.txt
+++ b/templates/emails/transactional/manual-subscription-end.txt
@@ -1,6 +1,5 @@
+{% extends "base.txt.jinja2" %}
+
+{% block content %}
 Your subscription will end on {{ manual_sub.end_at.format("YYYY-MM-DD") }}
-
-Please contact us at hi@simplelogin.io to renew your subscription.
-
-Best,
-SimpleLogin Team.
+{% endblock %}
diff --git a/templates/emails/transactional/non-reverse-alias-reply-phase.txt.jinja2 b/templates/emails/transactional/non-reverse-alias-reply-phase.txt.jinja2
index 1a578afe..0fd8283c 100644
--- a/templates/emails/transactional/non-reverse-alias-reply-phase.txt.jinja2
+++ b/templates/emails/transactional/non-reverse-alias-reply-phase.txt.jinja2
@@ -1,3 +1,6 @@
+{% extends "base.txt.jinja2" %}
+
+{% block content %}
 Hi
 
 Your email sent to {{ destination }} from {{ alias }} ({{ subject }}) contains an address which isn't a reverse-alias in the To: or Cc: field.
@@ -8,8 +11,4 @@ Please create a reverse alias for each recipient to make sure your mailbox stays
 
 More info about reverse-alias can be found on https://simplelogin.io/docs/getting-started/reverse-alias/
 and how to send an email from your alias on https://simplelogin.io/docs/getting-started/send-email/
-
-Please let us know if you have any question.
-
-Best,
-SimpleLogin team.
\ No newline at end of file
+{% endblock %}
diff --git a/templates/emails/transactional/reply-error.txt.jinja2 b/templates/emails/transactional/reply-error.txt.jinja2
index e4be4162..917a9996 100644
--- a/templates/emails/transactional/reply-error.txt.jinja2
+++ b/templates/emails/transactional/reply-error.txt.jinja2
@@ -1,3 +1,6 @@
+{% extends "base.txt.jinja2" %}
+
+{% block content %}
 Hi
 
 Your email cannot be sent to {{contact.email}} from your alias {{alias.email}}.
@@ -7,8 +10,4 @@ Can you please verify {{contact.email}} is a valid address?
 Usually this is because the DNS record of {{contact_domain}} does not exist.
 
 You can check its DNS record on any DNS checker websites, for example https://mxtoolbox.com/SuperTool.aspx
-
-Please let us know if you have any question.
-
-Best,
-SimpleLogin team.
\ No newline at end of file
+{% endblock %}
diff --git a/templates/emails/transactional/reply-must-use-personal-email.txt b/templates/emails/transactional/reply-must-use-personal-email.txt
index 85e804c5..f1f0fab8 100644
--- a/templates/emails/transactional/reply-must-use-personal-email.txt
+++ b/templates/emails/transactional/reply-must-use-personal-email.txt
@@ -1,3 +1,6 @@
+{% extends "base.txt.jinja2" %}
+
+{% block content %}
 We have recorded an attempt to send an email from your alias {{ alias.email }} using {{ sender }}.
 
 Please note that sending from this alias only works from alias's owning mailboxes, that are
@@ -5,8 +8,4 @@ Please note that sending from this alias only works from alias's owning mailboxe
 
 This is to protect against "email spoofing", i.e. someone else sending emails from your mailbox.
 If {{ sender }} can indeed send emails from your alias, you can add it to the allow list on {{authorize_address_link}}
-If you think this is a wrong alert, please let us know by replying to this email.
-
-
-Best,
-SimpleLogin team.
+{% endblock %}
diff --git a/templates/emails/transactional/reset-password.txt b/templates/emails/transactional/reset-password.txt
index 27a1eef0..aa2f1690 100644
--- a/templates/emails/transactional/reset-password.txt
+++ b/templates/emails/transactional/reset-password.txt
@@ -1,6 +1,8 @@
+{% extends "base.txt.jinja2" %}
+
+{% block content %}
 To reset or change your password, please click on this link:
 
 {{reset_password_link}}
 
-Thanks,
-SimpleLogin Team.
+{% endblock %}
diff --git a/templates/emails/transactional/send-from-alias-from-unknown-sender.txt b/templates/emails/transactional/send-from-alias-from-unknown-sender.txt
index 93181064..1a412c65 100644
--- a/templates/emails/transactional/send-from-alias-from-unknown-sender.txt
+++ b/templates/emails/transactional/send-from-alias-from-unknown-sender.txt
@@ -1,3 +1,6 @@
+{% extends "base.txt.jinja2" %}
+
+{% block content %}
 Hi,
 
 This is an automated email from SimpleLogin.
@@ -9,5 +12,4 @@ This user has been also informed of this incident.
 
 If you have any question, you can contact us by replying to this email or consult our website at {{LANDING_PAGE_URL}}.
 
-Regards,
-SimpleLogin team.
+{% endblock %}
diff --git a/templates/emails/transactional/spam-email-reply-phase.txt b/templates/emails/transactional/spam-email-reply-phase.txt
index df0d2710..54d47f84 100644
--- a/templates/emails/transactional/spam-email-reply-phase.txt
+++ b/templates/emails/transactional/spam-email-reply-phase.txt
@@ -1,3 +1,6 @@
+{% extends "base.txt.jinja2" %}
+
+{% block content %}
 An email sent from your alias {{alias.email}} to {{website_email}} is detected as spam by our Spam Detection Engine (SpamAssassin).
 
 In most of the cases, the email will be refused by your contact.
@@ -9,5 +12,4 @@ The email is automatically deleted in 7 days.
 
 Please let us know if you have any question by replying to this email.
 
-Best,
-SimpleLogin team.
\ No newline at end of file
+{% endblock %}
diff --git a/templates/emails/transactional/spam-email.txt b/templates/emails/transactional/spam-email.txt
index 2d883b16..c58a6f1b 100644
--- a/templates/emails/transactional/spam-email.txt
+++ b/templates/emails/transactional/spam-email.txt
@@ -1,3 +1,6 @@
+{% extends "base.txt.jinja2" %}
+
+{% block content %}
 An email sent to your alias {{alias.email}} from {{website_email}} is detected as spam by our Spam Detection Engine (SpamAssassin).
 
 In most of the cases, the email will be refused by your email provider.
@@ -13,5 +16,4 @@ Your alias {{alias}} is probably in the hands of a spammer now. In this case, yo
 
 Please let us know if you have any question by replying to this email.
 
-Best,
-SimpleLogin team.
\ No newline at end of file
+{% endblock %}
diff --git a/templates/emails/transactional/spf-fail.txt b/templates/emails/transactional/spf-fail.txt
index 7fbef21e..b2386fad 100644
--- a/templates/emails/transactional/spf-fail.txt
+++ b/templates/emails/transactional/spf-fail.txt
@@ -1,3 +1,6 @@
+{% extends "base.txt.jinja2" %}
+
+{% block content %}
 We have recorded an attempt to send the following email from your alias {{ alias }} from an unknown IP address {{ ip }}.
 
 - From: {{alias}}
@@ -11,6 +14,4 @@ Emails sent from an IP address that is unknown by your email service are refused
 However you can turn off this option by going to {{mailbox_url}}.
 
 Please only turn this protection off this if you know what you're doing :).
-
-Best,
-SimpleLogin team.
+{% endblock %}
diff --git a/templates/emails/transactional/subscription-cancel.txt b/templates/emails/transactional/subscription-cancel.txt
index 0c28cb16..b402740c 100644
--- a/templates/emails/transactional/subscription-cancel.txt
+++ b/templates/emails/transactional/subscription-cancel.txt
@@ -12,5 +12,3 @@ Best,
 Son.
 
 -----------------------------------------
-Son NK - SimpleLogin founder.
-https://simplelogin.io
\ No newline at end of file
diff --git a/templates/emails/transactional/subscription-end.txt b/templates/emails/transactional/subscription-end.txt
index 4df1d2f6..0d72abf3 100644
--- a/templates/emails/transactional/subscription-end.txt
+++ b/templates/emails/transactional/subscription-end.txt
@@ -1,3 +1,6 @@
+{% extends "base.txt.jinja2" %}
+
+{% block content %}
 Hi
 
 Your subscription will end on {{ next_bill_date }}.
@@ -11,6 +14,4 @@ When the subscription ends:
 - You cannot add new domain or directory.
 
 You can upgrade today to continue using all these Premium features (and much more coming).
-
-Best,
-SimpleLogin Team.
+{% endblock %}
diff --git a/templates/emails/transactional/test-email.txt b/templates/emails/transactional/test-email.txt
index dc5339fa..998ae3be 100644
--- a/templates/emails/transactional/test-email.txt
+++ b/templates/emails/transactional/test-email.txt
@@ -1,8 +1,11 @@
+{% extends "base.txt.jinja2" %}
+
+{% block content %}
 Hi {{name}}
 
 This is a test to make sure that you receive emails sent to your alias {{alias}}.
 
 If you have any questions, feel free to reply to this email.
 
-Have a nice day!
-SimpleLogin Team.
+{% endblock %}
+
diff --git a/templates/emails/transactional/trial-end.txt.jinja2 b/templates/emails/transactional/trial-end.txt.jinja2
index da89a2c1..789a33c3 100644
--- a/templates/emails/transactional/trial-end.txt.jinja2
+++ b/templates/emails/transactional/trial-end.txt.jinja2
@@ -1,3 +1,6 @@
+{% extends "base.txt.jinja2" %}
+
+{% block content %}
 Your trial will end {{ user.trial_end.humanize() }}.
 
 When the trial ends:
@@ -11,6 +14,4 @@ When the trial ends:
 You can upgrade today to continue using all these Premium features (and much more coming).
 
 Let me know if you need to extend your trial period.
-
-Best,
-SimpleLogin Team.
+{% endblock %}
diff --git a/templates/emails/transactional/unsubscribe-block-contact.txt.jinja2 b/templates/emails/transactional/unsubscribe-block-contact.txt.jinja2
index b3a76ed3..ab0fd7c9 100644
--- a/templates/emails/transactional/unsubscribe-block-contact.txt.jinja2
+++ b/templates/emails/transactional/unsubscribe-block-contact.txt.jinja2
@@ -1,3 +1,6 @@
+{% extends "base.txt.jinja2" %}
+
+{% block content %}
 Hi
 
 {{ contact.website_email }} can no longer send emails to {{ alias.email }}
@@ -11,6 +14,4 @@ If this is a mistake, you can unblock {{ contact.website_email }} on
 {{ unblock_contact_url }}
 
 Please let us know if you have any question.
-
-Best,
-SimpleLogin team.
+{% endblock %}
diff --git a/templates/emails/transactional/unsubscribe-disable-alias.txt b/templates/emails/transactional/unsubscribe-disable-alias.txt
index 1acf152f..98579c3e 100644
--- a/templates/emails/transactional/unsubscribe-disable-alias.txt
+++ b/templates/emails/transactional/unsubscribe-disable-alias.txt
@@ -1,3 +1,6 @@
+{% extends "base.txt.jinja2" %}
+
+{% block content %}
 Hi
 
 Your alias {{alias}} has been disabled successfully.
@@ -11,6 +14,4 @@ If this is a mistake, you can re-enable the alias on the dashboard via
 {{ enable_alias_url }}
 
 Please let us know if you have any question.
-
-Best,
-SimpleLogin team.
+{% endblock %}
diff --git a/templates/emails/transactional/unsubscribe-newsletter.txt b/templates/emails/transactional/unsubscribe-newsletter.txt
index ed8db311..32628e07 100644
--- a/templates/emails/transactional/unsubscribe-newsletter.txt
+++ b/templates/emails/transactional/unsubscribe-newsletter.txt
@@ -1,12 +1,9 @@
+{% extends "base.txt.jinja2" %}
+
+{% block content %}
 You have been unsubscribed from SimpleLogin newsletter.
 
 We would love to know why do you want to unsubscribe from our communication.
 
 Please let us know by replying to this email.
-
-Best,
-SimpleLogin Team.
-
-
-
-
+{% endblock %}
diff --git a/templates/emails/transactional/verify-mailbox-change.txt b/templates/emails/transactional/verify-mailbox-change.txt
index 175e6a93..d4d1daf5 100644
--- a/templates/emails/transactional/verify-mailbox-change.txt
+++ b/templates/emails/transactional/verify-mailbox-change.txt
@@ -1,3 +1,6 @@
+{% extends "base.txt.jinja2" %}
+
+{% block content %}
 Hi
 
 You recently requested to change mailbox {{mailbox_email}} to {{mailbox_new_email}}
@@ -5,6 +8,4 @@ You recently requested to change mailbox {{mailbox_email}} to {{mailbox_new_emai
 To confirm, please click on this link:
 
 {{link}}
-
-Regards,
-SimpleLogin Team.
+{% endblock %}
diff --git a/templates/emails/transactional/verify-mailbox.txt b/templates/emails/transactional/verify-mailbox.txt
index e06965dd..34eefb8d 100644
--- a/templates/emails/transactional/verify-mailbox.txt
+++ b/templates/emails/transactional/verify-mailbox.txt
@@ -1,3 +1,6 @@
+{% extends "base.txt.jinja2" %}
+
+{% block content %}
 Hi
 
 You have added {{mailbox_email}} as an additional mailbox.
@@ -5,6 +8,4 @@ You have added {{mailbox_email}} as an additional mailbox.
 To confirm, please click on this link:
 
 {{link}}
-
-Regards,
-SimpleLogin Team.
+{% endblock %}
diff --git a/templates/emails/transactional/yahoo-complaint.txt.jinja2 b/templates/emails/transactional/yahoo-complaint.txt.jinja2
index 9c2a5127..74fab1b5 100644
--- a/templates/emails/transactional/yahoo-complaint.txt.jinja2
+++ b/templates/emails/transactional/yahoo-complaint.txt.jinja2
@@ -1,3 +1,6 @@
+{% extends "base.txt.jinja2" %}
+
+{% block content %}
 Hi,
 
 This is SimpleLogin team.
@@ -12,6 +15,4 @@ If that’s the case, please disable the alias instead if you don't want to rece
 If SimpleLogin isn’t useful for you, please know that you can simply delete your account on the Settings page.
 
 Looking to hear back from you.
-
-Best,
-SimpleLogin Team.
\ No newline at end of file
+{% endblock %}
diff --git a/templates/emails/transactional/yahoo-transactional-complaint.txt.jinja2 b/templates/emails/transactional/yahoo-transactional-complaint.txt.jinja2
index 08b264e0..46b18b31 100644
--- a/templates/emails/transactional/yahoo-transactional-complaint.txt.jinja2
+++ b/templates/emails/transactional/yahoo-transactional-complaint.txt.jinja2
@@ -18,6 +18,4 @@ If somehow Yahoo considers a forwarded email as Spam, it helps us if you can mov
   https://simplelogin.io/docs/getting-started/troubleshooting/
 
 Please don't put our emails into the Spam folder. This can end up in your account being disabled on SimpleLogin.
-
-Looking to hear back from you.
-{% endblock %}
\ No newline at end of file
+{% endblock %}