fixed XSS vulnerability

fixed XSS vulnerability escaping pseudo and message text
Merge remote-tracking branch 'creativo/master'