Index: lams_tool_wiki_orig/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rfbc3b6e5c7d55e5f8a49719dc095e0dd9f8e844d -r16be4f178e2ed2998569f494ebe63cf5066836a6
--- lams_tool_wiki_orig/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision fbc3b6e5c7d55e5f8a49719dc095e0dd9f8e844d)
+++ lams_tool_wiki_orig/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 16be4f178e2ed2998569f494ebe63cf5066836a6)
@@ -32,9 +32,9 @@
 label.authoring.offline.delete  =Delete
 label.topic.title.wiki  =Wiki Title
 label.topic.title.pageContent  =Page content
-label.topic.title.update  =Last update
+label.topic.title.lastUpdate  =Last update
 label.topic.title.author  =Author
-label.topic.title.replies  =Replies
+label.topic.title.updates  =Updates
 label.topic.title.mark  =Mark
 label.topic.wiki.by  =By
 label.topic.title.message.number  =# of Msg
@@ -83,7 +83,6 @@
 label.download  =Download
 label.view  =View
 label.edit  =Edit
-label.reply  =Reply
 label.done  =Done
 label.newwiki  =New Wiki
 label.refresh  =Refresh
Index: lams_tool_wiki_orig/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -rfbc3b6e5c7d55e5f8a49719dc095e0dd9f8e844d -r16be4f178e2ed2998569f494ebe63cf5066836a6
--- lams_tool_wiki_orig/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision fbc3b6e5c7d55e5f8a49719dc095e0dd9f8e844d)
+++ lams_tool_wiki_orig/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 16be4f178e2ed2998569f494ebe63cf5066836a6)
@@ -32,9 +32,9 @@
 label.authoring.offline.delete  =Delete
 label.topic.title.wiki  =Wiki Title
 label.topic.title.pageContent  =Page content
-label.topic.title.update  =Last update
+label.topic.title.lastUpdate  =Last update
 label.topic.title.author  =Author
-label.topic.title.replies  =Replies
+label.topic.title.updates  =Updates
 label.topic.title.mark  =Mark
 label.topic.wiki.by  =By
 label.topic.title.message.number  =# of Msg
@@ -83,7 +83,6 @@
 label.download  =Download
 label.view  =View
 label.edit  =Edit
-label.reply  =Reply
 label.done  =Done
 label.newwiki  =New Wiki
 label.refresh  =Refresh
Index: lams_tool_wiki_orig/web/jsps/authoring/message/topiclist.jsp
===================================================================
diff -u -rfbc3b6e5c7d55e5f8a49719dc095e0dd9f8e844d -r16be4f178e2ed2998569f494ebe63cf5066836a6
--- lams_tool_wiki_orig/web/jsps/authoring/message/topiclist.jsp	(.../topiclist.jsp)	(revision fbc3b6e5c7d55e5f8a49719dc095e0dd9f8e844d)
+++ lams_tool_wiki_orig/web/jsps/authoring/message/topiclist.jsp	(.../topiclist.jsp)	(revision 16be4f178e2ed2998569f494ebe63cf5066836a6)
@@ -7,7 +7,7 @@
 		<tr>
 			<th scope="col" width="50%"><fmt:message key="label.topic.title.wiki"/></th>
 			<th scope="col" width="20%"><fmt:message key="label.topic.title.createdby"/></th>
-			<th scope="col" width="30%"><fmt:message key="label.topic.title.update"/></th>
+			<th scope="col" width="30%"><fmt:message key="label.topic.title.lastUpdate"/></th>
 		</tr>
 		<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 		<c:forEach items="${sessionMap.topicList}" var="topic" varStatus="status">
Index: lams_tool_wiki_orig/web/jsps/learning/message/topiceditform.jsp
===================================================================
diff -u -rfbc3b6e5c7d55e5f8a49719dc095e0dd9f8e844d -r16be4f178e2ed2998569f494ebe63cf5066836a6
--- lams_tool_wiki_orig/web/jsps/learning/message/topiceditform.jsp	(.../topiceditform.jsp)	(revision fbc3b6e5c7d55e5f8a49719dc095e0dd9f8e844d)
+++ lams_tool_wiki_orig/web/jsps/learning/message/topiceditform.jsp	(.../topiceditform.jsp)	(revision 16be4f178e2ed2998569f494ebe63cf5066836a6)
@@ -3,7 +3,7 @@
 
 	
 			<div class="field-name title-space-top">
-				<fmt:message key="message.label.title" />
+				<fmt:message key="message.label.wikiTitle" />
 			</div>
 			
 			
Index: lams_tool_wiki_orig/web/jsps/learning/message/topiclist.jsp
===================================================================
diff -u -rfbc3b6e5c7d55e5f8a49719dc095e0dd9f8e844d -r16be4f178e2ed2998569f494ebe63cf5066836a6
--- lams_tool_wiki_orig/web/jsps/learning/message/topiclist.jsp	(.../topiclist.jsp)	(revision fbc3b6e5c7d55e5f8a49719dc095e0dd9f8e844d)
+++ lams_tool_wiki_orig/web/jsps/learning/message/topiclist.jsp	(.../topiclist.jsp)	(revision 16be4f178e2ed2998569f494ebe63cf5066836a6)
@@ -10,10 +10,10 @@
 				<fmt:message key="label.topic.title.createdby" />
 			</th>
 			<th width="60px">
-				<fmt:message key="label.topic.title.replies" />
+				<fmt:message key="label.topic.title.updates" />
 			</th>
 			<th width="25%">
-				<fmt:message key="label.topic.title.update" />
+				<fmt:message key="label.topic.title.lastUpdate" />
 			</th>
 		</tr>
 		<c:forEach items="${topicList}" var="topic">
Index: lams_tool_wiki_orig/web/jsps/learning/message/topicview.jsp
===================================================================
diff -u -rfbc3b6e5c7d55e5f8a49719dc095e0dd9f8e844d -r16be4f178e2ed2998569f494ebe63cf5066836a6
--- lams_tool_wiki_orig/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision fbc3b6e5c7d55e5f8a49719dc095e0dd9f8e844d)
+++ lams_tool_wiki_orig/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision 16be4f178e2ed2998569f494ebe63cf5066836a6)
@@ -138,7 +138,7 @@
 						<!--  Edit Button -->
 						<c:if test="${not hidden}">
 							<c:if
-								test='${(sessionMap.mode == "teacher") || (msgDto.isAuthor && not sessionMap.finishedLock && sessionMap.allowEdit && (empty msgDto.mark))}'>
+								test='${(sessionMap.mode == "teacher") || (not sessionMap.finishedLock && sessionMap.allowEdit && (empty msgDto.mark))}'>
 								<c:set var="edittopic">
 									<html:rewrite
 										page="/learning/editTopic.do?sessionMapID=${sessionMapID}&topicID=${msgDto.message.uid}&rootUid=${sessinoMap.rootUid}&create=${msgDto.message.created.time}" />
@@ -147,18 +147,6 @@
 									<fmt:message key="label.edit" />
 								</html:link>
 							</c:if>
-					
-							<!--  Reply Button -->
-							<c:if
-								test="${(not sessionMap.finishedLock) && (not sessionMap.noMorePosts)}">
-								<c:set var="replytopic">
-									<html:rewrite
-										page="/learning/newReplyTopic.do?sessionMapID=${sessionMapID}&parentID=${msgDto.message.uid}&rootUid=${sessionMap.rootUid}" />
-								</c:set>
-								<html:link href="${replytopic}" styleClass="button">
-									<fmt:message key="label.reply" />
-								</html:link>
-							</c:if>
 						</c:if>
 					</div>
 				</td>