mailer test, little improves and fixes