Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
diff -u -rff26fa967dd8f1982453cbe5c83381194a79f732 -rf6d33f29edef65c40875e3093a7537761cec3d6e
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision ff26fa967dd8f1982453cbe5c83381194a79f732)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision f6d33f29edef65c40875e3093a7537761cec3d6e)
@@ -130,7 +130,7 @@
 			HttpServletRequest request, HttpServletResponse response) {
 
 		
-		Long contentId = new Long(WebUtil.readLongParam(request,AttributeNames.TOOL_CONTENT_ID));
+		Long contentId = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
 		ForumForm forumForm = (ForumForm)form;
 		//get back the topic list and display them on page
 		forumService = getForumManager();
@@ -327,6 +327,7 @@
 			forumService.createMessage(forumId,newMsg.getMessage());
 			
 		}
+		request.setAttribute(ForumConstants.SUCCESS_FLAG,"ATT_SUCCESS_FLAG");
 		request.setAttribute(ForumConstants.AUTHORING_TOPICS_INDEX,topicIndex);
     	return mapping.findForward("success");
     }
@@ -488,7 +489,7 @@
 	 * @return
 	 */
 	private ActionForward deleteFile(HttpServletRequest request, HttpServletResponse response, ActionForm form, String type) {
-		Long contentID = new Long(WebUtil.readLongParam(request,AttributeNames.TOOL_CONTENT_ID));
+		Long contentID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
 		Long versionID = new Long(WebUtil.readLongParam(request,"versionID"));
 		Long uuID = new Long(WebUtil.readLongParam(request,"uuID"));
 		
Index: lams_tool_forum/web/jsps/authoring/message/edit.jsp
===================================================================
diff -u -r3de24b3fb4e2ead20d187f4b5000464ae2791262 -rf6d33f29edef65c40875e3093a7537761cec3d6e
--- lams_tool_forum/web/jsps/authoring/message/edit.jsp	(.../edit.jsp)	(revision 3de24b3fb4e2ead20d187f4b5000464ae2791262)
+++ lams_tool_forum/web/jsps/authoring/message/edit.jsp	(.../edit.jsp)	(revision f6d33f29edef65c40875e3093a7537761cec3d6e)
@@ -1,5 +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 == "ATT_SUCCESS_FLAG"){
+			window.opener.parent.location.href = "<html:rewrite page='/authoring/finishTopic.do'/>";
+		}
+	}
+	success();
+</script>
 <html:errors property="error" />
 <div align="center">
 <html:form action="/authoring/updateTopic.do" focus="message.subject"
Index: lams_tool_forum/web/jsps/message/topiceditform.jsp
===================================================================
diff -u -r4d23938299d7cd12c95346e9abc603374b04e212 -rf6d33f29edef65c40875e3093a7537761cec3d6e
--- lams_tool_forum/web/jsps/message/topiceditform.jsp	(.../topiceditform.jsp)	(revision 4d23938299d7cd12c95346e9abc603374b04e212)
+++ lams_tool_forum/web/jsps/message/topiceditform.jsp	(.../topiceditform.jsp)	(revision f6d33f29edef65c40875e3093a7537761cec3d6e)
@@ -17,7 +17,7 @@
 			<b><bean:message key="message.label.attachment" /></b>
 		</td>
 		<td valign="MIDDLE">&nbsp;
-			<c:if test="${not empty topic.message.attachments}">
+			<c:if test="${topic.hasAttachment}">
 				<c:forEach var="file" items="${topic.message.attachments}">
 					<c:set var="downloadURL">
 							<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true"/>
@@ -34,7 +34,7 @@
 					</a>					
 				</c:forEach>
 			</c:if>
-			<c:if test="${empty topic.message.attachments}">
+			<c:if test="${not topic.hasAttachment}">
 				<html:file tabindex="3"		property="attachmentFile" /> <html:errors	property="message.attachment" />
 			</c:if>
 		</td>