Adding repeat message to correct template