diff --git a/user/neomutt/.config/neomutt/compose b/user/neomutt/.config/neomutt/compose
index 41c8f3d..bdcee5e 100644
--- a/user/neomutt/.config/neomutt/compose
+++ b/user/neomutt/.config/neomutt/compose
@@ -18,3 +18,4 @@ set include                          # include message in replies
 set forward_quote                    # include message in forwards
 
 set editor = "vim"
+set query_command = "khard email --parsable '%s'"
diff --git a/user/neomutt/.config/neomutt/keybinding b/user/neomutt/.config/neomutt/keybinding
index 2221248..33de7b8 100644
--- a/user/neomutt/.config/neomutt/keybinding
+++ b/user/neomutt/.config/neomutt/keybinding
@@ -77,7 +77,6 @@ macro index ca <save-message><kill-line>=Archive<Enter>
 macro index m <save-message>?
 bind index dd delete-message
 bind index dt delete-thread
-bind index f forward-message
 
 bind index ss flag-message
 bind index sf set-flag
@@ -88,8 +87,10 @@ bind index sr read-thread #set entire thread read
 macro index sR <tag-pattern>~N<Enter><tag-prefix><clear-flag>N<untag-pattern>.<Enter> #Mark all as Read
 bind index st tag-entry
 
+bind index f forward-message
 bind index r reply
 bind index R group-reply
+
 bind index <space> collapse-thread
 
 bind index l display-message
@@ -101,6 +102,8 @@ bind index zz sync-mailbox
 bind index ZZ quit
 bind index ZQ exit
 
+macro index,pager A "<pipe-message>khard add-email<Return>"
+
 ##################
 # Sidebar
 #
@@ -156,3 +159,10 @@ macro compose a <attach-file>? #show browser
 # browser
 #
 bind browser l select-entry
+
+##################
+# Editor
+#
+
+bind editor  <Tab> complete-query
+bind editor \CT complete