Several fixes to improve s4sync, specially when zarafa and mail installed