Email: Add PIB Support

Change-Id: I7981e9c4736a31971851dffaaacb2fce173815c8