More work on transactional emails