Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
===================================================================
diff -u -r6f2921676dc2b18ab8f8471a40d95e5db1ffa92c -rfb96ff9dba9dfa8cf9646fddcca425851075c80a
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	(.../ForumConstants.java)	(revision 6f2921676dc2b18ab8f8471a40d95e5db1ffa92c)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	(.../ForumConstants.java)	(revision fb96ff9dba9dfa8cf9646fddcca425851075c80a)
@@ -83,5 +83,7 @@
 	public static final String ATTR_FORUM_INSTRCUTION = "instruction";
 
 	public static final String FORUM_TITLE = "forum_title";
+
+	public static final String ATTR_TOOL_CONTENT_TOPICS = "ToolContentTopicList";
 	
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ExportServlet.java
===================================================================
diff -u -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888 -rfb96ff9dba9dfa8cf9646fddcca425851075c80a
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ExportServlet.java	(.../ExportServlet.java)	(revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ExportServlet.java	(.../ExportServlet.java)	(revision fb96ff9dba9dfa8cf9646fddcca425851075c80a)
@@ -26,10 +26,11 @@
 package org.lamsfoundation.lams.tool.forum.web.actions;
 
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.TreeMap;
 
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
@@ -39,22 +40,43 @@
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.forum.dto.MessageDTO;
+import org.lamsfoundation.lams.tool.forum.persistence.Attachment;
 import org.lamsfoundation.lams.tool.forum.persistence.Forum;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumException;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumToolSession;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumUser;
 import org.lamsfoundation.lams.tool.forum.service.ForumServiceProxy;
 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.web.servlet.AbstractExportPortfolioServlet;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
 
 public class ExportServlet  extends AbstractExportPortfolioServlet {
 	private static final long serialVersionUID = -4529093489007108143L;
 	private static Logger logger = Logger.getLogger(ExportServlet.class);
 	private final String FILENAME = "forum_main.html";
+	ForumToolContentHandler handler;
 	
 	
+	private class StringComparator implements Comparator<String>{
+		public int compare(String o1, String o2) {
+			if(o1 != null && o2 != null){
+				int c = o1.compareTo(o2);
+				//to ensure String does not overlap even they have duplicated name.
+				return c==0?1:c;
+			}else if(o1 != null)
+				return 1;
+			else
+				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())){
 			learner(request,response,directoryName,cookies);
 		}else if (StringUtils.equals(mode,ToolAccessMode.TEACHER.toString())){
@@ -87,12 +109,24 @@
             throw new ForumException(error);
         }
         
-        List<MessageDTO> topicList = forumService.getAllTopicsFromSession(toolSessionID);
-		Map topicsByUser = getTopicsSortedByAuthor(topicList);	
-		request.getSession().setAttribute("report",topicsByUser);
+		// get root topic list and its children topics
+        List<MessageDTO> msgDtoList = getSessionTopicList(toolSessionID, directoryName, forumService);
+        ForumToolSession session = forumService.getSessionBySessionId(toolSessionID);
+        
+        //put all message into Map. Key is session name, value is list of all topics in this session.
+        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);
+		
+		//set forum title 
+		request.setAttribute(ForumConstants.FORUM_TITLE, session.getForum().getTitle());
+		
     }
+
     
-    public void teacher(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies)
+	public void teacher(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies)
     {
     	IForumService forumService = ForumServiceProxy.getForumService(getServletContext());
        
@@ -115,31 +149,52 @@
 		//return FileDetailsDTO list according to the given sessionID
         List sessionList = forumService.getSessionsByContentId(toolContentID);
         Iterator iter = sessionList.iterator();
-        Map topicsByUser = new HashMap();
+        //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());
         while(iter.hasNext()){
         	ForumToolSession session = (ForumToolSession) iter.next();
-            List topicList = forumService.getAllTopicsFromSession(session.getSessionId());
-    		topicsByUser.putAll(getTopicsSortedByAuthor(topicList));	
+        	List<MessageDTO> sessionMsgDTO = getSessionTopicList(session.getSessionId(), directoryName, forumService);
+    		topicsByUser.put(session.getSessionName(),sessionMsgDTO);	
         }
-		request.getSession().setAttribute("report",topicsByUser);
+		request.getSession().setAttribute(ForumConstants.ATTR_TOOL_CONTENT_TOPICS,topicsByUser);
     }
