Merge "Enable use of plain text body for quoted text"