If we still care about displaying the emails as the users originally entered them (or as XMPP gives them to us, as the case may be), we can maybe add a 'displayEmail' field to the relevant datastore entities, maybe defaulting to null/missing so we don't waste space for users where it's the same as the userid.  But I'd leave this out in a first approach and just normalize everything everywhere. :)