diff --git a/felamimail/js/jscode/composeMessage.js b/felamimail/js/jscode/composeMessage.js
index 0e60ba4d06..e5866f2c9b 100644
--- a/felamimail/js/jscode/composeMessage.js
+++ b/felamimail/js/jscode/composeMessage.js
@@ -783,7 +783,8 @@ function fm_compose_sendEMail() {
 
 	if(addressSet == true && subjectSet == true && doubleCheck == false) {
 		// if we submit the form, we do not want to execute the onunload stuff
-		do_onunload=false; 
+		justSavedAsDraftManually = false;
+		do_onunload=false;
 		document.doit.submit();
 	} else {
 		justClickedSend = false; // since we did not send at all,....