diff --git a/init-custom.el b/init-custom.el
index 754689d66..347413452 100644
--- a/init-custom.el
+++ b/init-custom.el
@@ -16,6 +16,7 @@
    (quote
     (capitalized-words-mode turn-on-haskell-decl-scan turn-on-haskell-doc turn-on-hi2)))
  '(it-mode-google-cmd "/usr/local/bin/google")
+ '(mu4e-use-fancy-chars t)
  '(ns-alternate-modifier (quote none))
  '(ns-command-modifier (quote meta))
  '(require-final-newline (quote visit-save)))
diff --git a/init-modes.el b/init-modes.el
index d24ee7b0c..1664de11f 100644
--- a/init-modes.el
+++ b/init-modes.el
@@ -27,11 +27,18 @@
 ;; Use ac-nrepl for completion
 (add-hook 'nrepl-mode-hook 'ac-nrepl-setup)
 (add-hook 'nrepl-interaction-mode-hook 'ac-nrepl-setup)
-(eval-after-load "auto-complete"
-   '(add-to-list 'ac-modes 'nrepl-mode))
+
+;; I want history up/down without modifiers
+(define-key nrepl-mode-map (kbd "<up>") 'nrepl-backward-input)
+(define-key nrepl-mode-map (kbd "<down>") 'nrepl-forward-input)
+(define-key nrepl-mode-map (kbd "C-<up>") 'previous-line)
+(define-key nrepl-mode-map (kbd "C-<down>") 'next-line)
 
 (define-key nrepl-interaction-mode-map (kbd "C-c C-d") 'ac-nrepl-popup-doc)
 
+(eval-after-load "auto-complete"
+   '(add-to-list 'ac-modes 'nrepl-mode))
+
 ;; Paredit in clojure
 (add-hook 'clojure-mode-hook 'paredit-mode)
 
diff --git a/init-settings.el b/init-settings.el
index 373049796..4256ba1c0 100644
--- a/init-settings.el
+++ b/init-settings.el
@@ -9,6 +9,8 @@
 
 ;;; Code:
 
+(add-to-list 'load-path "/usr/local/share/emacs/site-lisp/mu4e")
+
 (add-to-list 'exec-path "/usr/local/bin")
 (add-to-list 'exec-path (expand-file-name "~/bin"))
 (add-to-list 'exec-path "/Applications/Racket/bin")
diff --git a/init.el b/init.el
index c89a6d0e2..9281861bb 100644
--- a/init.el
+++ b/init.el
@@ -70,6 +70,9 @@
 ;; Actual servers and such are loaded from irc.el
 (load-file-if-exists "~/.emacs.d/init-irc.el")
 
+;; Mail configuration (mu4e && mbsync)
+(load-file-if-exists "~/.emacs.d/init-mail.el")
+
 ;; Load magnars' string manipulation library
 (require 's)