diff --git a/nvim/.config/nvim/autoload/mine/functions.vim b/nvim/.config/nvim/autoload/mine/functions.vim
new file mode 100644
index 00000000..b61469fe
--- /dev/null
+++ b/nvim/.config/nvim/autoload/mine/functions.vim
@@ -0,0 +1,12 @@
+function! mine#functions#text() abort
+	" set spellchecking
+	set spell
+
+	" Add undo points when this punctuation is added
+	inoremap <buffer> ! !<C-g>u
+	inoremap <buffer> , ,<C-g>u
+	inoremap <buffer> . .<C-g>u
+	inoremap <buffer> : :<C-g>u
+	inoremap <buffer> ; ;<C-g>u
+	inoremap <buffer> ? ?<C-g>u
+endfunction
diff --git a/nvim/.config/nvim/ftplugin/gitcommit.vim b/nvim/.config/nvim/ftplugin/gitcommit.vim
new file mode 100644
index 00000000..48937529
--- /dev/null
+++ b/nvim/.config/nvim/ftplugin/gitcommit.vim
@@ -0,0 +1 @@
+call mine#functions#text()
diff --git a/nvim/.config/nvim/ftplugin/mail.vim b/nvim/.config/nvim/ftplugin/mail.vim
index bcda2dde..48937529 100644
--- a/nvim/.config/nvim/ftplugin/mail.vim
+++ b/nvim/.config/nvim/ftplugin/mail.vim
@@ -1 +1 @@
-setlocal spell
+call mine#functions#text()
diff --git a/nvim/.config/nvim/ftplugin/markdown.vim b/nvim/.config/nvim/ftplugin/markdown.vim
index bcda2dde..48937529 100644
--- a/nvim/.config/nvim/ftplugin/markdown.vim
+++ b/nvim/.config/nvim/ftplugin/markdown.vim
@@ -1 +1 @@
-setlocal spell
+call mine#functions#text()