UnifiedEmail: Improve string

Change-Id: Ida9bb8d98da10612b0110f9b6d0a36bf6a9efaa6
Merge remote-tracking branch 'cm/cm-11.0' into HEAD