diff --git a/templates/email/authors/acknowledge_resubmission.html b/templates/email/authors/acknowledge_resubmission.html
index 1b0203e99ff34068322c541f374a9dea9fea5026..ad17676eed41947636a2ddc6f562b8344637c500 100644
--- a/templates/email/authors/acknowledge_resubmission.html
+++ b/templates/email/authors/acknowledge_resubmission.html
@@ -13,4 +13,4 @@
{% include 'email/_footer.html' %}
-{% include 'email/_submission_thread_uuid' with submission=submission %}
+{% include 'email/_submission_thread_uuid.html' with submission=submission %}
diff --git a/templates/email/authors/acknowledge_submission.html b/templates/email/authors/acknowledge_submission.html
index e7540c2d894f899aaf41517fa0e8d0516213430e..8a4e2bb3f5ceb49de486ca268b4d661982df0ae0 100644
--- a/templates/email/authors/acknowledge_submission.html
+++ b/templates/email/authors/acknowledge_submission.html
@@ -13,4 +13,4 @@
{% include 'email/_footer.html' %}
-{% include 'email/_submission_thread_uuid' with submission=submission %}
+{% include 'email/_submission_thread_uuid.html' with submission=submission %}
diff --git a/templates/email/authors/inform_authors_comment_received.html b/templates/email/authors/inform_authors_comment_received.html
index 9122eb59a55deb871ad4f1c736c9f984b3751268..451de1eaaa2bbc0b84ca682f0fe48cfa5ada56dc 100644
--- a/templates/email/authors/inform_authors_comment_received.html
+++ b/templates/email/authors/inform_authors_comment_received.html
@@ -15,4 +15,4 @@
<p>The SciPost Team</p>
{% include 'email/_footer.html' %}
-{% include 'email/_submission_thread_uuid' with submission=submission %}
+{% include 'email/_submission_thread_uuid.html' with submission=submission %}
diff --git a/templates/email/authors/inform_authors_contributor_commented_report.html b/templates/email/authors/inform_authors_contributor_commented_report.html
index b6ff3a1f38d8382428c714af032e5ac6429ae764..6859a8a9da132d8acc1aa963c5c1527ef0c1237b 100644
--- a/templates/email/authors/inform_authors_contributor_commented_report.html
+++ b/templates/email/authors/inform_authors_contributor_commented_report.html
@@ -17,4 +17,4 @@
</p>
{% include 'email/_footer.html' %}
-{% include 'email/_submission_thread_uuid' with submission=report.submission %}
+{% include 'email/_submission_thread_uuid.html' with submission=report.submission %}
diff --git a/templates/email/authors/inform_authors_eic_assigned_direct_rec.html b/templates/email/authors/inform_authors_eic_assigned_direct_rec.html
index bcc146434d8b38e393e8caf608b38ee8ad7e0fe3..bc74bafdce6f189418769a6037aa82bb9ca5b839 100644
--- a/templates/email/authors/inform_authors_eic_assigned_direct_rec.html
+++ b/templates/email/authors/inform_authors_eic_assigned_direct_rec.html
@@ -19,4 +19,4 @@
</p>
{% include 'email/_footer.html' %}
-{% include 'email/_submission_thread_uuid' with submission=submission %}
+{% include 'email/_submission_thread_uuid.html' with submission=submission %}
diff --git a/templates/email/authors/inform_authors_manuscript_withdrawn.html b/templates/email/authors/inform_authors_manuscript_withdrawn.html
index 7a8e723c1866e8148802fd60aadd3e1fa1eba827..641084448c74e68310a237c869283a29b1636661 100644
--- a/templates/email/authors/inform_authors_manuscript_withdrawn.html
+++ b/templates/email/authors/inform_authors_manuscript_withdrawn.html
@@ -19,4 +19,4 @@
<p>The SciPost Team</p>
{% include 'email/_footer.html' %}
-{% include 'email/_submission_thread_uuid' with submission=submission %}
+{% include 'email/_submission_thread_uuid.html' with submission=submission %}
diff --git a/templates/email/authors/request_pubfrac_check.html b/templates/email/authors/request_pubfrac_check.html
index a36977bb069ddd62111dc104c89ee1ed6fcb8e08..ecd83f640d3fe32ec3e9cd1b78041a1b2c1fd17f 100644
--- a/templates/email/authors/request_pubfrac_check.html
+++ b/templates/email/authors/request_pubfrac_check.html
@@ -20,4 +20,4 @@
<p>The SciPost Team</p>
{% include 'email/_footer.html' %}
-{% include 'email/_submission_thread_uuid' with submission=publication.accepted_submission %}
+{% include 'email/_submission_thread_uuid.html' with submission=publication.accepted_submission %}
diff --git a/templates/email/eic/assignment_request.html b/templates/email/eic/assignment_request.html
index ed1848be65286f6d69702b740797b36ee687da95..c37be4b33d53030911dc6e4d5236d3ab1b5c0dcc 100644
--- a/templates/email/eic/assignment_request.html
+++ b/templates/email/eic/assignment_request.html
@@ -22,4 +22,4 @@
{% include 'email/_footer.html' %}
-{% include 'email/_submission_thread_uuid' with submission=object.submission %}
+{% include 'email/_submission_thread_uuid.html' with submission=object.submission %}
diff --git a/templates/email/eic/inform_eic_comment_received.html b/templates/email/eic/inform_eic_comment_received.html
index 48564f9ada1dae24207f243def2020a17d4191f9..d326b01998d386afd8ea742811c8c206050ee299 100644
--- a/templates/email/eic/inform_eic_comment_received.html
+++ b/templates/email/eic/inform_eic_comment_received.html
@@ -18,4 +18,4 @@
{% include 'email/_footer.html' %}
-{% include 'email/_submission_thread_uuid' with submission=comment.core_content_object %}
+{% include 'email/_submission_thread_uuid.html' with submission=comment.core_content_object %}
diff --git a/templates/email/eic/inform_eic_manuscript_withdrawn.html b/templates/email/eic/inform_eic_manuscript_withdrawn.html
index 881382d21de3404e16cf1fc58b05454a99b603ed..f601baf855d30e6ec8057b614217b742482bdb26 100644
--- a/templates/email/eic/inform_eic_manuscript_withdrawn.html
+++ b/templates/email/eic/inform_eic_manuscript_withdrawn.html
@@ -18,4 +18,4 @@
{% include 'email/_footer.html' %}
-{% include 'email/_submission_thread_uuid' with submission=submission %}
+{% include 'email/_submission_thread_uuid.html' with submission=submission %}
diff --git a/templates/email/eic/inform_eic_report_received.html b/templates/email/eic/inform_eic_report_received.html
index 55745fd02389f595eb5116013689ea7e3d05cf01..3710e9af72a3f318dbe9a345f6b4267f4c2c0b0e 100644
--- a/templates/email/eic/inform_eic_report_received.html
+++ b/templates/email/eic/inform_eic_report_received.html
@@ -1,7 +1,7 @@
<p>Dear {{ report.submission.editor_in_charge.get_title_display }} {{ report.submission.editor_in_charge.user.last_name }},</p>
<p>
- Referee {{ report.author.get_title_display }} {{ report.author.user.last_name }} has delivered a Report for Submission:
+ Referee {{ report.author.get_title_display }} {{ report.author.user.last_name }} has delivered a Report for Submission:
</p>
<p>
{{ report.submission.title }}
@@ -18,4 +18,4 @@
{% include 'email/_footer.html' %}
-{% include 'email/_submission_thread_uuid' with submission=report.submission %}
+{% include 'email/_submission_thread_uuid.html' with submission=report.submission %}
diff --git a/templates/email/eic/referee_response.html b/templates/email/eic/referee_response.html
index cc7782e0c6243aab4023ec4db45840a814e4347d..7a7b7782a6825758e3136a8d4257eee0fc18bbe2 100644
--- a/templates/email/eic/referee_response.html
+++ b/templates/email/eic/referee_response.html
@@ -22,4 +22,4 @@
{% include 'email/_footer.html' %}
-{% include 'email/_submission_thread_uuid' with submission=invitation.submission %}
+{% include 'email/_submission_thread_uuid.html' with submission=invitation.submission %}
diff --git a/templates/email/eic/referee_unresponsive.html b/templates/email/eic/referee_unresponsive.html
index 7d85f72c3e8de26614fd0cb32aa1c12084d1e049..56034981f9173cdb54bc6b60bbdd50da4b2e26b5 100644
--- a/templates/email/eic/referee_unresponsive.html
+++ b/templates/email/eic/referee_unresponsive.html
@@ -20,4 +20,4 @@
</p>
{% include 'email/_footer.html' %}
-{% include 'email/_submission_thread_uuid' with submission=invitation.submission %}
+{% include 'email/_submission_thread_uuid.html' with submission=invitation.submission %}
diff --git a/templates/email/eic/submission_reappointment.html b/templates/email/eic/submission_reappointment.html
index 0a3f1302f948a77f4d40010ae6534f8cd6d356f5..1107435d70ff8647f8eb0edfe893b189029d0b94 100644
--- a/templates/email/eic/submission_reappointment.html
+++ b/templates/email/eic/submission_reappointment.html
@@ -24,4 +24,4 @@
{% include 'email/_footer.html' %}
-{% include 'email/_submission_thread_uuid' with submission=submission %}
+{% include 'email/_submission_thread_uuid.html' with submission=submission %}
diff --git a/templates/email/fellows/email_fellow_assigned_submission.html b/templates/email/fellows/email_fellow_assigned_submission.html
index aca74983eaa276bdd44a5f48e1cc49498eb24ee6..71b4f6ddc95fe316c359d70bc96984c3b2a41ff4 100644
--- a/templates/email/fellows/email_fellow_assigned_submission.html
+++ b/templates/email/fellows/email_fellow_assigned_submission.html
@@ -12,4 +12,4 @@ Many thanks in advance for your collaboration,
SciPost Editorial Administration
-{% include 'email/_submission_thread_uuid' with submission=assignment.submission %}
+{% include 'email/_submission_thread_uuid.html' with submission=assignment.submission %}
diff --git a/templates/email/fellows/email_fellow_replaced_by_other.html b/templates/email/fellows/email_fellow_replaced_by_other.html
index 5b3e093fd3a846b3183fbc10228985b242ca7b6f..92f1e04c6b64824c4ed9137995346023af5c9279 100644
--- a/templates/email/fellows/email_fellow_replaced_by_other.html
+++ b/templates/email/fellows/email_fellow_replaced_by_other.html
@@ -10,4 +10,4 @@ Many thanks for your valuable work,
SciPost Editorial Administration
-{% include 'email/_submission_thread_uuid' with submission=assignment.submission %}
+{% include 'email/_submission_thread_uuid.html' with submission=assignment.submission %}
diff --git a/templates/email/production_send_proofs.html b/templates/email/production_send_proofs.html
index 8c3728bc8e9c3460178d7c72346e2813a3d4b3f5..2474e4b625fdcec949c55dfd0307a0fc4234e217 100644
--- a/templates/email/production_send_proofs.html
+++ b/templates/email/production_send_proofs.html
@@ -19,4 +19,4 @@
{% include 'email/_footer.html' %}
-{% include 'email/_submission_thread_uuid' with submission=proofs.stream.submission %}
+{% include 'email/_submission_thread_uuid.html' with submission=proofs.stream.submission %}
diff --git a/templates/email/publication_ready.html b/templates/email/publication_ready.html
index f7086c4695c0ad28b63f346c6b641da93873f5df..1f84f558391acd312cba0f51de9fb9ad7a6c0740 100644
--- a/templates/email/publication_ready.html
+++ b/templates/email/publication_ready.html
@@ -15,4 +15,4 @@
{% include 'email/_footer.html' %}
-{% include 'email/_submission_thread_uuid' with submission=object.accepted_submission %}
+{% include 'email/_submission_thread_uuid.html' with submission=object.accepted_submission %}
diff --git a/templates/email/referees/confirmation_invitation_response.html b/templates/email/referees/confirmation_invitation_response.html
index 786267369d127a634a64b5f5acb3240f95690b9e..5194156e5dffd522f4de15d2d82a6e81962e2968 100644
--- a/templates/email/referees/confirmation_invitation_response.html
+++ b/templates/email/referees/confirmation_invitation_response.html
@@ -22,4 +22,4 @@
{% include 'email/_footer.html' %}
-{% include 'email/_submission_thread_uuid' with submission=invitation.submission %}
+{% include 'email/_submission_thread_uuid.html' with submission=invitation.submission %}
diff --git a/templates/email/referees/inform_referee_authors_replied_to_report.html b/templates/email/referees/inform_referee_authors_replied_to_report.html
index 85a4579300599ee3bf00400f0d36337826cde107..089c8afa4e3f325a2c42bb793a7a82e6dde8f2ea 100644
--- a/templates/email/referees/inform_referee_authors_replied_to_report.html
+++ b/templates/email/referees/inform_referee_authors_replied_to_report.html
@@ -17,4 +17,4 @@
</p>
{% include 'email/_footer.html' %}
-{% include 'email/_submission_thread_uuid' with submission=report.submission %}
+{% include 'email/_submission_thread_uuid.html' with submission=report.submission %}
diff --git a/templates/email/referees/inform_referee_contributor_commented_report.html b/templates/email/referees/inform_referee_contributor_commented_report.html
index 9d605fba9efa324dd1d8c1f20a0f57f44f679bc6..71c327038efb07138e128a24b218b7b835707206 100644
--- a/templates/email/referees/inform_referee_contributor_commented_report.html
+++ b/templates/email/referees/inform_referee_contributor_commented_report.html
@@ -17,4 +17,4 @@
</p>
{% include 'email/_footer.html' %}
-{% include 'email/_submission_thread_uuid' with submission=report.submission %}
+{% include 'email/_submission_thread_uuid.html' with submission=report.submission %}
diff --git a/templates/email/referees/inform_referee_manuscript_withdrawn.html b/templates/email/referees/inform_referee_manuscript_withdrawn.html
index dbb02b17815cf1028362bc4be177c35db1ec24e7..a88db6f1e895d96c3e22f3be34cc038c55e7eefe 100644
--- a/templates/email/referees/inform_referee_manuscript_withdrawn.html
+++ b/templates/email/referees/inform_referee_manuscript_withdrawn.html
@@ -20,4 +20,4 @@
</p>
{% include 'email/_footer.html' %}
-{% include 'email/_submission_thread_uuid' with submission=invitation.submission %}
+{% include 'email/_submission_thread_uuid.html' with submission=invitation.submission %}
diff --git a/templates/email/referees/inform_referee_report_received.html b/templates/email/referees/inform_referee_report_received.html
index 370f9ee58f95a8c7d5453c3e659702fff33df942..420253b29485403019d9798855a5b31fbdc273f3 100644
--- a/templates/email/referees/inform_referee_report_received.html
+++ b/templates/email/referees/inform_referee_report_received.html
@@ -21,4 +21,4 @@
</p>
{% include 'email/_footer.html' %}
-{% include 'email/_submission_thread_uuid' with submission=report.submission %}
+{% include 'email/_submission_thread_uuid.html' with submission=report.submission %}
diff --git a/templates/email/referees/invite_contributor_to_referee.html b/templates/email/referees/invite_contributor_to_referee.html
index 477c36144ff5990e058c1f17aeee6df1212c4323..a6cafd69f3595f725a3ade490a9aa722aa491e0b 100644
--- a/templates/email/referees/invite_contributor_to_referee.html
+++ b/templates/email/referees/invite_contributor_to_referee.html
@@ -24,4 +24,4 @@
</p>
{% include 'email/_footer.html' %}
-{% include 'email/_submission_thread_uuid' with submission=invitation.submission %}
+{% include 'email/_submission_thread_uuid.html' with submission=invitation.submission %}
diff --git a/templates/email/referees/invite_contributor_to_referee_reminder1.html b/templates/email/referees/invite_contributor_to_referee_reminder1.html
index 13aeeed728669563953ffba181fd0285d45f75d8..a1c0ebed3d9d4f373851c66598aebd64b28c7944 100644
--- a/templates/email/referees/invite_contributor_to_referee_reminder1.html
+++ b/templates/email/referees/invite_contributor_to_referee_reminder1.html
@@ -29,4 +29,4 @@
</p>
{% include 'email/_footer.html' %}
-{% include 'email/_submission_thread_uuid' with submission=invitation.submission %}
+{% include 'email/_submission_thread_uuid.html' with submission=invitation.submission %}
diff --git a/templates/email/referees/invite_contributor_to_referee_reminder2.html b/templates/email/referees/invite_contributor_to_referee_reminder2.html
index f30ad08a8921b0da44cbe931d111fb863937e179..d6b656ecf17c7cdcba521291d68bbe18755d572e 100644
--- a/templates/email/referees/invite_contributor_to_referee_reminder2.html
+++ b/templates/email/referees/invite_contributor_to_referee_reminder2.html
@@ -29,4 +29,4 @@
</p>
{% include 'email/_footer.html' %}
-{% include 'email/_submission_thread_uuid' with submission=invitation.submission %}
+{% include 'email/_submission_thread_uuid.html' with submission=invitation.submission %}
diff --git a/templates/email/referees/invite_unregistered_to_referee.html b/templates/email/referees/invite_unregistered_to_referee.html
index c755d681600a9aac48113347b07cb7dc7ff047ae..2f5c4fbc7322c46bc20a755c73e8242cd2dac55b 100644
--- a/templates/email/referees/invite_unregistered_to_referee.html
+++ b/templates/email/referees/invite_unregistered_to_referee.html
@@ -35,4 +35,4 @@
{% include 'email/_footer.html' %}
-{% include 'email/_submission_thread_uuid' with submission=invitation.submission %}
+{% include 'email/_submission_thread_uuid.html' with submission=invitation.submission %}
diff --git a/templates/email/referees/invite_unregistered_to_referee_reminder1.html b/templates/email/referees/invite_unregistered_to_referee_reminder1.html
index d6da26b9f209669c8dae07d6a5881929f7d333e4..021fe3fabb6ddd6514a2adad4d2eaf2afe123ad2 100644
--- a/templates/email/referees/invite_unregistered_to_referee_reminder1.html
+++ b/templates/email/referees/invite_unregistered_to_referee_reminder1.html
@@ -37,4 +37,4 @@
{% include 'email/_footer.html' %}
-{% include 'email/_submission_thread_uuid' with submission=invitation.submission %}
+{% include 'email/_submission_thread_uuid.html' with submission=invitation.submission %}
diff --git a/templates/email/referees/invite_unregistered_to_referee_reminder2.html b/templates/email/referees/invite_unregistered_to_referee_reminder2.html
index 7bfb2410a003adc480fd70d4caa9c4f82be727bf..71e89874d13e9ef5bd05a81d5db6de1931e191e0 100644
--- a/templates/email/referees/invite_unregistered_to_referee_reminder2.html
+++ b/templates/email/referees/invite_unregistered_to_referee_reminder2.html
@@ -37,4 +37,4 @@
{% include 'email/_footer.html' %}
-{% include 'email/_submission_thread_uuid' with submission=invitation.submission %}
+{% include 'email/_submission_thread_uuid.html' with submission=invitation.submission %}
diff --git a/templates/email/referees/reinvite_contributor_to_referee.html b/templates/email/referees/reinvite_contributor_to_referee.html
index 6d14b02ffbc5c9a80b728298acff2cdf66b4049a..053e5a39e5e7ff4c5cba04a6b1074cb9cb397bb4 100644
--- a/templates/email/referees/reinvite_contributor_to_referee.html
+++ b/templates/email/referees/reinvite_contributor_to_referee.html
@@ -29,4 +29,4 @@
{% include 'email/_footer.html' %}
-{% include 'email/_submission_thread_uuid' with submission=invitation.submission %}
+{% include 'email/_submission_thread_uuid.html' with submission=invitation.submission %}
diff --git a/templates/email/referees/remind_referee_deadline_1week.html b/templates/email/referees/remind_referee_deadline_1week.html
index cbc4f29506918e09e7fe7f9a72466608f9534b43..47fb08344f67a034a0795d4cd99e0b8796b6b6cb 100644
--- a/templates/email/referees/remind_referee_deadline_1week.html
+++ b/templates/email/referees/remind_referee_deadline_1week.html
@@ -15,4 +15,4 @@
</p>
{% include 'email/_footer.html' %}
-{% include 'email/_submission_thread_uuid' with submission=invitation.submission %}
+{% include 'email/_submission_thread_uuid.html' with submission=invitation.submission %}
diff --git a/templates/email/submissions_assignment_failed.html b/templates/email/submissions_assignment_failed.html
index b4958fe4ba602d665aaaf04dbd0fe1394a3e2c06..50325341264851db339279b72f59ffbf79c21f8c 100644
--- a/templates/email/submissions_assignment_failed.html
+++ b/templates/email/submissions_assignment_failed.html
@@ -16,4 +16,4 @@
{% include 'email/_footer.html' %}
-{% include 'email/_submission_thread_uuid' with submission=object %}
+{% include 'email/_submission_thread_uuid.html' with submission=object %}