diff --git a/core/src/main/java/woko/facets/builtin/RenderMessages.java b/core/src/main/java/woko/facets/builtin/RenderMessages.java
index dbe58d19..5f9bfee5 100644
--- a/core/src/main/java/woko/facets/builtin/RenderMessages.java
+++ b/core/src/main/java/woko/facets/builtin/RenderMessages.java
@@ -1,8 +1,11 @@
 package woko.facets.builtin;
 
 import net.sourceforge.jfacets.IFacet;
+import net.sourceforge.stripes.action.Message;
 import woko.facets.FragmentFacet;
 
+import java.util.List;
+
 /**
  * Fragment facet used to render Stripes messages.
  */
@@ -10,4 +13,8 @@ public interface RenderMessages extends IFacet, FragmentFacet {
 
     static final String FACET_NAME = "renderMessages";
 
+    public List<Message> getMessages();
+
+    public boolean isEscapeXml();
+
 }
\ No newline at end of file
diff --git a/core/src/main/java/woko/facets/builtin/all/RenderMessagesImpl.java b/core/src/main/java/woko/facets/builtin/all/RenderMessagesImpl.java
index 95b83c33..f2beece7 100644
--- a/core/src/main/java/woko/facets/builtin/all/RenderMessagesImpl.java
+++ b/core/src/main/java/woko/facets/builtin/all/RenderMessagesImpl.java
@@ -27,4 +27,9 @@ public String getPath() {
     public List<Message> getMessages() {
         return (List<Message>)getFacetContext().getTargetObject();
     }
+
+    @Override
+    public boolean isEscapeXml() {
+        return true;
+    }
 }
diff --git a/webresources/core/src/main/webapp/WEB-INF/tags/woko/messages.tag b/webresources/core/src/main/webapp/WEB-INF/tags/woko/messages.tag
index 3e4f4281..0b9d7ecf 100644
--- a/webresources/core/src/main/webapp/WEB-INF/tags/woko/messages.tag
+++ b/webresources/core/src/main/webapp/WEB-INF/tags/woko/messages.tag
@@ -30,7 +30,7 @@
             <jsp:include page="<%=fragmentPath%>"/>
 <%
         } else {
-            // default to stripes messages handling
+            // default to stripes messages handling if no facet found
 %>
             <s:messages key="<%=key%>"/>
 <%
diff --git a/webresources/core/src/main/webapp/WEB-INF/woko/jsp/all/renderMessages.jsp b/webresources/core/src/main/webapp/WEB-INF/woko/jsp/all/renderMessages.jsp
new file mode 100644
index 00000000..864f010c
--- /dev/null
+++ b/webresources/core/src/main/webapp/WEB-INF/woko/jsp/all/renderMessages.jsp
@@ -0,0 +1,40 @@
+<%@ page import="woko.facets.builtin.RenderMessages" %>
+<%@ page import="net.sourceforge.stripes.action.Message" %>
+<%@ page import="java.util.List" %>
+<%@ page import="java.util.Locale" %>
+<%--
+~ Copyright 2001-2012 Remi Vankeisbelck
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~       http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@include file="/WEB-INF/woko/jsp/taglibs.jsp"%>
+<%
+    RenderMessages renderMessages = (RenderMessages)request.getAttribute(RenderMessages.FACET_NAME);
+    List<Message> messages = renderMessages.getMessages();
+    if (messages!=null && messages.size()>0) {
+        Locale locale = request.getLocale();
+%>
+        <ul class="wokoMessages">
+        <%
+            for (Message m : messages) {
+                String msgStr = m.getMessage(locale);
+        %>
+            <li><c:out value="<%=msgStr%>" escapeXml="<%=renderMessages.isEscapeXml()%>"/></li>
+        <%
+            }
+        %>
+        </ul>
+<%
+    }
+%>