Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java,v
diff -u -r1.85.2.10 -r1.85.2.11
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	20 Feb 2017 01:11:45 -0000	1.85.2.10
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	6 Mar 2017 13:25:38 -0000	1.85.2.11
@@ -930,15 +930,14 @@
      */
     private ActionForward deleteAttachment(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
-
 	// only reset not attachment flag.
 	MessageDTO dto = new MessageDTO();
 	dto.setHasAttachment(false);
 	request.setAttribute(ForumConstants.AUTHORING_TOPIC, dto);
-	SessionMap sessionMap = (SessionMap) request.getSession()
-		.getAttribute(WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID));
+	String sessionMapId = WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID);
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapId);
 	request.setAttribute(ForumConstants.ATTR_ALLOW_UPLOAD, sessionMap.get(ForumConstants.ATTR_ALLOW_UPLOAD));
-
+	request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, sessionMapId);
 	return mapping.findForward("success");
     }
 
Fisheye: Tag 1.4.12.3 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/learning/message/msgattachment.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/web/jsps/learning/message/topiceditform.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/topiceditform.jsp,v
diff -u -r1.18.2.9 -r1.18.2.10
--- lams_tool_forum/web/jsps/learning/message/topiceditform.jsp	27 Feb 2017 10:11:07 -0000	1.18.2.9
+++ lams_tool_forum/web/jsps/learning/message/topiceditform.jsp	6 Mar 2017 13:25:38 -0000	1.18.2.10
@@ -14,29 +14,9 @@
 <c:if test="${topic.hasAttachment || sessionMap.allowUpload}">
 	<c:set var="allowUpload" value="${sessionMap.allowUpload}" />
 
-	 <div class="form-group">
-    	<label><fmt:message key="message.label.attachment" />&nbsp;</label>
-		<div id="itemAttachmentArea">
-			<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
-			<input type="hidden" name="hasAttachment" value="${topic.hasAttachment}"/>
-			<c:if test="${topic.hasAttachment}">
-					<c:forEach var="file" items="${topic.message.attachments}">
-					    <a id="removeAttachmentButton" href="#" onclick="removeAtt('${sessionMapID}')" class="btn btn-default btn-xs"><i class="fa fa-trash-o"></i></a>
-						<fmt:message key="message.label.attachment"/>: 
-						<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>
-				  		<BR/>
-			  		</c:forEach>
-				</ul>
-			</c:if>
-			
-			<c:if test="${not topic.hasAttachment && allowUpload}">
-				<lams:FileUpload fileFieldname="attachmentFile" maxFileSize="${sessionMap.uploadMaxFileSize}"/>
-			</c:if>
-		</div>
-	</div>		
+	<div id="itemAttachmentArea">
+		<%@ include file="/jsps/learning/message/msgattachment.jsp"%>
+	</div>
 
 	<lams:WaitingSpinner id="itemAttachmentArea_Busy"/>
 </c:if>