Better fix for #11425

Fixes sorting of special mailbox names