- if (!ascii_strcasecmp(addr->mailbox, Username)
- || string_is_address(addr->mailbox, Username, Hostname)
- || string_is_address(addr->mailbox, Username, mutt_fqdn(0))
- || string_is_address(addr->mailbox, Username, mutt_fqdn(1))
+ if (!ascii_strcasecmp(addr->mailbox, MCore.username)
+ || string_is_address(addr->mailbox, MCore.username, Hostname)
+ || string_is_address(addr->mailbox, MCore.username, mutt_fqdn(0))
+ || string_is_address(addr->mailbox, MCore.username, mutt_fqdn(1))