Further work on email responsivness update