diff --git a/dev/Mime/Parser.js b/dev/Mime/Parser.js
index 7d037b054..ce4ef3040 100644
--- a/dev/Mime/Parser.js
+++ b/dev/Mime/Parser.js
@@ -75,9 +75,18 @@ export function ParseMime(text)
 		get raw() {
 			return text.slice(this.start, this.end);
 		}
-
+/*
 		get headRaw() {
-			return Object.keys(this.headers || {}).length ? text.slice(this.start, this.bodyStart) : '';
+			return this.hasHeader ? text.slice(this.start, this.bodyStart) : '';
+		}
+*/
+		get hasHeader() {
+			for (const prop in this.headers) {
+				if (Object.hasOwn(this.headers, prop)) {
+					return true;
+				}
+			}
+			return false;
 		}
 
 		get bodyRaw() {
diff --git a/dev/Mime/Utils.js b/dev/Mime/Utils.js
index 6770589f2..70d76ecf8 100644
--- a/dev/Mime/Utils.js
+++ b/dev/Mime/Utils.js
@@ -13,7 +13,7 @@ import { EmailModel } from 'Model/Email';
 export function MimeToMessage(data, message)
 {
 	const struct = ParseMime(data);
-	if (struct.headRaw) {
+	if (struct.hasHeader) {
 		let html = struct.getByContentType('text/html'),
 			subject = struct.headerValue('subject');
 		html = html ? html.body : '';