Updated grammar to be more tolerant of multi line messages.