Emails hierarchy fixes