Modify delay handling of rotating messages