diff --git a/log/format.go b/log/format.go
index 6c78d6da7e40..4fe163247d35 100644
--- a/log/format.go
+++ b/log/format.go
@@ -492,8 +492,8 @@ func escapeString(s string) string {
 func escapeMessage(s string) string {
 	needsQuoting := false
 	for _, r := range s {
-		// Carriage return and Line feed are ok
-		if r == 0xa || r == 0xd {
+		// Allow CR/LF/TAB. This is to make multi-line messages work.
+		if r == '\r' || r == '\n' || r == '\t' {
 			continue
 		}
 		// We quote everything below <space> (0x20) and above~ (0x7E),