Merge pull request #1488 from sumobi/master

Fix: typos
Allow filtering of preview $message