Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
diff -u -r3de24b3fb4e2ead20d187f4b5000464ae2791262 -r4d23938299d7cd12c95346e9abc603374b04e212
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 3de24b3fb4e2ead20d187f4b5000464ae2791262)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 4d23938299d7cd12c95346e9abc603374b04e212)
@@ -201,7 +201,7 @@
 
 		topics.add(MessageDTO.getMessageDTO(message,user.getFirstName()+" "+user.getLastName()));
 		
-		request.setAttribute(ForumConstants.SUCCESS_FLAG,"SUCCESS");
+		request.setAttribute(ForumConstants.SUCCESS_FLAG,"CREATE_SUCCESS");
 		request.getSession().setAttribute(ForumConstants.AUTHORING_TOPICS_LIST, topics);
 		return mapping.findForward("success");
 	}
@@ -220,7 +220,7 @@
 			}
 			request.getSession().setAttribute(ForumConstants.AUTHORING_TOPICS_LIST,topics);
     	}
-		request.setAttribute(ForumConstants.SUCCESS_FLAG,"SUCCESS");
+		request.setAttribute(ForumConstants.SUCCESS_FLAG,"DELETE_SUCCESS");
 		return mapping.getInputForward();
 	}
     public ActionForward viewTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
@@ -291,6 +291,7 @@
 		request.setAttribute(ForumConstants.AUTHORING_TOPICS_INDEX,topicIndex);
 		request.getSession().setAttribute(ForumConstants.AUTHORING_TOPICS_LIST, topics);
 		
+		request.setAttribute(ForumConstants.SUCCESS_FLAG,"EDIT_SUCCESS");
 		return mapping.findForward("success");
     }
     
@@ -314,6 +315,7 @@
 			oldMsg.getMessage().setAttachments(null);
 			
 		}
+		request.setAttribute(ForumConstants.AUTHORING_TOPICS_INDEX,topicIndex);
     	return mapping.findForward("success");
     }
     
