Improve "emails" view