Refactor email css so that we don't need the extra span