Merge "Removed some UI provider code from EmailProvider"