diff --git a/mailnews/base/resources/content/messageWindow.js b/mailnews/base/resources/content/messageWindow.js
index 40640093a29b..4732cdf0ddd4 100644
--- a/mailnews/base/resources/content/messageWindow.js
+++ b/mailnews/base/resources/content/messageWindow.js
@@ -107,7 +107,7 @@ function HandleDeleteOrMoveMsgCompleted(folder)
 	if((folderUri == gCurrentFolderUri) && gCurrentMessageIsDeleted)
 	{
     gCurrentMessageIsDeleted = false;
-    if (gNextMessageViewIndexAfterDelete != nsMsgViewIndex_None) 
+    if (gNextMessageViewIndexAfterDelete != nsMsgKey_None) 
     {
       var nextMstKey = gDBView.getKeyAt(gNextMessageViewIndexAfterDelete);
       if (nextMstKey != nsMsgKey_None) {
diff --git a/mailnews/base/search/resources/content/SearchDialog.js b/mailnews/base/search/resources/content/SearchDialog.js
index f6c3c712e672..61e8f295c8b1 100644
--- a/mailnews/base/search/resources/content/SearchDialog.js
+++ b/mailnews/base/search/resources/content/SearchDialog.js
@@ -52,8 +52,6 @@ var gSearchStopButton;
 var gSearchSessionFolderListener;
 var gMailSession;
 
-const nsMsgViewIndex_None = 0xFFFFFFFF;
-
 // Controller object for search results thread pane
 var nsSearchResultsController =
 {
@@ -95,7 +93,7 @@ var nsSearchResultsController =
     {
         switch(command) {
         case "cmd_open":
-            MsgOpenSelectedMessages(gSearchView);
+            MsgOpenSelectedMessages();
             return true;
 
         case "button_delete":