Message delivery state implementation start
Important delivery status fixes