Fix #484 Fix #501 - Add message header and border radius variable

See #484 and #501 for details.