Issue #3390942 by bohart, Abyss: Replaced reroute_email logic from procedural style to plugin-manageable.