Small fixes into mailer.