Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/MonitoringController.java
===================================================================
diff -u -r9f988c0cf9ce45c8812158692f38e74688b96ea4 -r98901fbfc777fa7907f4643646147c0c0286fa20
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 9f988c0cf9ce45c8812158692f38e74688b96ea4)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 98901fbfc777fa7907f4643646147c0c0286fa20)
@@ -567,7 +567,7 @@
      * View a special user's mark
      */
     @RequestMapping("/viewUserMark")
-    public String viewUserMark(HttpServletRequest request) {
+    public String viewUserMark(@ModelAttribute MarkForm markForm, HttpServletRequest request) {
 	Long userUid = new Long(WebUtil.readLongParam(request, ForumConstants.USER_UID));
 	Long sessionId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID));
 
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MessageForm.java
===================================================================
diff -u -r9f988c0cf9ce45c8812158692f38e74688b96ea4 -r98901fbfc777fa7907f4643646147c0c0286fa20
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MessageForm.java	(.../MessageForm.java)	(revision 9f988c0cf9ce45c8812158692f38e74688b96ea4)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MessageForm.java	(.../MessageForm.java)	(revision 98901fbfc777fa7907f4643646147c0c0286fa20)
@@ -89,7 +89,7 @@
 	    if (request.getRequestURI().indexOf("/learning/") != -1) {
 		if ((this.getAttachmentFile() != null)
 			&& FileUtil.isExecutableFile(this.getAttachmentFile().getOriginalFilename())) {
-		    errors.reject("message.attachment", messageService.getMessage("error.attachment.executable"));
+		    errors.reject("message.attachments", messageService.getMessage("error.attachment.executable"));
 		}
 		largeFile = false;
 	    }
Index: lams_tool_forum/web/jsps/authoring/message/create.jsp
===================================================================
diff -u -r82bfa2d1d62378051c32cff20a826607fdf7a8e5 -r98901fbfc777fa7907f4643646147c0c0286fa20
--- lams_tool_forum/web/jsps/authoring/message/create.jsp	(.../create.jsp)	(revision 82bfa2d1d62378051c32cff20a826607fdf7a8e5)
+++ lams_tool_forum/web/jsps/authoring/message/create.jsp	(.../create.jsp)	(revision 98901fbfc777fa7907f4643646147c0c0286fa20)
@@ -42,7 +42,7 @@
 			<div class="form-group">
 				<label for="attachmentFile"><fmt:message key="message.label.attachment" /></label>
 				<lams:FileUpload fileFieldname="attachmentFile" maxFileSize="${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}" tabindex="3" />
-				<form:errors path="message.attachment" />
+				<form:errors path="message.attachments" />
 				<lams:WaitingSpinner id="itemAttachmentArea_Busy"/>
 			</div>
 
Index: lams_tool_forum/web/jsps/authoring/parts/msgattachment.jsp
===================================================================
diff -u -r82bfa2d1d62378051c32cff20a826607fdf7a8e5 -r98901fbfc777fa7907f4643646147c0c0286fa20
--- lams_tool_forum/web/jsps/authoring/parts/msgattachment.jsp	(.../msgattachment.jsp)	(revision 82bfa2d1d62378051c32cff20a826607fdf7a8e5)
+++ lams_tool_forum/web/jsps/authoring/parts/msgattachment.jsp	(.../msgattachment.jsp)	(revision 98901fbfc777fa7907f4643646147c0c0286fa20)
@@ -4,10 +4,10 @@
 <%@ page import="org.lamsfoundation.lams.util.FileValidatorSpringUtil" %>
 <c:set var="UPLOAD_FILE_MAX_SIZE_AS_USER_STRING"><%=FileValidatorSpringUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%></c:set>
 
-<c:set var="ctxPath" value="${pageContext.request.contextPath}"	scope="request" />
-<input type="hidden" name="hasAttachment" value="${itemAttachment.hasAttachment}" />
+<c:set var="itemAttachment" value="${topicFormId}" />
+<input type="hidden" name="hasAttachment" value="${not empty itemAttachment and itemAttachment.hasAttachment}" />
 <c:choose>
