Mail events before/after

Related to this issue #1682