Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java,v
diff -u -r1.59 -r1.60
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	25 Nov 2006 00:44:21 -0000	1.59
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	2 Dec 2006 12:44:09 -0000	1.60
@@ -1051,7 +1051,9 @@
 		logger.debug("is tool reflective: " + mcContent.isReflect());
 	    mcGeneralLearnerFlowDTO.setReflection(new Boolean(mcContent.isReflect()).toString());
 		logger.debug("reflection subject: " + mcContent.getReflectionSubject());
-		mcGeneralLearnerFlowDTO.setReflectionSubject(mcContent.getReflectionSubject());
+		
+		String reflectionSubject=McUtils.replaceNewLines(mcContent.getReflectionSubject());
+		mcGeneralLearnerFlowDTO.setReflectionSubject(reflectionSubject);
 
 		logger.debug("mcGeneralLearnerFlowDTO for jsp: " +  mcGeneralLearnerFlowDTO);
 		
@@ -1239,7 +1241,9 @@
 		logger.debug("is tool reflective: " + mcContent.isReflect());
 	    mcGeneralLearnerFlowDTO.setReflection(new Boolean(mcContent.isReflect()).toString());
 		logger.debug("reflection subject: " + mcContent.getReflectionSubject());
-		mcGeneralLearnerFlowDTO.setReflectionSubject(mcContent.getReflectionSubject());
+		
+		String reflectionSubject=McUtils.replaceNewLines(mcContent.getReflectionSubject());
+		mcGeneralLearnerFlowDTO.setReflectionSubject(reflectionSubject);
     		
 		mcGeneralLearnerFlowDTO.setRetries(new Boolean(mcContent.isRetries()).toString());
 		
@@ -1359,8 +1363,10 @@
 		logger.debug("is tool reflective: " + mcContent.isReflect());
 	    mcGeneralLearnerFlowDTO.setReflection(new Boolean(mcContent.isReflect()).toString());
 		logger.debug("reflection subject: " + mcContent.getReflectionSubject());
-		mcGeneralLearnerFlowDTO.setReflectionSubject(mcContent.getReflectionSubject());
 		
+		String reflectionSubject=McUtils.replaceNewLines(mcContent.getReflectionSubject());
+		mcGeneralLearnerFlowDTO.setReflectionSubject(reflectionSubject);
+		
 		logger.debug("mcContent.isRetries(): " + mcContent.isRetries());
 		mcGeneralLearnerFlowDTO.setRetries(new Boolean(mcContent.isRetries()).toString());
 		
@@ -1607,8 +1613,10 @@
 		logger.debug("is tool reflective: " + mcContent.isReflect());
 	    mcGeneralLearnerFlowDTO.setReflection(new Boolean(mcContent.isReflect()).toString());
 		logger.debug("reflection subject: " + mcContent.getReflectionSubject());
-		mcGeneralLearnerFlowDTO.setReflectionSubject(mcContent.getReflectionSubject());
 		
+		String reflectionSubject=McUtils.replaceNewLines(mcContent.getReflectionSubject());
+		mcGeneralLearnerFlowDTO.setReflectionSubject(reflectionSubject);
+		
 		logger.debug("mcContent.isRetries(): " + mcContent.isRetries());
 		mcGeneralLearnerFlowDTO.setRetries(new Boolean(mcContent.isRetries()).toString());
 
@@ -1636,6 +1644,7 @@
 		
 		if (notebookEntry != null) {
 		    String notebookEntryPresentable = notebookEntry.getEntry();
+		    notebookEntryPresentable=McUtils.replaceNewLines(notebookEntryPresentable);
 		    mcGeneralLearnerFlowDTO.setNotebookEntry(notebookEntryPresentable);
 		}
 
@@ -1830,8 +1839,10 @@
 		logger.debug("is tool reflective: " + mcContent.isReflect());
 	    mcGeneralLearnerFlowDTO.setReflection(new Boolean(mcContent.isReflect()).toString());
 		logger.debug("reflection subject: " + mcContent.getReflectionSubject());
-		mcGeneralLearnerFlowDTO.setReflectionSubject(mcContent.getReflectionSubject());
 		
+		String reflectionSubject=McUtils.replaceNewLines(mcContent.getReflectionSubject());		
+		mcGeneralLearnerFlowDTO.setReflectionSubject(reflectionSubject);
+		
 		logger.debug("mcContent.isRetries(): " + mcContent.isRetries());
 		mcGeneralLearnerFlowDTO.setRetries(new Boolean(mcContent.isRetries()).toString());
 
@@ -1953,8 +1964,10 @@
 		logger.debug("is tool reflective: " + mcContent.isReflect());
 	    mcGeneralLearnerFlowDTO.setReflection(new Boolean(mcContent.isReflect()).toString());
 		logger.debug("reflection subject: " + mcContent.getReflectionSubject());
