Small logic change to make it easier to manually retry failed messages, with stuff like the re receive message service