domma-cms 1.6.35 → 1.6.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "domma-cms",
-  "version": "1.6.35",
+  "version": "1.6.37",
   "description": "File-based CMS powered by Domma and Fastify. Run npx domma-cms my-site to create a new project.",
   "type": "module",
   "main": "server/server.js",

package/plugins/_lib/admin/mail/compose-window.js

@@ -664,6 +664,7 @@ export function openCompose({
             html,
             inReplyTo: draft.inReplyTo ?? null,
             references: draft.references ?? [],
+            sourceMessage: draft.sourceMessage ?? null,
             attachments: attachments.peek().map(({filename, contentType, content}) =>
                 ({filename, contentType, content}))
         };
@@ -789,6 +790,9 @@ export function openCompose({
                         : 'Sent. No copy could be filed in Sent.',
                     {type: result.filedTo ? 'success' : 'warning'}
                 );
+                if (result.messageAction && !result.messageAction.recorded) {
+                    E.toast('Sent, but the original message could not be marked as replied to or forwarded.', {type: 'warning'});
+                }
                 onSent(result);
             }
         } catch (err) {

package/plugins/_lib/admin/mail/mail.css

@@ -1 +1 @@
-#view-container.mail-fullbleed{max-width:none}.mail-layout [hidden],.dm-slideover [hidden]{display:none!important}.mail-reader-summary{display:flex;align-items:baseline;gap:.5rem;flex-wrap:wrap}.mail-header-toggle,.mail-extras-toggle{padding:0!important;font-size:.78rem;opacity:.75;text-decoration:underline}.mail-header-toggle:hover,.mail-extras-toggle:hover{opacity:1}.mail-header-details{display:grid;grid-template-columns:max-content 1fr;gap:.15rem .75rem;margin:.5rem 0 0;font-size:.8rem}.mail-header-details dt{opacity:.65}.mail-header-details dd{margin:0;overflow-wrap:anywhere}.mail-layout{display:grid;grid-template-columns:var(--mail-col-1, 190px) auto var(--mail-col-2, 340px) auto 1fr;height:calc(100vh - 140px);min-height:320px;border:1px solid var(--dm-border, #e2e8f0);border-radius:var(--dm-radius-md, 8px);overflow:hidden;background:var(--dm-surface, #fff)}.mail-folders-pane,.mail-list-pane{display:flex;flex-direction:column;border-right:1px solid var(--dm-border, #e2e8f0);min-width:0;min-height:0}.mail-reader-pane{display:flex;flex-direction:column;min-width:0;min-height:0}.mail-pane-head{display:flex;align-items:center;justify-content:space-between;gap:.5rem;padding:.5rem .75rem;font-size:.8rem;font-weight:600;text-transform:uppercase;letter-spacing:.04em;color:var(--dm-text-muted, #64748b);border-bottom:1px solid var(--dm-border, #e2e8f0);flex-shrink:0}.mail-folders-list,.mail-list{overflow-y:auto;flex:1;min-height:0}.mail-search{display:flex;align-items:center;gap:.4rem;padding:.4rem .6rem;border-bottom:1px solid var(--dm-border, #e2e8f0);color:var(--dm-text-muted, #64748b);flex-shrink:0}.mail-search input{flex:1;min-width:0;font-size:.85rem;padding:.25rem .4rem}.mail-search-note{padding:.3rem .6rem;font-size:.74rem;color:var(--dm-text-muted, #64748b);border-bottom:1px solid var(--dm-border, #e2e8f0);flex-shrink:0}.mail-slideover-resizer{padding:0;position:absolute;left:0;top:0;bottom:0;width:6px;cursor:col-resize;z-index:2;background:transparent}.mail-slideover-resizer:hover,.is-resizing>.mail-slideover-resizer{background:var(--dm-primary, #2563eb);opacity:.7}.is-resizing{user-select:none;transition:none!important}.mail-selection{display:flex;align-items:center;gap:.35rem;flex-wrap:wrap;padding:.35rem .6rem;font-size:.78rem;background:var(--dm-primary, #2563eb);color:var(--dm-primary-text, #fff);flex-shrink:0}.mail-selection span{flex:1;min-width:0}.mail-selection .btn{color:var(--dm-primary-text, #fff);border:1px solid currentColor;background:transparent}.mail-selection .btn:hover{background:color-mix(in srgb,var(--dm-primary-text, #fff) 15%,transparent)}.mail-item.is-selected{background:var(--dm-active-bg, rgba(15, 23, 42, .07));box-shadow:inset 3px 0 0 var(--dm-primary, #2563eb)}.mail-undo{display:flex;align-items:center;gap:.5rem;padding:.4rem .6rem;font-size:.78rem;background:var(--dm-active-bg, rgba(15, 23, 42, .07));border-bottom:1px solid var(--dm-border, #e2e8f0);flex-shrink:0}.mail-undo span{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.mail-splitter{width:5px;cursor:col-resize;background:var(--dm-border, #e2e8f0);flex-shrink:0;background-clip:content-box;border-left:2px solid transparent;border-right:2px solid transparent;box-sizing:content-box}.mail-splitter:hover,.mail-layout.is-resizing .mail-splitter{background-color:var(--dm-primary, #2563eb)}.mail-layout.is-resizing{user-select:none}.mail-layout.is-resizing .mail-folders-pane,.mail-layout.is-resizing .mail-list-pane,.mail-layout.is-resizing .mail-reader-pane,.mail-layout.is-resizing iframe{pointer-events:none}.mail-unread-filter{display:flex;align-items:center;gap:.3rem;font-size:.7rem;text-transform:none;letter-spacing:0;cursor:pointer;margin-left:auto;margin-right:.25rem}.mail-unread-pill{flex-shrink:0;min-width:1.15rem;padding:0 .3rem;border-radius:999px;background:var(--dm-primary, #2563eb);color:var(--dm-primary-text, #fff);font-size:.66rem;font-weight:700;line-height:1.35;text-align:center}.mail-folder.is-context .mail-folder-name{opacity:.6}.mail-account{display:flex;align-items:center;gap:.4rem;width:100%;padding:.45rem .6rem;border:none;background:var(--dm-surface, #fff);cursor:pointer;text-align:left;font-size:.78rem;font-weight:700;text-transform:uppercase;letter-spacing:.03em;color:var(--dm-text-muted, #64748b)}.mail-account:hover{background:var(--dm-hover-bg, rgba(15, 23, 42, .04))}.mail-account.is-active{color:var(--dm-text, #1e293b);position:sticky;top:0;z-index:1;background:var(--dm-surface, #fff)}.mail-account-name{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.mail-folder{display:flex;align-items:center;gap:.5rem;padding:.45rem .75rem;font-size:.875rem;cursor:pointer;border:none;background:none;width:100%;text-align:left;color:var(--dm-text, #1e293b)}.mail-folder:hover{background:var(--dm-hover-bg, rgba(15, 23, 42, .04))}.mail-folder.is-active{background:var(--dm-active-bg, rgba(15, 23, 42, .07));color:var(--dm-primary, #2563eb);font-weight:600}.mail-folder.is-unselectable{opacity:.6;cursor:default}.mail-folder.is-unselectable:hover{background:none}.mail-folder-name{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.mail-item{display:block;width:100%;text-align:left;padding:.55rem .75rem;border:none;border-bottom:1px solid var(--dm-border, #e2e8f0);background:none;cursor:pointer;color:var(--dm-text, #1e293b)}.mail-item:hover{background:var(--dm-hover-bg, rgba(15, 23, 42, .04))}.mail-item.is-active{background:var(--dm-active-bg, rgba(15, 23, 42, .07))}.mail-item-top{display:flex;justify-content:space-between;gap:.5rem;align-items:baseline}.mail-item-from{font-size:.85rem;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.mail-item.is-unread .mail-item-from,.mail-item.is-unread .mail-item-subject{font-weight:700}.mail-item-date{font-size:.72rem;color:var(--dm-text-muted, #64748b);flex-shrink:0}.mail-item-subject{font-size:.82rem;margin-top:.1rem;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.mail-item-meta{display:flex;align-items:center;gap:.35rem;margin-top:.15rem;color:var(--dm-text-muted, #64748b)}.mail-pager{display:flex;align-items:center;justify-content:space-between;gap:.5rem;padding:.4rem .6rem;border-top:1px solid var(--dm-border, #e2e8f0);font-size:.75rem;color:var(--dm-text-muted, #64748b);flex-shrink:0}.mail-reader-head{padding:.75rem 1rem;border-bottom:1px solid var(--dm-border, #e2e8f0);flex-shrink:0}.mail-reader-head:empty{display:none}.mail-reader-subject{font-size:1.05rem;font-weight:600;margin:0 0 .3rem;color:var(--dm-text, #1e293b)}.mail-reader-actions{display:flex;gap:.25rem;margin:.1rem 0 .35rem;flex-wrap:wrap}.mail-reader-meta{font-size:.8rem;color:var(--dm-text-muted, #64748b)}.mail-reader-body{flex:1;position:relative;overflow:hidden;display:flex;flex-direction:column;min-height:0;background:var(--dm-surface, #fff)}.mail-reader-body iframe{width:100%;flex:1;border:none;display:block;background:#fff}.mail-notice{display:flex;align-items:center;gap:.5rem;flex-wrap:wrap;padding:.4rem .75rem;font-size:.78rem;background:var(--dm-warning, #8a6d1f);color:var(--dm-warning-text, #fff);border-bottom:1px solid var(--dm-border, #e2e8f0)}.mail-notice .btn{color:var(--dm-warning-text, #fff);border:1px solid currentColor;background:transparent;opacity:.95}.mail-notice .btn:hover{background:color-mix(in srgb,var(--dm-warning-text, #fff) 15%,transparent);opacity:1}.mail-attachments{display:flex;flex-wrap:wrap;gap:.4rem;padding:.5rem .75rem;border-bottom:1px solid var(--dm-border, #e2e8f0);background:var(--dm-background-alt, rgba(15, 23, 42, .03))}.mail-empty{display:flex;flex-direction:column;align-items:center;justify-content:center;gap:.5rem;height:100%;color:var(--dm-text-muted, #94a3b8);text-align:center;padding:1rem}.mail-empty p{margin:0;font-size:.875rem}@media(max-width:900px){.mail-layout{grid-template-columns:1fr;height:auto!important}.mail-splitter{display:none}.mail-folders-pane,.mail-list-pane{border-right:none;border-bottom:1px solid var(--dm-border, #e2e8f0)}.mail-folders-list,.mail-list{max-height:240px}.mail-reader-body{min-height:60vh}}.mail-box-row{display:flex;align-items:center;gap:.5rem;padding:.5rem .6rem;border:1px solid var(--dm-border, #e2e8f0);border-radius:var(--dm-radius-md, 6px)}.mail-default-badge{margin-left:.4rem;font-size:.7rem;font-weight:500;vertical-align:middle}.mail-item.is-dragging{opacity:.45}.mail-folder.is-drop-target{background:var(--dm-primary, #2563eb);color:var(--dm-primary-text, #fff);outline:2px solid var(--dm-primary, #2563eb);outline-offset:-2px}.mail-folder.is-drop-target .mail-folder-name,.mail-folder.is-drop-target .mail-unread-pill{color:inherit}.mail-item.is-dragging *{pointer-events:none}.mail-item{position:relative}.mail-item-tick{position:absolute;left:.45rem;top:.55rem;display:inline-flex;opacity:0;color:var(--dm-text-muted, #64748b);transition:opacity .12s ease;padding:2px;margin:-2px;border-radius:var(--dm-radius-sm, 3px)}.mail-item:hover .mail-item-tick,.mail-item:focus-visible .mail-item-tick,.mail-list.is-selecting .mail-item-tick,.mail-item-tick[aria-checked=true]{opacity:1}.mail-item-tick[aria-checked=true]{color:var(--dm-primary, #2563eb)}.mail-item-tick:hover{color:var(--dm-primary, #2563eb);background:var(--dm-hover-bg)}.mail-item-top,.mail-item-subject,.mail-item-meta{padding-left:1.5rem}.mail-select-all{display:inline-flex;align-items:center;margin-right:.1rem;cursor:pointer}.mail-select-all input{cursor:pointer;margin:0}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);white-space:nowrap;border:0}.mail-item-meta>span{display:inline-flex}.mail-item-meta .is-high{color:var(--dm-danger, #dc2626)}.mail-item-meta .is-low{color:var(--dm-text-muted, #64748b);opacity:.7}.mail-folder.is-hidden-folder .mail-folder-name{opacity:.5;font-style:italic}.mail-thread-chip{display:inline-flex;align-items:center;margin-left:.4rem;padding:0 .35rem;border-radius:999px;font-size:.68rem;font-weight:700;line-height:1.5;color:var(--dm-text-muted, #64748b);background:var(--dm-active-bg, rgba(15, 23, 42, .07));cursor:pointer}.mail-thread-chip:hover{color:var(--dm-primary, #2563eb)}.mail-thread-chip.is-unread{background:var(--dm-primary, #2563eb);color:var(--dm-primary-text, #fff)}.mail-item.is-in-thread{padding-left:1.6rem;box-shadow:inset 3px 0 0 var(--dm-border, #e2e8f0)}.mail-item.is-in-thread .mail-item-from{font-size:.8rem}.mail-pane-head .btn.is-on{color:var(--dm-primary, #2563eb);background:var(--dm-active-bg, rgba(15, 23, 42, .07))}#mail-outbox-btn{font-size:.72rem;font-weight:700}#mail-outbox-btn.is-failed{color:var(--dm-danger, #dc2626)}.mail-attachment{display:inline-flex;align-items:center;border:1px solid var(--dm-border, #e2e8f0);border-radius:var(--dm-radius-md, 6px);overflow:hidden}.mail-attachment .btn{border:none;border-radius:0}.mail-attachment-save{padding-left:.4rem!important;padding-right:.4rem!important;border-left:1px solid var(--dm-border, #e2e8f0)!important;opacity:.7}.mail-attachment-save:hover{opacity:1;color:var(--dm-primary, #2563eb)}.mail-section-heading{margin:1rem 0 .1rem;font-size:.8rem;text-transform:uppercase;letter-spacing:.04em;color:var(--dm-text-muted, #64748b)}.mail-section-heading:first-child{margin-top:.25rem}.mail-section-form .domma-form{margin:0}.mail-section-form .domma-form-field:last-child{margin-bottom:0}.mail-item-card{margin:0}.mail-item-card .card-header{padding:.5rem .6rem}.mail-item-card .card-body{padding:.6rem}.mail-ellipsis{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;min-width:0}.mail-status{min-height:1.2em}.mail-empty-line{margin:.25rem 0}.mail-editor-fallback{min-height:8rem;font-family:inherit;resize:vertical}.mail-clause{display:flex;gap:.3rem;align-items:center;flex-wrap:wrap}.mail-clause .form-select,.mail-clause .form-input{width:auto;flex:0 1 auto}.mail-clause .mail-clause-value{flex:1 1 8rem;min-width:8rem}.mail-section-list{display:flex;flex-direction:column;gap:.5rem}.mail-scroll-sm{max-height:20vh;overflow-y:auto}.mail-scroll-md{max-height:46vh;overflow-y:auto}.mail-section-form .domma-form-field:has(select) .form-label .text-danger{display:none}.mail-compose-form{padding:.25rem 0 .5rem;display:flex;flex-direction:column;gap:.6rem;height:100%}.mail-compose-body{display:flex;flex-direction:column;flex:1;min-height:0}.mail-compose-editor{flex:1;min-height:0}.mail-compose-textarea{flex:1;min-height:34vh;font-family:inherit;resize:vertical}.mail-attach-list{display:flex;flex-direction:column;gap:.2rem}.mail-template-row{margin:-.15rem 0 .35rem}.mail-template-picker{max-width:16rem}.mail-suggest-row{display:flex;flex-direction:column;line-height:1.25}.mail-suggest-detail{opacity:.7}.mail-rule-off{opacity:.55}.mail-panel{padding:.25rem 0 .5rem}.mail-panel-stack{padding:.25rem 0 .5rem;display:flex;flex-direction:column;gap:1rem}.mail-form-stack{padding:.25rem 0 .5rem;display:flex;flex-direction:column;gap:.75rem}.mail-dialog-stack{display:flex;flex-direction:column;gap:.5rem;padding:.25rem 0}.mail-hint{margin-top:.2rem}.mail-box-sub{overflow:hidden;text-overflow:ellipsis}.mail-add-btn{align-self:flex-start;margin-top:.5rem}.mail-none{margin:0;padding:.5rem .6rem}.mail-kv{padding:.5rem 0;display:flex;flex-direction:column;gap:.35rem}.mail-kv-row{display:flex;gap:.75rem}.mail-kv-key{min-width:8.5rem;flex-shrink:0}.mail-toggle-row{display:flex;align-items:center;gap:.5rem;margin-bottom:.75rem}.mail-sender-list{display:flex;flex-direction:column;gap:.2rem;max-height:40vh;overflow-y:auto}.mail-folder-pick{display:flex;align-items:center;gap:.5rem;padding:.3rem .4rem;border-radius:var(--dm-radius-md, 6px)}.mail-diag-log{width:100%;height:30vh;margin-top:.5rem;font-family:monospace;font-size:.72rem}.mail-facts{display:flex;flex-direction:column;gap:.2rem;margin-bottom:.75rem}.mail-item-more{position:absolute;right:.4rem;bottom:.35rem;display:inline-flex;align-items:center;justify-content:center;min-width:1.4rem;height:1.4rem;border-radius:var(--dm-radius-sm, 3px);font-size:1rem;line-height:1;color:var(--dm-text-muted, #64748b);background:inherit;opacity:0;transition:opacity .12s ease}.mail-item:hover .mail-item-more,.mail-item:focus-visible .mail-item-more,.mail-item.is-active .mail-item-more{opacity:1}.mail-item-more:hover{color:var(--dm-primary, #2563eb)}.mail-section-intro{display:flex;align-items:center;gap:.35rem;margin:0 0 .75rem;padding-bottom:.5rem;border-bottom:1px solid var(--dm-border, #e2e8f0)}.mail-pager-middle{display:flex;align-items:center;gap:.5rem;min-width:0}.mail-page-size{font:inherit;color:inherit;background:transparent;border:1px solid var(--dm-border, #e2e8f0);border-radius:4px;padding:.1rem .25rem}
+#view-container.mail-fullbleed{max-width:none}.mail-layout [hidden],.dm-slideover [hidden]{display:none!important}.mail-reader-summary{display:flex;align-items:baseline;gap:.5rem;flex-wrap:wrap}.mail-header-toggle,.mail-extras-toggle{padding:0!important;font-size:.78rem;opacity:.75;text-decoration:underline}.mail-header-toggle:hover,.mail-extras-toggle:hover{opacity:1}.mail-header-details{display:grid;grid-template-columns:max-content 1fr;gap:.15rem .75rem;margin:.5rem 0 0;font-size:.8rem}.mail-header-details dt{opacity:.65}.mail-header-details dd{margin:0;overflow-wrap:anywhere}.mail-layout{display:grid;grid-template-columns:var(--mail-col-1, 190px) auto var(--mail-col-2, 340px) auto 1fr;height:calc(100vh - 140px);min-height:320px;border:1px solid var(--dm-border, #e2e8f0);border-radius:var(--dm-radius-md, 8px);overflow:hidden;background:var(--dm-surface, #fff)}.mail-folders-pane,.mail-list-pane{display:flex;flex-direction:column;border-right:1px solid var(--dm-border, #e2e8f0);min-width:0;min-height:0}.mail-reader-pane{display:flex;flex-direction:column;min-width:0;min-height:0}.mail-pane-head{display:flex;align-items:center;justify-content:space-between;gap:.5rem;padding:.5rem .75rem;font-size:.8rem;font-weight:600;text-transform:uppercase;letter-spacing:.04em;color:var(--dm-text-muted, #64748b);border-bottom:1px solid var(--dm-border, #e2e8f0);flex-shrink:0}.mail-folders-list,.mail-list{overflow-y:auto;flex:1;min-height:0}.mail-search{display:flex;align-items:center;gap:.4rem;padding:.4rem .6rem;border-bottom:1px solid var(--dm-border, #e2e8f0);color:var(--dm-text-muted, #64748b);flex-shrink:0}.mail-search input{flex:1;min-width:0;font-size:.85rem;padding:.25rem .4rem}.mail-search-note{padding:.3rem .6rem;font-size:.74rem;color:var(--dm-text-muted, #64748b);border-bottom:1px solid var(--dm-border, #e2e8f0);flex-shrink:0}.mail-slideover-resizer{padding:0;position:absolute;left:0;top:0;bottom:0;width:6px;cursor:col-resize;z-index:2;background:transparent}.mail-slideover-resizer:hover,.is-resizing>.mail-slideover-resizer{background:var(--dm-primary, #2563eb);opacity:.7}.is-resizing{user-select:none;transition:none!important}.mail-selection{display:flex;align-items:center;gap:.35rem;flex-wrap:wrap;padding:.35rem .6rem;font-size:.78rem;background:var(--dm-primary, #2563eb);color:var(--dm-primary-text, #fff);flex-shrink:0}.mail-selection span{flex:1;min-width:0}.mail-selection .btn{color:var(--dm-primary-text, #fff);border:1px solid currentColor;background:transparent}.mail-selection .btn:hover{background:color-mix(in srgb,var(--dm-primary-text, #fff) 15%,transparent)}.mail-item.is-selected{background:var(--dm-active-bg, rgba(15, 23, 42, .07));box-shadow:inset 3px 0 0 var(--dm-primary, #2563eb)}.mail-undo{display:flex;align-items:center;gap:.5rem;padding:.4rem .6rem;font-size:.78rem;background:var(--dm-active-bg, rgba(15, 23, 42, .07));border-bottom:1px solid var(--dm-border, #e2e8f0);flex-shrink:0}.mail-undo span{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.mail-splitter{width:5px;cursor:col-resize;background:var(--dm-border, #e2e8f0);flex-shrink:0;background-clip:content-box;border-left:2px solid transparent;border-right:2px solid transparent;box-sizing:content-box}.mail-splitter:hover,.mail-layout.is-resizing .mail-splitter{background-color:var(--dm-primary, #2563eb)}.mail-layout.is-resizing{user-select:none}.mail-layout.is-resizing .mail-folders-pane,.mail-layout.is-resizing .mail-list-pane,.mail-layout.is-resizing .mail-reader-pane,.mail-layout.is-resizing iframe{pointer-events:none}.mail-unread-filter{display:flex;align-items:center;gap:.3rem;font-size:.7rem;text-transform:none;letter-spacing:0;cursor:pointer;margin-left:auto;margin-right:.25rem}.mail-unread-pill{flex-shrink:0;min-width:1.15rem;padding:0 .3rem;border-radius:999px;background:var(--dm-primary, #2563eb);color:var(--dm-primary-text, #fff);font-size:.66rem;font-weight:700;line-height:1.35;text-align:center}.mail-folder.is-context .mail-folder-name{opacity:.6}.mail-account{display:flex;align-items:center;gap:.4rem;width:100%;padding:.45rem .6rem;border:none;background:var(--dm-surface, #fff);cursor:pointer;text-align:left;font-size:.78rem;font-weight:700;text-transform:uppercase;letter-spacing:.03em;color:var(--dm-text-muted, #64748b)}.mail-account:hover{background:var(--dm-hover-bg, rgba(15, 23, 42, .04))}.mail-account.is-active{color:var(--dm-text, #1e293b);position:sticky;top:0;z-index:1;background:var(--dm-surface, #fff)}.mail-account-name{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.mail-folder{display:flex;align-items:center;gap:.5rem;padding:.45rem .75rem;font-size:.875rem;cursor:pointer;border:none;background:none;width:100%;text-align:left;color:var(--dm-text, #1e293b)}.mail-folder:hover{background:var(--dm-hover-bg, rgba(15, 23, 42, .04))}.mail-folder.is-active{background:var(--dm-active-bg, rgba(15, 23, 42, .07));color:var(--dm-primary, #2563eb);font-weight:600}.mail-folder.is-unselectable{opacity:.6;cursor:default}.mail-folder.is-unselectable:hover{background:none}.mail-folder-name{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.mail-item{display:block;width:100%;text-align:left;padding:.55rem .75rem;border:none;border-bottom:1px solid var(--dm-border, #e2e8f0);background:none;cursor:pointer;color:var(--dm-text, #1e293b)}.mail-item:hover{background:var(--dm-hover-bg, rgba(15, 23, 42, .04))}.mail-item.is-active{background:var(--dm-active-bg, rgba(15, 23, 42, .07))}.mail-item-top{display:flex;justify-content:space-between;gap:.5rem;align-items:baseline}.mail-item-from{font-size:.85rem;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.mail-item.is-unread .mail-item-from,.mail-item.is-unread .mail-item-subject{font-weight:700}.mail-item-date{font-size:.72rem;color:var(--dm-text-muted, #64748b);flex-shrink:0}.mail-item-subject{font-size:.82rem;margin-top:.1rem;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.mail-item-meta{display:flex;align-items:center;gap:.35rem;margin-top:.15rem;color:var(--dm-text-muted, #64748b)}.mail-pager{display:flex;align-items:center;justify-content:space-between;gap:.5rem;padding:.4rem .6rem;border-top:1px solid var(--dm-border, #e2e8f0);font-size:.75rem;color:var(--dm-text-muted, #64748b);flex-shrink:0}.mail-reader-head{padding:.75rem 1rem;border-bottom:1px solid var(--dm-border, #e2e8f0);flex-shrink:0}.mail-reader-head:empty{display:none}.mail-reader-subject{font-size:1.05rem;font-weight:600;margin:0 0 .3rem;color:var(--dm-text, #1e293b)}.mail-reader-actions{display:flex;gap:.25rem;margin:.1rem 0 .35rem;flex-wrap:wrap}.mail-reader-meta{font-size:.8rem;color:var(--dm-text-muted, #64748b)}.mail-reader-body{flex:1;position:relative;overflow:hidden;display:flex;flex-direction:column;min-height:0;background:var(--dm-surface, #fff)}.mail-reader-body iframe{width:100%;flex:1;border:none;display:block;background:#fff}.mail-notice{display:flex;align-items:center;gap:.5rem;flex-wrap:wrap;padding:.4rem .75rem;font-size:.78rem;background:var(--dm-warning, #8a6d1f);color:var(--dm-warning-text, #fff);border-bottom:1px solid var(--dm-border, #e2e8f0)}.mail-notice .btn{color:var(--dm-warning-text, #fff);border:1px solid currentColor;background:transparent;opacity:.95}.mail-notice .btn:hover{background:color-mix(in srgb,var(--dm-warning-text, #fff) 15%,transparent);opacity:1}.mail-attachments{display:flex;flex-wrap:wrap;gap:.4rem;padding:.5rem .75rem;border-bottom:1px solid var(--dm-border, #e2e8f0);background:var(--dm-background-alt, rgba(15, 23, 42, .03))}.mail-empty{display:flex;flex-direction:column;align-items:center;justify-content:center;gap:.5rem;height:100%;color:var(--dm-text-muted, #94a3b8);text-align:center;padding:1rem}.mail-empty p{margin:0;font-size:.875rem}@media(max-width:900px){.mail-layout{grid-template-columns:1fr;height:auto!important}.mail-splitter{display:none}.mail-folders-pane,.mail-list-pane{border-right:none;border-bottom:1px solid var(--dm-border, #e2e8f0)}.mail-folders-list,.mail-list{max-height:240px}.mail-reader-body{min-height:60vh}}.mail-box-row{display:flex;align-items:center;gap:.5rem;padding:.5rem .6rem;border:1px solid var(--dm-border, #e2e8f0);border-radius:var(--dm-radius-md, 6px)}.mail-default-badge{margin-left:.4rem;font-size:.7rem;font-weight:500;vertical-align:middle}.mail-item.is-dragging{opacity:.45}.mail-folder.is-drop-target{background:var(--dm-primary, #2563eb);color:var(--dm-primary-text, #fff);outline:2px solid var(--dm-primary, #2563eb);outline-offset:-2px}.mail-folder.is-drop-target .mail-folder-name,.mail-folder.is-drop-target .mail-unread-pill{color:inherit}.mail-item.is-dragging *{pointer-events:none}.mail-item{position:relative}.mail-item-tick{position:absolute;left:.45rem;top:.55rem;display:inline-flex;opacity:0;color:var(--dm-text-muted, #64748b);transition:opacity .12s ease;padding:2px;margin:-2px;border-radius:var(--dm-radius-sm, 3px)}.mail-item:hover .mail-item-tick,.mail-item:focus-visible .mail-item-tick,.mail-list.is-selecting .mail-item-tick,.mail-item-tick[aria-checked=true]{opacity:1}.mail-item-tick[aria-checked=true]{color:var(--dm-primary, #2563eb)}.mail-item-tick:hover{color:var(--dm-primary, #2563eb);background:var(--dm-hover-bg)}.mail-item-top,.mail-item-subject,.mail-item-meta{padding-left:1.5rem}.mail-select-all{display:inline-flex;align-items:center;margin-right:.1rem;cursor:pointer}.mail-select-all input{cursor:pointer;margin:0}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);white-space:nowrap;border:0}.mail-item-meta>span{display:inline-flex}.mail-item-meta .is-replied{color:var(--dm-success)}.mail-item-meta .is-forwarded{color:var(--dm-info, var(--dm-primary))}.mail-item-meta .is-high{color:var(--dm-danger, #dc2626)}.mail-item-meta .is-low{color:var(--dm-text-muted, #64748b);opacity:.7}.mail-folder.is-hidden-folder .mail-folder-name{opacity:.5;font-style:italic}.mail-thread-chip{display:inline-flex;align-items:center;margin-left:.4rem;padding:0 .35rem;border-radius:999px;font-size:.68rem;font-weight:700;line-height:1.5;color:var(--dm-text-muted, #64748b);background:var(--dm-active-bg, rgba(15, 23, 42, .07));cursor:pointer}.mail-thread-chip:hover{color:var(--dm-primary, #2563eb)}.mail-thread-chip.is-unread{background:var(--dm-primary, #2563eb);color:var(--dm-primary-text, #fff)}.mail-item.is-in-thread{padding-left:1.6rem;box-shadow:inset 3px 0 0 var(--dm-border, #e2e8f0)}.mail-item.is-in-thread .mail-item-from{font-size:.8rem}.mail-pane-head .btn.is-on{color:var(--dm-primary, #2563eb);background:var(--dm-active-bg, rgba(15, 23, 42, .07))}#mail-outbox-btn{font-size:.72rem;font-weight:700}#mail-outbox-btn.is-failed{color:var(--dm-danger, #dc2626)}.mail-attachment{display:inline-flex;align-items:center;border:1px solid var(--dm-border, #e2e8f0);border-radius:var(--dm-radius-md, 6px);overflow:hidden}.mail-attachment .btn{border:none;border-radius:0}.mail-attachment-save{padding-left:.4rem!important;padding-right:.4rem!important;border-left:1px solid var(--dm-border, #e2e8f0)!important;opacity:.7}.mail-attachment-save:hover{opacity:1;color:var(--dm-primary, #2563eb)}.mail-section-heading{margin:1rem 0 .1rem;font-size:.8rem;text-transform:uppercase;letter-spacing:.04em;color:var(--dm-text-muted, #64748b)}.mail-section-heading:first-child{margin-top:.25rem}.mail-section-form .domma-form{margin:0}.mail-section-form .domma-form-field:last-child{margin-bottom:0}.mail-item-card{margin:0}.mail-item-card .card-header{padding:.5rem .6rem}.mail-item-card .card-body{padding:.6rem}.mail-ellipsis{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;min-width:0}.mail-status{min-height:1.2em}.mail-empty-line{margin:.25rem 0}.mail-editor-fallback{min-height:8rem;font-family:inherit;resize:vertical}.mail-clause{display:flex;gap:.3rem;align-items:center;flex-wrap:wrap}.mail-clause .form-select,.mail-clause .form-input{width:auto;flex:0 1 auto}.mail-clause .mail-clause-value{flex:1 1 8rem;min-width:8rem}.mail-section-list{display:flex;flex-direction:column;gap:.5rem}.mail-scroll-sm{max-height:20vh;overflow-y:auto}.mail-scroll-md{max-height:46vh;overflow-y:auto}.mail-section-form .domma-form-field:has(select) .form-label .text-danger{display:none}.mail-compose-form{padding:.25rem 0 .5rem;display:flex;flex-direction:column;gap:.6rem;height:100%}.mail-compose-body{display:flex;flex-direction:column;flex:1;min-height:0}.mail-compose-editor{flex:1;min-height:0}.mail-compose-textarea{flex:1;min-height:34vh;font-family:inherit;resize:vertical}.mail-attach-list{display:flex;flex-direction:column;gap:.2rem}.mail-template-row{margin:-.15rem 0 .35rem}.mail-template-picker{max-width:16rem}.mail-suggest-row{display:flex;flex-direction:column;line-height:1.25}.mail-suggest-detail{opacity:.7}.mail-rule-off{opacity:.55}.mail-panel{padding:.25rem 0 .5rem}.mail-panel-stack{padding:.25rem 0 .5rem;display:flex;flex-direction:column;gap:1rem}.mail-form-stack{padding:.25rem 0 .5rem;display:flex;flex-direction:column;gap:.75rem}.mail-dialog-stack{display:flex;flex-direction:column;gap:.5rem;padding:.25rem 0}.mail-hint{margin-top:.2rem}.mail-box-sub{overflow:hidden;text-overflow:ellipsis}.mail-add-btn{align-self:flex-start;margin-top:.5rem}.mail-none{margin:0;padding:.5rem .6rem}.mail-kv{padding:.5rem 0;display:flex;flex-direction:column;gap:.35rem}.mail-kv-row{display:flex;gap:.75rem}.mail-kv-key{min-width:8.5rem;flex-shrink:0}.mail-toggle-row{display:flex;align-items:center;gap:.5rem;margin-bottom:.75rem}.mail-sender-list{display:flex;flex-direction:column;gap:.2rem;max-height:40vh;overflow-y:auto}.mail-folder-pick{display:flex;align-items:center;gap:.5rem;padding:.3rem .4rem;border-radius:var(--dm-radius-md, 6px)}.mail-diag-log{width:100%;height:30vh;margin-top:.5rem;font-family:monospace;font-size:.72rem}.mail-facts{display:flex;flex-direction:column;gap:.2rem;margin-bottom:.75rem}.mail-item-more{position:absolute;right:.4rem;bottom:.35rem;display:inline-flex;align-items:center;justify-content:center;min-width:1.4rem;height:1.4rem;border-radius:var(--dm-radius-sm, 3px);font-size:1rem;line-height:1;color:var(--dm-text-muted, #64748b);background:inherit;opacity:0;transition:opacity .12s ease}.mail-item:hover .mail-item-more,.mail-item:focus-visible .mail-item-more,.mail-item.is-active .mail-item-more{opacity:1}.mail-item-more:hover{color:var(--dm-primary, #2563eb)}.mail-section-intro{display:flex;align-items:center;gap:.35rem;margin:0 0 .75rem;padding-bottom:.5rem;border-bottom:1px solid var(--dm-border, #e2e8f0)}.mail-pager-middle{display:flex;align-items:center;gap:.5rem;min-width:0}.mail-page-size{font:inherit;color:inherit;background:transparent;border:1px solid var(--dm-border, #e2e8f0);border-radius:4px;padding:.1rem .25rem}

package/plugins/_lib/admin/mail/reader-view.js

@@ -1829,7 +1829,8 @@ return {
                         // attention each time.
                         [message.priority === 'high', 'arrow-up', 'High priority', 'is-high'],
                         [message.priority === 'low', 'arrow-down', 'Low priority', 'is-low'],
-                        [flags.includes('\\Answered'), 'corner-up-left', 'Replied to', ''],
+                        [flags.includes('\\Answered') || message.repliedAt, 'corner-up-left', 'Replied to', 'is-replied'],
+                        [flags.includes('$Forwarded') || message.forwardedAt, 'corner-up-right', 'Forwarded', 'is-forwarded'],
                         [flags.includes('\\Flagged'), 'flag', 'Starred', ''],
                         [message.hasAttachment, 'paperclip', 'Has an attachment', '']
                     ]) {
@@ -4309,9 +4310,11 @@ return {
          * @returns {Promise<void>}
          */
         async function editDraft(message) {
+            const accountId = currentAccountId;
+            const profile = identitySoon();
             try {
                 const params = new URLSearchParams({
-                    account: currentAccountId ?? '',
+                    account: accountId ?? '',
                     folder: message.folder ?? openFolder ?? currentFolder,
                     mode: 'edit'
                 });
@@ -4321,7 +4324,8 @@ return {
                 // is from. What it does NOT get is a second signature -
                 // `openCompose` reads the saved UID and treats the draft as
                 // already written.
-                openCompose(composeOptions(await identitySoon(), {
+                openCompose(composeOptions(await profile, {
+                    accountId,
                     draft: result.draft,
                     mode: 'edit',
                     // Saving or sending changes which UIDs are in Drafts, so
@@ -4559,14 +4563,17 @@ return {
          * @returns {Promise<void>}
          */
         async function compose(message, mode, {quote = null} = {}) {
+            const accountId = currentAccountId;
+            const profile = identitySoon();
             try {
                 const params = new URLSearchParams({
-                    account: currentAccountId ?? '',
+                    account: accountId ?? '',
                     folder: message.folder ?? openFolder ?? currentFolder,
                     mode
                 });
                 const result = await api(`${BASE}/messages/${message.uid}/draft?${params}`);
-                openCompose(composeOptions(await identitySoon(), {
+                openCompose(composeOptions(await profile, {
+                    accountId,
                     // Quote in reply: just the selected text under the
                     // attribution line, not the whole message.
                     draft: quote ? quoteSelection(result.draft, quote) : result.draft,
@@ -5002,7 +5009,9 @@ return {
                 const result = await api(`${BASE}/messages?${params}`);
                 if (!here() || currentAccountId !== account || currentFolder !== folder ||
                     page !== 1 || searchQuery || selected.size) return;
-                const signature = rows => JSON.stringify(rows.map(m => [m.uid, m.flags]));
+                const signature = rows => JSON.stringify(rows.map(m => [
+                    m.uid, m.flags, m.repliedAt ?? null, m.forwardedAt ?? null
+                ]));
                 const snapshot = JSON.stringify([account, folder, result.total, signature(result.messages)]);
                 const changed = threadsOn
                     ? snapshot !== observedThreadPage

package/plugins/_lib/call/ice.js

@@ -6,12 +6,15 @@
  *   {
  *     "stun": ["stun:stun.l.google.com:19302"],
  *     "turn": {"urls": ["turn:turn.example.org:3478?transport=udp", "turn:turn.example.org:3478?transport=tcp"],
- *              "secret": "<coturn static-auth-secret>", "ttlHours": 12}
+ *              "secret": "<coturn static-auth-secret>", "ttlHours": 4}
  *   }
  *
  * TURN credentials are coturn's time-limited kind (use-auth-secret): the
  * username is "<expiry>:<label>" and the password an HMAC of it, so no
  * account is ever stored and a copied credential stops working on its own.
+ * The default life is 4 hours (was 12): it is made when a person is let in,
+ * and a call rarely runs longer; a shorter one limits what a leaked credential
+ * is worth as a relay.
  *
  * @module _lib/call/ice
  */
@@ -32,7 +35,7 @@ export function readCallConfig(root = process.cwd()) {
         const stun = list(raw?.stun);
         const turnUrls = list(raw?.turn?.urls);
         const secret = typeof raw?.turn?.secret === 'string' ? raw.turn.secret : '';
-        const ttlHours = Math.max(1, Math.min(48, Number(raw?.turn?.ttlHours) || 12));
+        const ttlHours = Math.max(1, Math.min(48, Number(raw?.turn?.ttlHours) || 4));
         return {stun: stun.length ? stun : DEFAULT_STUN, turn: turnUrls.length && secret ? {urls: turnUrls, secret, ttlHours} : null};
     } catch {
         return {stun: DEFAULT_STUN, turn: null};

package/plugins/_lib/call/rooms.js

@@ -132,8 +132,11 @@ export function createRooms({now = Date.now, pollMs = POLL_MS, silentMs = SILENT
         const item = quiet ? undefined : system(room, person, 'joined', `${person.name} joined`);
         tell(admitted(room).filter(p => p !== person), {type: 'joined', peer: pub(person), ...(item && {item})});
         // `chat` is the history so far (their own "joined" line included), so a late joiner sees what was said.
+        // The ICE servers (TURN credentials) come HERE, not in the join reply: a guest still waiting, or turned
+        // away, never holds a relay credential. Made at admission, so its life starts now.
+        const ice = typeof person.ice === 'function' ? person.ice() : person.ice;
         push(person, {type: 'admitted', peers: admitted(room).filter(p => p !== person).map(pub), recording: room.recording,
-            chat: room.chat.filter(c => person.seeHistory || c.seq > person.fromSeq).map(c => ({...c}))});
+            chat: room.chat.filter(c => person.seeHistory || c.seq > person.fromSeq).map(c => ({...c})), ...(ice ? {iceServers: ice} : {})});
         tell(hosts(room), {type: 'waiting', waiting: waitingList(room)});
     }
 
@@ -149,9 +152,11 @@ export function createRooms({now = Date.now, pollMs = POLL_MS, silentMs = SILENT
          *   `canInvite`: this person may use the Tool's "Add people" (routes.js decides; see member()), with
          *   `inviteOptions` (what of it). `seeHistory: false`: when let in they get only the chat from their own
          *   "joined" line on - not what was said before (someone added to a conversation's call is not shown it).
+         *   `ice`: the ICE servers for this person (an array, or a function making them) - handed over in their
+         *   `admitted` event, never before: a waiting or turned-away guest holds no TURN credential.
          */
         join(key, {name, host = false, title = '', max = MAX_PEOPLE, recordingAllowed = false, autoAdmit = false, identity = '', history, canInvite = false,
-            inviteOptions = null, seeHistory = true}) {
+            inviteOptions = null, seeHistory = true, ice = null}) {
             let room = rooms.get(key);
             if (!room) {
                 const seeded = (Array.isArray(history) ? history : []).map(cleanItem).filter(Boolean).slice(-HISTORY_MAX);
@@ -177,7 +182,8 @@ export function createRooms({now = Date.now, pollMs = POLL_MS, silentMs = SILENT
             if (admitted(room).length >= room.max && (host || autoAdmit)) throw new CallError('full', `This call is full (${room.max} people).`);
             const id = newId(9);
             const person = {id, secret: newId(24), identity: String(identity || ''), who: whoOf(identity, id), name: String(name || '').trim().slice(0, 60) || (host ? 'Host' : 'Guest'),
-                host: Boolean(host), canInvite: canInvite === true, inviteOptions, seeHistory: seeHistory !== false, fromSeq: room.chatSeq, state: 'waiting', seq: 0, queue: [], waiters: [], seen: now()};
+                host: Boolean(host), canInvite: canInvite === true, inviteOptions, seeHistory: seeHistory !== false, fromSeq: room.chatSeq, state: 'waiting', seq: 0, queue: [], waiters: [], seen: now(),
+                ice: ice || null};
             room.people.set(person.id, person);
             if (host || autoAdmit) {
                 // admit() also tells every host - this one included - who is already waiting.

package/plugins/_lib/call/routes.js

@@ -4,7 +4,7 @@
  * nothing: only a Tool that mounts this, and says who may join which room,
  * has calls.
  *
- *   POST {prefix}/:room/join       {name, ...credentials}  -> {id, secret, host, state, iceServers, ...}
+ *   POST {prefix}/:room/join       {name, ...credentials}  -> {id, secret, host, state, ...} (ICE servers come in the `admitted` event)
  *   GET  {prefix}/:room/poll?since=N                         -> {events, state}   (long-poll, 25 s)
  *   POST {prefix}/:room/signal     {to, data}
  *   POST {prefix}/:room/chat       {text}
@@ -118,12 +118,15 @@ export function mountCallRoutes(fastify, {prefix = '/call', ns, resolve, rooms =
         try {
             const canInvite = inviting && (typeof r.mayInvite === 'boolean' ? r.mayInvite : r.host === true);
             const inviteOptions = canInvite ? inviteOptionsOf(r) : null;
+            // The ICE servers (a TURN credential good for ttlHours, when configured) go in this person's `admitted`
+            // event, made at admission - not in this reply, which a guest still waiting, or about to be turned away,
+            // also gets. Before, anyone holding a call link had a relay credential for the TTL.
+            const hostname = request.hostname;
             const joined = rooms.join(key, {name: r.name || body.name, host: r.host, title: r.title, max: r.max,
                 recordingAllowed: r.recordingAllowed === true, autoAdmit: r.autoAdmit === true, identity: r.identity || '', history, canInvite,
-                inviteOptions, seeHistory: r.history !== false});
+                inviteOptions, seeHistory: r.history !== false, ice: () => iceServers(config(), hostname)});
             // What "Add people" offers this person: {search, typed, copyLink, external} (invite.js inviteOptionsOf).
-            return reply.send({...joined, iceServers: iceServers(config(), request.hostname), closesAt: r.closesAt || null,
-                ...(inviteOptions ? {inviteOptions} : {})});
+            return reply.send({...joined, closesAt: r.closesAt || null, ...(inviteOptions ? {inviteOptions} : {})});
         } catch (err) { return fail(reply, err); }
     });
 

package/plugins/_lib/mail/compose.js

@@ -10,6 +10,7 @@
  * @module _lib/mail/compose
  */
 import {readPriority} from './priority.js';
+import {normaliseMessageSource, readMessageSource} from './message-action.js';
 
 /**
  * Addresses to reply to.
@@ -162,11 +163,13 @@ export function quoteHtml(message, html, text, sanitise) {
  * @param   {{message: object, self: string, mode: 'reply'|'replyAll'|'forward', body: string}} options
  * @returns {object} a draft the compose window can open with
  */
-export function buildDraft({message, self, mode, body, html = null, sanitise = null}) {
+export function buildDraft({message, self, mode, body, html = null, sanitise = null, sourceMessage = null}) {
     const htmlQuote = sanitise ? quoteHtml(message, html, body, sanitise) : null;
+    const source = normaliseMessageSource(sourceMessage);
 
     if (mode === 'forward') {
         return {
+            ...(source ? {sourceMessage: source} : {}),
             to: [],
             cc: [],
             subject: replySubject(message.subject, 'Fwd'),
@@ -185,6 +188,7 @@ export function buildDraft({message, self, mode, body, html = null, sanitise = n
         : {to: replyRecipients(message), cc: []};
 
     return {
+        ...(source ? {sourceMessage: source} : {}),
         to,
         cc,
         subject: replySubject(message.subject),
@@ -239,7 +243,8 @@ export function editableDraft(message, uid = null) {
             content: file.content ?? '',
             size: file.size ?? 0
         })),
-        savedUid: uid
+        savedUid: uid,
+        sourceMessage: readMessageSource(message.headers)
     };
 }
 

package/plugins/_lib/mail/defaults.js

@@ -40,6 +40,18 @@ export default {
      */
     allowInsecureTLS: false,
 
+    /**
+     * Let a mailbox or outgoing server be on a private, loopback or link-local
+     * address.
+     *
+     * Off, deliberately: "test these details" makes this server open TCP to the
+     * host typed in and report refused / no answer / unknown - a port scanner of
+     * the server's own network behind the Email permission. The site's own
+     * configured outgoing server (config/site.json smtp.host) is always allowed.
+     * Turn on only for a site whose mail server really is on its LAN.
+     */
+    allowPrivateMailHosts: false,
+
     /** Largest inline image embedded into a rendered body, in bytes. */
     inlineImageMaxBytes: 2_000_000,
 

package/plugins/_lib/mail/hostGuard.js

@@ -0,0 +1,86 @@
+/**
+ * May this server open a connection to that mail host?
+ *
+ * `/accounts/test`, saving a mailbox and the outgoing-server routes make the
+ * CMS open TCP to whatever host:port the caller typed, and `describeError()`
+ * answers "refused", "did not respond" or "could not be resolved" - a port
+ * scanner of the server's own network behind the `email` permission
+ * (127.0.0.1:27018 is the site's Mongo, :8192 the manager). So a private,
+ * loopback or link-local host is refused unless it is the host the site's own
+ * outgoing mail already goes to (config/site.json smtp.host - the LAN relay
+ * the admin chose) or `allowPrivateMailHosts` is set for a site whose mail
+ * server really is on its LAN.
+ *
+ * The pure half is `isPrivateAddress` / `isLocalName` in unsubscribe.js; this
+ * module adds the lookup, which the tests inject.
+ *
+ * @module _lib/mail/hostGuard
+ */
+import dns from 'node:dns/promises';
+import net from 'node:net';
+import {isLocalName, isPrivateAddress} from './unsubscribe.js';
+
+const REFUSED = 'That server is on this machine\'s own network, so the site will not connect to it. '
+    + 'Use the mail server\'s public name, or ask the site administrator to allow private mail hosts.';
+
+/**
+ * Normalise a typed host for comparison: case, trailing dot, IPv6 brackets.
+ *
+ * @param   {string} host
+ * @returns {string}
+ */
+export function normaliseHost(host) {
+    return String(host ?? '').trim().toLowerCase().replace(/\.$/, '').replace(/^\[(.*)\]$/, '$1');
+}
+
+/**
+ * Check one host.
+ *
+ * @param   {string} host
+ * @param   {object} [options]
+ * @param   {boolean} [options.allowPrivate]  - the site's `allowPrivateMailHosts` setting
+ * @param   {string}  [options.ownSmtpHost]   - the site's configured outgoing server; always allowed
+ * @param   {(host: string) => Promise<{address: string}[]>} [options.lookup] - DNS, injectable
+ * @returns {Promise<{ok: true} | {ok: false, error: string}>}
+ */
+export async function checkMailHost(host, {allowPrivate = false, ownSmtpHost = '', lookup} = {}) {
+    const name = normaliseHost(host);
+    if (!name) return {ok: false, error: 'A server is required.'};
+    if (allowPrivate) return {ok: true};
+    if (ownSmtpHost && normaliseHost(ownSmtpHost) === name) return {ok: true};
+
+    if (net.isIP(name)) {
+        return isPrivateAddress(name) ? {ok: false, error: REFUSED} : {ok: true};
+    }
+    if (isLocalName(name)) return {ok: false, error: REFUSED};
+
+    let answers;
+    try {
+        answers = await (lookup ?? ((h) => dns.lookup(h, {all: true})))(name);
+    } catch {
+        // Unresolvable: let the connection attempt say so in its own words.
+        // The check is about where a name points, not whether it exists.
+        return {ok: true};
+    }
+    // Every answer must be public: a name with one private A record among
+    // public ones is exactly the rebinding trick the check exists for.
+    const addresses = (answers ?? []).map(a => (typeof a === 'string' ? a : a?.address)).filter(Boolean);
+    if (addresses.some(isPrivateAddress)) return {ok: false, error: REFUSED};
+    return {ok: true};
+}
+
+/**
+ * The site's own outgoing server, from config/site.json `smtp.host` (what
+ * core `createTransport` sends with), read through a getter so a test can
+ * hand in its own.
+ *
+ * @param   {(section: string) => any} getConfig
+ * @returns {string}
+ */
+export function siteSmtpHost(getConfig) {
+    try {
+        return String(getConfig('site')?.smtp?.host ?? '').trim();
+    } catch {
+        return '';
+    }
+}

package/plugins/_lib/mail/message-action.js

@@ -0,0 +1,56 @@
+/** Remember replies and forwards on the original message after delivery. */
+export const SOURCE_HEADER = 'X-Domma-Message-Source';
+
+export function normaliseMessageSource(source) {
+    if (!source || !['reply', 'forward'].includes(source.action)) return null;
+    const uid = Number(source.uid);
+    const folder = typeof source.folder === 'string' ? source.folder : '';
+    const accountId = typeof source.accountId === 'string' ? source.accountId : '';
+    const messageId = typeof source.messageId === 'string' ? source.messageId : null;
+    if (!Number.isSafeInteger(uid) || uid < 1 || !folder || folder.length > 1024
+        || /[\r\n\0]/.test(folder) || !accountId || accountId.length > 128
+        || (messageId && (messageId.length > 1024 || /[\r\n\0]/.test(messageId)))) return null;
+    return {accountId, folder, uid, action: source.action, messageId};
+}
+
+export function readMessageSource(headers) {
+    const value = typeof headers?.get === 'function'
+        ? headers.get(SOURCE_HEADER.toLowerCase()) : headers?.[SOURCE_HEADER.toLowerCase()];
+    if (typeof value !== 'string' || value.length > 4096) return null;
+    try {
+        return normaliseMessageSource(JSON.parse(Buffer.from(value, 'base64url').toString('utf8')));
+    } catch { return null; }
+}
+
+/** Best effort: recording a delivered message must never turn it into a failed send. */
+export async function recordMessageAction({source, account, pool, poolKey, connection, store = null}) {
+    source = normaliseMessageSource(source);
+    if (!source || source.accountId !== account?.id) return null;
+    const flag = source.action === 'reply' ? '\\Answered' : '$Forwarded';
+    let flags = null;
+    let error = null;
+    let sourceVerified = false;
+    try {
+        flags = await pool.withMailbox(poolKey, connection, source.folder, async client => {
+            const original = await client.fetchOne(source.uid, {envelope: true, flags: true}, {uid: true});
+            if (!original || (source.messageId && original.envelope?.messageId !== source.messageId)) {
+                throw new Error('The original message is no longer in that folder.');
+            }
+            sourceVerified = true;
+            await client.messageFlagsAdd({uid: String(source.uid)}, [flag], {uid: true});
+            const after = await client.fetchOne(source.uid, {flags: true}, {uid: true});
+            const recorded = [...(after?.flags ?? [])];
+            if (!recorded.includes(flag)) throw new Error('The mail server did not keep the message marker.');
+            return recorded;
+        }, {writable: true});
+    } catch (err) { error = err.message; }
+
+    let mirrored = false;
+    if (store && sourceVerified) {
+        try {
+            if (flags) await store.setFlags(account.id, source.folder, [{uid: source.uid, flags}]);
+            mirrored = await store.setMessageAction(account.id, source.folder, source.uid, source.action);
+        } catch (err) { error ??= err.message; }
+    }
+    return {...source, flags, recorded: Boolean(flags || mirrored), error: flags || mirrored ? null : error};
+}

package/plugins/_lib/mail/readRoutes.js

@@ -28,6 +28,8 @@
 import {simpleParser} from 'mailparser';
 
 import {listUsers} from '../../../server/services/users.js';
+import {getConfig} from '../../../server/config.js';
+import {checkMailHost, siteSmtpHost} from './hostGuard.js';
 import * as accounts from './accounts.js';
 import * as bodyTokens from './bodyTokens.js';
 import {buildDiagnostics} from './diagnostics.js';
@@ -207,6 +209,11 @@ export function registerReadRoutes(fastify, {auth, hooks, config, pool, pluginNa
         });
     }
 
+    /** Where this server may be asked to connect - see hostGuard.js. */
+    const guardHost = (host) => checkMailHost(host, {allowPrivate: config.allowPrivateMailHosts === true, ownSmtpHost: siteSmtpHost(getConfig)});
+    // Each test is a connection attempt whose answer says what is listening: a few a minute per address is plenty.
+    const testLimit = {config: {rateLimit: {max: 10, timeWindow: '1 minute'}}};
+
     /** GET /accounts - every mailbox this user owns, without passwords. */
     fastify.get('/accounts', {preHandler: [authenticate]}, async (request, reply) => {
         const uid = userId(request);
@@ -221,6 +228,8 @@ export function registerReadRoutes(fastify, {auth, hooks, config, pool, pluginNa
 
         const result = accounts.validate(request.body ?? {}, null);
         if (!result.ok) return reply.code(400).send({error: result.error});
+        const where = await guardHost(result.value.host);
+        if (!where.ok) return reply.code(400).send({error: where.error});
 
         const saved = await accounts.saveAccount(uid, null, result.value);
         return {account: accounts.toPublic(saved)};
@@ -236,6 +245,8 @@ export function registerReadRoutes(fastify, {auth, hooks, config, pool, pluginNa
 
         const result = accounts.validate(request.body ?? {}, existing);
         if (!result.ok) return reply.code(400).send({error: result.error});
+        const where = await guardHost(result.value.host);
+        if (!where.ok) return reply.code(400).send({error: where.error});
 
         const saved = await accounts.saveAccount(uid, request.params.id, result.value);
         // The pooled connection was opened with the old details.
@@ -271,7 +282,7 @@ export function registerReadRoutes(fastify, {auth, hooks, config, pool, pluginNa
      * password field is blank and `id` names an existing mailbox, the stored
      * password is used - otherwise editing a hostname would mean retyping it.
      */
-    fastify.post('/accounts/test', {preHandler: [authenticate]}, async (request, reply) => {
+    fastify.post('/accounts/test', {preHandler: [authenticate], ...testLimit}, async (request, reply) => {
         const uid = userId(request);
         if (!uid) return reply.code(401).send({error: 'Authentication required.'});
 
@@ -281,6 +292,8 @@ export function registerReadRoutes(fastify, {auth, hooks, config, pool, pluginNa
 
         const result = accounts.validate(body, existing);
         if (!result.ok) return reply.code(400).send({error: result.error});
+        const where = await guardHost(result.value.host);
+        if (!where.ok) return reply.code(400).send({error: where.error});
 
         let pass = result.value.password;
         if (!pass) {
@@ -711,6 +724,12 @@ export function registerReadRoutes(fastify, {auth, hooks, config, pool, pluginNa
                 reply.code(404).send({error: 'That message is no longer in this folder.'});
                 return null;
             }
+            // The same ceiling as /messages/:uid and /body: without it a hostile
+            // 200 MB message cost a 200 MB buffer plus mailparser output per click.
+            if (fetched.source.length > config.maxMessageBytes) {
+                reply.code(413).send({error: 'That message is too large to open its attachments.'});
+                return null;
+            }
 
             const parsed = await simpleParser(fetched.source);
             const attachment = parsed.attachments?.[index];

package/plugins/_lib/mail/scheduler.js

@@ -82,6 +82,8 @@ export function createScheduler({store, pool, config, logger, tickMs = TICK_MS})
         try {
             const result = await sendMessage({
                 smtp,
+                account,
+                store,
                 draft: item.draft,
                 pool,
                 poolKey: `${item.userId}:${item.accountId}`,

package/plugins/_lib/mail/send.js

@@ -15,6 +15,7 @@ import nodemailer from 'nodemailer';
 import {bareAddress, formatFrom} from '../admin/mail/identity.js';
 import {describeError} from './imapPool.js';
 import {normalisePriority, priorityHeaders} from './priority.js';
+import {normaliseMessageSource, recordMessageAction, SOURCE_HEADER} from './message-action.js';
 
 // MailComposer is not on nodemailer's public export, but it is the piece that
 // turns a message object into the bytes that go on the wire - which is what a
@@ -191,7 +192,7 @@ class SkipFiling extends Error {}
  */
 export async function sendMessage({
     smtp, draft, pool, poolKey, connection, sentFolder = null, allowInsecureTLS = false,
-    replaces = null, draftsFolder = null, headers = {}, fileCopy = true
+    replaces = null, draftsFolder = null, headers = {}, fileCopy = true, account = null, store = null
 }) {
     // The header carries the display name; the envelope never can. They are
     // built from the same stored address so they cannot name two different
@@ -229,6 +230,10 @@ export async function sendMessage({
     });
     transport.close();
 
+    const messageAction = await recordMessageAction({
+        source: draft.sourceMessage, account, pool, poolKey, connection, store
+    });
+
     let filedTo = null;
     let fileError = null;
     try {
@@ -260,7 +265,8 @@ export async function sendMessage({
         rejected: info.rejected ?? [],
         filedTo,
         fileError,
-        draftRemoved
+        draftRemoved,
+        messageAction
     };
 }
 
@@ -315,9 +321,12 @@ export async function saveDraft({
 }) {
     // Written into the draft, not applied when it is eventually sent: a draft
     // opened on the phone should show the same headers it will go out with.
+    const source = normaliseMessageSource(draft.sourceMessage);
     const raw = await buildRaw(draft, from, {
         replyTo,
-        readReceiptTo: draft.readReceipt ? (replyTo || bareAddress(from)) : ''
+        readReceiptTo: draft.readReceipt ? (replyTo || bareAddress(from)) : '',
+        // Private draft metadata: it is omitted from SMTP and the Sent copy.
+        headers: source ? {[SOURCE_HEADER]: Buffer.from(JSON.stringify(source)).toString('base64url')} : {}
     });
 
     const destination = draftsFolder ?? await findSpecialFolder(pool, poolKey, connection, '\\Drafts');

package/plugins/_lib/mail/store.js

@@ -249,7 +249,7 @@ export function createStore(connection) {
     }
 
     /**
-     * Store a batch of envelopes, replacing any already held for those UIDs.
+     * Store envelopes while retaining the local reply and forward history.
      *
      * @param   {string} accountId
      * @param   {string} path
@@ -262,15 +262,14 @@ export function createStore(connection) {
         const now = new Date();
         const rooted = await inheritThreadRoots(database, accountId, messages);
         const operations = rooted.map(message => ({
-            replaceOne: {
+            updateOne: {
                 filter: {_id: messageId(accountId, path, message.uid)},
-                replacement: {
+                update: {$set: {
                     ...message,
-                    _id: messageId(accountId, path, message.uid),
                     accountId,
                     folder: path,
                     fetchedAt: now
-                },
+                }},
                 upsert: true
             }
         }));
@@ -350,6 +349,17 @@ export function createStore(connection) {
         return result.modifiedCount ?? 0;
     }
 
+    /** Keep action history even when a server refuses the $Forwarded keyword. */
+    async function setMessageAction(accountId, path, uid, action) {
+        if (!['reply', 'forward'].includes(action)) return false;
+        const database = await connect();
+        const field = action === 'reply' ? 'repliedAt' : 'forwardedAt';
+        const result = await database.collection(MESSAGES).updateOne(
+            {_id: messageId(accountId, path, uid)}, {$set: {[field]: new Date()}}
+        );
+        return result.matchedCount > 0;
+    }
+
     /**
      * Forget messages that are no longer on the server.
      *
@@ -1012,7 +1022,7 @@ export function createStore(connection) {
     return {
         connect,
         getFolder, saveFolder,
-        putMessages, setFlags, removeMessages, clearFolder,
+        putMessages, setFlags, setMessageAction, removeMessages, clearFolder,
         storedUids, listMessages, listThreads, searchMessages, countUnread, listUnread, forgetAccount,
         queueSend, listQueuedSends, claimDueSends, finishSend, cancelSend, getQueuedSend,
         queueSnooze, listSnoozed, claimDueSnoozes, finishSnooze, wakeSnooze,