More changes around moving messages from one queue to another