Email layout/bug fixes