diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 9efa11df7..85412f4df 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1631,7 +1631,11 @@ au BufNewFile,BufRead *.mm			call dist#ft#FTmm()
 au BufNewFile,BufRead *.nqc			setf nqc
 
 " notmuch
-au BufNewFile,BufRead .notmuch-config		setf dosini
+au BufNewFile,BufRead .notmuch-config{,.*}		setf dosini
+au BufNewFile,BufRead ~/.config/notmuch/*/config	setf dosini
+if exists('$XDG_CONFIG_HOME')
+  au BufNewFile,BufRead $XDG_CONFIG_HOME/notmuch/*/config setf dosini
+endif
 
 " NSE - Nmap Script Engine - uses Lua syntax
 au BufNewFile,BufRead *.nse			setf lua
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index b08c0f9b7..8977d7e3e 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -223,7 +223,8 @@ def s:GetFilenameChecks(): dict<list<string>>
              '.coveragerc', '.pypirc', '.gitlint', '.oelint.cfg', 'pylintrc', '.pylintrc',
              '/home/user/.config/bpython/config', '/home/user/.config/mypy/config', '.wakatime.cfg', '.replyrc',
              'psprint.conf', 'sofficerc', 'any/.config/lxqt/globalkeyshortcuts.conf', 'any/.config/screengrab/screengrab.conf',
-             'any/.local/share/flatpak/repo/config', '.notmuch-config'],
+             'any/.local/share/flatpak/repo/config', '.notmuch-config', '.notmuch-config.myprofile',
+             '~/.config/notmuch/myprofile/config'] + WhenConfigHome('$XDG_CONFIG_HOME/notmuch/myprofile/config'),
     dot: ['file.dot', 'file.gv'],
     dracula: ['file.drac', 'file.drc', 'file.lvs', 'file.lpe', 'drac.file'],
     dtd: ['file.dtd'],
diff --git a/src/version.c b/src/version.c
index c6f313b55..7378bab80 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    744,
 /**/
     743,
 /**/