Minor modifications in email template and subjects