diff --git a/msgcntr/messageforums-app/src/webapp/jsp/privateMsg/msgHeader.jsp b/msgcntr/messageforums-app/src/webapp/jsp/privateMsg/msgHeader.jsp
index 26f71fcb66d2..ae51cd9ea6c8 100644
--- a/msgcntr/messageforums-app/src/webapp/jsp/privateMsg/msgHeader.jsp
+++ b/msgcntr/messageforums-app/src/webapp/jsp/privateMsg/msgHeader.jsp
@@ -14,7 +14,7 @@
 		<h:commandButton styleClass="button_search" value="#{msgs.pvt_search}" action="#{PrivateMessagesTool.processSearch}" onkeypress="document.forms[0].submit;"/>
 		
 		<f:verbatim><span id='adv_button'></f:verbatim>
-		  <h:commandButton styleClass="button_search" value="#{msgs.pvt_advsearch}" onmousedown="javascript:toggleDisplay('adv_input','adv_button');setMainFrameHeight('#{PrivateMessagesTool.placementId}');" title="#{msgs.pvt_advsearch}"/>
+		  <h:commandButton id="advanced_search_button" styleClass="button_search" value="#{msgs.pvt_advsearch}" onmousedown="javascript:toggleDisplay('adv_input','adv_button');setMainFrameHeight('#{PrivateMessagesTool.placementId}');" title="#{msgs.pvt_advsearch}"/>
 		<f:verbatim></span></f:verbatim>
 		<f:verbatim></div></f:verbatim>
   </h:panelGroup>
diff --git a/msgcntr/messageforums-app/src/webapp/jsp/privateMsg/pvtMsgEx.jsp b/msgcntr/messageforums-app/src/webapp/jsp/privateMsg/pvtMsgEx.jsp
index f5fda998e06f..4eec475b9c5a 100644
--- a/msgcntr/messageforums-app/src/webapp/jsp/privateMsg/pvtMsgEx.jsp
+++ b/msgcntr/messageforums-app/src/webapp/jsp/privateMsg/pvtMsgEx.jsp
@@ -10,17 +10,19 @@
 <f:view>
 	<sakai:view title="#{msgs.pvt_rcvd_msgs}">
 <!--jsp/privateMsg/pvtMsgEx.jsp-->
+
+		<script type="text/javascript">includeLatestJQuery("msgcntr");</script>
+		<script type="text/javascript" src="/messageforums-tool/js/sak-10625.js"></script>
+		<script type="text/javascript" src="/messageforums-tool/js/forum.js"></script>
+		<script type="text/javascript" src="/messageforums-tool/js/messages.js"></script>
+
 		<h:form id="prefs_form_search">
-		       		<script type="text/javascript">includeLatestJQuery("msgcntr");</script>
-       		<script type="text/javascript" src="/messageforums-tool/js/sak-10625.js"></script>
-			<script type="text/javascript" src="/messageforums-tool/js/forum.js"></script>		
-			
+
 			<%@ include file="topNav.jsp" %>
 
 			<h:messages styleClass="alertMessage" id="errorMessages" rendered="#{! empty facesContext.maximumSeverity}"/>
 			<%@ include file="msgHeader.jsp"%>
 
-
 	  <h:dataTable styleClass="listHier lines nolines" cellpadding="0" cellspacing="0"  id="pvtmsgs" width="100%" value="#{PrivateMessagesTool.searchPvtMsgs}" var="rcvdItems" 
 	  	rendered="#{PrivateMessagesTool.selectView != 'threaded'}" columnClasses="attach,attach,specialLink,bogus,bogus,bogus">   
 		  <h:column>
@@ -35,9 +37,9 @@
 		  </h:column>
 		  <h:column>
 				<f:facet name="header">
-					<h:graphicImage value="/images/attachment.gif" alt="#{msgs.msg_has_attach}"/>								
+					<h:graphicImage value="/images/attachment.gif" alt="#{msgs.msg_has_attach}"/>
 				</f:facet>
-				<h:graphicImage value="/images/attachment.gif" rendered="#{rcvdItems.msg.hasAttachments}" alt="#{msgs.msg_has_attach}" />			 
+				<h:graphicImage value="/images/attachment.gif" rendered="#{rcvdItems.msg.hasAttachments}" alt="#{msgs.msg_has_attach}" />
 			</h:column>
 		  <h:column>
 		    <f:facet name="header">
