Wrap messages in container so repeat works fine