When converting a plain text message to HTML, don't use <pre>

Honor whitespace but allow lines to wrap using CSS.  Otherwise long unbroken
lines are mailed out and horizontal scrolling is required.
Merge branch '4.2/plain-text-in-html-mail' into 4.2-trunk