Change mailboax -> mailbox at remaining places