added mailbox support