-	<c:when test="${itemAttachment.hasAttachment}">
+	<c:when test="${not empty itemAttachment and itemAttachment.hasAttachment}">
 		<ul>
 			<li>
 				<c:forEach var="file" items="${topic.message.attachments}">
Index: lams_tool_forum/web/jsps/learning/message/topicform.jsp
===================================================================
diff -u -r9f988c0cf9ce45c8812158692f38e74688b96ea4 -r98901fbfc777fa7907f4643646147c0c0286fa20
--- lams_tool_forum/web/jsps/learning/message/topicform.jsp	(.../topicform.jsp)	(revision 9f988c0cf9ce45c8812158692f38e74688b96ea4)
+++ lams_tool_forum/web/jsps/learning/message/topicform.jsp	(.../topicform.jsp)	(revision 98901fbfc777fa7907f4643646147c0c0286fa20)
@@ -15,7 +15,7 @@
 	<div class="form-group">
 		<label><fmt:message key="message.label.attachment" /></label><BR/>
 		<lams:FileUpload fileFieldname="attachmentFile" maxFileSize="${sessionMap.uploadMaxFileSize}" tabindex="3" />
-		<form:errors path="message.attachment" />
+		<form:errors path="message.attachments" />
 	</div>
 </c:if>
 
Index: lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp
===================================================================
diff -u -r9f988c0cf9ce45c8812158692f38e74688b96ea4 -r98901fbfc777fa7907f4643646147c0c0286fa20
--- lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp	(.../topicreplyform.jsp)	(revision 9f988c0cf9ce45c8812158692f38e74688b96ea4)
+++ lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp	(.../topicreplyform.jsp)	(revision 98901fbfc777fa7907f4643646147c0c0286fa20)
@@ -14,7 +14,7 @@
 
 	<div class="form-group">
  		<lams:FileUpload fileFieldname="attachmentFile" maxFileSize="${sessionMap.uploadMaxFileSize}" tabindex="3" />
- 		<form:errors path="message.attachment" />
+ 		<form:errors path="message.attachments" />
 	</div>
 	
 	<lams:WaitingSpinner id="itemAttachmentArea_Busy"/>
Index: lams_tool_forum/web/jsps/monitoring/statisticpart.jsp
===================================================================
diff -u -re062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf -r98901fbfc777fa7907f4643646147c0c0286fa20
--- lams_tool_forum/web/jsps/monitoring/statisticpart.jsp	(.../statisticpart.jsp)	(revision e062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf)
+++ lams_tool_forum/web/jsps/monitoring/statisticpart.jsp	(.../statisticpart.jsp)	(revision 98901fbfc777fa7907f4643646147c0c0286fa20)
@@ -40,7 +40,7 @@
 	<table class="table table-condensed table-no-border">
 		<tr>
 			<td class="field-name" width="30%">
-				<fmt:message key="lable.monitoring.statistic.total.message" />
+				<fmt:message key="label.monitoring.statistic.total.message" />
 			</td>
 			<td>
 				<c:out value="${sessionTotalMessage}" />
Index: lams_tool_forum/web/jsps/monitoring/updatemarks.jsp
===================================================================
diff -u -re062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf -r98901fbfc777fa7907f4643646147c0c0286fa20
--- lams_tool_forum/web/jsps/monitoring/updatemarks.jsp	(.../updatemarks.jsp)	(revision e062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf)
+++ lams_tool_forum/web/jsps/monitoring/updatemarks.jsp	(.../updatemarks.jsp)	(revision 98901fbfc777fa7907f4643646147c0c0286fa20)
@@ -1,70 +1,92 @@
+<!DOCTYPE html>
+        
+
 <%@ include file="/common/taglibs.jsp"%>
 
+<lams:html>
+	<lams:head>
+		<title><fmt:message key="activity.title" /></title>
+		<%@ include file="/common/header.jsp"%>
+	</lams:head>
+	<body class="stripes">
+			
+			<lams:Page type="monitor" title="${page.title.monitoring.edit.user.mark}">
 
