Push fallback per mailbox, rather than for entire account

* Also cleanup code, add comments, remove unused methods
4 files changed