New presentation of email notification settings per requirements

We have a new shorter header and add labels for the two options.

Change-Id: If63720afe35f2edfa90b2c74d93fe355abd5da61
Merge "New presentation of email notification settings per requirements"