From 713dbb7c5588a9247c7fb67ae0f39576ad614365 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Wed, 1 May 2019 20:04:43 +0200
Subject: [PATCH] Include Submission's thread_hash in sub history and all
 emails

---
 .../submission_refereeing_history.html        |  4 +++
 templates/email/_footer.html                  |  6 ++--
 templates/email/_submission_thread_uuid.html  |  1 +
 .../authors/acknowledge_resubmission.html     |  2 ++
 .../email/authors/acknowledge_submission.html |  2 ++
 .../inform_authors_comment_received.html      |  2 ++
 ..._authors_contributor_commented_report.html |  2 ++
 ...nform_authors_eic_assigned_direct_rec.html | 11 ++++---
 .../inform_authors_manuscript_withdrawn.html  |  2 ++
 .../email/authors/request_pubfrac_check.html  |  2 ++
 templates/email/eic/assignment_request.html   |  8 +++--
 .../eic/inform_eic_comment_received.html      |  8 +++--
 .../eic/inform_eic_manuscript_withdrawn.html  |  6 ++--
 .../email/eic/inform_eic_report_received.html | 10 +++---
 templates/email/eic/referee_response.html     | 12 ++++---
 templates/email/eic/referee_unresponsive.html |  8 +++--
 .../email/eic/submission_reappointment.html   |  8 +++--
 .../email_fellow_assigned_submission.html     |  2 ++
 .../email_fellow_replaced_by_other.html       |  2 ++
 templates/email/production_send_proofs.html   | 10 +++---
 templates/email/publication_ready.html        |  6 +++-
 .../confirmation_invitation_response.html     | 12 ++++---
 ...orm_referee_authors_replied_to_report.html |  2 ++
 ..._referee_contributor_commented_report.html |  2 ++
 .../inform_referee_manuscript_withdrawn.html  | 11 ++++---
 .../inform_referee_report_received.html       |  3 ++
 .../invite_contributor_to_referee.html        | 26 ++++++++-------
 ...vite_contributor_to_referee_reminder1.html | 22 +++++++------
 ...vite_contributor_to_referee_reminder2.html | 22 +++++++------
 .../invite_unregistered_to_referee.html       | 30 +++++++++--------
 ...ite_unregistered_to_referee_reminder1.html | 22 +++++++------
 ...ite_unregistered_to_referee_reminder2.html | 22 +++++++------
 .../reinvite_contributor_to_referee.html      | 33 ++++++++++---------
 .../remind_referee_deadline_1week.html        |  8 +++--
 .../email/submissions_assignment_failed.html  |  2 ++
 35 files changed, 202 insertions(+), 129 deletions(-)
 create mode 100644 templates/email/_submission_thread_uuid.html

diff --git a/submissions/templates/partials/submissions/submission_refereeing_history.html b/submissions/templates/partials/submissions/submission_refereeing_history.html
index 1ab6f9a5c..1f3d4f01d 100644
--- a/submissions/templates/partials/submissions/submission_refereeing_history.html
+++ b/submissions/templates/partials/submissions/submission_refereeing_history.html
@@ -2,6 +2,10 @@
 
 <div class="submission-contents">
   <h3>Submission & Refereeing History</h3>
+  {% if perms.scipost.can_oversee_refereeing %}
+    <small class="text-muted">Thread {{ submission.thread_hash }}
+    <br/>(all emails concerning this stream contain this uuid)</small>
+  {% endif %}
   {% for sibling in submission.thread.public %}
     <div class="mt-3 mb-1">
       {% if forloop.last %}Submission{% else %}Resubmission{% endif %} <a href="{{ sibling.get_absolute_url }}" class="pubtitleli"{% if target_blank %} target="_blank"{% endif %}>{{ sibling.preprint.identifier_w_vn_nr }}</a> on {{ sibling.submission_date|date:'j F Y' }}
diff --git a/templates/email/_footer.html b/templates/email/_footer.html
index 1751c46c8..1ed30f21b 100644
--- a/templates/email/_footer.html
+++ b/templates/email/_footer.html
@@ -2,12 +2,10 @@
 
 <a href="https://scipost.org"><img src="https://scipost.org/static/scipost/images/logo_scipost_with_bgd_small.png" width="64px"></a>
 &nbsp;&nbsp;
+<a href="https://scipost.org/">Homepage</a>
+&nbsp;&middot;&nbsp;
 <a href="https://scipost.org/journals/">Journals</a>
 &nbsp;&middot;&nbsp;
 <a href="https://scipost.org/submissions/">Submissions</a>
 &nbsp;&middot;&nbsp;
-<a href="https://scipost.org/commentaries/">Commentaries</a>
-&nbsp;&middot;&nbsp;
-<a href="https://scipost.org/theses/">Theses</a>
-&nbsp;&middot;&nbsp;
 <a href="https://scipost.org/login/">Login</a>
diff --git a/templates/email/_submission_thread_uuid.html b/templates/email/_submission_thread_uuid.html
new file mode 100644
index 000000000..af694cf9b
--- /dev/null
+++ b/templates/email/_submission_thread_uuid.html
@@ -0,0 +1 @@
+<p><small>Submission thread uuid: {{ submission.thread_hash }}</small></p>
diff --git a/templates/email/authors/acknowledge_resubmission.html b/templates/email/authors/acknowledge_resubmission.html
index d5d0d253d..1b0203e99 100644
--- a/templates/email/authors/acknowledge_resubmission.html
+++ b/templates/email/authors/acknowledge_resubmission.html
@@ -12,3 +12,5 @@
 <p>The SciPost Team</p>
 
 {% include 'email/_footer.html' %}
+
+{% include 'email/_submission_thread_uuid' with submission=submission %}
diff --git a/templates/email/authors/acknowledge_submission.html b/templates/email/authors/acknowledge_submission.html
index 335842a85..e7540c2d8 100644
--- a/templates/email/authors/acknowledge_submission.html
+++ b/templates/email/authors/acknowledge_submission.html
@@ -12,3 +12,5 @@
 <p>The SciPost Team</p>
 
 {% include 'email/_footer.html' %}
