Index: lams_tool_forum/web/common/taglibs.jsp
===================================================================
diff -u -r71a37d456ee2d1d277774c125ac645ef7f06fa00 -rc23b7e0a955524b742970ab0410aad73b8dad1f9
--- lams_tool_forum/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 71a37d456ee2d1d277774c125ac645ef7f06fa00)
+++ lams_tool_forum/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision c23b7e0a955524b742970ab0410aad73b8dad1f9)
@@ -8,5 +8,5 @@
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-xml" prefix="x" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
-<%@ taglib uri="fck-editor" prefix="FCK"%>
+<%@ taglib uri="fck-editor" prefix="fck"%>
 
Index: lams_tool_forum/web/includes/taglibs.jsp
===================================================================
diff -u -r9d22cc9e548d46405f0b12cd1eddb4ae460ef289 -rc23b7e0a955524b742970ab0410aad73b8dad1f9
--- lams_tool_forum/web/includes/taglibs.jsp	(.../taglibs.jsp)	(revision 9d22cc9e548d46405f0b12cd1eddb4ae460ef289)
+++ lams_tool_forum/web/includes/taglibs.jsp	(.../taglibs.jsp)	(revision c23b7e0a955524b742970ab0410aad73b8dad1f9)
@@ -6,5 +6,5 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
-<%@ taglib uri="fck-editor" prefix="FCK"%>
+<%@ taglib uri="fck-editor" prefix="fck"%>
 
Index: lams_tool_forum/web/jsps/authoring/message/create.jsp
===================================================================
diff -u -r1efde1c1b8cfa99147c5ea22d9139c1406f39da8 -rc23b7e0a955524b742970ab0410aad73b8dad1f9
--- lams_tool_forum/web/jsps/authoring/message/create.jsp	(.../create.jsp)	(revision 1efde1c1b8cfa99147c5ea22d9139c1406f39da8)
+++ lams_tool_forum/web/jsps/authoring/message/create.jsp	(.../create.jsp)	(revision c23b7e0a955524b742970ab0410aad73b8dad1f9)
@@ -43,8 +43,15 @@
 				<tr>
 					<td>
 						<b><bean:message key="message.label.body" />*</b><BR>
-						<FCK:editor id="message.body" basePath="/lams/fckeditor/" height="150" width="600">
-						</FCK:editor>
+						<fck:editor id="message.body" basePath="/lams/fckeditor/"
+							imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector"
+							linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector"
+							flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector"
+							imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image"
+							linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File"
+							flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash"
+							toolbarSet="Default-Learner">
+						</fck:editor>							
 						<html:errors property="message.body" />
 					</td>
 				</tr>
Index: lams_tool_forum/web/jsps/authoring/message/edit.jsp
===================================================================
diff -u -r1efde1c1b8cfa99147c5ea22d9139c1406f39da8 -rc23b7e0a955524b742970ab0410aad73b8dad1f9
--- lams_tool_forum/web/jsps/authoring/message/edit.jsp	(.../edit.jsp)	(revision 1efde1c1b8cfa99147c5ea22d9139c1406f39da8)
+++ lams_tool_forum/web/jsps/authoring/message/edit.jsp	(.../edit.jsp)	(revision c23b7e0a955524b742970ab0410aad73b8dad1f9)
@@ -33,9 +33,17 @@
 					<td>
 						<b><bean:message key="message.label.body" />*</b>
 						<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-						<FCK:editor id="message.body" basePath="/lams/fckeditor/" height="150" width="600">
+						<fck:editor id="message.body" basePath="/lams/fckeditor/"
+							imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector"
+							linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector"
+							flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector"
+							imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image"
+							linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File"
+							flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash"
+							toolbarSet="Default-Learner">
 							<c:out value="${formBean.message.body}" escapeXml="false" />
-						</FCK:editor>
+						</fck:editor>							
+						
 						<html:errors property="message.body" />
 					</td>
 				</tr>
