Added basic mailbox features, untested as of yet