diff --git a/mailnews/ui/compose/resources/MsgComposeCommands.js b/mailnews/ui/compose/resources/MsgComposeCommands.js
index 899a71ff3dfd..ac6a449077df 100644
--- a/mailnews/ui/compose/resources/MsgComposeCommands.js
+++ b/mailnews/ui/compose/resources/MsgComposeCommands.js
@@ -30,10 +30,8 @@ function ComposeStartup()
 	var args = GetArgs();
 
 	// Generate a unique number, do we have a better way?
-	// I don't think so a user can create two message compositions
-	// in the same millisecond!!
 	var date = new Date();
-	sessionID = date.getTime();
+	sessionID = date.getTime() + Math.random();
 
 	appCoreName = "EditorAppCore:" + sessionID;
 	editorAppCore = XPAppCoresManager.Find(appCoreName);	
@@ -56,7 +54,6 @@ function ComposeStartup()
 		editorName = appCoreName; //Very important to set this variable used by Editor js
 
 		// setEditorType MUST be call before setContentWindow
-dump("args.editorType.toLowerCase(): " + args.editorType.toLowerCase() + "\n");
 		if (args.editorType && args.editorType.toLowerCase() == "html")
 		{
 			editorAppCore.setEditorType("html");
diff --git a/mailnews/ui/messenger/resources/commandglue.js b/mailnews/ui/messenger/resources/commandglue.js
index 2fd66836dfd0..65afd71c971f 100644
--- a/mailnews/ui/messenger/resources/commandglue.js
+++ b/mailnews/ui/messenger/resources/commandglue.js
@@ -28,10 +28,8 @@ function ComposeMessage(tree, nodeList, msgAppCore, type)
 	dump("\nComposeMessage from XUL\n");
 
 	// Generate a unique number, do we have a better way?
-	// I don't think so a user can create two message compositions
-	// in the same millisecond!!
 	var date = new Date();
-	sessionID = date.getTime();
+	sessionID = date.getTime() + Math.random();
 	
 	var composeAppCoreName = "ComposeAppCore:" + sessionID;
 	var composeAppCore = XPAppCoresManager.Find(composeAppCoreName);