diff --git a/mozilla/mailnews/base/public/nsIMsgFolder.idl b/mozilla/mailnews/base/public/nsIMsgFolder.idl
index 633e35c024a..e8e07b6d20a 100644
--- a/mozilla/mailnews/base/public/nsIMsgFolder.idl
+++ b/mozilla/mailnews/base/public/nsIMsgFolder.idl
@@ -451,8 +451,8 @@ const nsMsgBiffState nsMsgBiffState_Unknown = 2; // We dunno whether there is ne
                                     in wstring oldValue,
                                     in wstring newValue);
   
-  void NotifyItemAdded(in nsISupports item, in string viewString);
-  void NotifyItemDeleted(in nsISupports item, in string viewString);
+  void NotifyItemAdded(in nsISupports item);
+  void NotifyItemRemoved(in nsISupports item);
 
   void NotifyFolderEvent(in nsIAtom event);
   
diff --git a/mozilla/mailnews/base/util/nsMsgDBFolder.cpp b/mozilla/mailnews/base/util/nsMsgDBFolder.cpp
index 33ce4589213..eed675bcf05 100644
--- a/mozilla/mailnews/base/util/nsMsgDBFolder.cpp
+++ b/mozilla/mailnews/base/util/nsMsgDBFolder.cpp
@@ -865,9 +865,9 @@ nsresult nsMsgDBFolder::OnKeyAddedOrDeleted(nsMsgKey aKeyChanged, PRBool added)
   if(NS_SUCCEEDED(rv) && msgDBHdr)
   {
     if(added)
-      NotifyItemAdded(msgDBHdr, "messageView");
+      NotifyItemAdded(msgDBHdr);
     else
-      NotifyItemDeleted(msgDBHdr, "messageView");
+      NotifyItemRemoved(msgDBHdr);
     UpdateSummaryTotals(PR_TRUE);
   }
   return NS_OK;
@@ -2908,7 +2908,7 @@ NS_IMETHODIMP nsMsgDBFolder::PropagateDelete(nsIMsgFolder *folder, PRBool delete
         {
           //Remove from list of subfolders.
           mSubFolders->RemoveElement(supports);
-          NotifyItemDeleted(supports, "folderView");
+          NotifyItemRemoved(supports);
           break;
         }
         else
@@ -4022,7 +4022,7 @@ nsMsgDBFolder::NotifyPropertyFlagChanged(nsISupports *item, nsIAtom *property,
   return NS_OK;
 }
 
-nsresult nsMsgDBFolder::NotifyItemAdded(nsISupports *item, const char* viewString)
+nsresult nsMsgDBFolder::NotifyItemAdded(nsISupports *item)
 {
   static PRBool notify = PR_TRUE;
 
@@ -4048,7 +4048,7 @@ nsresult nsMsgDBFolder::NotifyItemAdded(nsISupports *item, const char* viewStrin
 
 }
 
-nsresult nsMsgDBFolder::NotifyItemDeleted(nsISupports *item, const char* viewString)
+nsresult nsMsgDBFolder::NotifyItemRemoved(nsISupports *item)
 {
 
   PRInt32 i;
diff --git a/mozilla/mailnews/imap/src/nsImapMailFolder.cpp b/mozilla/mailnews/imap/src/nsImapMailFolder.cpp
index 78d7ff4d2df..dd18df49a34 100644
--- a/mozilla/mailnews/imap/src/nsImapMailFolder.cpp
+++ b/mozilla/mailnews/imap/src/nsImapMailFolder.cpp
@@ -930,7 +930,7 @@ NS_IMETHODIMP nsImapMailFolder::CreateClientSubfolderInfo(const char *folderName
     nsCOMPtr <nsIAtom> folderCreateAtom;
     if(NS_SUCCEEDED(rv) && child)
     {
-      NotifyItemAdded(child, "folderView");
+      NotifyItemAdded(child);
       folderCreateAtom = do_GetAtom("FolderCreateCompleted");
       child->NotifyFolderEvent(folderCreateAtom);
     }
@@ -7241,7 +7241,7 @@ NS_IMETHODIMP nsImapMailFolder::RenameClient(nsIMsgWindow *msgWindow, nsIMsgFold
         if (oldImapFolder)
           oldImapFolder->SetVerifiedAsOnlineFolder(PR_FALSE);
 
-        NotifyItemAdded(child, "folderView");
+        NotifyItemAdded(child);
       }
     }     
     return rv;
diff --git a/mozilla/mailnews/local/src/nsLocalMailFolder.cpp b/mozilla/mailnews/local/src/nsLocalMailFolder.cpp
index 1cc28534798..603d47962b1 100644
--- a/mozilla/mailnews/local/src/nsLocalMailFolder.cpp
+++ b/mozilla/mailnews/local/src/nsLocalMailFolder.cpp
@@ -976,7 +976,7 @@ nsMsgLocalMailFolder::CreateSubfolder(const PRUnichar *folderName, nsIMsgWindow
     //we need to notify explicitly the flag change because it failed when we did AddSubfolder
     child->OnFlagChange(mFlags);
     child->SetPrettyName(folderName);  //because empty trash will create a new trash folder
-    NotifyItemAdded(child, "folderView");
+    NotifyItemAdded(child);
   }
   return rv;
 }
@@ -1341,7 +1341,7 @@ NS_IMETHODIMP nsMsgLocalMailFolder::Rename(const PRUnichar *aNewName, nsIMsgWind
       {
         SetParent(nsnull);
         parentFolder->PropagateDelete(this, PR_FALSE, msgWindow);
-        parentFolder->NotifyItemAdded(newFolder, "folderView");
+        parentFolder->NotifyItemAdded(newFolder);
       }
       folderRenameAtom = do_GetAtom("RenameCompleted");
       newFolder->NotifyFolderEvent(folderRenameAtom);
@@ -2102,7 +2102,7 @@ nsMsgLocalMailFolder::CopyFolderLocal(nsIMsgFolder *srcFolder, PRBool isMoveFold
   {
     //notifying the "folder" that was dragged and dropped has been created.
     //no need to do this for its subfolders - isMoveFolder will be true for "folder"
-    NotifyItemAdded(newMsgFolder, "folderView");
+    NotifyItemAdded(newMsgFolder);
     
     nsCOMPtr<nsIMsgFolder> msgParent;
     srcFolder->GetParentMsgFolder(getter_AddRefs(msgParent));
diff --git a/mozilla/mailnews/news/src/nsNewsFolder.cpp b/mozilla/mailnews/news/src/nsNewsFolder.cpp
index c7339e66f02..36bf8559942 100644
--- a/mozilla/mailnews/news/src/nsNewsFolder.cpp
+++ b/mozilla/mailnews/news/src/nsNewsFolder.cpp
@@ -577,7 +577,7 @@ NS_IMETHODIMP nsMsgNewsFolder::CreateSubfolder(const PRUnichar *uninewsgroupname
     SetNewsrcHasChanged(PR_TRUE); // subscribe UI does this - but maybe we got here through auto-subscribe
 
   if(NS_SUCCEEDED(rv) && child)
-    NotifyItemAdded(child, "folderView");
+    NotifyItemAdded(child);
 
   return rv;
 }