Merge "Deduplicate Address class" into ub-mail-master