Fixed message reply issue