diff --git a/omod/src/main/webapp/template/headerFull.jsp b/omod/src/main/webapp/template/headerFull.jsp
index 0add96c3..2a7643f5 100644
--- a/omod/src/main/webapp/template/headerFull.jsp
+++ b/omod/src/main/webapp/template/headerFull.jsp
@@ -175,7 +175,7 @@
 			</openmrs:forEachAlert>
 
 			<c:if test="${msg != null}">
-				<div id="openmrs_msg"><openmrs:message code="${msg}" text="${msg}" arguments="${msgArgs}"  htmlEscape="false" /></div>
+				<div id="openmrs_msg"><openmrs:message code="<c:out value='${msg}'/>" text="<c:out value='${msg}'/>" arguments="<c:out value='${msgArgs}'/>" htmlEscape="false" /></div>
 			</c:if>
 			<c:if test="${err != null}">
 				<div id="openmrs_error"><openmrs:message code="${err}" text="${err}" arguments="${errArgs}" htmlEscape="false"/></div>
diff --git a/omod/src/main/webapp/template/headerMinimal.jsp b/omod/src/main/webapp/template/headerMinimal.jsp
index 9cc4fed2..2de6e62e 100644
--- a/omod/src/main/webapp/template/headerMinimal.jsp
+++ b/omod/src/main/webapp/template/headerMinimal.jsp
@@ -94,7 +94,7 @@
 	<div id="pageBody">
 		<div id="contentMinimal">
 			<c:if test="${msg != null}">
-				<div id="openmrs_msg"><openmrs:message code="${msg}" text="${msg}" arguments="${msgArgs}" htmlEscape="false" /></div>
+				<div id="openmrs_msg"><openmrs:message code="<c:out value='${msg}'/>" text="<c:out value='${msg}'/>" arguments="<c:out value='${msgArgs}'/>" htmlEscape="false" /></div>
 			</c:if>
 			<c:if test="${err != null}">
 				<div id="openmrs_error"><openmrs:message code="${err}" text="${err}" arguments="${errArgs}"/></div>