Added Mailbox to MANIFEST, fixed minor bug in Mailbox cleanup