Revert "mutt: Remove mailbox change macros in favour of two tmux windows"

This reverts commit e0ac49b2c7337f4415535f1084627790b60c16c6.
Merge remote-tracking branch 'origin/master' into mac