MESSAGE token issues

The MESSAGE token as it stands is a concatenation of the alert subject and alert message (custom or otherwise).  Please add those elements separately, for example. MESSAGESUBJ and MESSAGEBODY.  I h...