int mutt_idna_to_local (const char *, char **, int);
int mutt_local_to_idna (const char *, char **);
-int mutt_addrlist_to_idna (ADDRESS *, char **);
-int mutt_addrlist_to_local (ADDRESS *);
+int mutt_addrlist_to_idna (address_t *, char **);
+int mutt_addrlist_to_local (address_t *);
void mutt_env_to_local (ENVELOPE *);
int mutt_env_to_idna (ENVELOPE *, const char **, const char **);
-const char *mutt_addr_for_display (ADDRESS * a);
+const char *mutt_addr_for_display (address_t * a);
/* Work around incompatibilities in the libidn API */