Fix "repeat" handling - take 3 (take rich vs. plain text into account)