diff --git a/contrib/mutt b/contrib/mutt
index ff7655f3..2145f5dc 100644
--- a/contrib/mutt
+++ b/contrib/mutt
@@ -39,7 +39,7 @@ _muttconffiles()
 
 _muttaliases()
 {
-	local cur muttrc
+	local cur muttrc muttcmd=${COMP_WORDS[0]}
 	local -a conffiles aliases
 	cur=`_get_cword =`
 
@@ -57,7 +57,7 @@ _muttaliases()
 
 _muttquery()
 {
-	local cur querycmd
+	local cur querycmd muttcmd=${COMP_WORDS[0]}
 	local -a queryresults
 	cur=`_get_cword`
 
@@ -77,7 +77,7 @@ _muttquery()
 
 _muttfiledir()
 {
-	local cur folder spoolfile
+	local cur folder spoolfile muttcmd=${COMP_WORDS[0]}
 	cur=`_get_cword`
 
 	# This is currently not working so well. Perhaps this function should
@@ -108,8 +108,6 @@ _mutt()
 
 	COMPREPLY=()
 
-	[ ${COMP_WORDS[0]} == muttng ] && muttcmd="muttng" || muttcmd="mutt"
-
 	case "$cur" in
 	-*)
 		COMPREPLY=( $( compgen -W '-A -a -b -c -e -f -F -H -i -m -n \