back out changes to all calls of user.name, add user.salutation_name method; add custom_message_suffix for a custom message that follows the standard block in email template