diff --git a/mozilla/mailnews/imap/src/nsImapMailFolder.cpp b/mozilla/mailnews/imap/src/nsImapMailFolder.cpp
index 22165460254..949715a8997 100644
--- a/mozilla/mailnews/imap/src/nsImapMailFolder.cpp
+++ b/mozilla/mailnews/imap/src/nsImapMailFolder.cpp
@@ -3896,6 +3896,19 @@ nsImapMailFolder::OnStopRunningUrl(nsIURI *aUrl, nsresult aExitCode)
             break;
         case nsIImapUrl::nsImapRenameFolder:
             break;
+        case nsIImapUrl::nsImapDeleteAllMsgs:
+            if (NS_SUCCEEDED(aExitCode))
+            {
+              if (folderOpen)
+                UpdateFolder(aWindow);
+              else
+              {
+                ChangeNumPendingTotalMessages(-mNumPendingTotalMessages);
+                ChangeNumPendingUnread(-mNumPendingUnreadMessages);
+              }
+
+            }
+            break;
         default:
             break;
         }
diff --git a/mozilla/mailnews/local/src/nsLocalMailFolder.cpp b/mozilla/mailnews/local/src/nsLocalMailFolder.cpp
index 3da27833f6a..a8f24d8fc47 100644
--- a/mozilla/mailnews/local/src/nsLocalMailFolder.cpp
+++ b/mozilla/mailnews/local/src/nsLocalMailFolder.cpp
@@ -928,6 +928,11 @@ NS_IMETHODIMP nsMsgLocalMailFolder::EmptyTrash(nsIMsgWindow *msgWindow,
                     trashFolder->SetParent(nsnull);
                     parentFolder->PropagateDelete(trashFolder, PR_TRUE);
                     parentFolder->CreateSubfolder(folderName.GetUnicode(),nsnull);
+                    nsCOMPtr<nsIMsgFolder> newTrashFolder;
+                    rv = GetTrashFolder(getter_AddRefs(newTrashFolder));
+                    if (NS_SUCCEEDED(rv) && newTrashFolder)
+                      newTrashFolder->UpdateFolder(msgWindow);
+                    CompactAll(aListener, msgWindow);
                 }
             }
         }