Switch to Email2

Change-Id: Ib62446ee4ba24b2be6d3b3c0b196ee11fb384350