diff --git a/etc/shared.conf b/etc/shared.conf
index 39e502a..175d9a9 100644
--- a/etc/shared.conf
+++ b/etc/shared.conf
@@ -107,18 +107,6 @@ color-regexp                     = "[0-9]{4}-[0-9]?[0-9]-[0-9]?[0-9]" #0000ff bo
 
 color-regexp                     = "-?[0-9]+(.[0-9]+)?%" #ff00ff bold
 
-# *bold*
-
-color-regexp                     = "\*[^*]+\*" #ffff00 bold
-
-# _underline_
-
-color-regexp                     = "_[^_]+_" #ffff00 underline
-
-# /italic/ , commented as interferes with file path and URI
-
-#color-regexp                     = "/[^/]+/" #ffff00 italic
-
 # by default polls uses that
 
 color-regexp                     = "⯀" green bold
@@ -135,7 +123,7 @@ color-regexp                     = "[012][0-9]:[0123456][0-9]" cyan bold
 
 # mentions
 
-color-regexp                     = "@[a-zA-Z0-9]+ " cyan
+color-regexp                     = "@[^\s]+" cyan
 
 # gemini colorization
 
@@ -167,6 +155,18 @@ color-regexp                     = ":aborted"   red
 
 color-regexp                     = ":rendering" cyan
 
+# _underline_
+
+color-regexp                     = "_[^_]+_" #ffff00 underline
+
+# *bold*
+
+color-regexp                     = "\*[^*]+\*" #ffff00 bold
+
+# /italic/ , commented as interferes with file path and URI
+
+#color-regexp                     = "/[^/]+/" #ffff00 italic
+
 # The width of  the generated table of contents for  gemini pages when
 # tinmop is ran as exclusive gemini client (command line option "-G")
 
diff --git a/src/sending-message.lisp b/src/sending-message.lisp
index fd99f6f..e02c1fc 100644
--- a/src/sending-message.lisp
+++ b/src/sending-message.lisp
@@ -121,7 +121,7 @@
                (label-subject-raw           (_ "Subject: "))
                (label-visibility-raw        (_ "Visibility: "))
                (label-reply-length-raw      (length label-reply-raw))
-               (label-mentions-length-raw    (length label-mentions-raw))
+               (label-mentions-length-raw   (length label-mentions-raw))
                (label-subject-raw-length    (length label-subject-raw))
                (label-visibility-raw-length (length label-visibility-raw))
                (max-field-length            (max label-reply-length-raw