Merge "De-duplicate header on name/addr conflict" into ub-mail-master