GH81: Implement helper for custom messages

Reviewed and approved. Merged to master