Prioritize thread_id over message_id