diff --git a/mail/.config/neomutt/accounts/1-mail@oxapentane.com.muttrc b/mail/.config/neomutt/accounts/1-mail@oxapentane.com.muttrc
index e9a1563..47df264 100644
--- a/mail/.config/neomutt/accounts/1-mail@oxapentane.com.muttrc
+++ b/mail/.config/neomutt/accounts/1-mail@oxapentane.com.muttrc
@@ -4,7 +4,6 @@ set realname = "Grigory Shipunov"
 set from = "mail@oxapentane.com"
 alternates "@oxapentane\.com$"
 set reverse_name
-set sendmail = "msmtp -a mail@oxapentane.com"
 alias me 0xA <mail@oxapentane.com>
 set folder = "~/mail/mail@oxapentane.com"
 set header_cache = "~/.cache/mutt-cache/mail@oxapentane.com/headers"
diff --git a/mail/.config/neomutt/accounts/2-grigory@shipunov.xyz.muttrc b/mail/.config/neomutt/accounts/2-grigory@shipunov.xyz.muttrc
index 378ff2d..9e0deaa 100644
--- a/mail/.config/neomutt/accounts/2-grigory@shipunov.xyz.muttrc
+++ b/mail/.config/neomutt/accounts/2-grigory@shipunov.xyz.muttrc
@@ -2,7 +2,6 @@
 # muttrc file for account grigory@shipunov.xyz
 set realname = "Grigory Shipunov"
 set from = "grigory@shipunov.xyz"
-set sendmail = "msmtp -a grigory@shipunov.xyz"
 alias me Grigory Shipunov <grigory@shipunov.xyz>
 set folder = "~/mail/grigory@shipunov.xyz"
 set header_cache = "~/.cache/mutt-cache/grigory@shipunov.xyz/headers"
diff --git a/mail/.config/neomutt/accounts/3-dump@dvb.solutions.muttrc b/mail/.config/neomutt/accounts/3-dump@dvb.solutions.muttrc
index c594380..0342ed0 100644
--- a/mail/.config/neomutt/accounts/3-dump@dvb.solutions.muttrc
+++ b/mail/.config/neomutt/accounts/3-dump@dvb.solutions.muttrc
@@ -2,7 +2,6 @@
 # muttrc file for account dump@dvb.solutions
 set realname = "dump"
 set from = "dump@dvb.solutions"
-set sendmail = "msmtp -a dump@dvb.solutions"
 alias me dump <dump@dvb.solutions>
 set folder = "~/mail/dump@dvb.solutions"
 set header_cache = "~/.cache/mutt-cache/dump@dvb.solutions/headers"
diff --git a/mail/.config/neomutt/accounts/4-grigory@tlm.solutions.muttrc b/mail/.config/neomutt/accounts/4-grigory@tlm.solutions.muttrc
index 4f80f6e..59dd8e5 100644
--- a/mail/.config/neomutt/accounts/4-grigory@tlm.solutions.muttrc
+++ b/mail/.config/neomutt/accounts/4-grigory@tlm.solutions.muttrc
@@ -1,6 +1,5 @@
 set realname = "Grigory Shipunov"
 set from = "grigory@tlm.solutions"
-set sendmail = "msmtp -a grigory@tlm.solutions"
 alias me <grigory@tlm.solutions>
 set folder = "~/mail/grigory@tlm.solutions"
 set header_cache = "~/.cache/mutt-cache/grigory_tlm.solutions/headers"
diff --git a/mail/.config/neomutt/defaults.muttrc b/mail/.config/neomutt/defaults.muttrc
index a705c8a..04cf1be 100644
--- a/mail/.config/neomutt/defaults.muttrc
+++ b/mail/.config/neomutt/defaults.muttrc
@@ -1,4 +1,8 @@
 set mailcap_path = ~/.config/neomutt/mailcap:$mailcap_path
+
+set sendmail = "msmtpq --read-envelope-from"
+set sendmail_wait = -1
+
 set mime_type_query_command = "file --mime-type -b %s"
 set date_format="%y-%m-%d %H:%M"
 set index_format="%2C %Z %?X?A& ? %D %-25.25F %s (%-4.4c)"