diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 5e34594d96..d8973fa71f 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -1218,14 +1218,6 @@ composer_build_message (EMsgComposer *composer,
 		g_free (encoded_organization);
 	}
 
-	/* X-Evolution-Format */
-	composer_add_evolution_format_header (
-		CAMEL_MEDIUM (context->message), flags);
-
-	/* X-Evolution-Composer-Mode */
-	composer_add_evolution_composer_mode_header (
-		CAMEL_MEDIUM (context->message), composer);
-
 	if (flags & COMPOSER_FLAG_SAVE_DRAFT) {
 		gchar *text;
 		EHTMLEditor *editor;
@@ -1236,6 +1228,14 @@ composer_build_message (EMsgComposer *composer,
 		view = e_html_editor_get_view (editor);
 		selection = e_html_editor_view_get_selection (view);
 
+		/* X-Evolution-Format */
+		composer_add_evolution_format_header (
+			CAMEL_MEDIUM (context->message), flags);
+
+		/* X-Evolution-Composer-Mode */
+		composer_add_evolution_composer_mode_header (
+			CAMEL_MEDIUM (context->message), composer);
+
 		data = g_byte_array_new ();
 
 		e_html_editor_view_embed_styles (view);