-<form:form action="updateMark.do" id="markForm" modelAttribute="markForm" method="post">
+			<form:form action="updateMark.do" id="markForm" modelAttribute="markForm" method="post">
 
-	<c:set var="sessionMap" value="${sessionScope[markForm.sessionMapID]}" />
-	<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
-    <script type="text/javascript" src="<lams:LAMSURL />/includes/javascript/jquery.timeago.js"></script>
-    <script type="text/javascript" src="<lams:LAMSURL />/includes/javascript/timeagoi18n/jquery.timeago.${fn:toLowerCase(localeLanguage)}.js"></script>
-	<form:hidden path="sessionMapID"/>
-	<form:hidden path="topicID"/>
-	<form:hidden path="hideReflection" value="${sessionMap.hideReflection}"/>
+			<c:set var="sessionMap" value="${sessionScope[markForm.sessionMapID]}" />
+			<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
+		    <script type="text/javascript" src="<lams:LAMSURL />/includes/javascript/jquery.timeago.js"></script>
+		    <script type="text/javascript" src="<lams:LAMSURL />/includes/javascript/timeagoi18n/jquery.timeago.${fn:toLowerCase(localeLanguage)}.js"></script>
+			<form:hidden path="sessionMapID"/>
+			<form:hidden path="topicID"/>
+			<inpu type="hidden" name="hideReflection" value="${sessionMap.hideReflection}"/>
+		
+			<p>
+				<fmt:message key="message.assign.mark" />&nbsp;
+				<c:out value="${user.firstName}" />&nbsp;
+				<c:out value="${user.lastName}" />&nbsp;
+				<lams:Date value="${topic.message.updated}" timeago="true"/>
+			</p>		
+			
+			<p>
+				<c:set var="viewtopic">
+				    <lams:WebAppURL />learning/viewTopic.do?topicID=${topic.message.uid}&create=${topic.message.created.time}&sessionMapID=${formBean.sessionMapID}&hideReflection=${sessionMap.hideReflection}
+				</c:set>
+				<a href="javascript:launchPopup('${viewtopic}','viewtopic')">
+					<c:out value="${topic.message.subject}" />
+				</a>
+				<c:if test="${topic.hasAttachment}">
+					<i class="fa fa-paperclip loffset5" title="<fmt:message key='message.label.attachment'/>"></i>
+				</c:if>
+			</p>
+			
+			<%@ include file="/common/messages.jsp"%>
+		
+			<div class="form-group">
+				<label for="mark"><fmt:message key="lable.topic.title.mark" />*</label>
+				<input type="text" name="mark" value="${markForm.mark}" class="form-control form-control-inline"/>
+			</div>
+			<div class="form-group">
+				<label for="comment"><fmt:message key="lable.topic.title.comment" /></label>
+				<lams:CKEditor id="comment"	value="${markForm.comment}" toolbarSet="DefaultMonitor">
+				</lams:CKEditor>
+			</div>
+		
+		
+			<div class="pull-right">
+				<input type="submit" value="<fmt:message key="lable.update.mark"/>" class="btn btn-default" />
+							
+				<c:if test="${sessionMap.updateMode == 'listMarks'}">
+					<c:set var="cancelUrl">
+						<c:url value="/monitoring/viewUserMark.do"/>?sessionMapID=${markForm.sessionMapID}&userUid=${user.uid}&toolSessionID=${sessionMap.toolSessionID}
+					</c:set>
+				</c:if>
+							
+				<c:if test="${sessionMap.updateMode == 'viewForum'}">
+					<c:set var="cancelUrl">
+							<c:url value="/learning/viewTopic.do"/>?sessionMapID=${markForm.sessionMapID}&topicID=${sessionMap.rootUid}&hideReflection=${sessionMap.hideReflection}
+					</c:set>
+				</c:if>
+			
+				<input type="button" onclick="location.href='${cancelUrl}';" class="btn btn-default" value="<fmt:message key="button.cancel"/>">
+			</div>
+			
+			<script type="text/javascript">
+			jQuery(document).ready(function() {
+				jQuery("time.timeago").timeago();
+			});
+		</script>
+		
+		</form:form>
+		
 
