Fix messages and strip html tags if needed.
Merge pull request #6351 from openscholar/6346

Fix messages and strip html tags if needed.