-		mcGeneralLearnerFlowDTO.setReflectionSubject(mcContent.getReflectionSubject());
 		
+		String reflectionSubject=McUtils.replaceNewLines(mcContent.getReflectionSubject());
+		mcGeneralLearnerFlowDTO.setReflectionSubject(reflectionSubject);
+		
 		logger.debug("mcContent.isRetries(): " + mcContent.isRetries());
 		mcGeneralLearnerFlowDTO.setRetries(new Boolean(mcContent.isRetries()).toString());
 		
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java,v
diff -u -r1.72 -r1.73
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	28 Nov 2006 22:04:19 -0000	1.72
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	2 Dec 2006 12:44:09 -0000	1.73
@@ -502,9 +502,11 @@
 	    logger.debug("is tool reflective: " + mcContent.isReflect());
 	    mcGeneralLearnerFlowDTO.setReflection(new Boolean(mcContent.isReflect()).toString());
 		logger.debug("reflection subject: " + mcContent.getReflectionSubject());
-		mcGeneralLearnerFlowDTO.setReflectionSubject(mcContent.getReflectionSubject());
 		
+		String reflectionSubject=McUtils.replaceNewLines(mcContent.getReflectionSubject());
+		mcGeneralLearnerFlowDTO.setReflectionSubject(reflectionSubject);
 		
+		
 		String userID=mcLearningForm.getUserID();
 		logger.debug("userID: " +  userID);
 		
@@ -517,7 +519,6 @@
         logger.debug("notebookEntry: " + notebookEntry);
 		
 		if (notebookEntry != null) {
-		    
 		    String notebookEntryPresentable=McUtils.replaceNewLines(notebookEntry.getEntry());
 		    mcGeneralLearnerFlowDTO.setNotebookEntry(notebookEntryPresentable);
 		}
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java,v
diff -u -r1.29 -r1.30
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java	15 Oct 2006 15:16:24 -0000	1.29
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java	2 Dec 2006 12:44:09 -0000	1.30
@@ -1238,7 +1238,8 @@
 								CoreNotebookConstants.NOTEBOOK_TOOL,
 								MY_SIGNATURE, new Integer(mcQueUsr.getQueUsrId().intValue()));
 						
-				        logger.debug("notebookEntry: " + notebookEntry);			 
+				        logger.debug("notebookEntry: " + notebookEntry);
+				        
 						if (notebookEntry != null)
 						{
 						    logger.debug("found at least one notebookEntry: " + notebookEntry.getEntry());
Index: lams_tool_lamc/web/learning/Notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/Notebook.jsp,v
diff -u -r1.11 -r1.12
--- lams_tool_lamc/web/learning/Notebook.jsp	25 Nov 2006 13:23:42 -0000	1.11
+++ lams_tool_lamc/web/learning/Notebook.jsp	2 Dec 2006 12:44:08 -0000	1.12
@@ -64,7 +64,7 @@
 			<html:textarea cols="60" rows="8" property="entryText"
 				styleClass="text-area">
 				<c:if test="${not empty mcGeneralLearnerFlowDTO.notebookEntry}">
-					<c:out value="${mcGeneralLearnerFlowDTO.notebookEntry}"/>
+					<c:out value="${mcGeneralLearnerFlowDTO.notebookEntry}" escapeXml="false"/>										
 				</c:if>
 			</html:textarea>
 
Index: lams_tool_lamc/web/learning/ViewAnswers.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/ViewAnswers.jsp,v
diff -u -r1.46 -r1.47
--- lams_tool_lamc/web/learning/ViewAnswers.jsp	25 Nov 2006 13:23:42 -0000	1.46
+++ lams_tool_lamc/web/learning/ViewAnswers.jsp	2 Dec 2006 12:44:08 -0000	1.47
@@ -213,13 +213,13 @@
 			</c:if>
 			<c:if test="${mcGeneralLearnerFlowDTO.reflection}">
 				<h2>
-					<fmt:message key="label.notebook.entries" />
+							<c:out value="${mcGeneralLearnerFlowDTO.reflectionSubject}" escapeXml="false" />											
 				</h2>
-		
+
 				<p>
 					<c:choose>
 						<c:when test="${not empty mcGeneralLearnerFlowDTO.notebookEntry}">
-							<c:out value="${mcGeneralLearnerFlowDTO.notebookEntry}" escapeXml="true"/>
+							<c:out value="${mcGeneralLearnerFlowDTO.notebookEntry}" escapeXml="false"/>
 						</c:when>
 						<c:otherwise>
 							<em><fmt:message key="message.no.reflection.available" /></em>