Merge pull request #104 from azul/bugfix/security-tweaks

Bugfix/security tweaks
preview without tags for message displays - fixes #6743