2 files changed, 51 insertions, 2 deletions
diff --git a/lib/hooks/mail-added.go b/lib/hooks/mail-added.go
new file mode 100644
index 00000000..f146d010
--- /dev/null
+++ b/lib/hooks/mail-added.go
@@ -0,0 +1,23 @@
+package hooks
+
+import (
+	"fmt"
+
+	"git.sr.ht/~rjarry/aerc/config"
+)
+
+type MailAdded struct {
+	Account string
+	Folder  string
+}
+
+func (m *MailAdded) Cmd() string {
+	return config.Hooks.MailAdded
+}
+
+func (m *MailAdded) Env() []string {
+	return []string{
+		fmt.Sprintf("AERC_ACCOUNT=%s", m.Account),
+		fmt.Sprintf("AERC_FOLDER=%s", m.Folder),
+	}
+}
diff --git a/lib/msgstore.go b/lib/msgstore.go
index 9c6b750d..cb81abef 100644
--- a/lib/msgstore.go
+++ b/lib/msgstore.go
@@ -69,6 +69,7 @@ type MessageStore struct {
 	triggerNewEmail        func(*models.MessageInfo)
 	triggerDirectoryChange func()
 	triggerMailDeleted     func()
+	triggerMailAdded       func(string)
 
 	threadBuilderDebounce *time.Timer
 	threadBuilderDelay    time.Duration
@@ -89,7 +90,8 @@ func NewMessageStore(worker *types.Worker,
 	reverseOrder bool, reverseThreadOrder bool, sortThreadSiblings bool,
 	triggerNewEmail func(*models.MessageInfo),
 	triggerDirectoryChange func(), triggerMailDeleted func(),
-	onSelect func(*models.MessageInfo), threadContext bool,
+	triggerMailAdded func(string), onSelect func(*models.MessageInfo),
+	threadContext bool,
 ) *MessageStore {
 	if !worker.Backend.Capabilities().Thread {
 		clientThreads = true
@@ -124,6 +126,7 @@ func NewMessageStore(worker *types.Worker,
 		triggerNewEmail:        triggerNewEmail,
 		triggerDirectoryChange: triggerDirectoryChange,
 		triggerMailDeleted:     triggerMailDeleted,
+		triggerMailAdded:       triggerMailAdded,
 
 		threadBuilderDelay: clientThreadsDelay,
 
@@ -608,7 +611,12 @@ func (store *MessageStore) Copy(uids []uint32, dest string, createDest bool,
 	store.worker.PostAction(&types.CopyMessages{
 		Destination: dest,
 		Uids:        uids,
-	}, cb)
+	}, func(msg types.WorkerMessage) {
+		if _, ok := msg.(*types.Done); ok {
+			store.triggerMailAdded(dest)
+		}
+		cb(msg)
+	})
 }
 
 func (store *MessageStore) Move(uids []uint32, dest string, createDest bool,
@@ -635,11 +643,29 @@ func (store *MessageStore) Move(uids []uint32, dest string, createDest bool,
 			cb(msg)
 		case *types.Done:
 			store.triggerMailDeleted()
+			store.triggerMailAdded(dest)
 			cb(msg)
 		}
 	})
 }
 
+func (store *MessageStore) Append(dest string, flags models.Flags, date time.Time,
+	reader io.Reader, length int, cb func(msg types.WorkerMessage),
+) {
+	store.worker.PostAction(&types.AppendMessage{
+		Destination: dest,
+		Flags:       flags,
+		Date:        date,
+		Reader:      reader,
+		Length:      length,
+	}, func(msg types.WorkerMessage) {
+		if _, ok := msg.(*types.Done); ok {
+			store.triggerMailAdded(dest)
+		}
+		cb(msg)
+	})
+}
+
 func (store *MessageStore) Flag(uids []uint32, flags models.Flags,
 	enable bool, cb func(msg types.WorkerMessage),
 ) {