Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java
===================================================================
diff -u -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888 -r3306bb9a4b9c92a8539e317d5b67b3fc5bf90e8c
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java	(.../MessageDTO.java)	(revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java	(.../MessageDTO.java)	(revision 3306bb9a4b9c92a8539e317d5b67b3fc5bf90e8c)
@@ -42,7 +42,10 @@
 	private int threadNum;
 	private boolean isAuthor;
 	private Float mark;
+	private String comment;
 
+
+
 	/**
 	 * Get a <code>MessageDTO</code> instance from a given <code>Message</code>.
 	 * 
@@ -62,8 +65,10 @@
 			dto.setHasAttachment(true);
 		
 		ForumReport report = msg.getReport();
-		if(report != null && report.getMark() != null)
+		if(report != null && report.getMark() != null){
 			dto.mark = report.getMark();
+			dto.comment = report.getComment();
+		}
 		
 		return dto;
 	}
@@ -90,8 +95,10 @@
 			else
 				msgDto.setHasAttachment(true);
 			ForumReport report = msg.getReport();
-			if(report != null && report.getMark() != null)
+			if(report != null && report.getMark() != null){
 				msgDto.mark = report.getMark();
+				msgDto.comment = report.getComment();
+			}
 
 			retSet.add(msgDto);
 		}
@@ -143,5 +150,12 @@
 
 	public void setMark(Float mark) {
 		this.mark = mark;
-	}	
+	}
+	public String getComment() {
+		return comment;
+	}
+
+	public void setComment(String comment) {
+		this.comment = comment;
+	}
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ExportServlet.java
===================================================================
diff -u -rfb96ff9dba9dfa8cf9646fddcca425851075c80a -r3306bb9a4b9c92a8539e317d5b67b3fc5bf90e8c
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ExportServlet.java	(.../ExportServlet.java)	(revision fb96ff9dba9dfa8cf9646fddcca425851075c80a)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ExportServlet.java	(.../ExportServlet.java)	(revision 3306bb9a4b9c92a8539e317d5b67b3fc5bf90e8c)
@@ -49,6 +49,7 @@
 import org.lamsfoundation.lams.tool.forum.service.IForumService;
 import org.lamsfoundation.lams.tool.forum.util.ForumConstants;
 import org.lamsfoundation.lams.tool.forum.util.ForumToolContentHandler;
+import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.web.servlet.AbstractExportPortfolioServlet;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.web.context.WebApplicationContext;
@@ -73,13 +74,15 @@
 				return -1;
 		}
 	}
+	
 	public String doExport(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies)
 	{
 		
-		request.setAttribute(AttributeNames.PARAM_MODE, mode);
 		if (StringUtils.equals(mode,ToolAccessMode.LEARNER.toString())){
+			 request.getSession().setAttribute(AttributeNames.PARAM_MODE, ToolAccessMode.LEARNER);
 			learner(request,response,directoryName,cookies);
 		}else if (StringUtils.equals(mode,ToolAccessMode.TEACHER.toString())){
+			request.getSession().setAttribute(AttributeNames.PARAM_MODE, ToolAccessMode.TEACHER);
 			teacher(request,response,directoryName,cookies);
 		}
 		
@@ -117,8 +120,7 @@
         Map sessionTopicMap = new TreeMap();
         sessionTopicMap.put(session.getSessionName(), msgDtoList);
         
-		request.setAttribute(ForumConstants.ATTR_TOOL_CONTENT_TOPICS, msgDtoList);
-		request.getSession().setAttribute(ForumConstants.AUTHORING_TOPIC_THREAD,msgDtoList);
+		request.getSession().setAttribute(ForumConstants.ATTR_TOOL_CONTENT_TOPICS, sessionTopicMap);
 		
 		//set forum title 
 		request.setAttribute(ForumConstants.FORUM_TITLE, session.getForum().getTitle());
@@ -150,7 +152,7 @@
         List sessionList = forumService.getSessionsByContentId(toolContentID);
         Iterator iter = sessionList.iterator();
         //put all message into Map. Key is session name, value is list of all topics in this session.
-        Map<String,List<MessageDTO>> topicsByUser = new TreeMap<String,List<MessageDTO>>(new StringComparator());
+        Map<String,List<MessageDTO>> topicsByUser = new TreeMap<String,List<MessageDTO>>(this.new StringComparator());
         while(iter.hasNext()){
         	ForumToolSession session = (ForumToolSession) iter.next();
         	List<MessageDTO> sessionMsgDTO = getSessionTopicList(session.getSessionId(), directoryName, forumService);
@@ -179,7 +181,7 @@
 						Attachment att = (Attachment) iter.next();
 						try {
 							handler = getToolContentHandler();
-							handler.saveFile(att.getFileUuid(), directoryName);
+							handler.saveFile(att.getFileUuid(), FileUtil.getFullPath(directoryName, att.getFileName()));
 						} catch (Exception e) {
 							logger.equals("Export forum topic attachment failed: " + e.toString());
 						}
Index: lams_tool_forum/web/WEB-INF/struts-config.xml
===================================================================
diff -u -red34ad93e720126f7473b282585c411c8acf7dbe -r3306bb9a4b9c92a8539e317d5b67b3fc5bf90e8c
--- lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision ed34ad93e720126f7473b282585c411c8acf7dbe)
+++ lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 3306bb9a4b9c92a8539e317d5b67b3fc5bf90e8c)
@@ -31,13 +31,14 @@
   </form-beans>
 
   <!-- ========== Global Exceptions Definitions =================================== -->
-      <!-- B: global exceptions 
-    <global-exceptions>
-	    <exception key="error.operation.failed"
-		    type="java.lang.Exception" path="tiles:/error"/>
-    </global-exceptions>
-    -->
-    <!-- B: end of global exceptions -->
+  <global-exceptions>
+  <exception
+    handler="org.lamsfoundation.lams.web.util.CustomStrutsExceptionHandler"
+    key="error.system"
+    path="/error.jsp"
+    scope="request"
+    type="java.lang.Exception"/>
+</global-exceptions>
 
   <!-- ========== Global Forward Definitions =================================== -->
   <global-forwards>
Index: lams_tool_forum/web/WEB-INF/web.xml
===================================================================
diff -u -r9393c098e5dfd603e2d37347cd1e531a25aa424a -r3306bb9a4b9c92a8539e317d5b67b3fc5bf90e8c
--- lams_tool_forum/web/WEB-INF/web.xml	(.../web.xml)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
+++ lams_tool_forum/web/WEB-INF/web.xml	(.../web.xml)	(revision 3306bb9a4b9c92a8539e317d5b67b3fc5bf90e8c)
@@ -159,10 +159,18 @@
    <!ELEMENT mime-mapping (extension, mime-type)>
    -->
 
-  <error-page>
-	<error-code>403</error-code>
-	<location>/403.html</location>
-</error-page>
+      <error-page>
+        <error-code>500</error-code>
+        <location>/error.jsp</location>
+    </error-page>
+    <error-page>
+        <error-code>403</error-code>
+        <location>/403.jsp</location>
+    </error-page>
+    <error-page>
+        <error-code>404</error-code>
+        <location>/404.jsp</location>
+    </error-page>
 
   	<jsp-config>
 		<!--  ======================================================== -->	
Index: lams_tool_forum/web/jsps/export/exportportfolio.jsp
===================================================================
diff -u -rfb96ff9dba9dfa8cf9646fddcca425851075c80a -r3306bb9a4b9c92a8539e317d5b67b3fc5bf90e8c
--- lams_tool_forum/web/jsps/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision fb96ff9dba9dfa8cf9646fddcca425851075c80a)
+++ lams_tool_forum/web/jsps/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 3306bb9a4b9c92a8539e317d5b67b3fc5bf90e8c)
@@ -19,9 +19,12 @@
 	<h2>
 		<fmt:message key="title.message.view.topic" />
 	</h2>
-<c:forEach var="entry" items=${ToolContentTopicList}">
+<c:forEach var="entry" items="${ToolContentTopicList}">
 	<c:set var="sessionName" value="${entry.key}"/>
-	Message from ${sessionName}:
+	<h2>
+		${sessionName}
+	</h2>
+	
 	<c:set var="topicThread" value="${entry.value}"/>
 	<c:forEach var="msgDto" items="${topicThread}">
 		<c:set var="indentSize" value="${msgDto.level*3}" />
@@ -66,10 +69,7 @@
 					<tr>
 						<td>
 							<c:forEach var="file" items="${msgDto.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>
+								<a href="${file.fileName}"> <c:out value="${file.fileName}" /> </a>
 							</c:forEach>
 						</td>
 					</tr>
@@ -78,16 +78,30 @@
 				<c:if test='${mode == "teacher"}'>
 					<tr>
 						<td>
-							<c:if test="${emtpy msgDto.message.report.mark}">
-							</c:if>
-							<c:if test="${msgDto.message.report.mark}">
-								${msgDto.message.report.mark}
-							</c:if>
+							<span class="field-name" ><fmt:message key="lable.topic.title.mark"/></span>
+							<BR>
+							<c:choose>
+								<c:when test="${empty msgDto.mark}">
+									<fmt:message key="message.not.avaliable"/>
+								</c:when>
+								<c:otherwise>
+									${msgDto.mark}
+								</c:otherwise>
+							</c:choose>
 						</td>
 					</tr>
 					<tr>
 						<td>
-							<c:out value="${msgDto.message.report.comment}" escapeXml="false" />
+							<span class="field-name" ><fmt:message key="lable.topic.title.comment"/></span>
+							<BR>
+							<c:choose>
+								<c:when test="${empty msgDto.comment}">
+									<fmt:message key="message.not.avaliable"/>
+								</c:when>
+								<c:otherwise>
+									<c:out value="${msgDto.comment}" escapeXml="false" />
+								</c:otherwise>
+							</c:choose>
 						</td>
 					</tr>
 				</c:if>