JOJ25: Make emails better formatted