Minor changes in email template and subject