Updated example to new Mail system