Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/composer/ChangeLog,v
retrieving revision 1.714
diff -u -p -r1.714 ChangeLog
--- ChangeLog	24 Aug 2005 04:19:01 -0000	1.714
+++ ChangeLog	29 Sep 2005 08:24:01 -0000
@@ -1,3 +1,11 @@
+2005-09-29  Parthasarathi Susarla <sparthasarathi@novell.com>
+
+	** See bug 317337
+
+	* e-msg-composer.c: (e_msg_composer_new_with_message):
+	Set the proper account name in account_name, so that
+	the from header is set properly.
+	
 2005-08-22  Srinivasa Ragavan <sragavan@novell.com>
 
 	* e-msg-composer.c (drop_action): Show the bar depending on the 
Index: e-msg-composer.c
===================================================================
RCS file: /cvs/gnome/evolution/composer/e-msg-composer.c,v
retrieving revision 1.517
diff -u -p -r1.517 e-msg-composer.c
--- e-msg-composer.c	24 Aug 2005 04:19:01 -0000	1.517
+++ e-msg-composer.c	29 Sep 2005 08:24:25 -0000
@@ -4213,6 +4213,8 @@ e_msg_composer_new_with_message (CamelMi
 		if ((account = mail_config_get_account_by_uid(account_name)) == NULL)
 			/* 'old' setting */
 			account = mail_config_get_account_by_name(account_name);
+		g_free (account_name);
+		account_name = g_strdup (account->name);
 	}
 	
 	if (postto == NULL) {
