diff --git a/webapp/web/templates/freemarker/body/error/error-email.ftl b/webapp/web/templates/freemarker/body/error/error-email.ftl
index f31b0c20d..d4972e42d 100644
--- a/webapp/web/templates/freemarker/body/error/error-email.ftl
+++ b/webapp/web/templates/freemarker/body/error/error-email.ftl
@@ -25,11 +25,14 @@
         </p>
         
         <p>
-            <strong>Stack trace</strong> (full trace available in the vivo log): ${stackTrace}
+            <strong>Stack trace</strong> (full trace available in the vivo log): 
+            <pre>${stackTrace}</pre>
         </p>
         
         <#if cause?has_content>
-            <p><strong>Caused by:</strong> ${cause}</p>
+            <p><strong>Caused by:</strong> 
+                <pre>${cause}</pre>
+            </p>
         </#if>
         
     </body>
@@ -43,10 +46,12 @@ Requested url: ${requestedUrl}
 
 Error message: ${errorMessage}
 
-Stack trace (full trace available in the vivo log): ${stackTrace}
+Stack trace (full trace available in the vivo log): 
+${stackTrace}
 
 <#if cause?has_content>
-Caused by: ${cause}
+Caused by: 
+${cause}
 </#if>       
 </#assign>