Improvements to BPM email message