fix bug 44889, r=putterman a=brendan. Fixes Search menu to match spec from jglick.

mailnews/base/resources/content/mailWindowOverlay.xul

@@ -699,8 +699,9 @@ Rights Reserved.
 			<menuitem value="&findCmd.label;" key="key_find" accesskey="&findCmd.accesskey;" observes="cmd_find"/>
 			<menuitem value="&findAgainCmd.label;" key="key_findAgain" accesskey="&findAgainCmd.accesskey;" observes="cmd_findAgain"/>
 			<menuseparator/>
-			<menuitem value="&searchInternetCmd.label;" accesskey="&searchInternetCmd.accesskey;" oncommand="openTopWin('http://search.netscape.com/')"/>
 			<menuitem value="&searchMailCmd.label;" accesskey="&searchMailCmd.accesskey;" oncommand="MsgSearchMessages();"/>
+			<menuseparator/>
+			<menuitem value="&searchInternetCmd.label;" accesskey="&searchInternetCmd.accesskey;" oncommand="openTopWin('http://search.netscape.com/')"/>
 			<menuitem value="&searchBookmarksCmd.label;" accesskey="&searchBookmarksCmd.accesskey;" oncommand="window.openDialog('chrome://communicator/content/bookmarks/bm-find.xul', 'FindBookmarksWindow', 'centerscreen,dialog=no,close,chrome,resizable');"/>
 		</menupopup>
 	</menu>

mailnews/base/resources/locale/en-US/messenger.dtd

@@ -222,7 +222,7 @@ Rights Reserved.
 <!-- Search Menu -->
 <!ENTITY searchMenu.accesskey "s">
 <!ENTITY searchMenu.label "Search">
-<!ENTITY findCmd.label "Find...">  
+<!ENTITY findCmd.label "Find in This Message...">  
 <!ENTITY findCmd.accesskey "f">  
 <!ENTITY findCmd.key "f">  
 <!ENTITY findAgainCmd.label "Find Again">