Unify alias expansion.

1 files changed, 2 insertions, 7 deletions

diff --git a/headers.c b/headers.c
index 843b3bba..38542d79 100644
--- a/headers.c
+++ b/headers.c
@@ -101,13 +101,8 @@ void mutt_edit_headers (const char *editor,
   mutt_free_envelope (&msg->env);
   msg->env = n;
 
-  msg->env->from = mutt_expand_aliases (msg->env->from);
-  msg->env->to = mutt_expand_aliases (msg->env->to);
-  msg->env->cc = mutt_expand_aliases (msg->env->cc);
-  msg->env->bcc = mutt_expand_aliases (msg->env->bcc);
-  msg->env->reply_to = mutt_expand_aliases (msg->env->reply_to);
-  msg->env->mail_followup_to = mutt_expand_aliases (msg->env->mail_followup_to);
-
+  mutt_expand_aliases_env (msg->env);
+  
   /* search through the user defined headers added to see if either a 
    * fcc: or attach-file: field was specified.  
    */