diff --git a/mailnews/compose/build/win32.order b/mailnews/compose/build/win32.order
index 00a5b52fec86..aff9218b970d 100644
--- a/mailnews/compose/build/win32.order
+++ b/mailnews/compose/build/win32.order
@@ -210,7 +210,6 @@ nsMsgPlatformFileToURL ; 2
 ?SetAttachVCard@nsMsgCompFields@@UAGIH@Z ; 2
 ?DeliverAsMailExit@nsMsgComposeAndSend@@QAEXPAVnsIURI@@I@Z ; 2
 ?SetAttachments@nsMsgCompFields@@UAGIPBD@Z ; 2
-?CreateAndSendMessage@nsMsgComposeAndSend@@UAGIPAVnsIEditorShell@@PAVnsIMsgIdentity@@PAVnsIMsgCompFields@@HHHPAVnsIMsgDBHdr@@PBD4IPBUnsMsgAttachmentData@@PBUnsMsgAttachedFile@@PAXPAPAVnsIMsgSendListener@@I@Z ; 2
 ?OnDataAvailable@nsURLFetcher@@UAGIPAVnsIRequest@@PAVnsISupports@@PAVnsIInputStream@@II@Z ; 2
 ??1nsSmtpUrl@@MAE@XZ ; 2
 ?CountCompFieldAttachments@nsMsgComposeAndSend@@QAEIXZ ; 2
@@ -251,7 +250,6 @@ msg_generate_message_id ; 2
 ?GetOriginalMsgURI@nsMsgComposeParams@@UAGIPAPAD@Z ; 1
 ?GetKey@nsSmtpServer@@UAGIPAPAD@Z ; 1
 ?GetType@nsMsgCompose@@UAGIPAH@Z ; 1
-?SetEditor@nsMsgCompose@@UAGIPAVnsIEditorShell@@@Z ; 1
 ??_GnsComposeStringService@@UAEPAXI@Z ; 1
 ?saveKeyList@nsSmtpService@@AAEIXZ ; 1
 ??0nsComposeStringService@@QAE@XZ ; 1
@@ -286,7 +284,6 @@ msg_generate_message_id ; 2
 ??_GnsSmtpService@@UAEPAXI@Z ; 1
 ??_GnsMsgDocumentStateListener@@UAEPAXI@Z ; 1
 ?GetFormat@nsMsgComposeParams@@UAGIPAH@Z ; 1
-?ConvertAndLoadComposeWindow@nsMsgCompose@@QAEIPAVnsIEditorShell@@AAVnsString@@11HH@Z ; 1
 ?GetServerByKey@nsSmtpService@@UAGIPBDPAPAVnsISmtpServer@@@Z ; 1
 ?BuildBodyMessageAndSignature@nsMsgCompose@@QAEIXZ ; 1
 ?InitCompose@nsMsgComposeService@@UAGIPAVnsIDOMWindowInternal@@PAVnsIMsgComposeParams@@PAPAVnsIMsgCompose@@@Z ; 1
diff --git a/mailnews/compose/src/nsMsgCompose.cpp b/mailnews/compose/src/nsMsgCompose.cpp
index e709ebe35eeb..ee35652114ed 100644
--- a/mailnews/compose/src/nsMsgCompose.cpp
+++ b/mailnews/compose/src/nsMsgCompose.cpp
@@ -487,8 +487,7 @@ nsMsgCompose::ConvertAndLoadComposeWindow(nsString& aPrefix,
   // So set it back to writable.
   // Note!  enableEditableFields in gComposeRecyclingListener::onReopen
   // will redundantly set this flag to writable, but it gets there
-  // too late.  This will be revisited when cmanske lands the
-  // next stage of editorshell removal.
+  // too late.
   PRUint32 flags = 0;
   m_editor->GetFlags(&flags);
   flags &= ~nsIPlaintextEditor::eEditorReadonlyMask;
@@ -1255,7 +1254,7 @@ nsresult nsMsgCompose::ClearEditor()
 
 // This used to be called BEFORE editor was created 
 //  (it did the loadUrl that triggered editor creation)
-// Since editorShell removal, it is called from JS after editor creation
+// It is called from JS after editor creation
 //  (loadUrl is done in JS)
 NS_IMETHODIMP nsMsgCompose::InitEditor(nsIEditor* aEditor, nsIDOMWindow* aContentWindow)
 {