Corrected mapping of 'mail' to 'us_(ext)mail' attrs (refs #4270)
Merge pull request #21 from eguaj/1.3-A4270

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