Added: Events for mail catch-all
Refactoring +++
(cherry picked from commit 14536d5)
(cherry picked from commit 4a164e1)