Index: lams_tool_task/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r32edfa69b9fb92b5d0a3cc9b777cd58dc7b4efab -r8d57c651529651250826971a6f6013a4d21d4f52
--- lams_tool_task/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 32edfa69b9fb92b5d0a3cc9b777cd58dc7b4efab)
+++ lams_tool_task/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8d57c651529651250826971a6f6013a4d21d4f52)
@@ -84,6 +84,8 @@
 label.learning.comment.or.instruction  =Comment/Instruction
 label.learning.required.tasks  =required tasks
 label.learning.wait.for.monitor.verification  =To finish wait for monitor verification
+label.learning.responses.locked  =Note: After you click on "Next Activity" and you come back to this Task List, you won't be able to continue editing.
+label.learning.responses.locked.reminder  =The instructor has set this activity not to allow editing after you have finished it. As you are returning to this Task List again, you are able to see all Tasks but not allow to edit them anymore.
 label.preview.upload.file  =Upload file
 label.preview.upload.button  =Upload
 label.preview.filelist  =File list
Index: lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r32edfa69b9fb92b5d0a3cc9b777cd58dc7b4efab -r8d57c651529651250826971a6f6013a4d21d4f52
--- lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 32edfa69b9fb92b5d0a3cc9b777cd58dc7b4efab)
+++ lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 8d57c651529651250826971a6f6013a4d21d4f52)
@@ -69,7 +69,8 @@
 label.learning.comment.or.instruction  =Description
 label.learning.required.tasks  =required tasks
 label.learning.wait.for.monitor.verification  =To finish wait for monitor verification
-label.learning.responses.locked  =Note: Once you click on "Next Activity", you can not edit your response.
+label.learning.responses.locked  =Note: After you click on "Next Activity" and you come back to this Task List, you won't be able to continue editing.
+label.learning.responses.locked.reminder  =The instructor has set this activity not to allow editing after you have finished it. As you are returning to this Task List again, you are able to see all Tasks but not allow to edit them anymore.
 label.preview.upload.file  =Upload file
 label.preview.upload.button  =Upload
 label.preview.filelist  =File list
Index: lams_tool_task/conf/language/rams/ApplicationResources.properties
===================================================================
diff -u -r32edfa69b9fb92b5d0a3cc9b777cd58dc7b4efab -r8d57c651529651250826971a6f6013a4d21d4f52
--- lams_tool_task/conf/language/rams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 32edfa69b9fb92b5d0a3cc9b777cd58dc7b4efab)
+++ lams_tool_task/conf/language/rams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8d57c651529651250826971a6f6013a4d21d4f52)
@@ -84,6 +84,8 @@
 label.learning.comment.or.instruction  =Comment/Instruction
 label.learning.required.tasks  =required tasks
 label.learning.wait.for.monitor.verification  =To finish wait for monitor verification
+label.learning.responses.locked  =Note: After you click on "Next Activity" and you come back to this Task List, you won't be able to continue editing.
+label.learning.responses.locked.reminder  =The instructor has set this activity not to allow editing after you have finished it. As you are returning to this Task List again, you are able to see all Tasks but not allow to edit them anymore.
 label.preview.upload.file  =Upload file
 label.preview.upload.button  =Upload
 label.preview.filelist  =File list
Index: lams_tool_task/conf/language/rams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r32edfa69b9fb92b5d0a3cc9b777cd58dc7b4efab -r8d57c651529651250826971a6f6013a4d21d4f52
--- lams_tool_task/conf/language/rams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 32edfa69b9fb92b5d0a3cc9b777cd58dc7b4efab)
+++ lams_tool_task/conf/language/rams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 8d57c651529651250826971a6f6013a4d21d4f52)
@@ -84,6 +84,8 @@
 label.learning.comment.or.instruction  =Comment/Instruction
 label.learning.required.tasks  =required tasks
 label.learning.wait.for.monitor.verification  =To finish wait for monitor verification
+label.learning.responses.locked  =Note: After you click on "Next Activity" and you come back to this Task List, you won't be able to continue editing.
+label.learning.responses.locked.reminder  =The instructor has set this activity not to allow editing after you have finished it. As you are returning to this Task List again, you are able to see all Tasks but not allow to edit them anymore.
 label.preview.upload.file  =Upload file
 label.preview.upload.button  =Upload
 label.preview.filelist  =File list
Index: lams_tool_task/web/pages/learning/learning.jsp
===================================================================
diff -u -r5da777683669038a6d53cf99c8e029ac74fa2143 -r8d57c651529651250826971a6f6013a4d21d4f52
--- lams_tool_task/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 5da777683669038a6d53cf99c8e029ac74fa2143)
+++ lams_tool_task/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 8d57c651529651250826971a6f6013a4d21d4f52)
@@ -78,6 +78,21 @@
 		<h1>
 			${taskList.title}
 		</h1>
+		
+		<c:if test="${mode == 'author' || mode == 'learner'}">
+			<c:if test="${taskList.lockWhenFinished}">
+		    	<div class="info space-bottom">
+			   		<c:choose>
+				    	<c:when test = "${finishedLock}">
+							<fmt:message key="label.learning.responses.locked.reminder" />								
+					    </c:when>
+					    <c:otherwise>
+							<fmt:message key="label.learning.responses.locked" />								
+					    </c:otherwise>
+				   </c:choose>
+				</div>
+			</c:if>
+	   </c:if>
 
 		<p>
 			${taskList.instructions}