Follow-ups

Fix
* Always "deliveryStatus: success" for "delivery: received"
* Change "deliveryStatus: sent" to "deliveryStatus: success" for "delivery: sent"