Index: lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r6442df16716ddedae6b4eb22e36e51d874ff66aa -r093caa86c16c7eb4835f42d8ed0f8bd8291e51d0
--- lams_tool_sbmt/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 6442df16716ddedae6b4eb22e36e51d874ff66aa)
+++ lams_tool_sbmt/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 093caa86c16c7eb4835f42d8ed0f8bd8291e51d0)
@@ -124,6 +124,8 @@
 error.attachment.executable  =The uploaded file is executable, please zip it before uploading.
 button.finish  =Next Activity
 message.alertContentEdit  =Warning: One of more students have accessed this activity. Changing this content will result in students getting different information.
+message.warnLockOnFinish = Note: After you click on "Next Activity" and you come back to this Submit Files, you won't be able to continue adding files.
+message.activityLocked = The instructor has set this activity not to allow submissions after you have finished it. As you are returning to this activity, you are able to see your files but not allowed to add more.
 
 
 #======= End labels: Exported 118 labels for en AU =====
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
diff -u -r2495e17b412e141f3827b7edee81e43475d16d07 -r093caa86c16c7eb4835f42d8ed0f8bd8291e51d0
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision 2495e17b412e141f3827b7edee81e43475d16d07)
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision 093caa86c16c7eb4835f42d8ed0f8bd8291e51d0)
@@ -6,8 +6,7 @@
 
 <lams:html>
 <lams:head>
-	<title><fmt:message key="tool.display.name" />
-	</title>
+	<title><fmt:message key="tool.display.name" /></title>
 	<html:base />
 	<%@ include file="/common/header.jsp"%>
 
@@ -61,6 +60,19 @@
 			<c:out value="${sessionMap.instruction}" escapeXml="false" />
 		</p>
 
+		<c:if test="${sessionMap.lockOnFinish and sessionMap.mode == 'learner'}">
+			<div class="info">
+				<c:choose>
+					<c:when test="${sessionMap.userFinished}">
+						<fmt:message key="message.activityLocked" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="message.warnLockOnFinish" />
+					</c:otherwise>
+				</c:choose>
+			</div>
+		</c:if>
+
 		<%@include file="/common/messages.jsp"%>
 		<c:if test="${sessionMap.limitUpload}">
 			<fmt:message key="message.left.upload.limit">