Index: lams_tool_nb/web/message.jsp
===================================================================
diff -u -r9393c098e5dfd603e2d37347cd1e531a25aa424a -r4aae0391a4892385de3df761a655e0ab8b1c0183
--- lams_tool_nb/web/message.jsp	(.../message.jsp)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
+++ lams_tool_nb/web/message.jsp	(.../message.jsp)	(revision 4aae0391a4892385de3df761a655e0ab8b1c0183)
@@ -7,7 +7,18 @@
 	</logic:messagesPresent>
 
 	<p align="right">
-		<html:button property="closeWindow" onclick="window.close()" styleClass="button">
-				<fmt:message key="button.next" />
-		</html:button>
+		<html:form action="/learner" target="_self">
+		<html:hidden property="toolSessionID" />
+		<html:hidden property="mode" />
+		<html:submit property="method" styleClass="button">
+			<c:choose>
+				<c:when test="${reflectOnActivity}">
+					<fmt:message key="button.continue" />
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="button.finish" />
+				</c:otherwise>
+			</c:choose>
+		</html:submit>
+		</html:form>
 	</p>