no need to sync every individual envelope we write during the SMTP transaction,
we only need to sync when we commit
Merge branch 'master' into portable