diff --git a/ietf/dbtemplate/templates/dbtemplate/template_show.html b/ietf/dbtemplate/templates/dbtemplate/template_show.html
index 60e3bb9c7cd..a3a77ed4566 100644
--- a/ietf/dbtemplate/templates/dbtemplate/template_show.html
+++ b/ietf/dbtemplate/templates/dbtemplate/template_show.html
@@ -34,7 +34,7 @@ <h2>Meta information</h2>
     <h2>Template content</h2>
 
     <div class="card">
-        <p class="pasted">{{ template.content }}</p>
+        <pre class="pasted">{{ template.content|escape }}</pre>
     </div>
 
 {% endblock %}
diff --git a/ietf/templates/nomcom/view_feedback_nominee.html b/ietf/templates/nomcom/view_feedback_nominee.html
index 2dd53d41d28..b26595f0c95 100644
--- a/ietf/templates/nomcom/view_feedback_nominee.html
+++ b/ietf/templates/nomcom/view_feedback_nominee.html
@@ -78,9 +78,9 @@ <h2>Feedback about {{ nominee }}</h2>
                             <dt class="col-sm-2">
                                 Feedback
                             </dt>
-                            <dd class="col-sm-10 pasted">
+                            <dd class="col-sm-10 pasted"><pre>
                                 {% decrypt feedback.comments request year 1 %}
-                            </dd>
+                            </pre></dd>
                         </dl>
                         {% if not forloop.last %}<hr>{% endif %}
                     {% endif %}
diff --git a/ietf/templates/nomcom/view_feedback_topic.html b/ietf/templates/nomcom/view_feedback_topic.html
index 20ee49ad08c..ea634ba237f 100644
--- a/ietf/templates/nomcom/view_feedback_topic.html
+++ b/ietf/templates/nomcom/view_feedback_topic.html
@@ -41,9 +41,9 @@ <h2>Feedback about {{ topic.subject }}</h2>
                             <dt class="col-sm-2">
                                 Feedback
                             </dt>
-                            <dd class="col-sm-10 pasted">
+                            <dd class="col-sm-10 pasted"><pre>
                                 {% decrypt feedback.comments request year 1 %}
-                            </dd>
+                            </pre></dd>
                         </dl>
                         {% if not forloop.last %}<hr>{% endif %}
                     {% endif %}
diff --git a/ietf/templates/nomcom/view_feedback_unrelated.html b/ietf/templates/nomcom/view_feedback_unrelated.html
index b098d7748de..013affe6d87 100644
--- a/ietf/templates/nomcom/view_feedback_unrelated.html
+++ b/ietf/templates/nomcom/view_feedback_unrelated.html
@@ -42,9 +42,9 @@ <h2>Feedback not related to nominees</h2>
                         <dt class="col-sm-2">
                             Feedback
                         </dt>
-                        <dd class="col-sm-10 pasted">
+                        <dd class="col-sm-10 pasted"><pre>
                             {% decrypt feedback.comments request year 1 %}
-                        </dd>
+                        </pre></dd>
                     </dl>
                 {% endfor %}
             </div>