Index: lams_tool_forum/web/struts/config/struts-actions.xml
===================================================================
diff -u -rdb911c3802e8b764988d3e9cc741583085d73273 -r6c3be69fef8521b4d01c2b9d7d07f7843f6c0507
--- lams_tool_forum/web/struts/config/struts-actions.xml	(.../struts-actions.xml)	(revision db911c3802e8b764988d3e9cc741583085d73273)
+++ lams_tool_forum/web/struts/config/struts-actions.xml	(.../struts-actions.xml)	(revision 6c3be69fef8521b4d01c2b9d7d07f7843f6c0507)
@@ -70,6 +70,13 @@
             <forward name="success"		path="tiles:/authoring/forum/edit"/>
         </action>
 
+        <action    path="/authoring/forum/getForum"
+			type="org.lamsfoundation.lams.tool.forum.actions.ForumAction"
+			parameter="getForum"
+			scope="session">
+            <forward name="success"		path="tiles:/authoring/forum/edit"/>
+        </action>
+
 		<action    path="/authoring/forum/editForum"
 			type="org.lamsfoundation.lams.tool.forum.actions.ForumAction"
 			name="forumForm"
@@ -135,24 +142,13 @@
 			<forward name="success"		path="tiles:/authoring/forum/edit"/>
 		</action>
 
-
 		<action    path="/authoring/forum/delete"
 			type="org.lamsfoundation.lams.tool.forum.actions.ForumAction"
 			parameter="deleteForum"
 			scope="request">
 			<forward name="success"		path="titles:/authoring/forum/success"/>
 		</action>
 
-
-		<action    path="/authoring/message/editMessage"
-			type="org.lamsfoundation.lams.tool.forum.actions.ForumAction"
-			name="messageForm"
-			validate="true"
-            input="tiles:/authoring/message/editMessage"
-			parameter="editMessage"
-			scope="request">
-			<forward name="success"		path="tiles:/authoring/forum/success"/>
-		</action>
 		<!-- Message related actions -->
 
     	<action    path="/learning/forum/open"
@@ -162,13 +158,20 @@
 			<forward name="success"		path="tiles:/learning/forum/open"/>
 		</action>
 
-    	<action    path="/learning/message/open"
+    	<action    path="/learning/message/openTopic"
 			type="org.lamsfoundation.lams.tool.forum.actions.LearningAction"
-			parameter="openMessage"
+			parameter="openTopic"
 			scope="request">
 			<forward name="success"		path="tiles:/learning/message/open"/>
 		</action>
 
+    	<action    path="/learning/message/getMessage"
+			type="org.lamsfoundation.lams.tool.forum.actions.LearningAction"
+			parameter="getMessage"
+			scope="request">
+			<forward name="success"		path="tiles:/learning/message/getMessage"/>
+		</action>
+
     	<action    path="/learning/message/post"
 		     type="org.lamsfoundation.lams.tool.forum.actions.LearningAction"
 			parameter="post"
@@ -183,17 +186,17 @@
 			input="tiles:/learning/message/post"
 			parameter="reply"
 			scope="request">
-			<forward name="success"		path="/learning/message/open.do"/>
+			<forward name="success"		path="/learning/message/openTopic.do"/>
 		</action>
 
 		<action    path="/learning/message/editMessage"
-			type="org.lamsfoundation.lams.tool.forum.actions.ForumAction"
+			type="org.lamsfoundation.lams.tool.forum.actions.LearningAction"
 			name="messageForm"
 			validate="true"
-			input="tiles:/learning/message/edit"
+			input="tiles:/learning/message/getMessage"
 			parameter="editMessage"
 			scope="request">
-			<forward name="success"		path="/learning/message/open.do"/>
+			<forward name="success"		path="/learning/message/openTopic.do"/>
 		</action>
 
 		<action    path="/learning/message/delete"
Index: lams_tool_forum/web/struts/tiles-defs.xml
===================================================================
diff -u -r4a158f66d55bcd6d74879daf30d902f2a402f79c -r6c3be69fef8521b4d01c2b9d7d07f7843f6c0507
--- lams_tool_forum/web/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 4a158f66d55bcd6d74879daf30d902f2a402f79c)
+++ lams_tool_forum/web/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 6c3be69fef8521b4d01c2b9d7d07f7843f6c0507)
@@ -62,7 +62,7 @@
 	</definition>
 	<!-- E: Generic -->
 
-	<!-- B: Forum -->
+	<!-- B: Authoring -->
 	<definition name="tiles:/authoring/forum/instructions" extends="tiles:layout">
     	<put name="pageTitleKey" value="title.forum.add"/>
     	<put name="body" value="/WEB-INF/jsps/authoring/forum/instructions.jsp"/>
@@ -95,14 +95,20 @@
 	</definition>
 
 
-	<!-- E: Forum -->
+	<!-- E: Authoring -->
 
-	<!-- B: Message -->
+	<!-- B: Learning -->
     <definition name="tiles:/learning/forum/open" extends="tiles:layout">
     	<put name="pageTitleKey" value="title.forum.open"/>
     	<put name="body" value="/WEB-INF/jsps/learning/forum/open.jsp"/>
 	</definition>
 
+    <definition name="tiles:/learning/message/getMessage" extends="tiles:layout">
+          <put name="pageTitleKey" value="title.message.edit"/>
+          <put name="body" value="/WEB-INF/jsps/learning/message/edit.jsp"/>
+    </definition>
+
+
     <definition name="tiles:/learning/message/open" extends="tiles:layout">
           <put name="pageTitleKey" value="title.messageTopic.open"/>
           <put name="body" value="/WEB-INF/jsps/learning/message/open.jsp"/>