Bug 871990 - Make multi-line messages show up as a single line - r=gnarf

Closes gh-9934