few changes in mailbox