Feature/repair mailbox