Use MessageDeliveryModeStrategy

Here are fixes that I missed introducing MessageDeliveryModeStrategy