Index: lams_tool_forum/web/includes/javascript/message.js
===================================================================
diff -u -r2ff38cdf504d51a2590b113023d885069d32645e -rb732d53d7176e05258acb291c209dfeb1e6e6704
--- lams_tool_forum/web/includes/javascript/message.js	(.../message.js)	(revision 2ff38cdf504d51a2590b113023d885069d32645e)
+++ lams_tool_forum/web/includes/javascript/message.js	(.../message.js)	(revision b732d53d7176e05258acb291c209dfeb1e6e6704)
@@ -45,3 +45,30 @@
 		$('.highlight').removeClass('highlight');
 	}
 
+	function setupJRating(rateMessagePath) {
+		$(".rating-stars-new").filter($(".rating-stars")).jRating({
+			phpPath : rateMessagePath,
+			rateMax : 5,
+			decimalLength : 1,
+			onSuccess : function(data, messageId){
+				$("#averageRating" + messageId).html(data.averageRating);
+				$("#numberOfVotes" + messageId).html(data.numberOfVotes);
+				$("#numOfRatings").html(data.numOfRatings);
+
+				//disable rating feature in case maxRate limit reached
+				if (data.noMoreRatings) {
+					$(".rating-stars").each(function() {
+						$(this).jRating('readOnly');
+					});
+				}
+			},
+			onError : function(){
+				jError('Error : please retry');
+			}
+		});
+		$(".rating-stars-new").filter($(".rating-stars-disabled")).jRating({
+			rateMax : 5,
+			isDisabled : true
+		});
+		$(".rating-stars-new").removeClass("rating-stars-new");
+	}
Index: lams_tool_forum/web/jsps/learning/edit.jsp
===================================================================
diff -u -r2ff38cdf504d51a2590b113023d885069d32645e -rb732d53d7176e05258acb291c209dfeb1e6e6704
--- lams_tool_forum/web/jsps/learning/edit.jsp	(.../edit.jsp)	(revision 2ff38cdf504d51a2590b113023d885069d32645e)
+++ lams_tool_forum/web/jsps/learning/edit.jsp	(.../edit.jsp)	(revision b732d53d7176e05258acb291c209dfeb1e6e6704)
@@ -1,5 +1,10 @@
 <%@ include file="/common/taglibs.jsp"%>
 
+<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.jRating.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery-ui.js"></script>
+<script type="text/javascript" src="<lams:WebAppURL />includes/javascript/message.js"></script>
+
 <script type="text/javascript">
 	// The treetable code uses the clicks to expand and collapse the replies but then 
 	// the buttons will not work. So stop the event propogating up the event chain. 
@@ -41,7 +46,11 @@
         					// the user won't try to submit it again
 							$('#edit').remove();
 	        				var loadString = '<html:rewrite page="/learning/viewMessage.do?topicID="/>' + rootUid + "&sessionMapID=" + response.sessionMapID + "&messageUid="+messageUid;
-							$(messDiv).load(loadString);
+							$(messDiv).load(loadString, function() {
+								$('#msg'+messageUid).focus();
+								setupJRating("<c:url value='/learning/rateMessage.do'/>?toolSessionID=${sessionMap.toolSessionID}&sessionMapID=${sessionMapID}");
+								highlightMessage();
+							});
 						}
 
 		    		} else {
Index: lams_tool_forum/web/jsps/learning/message/msgview.jsp
===================================================================
diff -u -r2ff38cdf504d51a2590b113023d885069d32645e -rb732d53d7176e05258acb291c209dfeb1e6e6704
--- lams_tool_forum/web/jsps/learning/message/msgview.jsp	(.../msgview.jsp)	(revision 2ff38cdf504d51a2590b113023d885069d32645e)
+++ lams_tool_forum/web/jsps/learning/message/msgview.jsp	(.../msgview.jsp)	(revision b732d53d7176e05258acb291c209dfeb1e6e6704)
@@ -1,7 +1,7 @@
 <%@ page import="org.lamsfoundation.lams.tool.forum.util.ForumConstants"%>
 <%@ include file="/common/taglibs.jsp"%>
 
-<!--  msgDto, messageUid, msgLevel needs to be in the session elsewhere -->
+<%--  msgDto, messageUid, msgLevel needs to be in the session elsewhere --%>
 
 	<c:set var="hidden" value="${msgDto.message.hideFlag}" />
 	
Index: lams_tool_forum/web/jsps/learning/message/msgviewwrapper.jsp
===================================================================
diff -u -r2ff38cdf504d51a2590b113023d885069d32645e -rb732d53d7176e05258acb291c209dfeb1e6e6704
--- lams_tool_forum/web/jsps/learning/message/msgviewwrapper.jsp	(.../msgviewwrapper.jsp)	(revision 2ff38cdf504d51a2590b113023d885069d32645e)
+++ lams_tool_forum/web/jsps/learning/message/msgviewwrapper.jsp	(.../msgviewwrapper.jsp)	(revision b732d53d7176e05258acb291c209dfeb1e6e6704)
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
-<!-- Wraps up msgview.jsp for returning a single message - called when an edit is performed. It needs to do all the setup that topicview.jsp normally does. -->
+<%-- Wraps up msgview.jsp for returning a single message - called when an edit is performed. It needs to do all the setup that topicview.jsp normally does. --%>
 
 <%@ include file="/common/taglibs.jsp"%>
 
Index: lams_tool_forum/web/jsps/learning/reply.jsp
===================================================================
diff -u -r2ff38cdf504d51a2590b113023d885069d32645e -rb732d53d7176e05258acb291c209dfeb1e6e6704
--- lams_tool_forum/web/jsps/learning/reply.jsp	(.../reply.jsp)	(revision 2ff38cdf504d51a2590b113023d885069d32645e)
+++ lams_tool_forum/web/jsps/learning/reply.jsp	(.../reply.jsp)	(revision b732d53d7176e05258acb291c209dfeb1e6e6704)
@@ -1,7 +1,10 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <%-- If you change this file, remember to update the copy made for CNG-28 --%>
+<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.jRating.js"></script>
 <script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery-ui.js"></script>
+<script type="text/javascript" src="<lams:WebAppURL />includes/javascript/message.js"></script>
 
 <script type="text/javascript">
 	// The treetable code uses the clicks to expand and collapse the replies but then 
@@ -59,6 +62,7 @@
 									$('#tree' + threadUid).treetable("reveal",messageUid);
 									$('#msg'+messageUid).focus();
 								}
