diff --git a/mailnews/base/resources/content/messageWindow.js b/mailnews/base/resources/content/messageWindow.js
index d55a8c8cfa6..815f48f14ef 100644
--- a/mailnews/base/resources/content/messageWindow.js
+++ b/mailnews/base/resources/content/messageWindow.js
@@ -70,6 +70,9 @@ var folderListener = {
 		if (event.GetUnicode() == "DeleteOrMoveMsgCompleted") {
 			HandleDeleteOrMoveMsgCompleted(folder);
 		}     
+                else if (event.GetUnicode() == "DeleteOrMoveMsgFailed") {
+                        HandleDeleteOrMoveMsgFailed(folder);
+                }
     }
 }
 
@@ -92,6 +95,19 @@ function HandleDeleteOrMoveMsgCompleted(folder)
 	}
 }
 
+function HandleDeleteOrMoveMsgFailed(folder)
+{
+        var folderResource = folder.QueryInterface(Components.interfaces.nsIRDFResource);
+        if(!folderResource)
+                return;
+
+        var folderUri = folderResource.Value;
+        if((folderUri == gCurrentFolderUri) && gCurrentMessageIsDeleted)
+        {
+                gCurrentMessageIsDeleted = false;
+        }	
+}
+
 function OnLoadMessageWindow()
 {
 	HideMenus();