diff --git a/.emacs.d/functions.el b/.emacs.d/functions.el
index dcf6723..a8d17d7 100644
--- a/.emacs.d/functions.el
+++ b/.emacs.d/functions.el
@@ -174,10 +174,6 @@ Currently adds | & ! . + = - / % * , < > ? : ->"
   (setq fill-column 73)
   (auto-fill-mode))
 
-(defun on-mail-mode ()
-  (turn-on-auto-fill)
-  (search-forward "\n\n"))
-
 (defun pretty-lambdas ()
   (font-lock-add-keywords
    nil `(("(\\(lambda\\>\\)"
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 5319926..365520e 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -133,6 +133,13 @@
 
 ;;; bidi
 (setq-default bidi-display-reordering nil)
+
+;;; Message
+(add-to-list 'auto-mode-alist '(".*mutt.*"            . message-mode))
+(add-hook 'message-mode-hook
+          (lambda ()
+            (turn-on-auto-fill)
+            (turn-on-flyspell)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                         AUTOLOADS                          ;;
@@ -174,7 +181,6 @@
 (setq ido-auto-merge-delay-time 2)      ; Wait before fixing names
 (setq mouse-autoselect-window t)
 (setq pop-up-windows nil)
-(setq mail-header-separator "")
 
 (setq frame-title-format ; I don't like emacs@cloud, must have file
  '(:eval                 ; name
@@ -223,7 +229,6 @@
 (add-to-list 'auto-mode-alist '("\\.cmake$"           . cmake-mode))
 (add-to-list 'auto-mode-alist '("\\.css$"             . css-mode))
 (add-to-list 'auto-mode-alist '("stumpwmrc"           . stumpwm-mode))
-(add-to-list 'auto-mode-alist '(".*mutt.*"            . message-mode))
 (add-to-list 'auto-mode-alist '("COMMIT_EDITMSG$"     . git-commit-mode))
 
 (add-to-list 'file-coding-system-alist '("\\.vala$" . utf-8))
@@ -257,7 +262,6 @@
 
 (add-hook 'c-mode-hook                'on-c-mode)
 (add-hook 'html-mode-hook             'on-html-mode)
-(add-hook 'message-mode-hook          'on-mail-mode)
 (add-hook 'git-commit-mode-hook       'auto-fill-mode)
 (add-hook 'css-mode-hook              'rainbow-mode)