merge in changes from mailer