Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r1307599981af4c3f63c2da571c07e150d4713e8d -r1fd4080f02aa04c5938c33bc4d962749e1a3882b
--- lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 1307599981af4c3f63c2da571c07e150d4713e8d)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 1fd4080f02aa04c5938c33bc4d962749e1a3882b)
@@ -381,7 +381,7 @@
 label.someone.allocated.this.answer  =Sorry, someone has allocated this answer already
 label.monitoring.user.summary.full.name  =Full name
 label.etherpad.discussion = Discussion
-label.answer.rating.title = Your rating of this other group's answer
+label.answer.rating.title = Other teams' feedback
 label.average.rating  =Average rating {0}/{1} votes
 label.your.rating  =Your rating {0}, average rating {1}/{2} votes
 label.comment.textarea.tip  =Type your comment here then click on the green tick
Index: lams_tool_assessment/web/pages/learning/results/essay.jsp
===================================================================
diff -u -ra58b532154155dd77cc41f2da975797419660a22 -r1fd4080f02aa04c5938c33bc4d962749e1a3882b
--- lams_tool_assessment/web/pages/learning/results/essay.jsp	(.../essay.jsp)	(revision a58b532154155dd77cc41f2da975797419660a22)
+++ lams_tool_assessment/web/pages/learning/results/essay.jsp	(.../essay.jsp)	(revision 1fd4080f02aa04c5938c33bc4d962749e1a3882b)
@@ -20,31 +20,41 @@
 			<td colspan="2" class="text-center"><b><fmt:message key="label.learning.summary.other.team.answers"/></b></td>
 		</tr>
 		<c:forEach var="session" items="${sessions}" varStatus="status">
-			<c:if test="${sessionMap.toolSessionID != session.sessionId}">
+			<%-- Default answer value, when answers are not disclosed yet --%>
+			<c:set var="answer" value="?" />
+			
+			<c:if test="${question.groupsAnswersDisclosed}">
+				<%-- Get the needed piece of information from a complicated questionSummaries structure --%>
+				<c:set var="sessionResults" 
+					value="${questionSummaries[question.uid].questionResultsPerSession[status.index]}" />
+				<c:set var="sessionResults" value="${sessionResults[fn:length(sessionResults)-1]}" />
+				<c:set var="answer" value="${sessionResults.answer}" />
+				<c:set var="itemRatingDto" value="${itemRatingDtos[sessionResults.uid]}" />
+			</c:if>
+			
+			<%-- Show answers for all other teams, and just rating if someone has already commented on this team's answer --%>
+			<c:if test="${sessionMap.toolSessionID != session.sessionId or not empty itemRatingDto.commentDtos}">
 				<tr role="row">
-					<td class="text-center" style="width: 33%" ${question.groupsAnswersDisclosed ? 'rowspan="2"' : ''}>
+					<td class="text-center" style="width: 33%" ${sessionMap.toolSessionID == session.sessionId ? '' : 'rowspan="2"'}>
 						<%-- Sessions are named after groups --%>
 						<lams:Portrait userId="${session.groupLeader.userId}"/>&nbsp;
 						<c:out value="${session.sessionName}" escapeXml="true"/> 
 					</td>
-					<c:set var="answer" value="?" />
-					<c:if test="${question.groupsAnswersDisclosed}">
-						<%-- Get the needed piece of information from a complicated questionSummaries structure --%>
-						<c:set var="sessionResults" 
-							value="${questionSummaries[question.uid].questionResultsPerSession[status.index]}" />
-						<c:set var="sessionResults" value="${sessionResults[fn:length(sessionResults)-1]}" />
-						<c:set var="answer" value="${sessionResults.answer}" />
-					</c:if>
 					
-					<td>
-						<c:out value="${answer}" escapeXml="false" /> 
-					</td>
-					
-					<c:if test="${question.groupsAnswersDisclosed}">
+					<%-- Do not show your own answer --%> 
+					<c:if test="${sessionMap.toolSessionID != session.sessionId}">
+							<td>
+								<c:out value="${answer}" escapeXml="false" /> 
+							</td>
 						</tr>
 						<tr>
+					</c:if>
+					
+					<c:if test="${question.groupsAnswersDisclosed}">
 							<td>
-								<lams:Rating itemRatingDto="${itemRatingDtos[sessionResults.uid]}" isItemAuthoredByUser="false" showAllComments="true" />
+								<lams:Rating itemRatingDto="${itemRatingDto}"
+											 isItemAuthoredByUser="${sessionMap.toolSessionID == session.sessionId}"
+											 showAllComments="true" />
 							</td>
 					</c:if>
 				</tr>