Adjusted templates to account for a different display on the live version.
Adjusted mail sender names and subjects for consistency.