fix Mailbox migration patch