diff --git a/mozilla/mail/components/compose/content/MsgComposeCommands.js b/mozilla/mail/components/compose/content/MsgComposeCommands.js
index 02de3966b13..6771d8dba2e 100644
--- a/mozilla/mail/components/compose/content/MsgComposeCommands.js
+++ b/mozilla/mail/components/compose/content/MsgComposeCommands.js
@@ -3513,7 +3513,8 @@ function loadHTMLMsgPrefs()
 
 function AutoSave()
 {
-  if (gMsgCompose.editor && (gContentChanged || gMsgCompose.bodyModified))
+  if (gMsgCompose.editor && (gContentChanged || gMsgCompose.bodyModified) 
+      && !gSendOrSaveOperationInProgress)
     GenericSendMessage(nsIMsgCompDeliverMode.AutoSaveAsDraft);
 
   gAutoSaveTimeout = setTimeout(AutoSave, gAutoSaveInterval);