+
 	/**
-	 * @param topicList
+	 * Get all topics with their children message for a special ToolSessionID.
+	 * @param toolSessionID
+	 * @param directoryName
+	 * @param forumService
 	 * @return
 	 */
-	private Map getTopicsSortedByAuthor(List topicList) {
-		Map topicsByUser = new HashMap();
-		Iterator iter = topicList.iterator();
-		while(iter.hasNext()){
-			MessageDTO dto = (MessageDTO) iter.next();
-			dto.getMessage().getReport();
-			List list = (List) topicsByUser.get(dto.getMessage().getCreatedBy());
-			if(list == null){
-				list = new ArrayList();
-				topicsByUser.put(dto.getMessage().getCreatedBy(),list);
+	private List<MessageDTO> getSessionTopicList(Long toolSessionID, String directoryName, IForumService forumService) {
+		List<MessageDTO> rootTopics = forumService.getRootTopics(toolSessionID);
+		List<MessageDTO> msgDtoList = new ArrayList<MessageDTO>();
+		for(MessageDTO msgDto : rootTopics){
+			List<MessageDTO> topics = forumService.getTopicThread(msgDto.getMessage().getUid());
+			//check attachement, if it has, save it into local directory.
+			for(MessageDTO topic:topics){
+				if(topic.getHasAttachment()){
+					Iterator iter = topic.getMessage().getAttachments().iterator();
+					while(iter.hasNext()){
+						Attachment att = (Attachment) iter.next();
+						try {
+							handler = getToolContentHandler();
+							handler.saveFile(att.getFileUuid(), directoryName);
+						} catch (Exception e) {
+							logger.equals("Export forum topic attachment failed: " + e.toString());
+						}
+					}
+				}
 			}
-			list.add(dto);
+			msgDtoList.addAll(topics);
 		}
-		return topicsByUser;
+		return msgDtoList;
 	}
+    private ForumToolContentHandler getToolContentHandler() {
+  	    if ( handler == null ) {
+    	      WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(this.getServletContext());
+    	      handler = (ForumToolContentHandler) wac.getBean("forumToolContentHandler");
+    	    }
+    	    return handler;
+	}
 }
Index: lams_tool_forum/web/jsps/export/exportportfolio.jsp
===================================================================
diff -u -r5b6a17732f3cc14cf5005aa71d92e553e21c60b0 -rfb96ff9dba9dfa8cf9646fddcca425851075c80a
--- lams_tool_forum/web/jsps/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 5b6a17732f3cc14cf5005aa71d92e553e21c60b0)
+++ lams_tool_forum/web/jsps/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision fb96ff9dba9dfa8cf9646fddcca425851075c80a)
@@ -8,129 +8,98 @@
 </head>
 
 <body>
-<div id="page-learner"><!--main box 'page'-->
+<h1 class="no-tabs-below">
+	${forum_title}
+</h1>
 
-	<h1 class="no-tabs-below">  </h1>
-	<div id="header-no-tabs-learner">
+<div id="header-no-tabs-learner"></div>
 
-	</div><!--closes header-->
+<div id="content-learner">
 
