Fix mailbox persistence bug