bunch of revision of email structure.