Include mailbox check and minor corrections.