Resolved vimrc conflicts.
New ftplugin settings for mail files.