Fixed some performance issues on mailbox/contact change