Index: lams_admin/web/WEB-INF/lams.tld
===================================================================
diff -u -rf981e7d82c9163e9239cdcca2bfede78095fd841 -re4a1fb3c417f6227175bef9c7e20e985feec6a85
--- lams_admin/web/WEB-INF/lams.tld	(.../lams.tld)	(revision f981e7d82c9163e9239cdcca2bfede78095fd841)
+++ lams_admin/web/WEB-INF/lams.tld	(.../lams.tld)	(revision e4a1fb3c417f6227175bef9c7e20e985feec6a85)
@@ -60,7 +60,15 @@
            <rtexprvalue>true</rtexprvalue>
 
       </attribute>
+      <attribute>
+         <description>converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
+         <name>escapeXml</name>
+         <required>false</required>
 
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
    </tag>
    <tag>
 
Index: lams_central/src/java/org/lamsfoundation/lams/web/tag/MultiLinesOutputTag.java
===================================================================
diff -u -rd7e3e9b576a3af5c792fcdc41074b76464dd3d30 -re4a1fb3c417f6227175bef9c7e20e985feec6a85
--- lams_central/src/java/org/lamsfoundation/lams/web/tag/MultiLinesOutputTag.java	(.../MultiLinesOutputTag.java)	(revision d7e3e9b576a3af5c792fcdc41074b76464dd3d30)
+++ lams_central/src/java/org/lamsfoundation/lams/web/tag/MultiLinesOutputTag.java	(.../MultiLinesOutputTag.java)	(revision e4a1fb3c417f6227175bef9c7e20e985feec6a85)
@@ -5,6 +5,7 @@
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.SimpleTagSupport;
 
+import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 /**
  * JSP tag. It converts text from \n or \r\n to &lt;BR&gt; before rendering.
@@ -21,6 +22,8 @@
 	
 	private String value;
 	
+	private boolean escapeXml;
+	
 	@Override
 	public void doTag() throws JspException, IOException {
 		if(StringUtils.isEmpty(value))
@@ -30,7 +33,17 @@
 //		if(os.toLowerCase().indexOf("win") != -1)
 //			value = value.replaceAll("\r\n","<BR>");
 //		else
+		
+		if (escapeXml) {
+			String[] lines = value.split("\n");
+			value = new String();
+			for(String line: lines) {
+				value += StringEscapeUtils.escapeXml(line) + "<br>";
+			}			
+		} else {
 			value = value.replaceAll("\n","<BR>");
+		}
+
 		getJspContext().getOut().write(value.toString());
 	}
 
@@ -45,5 +58,16 @@
 	public void setValue(String value) {
 		this.value = value;
 	}
-
+	
+	/**
+	 * @jsp.attribute required="false" rtexprvalue="true" description="escape xml characters?
+	 * 
+	 */
+	public boolean getEscapeXml() {
+	    return this.escapeXml;
+	}
+	
+	public void setEscapeXml(boolean escapeXml) {
+	    this.escapeXml = escapeXml;
+	}
 }
Index: lams_central/web/WEB-INF/lams.tld
===================================================================
diff -u -rf981e7d82c9163e9239cdcca2bfede78095fd841 -re4a1fb3c417f6227175bef9c7e20e985feec6a85
--- lams_central/web/WEB-INF/lams.tld	(.../lams.tld)	(revision f981e7d82c9163e9239cdcca2bfede78095fd841)
+++ lams_central/web/WEB-INF/lams.tld	(.../lams.tld)	(revision e4a1fb3c417f6227175bef9c7e20e985feec6a85)
@@ -60,7 +60,15 @@
            <rtexprvalue>true</rtexprvalue>
 
       </attribute>
+      <attribute>
+         <description>converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
+         <name>escapeXml</name>
+         <required>false</required>
 
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
    </tag>
    <tag>
 
Index: lams_learning/web/WEB-INF/lams.tld
===================================================================
diff -u -r70a300c302bda759bf06c8bc54a5ca0884d8c48f -re4a1fb3c417f6227175bef9c7e20e985feec6a85
--- lams_learning/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 70a300c302bda759bf06c8bc54a5ca0884d8c48f)
+++ lams_learning/web/WEB-INF/lams.tld	(.../lams.tld)	(revision e4a1fb3c417f6227175bef9c7e20e985feec6a85)
@@ -60,7 +60,15 @@
            <rtexprvalue>true</rtexprvalue>
 
       </attribute>
+      <attribute>
+         <description>converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
+         <name>escapeXml</name>
+         <required>false</required>
 
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
    </tag>
    <tag>
 
