Fix mailbox class
Dont need that