diff --git a/office/.config/neomutt/maps b/office/.config/neomutt/maps
index 6874cd3..da5854d 100644
--- a/office/.config/neomutt/maps
+++ b/office/.config/neomutt/maps
@@ -30,6 +30,10 @@ bind pager,index    za collapse-thread
 bind pager,index    zA collapse-all
 bind pager,index    zr reconstruct-thread
 bind pager,index    zR entire-thread
+# Saner copy/move dialogs
+macro index,pager   C "<copy-message>?<toggle-mailboxes>" "copy a message to a mailbox"
+macro index,pager   M "<save-message>?<toggle-mailboxes>" "move a message to a mailbox"
+macro index,pager   gM "<tag-thread><tag-prefix><save-message>?<toggle-mailboxes>" "move thread to a mailbox"
 
 # Email completion bindings
 bind editor <Tab> complete-query
@@ -78,9 +82,6 @@ macro index,pager \CU "|urlview<enter>" "call urlview to open links"
 macro index O "<sync-mailbox><shell-escape>export MBSYNC_PRE=true; sync-mail<enter><sync-mailbox>" "refresh all e-mail"
 macro index o "<sync-mailbox><shell-escape>export MBSYNC_PRE=true; sync-mail gmail-inbox<enter><sync-mailbox>" "refresh inbox e-mail"
 
-# Saner copy/move dialogs
-macro index C "<copy-message>?<toggle-mailboxes>" "copy a message to a mailbox"
-macro index M "<save-message>?<toggle-mailboxes>" "move a message to a mailbox"
 
 # Send mail to taskwarrior
 macro index,pager T "<pipe-message>mutt2task -c -d -t<enter>" "add mail as task to taskwarrior with custom description and tags"