2 files changed, 18 insertions, 5 deletions
diff --git a/commands/msg/archive.go b/commands/msg/archive.go
index 149d7a5f..aeb65738 100644
--- a/commands/msg/archive.go
+++ b/commands/msg/archive.go
@@ -39,29 +39,35 @@ func (Archive) Execute(aerc *widgets.Aerc, args []string) error {
 		return errors.New("Usage: archive <flat|year|month>")
 	}
 	h := newHelper(aerc)
-	acct, err := h.account()
+	msgs, err := h.messages()
 	if err != nil {
 		return err
 	}
-	store, err := h.store()
+	err = archive(aerc, msgs, args[1])
+	return err
+}
+
+func archive(aerc *widgets.Aerc, msgs []*models.MessageInfo, archiveType string) error {
+	h := newHelper(aerc)
+	acct, err := h.account()
 	if err != nil {
 		return err
 	}
-	msgs, err := h.messages()
+	store, err := h.store()
 	if err != nil {
 		return err
 	}
-	archiveDir := acct.AccountConfig().Archive
 	var uids []uint32
 	for _, msg := range msgs {
 		uids = append(uids, msg.Uid)
 	}
+	archiveDir := acct.AccountConfig().Archive
 	marker := store.Marker()
 	marker.ClearVisualMark()
 	next := findNextNonDeleted(uids, store)
 
 	var uidMap map[string][]uint32
-	switch args[1] {
+	switch archiveType {
 	case ARCHIVE_MONTH:
 		uidMap = groupBy(msgs, func(msg *models.MessageInfo) string {
 			dir := path.Join(archiveDir,
diff --git a/commands/msg/reply.go b/commands/msg/reply.go
index 8f536c14..52265950 100644
--- a/commands/msg/reply.go
+++ b/commands/msg/reply.go
@@ -7,6 +7,7 @@ import (
 	"io"
 	"regexp"
 	"strings"
+	"time"
 
 	"git.sr.ht/~sircmpwn/getopt"
 
@@ -210,6 +211,12 @@ func (reply) Execute(aerc *widgets.Aerc, args []string) error {
 
 		composer.OnClose(func(c *widgets.Composer) {
 			switch {
+			case c.Sent() && c.Archive() != "":
+				store.Answered([]uint32{msg.Uid}, true, nil)
+				err := archive(aerc, []*models.MessageInfo{msg}, c.Archive())
+				if err != nil {
+					aerc.PushStatus("Archive failed", 10*time.Second)
+				}
 			case c.Sent():
 				store.Answered([]uint32{msg.Uid}, true, nil)
 			case mv != nil && closeOnReply: