Add icons and modified the e-mail view.