diff --git a/ietf/templates/idrfc/ballot_comment_mail.txt b/ietf/templates/idrfc/ballot_comment_mail.txt
index 7ffbf3eac..011d4a8aa 100644
--- a/ietf/templates/idrfc/ballot_comment_mail.txt
+++ b/ietf/templates/idrfc/ballot_comment_mail.txt
@@ -1,4 +1,4 @@
-{{ ad }} has entered the following ballot position for
+{% autoescape off %}{{ ad }} has entered the following ballot position for
 {{ doc.filename }}-{{ doc.revision_display }}: {{ pos.name }}
 
 When responding, please keep the subject line intact and reply to all
@@ -25,3 +25,4 @@ COMMENT:
 
 {{ comment|safe }}
 {% endif %}
+{% endautoescape %}
diff --git a/ietf/templates/idrfc/ballot_deferred_email.txt b/ietf/templates/idrfc/ballot_deferred_email.txt
index 7448ed92c..f08daa201 100644
--- a/ietf/templates/idrfc/ballot_deferred_email.txt
+++ b/ietf/templates/idrfc/ballot_deferred_email.txt
@@ -1,3 +1,4 @@
-{% filter wordwrap:73 %}Ballot of {{ doc.file_tag }} has been deferred by {{ by }}.{% endfilter %}
+{% autoescape off %}{% filter wordwrap:73 %}Ballot of {{ doc.file_tag }} has been deferred by {{ by }}.{% endfilter %}
 
 This ballot will be on the IESG agenda of {{ telechat_date }}.
+{% endautoescape %}
diff --git a/ietf/templates/idrfc/issue_ballot_mail.txt b/ietf/templates/idrfc/issue_ballot_mail.txt
index 736c1a1e4..e96619669 100644
--- a/ietf/templates/idrfc/issue_ballot_mail.txt
+++ b/ietf/templates/idrfc/issue_ballot_mail.txt
@@ -37,4 +37,4 @@ DISCUSSES AND COMMENTS
 
 {{ doc.idinternal.ballot.ballot_writeup }}
 {% endif %}
-{% endautoescape%}
\ No newline at end of file
+{% endautoescape%}
diff --git a/ietf/templates/idrfc/resurrect_completed_email.txt b/ietf/templates/idrfc/resurrect_completed_email.txt
index 5e40f41b5..c6ae1994a 100644
--- a/ietf/templates/idrfc/resurrect_completed_email.txt
+++ b/ietf/templates/idrfc/resurrect_completed_email.txt
@@ -1,4 +1,5 @@
-As you requsted, the Internet Draft {{ doc.file_tag|safe }}
+{% autoescape off %}As you requsted, the Internet Draft {{ doc.file_tag|safe }}
 has been resurrected.
 
 ID Tracker URL: {{ url|safe }}
+{% endautoescape %}
diff --git a/ietf/templates/idrfc/resurrect_request_email.txt b/ietf/templates/idrfc/resurrect_request_email.txt
index b2be1f627..8cf06c671 100644
--- a/ietf/templates/idrfc/resurrect_request_email.txt
+++ b/ietf/templates/idrfc/resurrect_request_email.txt
@@ -1,3 +1,4 @@
-I-D that is requested to be resurrected: {{ doc.file_tag|safe }}
+{% autoescape off %}I-D that is requested to be resurrected: {{ doc.file_tag|safe }}
 Requested by: {{ by|safe }}
 ID Tracker URL: {{ url|safe }}
+{% endautoescape %}
diff --git a/ietf/templates/idrfc/state_changed_email.txt b/ietf/templates/idrfc/state_changed_email.txt
index cea35efea..048e15949 100644
--- a/ietf/templates/idrfc/state_changed_email.txt
+++ b/ietf/templates/idrfc/state_changed_email.txt
@@ -1,2 +1,3 @@
-{{ text }}
+{% autoescape off %}{{ text }}
 ID Tracker URL: {{ url }}
+{% endautoescape %}
diff --git a/ietf/templates/ipr/new_update_email.txt b/ietf/templates/ipr/new_update_email.txt
index 1865cf8cd..643ec00e5 100644
--- a/ietf/templates/ipr/new_update_email.txt
+++ b/ietf/templates/ipr/new_update_email.txt
@@ -1,5 +1,6 @@
-A new IPR disclosure has been submitted.
+{% autoescape off %}A new IPR disclosure has been submitted.
 Please check it and post it.
 https://datatracker.ietf.org/cgi-bin/ipr_admin/ipr_admin.cgi
 
 {% include "ipr/details.txt" %}
+{% endautoescape %}
diff --git a/ietf/templates/submit/manual_post_mail.txt b/ietf/templates/submit/manual_post_mail.txt
index 50c468f4b..36d500a4b 100644
--- a/ietf/templates/submit/manual_post_mail.txt
+++ b/ietf/templates/submit/manual_post_mail.txt
@@ -1,4 +1,4 @@
-Manual posting has been requested for the following Internet-Draft:
+{% autoescape off %}Manual posting has been requested for the following Internet-Draft:
 
 I-D Submission Tool URL: http://{{ domain }}/submit/status/{{ draft.submission_id }}/
 
@@ -20,3 +20,4 @@ Author(s):
 {% endfor %}
 
 {{ draft.comment_to_sec }}
+{% endautoescape %}
diff --git a/ietf/templates/submit/submission_approval.txt b/ietf/templates/submit/submission_approval.txt
index 9fda7c059..fb2c36c39 100644
--- a/ietf/templates/submit/submission_approval.txt
+++ b/ietf/templates/submit/submission_approval.txt
@@ -1,6 +1,6 @@
 WG chair approval is needed for posting of {{ draft.filename }}-{{ draft.revision }} draft 
 
-I-D Submission Tool URL: http://{{ domain }}/submit/status/{{ draft.submission_id }}/
+I-D Submission Tool URL: http://{{ domain }}/submit/status/{{ draft.submission_id }}/{{ draft.submission_hash }}/
 
 File name: {{ draft.filename }}
 Version: {{ draft.revision }}