fixing mailbox structure