Fix issue with drop down list ordering when composing Personal Message.
Merge branch 'master' into MNF