Merge remote-tracking branch 'origin/main' into feature/scheduled-send

# Conflicts:
#	app/[locale]/page.tsx
#	components/email/email-composer.tsx
#	components/email/email-viewer.tsx
This commit is contained in:
Lucas Gaitzsch
2026-05-07 18:01:41 +02:00
120 changed files with 7033 additions and 4882 deletions
-2
View File
@@ -192,7 +192,6 @@ interface SettingsState {
// Email Display
disableThreading: boolean; // Show emails as individual messages instead of grouped by conversation
// Experimental
senderFavicons: boolean;
showAvatarsInJunk: boolean; // Show profile images/favicons in the junk folder
@@ -346,7 +345,6 @@ const DEFAULT_SETTINGS = {
// Email Display
disableThreading: false,
// Experimental
senderFavicons: true,
showAvatarsInJunk: false,