This would also simplify the calling code since creating and iterating over ```messages_with_sync``` is no longer needed, i.e. we only need to iterator over ```messages```.