+								setupJRating("<c:url value='/learning/rateMessage.do'/>?toolSessionID=${sessionMap.toolSessionID}&sessionMapID=${sessionMapID}");
 								highlightMessage();
 							});
 						}
Index: lams_tool_forum/web/jsps/learning/viewtopic.jsp
===================================================================
diff -u -r2ff38cdf504d51a2590b113023d885069d32645e -rb732d53d7176e05258acb291c209dfeb1e6e6704
--- lams_tool_forum/web/jsps/learning/viewtopic.jsp	(.../viewtopic.jsp)	(revision 2ff38cdf504d51a2590b113023d885069d32645e)
+++ lams_tool_forum/web/jsps/learning/viewtopic.jsp	(.../viewtopic.jsp)	(revision b732d53d7176e05258acb291c209dfeb1e6e6704)
@@ -47,35 +47,11 @@
 		<script type="text/javascript" src="${tool}includes/javascript/message.js"></script>
 		<script type="text/javascript">
 			$(document).ready(function(){
-				setupJRating();
+				setupJRatingSetPath();
 			});
-	
-			function setupJRating() {
-				$(".rating-stars-new").filter($(".rating-stars")).jRating({
-				    phpPath : "<c:url value='/learning/rateMessage.do'/>?toolSessionID=${sessionMap.toolSessionID}&sessionMapID=${sessionMapID}",
-				    rateMax : 5,
-				    decimalLength : 1,
-					onSuccess : function(data, messageId){
-					    $("#averageRating" + messageId).html(data.averageRating);
-					    $("#numberOfVotes" + messageId).html(data.numberOfVotes);
-					    $("#numOfRatings").html(data.numOfRatings);
-					    
-					    //disable rating feature in case maxRate limit reached
-					    if (data.noMoreRatings) {
-					    	$(".rating-stars").each(function() {
-					    		$(this).jRating('readOnly');
-					    	});
-					    }
-					},
-					onError : function(){
-					    jError('Error : please retry');
-					}
-				});
-			    $(".rating-stars-new").filter($(".rating-stars-disabled")).jRating({
-			    	rateMax : 5,
-			    	isDisabled : true
-				});
-				$(".rating-stars-new").removeClass("rating-stars-new");
+				
+			function setupJRatingSetPath() {
+				setupJRating("<c:url value='/learning/rateMessage.do'/>?toolSessionID=${sessionMap.toolSessionID}&sessionMapID=${sessionMapID}");
 			}
 			
 			function refreshTopic(){
@@ -195,7 +171,7 @@
 			<script>
 				<c:set var="loading_animation">${lams}images/ajax-loader.gif</c:set>
 				<c:set var="loading_words"><fmt:message key="label.loading.messages" /></c:set>
-				$('.scroll' ).jscroll({loadingHtml: '<img src="${loading_animation}" alt="${loading_words}" />${loading_words}',padding:30,autoTrigger:true,callback:setupJRating});
+				$('.scroll' ).jscroll({loadingHtml: '<img src="${loading_animation}" alt="${loading_words}" />${loading_words}',padding:30,autoTrigger:true,callback:setupJRatingSetPath});
 			</script>
 			
 			<c:set var="refreshTopicURL">