Retaining Original Message on Endpoint Incident