fix!: append sent emails to the SENT folder (#496)

Author: andrinoff

backend/imap/imap.go

@@ -4,6 +4,7 @@ package imap
 
 import (
 	"context"
+	"log"
 
 	"github.com/floatpane/matcha/backend"
 	"github.com/floatpane/matcha/config"
@@ -76,14 +77,28 @@ func (p *Provider) MoveEmails(_ context.Context, uids []uint32, srcFolder, dstFo
 }
 
 func (p *Provider) SendEmail(_ context.Context, msg *backend.OutgoingEmail) error {
-	return sender.SendEmail(
+	rawMsg, err := sender.SendEmail(
 		p.account, msg.To, msg.Cc, msg.Bcc,
 		msg.Subject, msg.PlainBody, msg.HTMLBody,
 		msg.Images, msg.Attachments,
 		msg.InReplyTo, msg.References,
 		msg.SignSMIME, msg.EncryptSMIME,
 		msg.SignPGP, msg.EncryptPGP,
 	)
+	if err != nil {
+		return err
+	}
+
+	// Gmail automatically saves sent messages server-side; skip APPEND to avoid duplicates.
+	if p.account.ServiceProvider == "gmail" {
+		return nil
+	}
+
+	if err := fetcher.AppendToSentMailbox(p.account, rawMsg); err != nil {
+		log.Printf("Failed to append sent message to Sent folder: %v", err)
+	}
+
+	return nil
 }
 
 func (p *Provider) FetchFolders(_ context.Context) ([]backend.Folder, error) {

backend/pop3/pop3.go

@@ -224,14 +224,15 @@ func (p *Provider) MoveEmails(_ context.Context, _ []uint32, _, _ string) error
 }
 
 func (p *Provider) SendEmail(_ context.Context, msg *backend.OutgoingEmail) error {
-	return sender.SendEmail(
+	_, err := sender.SendEmail(
 		p.account, msg.To, msg.Cc, msg.Bcc,
 		msg.Subject, msg.PlainBody, msg.HTMLBody,
 		msg.Images, msg.Attachments,
 		msg.InReplyTo, msg.References,
 		msg.SignSMIME, msg.EncryptSMIME,
 		msg.SignPGP, msg.EncryptPGP,
 	)
+	return err
 }
 
 func (p *Provider) FetchFolders(_ context.Context) ([]backend.Folder, error) {

fetcher/fetcher.go

@@ -1274,6 +1274,19 @@ func ArchiveSentEmail(account *config.Account, uid uint32) error {
 	return ArchiveEmailFromMailbox(account, getSentMailbox(account), uid)
 }
 
+// AppendToSentMailbox appends a raw RFC822 message to the Sent mailbox via IMAP APPEND.
+func AppendToSentMailbox(account *config.Account, msg []byte) error {
+	c, err := connect(account)
+	if err != nil {
+		return err
+	}
+	defer c.Logout()
+
+	sentMailbox := getSentMailbox(account)
+	flags := []string{imap.SeenFlag}
+	return c.Append(sentMailbox, flags, time.Now(), bytes.NewReader(msg))
+}
+
 // getTrashMailbox returns the trash mailbox name for the account
 func getTrashMailbox(account *config.Account) string {
 	switch account.ServiceProvider {

main.go

@@ -2004,11 +2004,19 @@ func sendEmail(account *config.Account, msg tui.SendEmailMsg) tea.Cmd {
 			attachments[filename] = fileData
 		}
 
-		err := sender.SendEmail(account, recipients, cc, bcc, msg.Subject, body, string(htmlBody), images, attachments, msg.InReplyTo, msg.References, msg.SignSMIME, msg.EncryptSMIME, msg.SignPGP, false)
+		rawMsg, err := sender.SendEmail(account, recipients, cc, bcc, msg.Subject, body, string(htmlBody), images, attachments, msg.InReplyTo, msg.References, msg.SignSMIME, msg.EncryptSMIME, msg.SignPGP, false)
 		if err != nil {
 			log.Printf("Failed to send email: %v", err)
 			return tui.EmailResultMsg{Err: err}
 		}
+
+		// Append to Sent folder via IMAP (Gmail auto-saves, so skip it)
+		if account.ServiceProvider != "gmail" {
+			if err := fetcher.AppendToSentMailbox(account, rawMsg); err != nil {
+				log.Printf("Failed to append sent message to Sent folder: %v", err)
+			}
+		}
+
 		return tui.EmailResultMsg{}
 	}
 }
@@ -2771,12 +2779,19 @@ func runSendCLI(args []string) {
 	ccList := splitEmails(*cc)
 	bccList := splitEmails(*bcc)
 
-	err = sender.SendEmail(account, recipients, ccList, bccList, *subject, emailBody, string(htmlBody), images, attachMap, "", nil, *signSMIME, *encryptSMIME, *signPGP, false)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Error: %v\n", err)
+	rawMsg, sendErr := sender.SendEmail(account, recipients, ccList, bccList, *subject, emailBody, string(htmlBody), images, attachMap, "", nil, *signSMIME, *encryptSMIME, *signPGP, false)
+	if sendErr != nil {
+		fmt.Fprintf(os.Stderr, "Error: %v\n", sendErr)
 		os.Exit(1)
 	}
 
+	// Append to Sent folder via IMAP (Gmail auto-saves, so skip it)
+	if account.ServiceProvider != "gmail" {
+		if err := fetcher.AppendToSentMailbox(account, rawMsg); err != nil {
+			log.Printf("Failed to append sent message to Sent folder: %v", err)
+		}
+	}
+
 	fmt.Println("Email sent successfully.")
 }