diff --git a/templates/email/email_fellow_tasklist.html b/templates/email/email_fellow_tasklist.html
index 1d033731a96330c9dd92d0cad39e706367ccea45..78178cb9d6c55949d131fcb0d4b7ffdf68c50e16 100644
--- a/templates/email/email_fellow_tasklist.html
+++ b/templates/email/email_fellow_tasklist.html
@@ -17,11 +17,10 @@
 <ul>
   {% for assignment in assignments_ongoing %}
   <li>
+    <h3><a href="https://scipost.org{% url 'submissions:submission' assignment.submission.arxiv_identifier_w_vn_nr %}">{{ assignment.submission.title }}</a></h3>
     <p>
-      <h3><a href="https://scipost.org{% url 'submissions:submission' assignment.submission.arxiv_identifier_w_vn_nr %}">{{ assignment.submission.title }}</a></h3>
       <em>by {{ assignment.submission.author_list }}</em>
     </p>
-    <p><a href="https://scipost.org{% url 'submissions:editorial_page' assignment.submission.arxiv_identifier_w_vn_nr %}">Go to this Submission's Editorial page</a></p>
     {% if assignment.submission.cycle.has_required_actions %}
     <h3>Required actions:</h3>
     <ul>
@@ -31,6 +30,7 @@
       <li>No actions required</li>
       {% endfor %}
     </ul>
+    <p><em>Manage this Submission from its </em><a href="https://scipost.org{% url 'submissions:editorial_page' assignment.submission.arxiv_identifier_w_vn_nr %}">Editorial page</a></p>
     {% endif %}
   </li>
   {% endfor %}
@@ -41,12 +41,12 @@
 <ul>
   {% for assignment in assignments_upcoming_deadline %}
   <li>
+    <h3><a href="https://scipost.org{% url 'submissions:pool' assignment.submission.arxiv_identifier_w_vn_nr %}">{{ assignment.submission.title }}</a></h3>
     <p>
-      <h3><a href="https://scipost.org{% url 'submissions:pool' assignment.submission.arxiv_identifier_w_vn_nr %}">{{ assignment.submission.title }}</a></h3>
       <em>by {{ assignment.submission.author_list }}</em>
     </p>
     <p>Refereeing deadline: {{ assignment.submission.reporting_deadline|date:"Y-m-d" }}.</p>
-    <p><a href="https://scipost.org{% url 'submissions:editorial_page' assignment.submission.arxiv_identifier_w_vn_nr %}">Go to this Submission's Editorial page</a></p>
+    <p><em>Manage this Submission from its </em><a href="https://scipost.org{% url 'submissions:editorial_page' assignment.submission.arxiv_identifier_w_vn_nr %}">Editorial page</a></p>
   </li>
   {% endfor %}
 </ul>