new items on roadmap, mention delivered-to rfc, fix wording in comments

README.md

@@ -116,11 +116,13 @@ The code is heavily cross-referenced with the RFCs for readability/maintainabili
 - Add special IMAP mailbox ("Queue?") that contains queued but
   not-yet-delivered messages
 - Sieve for filtering (for now see Rulesets in the account config)
+- Accepting/processing/monitoring DMARC reports for external domains
 - Calendaring
 - Privilege separation, isolating parts of the application to more restricted
   sandbox (e.g. new unauthenticated connections)
 - Using mox as backup MX
 - Old-style internationalization in messages
+- ARC, with forwarded email from trusted source
 - JMAP
 - Autoresponder (out of office/vacation)
 - HTTP-based API for sending messages and receiving delivery feedback

rfc/index.md

@@ -16,6 +16,7 @@ Also see IANA assignments, https://www.iana.org/protocols
 5598	Internet Mail Architecture
 6854	Update to Internet Message Format to Allow Group Syntax in the "From:" and "Sender:" Header Fields
 7405	Case-Sensitive String Support in ABNF
+9228	Delivered-To Email Header Field
 
 # SMTP
 

smtpserver/server.go

@@ -2414,7 +2414,7 @@ func (c *conn) deliver(ctx context.Context, recvHdrFor func(string) string, msgW
 				} else if !present {
 					m.Seen = true // We don't want to draw attention.
 					// Regular automatic junk flags configuration applies to these messages. The
-					// default is to treat these are neutral, so they won't cause outright rejections
+					// default is to treat these as neutral, so they won't cause outright rejections
 					// due to reputation for later delivery attempts.
 					m.MessageID = messageid
 					m.MessageHash = messagehash

store/account.go

@@ -269,9 +269,10 @@ type Message struct {
 	Expunged  bool
 
 	// MailboxOrigID is the mailbox the message was originally delivered to. Typically
-	// Inbox or Rejects, but can also be Postmaster and TLS/DMARC reporting addresses.
-	// MailboxOrigID is not changed when the message is moved to another mailbox, e.g.
-	// Archive/Trash/Junk. Used for per-mailbox reputation.
+	// Inbox or Rejects, but can also be a mailbox configured in a Ruleset, or
+	// Postmaster, TLS/DMARC reporting addresses. MailboxOrigID is not changed when the
+	// message is moved to another mailbox, e.g. Archive/Trash/Junk. Used for
+	// per-mailbox reputation.
 	//
 	// MailboxDestinedID is normally 0, but when a message is delivered to the Rejects
 	// mailbox, it is set to the intended mailbox according to delivery rules,