--- a/mailnews/compose/public/nsIMsgQuote.idl
+++ b/mailnews/compose/public/nsIMsgQuote.idl
@@ -34,35 +34,31 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 #include "nsISupports.idl"
 #include "nsIMsgQuotingOutputStreamListener.idl"
 #include "nsIChannel.idl"
 #include "nsIMimeStreamConverter.idl"
 
-[scriptable, uuid(fcc907ce-abff-47b7-8c0f-c09063b13494)]
+[scriptable, uuid(5e601eed-95e8-4598-8917-26fe983e2803)]
 interface nsIMsgQuote : nsISupports {
-	/*
-	 * This is the primary interface for quoting a particular message specified
-	   by a URI
-	 */
- 
-    /* aCharset is an option parameter which can be used to force the message to be 
-	   quoted using a particular charset. 
-	*/
-  void QuoteMessage(in string msgURI, in boolean quoteHeaders,
-                    in nsIMsgQuotingOutputStreamListener streamListener, 
-                    in string aCharset, in boolean headersOnly);
-	                  
-    readonly attribute nsIMimeStreamConverterListener quoteListener;
-    readonly attribute nsIChannel quoteChannel;
-    readonly attribute nsIMsgQuotingOutputStreamListener streamListener;
+
+ /**
+  * Quote a particular message specified by its URI.
+  *
+  * @param charset optional parameter - if set, force the message to be
+  *                quoted using this particular charset
+  */
+  void quoteMessage(in string msgURI, in boolean quoteHeaders,
+                    in nsIMsgQuotingOutputStreamListener streamListener,
+                    in string charset, in boolean headersOnly);
+
+  readonly attribute nsIMimeStreamConverterListener quoteListener;
+  readonly attribute nsIChannel quoteChannel;
+  readonly attribute nsIMsgQuotingOutputStreamListener streamListener;
 };
 
 [scriptable, uuid(1EC75AD9-88DE-11d3-989D-001083010E9B)]
 interface nsIMsgQuoteListener : nsIMimeStreamConverterListener
 {
-	attribute nsIMsgQuote msgQuote;
+  attribute nsIMsgQuote msgQuote;
 };
-
-
-

--- a/mailnews/mime/public/nsIMimeEmitter.idl
+++ b/mailnews/mime/public/nsIMimeEmitter.idl
@@ -47,55 +47,52 @@ interface nsIChannel;
 interface nsMimeHeaderDisplayTypes
 {
     const long MicroHeaders = 0;
     const long NormalHeaders = 1;
     const long AllHeaders = 2;
 };
 
 %{C++
-//#define NS_IMIME_MISC_STATUS_KEY       "@mozilla.org/messenger/mimestatus;1?"
 #define NS_IMIME_MISC_STATUS_KEY       "@mozilla.org/MimeMiscStatus;1?type="
 %}
 
-[scriptable, uuid(8c9f218a-d1a6-4cb4-b985-e38140c0af93)]
-interface nsIMimeEmitter : nsISupports{
+[scriptable, uuid(c470b05e-9006-43a4-aa84-0da080360675)]
+interface nsIMimeEmitter : nsISupports {
 
-    // These will be called to start and stop the total operation
-    void    Initialize(in nsIURI url, in nsIChannel aChannel, in long aFormat);
-    void    Complete();
+    // Output listener to allow access to it from mime.
+    attribute nsIStreamListener outputListener;
+
+    // These will be called to start and stop the total operation.
+    void initialize(in nsIURI url, in nsIChannel aChannel, in long aFormat);
+    void complete();
 
     // Set the output stream/listener for processed data.
-    void    SetPipe(in nsIInputStream inputStream, in nsIOutputStream outStream);
-    void    SetOutputListener(in nsIStreamListener listener);
-
-    //Get the output listener to allow access to it from mime
-    nsIStreamListener    GetOutputListener();
+    void setPipe(in nsIInputStream inputStream, in nsIOutputStream outStream);
 
     // Header handling routines.
-    void    StartHeader(in PRBool rootMailHeader, in PRBool headerOnly,
-                        [const] in string msgID, [const] in string outCharset);
-    void    AddHeaderField([const] in string field, [const] in string value);
-    void    addAllHeaders(in ACString allheaders);
-  void    WriteHTMLHeaders(); // book case this with a EndHeader call.
-    void    EndHeader();
-    void    UpdateCharacterSet([const] in string aCharset);
+    void startHeader(in PRBool rootMailHeader, in PRBool headerOnly,
+                     [const] in string msgID, [const] in string outCharset);
+    void addHeaderField([const] in string field, [const] in string value);
+    void addAllHeaders(in ACString allheaders);
+    void writeHTMLHeaders(); // Book case this with an EndHeader call.
+    void endHeader();
+    void updateCharacterSet([const] in string aCharset);
 
-    // Attachment handling routines
-    void    StartAttachment([const] in string name, [const] in string contentType,
-                            [const] in string url, in PRBool aNotDownloaded);
-    void    AddAttachmentField([const] in string field, [const] in string value);
-    void    EndAttachment();
+    // Attachment handling routines.
+    void startAttachment([const] in string name, [const] in string contentType,
+                         [const] in string url, in PRBool aNotDownloaded);
+    void addAttachmentField([const] in string field, [const] in string value);
+    void endAttachment();
 
-    void    EndAllAttachments();
+    void endAllAttachments();
 
-    // Body handling routines
-    void    StartBody(in PRBool bodyOnly, [const] in string msgID, [const] in string outCharset);
-    void    WriteBody([const] in string buf, in PRUint32 size, out PRUint32 amountWritten);
-    void    EndBody();
+    // Body handling routines.
+    void startBody(in PRBool bodyOnly, [const] in string msgID, [const] in string outCharset);
+    void writeBody([const] in string buf, in PRUint32 size, out PRUint32 amountWritten);
+    void endBody();
 
     // Generic write routine. This is necessary for output that
     // libmime needs to pass through without any particular parsing
     // involved (i.e. decoded images, HTML Body Text, etc...
-    void    Write([const] in string buf, in PRUint32 size, out PRUint32 amountWritten);
-    void    UtilityWrite([const] in string buf);
+    void write([const] in string buf, in PRUint32 size, out PRUint32 amountWritten);
+    void utilityWrite([const] in string buf);
 };
-