#11116: roll back on error during add so mailbox isn't left corrupted.
3 files changed