Skip to content

fix: keep sent message/rfc822 attachment visible after inline unwrapping #704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
guisea wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −6
Open

fix: keep sent message/rfc822 attachment visible after inline unwrapping #704

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions components/email/email-viewer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,7 +847,6 @@ export function EmailViewer({
const [embeddedEmailHtml, setEmbeddedEmailHtml] = useState<string | null>(null);
const [embeddedEmailText, setEmbeddedEmailText] = useState<string | null>(null);
const [embeddedEmailAttachments, setEmbeddedEmailAttachments] = useState<PostalMimeAttachment[]>([]);
const [embeddedEmailUnwrapped, setEmbeddedEmailUnwrapped] = useState(false);

// Plugin detail sidebar state. Collapsed/width persist across opens and
// sessions so the panel reopens the way the user last left it.
Expand Down Expand Up @@ -1155,7 +1154,6 @@ export function EmailViewer({
setEmbeddedEmailHtml(null);
setEmbeddedEmailText(null);
setEmbeddedEmailAttachments([]);
setEmbeddedEmailUnwrapped(false);
}, [email?.id, externalContentPolicy]);

// Crypto-plugin body takeover (S/MIME, PGP, …). A privileged crypto plugin
Expand Down Expand Up @@ -1389,7 +1387,6 @@ export function EmailViewer({
a => (a.filename || 'unnamed') + ' (' + a.mimeType + ')'
).join(', '));
}
setEmbeddedEmailUnwrapped(true);
debug.groupEnd();
} catch (err) {
debug.error('Embedded RFC822 unwrapping failed:', err);
Expand Down Expand Up @@ -1488,8 +1485,9 @@ export function EmailViewer({
const jmapAttachments = (email?.attachments ?? [])
// Hide winmail.dat when we have successfully extracted TNEF content or attachments
.filter(att => !(tnefHtml || tnefText || tnefAttachments.length > 0) || !isTnefAttachment(att.name, att.type))
// Hide message/rfc822 when we have unwrapped the embedded email
.filter(att => !embeddedEmailUnwrapped || att.type !== 'message/rfc822')
// Keep the message/rfc822 attachment itself visible in the attachment list even
// when we've unwrapped it for inline preview - it's a real, downloadable
// attachment (e.g. "Forward as attachment" sends), not just preview scaffolding.
// Hide calendar MIME parts (text/calendar, application/ics) when the invitation
// banner is shown - prevents raw ICS files appearing as spurious attachments.
.filter(att => !hasCalInvitation || !isCalendarMimeType(att.type))
Expand Down Expand Up @@ -1534,7 +1532,7 @@ export function EmailViewer({
// attachment list — and its downstream layout measurement — on every email
// field change.
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [email?.attachments, pluginRenderedAttachments, tnefHtml, tnefText, tnefAttachments, embeddedEmailUnwrapped, embeddedEmailAttachments, calendarInvitationParsingEnabled, hideInlineImageAttachments]);
}, [email?.attachments, pluginRenderedAttachments, tnefHtml, tnefText, tnefAttachments, embeddedEmailAttachments, calendarInvitationParsingEnabled, hideInlineImageAttachments]);

// Measure attachment chips in the below-header row to determine how many fit
// on a single line; the rest collapse into a "+N attachments" overflow pill.
Expand Down