unified email forked

Change-Id: I8ee5426d4b26b6b8a04daa83d5b56c539d2379ad