diff --git a/mozilla/mailnews/base/resources/content/msgMail3PaneWindow.js b/mozilla/mailnews/base/resources/content/msgMail3PaneWindow.js
index c33da8cd490..6ec2b49b34a 100644
--- a/mozilla/mailnews/base/resources/content/msgMail3PaneWindow.js
+++ b/mozilla/mailnews/base/resources/content/msgMail3PaneWindow.js
@@ -141,10 +141,28 @@ var folderListener = {
 		}
         } else if (event.GetUnicode() == "DeleteOrMoveMsgCompleted") {
 			HandleDeleteOrMoveMsgCompleted(folder);
-		}     
+        }     
+          else if (event.GetUnicode() == "DeleteOrMoveMsgFailed") {
+                        HandleDeleteOrMoveMsgFailed(folder);
+        }
+
     }
 }
 
+function HandleDeleteOrMoveMsgFailed(folder)
+{
+
+        if(IsCurrentLoadedFolder(folder))
+        {
+                if(gNextMessageAfterDelete)
+                {
+                        gNextMessageAfterDelete = null;
+		}
+        }
+
+}
+
+
 function HandleDeleteOrMoveMsgCompleted(folder)
 {