Index: lams_tool_preview/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r39e51c99b24d58f15ce107380e3644d214883188 -r8b49e3b7541a9694c6e8df561c8586231b6fca12
--- lams_tool_preview/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 39e51c99b24d58f15ce107380e3644d214883188)
+++ lams_tool_preview/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8b49e3b7541a9694c6e8df561c8586231b6fca12)
@@ -140,6 +140,7 @@
 msg.results.sent = {0} Email(s) Sent
 button.email.results = Email Results
 label.notify.user.of.results = Notify students of results
+confirm.notify.user.of.results =You are about to send the results of peer review by email to all students. Are you sure you want to do this now?
 label.number.of.team.members = No of team members
 label.average = Average
 label.for.user = For {0}
Index: lams_tool_preview/web/pages/monitoring/criteriapart.jsp
===================================================================
diff -u -rca958ecbc65696caf0f399cec0a8eace5a84da98 -r8b49e3b7541a9694c6e8df561c8586231b6fca12
--- lams_tool_preview/web/pages/monitoring/criteriapart.jsp	(.../criteriapart.jsp)	(revision ca958ecbc65696caf0f399cec0a8eace5a84da98)
+++ lams_tool_preview/web/pages/monitoring/criteriapart.jsp	(.../criteriapart.jsp)	(revision 8b49e3b7541a9694c6e8df561c8586231b6fca12)
@@ -130,24 +130,37 @@
         
 	});
 