-	<p>
-		<fmt:message key="message.assign.mark" />&nbsp;
-		<c:out value="${user.firstName}" />&nbsp;
-		<c:out value="${user.lastName}" />&nbsp;
-		<lams:Date value="${topic.message.updated}" timeago="true"/>
-	</p>		
-	
-	<p>
-		<c:set var="viewtopic">
-		    <lams:WebAppURL />learning/viewTopic.do?topicID=${topic.message.uid}&create=${topic.message.created.time}&sessionMapID=${formBean.sessionMapID}&hideReflection=${sessionMap.hideReflection}
-		</c:set>
-		<a href="javascript:launchPopup('${viewtopic}','viewtopic')">
-			<c:out value="${topic.message.subject}" />
-		</a>
-		<c:if test="${topic.hasAttachment}">
-			<i class="fa fa-paperclip loffset5" title="<fmt:message key='message.label.attachment'/>"></i>
-		</c:if>
-	</p>
-	
-	<%@ include file="/common/messages.jsp"%>
+			<div id="footer">
+			</div>
 
-	<div class="form-group">
-		<label for="mark"><fmt:message key="lable.topic.title.mark" />*</label>
-		<input type="text" name="mark" value="${markForm.mark}" class="form-control form-control-inline"/>
-	</div>
-	<div class="form-group">
-		<label for="comment"><fmt:message key="lable.topic.title.comment" /></label>
-		<lams:CKEditor id="comment"	value="${markForm.comment}" toolbarSet="DefaultMonitor">
-		</lams:CKEditor>
-	</div>
+			</lams:Page>
+	</body>
+</lams:html>
 
 
-	<div class="pull-right">
-		<input type="submit" value="<fmt:message key="lable.update.mark"/>" class="btn btn-default" />
-					
-		<c:if test="${sessionMap.updateMode == 'listMarks'}">
-			<c:set var="cancelUrl">
-				<c:url value="/monitoring/viewUserMark.do"/>?sessionMapID=${markForm.sessionMapID}&userUid=${user.uid}&toolSessionID=${sessionMap.toolSessionID}
-			</c:set>
-		</c:if>
-					
-		<c:if test="${sessionMap.updateMode == 'viewForum'}">
-			<c:set var="cancelUrl">
-					<c:url value="/learning/viewTopic.do"/>?sessionMapID=${markForm.sessionMapID}&topicID=${sessionMap.rootUid}&hideReflection=${sessionMap.hideReflection}
-			</c:set>
-		</c:if>
-	
-		<input type="button" onclick="location.href='${cancelUrl}';" class="btn btn-default" value="<fmt:message key="button.cancel"/>">
-	</div>
-	
-	<script type="text/javascript">
-	jQuery(document).ready(function() {
-		jQuery("time.timeago").timeago();
-	});
-</script>
 
-</form:form>
Index: lams_tool_forum/web/jsps/monitoring/viewmarks.jsp
===================================================================
diff -u -re062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf -r98901fbfc777fa7907f4643646147c0c0286fa20
--- lams_tool_forum/web/jsps/monitoring/viewmarks.jsp	(.../viewmarks.jsp)	(revision e062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf)
+++ lams_tool_forum/web/jsps/monitoring/viewmarks.jsp	(.../viewmarks.jsp)	(revision 98901fbfc777fa7907f4643646147c0c0286fa20)
@@ -1,109 +1,132 @@
+<!DOCTYPE html>
+        
+
 <%@ include file="/common/taglibs.jsp"%>
-<style media="screen,projection" type="text/css">
-	.field-name {
-		padding-bottom: 0px;
-	}
-</style>
-<script type="text/javascript">
-	function closeAndRefreshParentMonitoringWindow() {
-		refreshParentMonitoringWindow();
-		window.close();
-	}
-</script>
 
