Using email tempate for custom messages

I don't think this condition is necessary. There aren't any in use, but getting rid of this would allow an inline message to to include them when calling the message() function. We could keep the MESSAGE_ID in here though