mv the delivery into a MessageSender service
small change to how we decide if a message is active?