Untabify
Publish delivery receipts to queue. Prove of concept
Merge with master