diff --git a/mu4e/mu4e-main.el b/mu4e/mu4e-main.el
index b6c54c16..999e74b3 100644
--- a/mu4e/mu4e-main.el
+++ b/mu4e/mu4e-main.el
@@ -77,7 +77,7 @@ a string, execute the corresponding keyboard action when it is
 clicked."
   (let ((newstr
 	  (replace-regexp-in-string
-	    "\\[\\(.\\)\\]"
+	    "\\[\\(..?\\)\\]"
 	    (lambda(m)
 	      (format "[%s]"
 		(propertize (match-string 1 m) 'face 'mu4e-highlight-face)))
@@ -92,7 +92,7 @@ clicked."
     (define-key map [mouse-2] func)
     (define-key map (kbd "RET") func)
     (put-text-property 0 (length newstr) 'keymap map newstr)
-    (put-text-property (string-match "\\w" newstr)
+    (put-text-property (string-match "\\[.+" newstr)
       (- (length newstr) 1) 'mouse-face 'highlight newstr) newstr))