Merge three separate patches that all modify internal/mail/router.go into one combined patch to avoid patch ordering conflicts. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>