Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MessageForm.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -reb6d30f3b815b7e8154c23495e796c68f43fbb7f
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MessageForm.java	(.../MessageForm.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MessageForm.java	(.../MessageForm.java)	(revision eb6d30f3b815b7e8154c23495e796c68f43fbb7f)
@@ -72,11 +72,11 @@
         ActionErrors errors = new ActionErrors(); 
         try{
             if (StringUtils.isBlank(message.getSubject())) {
-               ActionMessage error = new ActionMessage("error.valueReqd");
+               ActionMessage error = new ActionMessage("error.subject.required");
                errors.add("message.subject", error);
             }
             if (StringUtils.isBlank(message.getBody())) {
-            	ActionMessage error = new ActionMessage("error.valueReqd");
+            	ActionMessage error = new ActionMessage("error.body.required");
                errors.add("message.body", error);
             }
         } catch (Exception e) {
Index: lams_tool_forum/web/jsps/learning/message/topicview.jsp
===================================================================
diff -u -r53645c8d07fa71f2f23a362667a1bfc270bb4912 -reb6d30f3b815b7e8154c23495e796c68f43fbb7f
--- lams_tool_forum/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision 53645c8d07fa71f2f23a362667a1bfc270bb4912)
+++ lams_tool_forum/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision eb6d30f3b815b7e8154c23495e796c68f43fbb7f)
@@ -122,9 +122,7 @@
 								</c:otherwise>
 							</c:choose>
 						</c:if>
-					</div>
 
-					<div class="right-buttons">
 						<!--  Edit Button -->
 						<c:if test="${not hidden}">
 							<c:if
@@ -151,7 +149,6 @@
 							</html:link>
 						</c:if>
 					</div>
-					</div>
 				</td>
 			</tr>
 		</table>