Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaMonitoredAnswersDTO.java
===================================================================
diff -u -rc527318c8c79f72151f6261342c5cc1a830d1e4d -rf448acf1e44f9fc8d349976f5dcc9217c9cdefab
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaMonitoredAnswersDTO.java	(.../QaMonitoredAnswersDTO.java)	(revision c527318c8c79f72151f6261342c5cc1a830d1e4d)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaMonitoredAnswersDTO.java	(.../QaMonitoredAnswersDTO.java)	(revision f448acf1e44f9fc8d349976f5dcc9217c9cdefab)
@@ -43,13 +43,12 @@
     private String questionUid;
 
     private String question;
+    
+    private String feedback;
 
     private Map questionAttempts;
 
     /**
-     * 
-     * /**
-     * 
      * @return Returns the question.
      */
     public String getQuestion() {
@@ -58,13 +57,29 @@
 
     /**
      * @param question
-     *                The question to set.
+     *            The question to set.
      */
     public void setQuestion(String question) {
 	this.question = question;
     }
+    
+    /**
+     * 
+     * @return Returns the feedback.
+     */
+    public String getFeedback() {
+	return feedback;
+    }
 
     /**
+     * @param feedback
+     *                The feedback to set.
+     */
+    public void setFeedback(String feedback) {
+	this.feedback = feedback;
+    }
+
+    /**
      * @return Returns the questionUid.
      */
     public String getQuestionUid() {
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java
===================================================================
diff -u -r328cd4dbe60d9e5c588e13cc16b7e7414893b0af -rf448acf1e44f9fc8d349976f5dcc9217c9cdefab
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java	(.../MonitoringUtil.java)	(revision 328cd4dbe60d9e5c588e13cc16b7e7414893b0af)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java	(.../MonitoringUtil.java)	(revision f448acf1e44f9fc8d349976f5dcc9217c9cdefab)
@@ -210,6 +210,7 @@
 		QaMonitoredAnswersDTO qaMonitoredAnswersDTO = new QaMonitoredAnswersDTO();
 		qaMonitoredAnswersDTO.setQuestionUid(qaQueContent.getUid().toString());
 		qaMonitoredAnswersDTO.setQuestion(qaQueContent.getQuestion());
+		qaMonitoredAnswersDTO.setFeedback(qaQueContent.getFeedback());
 		qaMonitoredAnswersDTO.setSessionName(sessionName);
 
 		logger.debug("using allUsersData to retrieve users data: " + isUserNamesVisible);
@@ -502,6 +503,7 @@
 			QaMonitoredAnswersDTO qaMonitoredAnswersDTO = new QaMonitoredAnswersDTO();
 			qaMonitoredAnswersDTO.setQuestionUid(qaQueContent.getUid().toString());
 			qaMonitoredAnswersDTO.setQuestion(qaQueContent.getQuestion());
+			qaMonitoredAnswersDTO.setFeedback(qaQueContent.getFeedback());
 			qaMonitoredAnswersDTO.setSessionId(currentSessionId);
 			qaMonitoredAnswersDTO.setSessionName(currentSessionName);
 
Index: lams_tool_laqa/web/export/exportportfolio.jsp
===================================================================
diff -u -rc914c1bc8b2a357e50071d40f2f379e1fbcb009f -rf448acf1e44f9fc8d349976f5dcc9217c9cdefab
--- lams_tool_laqa/web/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision c914c1bc8b2a357e50071d40f2f379e1fbcb009f)
+++ lams_tool_laqa/web/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision f448acf1e44f9fc8d349976f5dcc9217c9cdefab)
@@ -34,26 +34,17 @@
 
 	<div id="content">
 
-		<h1>
-			<c:choose>
-				<c:when test="${(portfolioExportMode == 'learner')}">
-					<fmt:message key="label.export.learner" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.export.teacher" />
-				</c:otherwise>
-			</c:choose>
-		</h1>
+		<h1>${generalLearnerFlowDTO.activityTitle} </h1>
+			
+		<h1>${generalLearnerFlowDTO.activityInstructions} </h1>
 
-
 		<c:if
 			test="${(userExceptionNoToolSessions == 'true') and (portfolioExportMode != 'learner')}">
 			<p>
 				<fmt:message key="error.noLearnerActivity" />
 			</p>
 		</c:if>
 
-
 		<!-- LEARNER EXPORT -->
 
 		<c:if test="${(userExceptionNoToolSessions != 'true') }">
@@ -68,6 +59,13 @@
 							<strong> <fmt:message key="label.question" /> : </strong>
 							<c:out value="${currentDto.question}" escapeXml="false" />
 						</p>
+						
+						<c:if test="${not empty currentDto.feedback}">
+							<p>
+								<strong> <fmt:message key="label.feedback" /> : </strong>
+								<c:out value="${currentDto.feedback}" escapeXml="false" />
+							</p>
+						</c:if>
 
 						<table cellspacing="0" class="alternative-color">
 							<tr>
@@ -146,6 +144,11 @@
 
 						<strong> <fmt:message key="label.question" /> : </strong>
 						<c:out value="${currentDto.question}" escapeXml="false" />
+						
+						<c:if test="${not empty currentDto.feedback}">
+							<strong> <fmt:message key="label.feedback" /> : </strong>
+							<c:out value="${currentDto.feedback}" escapeXml="false" />
+						</c:if>
 
 						<table cellspacing="0" class="alternative-color">
 							<tr>