-<p>
-	<strong><c:out value="${user.lastName}" />&nbsp;<c:out value="${user.firstName}" /></strong>&nbsp;
-	<fmt:message key="monitoring.user.post.topic" />
-</p>
+<lams:html>
+	<lams:head>
+		<title><fmt:message key="activity.title" /></title>
+		<%@ include file="/common/header.jsp"%>
+	</lams:head>
+	<body class="stripes">
+			
+			<lams:Page type="monitor" title="${page.title.monitoring.view.user.mark}">
 
-<c:forEach items="${messages}" var="topic">
+			<style media="screen,projection" type="text/css">
+				.field-name {
+					padding-bottom: 0px;
+				}
+			</style>
+			<script type="text/javascript">
+				function closeAndRefreshParentMonitoringWindow() {
+					refreshParentMonitoringWindow();
+					window.close();
+				}
+			</script>
+			
+			<p>
+				<strong><c:out value="${user.lastName}" />&nbsp;<c:out value="${user.firstName}" /></strong>&nbsp;
+				<fmt:message key="monitoring.user.post.topic" />
+			</p>
+			
+			<c:forEach items="${messages}" var="topic">
+			
+			<div class="panel panel-default ${highlightClass} msg" >
+			
+				<c:choose>
+					<c:when test="${topic.message.isMonitor}">
+			            	<c:set var="textClass" value="text-info"/>
+			                <c:set var="bgClass" value="bg-info"/>
+			                <c:set var="iconClass" value ="fa-mortar-board ${textClass}"/>
+			            </c:when>
+					<c:otherwise>
+			            	<c:set var="textClass" value=""/>
+			                <c:set var="bgClass" value=""/>
+			                <c:set var="iconClass" value ="fa-user ${textClass}"/>
+			        </c:otherwise>
+			    </c:choose>
+			
+				<div class="panel-heading">
+					<h4 class="panel-title">
+					<span class="${textClass}">
+						<span style="float: right"> <i class="fa fa-xs ${iconClass}"></i> 
+							<lams:Date value="${topic.message.updated}" />
+						</span>
+						<c:out value="${topic.message.subject}" />
+					</span>
+					</h4>
+				</div>
+			
+				<div class="panel-body ${bgClass}" >
+			
+				<div class="pull-right">
+						<form:form action="editMark.do" id="markForm" modelAttribute="markForm" method="post">
+						<form:hidden path="sessionMapID" value="${sessionMapID}"/>
+						<form:hidden path="topicID" value="${topic.message.uid}"/>
+						<input type="submit" value="<fmt:message key="lable.update.mark"/>" class="btn btn-default btn-sm" />
+						</form:form>
+				</div>
+			
+					<div class="row">
+			  		<div class="col-sm-2"><strong><fmt:message key="label.number.of.replies" /></strong></div>
+					<div class="col-sm-3">${topic.message.replyNumber}</div>
+				</div>
+				<div class="row">
+					<div class="col-sm-2"><strong><fmt:message key="lable.topic.title.mark" /></strong></div>
+					<div class="col-sm-3">
+					<c:choose>
+					<c:when test="${empty topic.message.report.mark}">
+						<fmt:message key="message.not.avaliable" />
+					</c:when>
+					<c:otherwise>
+						<fmt:formatNumber value="${topic.message.report.mark}"  maxFractionDigits="2"/>
+					</c:otherwise>
+					</c:choose>
+					</div>
+				</div>
+				
+				<div class="row">
+					<div class="col-sm-2"><strong><fmt:message key="lable.topic.title.comment" /></strong></div>
+				  	<div class="col-sm-10">
+					<c:choose>
+					<c:when test="${empty topic.message.report.comment}">
+						<fmt:message key="message.not.avaliable" />
+					</c:when>
+					<c:otherwise>
+						<c:out value="${topic.message.report.comment}" escapeXml="false" />
+					</c:otherwise>
+					</c:choose>
+					</div>
+				</div>
+				
+				<hr class="msg-hr">
+				
+				<span><c:out value="${topic.message.body}" escapeXml="false" /></span>
+			
+				<c:forEach var="file" items="${topic.message.attachments}">
+					<c:set var="downloadURL">
+						<lams:WebAppURL />download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true
+					</c:set>
+					<a href="<c:out value='${downloadURL}' escapeXml='false'/>"><i class="fa fa-paperclip" title="<fmt:message key='message.label.attachment'/>"></i></a>
+				</c:forEach>
+			
+				</div>
+			</div>			
+			
+			</c:forEach>
+			
+			<div style="padding:0 15px 25px;">
+				<a href="javascript:window.close();" class="btn btn-default btn-sm pull-right">
+					<fmt:message key="button.close"/>
+				</a>
+			</div>
 
