diff --git a/.muttrc b/.muttrc
index 82bcaed..c4188b4 100644
--- a/.muttrc
+++ b/.muttrc
@@ -1,5 +1,5 @@
 ## general settings
-set editor = "vim -u ~/.vimrc-mail"
+set editor = "vim"
 set sort = reverse-threads
 set use_envelope_from = yes
 set use_from = yes
diff --git a/.vimrc b/.vimrc
new file mode 100644
index 0000000..13899c7
--- /dev/null
+++ b/.vimrc
@@ -0,0 +1,36 @@
+" Set to 256 color mode.
+set t_Co=256
+" Enable syntax highlighting.
+syntax on
+" Set color scheme.
+colorscheme darkburn 
+" Enable line numbering.
+set number
+" Disable word wrap.
+set nowrap
+" Set tab to 4 characters.
+set tabstop=4
+" Enable smart indent.
+set smartindent
+set autoindent
+" Set smartindent width to 4 characters.
+set shiftwidth=4
+" Highlight search and increment search.
+set hlsearch
+set incsearch
+" Show matching brackets.
+set showmatch
+" Disable modeline support.
+set nomodeline
+
+set expandtab
+set softtabstop=4
+
+if $MONO == "yes"
+    colorscheme default
+    syntax off
+    set nonumber
+endif
+
+au FileType mail set tw=72 spell spelllang=en_us nonumber
+au FileType gitcommit set tw=72 spell spelllang=en_us nonumber