Commit 960afab4 changed URL generation to preserve the data originally
in the mailbox URL, to fix some internal comparison problems.

Unfortunately, it also affected header and body cache generation.
Since those could easily be shared across multi-muttrc situations,
it's important the username be part of the pathname.

Thanks to exg on the #mutt IRC channel for reporting the regression!