Further clarify Mail/Address distinction