Move message keys to the request (not set on gateway)