Update EMAIL_SUBJECTS to also work if used in the subject line