Index: lams_tool_forum/web/jsps/learning/message/bodyarea.jsp
===================================================================
diff -u -r9719695d2ad2c0dbe06c93d032eef994f634b9d5 -rc23b7e0a955524b742970ab0410aad73b8dad1f9
--- lams_tool_forum/web/jsps/learning/message/bodyarea.jsp	(.../bodyarea.jsp)	(revision 9719695d2ad2c0dbe06c93d032eef994f634b9d5)
+++ lams_tool_forum/web/jsps/learning/message/bodyarea.jsp	(.../bodyarea.jsp)	(revision c23b7e0a955524b742970ab0410aad73b8dad1f9)
@@ -4,10 +4,16 @@
 <c:choose>
 	<c:when test="${allowRichEditor}">
 		<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-		
-		<lams:SetEditor id="message.body" text="${formBean.message.body}" />
-		<lams:HTMLEditor />
-		
+		<fck:editor id="message.body" basePath="/lams/fckeditor/"
+			imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector"
+			linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector"
+			flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector"
+			imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image"
+			linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File"
+			flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash"
+			toolbarSet="Default-Learner">
+			<c:out value="${formBean.message.body}" escapeXml="false"/>
+		</fck:editor>		
 	</c:when>
 	<c:otherwise>
 		<lams:STRUTS-textarea rows="10" cols="40" tabindex="2" property="message.body" styleId="messageBody" />
Index: lams_tool_forum/web/jsps/learning/message/topiceditform.jsp
===================================================================
diff -u -r0e0e9d69176507019be4f182d00bb2dff86f6c2c -rc23b7e0a955524b742970ab0410aad73b8dad1f9
--- lams_tool_forum/web/jsps/learning/message/topiceditform.jsp	(.../topiceditform.jsp)	(revision 0e0e9d69176507019be4f182d00bb2dff86f6c2c)
+++ lams_tool_forum/web/jsps/learning/message/topiceditform.jsp	(.../topiceditform.jsp)	(revision c23b7e0a955524b742970ab0410aad73b8dad1f9)
@@ -1,29 +1,21 @@
 <table cellpadding="0">
 	<tr>
-		<td class="field-name">
-			<bean:message key="message.label.subject" />
-			*
-		</td>
 		<td>
+			<span  class="field-name"><bean:message key="message.label.subject" /></span><BR>
 			<html:text size="30" tabindex="1" property="message.subject" />
 			<html:errors property="message.subject" />
 		</td>
 	</tr>
 	<tr>
-		<td class="field-name">
-			<bean:message key="message.label.body" />
-			*
-		</td>
 		<td>
+			<span  class="field-name"><bean:message key="message.label.body" />*</span><BR>
 			<%@include file="bodyarea.jsp"%>
 		</td>
 	</tr>
 	<c:if test="${topic.hasAttachment || allowUpload}">
 		<tr>
-			<td class="field-name">
-				<bean:message key="message.label.attachment" />
-			</td>
 			<td>
+				<span class="field-name"><bean:message key="message.label.attachment" /></span>
 				<c:if test="${topic.hasAttachment}">
 					<c:forEach var="file" items="${topic.message.attachments}">
 						<c:set var="downloadURL">
@@ -34,7 +26,7 @@
 							<html:rewrite page="/learning/deleteAttachment.do?uuid=${file.fileUuid}&versionID=${file.fileVersionId}" />
 						</c:set>
 						&nbsp;
-						<a href="<c:out value='${deleteURL}'/>"> <fmt:message key="label.delete" /> </a>
+						<a href="<c:out value='${deleteURL}'/>"  class="button"> <fmt:message key="label.delete" /> </a>
 					</c:forEach>
 				</c:if>
 				<c:if test="${not topic.hasAttachment && allowUpload}">
@@ -44,9 +36,8 @@
 			</td>
 		</tr>
 	</c:if>
-	<tr>
-		<td></td>
-		<td>
+</table>
+<div class="right-buttons">
 			<html:submit styleClass="button">
 				<bean:message key="button.submit" />
 			</html:submit>
@@ -56,6 +47,4 @@
 			<html:button property="goback" onclick="javascript:location.href='${backToTopic}';" styleClass="button">
 				<bean:message key="button.cancel" />
 			</html:button>
-		</td>
-	</tr>
-</table>
+</div>
Index: lams_tool_forum/web/jsps/learning/message/topicform.jsp
===================================================================
diff -u -r0e0e9d69176507019be4f182d00bb2dff86f6c2c -rc23b7e0a955524b742970ab0410aad73b8dad1f9
--- lams_tool_forum/web/jsps/learning/message/topicform.jsp	(.../topicform.jsp)	(revision 0e0e9d69176507019be4f182d00bb2dff86f6c2c)
+++ lams_tool_forum/web/jsps/learning/message/topicform.jsp	(.../topicform.jsp)	(revision c23b7e0a955524b742970ab0410aad73b8dad1f9)
@@ -2,31 +2,23 @@
 
 <table cellpadding="0">
 	<tr>
-		<td class="field-name">
-			<bean:message key="message.label.subject" />
-			*
-		</td>
 		<td>
+			<span  class="field-name"><bean:message key="message.label.subject" /></span><BR>		
 			<html:text size="30" tabindex="1" property="message.subject" />
 			<br>
 			<html:errors property="message.subject" />
 		</td>
 	</tr>
 	<tr>
-		<td class="field-name">
-			<bean:message key="message.label.body" />
-			*
-		</td>
 		<td>
+			<span  class="field-name"><bean:message key="message.label.body" />*</span><BR>
 			<%@include file="bodyarea.jsp"%>
 		</td>
 	</tr>
 	<c:if test="${allowUpload}">
 		<tr>
-			<td class="field-name">
-				<bean:message key="message.label.attachment" />
-			</td>
 			<td>
+				<span class="field-name"><bean:message key="message.label.attachment" /></span>
 				<html:file tabindex="3" property="attachmentFile" />
 				<html:errors property="message.attachment" />
 			</td>
Index: lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp
===================================================================
diff -u -r0e0e9d69176507019be4f182d00bb2dff86f6c2c -rc23b7e0a955524b742970ab0410aad73b8dad1f9
--- lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp	(.../topicreplyform.jsp)	(revision 0e0e9d69176507019be4f182d00bb2dff86f6c2c)
+++ lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp	(.../topicreplyform.jsp)	(revision c23b7e0a955524b742970ab0410aad73b8dad1f9)
@@ -1,36 +1,28 @@
 <table cellpadding="0">
 	<tr>
-		<td class="field-name">
-			<bean:message key="message.label.subject" />*
-		</td>
 		<td>
+			<span  class="field-name"><bean:message key="message.label.subject" /></span><BR>		
 			<html:text size="30" tabindex="1" property="message.subject" />
 			<html:errors property="message.subject" />
 		</td>
 	</tr>
 	<tr>
-		<td class="field-name">
-			<bean:message key="message.label.body" />*
-		</td>
 		<td>
+			<span  class="field-name"><bean:message key="message.label.body" />*</span><BR>		
 			<%@include file="bodyarea.jsp"%>
 		</td>
 	</tr>
 	<c:if test="${allowUpload}">
 		<tr>
-			<td class="field-name">
-				<b><bean:message key="message.label.attachment" /></b>
-			</td>
 			<td>
+				<span class="field-name"><bean:message key="message.label.attachment" /></span>
 				<html:file tabindex="3" property="attachmentFile" />
 				<html:errors property="message.attachment" />
 			</td>
 		</tr>
 	</c:if>
-	<tr>
-		<td></td>
-		<td>
-			
+</table>
+<div class="right-buttons">
 			<html:submit styleClass="button">
 				<bean:message key="button.submit" />
 			</html:submit>
@@ -40,6 +32,4 @@
 			<html:button property="goback" onclick="javascript:location.href='${backToTopic}';" styleClass="button">
 				<bean:message key="button.cancel" />
 			</html:button>
-		</td>
-	</tr>
-</table>
+</div>
\ No newline at end of file