Mob 1532

@nandy-andy @RafLeszczynski @rogatty Please, review ;) DO NOT MERGE JUST YET
We can escape those two messages `wfMessage( '...' )->escape()`