diff --git a/lms/templates/courseware/course_updates.html b/lms/templates/courseware/course_updates.html
index 28dde7f258..eea03d65f5 100644
--- a/lms/templates/courseware/course_updates.html
+++ b/lms/templates/courseware/course_updates.html
@@ -1,3 +1,4 @@
+<%page expression_filter="h"/>
<%! from django.utils.translation import ugettext as _ %>
% for index, update in enumerate(visible_updates):
@@ -14,7 +15,7 @@
>
% endif
- ${update.get("content")}
+ ${update.get("content") | n, decode.utf8}
% endfor
@@ -42,7 +43,7 @@
aria-controls="msg-content-${index + len(visible_updates)}"
aria-expanded="false"
>
-
${update.get("content")}
+
${update.get("content") | n, decode.utf8}
% endfor
diff --git a/lms/templates/courseware/error-message.html b/lms/templates/courseware/error-message.html
index d76982d38f..3f88d93d10 100644
--- a/lms/templates/courseware/error-message.html
+++ b/lms/templates/courseware/error-message.html
@@ -1,10 +1,11 @@
## mako
+<%page expression_filter="h"/>
<%namespace name='static' file='../static_content.html'/>
<%!
from django.utils.translation import ugettext as _
from openedx.core.djangolib.markup import HTML, Text
%>
<%
- tech_support_email='{tech_support_email}'.format(tech_support_email=static.get_tech_support_email_address())
+ tech_support_email=HTML('{tech_support_email}').format(tech_support_email=static.get_tech_support_email_address())
%>
-${_("We're sorry, this module is temporarily unavailable. Our staff is working to fix it as soon as possible. Please email us at {tech_support_email} to report any problems or downtime.").format(tech_support_email=tech_support_email)}
+${Text(_("We're sorry, this module is temporarily unavailable. Our staff is working to fix it as soon as possible. Please email us at {tech_support_email} to report any problems or downtime.")).format(tech_support_email=tech_support_email)}
diff --git a/lms/templates/courseware/gradebook.html b/lms/templates/courseware/gradebook.html
index ebf1b5586b..dbae15c386 100644
--- a/lms/templates/courseware/gradebook.html
+++ b/lms/templates/courseware/gradebook.html
@@ -1,3 +1,4 @@
+<%page expression_filter="h"/>
<%inherit file="/main.html" />
<%namespace name='static' file='/static_content.html'/>
<%!
diff --git a/lms/templates/courseware/news.html b/lms/templates/courseware/news.html
index 706292f569..f50a4ce709 100644
--- a/lms/templates/courseware/news.html
+++ b/lms/templates/courseware/news.html
@@ -1,3 +1,4 @@
+<%page expression_filter="h"/>
<%inherit file="main.html" />
<%namespace name='static' file='../static_content.html'/>
<%! from django.utils.translation import ugettext as _ %>
@@ -18,7 +19,7 @@
${_("Updates to Discussion Posts You Follow")}
- ${content}
+ ${content | n, decode.utf8}
diff --git a/lms/templates/courseware/syllabus.html b/lms/templates/courseware/syllabus.html
index 64e6dd494e..e4c05cf6fa 100644
--- a/lms/templates/courseware/syllabus.html
+++ b/lms/templates/courseware/syllabus.html
@@ -1,3 +1,4 @@
+<%page expression_filter="h"/>
<%inherit file="/main.html" />
<%namespace name='static' file='/static_content.html'/>
<%!
@@ -10,7 +11,7 @@ from courseware.courses import get_course_syllabus_section
<%static:css group='style-course'/>
%block>
-<%block name="pagetitle">${_("{course.display_number_with_default} Course Info").format(course=course) | h}%block>
+<%block name="pagetitle">${_("{course.display_number_with_default} Course Info").format(course=course)}%block>
<%include file="/courseware/course_navigation.html" args="active_page='syllabus'" />
@@ -19,9 +20,9 @@ from courseware.courses import get_course_syllabus_section
${_("Syllabus")}
% if user.is_authenticated:
- ${get_course_syllabus_section(course, 'syllabus')}
+ ${get_course_syllabus_section(course, 'syllabus') | n, decode.utf8}
% else:
- ${get_course_syllabus_section(course, 'guest_syllabus')}
+ ${get_course_syllabus_section(course, 'guest_syllabus') | n, decode.utf8}
% endif