Index: lams_monitoring/web/WEB-INF/lams.tld
===================================================================
diff -u -r70a300c302bda759bf06c8bc54a5ca0884d8c48f -re4a1fb3c417f6227175bef9c7e20e985feec6a85
--- lams_monitoring/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 70a300c302bda759bf06c8bc54a5ca0884d8c48f)
+++ lams_monitoring/web/WEB-INF/lams.tld	(.../lams.tld)	(revision e4a1fb3c417f6227175bef9c7e20e985feec6a85)
@@ -60,7 +60,15 @@
            <rtexprvalue>true</rtexprvalue>
 
       </attribute>
+      <attribute>
+         <description>converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
+         <name>escapeXml</name>
+         <required>false</required>
 
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
    </tag>
    <tag>
 
Index: lams_tool_chat/web/WEB-INF/lams.tld
===================================================================
diff -u -r70a300c302bda759bf06c8bc54a5ca0884d8c48f -re4a1fb3c417f6227175bef9c7e20e985feec6a85
--- lams_tool_chat/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 70a300c302bda759bf06c8bc54a5ca0884d8c48f)
+++ lams_tool_chat/web/WEB-INF/lams.tld	(.../lams.tld)	(revision e4a1fb3c417f6227175bef9c7e20e985feec6a85)
@@ -60,7 +60,15 @@
            <rtexprvalue>true</rtexprvalue>
 
       </attribute>
+      <attribute>
+         <description>converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
+         <name>escapeXml</name>
+         <required>false</required>
 
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
    </tag>
    <tag>
 
Index: lams_tool_forum/web/WEB-INF/lams.tld
===================================================================
diff -u -r70a300c302bda759bf06c8bc54a5ca0884d8c48f -re4a1fb3c417f6227175bef9c7e20e985feec6a85
--- lams_tool_forum/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 70a300c302bda759bf06c8bc54a5ca0884d8c48f)
+++ lams_tool_forum/web/WEB-INF/lams.tld	(.../lams.tld)	(revision e4a1fb3c417f6227175bef9c7e20e985feec6a85)
@@ -60,7 +60,15 @@
            <rtexprvalue>true</rtexprvalue>
 
       </attribute>
+      <attribute>
+         <description>converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
+         <name>escapeXml</name>
+         <required>false</required>
 
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
    </tag>
    <tag>
 
Index: lams_tool_lamc/web/WEB-INF/lams.tld
===================================================================
diff -u -r70a300c302bda759bf06c8bc54a5ca0884d8c48f -re4a1fb3c417f6227175bef9c7e20e985feec6a85
--- lams_tool_lamc/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 70a300c302bda759bf06c8bc54a5ca0884d8c48f)
+++ lams_tool_lamc/web/WEB-INF/lams.tld	(.../lams.tld)	(revision e4a1fb3c417f6227175bef9c7e20e985feec6a85)
@@ -60,7 +60,15 @@
            <rtexprvalue>true</rtexprvalue>
 
       </attribute>
+      <attribute>
+         <description>converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
+         <name>escapeXml</name>
+         <required>false</required>
 
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
    </tag>
    <tag>
 
Index: lams_tool_laqa/web/WEB-INF/lams.tld
===================================================================
diff -u -r70a300c302bda759bf06c8bc54a5ca0884d8c48f -re4a1fb3c417f6227175bef9c7e20e985feec6a85
--- lams_tool_laqa/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 70a300c302bda759bf06c8bc54a5ca0884d8c48f)
+++ lams_tool_laqa/web/WEB-INF/lams.tld	(.../lams.tld)	(revision e4a1fb3c417f6227175bef9c7e20e985feec6a85)
@@ -60,7 +60,15 @@
            <rtexprvalue>true</rtexprvalue>
 
       </attribute>
+      <attribute>
+         <description>converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
+         <name>escapeXml</name>
+         <required>false</required>
 
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
    </tag>
    <tag>
 
Index: lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r70a300c302bda759bf06c8bc54a5ca0884d8c48f -re4a1fb3c417f6227175bef9c7e20e985feec6a85
--- lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 70a300c302bda759bf06c8bc54a5ca0884d8c48f)
+++ lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision e4a1fb3c417f6227175bef9c7e20e985feec6a85)
@@ -60,7 +60,15 @@
            <rtexprvalue>true</rtexprvalue>
 
       </attribute>
+      <attribute>
+         <description>converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
+         <name>escapeXml</name>
+         <required>false</required>
 
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
    </tag>
    <tag>
 
Index: lams_tool_nb/web/WEB-INF/lams.tld
===================================================================
diff -u -r70a300c302bda759bf06c8bc54a5ca0884d8c48f -re4a1fb3c417f6227175bef9c7e20e985feec6a85
--- lams_tool_nb/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 70a300c302bda759bf06c8bc54a5ca0884d8c48f)
+++ lams_tool_nb/web/WEB-INF/lams.tld	(.../lams.tld)	(revision e4a1fb3c417f6227175bef9c7e20e985feec6a85)
@@ -60,7 +60,15 @@
            <rtexprvalue>true</rtexprvalue>
 
       </attribute>
