diff --git a/scm-webapp/src/main/java/sonia/scm/template/TemplateServlet.java b/scm-webapp/src/main/java/sonia/scm/template/TemplateServlet.java
index bbbd122818..2785b5a6e2 100644
--- a/scm-webapp/src/main/java/sonia/scm/template/TemplateServlet.java
+++ b/scm-webapp/src/main/java/sonia/scm/template/TemplateServlet.java
@@ -63,6 +63,12 @@ import javax.servlet.http.HttpServletResponse;
 public class TemplateServlet extends HttpServlet
 {
 
+  /** Field description */
+  public static final String CONTENT_TYPE = "text/html";
+
+  /** Field description */
+  public static final String ENCODING = "UTF-8";
+
   /** Field description */
   private static final long serialVersionUID = 3578555653924091546L;
 
@@ -132,6 +138,8 @@ public class TemplateServlet extends HttpServlet
 
     try
     {
+      response.setCharacterEncoding(ENCODING);
+      response.setContentType(CONTENT_TYPE);
       writer = response.getWriter();
       templateHandler.render(templateName, writer, params);
     }