Fix persistence
Merge branch 'master' of https://github.com/fmonniot/mailbox