diff --git a/meli.1 b/meli.1
index 900c929a..f7150d26 100644
--- a/meli.1
+++ b/meli.1
@@ -153,6 +153,19 @@ to
 \&.
 .Nm
 will relay your queries to the IMAP server. Expect a delay between query and response. Sqlite3 on the contrary at reasonable mailbox sizes should have a non noticable delay.
+.Sh TAGS
+.Nm
+supports tagging in notmuch and IMAP backends. Tags can be searched with the `tags:` or `flags:` prefix in a search query, and can be modified by
+.Cm tag add TAG
+and
+.Cm tag remove TAG
+(see
+.Xr meli.conf 5 TAGS Ns
+, settings
+.Ic colors
+and
+.Ic ignore_tags
+for how to set tag colors and tag visiblity)
 .Sh COMPOSING
 To send mail, press
 .Cm m
diff --git a/meli.conf.5 b/meli.conf.5
index e6098e07..0f54a535 100644
--- a/meli.conf.5
+++ b/meli.conf.5
@@ -544,6 +544,25 @@ enable freedesktop-spec notifications. this is usually what you want
 .\" default value
 .Pq Em 80
 .El
+.Sh TAGS
+.Bl -tag -width 36n
+.It Ic colours Ar hash table String[Color]
+(optional) set UI colors for tags
+.It Ic ignore_Tags Ar Array String
+(optional) hide tags (not the tagged messages themselves)
+
+.Sy example configuration
+.Bd -literal
+[tags]
+# valid inputs: #HHHHHH, #ABC -> #AABBCC, XTERM_NAME, 0-255 byte
+colors = { signed="#Ff6600", replied="DeepSkyBlue4", draft="#f00", replied="8" }
+[accounts.dummy]
+\&...8<--
+  [accounts.dummy.folders]
+  # per folder override:
+  "INBOX" = {  tags.ignore_tags=["inbox", ] }
+.Ed
+.El
 .Sh PGP
 .Bl -tag -width 36n
 .It Ic auto_verify_signatures Ar boolean