fixup message selections