diff --git a/mozilla/mailnews/base/public/nsIMsgCopyService.idl b/mozilla/mailnews/base/public/nsIMsgCopyService.idl
index f60c130aadc..8326b820646 100644
--- a/mozilla/mailnews/base/public/nsIMsgCopyService.idl
+++ b/mozilla/mailnews/base/public/nsIMsgCopyService.idl
@@ -19,6 +19,7 @@
 #include "nsISupports.idl"
 #include "nsIMsgFolder.idl"
 #include "nsIFileSpec.idl"
+#include "nsIMessage.idl"
 #include "nsIMsgCopyServiceListener.idl"
 
 %{C++
@@ -32,25 +33,39 @@ interface nsITransactionManager;
 [scriptable, uuid(bce41600-28df-11d3-abf7-00805f8ac968)]
 interface nsIMsgCopyService : nsISupports {
 
-	void CopyMessages(in nsIMsgFolder srcFolder,	/* ui source folder */
-	                  in nsISupportsArray messages, /* messages to copy with */
-					  in nsIMsgFolder dstFolder,	/* destination folder */
-					  in boolean isMove,		 	/* move messages */
-					  in nsITransactionManager txnMgr); /* undo manager */
+    /**
+     *
+     */
+	void CopyMessages(in nsIMsgFolder srcFolder,
+	                  in nsISupportsArray messages,
+					  in nsIMsgFolder dstFolder,
+					  in boolean isMove,
+                      in nsIMsgCopyServiceListener listener,
+                      in nsISupports listenerData,
+					  in nsITransactionManager txnMgr);
 
-	void CopyMessage(in nsIFileSpec fileSpec,	/* canonical mime msg file */
-					 in nsIMsgFolder dstFolder, /* destination folder */
-					 in nsITransactionManager txnMgr); /* undo manager */
+    /**
+     *
+     */
+	void CopyFileMessage(in nsIFileSpec fileSpec,
+                         in nsIMsgFolder dstFolder,
+                         in nsIMessage msgToReplace,
+                         in boolean isDraft,
+                         in nsIMsgCopyServiceListener listener,
+                         in nsISupports listenerData,
+                         in nsITransactionManager txnMgr);
 
-	void NotifyCompletion(in nsISupports aSupport, /* a src folder or file spec */
-						  in nsIMsgFolder dstFolder); /* destination folder */
-
-    void RegisterListener(in nsIMsgCopyServiceListener listener,
-                          in nsISupports aSupport, // either an ui source
-                                                   // folder or a file spec
-                          in nsIMsgFolder dstFolder,
-                          in nsISupports listenerData);
-
-    void UnregisterListener(in nsIMsgCopyServiceListener listener);
+    /**
+     * Notify the message copy service that the destination folder has finished
+     * it's messages copying operation so that the copy service can continue
+     * copying the rest of the messages if there are more to copy with.
+     * aSupport and dstFolder uniquely identify a copy service request.
+     *
+     * aSupport -- the originator of CopyMessages or CopyFileMessage; it can
+     *             be either a nsIMsgFolder or a nsIFileSpec
+     * dstFolder -- the destination folder which performs the copy operation
+     */
+	void NotifyCompletion(in nsISupports aSupport,
+						  in nsIMsgFolder dstFolder);
 
 };
diff --git a/mozilla/mailnews/base/public/nsIMsgCopyServiceListener.idl b/mozilla/mailnews/base/public/nsIMsgCopyServiceListener.idl
index d015e52081a..1dd64983b36 100644
--- a/mozilla/mailnews/base/public/nsIMsgCopyServiceListener.idl
+++ b/mozilla/mailnews/base/public/nsIMsgCopyServiceListener.idl
@@ -23,13 +23,18 @@
 interface nsIMsgCopyServiceListener : nsISupports {
 
     /**
-     * Notify the observer that the message has started to be copied. This method is
-     * called only once, at the beginning of a message copyoperation.
+     * Notify the observer that the message has started to be copied. This
+     * method is called only once, at the beginning of a message
+     * copyoperation. 
+     * listenerData -
      */
     void OnStartCopy(in nsISupports listenerData);
 
     /**
      * Notify the observer that progress as occurred for the message copy
+     * aProgress -
+     * aProgressMax -
+     * listenerData -
      */
     void OnProgress(in PRUint32 aProgress, 
                     in PRUint32 aProgressMax, 
@@ -37,12 +42,10 @@ interface nsIMsgCopyServiceListener : nsISupports {
 
     /**
      * Notify the observer that the message copied operation has completed.  
-     * 
-     * This method is called regardless of whether the the operation was successful.
-     * aMsgID   The message id for the mail message
-     * status   Status code for the message send.
-     * msg      A text string describing the error.
-     * returnFileSpec The returned file spec for save to file operations.
+     * This method is called regardless of whether the the operation was
+     * successful.
+     * aStatus - indicate whether the operation was succeeded
+     * listenerData - 
      */
     void OnStopCopy(in nsresult aStatus, in nsISupports listenerData);