Layout for email screen upgraded