Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java
===================================================================
diff -u -rbd383652fb10a2e82b00cbcc2ed08ac02183b1d3 -r3ed28043516fa5618a5b8dc11977241b0cdf92f5
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java	(.../MessageDTO.java)	(revision bd383652fb10a2e82b00cbcc2ed08ac02183b1d3)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java	(.../MessageDTO.java)	(revision 3ed28043516fa5618a5b8dc11977241b0cdf92f5)
@@ -44,6 +44,10 @@
 	private Float mark;
 	private String comment;
 	private boolean released;
+	
+	//2 fields use for export portfolio function
+	private String attachmentName;
+	private String attachmentLocalUrl;
 
 	/**
 	 * Get a <code>MessageDTO</code> instance from a given <code>Message</code>.
@@ -167,5 +171,21 @@
 	public void setReleased(boolean isReleased) {
 		this.released = isReleased;
 	}
+
+	public String getAttachmentLocalUrl() {
+		return attachmentLocalUrl;
+	}
+
+	public void setAttachmentLocalUrl(String attachmentLocalUrl) {
+		this.attachmentLocalUrl = attachmentLocalUrl;
+	}
+
+	public String getAttachmentName() {
+		return attachmentName;
+	}
+
+	public void setAttachmentName(String attachmentName) {
+		this.attachmentName = attachmentName;
+	}
 	
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ExportServlet.java
===================================================================
diff -u -r3306bb9a4b9c92a8539e317d5b67b3fc5bf90e8c -r3ed28043516fa5618a5b8dc11977241b0cdf92f5
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ExportServlet.java	(.../ExportServlet.java)	(revision 3306bb9a4b9c92a8539e317d5b67b3fc5bf90e8c)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ExportServlet.java	(.../ExportServlet.java)	(revision 3ed28043516fa5618a5b8dc11977241b0cdf92f5)
@@ -25,6 +25,7 @@
 
 package org.lamsfoundation.lams.tool.forum.web.actions;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Iterator;
@@ -35,6 +36,7 @@
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
@@ -49,8 +51,10 @@
 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.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.web.servlet.AbstractExportPortfolioServlet;
+import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
@@ -114,6 +118,8 @@
         
 		// get root topic list and its children topics
         List<MessageDTO> msgDtoList = getSessionTopicList(toolSessionID, directoryName, forumService);
+        setAuthorMark(msgDtoList);
+        
         ForumToolSession session = forumService.getSessionBySessionId(toolSessionID);
         
         //put all message into Map. Key is session name, value is list of all topics in this session.
@@ -179,11 +185,25 @@
 					Iterator iter = topic.getMessage().getAttachments().iterator();
 					while(iter.hasNext()){
 						Attachment att = (Attachment) iter.next();
+						topic.setAttachmentName(att.getFileName());
+						int idx= 1;
+						String userName = topic.getAuthor();
+						String localDir;
+						while(true){
+							localDir = FileUtil.getFullPath(directoryName,userName + "/" + idx);
+							File local = new File(localDir);
+							if(!local.exists()){
+								local.mkdirs();
+								break;
+							}
+							idx++;
+						}
+						topic.setAttachmentLocalUrl(userName + "/" + idx + "/" + att.getFileName());
 						try {
 							handler = getToolContentHandler();
-							handler.saveFile(att.getFileUuid(), FileUtil.getFullPath(directoryName, att.getFileName()));
+							handler.saveFile(att.getFileUuid(), FileUtil.getFullPath(directoryName, topic.getAttachmentLocalUrl()));
 						} catch (Exception e) {
-							logger.equals("Export forum topic attachment failed: " + e.toString());
+							logger.error("Export forum topic attachment failed: " + e.toString());
 						}
 					}
 				}
@@ -199,4 +219,31 @@
     	    }
     	    return handler;
 	}
+    
+	/**
+	 * If this topic is created by current login user, then set Author mark
+	 * true.
+	 * 
+	 * @param msgDtoList
+	 */
+	private void setAuthorMark(List msgDtoList) {
+		// set current user to web page, so that can display "edit" button
+		// correct. Only author alow to edit.
+		HttpSession ss = SessionManager.getSession();
+		// get back login user DTO
+		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+
+		Long currUserId = new Long(user.getUserID().intValue());
+		Iterator iter = msgDtoList.iterator();
+		while (iter.hasNext()) {
+			MessageDTO dto = (MessageDTO) iter.next();
+			if (dto.getMessage().getCreatedBy() != null
+					&& currUserId.equals(dto.getMessage().getCreatedBy()
+							.getUserId()))
+				dto.setAuthor(true);
+			else
+				dto.setAuthor(false);
+		}
+	}
+
 }
Index: lams_tool_forum/web/jsps/export/exportportfolio.jsp
===================================================================
diff -u -rbd383652fb10a2e82b00cbcc2ed08ac02183b1d3 -r3ed28043516fa5618a5b8dc11977241b0cdf92f5
--- lams_tool_forum/web/jsps/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision bd383652fb10a2e82b00cbcc2ed08ac02183b1d3)
+++ lams_tool_forum/web/jsps/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 3ed28043516fa5618a5b8dc11977241b0cdf92f5)
@@ -69,13 +69,13 @@
 					<tr>
 						<td>
 							<c:forEach var="file" items="${msgDto.message.attachments}">
-								<a href="${file.fileName}"> <c:out value="${file.fileName}" /> </a>
+								<a href="${msgDto.attachmentLocalUrl}"> <c:out value="${msgDto.attachmentName}" /> </a>
 							</c:forEach>
 						</td>
 					</tr>
 				</c:if>
 				<%-- display mark for teacher --%>
-				<c:if test="${msgDto.released || mode=='teacher'}">
+				<c:if test="${(msgDto.released && msgDto.isAuthor)|| mode=='teacher'}">
 					<tr>
 						<td>
 							<span class="field-name" ><fmt:message key="lable.topic.title.mark"/></span>
Index: lams_tool_forum/web/jsps/learning/message/topicview.jsp
===================================================================
diff -u -r27d386f3472e12afab03d53dfde3ed9b1c9a44d3 -r3ed28043516fa5618a5b8dc11977241b0cdf92f5
--- lams_tool_forum/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision 27d386f3472e12afab03d53dfde3ed9b1c9a44d3)
+++ lams_tool_forum/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision 3ed28043516fa5618a5b8dc11977241b0cdf92f5)
@@ -50,7 +50,7 @@
 					</td>
 				</tr>
 			</c:if>
-			<c:if test="${(msgDto.released || mode=='teacher') && (not empty msgDto.mark)}">
+			<c:if test="${((msgDto.released && msgDto.isAuthor) || mode=='teacher') && (not empty msgDto.mark)}">
 				<tr>
 					<td>
 						<span class="field-name" ><fmt:message key="lable.topic.title.mark"/></span>