*5568* Fixed entities for emailed content