adding device to delivery message for better parsing