Updated/New Composer support for Message

See diff for full changes