diff --git a/app/dashboard/views/mailbox.py b/app/dashboard/views/mailbox.py
index ef5bf42d..8c9e41b4 100644
--- a/app/dashboard/views/mailbox.py
+++ b/app/dashboard/views/mailbox.py
@@ -164,9 +164,9 @@ def send_verification_email(user, mailbox):
     )
     send_email(
         mailbox.email,
-        f"Please confirm your email {mailbox.email}",
+        f"Please confirm your mailbox {mailbox.email}",
         render(
-            "transactional/verify-mailbox.txt",
+            "transactional/verify-mailbox.txt.jinja2",
             user=user,
             link=verification_url,
             mailbox_email=mailbox.email,
diff --git a/app/dashboard/views/mailbox_detail.py b/app/dashboard/views/mailbox_detail.py
index 0d564a11..e7bb1ee5 100644
--- a/app/dashboard/views/mailbox_detail.py
+++ b/app/dashboard/views/mailbox_detail.py
@@ -208,7 +208,7 @@ def verify_mailbox_change(user, mailbox, new_email):
         new_email,
         "Confirm mailbox change on SimpleLogin",
         render(
-            "transactional/verify-mailbox-change.txt",
+            "transactional/verify-mailbox-change.txt.jinja2",
             user=user,
             link=verification_url,
             mailbox_email=mailbox.email,
diff --git a/templates/emails/transactional/verify-mailbox-change.txt b/templates/emails/transactional/verify-mailbox-change.txt.jinja2
similarity index 100%
rename from templates/emails/transactional/verify-mailbox-change.txt
rename to templates/emails/transactional/verify-mailbox-change.txt.jinja2
diff --git a/templates/emails/transactional/verify-mailbox.html b/templates/emails/transactional/verify-mailbox.html
index 291e0cff..12830d5d 100644
--- a/templates/emails/transactional/verify-mailbox.html
+++ b/templates/emails/transactional/verify-mailbox.html
@@ -5,7 +5,7 @@
   {{ render_text("Hi") }}
   {{ render_text("You have added <b>"+ mailbox_email +"</b> as an additional mailbox.") }}
   {{ render_text("To confirm, please click on the button below.") }}
-  {{ render_button("Confirm email", link) }}
+  {{ render_button("Confirm mailbox", link) }}
   {{ render_text('Thanks,
   <br />
   SimpleLogin Team.') }}
diff --git a/templates/emails/transactional/verify-mailbox.txt b/templates/emails/transactional/verify-mailbox.txt.jinja2
similarity index 100%
rename from templates/emails/transactional/verify-mailbox.txt
rename to templates/emails/transactional/verify-mailbox.txt.jinja2