diff --git a/emacs/mu4e-vars.el b/emacs/mu4e-vars.el
index e6ef0fcb..2ffd1222 100644
--- a/emacs/mu4e-vars.el
+++ b/emacs/mu4e-vars.el
@@ -224,7 +224,7 @@ e-mail message (if there is any."
   :group 'mu4e-view)
 
 (defcustom mu4e-html2text-command nil
-  "Shel command that converts HTML from stdin into plain text on
+  "Shell command that converts HTML from stdin into plain text on
 stdout. If this is not defined, the emacs `html2text' tool will be
 used when faced with html-only message. If you use htmltext, it's
 recommended you use \"html2text -utf8 -width 72\"."
@@ -232,6 +232,12 @@ recommended you use \"html2text -utf8 -width 72\"."
   :group 'mu4e-view
   :safe 'stringp)
 
+(defcustom mu4e-view-show-addresses t
+  "Whether to show e-mail addresses for contacts in address-fields,
+  if names are available as well (note that the e-mail addresses
+  are still available as a tooltip."
+  :type 'boolean
+  :group 'mu4e-view)
 
 (defcustom mu4e-view-wrap-lines nil
   "Whether to automatically wrap lines in the body of messages when
diff --git a/emacs/mu4e-view.el b/emacs/mu4e-view.el
index 64a72ea4..e2055e69 100644
--- a/emacs/mu4e-view.el
+++ b/emacs/mu4e-view.el
@@ -161,9 +161,14 @@ DONT-PROPERTIZE-VAL, do not add text-properties to VAL."
 	      (mapconcat
 		(lambda(c)
 		  (let ((name (car c)) (email (cdr c)))
-		    (if name
-		      (format "%s <%s>" name email)
-		      (format "%s" email)))) lst ", "))))
+		    (propertize
+		      (if name
+			(if mu4e-view-show-addresses
+			  (format "%s <%s>" name email)
+			  (format "%s" name))
+			(format "%s" email))
+		      'help-echo email)))
+		lst ", "))))
     (if contacts
       (mu4e-view-header fieldname contacts)
       "")))
diff --git a/emacs/mu4e.texi b/emacs/mu4e.texi
index 1db0cb22..3f58c246 100644
--- a/emacs/mu4e.texi
+++ b/emacs/mu4e.texi
@@ -637,13 +637,17 @@ variable @code{mu4e-view-fields}.
 @item You can customize the date format by setting the variable
 @code{mu4e-date-format-long}, using the same format that
 @code{format-time-string} uses.
+@item If you only want to see the name and not the e-mail address of the
+contacts in address fields, you can set @option{mu4e-view-show-addresses} to
+@t{nil}. This will hide the addresses for contacts that also have a name. The
+e-mail address is still available as a tool-tip.
 @item The body text can be line-wrapped (toggle between wrapped/not-wrapped with
 @key{w}) and/or cited parts can be hidden (toggle between hidden/not-hidden
 with @key{h}. If you want to do this by default when viewing messages, you can
 set, respectively, @code{mu4e-view-wrap-lines} and @code{mu4e-view-hide-cited}
 to @code{t}. @footnote{If you have installed the @t{filladapt} package
-(@url{http://www.wonderworks.com/download/filladapt.el}), @t{mu4e} will use
-it for line-wrapping, as it generally does a better job than the default
+(@url{http://www.wonderworks.com/download/filladapt.el}), @t{mu4e} will use it
+for line-wrapping, as it generally does a better job than the default
 mechanism emacs provides.}
 
 @end itemize