diff --git a/plugin/settings.vim b/plugin/settings.vim
index 0c07003..cbfda5b 100644
--- a/plugin/settings.vim
+++ b/plugin/settings.vim
@@ -1,6 +1,13 @@
+scriptencoding 'utf-8'
+
 " Enable all mouse features
 set mouse=a
 
+" Enable visually highlighting listchars
+set list
+" Set visible chars for trailing white space and tabs
+set listchars=trail:·,tab:»»
+
 " TODO: spellcapcheck
 " TODO: virtualedit=block
 " TODO: whichwrap=b,h,l,s,<,>,[,],~
@@ -32,7 +39,7 @@ if has('writebackup')
 endif
 
 " Wrap to whole words
-set wrap nolist
+set wrap
 if has('linebreak')
   set linebreak
 endif
diff --git a/vimrc b/vimrc
index a6e74ae..de1928c 100644
--- a/vimrc
+++ b/vimrc
@@ -1,4 +1,5 @@
-scriptencoding 'utf-8'
+set encoding=utf-8
+scriptencoding 'utf-8'
 
 " Set leader to space
 let g:mapleader = ' '