I don't know if you still care, but I found this solution:
With the above shortcuts (or with the sidebar) you will find that changing folders (with c by default) is not contextual, i.e. it will not list the folders of the current mailbox, but of the one used the last time you changed folders. To make the behaviour more contextual, the trick is to press = or + for current mailbox. You can automate this with the following macro:
macro index 'c' '<change-folder>?<change-dir><home>^K=<enter>'
See the website: https://wiki.archlinux.org/index.php/Mutt