diff --git a/mu4e/mu4e-compose.el b/mu4e/mu4e-compose.el
index 94beab1d..ecc982f0 100644
--- a/mu4e/mu4e-compose.el
+++ b/mu4e/mu4e-compose.el
@@ -55,7 +55,7 @@
 
 ;;  a) is dealt with by message-mode, but we need to tell it where to move the
 ;;     sent message. We do this by adding an Fcc: header with the target folder,
-;;     see `mu4e~setup-fcc-maybe'. Since message-mode does not natively
+;;     see `mu4e~compose-setup-fcc-maybe'. Since message-mode does not natively
 ;;     understand maildirs, we also need to tell it what to do, so we also set
 ;;     `message-fcc-handler-function' there. Finally, we add the the message in
 ;;     the sent-folder to the database.
diff --git a/mu4e/mu4e-headers.el b/mu4e/mu4e-headers.el
index fa73765d..8364e29f 100644
--- a/mu4e/mu4e-headers.el
+++ b/mu4e/mu4e-headers.el
@@ -127,6 +127,25 @@ sent messages into message threads."
   :type 'boolean
   :group 'mu4e-headers)
 
+(defcustom mu4e-headers-visible-flags
+  '('draft 'flagged 'new 'passed 'replied 'seen 'trashed 'attach 'encrypted 'signed 'unread)
+  "An ordered list of flags to show in the headers buffer. Each
+element is a symbol in the list (DRAFT FLAGGED NEW PASSED
+REPLIED SEEN TRASHED ATTACH ENCRYPTED SIGNED UNREAD)."
+  :type '(set
+          (const :tag "Draft" 'draft)
+          (const :tag "Flagged" 'flagged)
+          (const :tag "New" 'new)
+          (const :tag "Passed" 'passed)
+          (const :tag "Replied" 'replied)
+          (const :tag "Seen" 'seen)
+          (const :tag "Trashed" 'trashed)
+          (const :tag "Attach" 'attach)
+          (const :tag "Encrypted" 'encrypted)
+          (const :tag "Signed" 'signed)
+          (const :tag "Unread" 'unread))
+  :group 'mu4e-headers)
+
 ;; marks for headers of the form; each is a cons-cell (basic . fancy)
 ;; each of which is basic ascii char and something fancy, respectively
 (defvar mu4e-headers-draft-mark     (purecopy '("D" . "⚒")) "Draft.")
@@ -322,25 +341,26 @@ Note that `mu4e-flags-to-string' is for internal use only; this
 function is for display. (This difference is significant, since
 internally, the Maildir spec determines what the flags look like,
 while our display may be different)."
-  (let ((str)
-	 (get-prefix
-	   (lambda (cell) (if mu4e-use-fancy-chars (cdr cell) (car cell)))))
-    (dolist (flag flags)
-      (setq str
-	(concat str
-	  (case flag
-	    ('draft     (funcall get-prefix mu4e-headers-draft-mark))
-	    ('flagged   (funcall get-prefix mu4e-headers-flagged-mark))
-	    ('new       (funcall get-prefix mu4e-headers-new-mark))
-	    ('passed    (funcall get-prefix mu4e-headers-passed-mark))
-	    ('replied   (funcall get-prefix mu4e-headers-replied-mark))
-	    ('seen      (funcall get-prefix mu4e-headers-seen-mark))
-	    ('trashed   (funcall get-prefix mu4e-headers-trashed-mark))
-	    ('attach    (funcall get-prefix mu4e-headers-attach-mark))
-	    ('encrypted (funcall get-prefix mu4e-headers-encrypted-mark))
-	    ('signed    (funcall get-prefix mu4e-headers-signed-mark))
-	    ('unread    (funcall get-prefix mu4e-headers-unread-mark))))))
-	   str))
+  (let ((str "")
+        (get-prefix
+         (lambda (cell) (if mu4e-use-fancy-chars (cdr cell) (car cell)))))
+    (dolist (flag mu4e-headers-visible-flags)
+      (when (member flag flags)
+        (setq str
+              (concat str
+                      (case flag
+                        ('draft     (funcall get-prefix mu4e-headers-draft-mark))
+                        ('flagged   (funcall get-prefix mu4e-headers-flagged-mark))
+                        ('new       (funcall get-prefix mu4e-headers-new-mark))
+                        ('passed    (funcall get-prefix mu4e-headers-passed-mark))
+                        ('replied   (funcall get-prefix mu4e-headers-replied-mark))
+                        ('seen      (funcall get-prefix mu4e-headers-seen-mark))
+                        ('trashed   (funcall get-prefix mu4e-headers-trashed-mark))
+                        ('attach    (funcall get-prefix mu4e-headers-attach-mark))
+                        ('encrypted (funcall get-prefix mu4e-headers-encrypted-mark))
+                        ('signed    (funcall get-prefix mu4e-headers-signed-mark))
+                        ('unread    (funcall get-prefix mu4e-headers-unread-mark)))))))
+    str))
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 
diff --git a/mu4e/mu4e-view.el b/mu4e/mu4e-view.el
index 019b3ad2..bb148abb 100644
--- a/mu4e/mu4e-view.el
+++ b/mu4e/mu4e-view.el
@@ -255,9 +255,9 @@ add text-properties to VAL."
 	  (help (plist-get info :help)))
     (if (and val (> (length val) 0))
     (with-temp-buffer
-      (insert (propertize key
+      (insert (propertize (concat key ":")
 		'face 'mu4e-view-header-key-face
-		'help-echo help) ": "
+		'help-echo help) " "
 	(if dont-propertize-val
 	  val
 	  (propertize val 'face 'mu4e-view-header-value-face)) "\n")
@@ -437,9 +437,8 @@ at POINT, or if nil, at (point)."
 			"[mouse-1] or [M-RET] opens the attachment\n"
 			"[mouse-2] or [S-RET] offers to save it"))
 		    (when (and size (> size 0))
-		      (concat (format "(%s)"
-				(propertize (mu4e-display-size size)
-				  'face 'mu4e-view-header-key-face)))))))
+		      (propertize (format "(%s)" (mu4e-display-size size))
+                                  'face 'mu4e-view-header-key-face)))))
 	      attachments ", ")))
     (when attachments
       (mu4e~view-construct-header :attachments attstr t))))