diff --git a/mozilla/mailnews/base/resources/content/mailWindowOverlay.js b/mozilla/mailnews/base/resources/content/mailWindowOverlay.js
index a444342a848..ba4839d7c63 100644
--- a/mozilla/mailnews/base/resources/content/mailWindowOverlay.js
+++ b/mozilla/mailnews/base/resources/content/mailWindowOverlay.js
@@ -819,12 +819,21 @@ function MsgViewPageSource()
 
 function MsgFind()
 {
-    messenger.find();
+  var contentWindow = window.top._content;
+
+  // from utilityOverlay.js
+  findInPage(getMessageBrowser(), contentWindow, contentWindow)
 }
 
 function MsgFindAgain()
 {
-    messenger.findAgain();
+  var contentWindow = window.top._content;
+  findAgainInPage(getMessageBrowser(), contentWindow, contentWindow)
+}
+
+function MsgCanFindAgain()
+{
+  return canFindAgainInPage();
 }
 
 function MsgSearchMessages()
diff --git a/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul b/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
index b9e07ac5458..900992c3df9 100644
--- a/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
+++ b/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
@@ -42,6 +42,7 @@ Rights Reserved.
 <script src="chrome://messenger/content/mailCommands.js"/>
 <script src="chrome://messenger/content/mailWindowOverlay.js"/>
 <script src="chrome://messenger/content/commandglue.js"/>
+<script type="application/x-javascript" src="chrome://communicator/content/findUtils.js"/>
 <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksOverlay.js"/>
 
 <stringbundleset id="mailStringBundles">
diff --git a/mozilla/mailnews/base/resources/content/messageWindow.js b/mozilla/mailnews/base/resources/content/messageWindow.js
index a1222bdf481..12119aa77ef 100644
--- a/mozilla/mailnews/base/resources/content/messageWindow.js
+++ b/mozilla/mailnews/base/resources/content/messageWindow.js
@@ -502,7 +502,6 @@ var MessageWindowController =
 			case "cmd_viewPageSource":
 			case "cmd_reload":
 			case "cmd_find":
-			case "cmd_findAgain":
       case "button_mark":
 			case "cmd_markAsRead":
 			case "cmd_markAllRead":
@@ -531,6 +530,8 @@ var MessageWindowController =
 			case "cmd_previousMsg":
 			case "cmd_previousUnreadMsg":
 				return true;
+			case "cmd_findAgain":
+				return MsgCanFindAgain();
 			default:
 				return false;
 		}