Index: lams_tool_forum/web/jsps/authoring/message/create.jsp
===================================================================
diff -u -r3de24b3fb4e2ead20d187f4b5000464ae2791262 -r4d23938299d7cd12c95346e9abc603374b04e212
--- lams_tool_forum/web/jsps/authoring/message/create.jsp	(.../create.jsp)	(revision 3de24b3fb4e2ead20d187f4b5000464ae2791262)
+++ lams_tool_forum/web/jsps/authoring/message/create.jsp	(.../create.jsp)	(revision 4d23938299d7cd12c95346e9abc603374b04e212)
@@ -3,7 +3,7 @@
 <script type="text/javascript">
 	function success(){
 		var flag = "<c:out value="${SUCCESS_FLAG}"/>";
-		if(flag == "SUCCESS"){
+		if(flag == "CREATE_SUCCESS"){
 			closeWin();
 		}
 	}
Index: lams_tool_forum/web/jsps/authoring/message/view.jsp
===================================================================
diff -u -r24c0b6a31b3cc9226cf70d4f9f21e8ed45a1ba86 -r4d23938299d7cd12c95346e9abc603374b04e212
--- lams_tool_forum/web/jsps/authoring/message/view.jsp	(.../view.jsp)	(revision 24c0b6a31b3cc9226cf70d4f9f21e8ed45a1ba86)
+++ lams_tool_forum/web/jsps/authoring/message/view.jsp	(.../view.jsp)	(revision 4d23938299d7cd12c95346e9abc603374b04e212)
@@ -1,6 +1,14 @@
 <%@ include file="/includes/taglibs.jsp" %>
 <script type="text/javascript" src="<html:rewrite page='/includes/scripts.jsp'/>"></script>
-
+<script type="text/javascript">
+	function success(){
+		var flag = "<c:out value="${SUCCESS_FLAG}"/>";
+		if(flag == "EDIT_SUCCESS"){
+			window.opener.parent.location.href = "<html:rewrite page='/authoring/finishTopic.do'/>";
+		}
+	}
+	success();
+</script>
 <div align="center">
 <fieldset>
 	<%@ include file="/jsps/message/topicview.jsp" %>
Index: lams_tool_forum/web/jsps/message/topiceditform.jsp
===================================================================
diff -u -r3de24b3fb4e2ead20d187f4b5000464ae2791262 -r4d23938299d7cd12c95346e9abc603374b04e212
--- lams_tool_forum/web/jsps/message/topiceditform.jsp	(.../topiceditform.jsp)	(revision 3de24b3fb4e2ead20d187f4b5000464ae2791262)
+++ lams_tool_forum/web/jsps/message/topiceditform.jsp	(.../topiceditform.jsp)	(revision 4d23938299d7cd12c95346e9abc603374b04e212)
@@ -8,49 +8,44 @@
 	</tr>
 	<tr>
 		<td valign="MIDDLE"><b><bean:message key="message.label.body" /></b></td>
-		<td valign="MIDDLE">&nbsp;&nbsp;<html:textarea rows="10" cols="60"
+		<td valign="MIDDLE"><b class="required">*</b><html:textarea rows="10" cols="60"
 			tabindex="2" property="message.body" /> 
 			<BR><html:errors property="message.body" /></td>
 	</tr>
 	<tr>
 		<td>
 			<b><bean:message key="message.label.attachment" /></b>
 		</td>
-		<td>
-			<c:forEach var="file" items="${topic.message.attachments}">
-				<c:set var="downloadURL">
-						<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>
-				<c:set var="deleteURL">
-						<html:rewrite page="/authoring/deleteAttachment.do?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&topicIndex=${topicIndex}"/>
-				</c:set>
-				&nbsp;
-				<a href="<c:out value='${deleteURL}'/>">
-					<fmt:message key="label.delete" />
-				</a>					
-			</c:forEach>
+		<td valign="MIDDLE">&nbsp;
+			<c:if test="${not empty topic.message.attachments}">
+				<c:forEach var="file" items="${topic.message.attachments}">
+					<c:set var="downloadURL">
+							<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>
+					<c:set var="deleteURL">
+							<html:rewrite page="/authoring/deleteAttachment.do?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&topicIndex=${topicIndex}"/>
+					</c:set>
+					&nbsp;
+					<a href="<c:out value='${deleteURL}'/>">
+						<fmt:message key="label.delete" />
+					</a>					
+				</c:forEach>
+			</c:if>
+			<c:if test="${empty topic.message.attachments}">
+				<html:file tabindex="3"		property="attachmentFile" /> <html:errors	property="message.attachment" />
+			</c:if>
 		</td>
 	</tr>
 	<tr>
-		<td valign="MIDDLE"></td>
-		<td valign="MIDDLE">
-			&nbsp;&nbsp;<html:file tabindex="3"
-				property="attachmentFile" /> <html:errors
-				property="message.attachment" />
-		</td>
-	</tr>
 		<td>&nbsp;&nbsp;
 			<html:submit>
 				<bean:message key="button.submit" />
 			</html:submit>
 		</td>
 		<td>
-			<html:button property="done" onclick="closeWin()">
-				<bean:message key="button.done" />
-			</html:button>
 		</td>
 	</tr>
 </table>
Index: lams_tool_forum/web/jsps/message/topicform.jsp
===================================================================
diff -u -r3de24b3fb4e2ead20d187f4b5000464ae2791262 -r4d23938299d7cd12c95346e9abc603374b04e212
--- lams_tool_forum/web/jsps/message/topicform.jsp	(.../topicform.jsp)	(revision 3de24b3fb4e2ead20d187f4b5000464ae2791262)
+++ lams_tool_forum/web/jsps/message/topicform.jsp	(.../topicform.jsp)	(revision 4d23938299d7cd12c95346e9abc603374b04e212)
@@ -7,7 +7,7 @@
 	</tr>
 	<tr>
 		<td valign="MIDDLE"><b><bean:message key="message.label.body" /></b></td>
-		<td valign="MIDDLE">&nbsp;&nbsp;<html:textarea rows="10" cols="60"
+		<td valign="TOP"><b class="required">*</b><html:textarea rows="10" cols="60"
 			tabindex="2" property="message.body" /> 
 			<BR><html:errors property="message.body" /></td>
 	</tr>
Index: lams_tool_forum/web/jsps/message/topicview.jsp
===================================================================
diff -u -r3de24b3fb4e2ead20d187f4b5000464ae2791262 -r4d23938299d7cd12c95346e9abc603374b04e212
--- lams_tool_forum/web/jsps/message/topicview.jsp	(.../topicview.jsp)	(revision 3de24b3fb4e2ead20d187f4b5000464ae2791262)
+++ lams_tool_forum/web/jsps/message/topicview.jsp	(.../topicview.jsp)	(revision 4d23938299d7cd12c95346e9abc603374b04e212)
@@ -3,7 +3,7 @@
 <script type="text/javascript">
 	function success(){
 		var flag = "<c:out value="${SUCCESS_FLAG}"/>";
-		if(flag == "SUCCESS"){
+		if(flag == "DELETE_SUCCESS"){
 			closeWin();
 		}
 	}
@@ -61,9 +61,6 @@
 				<html:link href="${deletetopic}">
 					<b><fmt:message key="label.delete" /></b>
 				</html:link>
-				<html:link href="javascript:closeWin()">
-					<b><fmt:message key="label.done" /></b>
-				</html:link>
 			</td>
 		</tr>
 	</table>