More work on email class

Change-Id: I9764ee27bbd01e289df9f06b7306c2f75d0cedc0