diff --git a/nvim/.config/nvim/after/ftplugin/git.lua b/nvim/.config/nvim/after/ftplugin/git.lua
new file mode 100644
index 0000000..309ad95
--- /dev/null
+++ b/nvim/.config/nvim/after/ftplugin/git.lua
@@ -0,0 +1,2 @@
+vim.b.minitrailspace_disable = true
+vim.b.spell                  = false
diff --git a/nvim/.config/nvim/after/ftplugin/git.vim b/nvim/.config/nvim/after/ftplugin/git.vim
index 7f8d3d7..08b38fe 100644
--- a/nvim/.config/nvim/after/ftplugin/git.vim
+++ b/nvim/.config/nvim/after/ftplugin/git.vim
@@ -1,5 +1,3 @@
-setlocal nospell
-
 nnoremap <buffer> <silent>q  :bwipeout!<CR>
 
 nnoremap <buffer> <Leader>gb :call git#git_branch_checkout()<CR>
diff --git a/nvim/.config/nvim/after/ftplugin/gitcommit.lua b/nvim/.config/nvim/after/ftplugin/gitcommit.lua
index 2838634..186a4f6 100644
--- a/nvim/.config/nvim/after/ftplugin/gitcommit.lua
+++ b/nvim/.config/nvim/after/ftplugin/gitcommit.lua
@@ -1,5 +1,6 @@
-vim.bo.textwidth = 72
-vim.bo.bufhidden = 'wipe'
+vim.b.textwidth              = 72
+vim.b.bufhidden              = 'wipe'
+vim.b.minitrailspace_disable = true
 
 vim.keymap.set('n', '[c', "?^@@<CR>", { noremap=true, silent=true, buffer=0 })
 vim.keymap.set('n', ']c', "/^@@<CR>", { noremap=true, silent=true, buffer=0 })
diff --git a/nvim/.config/nvim/after/ftplugin/gitsendemail.lua b/nvim/.config/nvim/after/ftplugin/gitsendemail.lua
new file mode 100644
index 0000000..309ad95
--- /dev/null
+++ b/nvim/.config/nvim/after/ftplugin/gitsendemail.lua
@@ -0,0 +1,2 @@
+vim.b.minitrailspace_disable = true
+vim.b.spell                  = false
diff --git a/nvim/.config/nvim/after/ftplugin/mail.lua b/nvim/.config/nvim/after/ftplugin/mail.lua
new file mode 100644
index 0000000..424d83c
--- /dev/null
+++ b/nvim/.config/nvim/after/ftplugin/mail.lua
@@ -0,0 +1 @@
+vim.b.minitrailspace_disable = true