Email changes

Used email composer plugin.