fix mailbox creation