diff --git a/mozilla/mail/base/content/commandglue.js b/mozilla/mail/base/content/commandglue.js
index e90bb91df52..00340ac1066 100644
--- a/mozilla/mail/base/content/commandglue.js
+++ b/mozilla/mail/base/content/commandglue.js
@@ -66,12 +66,6 @@ var MSG_FOLDER_FLAG_TEMPLATES = 0x400000;
 var MSG_FOLDER_FLAG_JUNK = 0x40000000;
 var MSG_FOLDER_FLAG_FAVORITE = 0x80000000;
 
-function OpenURL(url)
-{
-  messenger.SetWindow(window, msgWindow);
-  messenger.OpenURL(url);
-}
-
 function GetMsgFolderFromResource(folderResource)
 {
   if (!folderResource)
@@ -97,30 +91,6 @@ function GetServer(uri)
     return null;
 }
 
-function LoadMessageByUri(uri)
-{
-  //dump("XXX LoadMessageByUri " + uri + " vs " + gCurrentDisplayedMessage + "\n");
-  if(uri != gCurrentDisplayedMessage)
-  {
-        dump("fix this, get the nsIMsgDBHdr and the nsIMsgFolder from the uri...\n");
-/*
-    var resource = RDF.GetResource(uri);
-    var message = resource.QueryInterface(Components.interfaces.nsIMessage);
-    if (message)
-      setTitleFromFolder(message.msgFolder, message.mimef2DecodedSubject);
-
-    var nsIMsgFolder = Components.interfaces.nsIMsgFolder;
-    if (message.msgFolder.server.downloadOnBiff)
-      message.msgFolder.biffState = nsIMsgFolder.nsMsgBiffState_NoMail;
-*/
-
-    gCurrentDisplayedMessage = uri;
-    gHaveLoadedMessage = true;
-    OpenURL(uri);
-  }
-
-}
-
 function setTitleFromFolder(msgfolder, subject)
 {
     var wintype = document.documentElement.getAttribute('windowtype');
diff --git a/mozilla/mail/base/content/msgMail3PaneWindow.js b/mozilla/mail/base/content/msgMail3PaneWindow.js
index 42ed9af6d07..009aff805d1 100644
--- a/mozilla/mail/base/content/msgMail3PaneWindow.js
+++ b/mozilla/mail/base/content/msgMail3PaneWindow.js
@@ -74,7 +74,6 @@ var gCurrentLoadingFolderSortOrder = 0;
 var gCurrentLoadingFolderViewType = 0;
 var gCurrentLoadingFolderViewFlags = 0;
 var gRerootOnFolderLoad = false;
-var gCurrentDisplayedMessage = null;
 var gNextMessageAfterDelete = null;
 var gNextMessageAfterLoad = null;
 var gNextMessageViewIndexAfterDelete = -2;
@@ -1314,7 +1313,6 @@ function ClearMessagePane()
   if(gHaveLoadedMessage)
   {
     gHaveLoadedMessage = false;
-    gCurrentDisplayedMessage = null;
     if (GetMessagePaneFrame().location.href != "about:blank")
         GetMessagePaneFrame().location.href = "about:blank";
     
diff --git a/mozilla/mailnews/base/src/nsMsgDBView.cpp b/mozilla/mailnews/base/src/nsMsgDBView.cpp
index 20626578b40..f51a28d7212 100644
--- a/mozilla/mailnews/base/src/nsMsgDBView.cpp
+++ b/mozilla/mailnews/base/src/nsMsgDBView.cpp
@@ -972,10 +972,7 @@ NS_IMETHODIMP nsMsgDBView::SetSelection(nsITreeSelection * aSelection)
 
 NS_IMETHODIMP nsMsgDBView::ReloadMessageWithAllParts()
 {
-  if (m_currentlyDisplayedMsgUri.IsEmpty())
-    return NS_ERROR_FAILURE;
-
-  if (mSuppressMsgDisplay)
+  if (m_currentlyDisplayedMsgUri.IsEmpty() || mSuppressMsgDisplay)
     return NS_OK;
 
   nsCAutoString forceAllParts(m_currentlyDisplayedMsgUri);
@@ -986,10 +983,7 @@ NS_IMETHODIMP nsMsgDBView::ReloadMessageWithAllParts()
 
 NS_IMETHODIMP nsMsgDBView::ReloadMessage()
 {
-  if (m_currentlyDisplayedMsgUri.IsEmpty())
-    return NS_ERROR_FAILURE;
-
-  if (mSuppressMsgDisplay)
+  if (m_currentlyDisplayedMsgUri.IsEmpty() || mSuppressMsgDisplay)
     return NS_OK;
 
   return mMessengerInstance->OpenURL(m_currentlyDisplayedMsgUri.get());