--- evolution-2.8.3/composer/e-msg-composer-hdrs.c.orig	2007-02-26 02:55:37.000000000 -0500
+++ evolution-2.8.3/composer/e-msg-composer-hdrs.c	2007-02-26 03:01:48.000000000 -0500
@@ -384,7 +384,7 @@
 	while (e_iterator_is_valid (iter)) {
 		account = (EAccount *) e_iterator_get (iter);
 
-		if (account->id->address && account_can_send (account))
+		if (account->id->address && account_can_send (account) && account->enabled)
 			g_ptr_array_add (addresses, account->id->address);
 		
 		e_iterator_next (iter);
@@ -403,7 +403,7 @@
 			continue;
 		}
 		
-		if (account->id->address && *account->id->address && account_can_send (account)) {
+		if (account->id->address && *account->id->address && account_can_send (account) && account->enabled) {
 			/* If the account has a unique email address, just
 			 * show that. Otherwise include the account name.
 			 */
