Include message id in response