-	<div id="content-learner">
-
-	<c:if test="${empty report}">
-		<div align="center"><b><fmt:message key="message.not.avaliable"/></b></div>
-	</c:if>
-	<c:forEach items="${report}" var="userList">
-		<table width="90%" border="1" cellspacing="3" cellpadding="3" align="center">
-			<tr>
-				<td>
-					<table width="100%" border="0" cellspacing="3" cellpadding="3">
-						<c:set var="user" value="${userList.key}" />
-						<c:set var="markList" value="${userList.value}" />
-						<c:set var="first" value="true" />
-						<c:set var="postNum" value="${fn:length(markList)}" />
-						<c:forEach items="${markList}" var="topic" varStatus="status">
-							<c:if test="${status.index == 0}">
-								<tr>
-									<td colspan="2">
-										<c:out value="${user.firstName}" />
-										<c:out value="${user.lastName}" />
-										,
-										<c:out value="${user.loginName}" />
-										,
-										<fmt:message key="monitoring.user.post.topic" />
-									</td>
-								<tr>
-							</c:if>
-							<tr>
-								<td width="150">
-									<b><fmt:message key="lable.topic.title.subject" /></b>
-								</td>
-								<td>
-									<c:out value="${topic.message.subject}" />
-								</td>
-							</tr>
-							<tr>
-								<td>
-									<b><fmt:message key="button.on" /></b>
-								</td>
-								<td>
-									<fmt:formatDate value="${topic.message.updated}" type="time" timeStyle="short" />
-									<fmt:formatDate value="${topic.message.updated}" type="date" dateStyle="full" />
-								</td>
-							</tr>
-							<c:forEach var="file" items="${topic.message.attachments}">
-								<tr>
-									<td>
-										<b><fmt:message key="message.label.attachment" /></b>
-									</td>
-									<td>
-										<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>
-									</td>
-								</tr>
+	<h2>
+		<fmt:message key="title.message.view.topic" />
+	</h2>
+<c:forEach var="entry" items=${ToolContentTopicList}">
+	<c:set var="sessionName" value="${entry.key}"/>
+	Message from ${sessionName}:
+	<c:set var="topicThread" value="${entry.value}"/>
+	<c:forEach var="msgDto" items="${topicThread}">
+		<c:set var="indentSize" value="${msgDto.level*3}" />
+		<c:set var="hidden" value="${msgDto.message.hideFlag}" />
+		<div style="margin-left:<c:out value="${indentSize}"/>em;">
+			<table cellspacing="0" class="forum">
+				<tr>
+					<th class="first">
+						<c:choose>
+							<c:when test='${(mode == "teacher") || (not hidden)}'>
+								<b> <c:out value="${msgDto.message.subject}" /> </b>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="topic.message.subject.hidden" />
+							</c:otherwise>
+						</c:choose>
+					</th>
+				</tr>
+				<tr>
+					<td class="first posted-by">
+						<c:if test='${(mode == "teacher") || (not hidden)}'>
+							<fmt:message key="lable.topic.subject.by" />
+							<c:out value="${msgDto.author}" />
+									-
+									<fmt:formatDate value="${msgDto.message.created}" type="time" timeStyle="short" />
+							<fmt:formatDate value="${msgDto.message.created}" type="date" dateStyle="full" />
+						</c:if>
+					</td>
+				</tr>
+				<tr>
+					<td>
+						<c:if test='${(not hidden) || (hidden && mode == "teacher")}'>
+							<c:out value="${msgDto.message.body}" escapeXml="false" />
+						</c:if>
+						<c:if test='${hidden}'>
+							<fmt:message key="topic.message.body.hidden" />
+						</c:if>
+					</td>
+				</tr>
+	
+				<c:if test="${not empty msgDto.message.attachments}">
+					<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>
 							</c:forEach>
-							<tr>
-								<td>
-									<b><fmt:message key="lable.topic.title.body" /></b>
-								</td>
-								<td>
-									<c:out value="${topic.message.body}" escapeXml="false" />
-								</td>
-							</tr>
-							<tr>
-								<td>
-									<b><fmt:message key="lable.topic.title.mark" /></b>
-								</td>
-								<td>
-									<c:choose>
-										<c:when test="${empty topic.message.report.mark}">
-											<fmt:message key="message.not.avaliable" />
-										</c:when>
-										<c:otherwise>
-											<c:out value="${topic.message.report.mark}" escapeXml="false" />
-										</c:otherwise>
-									</c:choose>
-								</td>
-							</tr>
-							<tr>
-								<td>
-									<b><fmt:message key="lable.topic.title.comment" /></b>
-								</td>
-								<td>
-									<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>
-								</td>
-							</tr>
-							<c:if test="${status.count != postNum}">
-								<tr>
-									<td colspan="2">
-										<hr>
-									</td>
-								</tr>
+						</td>
+					</tr>
+				</c:if>
+				<%-- display mark for teacher --%>
+				<c:if test='${mode == "teacher"}'>
+					<tr>
+						<td>
+							<c:if test="${emtpy msgDto.message.report.mark}">
 							</c:if>
-						</c:forEach>
-					</table>
-				</td>
-			</tr>
-		</table>
+							<c:if test="${msgDto.message.report.mark}">
+								${msgDto.message.report.mark}
+							</c:if>
+						</td>
+					</tr>
+					<tr>
+						<td>
+							<c:out value="${msgDto.message.report.comment}" escapeXml="false" />
+						</td>
+					</tr>
+				</c:if>
+			</table>
+		</div>
 	</c:forEach>
-	
-	</div>  <!--closes content-->
+</c:forEach>
 
 
-	<div id="footer-learner">
-	</div><!--closes footer-->
+</div>
 
-</div><!--closes page-->
+<div id="footer-learner"></div>
 
 </body>
 </html:html>