+      <attribute>
+         <description>converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
+         <name>escapeXml</name>
+         <required>false</required>
 
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
    </tag>
    <tag>
 
Index: lams_tool_notebook/web/WEB-INF/lams.tld
===================================================================
diff -u -r70a300c302bda759bf06c8bc54a5ca0884d8c48f -re4a1fb3c417f6227175bef9c7e20e985feec6a85
--- lams_tool_notebook/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 70a300c302bda759bf06c8bc54a5ca0884d8c48f)
+++ lams_tool_notebook/web/WEB-INF/lams.tld	(.../lams.tld)	(revision e4a1fb3c417f6227175bef9c7e20e985feec6a85)
@@ -60,7 +60,15 @@
            <rtexprvalue>true</rtexprvalue>
 
       </attribute>
+      <attribute>
+         <description>converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
+         <name>escapeXml</name>
+         <required>false</required>
 
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
    </tag>
    <tag>
 
Index: lams_tool_sbmt/web/WEB-INF/lams.tld
===================================================================
diff -u -r70a300c302bda759bf06c8bc54a5ca0884d8c48f -re4a1fb3c417f6227175bef9c7e20e985feec6a85
--- lams_tool_sbmt/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 70a300c302bda759bf06c8bc54a5ca0884d8c48f)
+++ lams_tool_sbmt/web/WEB-INF/lams.tld	(.../lams.tld)	(revision e4a1fb3c417f6227175bef9c7e20e985feec6a85)
@@ -60,7 +60,15 @@
            <rtexprvalue>true</rtexprvalue>
 
       </attribute>
+      <attribute>
+         <description>converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
+         <name>escapeXml</name>
+         <required>false</required>
 
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
    </tag>
    <tag>
 
Index: lams_tool_scribe/web/WEB-INF/lams.tld
===================================================================
diff -u -r70a300c302bda759bf06c8bc54a5ca0884d8c48f -re4a1fb3c417f6227175bef9c7e20e985feec6a85
--- lams_tool_scribe/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 70a300c302bda759bf06c8bc54a5ca0884d8c48f)
+++ lams_tool_scribe/web/WEB-INF/lams.tld	(.../lams.tld)	(revision e4a1fb3c417f6227175bef9c7e20e985feec6a85)
@@ -60,7 +60,15 @@
            <rtexprvalue>true</rtexprvalue>
 
       </attribute>
+      <attribute>
+         <description>converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
+         <name>escapeXml</name>
+         <required>false</required>
 
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
    </tag>
    <tag>
 
Index: lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r70a300c302bda759bf06c8bc54a5ca0884d8c48f -re4a1fb3c417f6227175bef9c7e20e985feec6a85
--- lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 70a300c302bda759bf06c8bc54a5ca0884d8c48f)
+++ lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision e4a1fb3c417f6227175bef9c7e20e985feec6a85)
@@ -60,7 +60,15 @@
            <rtexprvalue>true</rtexprvalue>
 
       </attribute>
+      <attribute>
+         <description>converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
+         <name>escapeXml</name>
+         <required>false</required>
 
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
    </tag>
    <tag>
 
Index: lams_tool_vote/web/WEB-INF/lams.tld
===================================================================
diff -u -r70a300c302bda759bf06c8bc54a5ca0884d8c48f -re4a1fb3c417f6227175bef9c7e20e985feec6a85
--- lams_tool_vote/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 70a300c302bda759bf06c8bc54a5ca0884d8c48f)
+++ lams_tool_vote/web/WEB-INF/lams.tld	(.../lams.tld)	(revision e4a1fb3c417f6227175bef9c7e20e985feec6a85)
@@ -60,7 +60,15 @@
            <rtexprvalue>true</rtexprvalue>
 
       </attribute>
+      <attribute>
+         <description>converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
+         <name>escapeXml</name>
+         <required>false</required>
 
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
    </tag>
    <tag>
 
Index: lams_www/web/WEB-INF/lams.tld
===================================================================
diff -u -r70a300c302bda759bf06c8bc54a5ca0884d8c48f -re4a1fb3c417f6227175bef9c7e20e985feec6a85
--- lams_www/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 70a300c302bda759bf06c8bc54a5ca0884d8c48f)
+++ lams_www/web/WEB-INF/lams.tld	(.../lams.tld)	(revision e4a1fb3c417f6227175bef9c7e20e985feec6a85)
@@ -60,7 +60,15 @@
            <rtexprvalue>true</rtexprvalue>
 
       </attribute>
+      <attribute>
+         <description>converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
+         <name>escapeXml</name>
+         <required>false</required>
 
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
    </tag>
    <tag>