Allow filtering of preview $message
Merge pull request #1489 from sumobi/master

Allow filtering of preview $message