-	function closeResultsForLearner() {
-		$("#emailPreviewArea").html("");
-		$("#emailPreviewArea").hide();
-		return false;
+	function getResultsElement(sessionId, selector) {
+		let element = null;
+		if (sessionId) {
+			// if Peer Review is grouped, try to find the element within own group
+			element = $('#collapse' + sessionId + ' ' + selector);
+		}
+		if (!element || element.length == 0) {
+			element = $(selector);
+		}
+		return element;
 	}
-
-	function clearMessage() {
-		$("#messageArea2").html("");
+	
+	function closeResultsForLearner(sessionId) {
+		let emailPreviewArea = getResultsElement(sessionId, '.emailPreviewArea');
+		emailPreviewArea .html("").hide();
 		return false;
 	}
-
-	// Prview the email to be sent to the learner
+	
+	// Preview the email to be sent to the learner
 	function previewResultsForLearner(sessionId, userId) {
-		$(".btn-disable-on-submit").prop("disabled", true);
-		var url = "<c:url value="/monitoring/previewResultsToUser.do"/>";
-		clearMessage();
-		$("#messageArea2_Busy").show();
-		$("#emailPreviewArea").load(
+		let buttons = getResultsElement(sessionId, ".btn-disable-on-submit"),
+			messageArea = getResultsElement(sessionId, ".messageArea2"),
+			messageAreaBusy = getResultsElement(sessionId, ".messageArea2_Busy"),
+			emailPreviewArea = getResultsElement(sessionId, '.emailPreviewArea'),
+			url = "<c:url value="/monitoring/previewResultsToUser.do"/>";
+			
+		buttons.prop("disabled", true);
+		messageArea.html("");
+		messageAreaBusy.show();
+		
+		emailPreviewArea.load(
 			url,
 			{
 				sessionMapID: "${sessionMapID}",
@@ -157,21 +170,26 @@
 				reqID: (new Date()).getTime()
 			},
 			function() {
-				$("#messageArea2_Busy").hide();
-				$("#emailPreviewArea").show();
-				$(".btn-disable-on-submit").prop("disabled", false);
+				messageAreaBusy.hide();
+				emailPreviewArea.show();
+				buttons.prop("disabled", false);
 			}
 		);
 		return false;
 	}
-
+	
 	// Send the previewed email to the learner
 	function sendResultsForLearner(sessionId, userId, dateTimeStamp) {
-		$(".btn-disable-on-submit").prop("disabled", true);
-		var url = "<c:url value="/monitoring/sendPreviewedResultsToUser.do"/>";
-		clearMessage();
-		$("#messageArea2_Busy").show();
-		$("#messageArea2").load(
+		let buttons = getResultsElement(sessionId, ".btn-disable-on-submit"),
+			messageArea = getResultsElement(sessionId, ".messageArea2"),
+			messageAreaBusy = getResultsElement(sessionId, ".messageArea2_Busy"),
+			url = "<c:url value="/monitoring/sendPreviewedResultsToUser.do"/>";
+		
+		buttons.prop("disabled", true);
+		messageArea.html("");
+		messageAreaBusy.show();
+		
+		messageArea.load(
 			url,
 			{
 				sessionMapID: "${sessionMapID}",
@@ -182,19 +200,18 @@
 				reqID: (new Date()).getTime()
 			},
 			function() {
-				$("#messageArea2_Busy").hide();
-				closeResultsForLearner();
-				$(".btn-disable-on-submit").prop("disabled", false);
+				messageAreaBusy.hide();
+				closeResultsForLearner(sessionId);
+				buttons.prop("disabled", false);
 			}
 		);
 		return false;
 	}
-
 </script>
 
 <!--For send results feature-->
-<i class="fa fa-spinner" style="display:none" id="messageArea2_Busy"></i>
-<div class="voffset5" id="messageArea2"></div>
+<i class="fa fa-spinner messageArea2_Busy" style="display:none"></i>
+<div class="voffset5 messageArea2"></div>
 
 <p>
 	<c:choose>
@@ -222,4 +239,4 @@
 <table id="group${toolSessionId}" class="scroll" cellpadding="0" cellspacing="0"></table>
 <div id="pager${toolSessionId}"></div> 
 
-<div class="voffset10" id="emailPreviewArea" style="display:none" ></div>
\ No newline at end of file
+<div class="voffset10 emailPreviewArea" style="display:none" ></div>
\ No newline at end of file
Index: lams_tool_preview/web/pages/monitoring/emailpreview.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8b49e3b7541a9694c6e8df561c8586231b6fca12
--- lams_tool_preview/web/pages/monitoring/emailpreview.jsp	(.../emailpreview.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_preview/web/pages/monitoring/emailpreview.jsp	(.../emailpreview.jsp)	(revision 8b49e3b7541a9694c6e8df561c8586231b6fca12)
@@ -13,7 +13,7 @@
 <div class="panel-body">
 <div id="emailHTML">${emailPreviewDTO.emailHTML}</div>
 <div class="pull-right">
-	<button onclick="javascript:closeResultsForLearner();return false;" class="btn btn-default btn-sm btn-disable-on-submit"><fmt:message key="label.hide"/></button>
+	<button onclick="javascript:closeResultsForLearner(${emailPreviewDTO.toolSessionId});return false;" class="btn btn-default btn-sm btn-disable-on-submit"><fmt:message key="label.hide"/></button>
 	<button id="sendEmailNowButton" onclick="javascript:sendResultsForLearner(${emailPreviewDTO.toolSessionId}, ${emailPreviewDTO.learnerUserId}, ${emailPreviewDTO.dateTimeStamp});return false;" 
 		class="btn btn-default btn-sm loffset5 btn-disable-on-submit"><i class="fa fa-sm fa-envelope-o">&nbsp;</i><fmt:message key="button.email.results"/></button>
 </div>
Index: lams_tool_preview/web/pages/monitoring/rubricspart.jsp
===================================================================
diff -u -rca958ecbc65696caf0f399cec0a8eace5a84da98 -r8b49e3b7541a9694c6e8df561c8586231b6fca12
--- lams_tool_preview/web/pages/monitoring/rubricspart.jsp	(.../rubricspart.jsp)	(revision ca958ecbc65696caf0f399cec0a8eace5a84da98)
+++ lams_tool_preview/web/pages/monitoring/rubricspart.jsp	(.../rubricspart.jsp)	(revision 8b49e3b7541a9694c6e8df561c8586231b6fca12)
@@ -8,24 +8,38 @@
 </style>
 
 <script>
-	function closeResultsForLearner() {
-		$("#emailPreviewArea").html("");
-		$("#emailPreviewArea").hide();
-		return false;
+
+	function getResultsElement(sessionId, selector) {
+		let element = null;
+		if (sessionId) {
+			// if Peer Review is grouped, try to find the element within own group
+			element = $('#collapse' + sessionId + ' ' + selector);
+		}
+		if (!element || element.length == 0) {
+			element = $(selector);
+		}
+		return element;
 	}
 	
-	function clearMessage() {
-		$("#messageArea2").html("");
+	function closeResultsForLearner(sessionId) {
+		let emailPreviewArea = getResultsElement(sessionId, '.emailPreviewArea');
+		emailPreviewArea .html("").hide();
 		return false;
 	}
 	
-	// Prview the email to be sent to the learner
+	// Preview the email to be sent to the learner
 	function previewResultsForLearner(sessionId, userId) {
-		$(".btn-disable-on-submit").prop("disabled", true);
-		var url = "<c:url value="/monitoring/previewResultsToUser.do"/>";
-		clearMessage();
-		$("#messageArea2_Busy").show();
-		$("#emailPreviewArea").load(
+		let buttons = getResultsElement(sessionId, ".btn-disable-on-submit"),
+			messageArea = getResultsElement(sessionId, ".messageArea2"),
+			messageAreaBusy = getResultsElement(sessionId, ".messageArea2_Busy"),
+			emailPreviewArea = getResultsElement(sessionId, '.emailPreviewArea'),
+			url = "<c:url value="/monitoring/previewResultsToUser.do"/>";
+			
+		buttons.prop("disabled", true);
+		messageArea.html("");
+		messageAreaBusy.show();
+		
+		emailPreviewArea.load(
 			url,
 			{
 				sessionMapID: "${sessionMapID}",
@@ -35,21 +49,26 @@
 				reqID: (new Date()).getTime()
 			},
 			function() {
-				$("#messageArea2_Busy").hide();
-				$("#emailPreviewArea").show();
-				$(".btn-disable-on-submit").prop("disabled", false);
+				messageAreaBusy.hide();
+				emailPreviewArea.show();
+				buttons.prop("disabled", false);
 			}
 		);
 		return false;
 	}
 	
 	// Send the previewed email to the learner
 	function sendResultsForLearner(sessionId, userId, dateTimeStamp) {
-		$(".btn-disable-on-submit").prop("disabled", true);
-		var url = "<c:url value="/monitoring/sendPreviewedResultsToUser.do"/>";
-		clearMessage();
-		$("#messageArea2_Busy").show();
-		$("#messageArea2").load(
+		let buttons = getResultsElement(sessionId, ".btn-disable-on-submit"),
+			messageArea = getResultsElement(sessionId, ".messageArea2"),
+			messageAreaBusy = getResultsElement(sessionId, ".messageArea2_Busy"),
+			url = "<c:url value="/monitoring/sendPreviewedResultsToUser.do"/>";
+		
+		buttons.prop("disabled", true);
+		messageArea.html("");
+		messageAreaBusy.show();
+		
+		messageArea.load(
 			url,
 			{
 				sessionMapID: "${sessionMapID}",
@@ -60,18 +79,18 @@
 				reqID: (new Date()).getTime()
 			},
 			function() {
-				$("#messageArea2_Busy").hide();
-				closeResultsForLearner();
-				$(".btn-disable-on-submit").prop("disabled", false);
+				messageAreaBusy.hide();
+				closeResultsForLearner(sessionId);
+				buttons.prop("disabled", false);
 			}
 		);
 		return false;
 	}
 </script>
 
 <!--For send results feature-->
-<i class="fa fa-spinner" style="display:none" id="messageArea2_Busy"></i>
-<div class="voffset5" id="messageArea2"></div>
+<i class="fa fa-spinner messageArea2_Busy" style="display:none"></i>
+<div class="voffset5 messageArea2"></div>
 
 	     
 <c:forEach var="learnerData" items="${rubricsLearnerData}">
@@ -88,7 +107,7 @@
 		</a>
 	</span>
 	<button class="btn btn-default pull-right email-button btn-disable-on-submit"
-			onClick="javascript:previewResultsForLearner(${toolSessionId}, ${learnerData.key.userId})">
+			onClick="javascript:previewResultsForLearner(${toolSessionId}, ${learnerData.key.userId}, this)">
 		<fmt:message key="button.preview.results" />
 	</button>
       </div>
@@ -101,4 +120,4 @@
 </div>
 </c:forEach>
 
-<div class="voffset10" id="emailPreviewArea" style="display:none" ></div>
\ No newline at end of file
+<div class="voffset10 emailPreviewArea" style="display:none" ></div>
\ No newline at end of file
Index: lams_tool_preview/web/pages/monitoring/summary.jsp
===================================================================
diff -u -rca958ecbc65696caf0f399cec0a8eace5a84da98 -r8b49e3b7541a9694c6e8df561c8586231b6fca12
--- lams_tool_preview/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision ca958ecbc65696caf0f399cec0a8eace5a84da98)
+++ lams_tool_preview/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 8b49e3b7541a9694c6e8df561c8586231b6fca12)
@@ -48,11 +48,15 @@
 		if (!confirm('<fmt:message key="confirm.notify.user.of.results" />')) {
 			return;
 		}
-		var url = "<c:url value="/monitoring/sendResultsToSessionUsers.do"/>";
-		$("#messageArea").html("");
-		$("#messageArea_Busy").show();
-		$(".btn-disable-on-submit").prop("disabled", true);
-		$("#messageArea").load(
+		let buttons = getResultsElement(sessionId, ".btn-disable-on-submit"),
+			messageArea = getResultsElement(sessionId, ".messageArea2"),
+			messageAreaBusy = getResultsElement(sessionId, ".messageArea2_Busy"),
+			url = "<c:url value="/monitoring/sendResultsToSessionUsers.do"/>";
+		
+		messageArea.html("");
+		messageAreaBusy.show();
+		buttons.prop("disabled", true);
+		messageArea.load(
 			url,
 			{
 				sessionMapID: "${sessionMapID}",
@@ -61,8 +65,8 @@
 				reqID: (new Date()).getTime()
 			},
 			function() {
-				$("#messageArea_Busy").hide();
-				$(".btn-disable-on-submit").prop("disabled", false);
+				messageAreaBusy.hide();
+				buttons.prop("disabled", false);
 			}
 		);
 		return false;