diff --git a/junit-report/src/plugin-resources/junit.jsl b/junit-report/src/plugin-resources/junit.jsl
index bc28e786..a718e3cb 100644
--- a/junit-report/src/plugin-resources/junit.jsl
+++ b/junit-report/src/plugin-resources/junit.jsl
@@ -63,9 +63,9 @@
     <define:tag name="displayFailure">
       <j:choose>
         <j:when test="${current.attribute('message') != null}">
-          <code>
+          <code><pre>
 ${current.attributeValue('message')}
-          </code>
+          </pre></code>
         </j:when>
         <j:otherwise>
           N/A
@@ -401,10 +401,10 @@ ${current.attributeValue('message')}
                         <td colspan="2">
                           <!-- removing stacktrace generated by maven -->
                           <!-- no way to preserve newlines, jelly strips out everything -->
-<code>
+<code><pre>
 ${exceptionTool.truncateNestedStackTrace(exceptionTool.truncateNestedStackTrace(failure.text, 'at org.apache.commons.jelly.tags.ant.AntTag.doTag'),
 'at sun.reflect.NativeMethodAccessorImpl.invoke0(')}
-</code>
+</pre></code>
                         </td>
                       </tr>
                     </tbody>
diff --git a/junit-report/xdocs/changes.xml b/junit-report/xdocs/changes.xml
index 4d762895..f87bdb88 100644
--- a/junit-report/xdocs/changes.xml
+++ b/junit-report/xdocs/changes.xml
@@ -26,6 +26,7 @@
   </properties>
   <body>
     <release version="1.5.1-SNAPSHOT" date="in SVN">
+      <action dev="ltheussl" type="fix" issue="MPJUNITREPORT-2">Fix formatting/escaping of error messages.</action>
       <action dev="ltheussl" type="add" issue="MPJUNITREPORT-10">Add ability to specify a custom jsl transform. New property <code>maven.junit.report.jsl</code>.</action>
       <action dev="ltheussl" type="add" issue="MPJUNITREPORT-11" due-to="Cyrille Le Clerc">Keep nested exceptions in truncated stack traces.</action>
       <action dev="ltheussl" type="add" issue="MPJUNITREPORT-6" due-to="Cyrille Le Clerc">Include System.out/System.err in the generated report.</action>
