Fix reply & thread wikitext parsing

Change-Id: I1c6952ff9b8e2230542b75b016e38b29d9e07536