+
+{% include 'email/_submission_thread_uuid' with submission=submission %}
diff --git a/templates/email/authors/inform_authors_comment_received.html b/templates/email/authors/inform_authors_comment_received.html
index 1ae619a3c..9122eb59a 100644
--- a/templates/email/authors/inform_authors_comment_received.html
+++ b/templates/email/authors/inform_authors_comment_received.html
@@ -14,3 +14,5 @@
 <p>Sincerely,</p>
 <p>The SciPost Team</p>
 {% include 'email/_footer.html' %}
+
+{% include 'email/_submission_thread_uuid' 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 860bb67e6..b6ff3a1f3 100644
--- a/templates/email/authors/inform_authors_contributor_commented_report.html
+++ b/templates/email/authors/inform_authors_contributor_commented_report.html
@@ -16,3 +16,5 @@
   We thank you very much for your contribution.<br/><br/>The SciPost Team.
 </p>
 {% include 'email/_footer.html' %}
+
+{% include 'email/_submission_thread_uuid' 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 ba045fd97..bcc146434 100644
--- a/templates/email/authors/inform_authors_eic_assigned_direct_rec.html
+++ b/templates/email/authors/inform_authors_eic_assigned_direct_rec.html
@@ -1,5 +1,5 @@
 <p>
-    Dear {{ submission.submitted_by.get_title_display }} {{ submission.submitted_by.user.last_name }},
+  Dear {{ submission.submitted_by.get_title_display }} {{ submission.submitted_by.user.last_name }},
 </p>
 <p>
   For your information, your Submission
@@ -13,7 +13,10 @@
 <p>You will be informed shortly by email about the status of this Editorial Recommendation.</p>
 
 <p>
-    Sincerely,
-    <br>
-    The SciPost Team.
+  Sincerely,
+  <br>
+  The SciPost Team.
 </p>
+{% include 'email/_footer.html' %}
+
+{% include 'email/_submission_thread_uuid' with submission=submission %}
diff --git a/templates/email/authors/inform_authors_manuscript_withdrawn.html b/templates/email/authors/inform_authors_manuscript_withdrawn.html
index cc6f29227..7a8e723c1 100644
--- a/templates/email/authors/inform_authors_manuscript_withdrawn.html
+++ b/templates/email/authors/inform_authors_manuscript_withdrawn.html
@@ -18,3 +18,5 @@
 <p>Sincerely,</p>
 <p>The SciPost Team</p>
 {% include 'email/_footer.html' %}
+
+{% include 'email/_submission_thread_uuid' with submission=submission %}
diff --git a/templates/email/authors/request_pubfrac_check.html b/templates/email/authors/request_pubfrac_check.html
index ff3ce9096..a36977bb0 100644
--- a/templates/email/authors/request_pubfrac_check.html
+++ b/templates/email/authors/request_pubfrac_check.html
@@ -19,3 +19,5 @@
 </p>
 <p>The SciPost Team</p>
 {% include 'email/_footer.html' %}
+
+{% include 'email/_submission_thread_uuid' with submission=publication.accepted_submission %}
diff --git a/templates/email/eic/assignment_request.html b/templates/email/eic/assignment_request.html
index 7e2a24e14..ed1848be6 100644
--- a/templates/email/eic/assignment_request.html
+++ b/templates/email/eic/assignment_request.html
@@ -13,11 +13,13 @@
     Please visit the <a href="https://scipost.org/submissions/pool">Submissions Pool</a> in order to accept or decline (it is important for you to inform us even if you decline, since this affects the result of the pre-screening process).
 </p>
 <p>
-    Note that this assignment request is automatically deprecated if another Fellow takes charge of this Submission or if pre-screening fails in the meantime.
+  Note that this assignment request is automatically deprecated if another Fellow takes charge of this Submission or if pre-screening fails in the meantime.
 </p>
 <p>
-    Many thanks in advance for your collaboration,<br>
-    The SciPost Team.
+  Many thanks in advance for your collaboration,<br>
+  The SciPost Team.
 </p>
 
 {% include 'email/_footer.html' %}
+
+{% include 'email/_submission_thread_uuid' 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 59c2a17f1..48564f9ad 100644
--- a/templates/email/eic/inform_eic_comment_received.html
+++ b/templates/email/eic/inform_eic_comment_received.html
@@ -9,11 +9,13 @@
     by {{ comment.core_content_object.author_list }}.
 </p>
 <p>
-    This Comment now requires vetting, which you can perform from <a href="https://scipost.org{% url 'submissions:editorial_page' comment.core_content_object.preprint.identifier_w_vn_nr %}">the editorial page</a> (please be careful when doing this, avoiding for example to vet doubly-submitted comments, or comments with improper language etc; in case you have any doubt, please contact our <a href="mailto:edadmin@scipost.org">editorial administration</a>).
+  This Comment now requires vetting, which you can perform from <a href="https://scipost.org{% url 'submissions:editorial_page' comment.core_content_object.preprint.identifier_w_vn_nr %}">the editorial page</a> (please be careful when doing this, avoiding for example to vet doubly-submitted comments, or comments with improper language etc; in case you have any doubt, please contact our <a href="mailto:edadmin@scipost.org">editorial administration</a>).
 </p>
 <p>
-    Many thanks in advance for your collaboration,<br>
-    The SciPost Team.
+  Many thanks in advance for your collaboration,<br>
+  The SciPost Team.
 </p>
 
 {% include 'email/_footer.html' %}
+
+{% include 'email/_submission_thread_uuid' 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 e0ed174be..881382d21 100644
--- a/templates/email/eic/inform_eic_manuscript_withdrawn.html
+++ b/templates/email/eic/inform_eic_manuscript_withdrawn.html
@@ -12,8 +12,10 @@
   have withdrawn their manuscript. There is no further action required from your part, and your editorial assignment is now marked as completed.
 </p>
 <p>
-    Many thanks,<br>
-    The SciPost Team.
+  Many thanks,<br>
+  The SciPost Team.
 </p>
 
 {% include 'email/_footer.html' %}
+
+{% include 'email/_submission_thread_uuid' with submission=submission %}
diff --git a/templates/email/eic/inform_eic_report_received.html b/templates/email/eic/inform_eic_report_received.html
index 11d7d9f82..55745fd02 100644
--- a/templates/email/eic/inform_eic_report_received.html
+++ b/templates/email/eic/inform_eic_report_received.html
@@ -4,16 +4,18 @@
     Referee {{ report.author.get_title_display }} {{ report.author.user.last_name }} has delivered a Report for Submission:
 </p>
 <p>
-  {{report.submission.title}}
+  {{ report.submission.title }}
   <br/>
   by {{ report.submission.author_list }}.
 </p>
 <p>
-    Please vet this Report via your <a href="https://scipost.org{% url 'scipost:personal_page' %}">personal page</a> under the Editorial Actions tab.
+  Please vet this Report via your <a href="https://scipost.org{% url 'scipost:personal_page' %}">personal page</a> under the Editorial Actions tab.
 </p>
 <p>
-    Many thanks in advance for your collaboration,<br>
-    The SciPost Team.
+  Many thanks in advance for your collaboration,<br>
+  The SciPost Team.
 </p>
 
 {% include 'email/_footer.html' %}
+
+{% include 'email/_submission_thread_uuid' with submission=report.submission %}
diff --git a/templates/email/eic/referee_response.html b/templates/email/eic/referee_response.html
index 9de08cb8e..cc7782e0c 100644
--- a/templates/email/eic/referee_response.html
+++ b/templates/email/eic/referee_response.html
@@ -10,14 +10,16 @@
 </p>
 
 {% if not invitation.accepted %}
-    <p>
-        Please invite another referee from the Submission's <a href="https://scipost.org{% url 'submissions:editorial_page' invitation.submission.preprint.identifier_w_vn_nr %}">editorial page</a>.
-    </p>
+  <p>
+    Please invite another referee from the Submission's <a href="https://scipost.org{% url 'submissions:editorial_page' invitation.submission.preprint.identifier_w_vn_nr %}">editorial page</a>.
+  </p>
 {% endif %}
 
 <p>
-    Many thanks for your collaboration,<br/>
-    The SciPost Team.
+  Many thanks for your collaboration,<br/>
+  The SciPost Team.
 </p>
 
 {% include 'email/_footer.html' %}
+
+{% include 'email/_submission_thread_uuid' with submission=invitation.submission %}
diff --git a/templates/email/eic/referee_unresponsive.html b/templates/email/eic/referee_unresponsive.html
index a378b7c98..7d85f72c3 100644
--- a/templates/email/eic/referee_unresponsive.html
+++ b/templates/email/eic/referee_unresponsive.html
@@ -14,8 +14,10 @@
   Unless you are confident that this referee will really deliver a Report, and to ensure that this Submission does not suffer from unnecessary delays in processing, you should ideally invite a replacement referee using the tols on the <a href="https://scipost.org{% url 'submissions:editorial_page' invitation.submission.preprint.identifier_w_vn_nr %}">Editorial page</a>.
 </p>
 <p>
-    We are very grateful for your prompt action.
-    <br><br>
-    SciPost Editorial Administration
+  We are very grateful for your prompt action.
+  <br><br>
+  SciPost Editorial Administration
 </p>
 {% include 'email/_footer.html' %}
+
+{% include 'email/_submission_thread_uuid' with submission=invitation.submission %}
diff --git a/templates/email/eic/submission_reappointment.html b/templates/email/eic/submission_reappointment.html
index fc463fa2f..0a3f1302f 100644
--- a/templates/email/eic/submission_reappointment.html
+++ b/templates/email/eic/submission_reappointment.html
@@ -15,11 +15,13 @@
     As Editor-in-charge, you can take your editorial actions from the submission's <a href="https://scipost.org{% url 'submissions:editorial_page' submission.preprint.identifier_w_vn_nr %}">editorial page</a>, which is also accessible from your <a href="https://scipost.org{% url 'scipost:personal_page' %}">personal page</a> under the Editorial Actions tab.
 </p>
 <p>
-    You can either take an immediate acceptance/rejection decision, quickly consult previous referees or run a new refereeing round, in which case you should now invite at least 3 referees; you might want to make sure you are aware of the detailed procedure described in the <a href="https://scipost.org{% url 'scipost:EdCol_by-laws' %}">Editorial College by-laws</a>.
+  You can either take an immediate acceptance/rejection decision, quickly consult previous referees or run a new refereeing round, in which case you should now invite at least 3 referees; you might want to make sure you are aware of the detailed procedure described in the <a href="https://scipost.org{% url 'scipost:EdCol_by-laws' %}">Editorial College by-laws</a>.
 </p>
 <p>
-    Many thanks in advance for your collaboration,<br>
-    The SciPost Team.
+  Many thanks in advance for your collaboration,<br>
+  The SciPost Team.
 </p>
 
 {% include 'email/_footer.html' %}
+
+{% include 'email/_submission_thread_uuid' with submission=submission %}
diff --git a/templates/email/fellows/email_fellow_assigned_submission.html b/templates/email/fellows/email_fellow_assigned_submission.html
index fb269467d..aca74983e 100644
--- a/templates/email/fellows/email_fellow_assigned_submission.html
+++ b/templates/email/fellows/email_fellow_assigned_submission.html
@@ -11,3 +11,5 @@ In particular, you should now make sure at least 3 referees have been invited; y
 Many thanks in advance for your collaboration,
 
 SciPost Editorial Administration
+
+{% include 'email/_submission_thread_uuid' 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 564a97327..5b3e093fd 100644
--- a/templates/email/fellows/email_fellow_replaced_by_other.html
+++ b/templates/email/fellows/email_fellow_replaced_by_other.html
@@ -9,3 +9,5 @@ To see your current active assignments, check <a href="https://scipost.org{% url
 Many thanks for your valuable work,
 
 SciPost Editorial Administration
+
+{% include 'email/_submission_thread_uuid' with submission=assignment.submission %}
diff --git a/templates/email/production_send_proofs.html b/templates/email/production_send_proofs.html
index bfd87c4e2..8c3728bc8 100644
--- a/templates/email/production_send_proofs.html
+++ b/templates/email/production_send_proofs.html
@@ -7,14 +7,16 @@
 </p>
 
 <p>
-    Please review the proofs and let us know whether you accept the proofs for publication using the form on the submission page.
+  Please review the proofs and let us know whether you accept the proofs for publication using the form on the submission page.
 </p>
 
 <p>
-    Sincerely,<br>
+  Sincerely,<br>
 
-    {{ proofs.stream.supervisor.user.first_name }} {{ proofs.stream.supervisor.user.last_name }},<br>
-    SciPost Production
+  {{ proofs.stream.supervisor.user.first_name }} {{ proofs.stream.supervisor.user.last_name }},<br>
+  SciPost Production
 </p>
 
 {% include 'email/_footer.html' %}
+
+{% include 'email/_submission_thread_uuid' with submission=proofs.stream.submission %}
diff --git a/templates/email/publication_ready.html b/templates/email/publication_ready.html
index 104914e6c..f7086c469 100644
--- a/templates/email/publication_ready.html
+++ b/templates/email/publication_ready.html
@@ -10,5 +10,9 @@
 </p>
 
 <p>
-    <em>This mail is automatically generated from the SciPost platform</em>.
+  <em>This mail is automatically generated from the SciPost platform</em>.
 </p>
+
+{% include 'email/_footer.html' %}
+
+{% include 'email/_submission_thread_uuid' with submission=object.accepted_submission %}
diff --git a/templates/email/referees/confirmation_invitation_response.html b/templates/email/referees/confirmation_invitation_response.html
index b8363b5b5..786267369 100644
--- a/templates/email/referees/confirmation_invitation_response.html
+++ b/templates/email/referees/confirmation_invitation_response.html
@@ -1,7 +1,7 @@
 <p>Dear {{ invitation.referee.get_title_display }} {{ invitation.referee.user.last_name }},</p>
 
 <p>
-    We hereby confirm your choice to {% if invitation.accepted %}accept{% else %}decline (due to reason: {{ invitation.get_refusal_reason_display }}){% endif %} to referee Submission
+  We hereby confirm your choice to {% if invitation.accepted %}accept{% else %}decline (due to reason: {{ invitation.get_refusal_reason_display }}){% endif %} to referee Submission
 </p>
 <p>
   {{ invitation.submission.title }}
@@ -10,14 +10,16 @@
 </p>
 
 <p>
-    {% if invitation.accepted %}
+  {% if invitation.accepted %}
     We will look forward to receiving your Report by the reporting deadline {{ invitation.submission.reporting_deadline|date:'Y-m-d' }}.
     <br/>
     Many thanks for your collaboration,
-    {% else %}
+  {% else %}
     Nonetheless, we thank you very much for considering this refereeing invitation,
-    {% endif %}
-    <br/>The SciPost Team.
+  {% endif %}
+  <br/>The SciPost Team.
 </p>
 
 {% include 'email/_footer.html' %}
+
+{% include 'email/_submission_thread_uuid' 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 41eca5d45..85a457930 100644
--- a/templates/email/referees/inform_referee_authors_replied_to_report.html
+++ b/templates/email/referees/inform_referee_authors_replied_to_report.html
@@ -16,3 +16,5 @@
   We thank you very much for your contribution.<br/><br/>The SciPost Team.
 </p>
 {% include 'email/_footer.html' %}
+
+{% include 'email/_submission_thread_uuid' 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 3c540b8bb..9d605fba9 100644
--- a/templates/email/referees/inform_referee_contributor_commented_report.html
+++ b/templates/email/referees/inform_referee_contributor_commented_report.html
@@ -16,3 +16,5 @@
   We thank you very much for your contribution.<br/><br/>The SciPost Team.
 </p>
 {% include 'email/_footer.html' %}
+
+{% include 'email/_submission_thread_uuid' 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 78b25a0f1..dbb02b178 100644
--- a/templates/email/referees/inform_referee_manuscript_withdrawn.html
+++ b/templates/email/referees/inform_referee_manuscript_withdrawn.html
@@ -1,16 +1,17 @@
 <p>
-    Dear {{invitation.referee.get_title_display}} {{invitation.referee.user.last_name}},
+  Dear {{ invitation.referee.get_title_display }} {{ invitation.referee.user.last_name }},
 </p>
 <p>
   This is a simple email to inform you that the authors of
 </p>
 <p>
-  {{invitation.submission.title}}
+  {{ invitation.submission.title }}
   <br>
-  by {{invitation.submission.author_list}}
+  by {{ invitation.submission.author_list }}
 </p>
 <p>
-  have withdrawn their manuscript. Your report is thus not needed anymore.
+  have withdrawn their manuscript. Your report is thus no longer needed. We apologize
+  for any inconvenience to you.
 </p>
 <p>
   Sincerely,
@@ -18,3 +19,5 @@
   The SciPost Team.
 </p>
 {% include 'email/_footer.html' %}
+
+{% include 'email/_submission_thread_uuid' 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 9e50b5f4b..370f9ee58 100644
--- a/templates/email/referees/inform_referee_report_received.html
+++ b/templates/email/referees/inform_referee_report_received.html
@@ -19,3 +19,6 @@
   <br/>
   The SciPost Team.
 </p>
+{% include 'email/_footer.html' %}
+
+{% include 'email/_submission_thread_uuid' 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 cddb2dafe..477c36144 100644
--- a/templates/email/referees/invite_contributor_to_referee.html
+++ b/templates/email/referees/invite_contributor_to_referee.html
@@ -1,25 +1,27 @@
 <p>
-    Dear {{invitation.referee.get_title_display}} {{invitation.referee.user.last_name}},
+  Dear {{ invitation.referee.get_title_display }} {{ invitation.referee.user.last_name }},
 </p>
 <p>
-    We have received a Submission to SciPost which, in view of your expertise and on behalf of the Editor-in-charge {{invitation.submission.editor_in_charge.get_title_display}} {{invitation.submission.editor_in_charge.user.last_name}}, we would like to invite you to referee:
-    <br><br>
-    {{invitation.submission.title}}
-    <br>by {{invitation.submission.author_list}}<br>
-    (see https://scipost.org{{ invitation.submission.get_absolute_url }} - first submitted {{ invitation.submission.original_submission_date|date:"d M Y" }}).
+  We have received a Submission to SciPost which, in view of your expertise and on behalf of the Editor-in-charge {{ invitation.submission.editor_in_charge.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }}, we would like to invite you to referee:
+  <br><br>
+  {{ invitation.submission.title }}
+  <br>by {{ invitation.submission.author_list }}<br>
+  (see https://scipost.org{{ invitation.submission.get_absolute_url }} - first submitted {{ invitation.submission.original_submission_date|date:"d M Y" }}).
 </p>
 <p>
-    Please <a href="https://scipost.org/submissions/accept_or_decline_ref_invitations">accept or decline</a> (login required) this invitation as soon as possible (ideally within the next 2 days).
+  Please <a href="https://scipost.org/submissions/accept_or_decline_ref_invitations">accept or decline</a> (login required) this invitation as soon as possible (ideally within the next 2 days).
 </p>
 <p>
-    If you accept, your report can be submitted by simply clicking on the "Contribute a Report" link on <a href="https://scipost.org{{invitation.submission.get_absolute_url}}">the Submission Page</a> before the reporting deadline (currently set at {{invitation.submission.reporting_deadline|date:'d-m-Y'}}; your report will be automatically recognized as an invited report).
+  If you accept, your report can be submitted by simply clicking on the "Contribute a Report" link on <a href="https://scipost.org{{ invitation.submission.get_absolute_url }}">the Submission Page</a> before the reporting deadline (currently set at {{ invitation.submission.reporting_deadline|date:'d-m-Y' }}; your report will be automatically recognized as an invited report).
 </p>
 <p>
-    You might want to make sure you are familiar with our <a href="https://scipost.org{% url 'submissions:sub_and_ref_procedure' %}">refereeing procedure</a>, <a href="https://scipost.org{% url 'submissions:referee_guidelines' %}">referee guidelines</a> and <a href="https://scipost.org{% url 'journals:journals_terms_and_conditions' %}#referee_code_of_conduct">referee code of conduct</a>.
+  You might want to make sure you are familiar with our <a href="https://scipost.org{% url 'submissions:sub_and_ref_procedure' %}">refereeing procedure</a>, <a href="https://scipost.org{% url 'submissions:referee_guidelines' %}">referee guidelines</a> and <a href="https://scipost.org{% url 'journals:journals_terms_and_conditions' %}#referee_code_of_conduct">referee code of conduct</a>.
 </p>
 <p>
-    We would be extremely grateful for your contribution, and thank you in advance for your consideration.
-    <br><br>
-    The SciPost Team.
+  We would be extremely grateful for your contribution, and thank you in advance for your consideration.
+  <br><br>
+  The SciPost Team.
 </p>
 {% include 'email/_footer.html' %}
+
+{% include 'email/_submission_thread_uuid' 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 3eda73474..13aeeed72 100644
--- a/templates/email/referees/invite_contributor_to_referee_reminder1.html
+++ b/templates/email/referees/invite_contributor_to_referee_reminder1.html
@@ -1,12 +1,12 @@
 <h3>Re: refereeing invitation. First automatic reminder</h3>
 <p>
-  Dear {{invitation.referee.get_title_display}} {{invitation.referee.user.last_name}},
+  Dear {{ invitation.referee.get_title_display }} {{ invitation.referee.user.last_name }},
 </p>
 <p>
   Recently, on behalf of the Editor-in-charge {{ invitation.submission.editor_in_charge.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }}, we invited you to consider refereeing a Submission to {{ invitation.submission.submitted_to }}, namely<br><br>
-    {{ invitation.submission.title }}<br>
-    by {{ invitation.submission.author_list }}<br>
-    (see https://scipost.org{{ invitation.submission.get_absolute_url }} - first submitted {{ invitation.submission.original_submission_date|date:"d M Y" }}).
+  {{ invitation.submission.title }}<br>
+  by {{ invitation.submission.author_list }}<br>
+  (see https://scipost.org{{ invitation.submission.get_absolute_url }} - first submitted {{ invitation.submission.original_submission_date|date:"d M Y" }}).
 </p>
 <p>
   We are still awaiting your response to this invitation.
@@ -14,17 +14,19 @@
   could you please let us know whether we can count on your expertise?
 </p>
 <p>
-    Please <a href="https://scipost.org/submissions/accept_or_decline_ref_invitations">accept or decline</a> (login required) this invitation.
+  Please <a href="https://scipost.org/submissions/accept_or_decline_ref_invitations">accept or decline</a> (login required) this invitation.
 </p>
 <p>
-    If you accept, your report can be submitted by simply clicking on the "Contribute a Report" link on <a href="https://scipost.org{{invitation.submission.get_absolute_url}}">the Submission Page</a> before the reporting deadline (currently set at {{invitation.submission.reporting_deadline|date:'d M Y'}}; your report will be automatically recognized as an invited report).
+  If you accept, your report can be submitted by simply clicking on the "Contribute a Report" link on <a href="https://scipost.org{{ invitation.submission.get_absolute_url }}">the Submission Page</a> before the reporting deadline (currently set at {{ invitation.submission.reporting_deadline|date:'d M Y' }}; your report will be automatically recognized as an invited report).
 </p>
 <p>
-    You might want to make sure you are familiar with our <a href="https://scipost.org{% url 'submissions:sub_and_ref_procedure' %}">refereeing procedure</a>, <a href="https://scipost.org{% url 'submissions:referee_guidelines' %}">referee guidelines</a> and <a href="https://scipost.org{% url 'journals:journals_terms_and_conditions' %}#referee_code_of_conduct">referee code of conduct</a>.
+  You might want to make sure you are familiar with our <a href="https://scipost.org{% url 'submissions:sub_and_ref_procedure' %}">refereeing procedure</a>, <a href="https://scipost.org{% url 'submissions:referee_guidelines' %}">referee guidelines</a> and <a href="https://scipost.org{% url 'journals:journals_terms_and_conditions' %}#referee_code_of_conduct">referee code of conduct</a>.
 </p>
 <p>
-    We would be extremely grateful for your contribution, and thank you in advance for your consideration.
-    <br><br>
-    The SciPost Team.
+  We would be extremely grateful for your contribution, and thank you in advance for your consideration.
+  <br><br>
+  The SciPost Team.
 </p>
 {% include 'email/_footer.html' %}
+
+{% include 'email/_submission_thread_uuid' 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 3f26c5490..f30ad08a8 100644
--- a/templates/email/referees/invite_contributor_to_referee_reminder2.html
+++ b/templates/email/referees/invite_contributor_to_referee_reminder2.html
@@ -1,12 +1,12 @@
 <h3>Re: refereeing invitation. Second (and last) automatic reminder</h3>
 <p>
-  Dear {{invitation.referee.get_title_display}} {{invitation.referee.user.last_name}},
+  Dear {{ invitation.referee.get_title_display }} {{ invitation.referee.user.last_name }},
 </p>
 <p>
   Recently, on behalf of the Editor-in-charge {{ invitation.submission.editor_in_charge.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }}, we invited you to consider refereeing a Submission to {{ invitation.submission.submitted_to }}, namely<br><br>
-    {{ invitation.submission.title }}<br>
-    by {{ invitation.submission.author_list }}<br>
-    (see https://scipost.org{{ invitation.submission.get_absolute_url }} - first submitted {{ invitation.submission.original_submission_date|date:"d M Y" }}).
+  {{ invitation.submission.title }}<br>
+  by {{ invitation.submission.author_list }}<br>
+  (see https://scipost.org{{ invitation.submission.get_absolute_url }} - first submitted {{ invitation.submission.original_submission_date|date:"d M Y" }}).
 </p>
 <p>
   We are still awaiting your response to this invitation.
@@ -14,17 +14,19 @@
   could you please let us know whether we can count on your expertise?
 </p>
 <p>
-    Please <a href="https://scipost.org/submissions/accept_or_decline_ref_invitations">accept or decline</a> (login required) this invitation.
+  Please <a href="https://scipost.org/submissions/accept_or_decline_ref_invitations">accept or decline</a> (login required) this invitation.
 </p>
 <p>
-    If you accept, your report can be submitted by simply clicking on the "Contribute a Report" link on <a href="https://scipost.org{{invitation.submission.get_absolute_url}}">the Submission Page</a> before the reporting deadline (currently set at {{invitation.submission.reporting_deadline|date:'d M Y'}}; your report will be automatically recognized as an invited report).
+  If you accept, your report can be submitted by simply clicking on the "Contribute a Report" link on <a href="https://scipost.org{{ invitation.submission.get_absolute_url }}">the Submission Page</a> before the reporting deadline (currently set at {{ invitation.submission.reporting_deadline|date:'d M Y' }}; your report will be automatically recognized as an invited report).
 </p>
 <p>
-    You might want to make sure you are familiar with our <a href="https://scipost.org{% url 'submissions:sub_and_ref_procedure' %}">refereeing procedure</a>, <a href="https://scipost.org{% url 'submissions:referee_guidelines' %}">referee guidelines</a> and <a href="https://scipost.org{% url 'journals:journals_terms_and_conditions' %}#referee_code_of_conduct">referee code of conduct</a>.
+  You might want to make sure you are familiar with our <a href="https://scipost.org{% url 'submissions:sub_and_ref_procedure' %}">refereeing procedure</a>, <a href="https://scipost.org{% url 'submissions:referee_guidelines' %}">referee guidelines</a> and <a href="https://scipost.org{% url 'journals:journals_terms_and_conditions' %}#referee_code_of_conduct">referee code of conduct</a>.
 </p>
 <p>
-    We would be extremely grateful for your contribution, and thank you in advance for your consideration.
-    <br><br>
-    The SciPost Team.
+  We would be extremely grateful for your contribution, and thank you in advance for your consideration.
+  <br><br>
+  The SciPost Team.
 </p>
 {% include 'email/_footer.html' %}
+
+{% include 'email/_submission_thread_uuid' 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 0080a835a..c755d6816 100644
--- a/templates/email/referees/invite_unregistered_to_referee.html
+++ b/templates/email/referees/invite_unregistered_to_referee.html
@@ -1,18 +1,18 @@
 <p>
-Dear {{ invitation.get_title_display }} {{ invitation.last_name }},
+  Dear {{ invitation.get_title_display }} {{ invitation.last_name }},
 </p>
 <p>
-    On behalf of the Editor-in-charge {{ invitation.submission.editor_in_charge.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }}, we would like to invite you to referee a Submission to {{ invitation.submission.submitted_to }}, namely<br><br>
-    {{ invitation.submission.title }}<br>
-    by {{ invitation.submission.author_list }}<br>
-    (see https://scipost.org{{ invitation.submission.get_absolute_url }} - first submitted {{ invitation.submission.original_submission_date|date:"d M Y" }}).
+  On behalf of the Editor-in-charge {{ invitation.submission.editor_in_charge.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }}, we would like to invite you to referee a Submission to {{ invitation.submission.submitted_to }}, namely<br><br>
+  {{ invitation.submission.title }}<br>
+  by {{ invitation.submission.author_list }}<br>
+  (see https://scipost.org{{ invitation.submission.get_absolute_url }} - first submitted {{ invitation.submission.original_submission_date|date:"d M Y" }}).
 </p>
 <p>
-    To ensure timely processing of the submission (out of respect for the authors),
-    we would appreciate a quick accept/decline response from you, ideally within the next 2 days.
+  To ensure timely processing of the submission (out of respect for the authors),
+  we would appreciate a quick accept/decline response from you, ideally within the next 2 days.
 </p>
 <p>
-    If you are <strong>not</strong> able to provide a Report, you can let us know by simply <a href="https://scipost.org/submissions/decline_ref_invitation/{{ invitation.invitation_key }}"> clicking here</a>.
+  If you are <strong>not</strong> able to provide a Report, you can let us know by simply <a href="https://scipost.org/submissions/decline_ref_invitation/{{ invitation.invitation_key }}"> clicking here</a>.
 </p>
 <p>
   If you are able to provide a Report, you can confirm this after registering and logging in (you will automatically be prompted for a confirmation).
@@ -23,14 +23,16 @@ Dear {{ invitation.get_title_display }} {{ invitation.last_name }},
   After activation of your registration, you will be allowed to contribute, in particular by providing referee reports.
 </p>
 <p>
-    You might want to make sure you are familiar with our <a href="https://scipost.org{% url 'submissions:sub_and_ref_procedure' %}">refereeing procedure</a>, <a href="https://scipost.org{% url 'submissions:referee_guidelines' %}">referee guidelines</a> and <a href="https://scipost.org{% url 'journals:journals_terms_and_conditions' %}#referee_code_of_conduct">referee code of conduct</a>.
+  You might want to make sure you are familiar with our <a href="https://scipost.org{% url 'submissions:sub_and_ref_procedure' %}">refereeing procedure</a>, <a href="https://scipost.org{% url 'submissions:referee_guidelines' %}">referee guidelines</a> and <a href="https://scipost.org{% url 'journals:journals_terms_and_conditions' %}#referee_code_of_conduct">referee code of conduct</a>.
 </p>
 <p>
-    We very much hope that we can count on your expertise,
-    <br>
-    Many thanks in advance,
-    <br><br>
-    The SciPost Team
+  We very much hope that we can count on your expertise,
+  <br>
+  Many thanks in advance,
+  <br><br>
+  The SciPost Team
 </p>
 
 {% include 'email/_footer.html' %}
+
+{% include 'email/_submission_thread_uuid' 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 aa37c5ac7..d6da26b9f 100644
--- a/templates/email/referees/invite_unregistered_to_referee_reminder1.html
+++ b/templates/email/referees/invite_unregistered_to_referee_reminder1.html
@@ -4,9 +4,9 @@
 </p>
 <p>
   Recently, on behalf of the Editor-in-charge {{ invitation.submission.editor_in_charge.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }}, we invited you to consider refereeing a Submission to {{ invitation.submission.submitted_to }}, namely<br><br>
-    {{ invitation.submission.title }}<br>
-    by {{ invitation.submission.author_list }}<br>
-    (see https://scipost.org{{ invitation.submission.get_absolute_url }} - first submitted {{ invitation.submission.original_submission_date|date:"d M Y" }}).
+  {{ invitation.submission.title }}<br>
+  by {{ invitation.submission.author_list }}<br>
+  (see https://scipost.org{{ invitation.submission.get_absolute_url }} - first submitted {{ invitation.submission.original_submission_date|date:"d M Y" }}).
 </p>
 <p>
   We are still awaiting your response to this invitation.
@@ -14,7 +14,7 @@
   could you please let us know whether we can count on your expertise?
 </p>
 <p>
-    If you are <strong>not</strong> able to provide a Report, you can let us know by simply <a href="https://scipost.org/submissions/decline_ref_invitation/{{ invitation.invitation_key }}"> clicking here</a>.
+  If you are <strong>not</strong> able to provide a Report, you can let us know by simply <a href="https://scipost.org/submissions/decline_ref_invitation/{{ invitation.invitation_key }}"> clicking here</a>.
 </p>
 <p>
   If you are able to provide a Report, you can confirm this after registering and logging in (you will automatically be prompted for a confirmation).
@@ -25,14 +25,16 @@
   After activation of your registration, you will be allowed to contribute, in particular by providing referee reports.
 </p>
 <p>
-    You might want to make sure you are familiar with our <a href="https://scipost.org{% url 'submissions:sub_and_ref_procedure' %}">refereeing procedure</a>, <a href="https://scipost.org{% url 'submissions:referee_guidelines' %}">referee guidelines</a> and <a href="https://scipost.org{% url 'journals:journals_terms_and_conditions' %}#referee_code_of_conduct">referee code of conduct</a>.
+  You might want to make sure you are familiar with our <a href="https://scipost.org{% url 'submissions:sub_and_ref_procedure' %}">refereeing procedure</a>, <a href="https://scipost.org{% url 'submissions:referee_guidelines' %}">referee guidelines</a> and <a href="https://scipost.org{% url 'journals:journals_terms_and_conditions' %}#referee_code_of_conduct">referee code of conduct</a>.
 </p>
 <p>
-    We very much hope that we can count on your expertise,
-    <br>
-    Many thanks in advance,
-    <br><br>
-    The SciPost Team
+  We very much hope that we can count on your expertise,
+  <br>
+  Many thanks in advance,
+  <br><br>
+  The SciPost Team
 </p>
 
 {% include 'email/_footer.html' %}
+
+{% include 'email/_submission_thread_uuid' 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 6fa3f0048..7bfb2410a 100644
--- a/templates/email/referees/invite_unregistered_to_referee_reminder2.html
+++ b/templates/email/referees/invite_unregistered_to_referee_reminder2.html
@@ -4,9 +4,9 @@
 </p>
 <p>
   Recently, on behalf of the Editor-in-charge {{ invitation.submission.editor_in_charge.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }}, we invited you to consider refereeing a Submission to {{ invitation.submission.submitted_to }}, namely<br><br>
-    {{ invitation.submission.title }}<br>
-    by {{ invitation.submission.author_list }}<br>
-    (see https://scipost.org{{ invitation.submission.get_absolute_url }} - first submitted {{ invitation.submission.original_submission_date|date:"d M Y" }}).
+  {{ invitation.submission.title }}<br>
+  by {{ invitation.submission.author_list }}<br>
+  (see https://scipost.org{{ invitation.submission.get_absolute_url }} - first submitted {{ invitation.submission.original_submission_date|date:"d M Y" }}).
 </p>
 <p>
   We are still awaiting your response to this invitation.
@@ -14,7 +14,7 @@
   could you please let us know whether we can count on your expertise?
 </p>
 <p>
-    If you are <strong>not</strong> able to provide a Report, you can let us know by simply <a href="https://scipost.org/submissions/decline_ref_invitation/{{ invitation.invitation_key }}"> clicking here</a>.
+  If you are <strong>not</strong> able to provide a Report, you can let us know by simply <a href="https://scipost.org/submissions/decline_ref_invitation/{{ invitation.invitation_key }}"> clicking here</a>.
 </p>
 <p>
   If you are able to provide a Report, you can confirm this after registering and logging in (you will automatically be prompted for a confirmation).
@@ -25,14 +25,16 @@
   After activation of your registration, you will be allowed to contribute, in particular by providing referee reports.
 </p>
 <p>
-    You might want to make sure you are familiar with our <a href="https://scipost.org{% url 'submissions:sub_and_ref_procedure' %}">refereeing procedure</a>, <a href="https://scipost.org{% url 'submissions:referee_guidelines' %}">referee guidelines</a> and <a href="https://scipost.org{% url 'journals:journals_terms_and_conditions' %}#referee_code_of_conduct">referee code of conduct</a>.
+  You might want to make sure you are familiar with our <a href="https://scipost.org{% url 'submissions:sub_and_ref_procedure' %}">refereeing procedure</a>, <a href="https://scipost.org{% url 'submissions:referee_guidelines' %}">referee guidelines</a> and <a href="https://scipost.org{% url 'journals:journals_terms_and_conditions' %}#referee_code_of_conduct">referee code of conduct</a>.
 </p>
 <p>
-    We very much hope that we can count on your expertise,
-    <br>
-    Many thanks in advance,
-    <br><br>
-    The SciPost Team
+  We very much hope that we can count on your expertise,
+  <br>
+  Many thanks in advance,
+  <br><br>
+  The SciPost Team
 </p>
 
 {% include 'email/_footer.html' %}
+
+{% include 'email/_submission_thread_uuid' 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 35471c59b..6d14b02ff 100644
--- a/templates/email/referees/reinvite_contributor_to_referee.html
+++ b/templates/email/referees/reinvite_contributor_to_referee.html
@@ -1,29 +1,32 @@
 <p>Dear {{ invitation.get_title_display }} {{ invitation.last_name }},</p>
 
 <p>
-    The authors of submission
-
-    <br><br>
-    {{invitation.submission.title}}
-    <br>
-    by {{invitation.submission.author_list}}
-    <br>
-    (<a href="https://scipost.org{{ invitation.submission.get_absolute_url }}">see on SciPost.org</a>)
+  The authors of submission
+  <br><br>
+  {{ invitation.submission.title }}
+  <br>
+  by {{ invitation.submission.author_list }}
+  <br>
+  (<a href="https://scipost.org{{ invitation.submission.get_absolute_url }}">see on SciPost.org</a>)
+</p>
+<p>
+  have resubmitted their manuscript to SciPost. On behalf of the Editor-in-charge {{ invitation.submission.editor_in_charge.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }}, we would like to invite you to quickly review this new version.
 </p>
 <p>
-    have resubmitted their manuscript to SciPost. On behalf of the Editor-in-charge {{invitation.submission.editor_in_charge.get_title_display}} {{invitation.submission.editor_in_charge.user.last_name}}, we would like to invite you to quickly review this new version.
-    Please accept or decline the invitation (login required) as soon as possible (ideally within the next 2 days).
+  Please accept or decline the invitation (login required) as soon as possible (ideally within the next 2 days).
 </p>
 <p>
-    If you accept, your report can be submitted by simply clicking on the "Contribute a Report" link on the Submission's Page before the reporting deadline (currently set at {{invitation.submission.reporting_deadline|date:'N j, Y'}}; your report will be automatically recognized as an invited report).
+  If you accept, your report can be submitted by simply clicking on the "Contribute a Report" link on the Submission's Page before the reporting deadline (currently set at {{ invitation.submission.reporting_deadline|date:'N j, Y' }}; your report will be automatically recognized as an invited report).
 </p>
 <p>
-    You might want to make sure you are familiar with our refereeing code of conduct and with the refereeing procedure.
+  You might want to make sure you are familiar with our refereeing code of conduct and with the refereeing procedure.
 </p>
 <p>
-    We would be extremely grateful for your contribution, and thank you in advance for your consideration.
-    <br><br>
-    The SciPost Team.
+  We would be extremely grateful for your contribution, and thank you in advance for your consideration.
+  <br><br>
+  The SciPost Team.
 </p>
 
 {% include 'email/_footer.html' %}
+
+{% include 'email/_submission_thread_uuid' 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 3ef9275a7..cbc4f2950 100644
--- a/templates/email/referees/remind_referee_deadline_1week.html
+++ b/templates/email/referees/remind_referee_deadline_1week.html
@@ -1,11 +1,11 @@
 <p>
-    Dear {{invitation.referee.get_title_display}} {{invitation.referee.user.last_name}},
+  Dear {{ invitation.referee.get_title_display }} {{ invitation.referee.user.last_name }},
 </p>
 <p>
   This is a simple email to remind you of the approaching deadline (in one week) to send a Report on
   <br><br>
-  {{invitation.submission.title}}
-  <br>by {{invitation.submission.author_list}}<br>
+  {{ invitation.submission.title }}
+  <br>by {{ invitation.submission.author_list }}<br>
   (see https://scipost.org{{ invitation.submission.get_absolute_url }} - first submitted {{ invitation.submission.original_submission_date|date:"d M Y" }}).
 </p>
 <p>
@@ -14,3 +14,5 @@
   The SciPost Team.
 </p>
 {% include 'email/_footer.html' %}
+
+{% include 'email/_submission_thread_uuid' with submission=invitation.submission %}
diff --git a/templates/email/submissions_assignment_failed.html b/templates/email/submissions_assignment_failed.html
index 61cdaf624..b4958fe4b 100644
--- a/templates/email/submissions_assignment_failed.html
+++ b/templates/email/submissions_assignment_failed.html
@@ -15,3 +15,5 @@
 <p>The SciPost Team.</p>
 
 {% include 'email/_footer.html' %}
+
+{% include 'email/_submission_thread_uuid' with submission=object %}
-- 
GitLab