Integrated support for the email manager

Progress towards tracker item 3762