Index: mail/ChangeLog
===================================================================
--- mail/ChangeLog	(revision 35368)
+++ mail/ChangeLog	(working copy)
@@ -1,3 +1,10 @@
+2008-04-15  Bharath Acharya  <abharath@novell.com>
+
+	** Fixes bug #502913
+	
+	* em-composer-utils.c: (create_new_composer): The headers would be set 
+	by e-msg-composer.c:from_changed_cb. So let this function not mess it up
+
 2008-03-27  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes bug #523271
Index: mail/em-composer-utils.c
===================================================================
--- mail/em-composer-utils.c	(revision 35368)
+++ mail/em-composer-utils.c	(working copy)
@@ -621,11 +621,14 @@
 {
 	EMsgComposer *composer;
 	EAccount *account = NULL;
+	EMsgComposerHdrs* hdrs;
 
 	composer = e_msg_composer_new ();
 	if (composer == NULL)
 		return NULL;
 
+	hdrs = e_msg_composer_get_hdrs (composer);
+
 	if (fromuri)
 		account = mail_config_get_account_by_source_url(fromuri);
 
@@ -636,7 +639,8 @@
 	if (!account)
 		account = e_msg_composer_get_preferred_account (composer);
 
-	e_msg_composer_set_headers (composer, account?account->name:NULL, NULL, NULL, NULL, subject);
+	e_msg_composer_hdrs_set_subject (hdrs, subject);
+	e_msg_composer_hdrs_set_from_account (hdrs, account?account->name:NULL);
 
 	em_composer_utils_setup_default_callbacks (composer);
 
