3 files changed, 65 insertions, 6 deletions
diff --git a/commands/account/move.go b/commands/account/move.go
new file mode 100644
index 00000000..f84427e8
--- /dev/null
+++ b/commands/account/move.go
@@ -0,0 +1,38 @@
+package account
+
+import (
+	"errors"
+	"time"
+
+	"github.com/gdamore/tcell"
+
+	"git.sr.ht/~sircmpwn/aerc2/widgets"
+	"git.sr.ht/~sircmpwn/aerc2/worker/types"
+)
+
+func init() {
+	register("mv", Move)
+	register("move", Move)
+}
+
+func Move(aerc *widgets.Aerc, args []string) error {
+	if len(args) != 2 {
+		return errors.New("Usage: mv <folder>")
+	}
+	acct := aerc.SelectedAccount()
+	if acct == nil {
+		return errors.New("No account selected")
+	}
+	msg := acct.Messages().Selected()
+	store := acct.Messages().Store()
+	store.Move([]uint32{msg.Uid}, args[1], func(msg types.WorkerMessage) {
+		switch msg := msg.(type) {
+		case *types.Done:
+			aerc.PushStatus("Messages moved.", 10*time.Second)
+		case *types.Error:
+			aerc.PushStatus(" "+msg.Error.Error(), 10*time.Second).
+				Color(tcell.ColorDefault, tcell.ColorRed)
+		}
+	})
+	return nil
+}
diff --git a/lib/msgstore.go b/lib/msgstore.go
index c4f5326b..bd347893 100644
--- a/lib/msgstore.go
+++ b/lib/msgstore.go
@@ -246,3 +246,30 @@ func (store *MessageStore) Copy(uids []uint32, dest string,
 		Uids:        set,
 	}, cb)
 }
+
+func (store *MessageStore) Move(uids []uint32, dest string,
+	cb func(msg types.WorkerMessage)) {
+	store.Lock()
+
+	var set imap.SeqSet
+	for _, uid := range uids {
+		set.AddNum(uid)
+		store.Deleted[uid] = nil
+	}
+
+	store.Unlock()
+
+	store.worker.PostAction(&types.CopyMessages{
+		Destination: dest,
+		Uids:        set,
+	}, func(msg types.WorkerMessage) {
+		switch msg.(type) {
+		case *types.Error:
+			cb(msg)
+		case *types.Done:
+			store.worker.PostAction(&types.DeleteMessages{Uids: set}, cb)
+		}
+	})
+
+	store.update()
+}
diff --git a/worker/types/messages.go b/worker/types/messages.go
index fdd3263c..e97ae025 100644
--- a/worker/types/messages.go
+++ b/worker/types/messages.go
@@ -103,12 +103,6 @@ type CopyMessages struct {
 	Uids        imap.SeqSet
 }
 
-type MoveMessages struct {
-	Message
-	Destination string
-	Uids        imap.SeqSet
-}
-
 // Messages
 
 type CertificateApprovalRequest struct {