Index: lams_tool_forum/web/jsps/learning/message/msgattachment.jsp
===================================================================
diff -u -r5e9e3b9c895e932ff86edb7a64cf4b81f59f766c -reb9c343e0a5d441b32fc35cb034a621525ead82d
--- lams_tool_forum/web/jsps/learning/message/msgattachment.jsp	(.../msgattachment.jsp)	(revision 5e9e3b9c895e932ff86edb7a64cf4b81f59f766c)
+++ lams_tool_forum/web/jsps/learning/message/msgattachment.jsp	(.../msgattachment.jsp)	(revision eb9c343e0a5d441b32fc35cb034a621525ead82d)
@@ -1,4 +1,5 @@
 <%@ include file="/common/taglibs.jsp" %>
+
 <c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
 <input type="hidden" name="hasAttachment" value="${topic.hasAttachment}"/>
 <c:if test="${topic.hasAttachment}">
Index: lams_tool_forum/web/jsps/learning/message/topiceditform.jsp
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -reb9c343e0a5d441b32fc35cb034a621525ead82d
--- lams_tool_forum/web/jsps/learning/message/topiceditform.jsp	(.../topiceditform.jsp)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_tool_forum/web/jsps/learning/message/topiceditform.jsp	(.../topiceditform.jsp)	(revision eb9c343e0a5d441b32fc35cb034a621525ead82d)
@@ -1,3 +1,5 @@
+<%@ include file="/includes/taglibs.jsp"%>
+
 <table cellpadding="0">
 	<tr>
 		<td>
Index: lams_tool_forum/web/jsps/learning/message/topicform.jsp
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -reb9c343e0a5d441b32fc35cb034a621525ead82d
--- lams_tool_forum/web/jsps/learning/message/topicform.jsp	(.../topicform.jsp)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_tool_forum/web/jsps/learning/message/topicform.jsp	(.../topicform.jsp)	(revision eb9c343e0a5d441b32fc35cb034a621525ead82d)
@@ -1,3 +1,4 @@
+<%@ include file="/includes/taglibs.jsp"%>
 
 <table cellpadding="0">
 	<tr>
Index: lams_tool_forum/web/jsps/learning/message/topiclist.jsp
===================================================================
diff -u -r2700025047410d38f40b3bd7c56966a9fc08bb29 -reb9c343e0a5d441b32fc35cb034a621525ead82d
--- lams_tool_forum/web/jsps/learning/message/topiclist.jsp	(.../topiclist.jsp)	(revision 2700025047410d38f40b3bd7c56966a9fc08bb29)
+++ lams_tool_forum/web/jsps/learning/message/topiclist.jsp	(.../topiclist.jsp)	(revision eb9c343e0a5d441b32fc35cb034a621525ead82d)
@@ -1,3 +1,4 @@
+<%@ include file="/includes/taglibs.jsp"%>
 
 <table cellpadding="0" class="alternative-color">
 	<tbody>
Index: lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -reb9c343e0a5d441b32fc35cb034a621525ead82d
--- lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp	(.../topicreplyform.jsp)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp	(.../topicreplyform.jsp)	(revision eb9c343e0a5d441b32fc35cb034a621525ead82d)
@@ -1,3 +1,5 @@
+<%@ include file="/includes/taglibs.jsp"%>
+
 <table cellpadding="0">
 	<tr>
 		<td>
Index: lams_tool_forum/web/jsps/learning/message/topicview.jsp
===================================================================
diff -u -rf2908e832dbbd96a913f17485eeb7aa9b239c18e -reb9c343e0a5d441b32fc35cb034a621525ead82d
--- lams_tool_forum/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision f2908e832dbbd96a913f17485eeb7aa9b239c18e)
+++ lams_tool_forum/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision eb9c343e0a5d441b32fc35cb034a621525ead82d)
@@ -9,7 +9,7 @@
 				<th class="first">
 					<c:choose>
 						<c:when test='${(sessionMap.mode == "teacher") || (not hidden)}'>
-							<b> <c:out value="${msgDto.message.subject}" /> </b>
+							<c:out value="${msgDto.message.subject}" />
 						</c:when>
 						<c:otherwise>
 							<fmt:message key="topic.message.subject.hidden" />
@@ -21,21 +21,22 @@
 				<td class="first posted-by">
 					<c:if test='${(sessionMap.mode == "teacher") || (not hidden)}'>
 						<fmt:message key="lable.topic.subject.by" />
-						<c:set var="author" value="${msgDto.author}"/>
+						<c:set var="author" value="${msgDto.author}" />
 						<c:if test="${empty author}">
 							<c:set var="author">
-								<fmt:message key="label.default.user.name"/>
+								<fmt:message key="label.default.user.name" />
 							</c:set>
 						</c:if>
 						${author}						
 								-
-						<lams:Date  value="${msgDto.message.created}" />
+						<lams:Date value="${msgDto.message.created}" />
 					</c:if>
 				</td>
 			</tr>
 			<tr>
 				<td>
-					<c:if test='${(not hidden) || (hidden && sessionMap.mode == "teacher")}'>
+					<c:if
+						test='${(not hidden) || (hidden && sessionMap.mode == "teacher")}'>
 						<c:out value="${msgDto.message.body}" escapeXml="false" />
 					</c:if>
 					<c:if test='${hidden}'>
@@ -47,12 +48,15 @@
 			<c:if test="${not empty msgDto.message.attachments}">
 				<tr>
 					<td>
