diff --git a/mailhog/data/message.go b/mailhog/data/message.go
index 3e093e3..75edea1 100644
--- a/mailhog/data/message.go
+++ b/mailhog/data/message.go
@@ -144,7 +144,7 @@ func ContentFromString(data string) *Content {
 		hdrs := strings.Split(headers, "\r\n")
 		var lastHdr = ""
 		for _, hdr := range hdrs {
-			if lastHdr != "" && strings.HasPrefix(hdr, " ") {
+			if lastHdr != "" && (strings.HasPrefix(hdr, " ") || strings.HasPrefix(hdr, "\t")) {
 				h[lastHdr][len(h[lastHdr])-1] = h[lastHdr][len(h[lastHdr])-1] + hdr
 			} else if strings.Contains(hdr, ": ") {
 				y := strings.SplitN(hdr, ": ", 2)