diff --git a/elisp/extras.el b/elisp/extras.el
index a65391c..ee303dc 100644
--- a/elisp/extras.el
+++ b/elisp/extras.el
@@ -43,6 +43,9 @@
 ;; git
 (use-package magit)
 
+;; This package was installed with debian, I hope this works
+(use-package mu4e)
+
 ;;R
 (use-package auto-complete)
 (use-package ess
diff --git a/elisp/mu4e-setup.el b/elisp/mu4e-setup.el
new file mode 100644
index 0000000..b57bd3a
--- /dev/null
+++ b/elisp/mu4e-setup.el
@@ -0,0 +1,36 @@
+;; Largely based on ... and ...
+;; use mu4e for e-mail in emacs
+(setq mail-user-agent 'mu4e-user-agent)
+
+;; Set the root maildir
+(setq mu4e-maildir "~/.mail")
+
+;; some other dirs
+(setq mu4e-sent-folder "/posteo/Sent"
+      mu4e-drafts-folder "/drafts")
+
+;; a  list of user's e-mail addresses
+(setq mu4e-user-mail-address-list '("mprodrigues@posteo.net"))
+
+;; the headers to show in the headers list -- a pair of a field
+;; and its width, with `nil' meaning 'unlimited'
+;; (better only use that for the last field.
+;; These are the defaults:
+(setq mu4e-headers-fields
+    '( (:date          .  25)    ;; alternatively, use :human-date
+       (:flags         .   6)
+       (:from          .  22)
+       (:subject       .  nil))) ;; alternatively, use :thread-subject
+
+;; general emacs mail settings; used when composing e-mail
+;; the non-mu4e-* stuff is inherited from emacs/message-mode
+(setq mu4e-compose-reply-to-address "mprodrigues@posteo.net"
+      user-mail-address "mprodrigues@posteo.net"
+      user-full-name  "Mateus P. Rodrigues")
+
+;; SMTP configuration
+(setq message-send-mail-function 'smtpmail-send-it
+      user-mail-address "mprodrigues@posteo.net"
+      smtpmail-default-smtp-server "posteo.de"
+      smtpmail-smtp-server "posteo.de"
+      smtpmail-smtp-service 587)
diff --git a/elisp/settings.el b/elisp/settings.el
index fbc97b9..1e41f2b 100644
--- a/elisp/settings.el
+++ b/elisp/settings.el
@@ -7,6 +7,9 @@
 ;; Set default encoding
 (setq current-language-environment "UTF-8")
 
+;; Handle pinentry in minibuffer if called from emacs
+(setq epg-pinentry-mode "loopback")
+
 ;; Always do syntax highlighting
 (global-font-lock-mode 1)
 
diff --git a/init.el b/init.el
index 407fa00..9f8bd74 100644
--- a/init.el
+++ b/init.el
@@ -23,6 +23,8 @@
 	     '("gnu" . "http://elpa.gnu.org/packages/"))
 
 (add-to-list 'load-path "~/.emacs.d/elisp/")
+;; load debian mu4e package
+(add-to-list 'load-path "/usr/share/emacs/site-lisp/mu4e")
 
 (load "~/.emacs.d/elisp/settings.el")
 (load "~/.emacs.d/elisp/extras.el")