diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index d9c8bd2..82984d6 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -577,8 +577,6 @@ save_draft_done (CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *i
 	if (!ok)
 		goto done;
 
-	composer_set_no_change (sdi->composer, FALSE, FALSE);
-
 	if ((emcs = sdi->emcs) == NULL)
 		emcs = emcs_new ();
 
@@ -986,7 +984,7 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const gchar *uid)
 		emcs_set_drafts_info (emcs, drafts, uid);
 	}
 
-	composer_set_no_change (composer, TRUE, FALSE);
+	composer_set_no_change (composer, TRUE, TRUE);
 
 	if (!e_msg_composer_get_lite())
 		gtk_widget_show (GTK_WIDGET (composer));