@@ -48,21 +50,21 @@
             <h:outputText styleClass="unreadMsg" value=" #{rcvdItems.msg.title}" rendered="#{!rcvdItems.hasRead}"/>
             <f:param value="#{rcvdItems.msg.id}" name="current_msg_detail"/>
           </h:commandLink>
-		  </h:column>			
+		  </h:column>
 		  <h:column rendered="#{PrivateMessagesTool.msgNavMode != 'Sent'}">
 		    <f:facet name="header">
 		       <h:outputText value="#{msgs.pvt_authby}"/>
-		    </f:facet>		     		    
+		    </f:facet>
 		     <h:outputText value="#{rcvdItems.msg.author}" rendered="#{rcvdItems.hasRead}"/>
 		     <h:outputText styleClass="unreadMsg" value="#{rcvdItems.msg.author}" rendered="#{!rcvdItems.hasRead}"/>
 		  </h:column>
 		  <h:column rendered="#{PrivateMessagesTool.msgNavMode == 'Sent'}">
 		    <f:facet name="header">
 		       <h:outputText value="#{msgs.pvt_to}"/>
-		    </f:facet>		     		    
+		    </f:facet>
 		     <h:outputText value="#{rcvdItems.sendToStringDecorated}" rendered="#{rcvdItems.hasRead}" />
 		     <h:outputText styleClass="unreadMsg" value="#{rcvdItems.sendToStringDecorated}" rendered="#{!rcvdItems.hasRead}"/>
-		  </h:column>	
+		  </h:column>
 		  	  
 		  <h:column>
 		    <f:facet name="header">
@@ -102,9 +104,9 @@
 		  </h:column>
 		  <h:column>
 				<f:facet name="header">
-					<h:graphicImage value="/images/attachment.gif" alt="#{msgs.msg_has_attach}" />								
+					<h:graphicImage value="/images/attachment.gif" alt="#{msgs.msg_has_attach}" />
 				</f:facet>
-				<h:graphicImage value="/images/attachment.gif" rendered="#{rcvdItems.msg.hasAttachments}" alt="#{msgs.msg_has_attach}" />			 
+				<h:graphicImage value="/images/attachment.gif" rendered="#{rcvdItems.msg.hasAttachments}" alt="#{msgs.msg_has_attach}" />
 			</h:column>
 			<h:column id="_msg_subject">
 		    <f:facet name="header">
@@ -115,21 +117,21 @@
             <h:outputText styleClass="unreadMsg" value=" #{rcvdItems.msg.title}" rendered="#{!rcvdItems.hasRead}"/>
             <f:param value="#{rcvdItems.msg.id}" name="current_msg_detail"/>
           </h:commandLink>
-		  </h:column>			
+		  </h:column>
 		  <h:column rendered="#{PrivateMessagesTool.msgNavMode != 'pvt_sent'}">
 		    <f:facet name="header">
 		       <h:outputText value="#{msgs.pvt_authby}"/>
-		    </f:facet>		     		    
+		    </f:facet>
 		     <h:outputText value="#{rcvdItems.msg.author}" rendered="#{rcvdItems.hasRead}"/>
 		     <h:outputText styleClass="unreadMsg" value="#{rcvdItems.msg.author}" rendered="#{!rcvdItems.hasRead}"/>
 		  </h:column>
 		  <h:column rendered="#{PrivateMessagesTool.msgNavMode == 'pvt_sent'}">
 		    <f:facet name="header">
 		       <h:outputText value="#{msgs.pvt_to}"/>
-		    </f:facet>		     		    
+		    </f:facet>
 		     <h:outputText value="#{rcvdItems.sendToStringDecorated}" rendered="#{rcvdItems.hasRead}"/>
 		     <h:outputText styleClass="unreadMsg" value="#{rcvdItems.sendToStringDecorated}" rendered="#{!rcvdItems.hasRead}"/>
-		  </h:column>		  
+		  </h:column>
 		  <h:column>
 		    <f:facet name="header">
 		       <h:outputText value="#{msgs.pvt_date}"/>
@@ -149,7 +151,7 @@
 		  </h:column>
 		</mf:hierPvtMsgDataTable>
 		</div>
-		
+
 <%-- Added if user clicks Check All --%>
     <script language="Javascript" type="text/javascript">
      // setting number checked just in case Check All being processed