Rebuild for messages in gerund