SPEED-21 New: add email render