-<div class="panel panel-default ${highlightClass} msg" >
 
-	<c:choose>
-		<c:when test="${topic.message.isMonitor}">
-            	<c:set var="textClass" value="text-info"/>
-                <c:set var="bgClass" value="bg-info"/>
-                <c:set var="iconClass" value ="fa-mortar-board ${textClass}"/>
-            </c:when>
-		<c:otherwise>
-            	<c:set var="textClass" value=""/>
-                <c:set var="bgClass" value=""/>
-                <c:set var="iconClass" value ="fa-user ${textClass}"/>
-        </c:otherwise>
-    </c:choose>
+			<div id="footer">
+			</div>
 
-	<div class="panel-heading">
-		<h4 class="panel-title">
-		<span class="${textClass}">
-			<span style="float: right"> <i class="fa fa-xs ${iconClass}"></i> 
-				<lams:Date value="${topic.message.updated}" />
-			</span>
-			<c:out value="${topic.message.subject}" />
-		</span>
-		</h4>
-	</div>
+			</lams:Page>
+	</body>
+</lams:html>
 
-	<div class="panel-body ${bgClass}" >
 
-	<div class="pull-right">
-			<form:form action="editMark.do" id="markForm" modelAttribute="markForm" method="post">
-			<form:hidden path="sessionMapID" value="${sessionMapID}"/>
-			<form:hidden path="topicID" value="${topic.message.uid}"/>
-			<input type="submit" value="<fmt:message key="lable.update.mark"/>" class="btn btn-default btn-sm" />
-			</form:form>
-	</div>
-
-		<div class="row">
-  		<div class="col-sm-2"><strong><fmt:message key="label.number.of.replies" /></strong></div>
-		<div class="col-sm-3">${topic.message.replyNumber}</div>
-	</div>
-	<div class="row">
-		<div class="col-sm-2"><strong><fmt:message key="lable.topic.title.mark" /></strong></div>
-		<div class="col-sm-3">
-		<c:choose>
-		<c:when test="${empty topic.message.report.mark}">
-			<fmt:message key="message.not.avaliable" />
-		</c:when>
-		<c:otherwise>
-			<fmt:formatNumber value="${topic.message.report.mark}"  maxFractionDigits="2"/>
-		</c:otherwise>
-		</c:choose>
-		</div>
-	</div>
-	
-	<div class="row">
-		<div class="col-sm-2"><strong><fmt:message key="lable.topic.title.comment" /></strong></div>
-	  	<div class="col-sm-10">
-		<c:choose>
-		<c:when test="${empty topic.message.report.comment}">
-			<fmt:message key="message.not.avaliable" />
-		</c:when>
-		<c:otherwise>
-			<c:out value="${topic.message.report.comment}" escapeXml="false" />
-		</c:otherwise>
-		</c:choose>
-		</div>
-	</div>
-	
-	<hr class="msg-hr">
-	
-	<span><c:out value="${topic.message.body}" escapeXml="false" /></span>
-
-	<c:forEach var="file" items="${topic.message.attachments}">
-		<c:set var="downloadURL">
-			<lams:WebAppURL />download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true
-		</c:set>
-		<a href="<c:out value='${downloadURL}' escapeXml='false'/>"><i class="fa fa-paperclip" title="<fmt:message key='message.label.attachment'/>"></i></a>
-	</c:forEach>
-
-	</div>
-</div>			
-
-</c:forEach>
-
-<div style="padding:0 15px 25px;">
-	<a href="javascript:window.close();" class="btn btn-default btn-sm pull-right">
-		<fmt:message key="button.close"/>
-	</a>
-</div>