diff --git a/eml_test.go b/eml_test.go
index 83e26ab..e94d07c 100644
--- a/eml_test.go
+++ b/eml_test.go
@@ -10,30 +10,69 @@ import (
 )
 
 const (
-	exampleMailPlainNoEnc = `Date: Thu, 14 Sep 2023 14:35:28 +0200
+	exampleMailPlainNoEnc = `Date: Wed, 01 Nov 2023 00:00:00 +0000
 MIME-Version: 1.0
-Message-ID:
- <1305604950.683004066175.AAAAAAAAaaaaaaaaB@test.com>
-Subject: Example mail Plain text no Encoding
-User-Agent: go-mail v0.3.9 // https://github.com/wneessen/go-mail
-X-Mailer: go-mail v0.3.8 // https://github.com/wneessen/go-mail
+Message-ID: <1305604950.683004066175.AAAAAAAAaaaaaaaaB@go-mail.dev>
+Subject: Example mail // plain text without encoding
+User-Agent: go-mail v0.4.0 // https://github.com/wneessen/go-mail
+X-Mailer: go-mail v0.4.0 // https://github.com/wneessen/go-mail
 From: "Toni Tester" <go-mail@go-mail.dev>
-To: "Go Mail" <go-mail+test@go-mail.dev>
-Cc: Second Recipient <recipient@test.com>
-Bcc: "Invisible User" <bcc@bcc.de>
+To: <go-mail+test@go-mail.dev>
+Cc: <go-mail+cc@go-mail.dev>
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
 Dear Customer,
 
-This is a test mail. Please do not reply to this.
+This is a test mail. Please do not reply to this. Also this line is very long so it
+should be wrapped.
 
 
 Thank your for your business!
 The go-mail team
 
--- 
+--
 This is a signature`
+	exampleMailPlainQP = `Date: Wed, 01 Nov 2023 00:00:00 +0000
+MIME-Version: 1.0
+Message-ID: <1305604950.683004066175.AAAAAAAAaaaaaaaaB@go-mail.dev>
+Subject: Example mail // plain text quoted-printable
+User-Agent: go-mail v0.4.0 // https://github.com/wneessen/go-mail
+X-Mailer: go-mail v0.4.0 // https://github.com/wneessen/go-mail
+From: "Toni Tester" <go-mail@go-mail.dev>
+To: <go-mail+test@go-mail.dev>
+Cc: <go-mail+cc@go-mail.dev>
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+
+Dear Customer,
+
+This is a test mail. Please do not reply to this. Also this line is very lo=
+ng so it
+should be wrapped.
+
+
+Thank your for your business!
+The go-mail team
+
+--
+This is a signature`
+	exampleMailPlainB64 = `Date: Wed, 01 Nov 2023 00:00:00 +0000
+MIME-Version: 1.0
+Message-ID: <1305604950.683004066175.AAAAAAAAaaaaaaaaB@go-mail.dev>
+Subject: Example mail // plain text base64
+User-Agent: go-mail v0.4.0 // https://github.com/wneessen/go-mail
+X-Mailer: go-mail v0.4.0 // https://github.com/wneessen/go-mail
+From: "Toni Tester" <go-mail@go-mail.dev>
+To: <go-mail+test@go-mail.dev>
+Cc: <go-mail+cc@go-mail.dev>
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: base64
+
+RGVhciBDdXN0b21lciwKClRoaXMgaXMgYSB0ZXN0IG1haWwuIFBsZWFzZSBkbyBub3QgcmVwbHkg
+dG8gdGhpcy4gQWxzbyB0aGlzIGxpbmUgaXMgdmVyeSBsb25nIHNvIGl0CnNob3VsZCBiZSB3cmFw
+cGVkLgoKClRoYW5rIHlvdXIgZm9yIHlvdXIgYnVzaW5lc3MhClRoZSBnby1tYWlsIHRlYW0KCi0t
+ClRoaXMgaXMgYSBzaWduYXR1cmU=`
 )
 
 func TestEMLToMsgFromString(t *testing.T) {
@@ -45,7 +84,15 @@ func TestEMLToMsgFromString(t *testing.T) {
 	}{
 		{
 			"Plain text no encoding", exampleMailPlainNoEnc, "8bit",
-			"Example mail Plain text no Encoding",
+			"Example mail // plain text without encoding",
+		},
+		{
+			"Plain text quoted-printable", exampleMailPlainQP, "quoted-printable",
+			"Example mail // plain text quoted-printable",
+		},
+		{
+			"Plain text base64", exampleMailPlainB64, "base64",
+			"Example mail // plain text base64",
 		},
 	}
 	for _, tt := range tests {