src-advisory/SRCmail
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: render plain-text-only emails as text, not HTML

Browse Source
This commit is contained in:
Linus Rath
2026-05-07 17:49:39 +02:00
parent cd363b4840
commit e7e78072d4
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/email/email-viewer.tsx
+17 -10
View File
@@ -2294,17 +2294,24 @@ export function EmailViewer({
if (email.htmlBody?.[0]?.partId && email.bodyValues[email.htmlBody[0].partId]) { if (email.htmlBody?.[0]?.partId && email.bodyValues[email.htmlBody[0].partId]) {
htmlContent = email.bodyValues[email.htmlBody[0].partId].value; htmlContent = email.bodyValues[email.htmlBody[0].partId].value;
// Prefer textBody when HTML is auto-generated minimal wrapper (no rich formatting). // Per RFC 8621 § 4.1.4, when a message has only one alternative the server
// Server-generated HTML from text/plain emails often lacks <br> tags, collapsing newlines. // exposes the same part in both htmlBody and textBody. The shared part may
// Per RFC 8621, an HTML-only email exposes the same partId in both htmlBody and textBody — // actually be text/plain (plain-text-only mail) — rendering that as HTML
// in that case there is no real plain-text alternative, so always render the HTML. // collapses newlines and skips linkification, so route by the part's type.
const textPartId = email.textBody?.[0]?.partId; const htmlPart = email.htmlBody[0];
const htmlPartId = email.htmlBody[0].partId; if (htmlPart.type && htmlPart.type.toLowerCase() !== 'text/html') {
const hasDistinctTextBody = !!textPartId && textPartId !== htmlPartId && !!email.bodyValues[textPartId]; useHtmlVersion = false;
if (hasDistinctTextBody && htmlContent) {
useHtmlVersion = hasMeaningfulHtmlBody(htmlContent);
} else { } else {
useHtmlVersion = !!htmlContent; // Prefer textBody when HTML is auto-generated minimal wrapper (no rich formatting).
// Server-generated HTML from text/plain emails often lacks <br> tags, collapsing newlines.
const textPartId = email.textBody?.[0]?.partId;
const htmlPartId = htmlPart.partId;
const hasDistinctTextBody = !!textPartId && textPartId !== htmlPartId && !!email.bodyValues[textPartId];
if (hasDistinctTextBody && htmlContent) {
useHtmlVersion = hasMeaningfulHtmlBody(htmlContent);
} else {
useHtmlVersion = !!htmlContent;
}
} }
} }