Fix exipick for new message-id format