Corrected mapping of 'mail' to 'us_(ext)mail' attrs (closes #4270)