Emails restructuring