Merge change 25459 into eclair

* changes:
  Fix sort order of MailboxList