-						<c:if test='${(not hidden) || (hidden && sessionMap.mode == "teacher")}'>
+						<c:if
+							test='${(not hidden) || (hidden && sessionMap.mode == "teacher")}'>
 							<c:forEach var="file" items="${msgDto.message.attachments}">
 								<c:set var="downloadURL">
-									<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true" />
+									<html:rewrite
+										page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true" />
 								</c:set>
-								<a href="<c:out value='${downloadURL}' escapeXml='false'/>"> <c:out value="${file.fileName}" /> </a>
+								<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
+									<c:out value="${file.fileName}" /> </a>
 							</c:forEach>
 						</c:if>
 						<c:if test='${hidden}'>
@@ -61,21 +65,26 @@
 					</td>
 				</tr>
 			</c:if>
-			<c:if test="${((msgDto.released && msgDto.isAuthor) || sessionMap.mode=='teacher') && (not empty msgDto.mark)}">
+			<c:if
+				test="${((msgDto.released && msgDto.isAuthor) || sessionMap.mode=='teacher') && (not empty msgDto.mark)}">
 				<tr>
 					<td>
-						<span class="field-name" ><fmt:message key="lable.topic.title.mark"/></span>
+						<span class="field-name"><fmt:message
+								key="lable.topic.title.mark" />
+						</span>
 						<BR>
-							${msgDto.mark}
+						${msgDto.mark}
 					</td>
 				</tr>
 				<tr>
 					<td>
-						<span class="field-name" ><fmt:message key="lable.topic.title.comment"/></span>
+						<span class="field-name"><fmt:message
+								key="lable.topic.title.comment" />
+						</span>
 						<BR>
 						<c:choose>
 							<c:when test="${empty msgDto.comment}">
-								<fmt:message key="message.not.avaliable"/>
+								<fmt:message key="message.not.avaliable" />
 							</c:when>
 							<c:otherwise>
 								<c:out value="${msgDto.comment}" escapeXml="false" />
@@ -94,46 +103,57 @@
 								<c:when test="${hidden}">
 									<!--  display a show link  -->
 									<c:set var="hidetopic">
-										<html:rewrite page="/learning/updateMessageHideFlag.do?sessionMapID=${sessionMapID}&msgId=${msgDto.message.uid}&hideFlag=false" />
+										<html:rewrite
+											page="/learning/updateMessageHideFlag.do?sessionMapID=${sessionMapID}&msgId=${msgDto.message.uid}&hideFlag=false" />
 									</c:set>
 									<html:link href="${hidetopic}" styleClass="button">
-										<fmt:message key="label.show" /> 
+										<fmt:message key="label.show" />
 									</html:link>
 								</c:when>
 								<c:otherwise>
 									<!--  display a hide link -->
 									<c:set var="hidetopic">
-										<html:rewrite page="/learning/updateMessageHideFlag.do?sessionMapID=${sessionMapID}&topicID=${msgDto.message.uid}&hideFlag=true" />
+										<html:rewrite
+											page="/learning/updateMessageHideFlag.do?sessionMapID=${sessionMapID}&topicID=${msgDto.message.uid}&hideFlag=true" />
 									</c:set>
 									<html:link href="${hidetopic}" styleClass="button">
 										<fmt:message key="label.hide" />
 									</html:link>
 								</c:otherwise>
 							</c:choose>
 						</c:if>
-						
+					</div>
+
+					<div class="right-buttons">
 						<!--  Edit Button -->
 						<c:if test="${not hidden}">
-							<c:if test='${(sessionMap.mode == "teacher") || (msgDto.isAuthor && not sessionMap.finishedLock && sessionMap.allowEdit && (empty msgDto.mark))}'>
+							<c:if
+								test='${(sessionMap.mode == "teacher") || (msgDto.isAuthor && not sessionMap.finishedLock && sessionMap.allowEdit && (empty msgDto.mark))}'>
 								<c:set var="edittopic">
-									<html:rewrite page="/learning/editTopic.do?sessionMapID=${sessionMapID}&topicID=${msgDto.message.uid}&rootUid=${sessinoMap.rootUid}&create=${msgDto.message.created.time}" />
+									<html:rewrite
+										page="/learning/editTopic.do?sessionMapID=${sessionMapID}&topicID=${msgDto.message.uid}&rootUid=${sessinoMap.rootUid}&create=${msgDto.message.created.time}" />
 								</c:set>
 								<html:link href="${edittopic}" styleClass="button">
 									<fmt:message key="label.edit" />
 								</html:link>
 							</c:if>
 						</c:if>
+					</div>
 
+					<div class="right-buttons">
 						<!--  Reply Button -->
-						<c:if test="${(not sessionMap.finishedLock) && (not sessionMap.noMorePosts)}">
+						<c:if
+							test="${(not sessionMap.finishedLock) && (not sessionMap.noMorePosts)}">
 							<c:set var="replytopic">
-								<html:rewrite page="/learning/newReplyTopic.do?sessionMapID=${sessionMapID}&parentID=${msgDto.message.uid}&rootUid=${sessionMap.rootUid}" />
+								<html:rewrite
+									page="/learning/newReplyTopic.do?sessionMapID=${sessionMapID}&parentID=${msgDto.message.uid}&rootUid=${sessionMap.rootUid}" />
 							</c:set>
 							<html:link href="${replytopic}" styleClass="button">
 								<fmt:message key="label.reply" />
 							</html:link>
 						</c:if>
 					</div>
+					</div>
 				</td>
 			</tr>
 		</table>