Fix ESI detection for message block