MSINM-89: Improve message manager history selection