diff --git a/templates/discussion_list.mustache b/templates/discussion_list.mustache
index 65280550fd5..5807ddb4369 100644
--- a/templates/discussion_list.mustache
+++ b/templates/discussion_list.mustache
@@ -183,7 +183,7 @@
                 {{/canviewdiscussions}}
 
                 <td class="topic starter">
-                    <a href="{{ subjectlink }}">{{ subjecttext }}</a>
+                    <a href="{{ subjectlink }}">{{{ subjecttext }}}</a>
                 </td>
 
                 <td class="picture">
diff --git a/templates/question.mustache b/templates/question.mustache
index 80a7df4c2e2..4c074d281f9 100644
--- a/templates/question.mustache
+++ b/templates/question.mustache
@@ -53,7 +53,7 @@
                 {{#isfirstpost}}
                 {{! The subject. }}
                     <div class="subject" role="heading" aria-level="2">
-                        {{ subject }}
+                        {{{ subject }}}
                     </div>
                 {{/isfirstpost}}
 
@@ -142,4 +142,4 @@
 
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>