diff --git a/docs/keybindings.md b/docs/keybindings.md
index 17b9eee..cf513ce 100644
--- a/docs/keybindings.md
+++ b/docs/keybindings.md
@@ -113,6 +113,7 @@ Press `?` inside neomd to open the interactive help overlay. Start typing to fil
| `R` | reload / refresh folder |
| `r` | reply (from inbox or reader) |
| `ctrl+r` | reply-all — reply to sender + all CC recipients (from inbox or reader) |
+| `ctrl+e` | react with emoji (from inbox or reader) |
| `f` | forward email (from reader or inbox) |
| `T` | show full conversation thread across folders (from inbox or reader) |
| `c` | compose new email |
diff --git a/internal/editor/editor.go b/internal/editor/editor.go
index 9cf87a1..967ff3b 100644
--- a/internal/editor/editor.go
+++ b/internal/editor/editor.go
@@ -129,6 +129,19 @@ func ForwardPrelude(subject, from, originalFrom, originalDate, originalTo, origi
return s
}
+// ReactionBody builds the plain text body for an emoji reaction.
+func ReactionBody(emoji, fromName string) string {
+ return fmt.Sprintf("%s\n\n%s reacted via neomd (https://neomd.ssp.sh)\n", emoji, fromName)
+}
+
+// ReactionBodyHTML builds the HTML body for an emoji reaction.
+func ReactionBodyHTML(emoji, fromName string) string {
+ return fmt.Sprintf(`%s
+
+%s reacted via neomd
+
`, emoji, fromName)
+}
+
// ParseHeaders scans raw editor content for # [neomd: key: value] lines and
// returns the extracted to, cc, bcc, from, subject values and the remaining body
// (with header lines stripped). Any field not found is returned as "".
diff --git a/internal/imap/client.go b/internal/imap/client.go
index c5edfa7..efa79dc 100644
--- a/internal/imap/client.go
+++ b/internal/imap/client.go
@@ -49,6 +49,7 @@ type Email struct {
HasAttachment bool // true if BODYSTRUCTURE contains an attachment part
MessageID string // Message-ID from envelope (for threading)
InReplyTo string // first In-Reply-To message ID (for threading)
+ References string // References header (space-separated Message-IDs for threading)
}
// Config holds connection parameters.
@@ -325,6 +326,8 @@ func (c *Client) FetchHeaders(ctx context.Context, folder string, n int) ([]Emai
if len(m.Envelope.InReplyTo) > 0 {
e.InReplyTo = m.Envelope.InReplyTo[0]
}
+ // Note: References header is fetched when the body is loaded (FetchBody)
+ // because it's not available in the IMAP Envelope structure.
}
e.Size = uint32(m.RFC822Size)
e.HasAttachment = hasAttachment(m.BodyStructure)
diff --git a/internal/smtp/sender.go b/internal/smtp/sender.go
index d7772f4..5d48dd8 100644
--- a/internal/smtp/sender.go
+++ b/internal/smtp/sender.go
@@ -249,6 +249,12 @@ func sendSTARTTLSWithConfig(addr, host string, tlsCfg *tls.Config, auth smtp.Aut
// otherwise the structure is unchanged (multipart/alternative only).
// htmlSignature, if non-empty, is injected before the closing tag in the HTML part.
func BuildMessage(from, to, cc, subject, markdownBody string, attachments []string, htmlSignature string) ([]byte, error) {
+ return BuildMessageWithThreading(from, to, cc, subject, markdownBody, attachments, htmlSignature, "", "")
+}
+
+// BuildMessageWithThreading builds a MIME message with optional threading headers (In-Reply-To, References).
+// Used for replies and forwards to maintain proper email conversation threading.
+func BuildMessageWithThreading(from, to, cc, subject, markdownBody string, attachments []string, htmlSignature, inReplyTo, references string) ([]byte, error) {
htmlBody, err := render.ToHTML(markdownBody)
if err != nil {
return nil, fmt.Errorf("markdown to html: %w", err)
@@ -262,7 +268,16 @@ func BuildMessage(from, to, cc, subject, markdownBody string, attachments []stri
htmlBody = htmlBody[:idx] + "\n" + htmlSignature + "\n" + htmlBody[idx:]
}
}
- return buildMessage(from, to, cc, subject, markdownBody, htmlBody, attachments)
+ // Build References chain: append inReplyTo to existing references
+ refChain := references
+ if inReplyTo != "" {
+ if refChain != "" {
+ refChain = refChain + " " + inReplyTo
+ } else {
+ refChain = inReplyTo
+ }
+ }
+ return buildMessageWithBCC(from, to, cc, "", subject, markdownBody, htmlBody, attachments, inReplyTo, refChain)
}
// BuildDraftMessage constructs a raw MIME draft for IMAP APPEND.
@@ -271,8 +286,27 @@ func BuildMessage(from, to, cc, subject, markdownBody string, attachments []stri
// Drafts are stored as plain text only (no HTML conversion) to preserve the
// original markdown formatting exactly during save/load cycles.
func BuildDraftMessage(from, to, cc, bcc, subject, markdownBody string, attachments []string) ([]byte, error) {
- // Pass empty htmlBody to store plain text only
- return buildMessageWithBCC(from, to, cc, bcc, subject, markdownBody, "", attachments)
+ // Pass empty htmlBody to store plain text only; no threading headers for drafts
+ return buildMessageWithBCC(from, to, cc, bcc, subject, markdownBody, "", attachments, "", "")
+}
+
+// BuildReactionMessage constructs a minimal reaction email with threading headers.
+// Used for emoji reactions sent as replies to emails.
+// plainBody and htmlBody are pre-formatted reaction messages (emoji + footer).
+// inReplyTo is the Message-ID of the original email.
+// references is the References chain from the original email (may be empty).
+func BuildReactionMessage(from, to, cc, subject, plainBody, htmlBody, inReplyTo, references string) ([]byte, error) {
+ // Build References chain: append inReplyTo to existing references
+ refChain := references
+ if inReplyTo != "" {
+ if refChain != "" {
+ refChain = refChain + " " + inReplyTo
+ } else {
+ refChain = inReplyTo
+ }
+ }
+ // No attachments for reactions
+ return buildMessageWithBCC(from, to, cc, "", subject, plainBody, htmlBody, nil, inReplyTo, refChain)
}
// inlineImage holds a local image path and its assigned Content-ID.
@@ -291,10 +325,10 @@ type inlineImage struct {
// - images only → multipart/related > (multipart/alternative + inline images)
// - images + files → multipart/mixed > (multipart/related > alt+images) + files
func buildMessage(from, to, cc, subject, plainText, htmlBody string, attachments []string) ([]byte, error) {
- return buildMessageWithBCC(from, to, cc, "", subject, plainText, htmlBody, attachments)
+ return buildMessageWithBCC(from, to, cc, "", subject, plainText, htmlBody, attachments, "", "")
}
-func buildMessageWithBCC(from, to, cc, bcc, subject, plainText, htmlBody string, attachments []string) ([]byte, error) {
+func buildMessageWithBCC(from, to, cc, bcc, subject, plainText, htmlBody string, attachments []string, inReplyTo, references string) ([]byte, error) {
// Find local image paths in htmlBody (