diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 2586e91..cef2e43 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -269,6 +269,7 @@ composer_get_message (EMsgComposer *composer, gboolean save_html_object_data)
 	EMEvent *eme;
 	EMEventTargetComposer *target;
 	EComposerHeaderTable *table;
+	EComposerHeader *post_to_header;
 
 	gconf = mail_config_get_gconf_client ();
 	table = e_msg_composer_get_header_table (composer);
@@ -322,10 +323,13 @@ composer_get_message (EMsgComposer *composer, gboolean save_html_object_data)
 
 	camel_object_unref (cia);
 
-	postlist = e_composer_header_table_get_post_to (table);
-	num_post = g_list_length(postlist);
-	g_list_foreach(postlist, (GFunc)g_free, NULL);
-	g_list_free(postlist);
+	post_to_header = e_composer_header_table_get_header (table, E_COMPOSER_HEADER_POST_TO);
+	if (e_composer_header_get_visible (post_to_header)) {
+		postlist = e_composer_header_table_get_post_to (table);
+		num_post = g_list_length(postlist);
+		g_list_foreach(postlist, (GFunc)g_free, NULL);
+		g_list_free(postlist);
+	}
 
 	/* I'm sensing a lack of love, er, I mean recipients. */
 	if (num == 0 && num_post == 0) {
