Fix mixed use of message ID list (#2859)