Small improvements in mailer.