fix Mailbox migration patch
Merge pull request #2418 from pdvyas/fix-patch

fix Mailbox migration patch