core: add option "tags" for command /debug

27 files changed, 281 insertions, 108 deletions

diff --git a/ChangeLog b/ChangeLog
index aaf285aaf..ca78ea16d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,7 +10,7 @@ Version 0.3.6 (under dev!)
 * core: add "hdata" (direct access to WeeChat/plugin data)
 * core: add option weechat.look.eat_newline_glitch (do not add new line at end
   of each line displayed)
-* core: add option "infolists" for command /debug
+* core: add options "infolists", "hdata" and "tags" for command /debug
 * core: add horizontal scrolling for buffers with free content (command
   /window scroll_horiz) (task #11112)
 * api: fix bug with function config_set_desc_plugin (use immediately
diff --git a/doc/de/autogen/user/weechat_commands.txt b/doc/de/autogen/user/weechat_commands.txt
index c999e32ba..8cc957e03 100644
--- a/doc/de/autogen/user/weechat_commands.txt
+++ b/doc/de/autogen/user/weechat_commands.txt
@@ -145,7 +145,7 @@ Erweiterung: Name der Erweiterung ('weechat' für interne WeeChat Befehle)
 /debug  list
         set <plugin> <level>
         dump [<plugin>]
-        buffer|color|hdata|infolists|memory|term|windows
+        buffer|color|hdata|infolists|memory|tags|term|windows
 
      list: list plugins with debug levels
       set: set debug level for plugin
@@ -157,6 +157,7 @@ Erweiterung: Name der Erweiterung ('weechat' für interne WeeChat Befehle)
     hdata: display infos about hdata
 infolists: display infos about infolists
    memory: display infos about memory usage
+     tags: display tags for lines
      term: display infos about terminal
   windows: display windows tree
 ........................................
@@ -168,50 +169,51 @@ infolists: display infos about infolists
          add <name> <buffer>[,<buffer>...] <tags> <regex>
          del <name>|-all
 
-   list: alle Filter auflisten
- enable: Filter wird aktiviert (Filter werden standardmässig aktiviert)
-disable: Filter deaktivieren
- toggle: Filter de-/aktivieren
-   name: Name des Filters
-    add: Filter hinzufügen
-    del: Filter entfernen
-   -all: entfernt alle Filter
- buffer: durch Kommata getrennte Liste von Buffern in denen der Filter aktiv sein soll:
-         - ist der vollständige Name eines Buffers inklusive seiner Erweiterung (Beispiel: "irc.freenode.#weechat")
-         - "*" bedeutet alle Buffer
-         - beginnt ein Name mit '!' wird für diesen Buffer kein Filter genutzt
-         - ein Name darf mit '*' beginnen oder enden um mehrere Buffer auszuwählen
-   tags: durch Kommata  getrennte Liste mit Tags. Zum Beispiel: "irc_join,irc_part,irc_quit"
-        regex: regulärer Ausdruck um in einer Zeile zu suchen
-               - das Präfix (z.B. Nick) wird mittels '\t' von der Nachricht getrennt. Sonderzeichen wie '|' müssen mit einer Escapesequenz : '\|' eingebunden werden)
-               - wird ein regulärer Ausdruck mit '!' eingeleitet dann wird das übereinstimmende Ergebnis umgekehrt  (nutze '\!' um mit '!' zu beginnen)
-               - es werden zwei reguläre Ausdrücke erstellt: Der erste für den Präfix und der zweite für die eigentliche Nachricht
-
-Die Tastenvoreinstellung alt+'=' schaltet die Filterfunktion an/aus.
-
-Die am häufigsten gebrauchten Tags lauten:
-  no_filter, no_highlight, no_log, log0..log9 (log Level),
+   list: list all filters
+ enable: enable filters (filters are enabled by default)
+disable: disable filters
+ toggle: toggle filters
+   name: filter name
+    add: add a filter
+    del: delete a filter
+   -all: delete all filters
+ buffer: comma separated list of buffers where filter is active:
+         - this is full name including plugin (example: "irc.freenode.#weechat")
+         - "*" means all buffers
+         - a name starting with '!' is excluded
+         - name can start or end with '*' to match many buffers
+   tags: comma separated list of tags, for example: "irc_join,irc_part,irc_quit"
+  regex: regular expression to search in line
+         - use '\t' to separate prefix from message, special chars like '|' must be escaped: '\|'
+         - if regex starts with '!', then matching result is reversed (use '\!' to start with '!')
+         - two regular expressions are created: one for prefix and one for message
+
+The default key alt+'=' toggles filtering on/off.
+
+Tags most commonly used:
+  no_filter, no_highlight, no_log, log0..log9 (log level),
   notify_none, notify_message, notify_private, notify_highlight,
-  nick_xxx (xxx ist durch den Nicknamen zu ersetzen),
-  irc_xxx (xxx ist durch einen IRC-Befehl/-Nummer zu ersetzen, siehe /server raw)
+  nick_xxx (xxx is nick in message),
+  irc_xxx (xxx is command name or number, see /server raw),
   irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, irc_smart_filter, away_info.
+To see tags for lines in buffers: /debug tags
 
-Beispiele:
-  aktiviert einen einfachen IRC Filter für join/part/quit/nick Nachrichten für alle Buffer:
+Examples:
+  use IRC smart filter on all buffers:
     /filter add irc_smart * irc_smart_filter *
-  aktiviert einen einfachen IRC Filter für join/part/quit/nick Nachrichten der für alle Buffer genutzt wird, außer Buffer die "#weechat" im Namen tragen:
+  use IRC smart filter on all buffers except those with "#weechat" in name:
     /filter add irc_smart *,!*#weechat* irc_smart_filter *
-  filtert alle IRC join/part/quit Nachrichten:
+  filter all IRC join/part/quit messages:
     /filter add joinquit * irc_join,irc_part,irc_quit *
-  filtert Nicks wenn diese den Channel betreten oder durch den Befehl "/names:" angezeigt werden:
+  filter nicks displayed when joining channels or with /names:
     /filter add nicks * irc_366 *
-  filtert Nick "toto" im IRC Channel #weechat:
+  filter nick "toto" on IRC channel #weechat:
     /filter add toto irc.freenode.#weechat * toto\t
-  nur der Nick "tutu" wird im IRC Channel #test angezeigt:
-    /filter add tutu irc.freenode.#test * !tutu\t
-  filtert Zeilen die das Wort "spam" enthalten:
+  keep only nick "titi" on IRC channel #test:
+    /filter add titi irc.freenode.#test * !titi\t
+  filter lines containing word "spam":
     /filter add filterspam * * spam
-  filtert Zeilen die "weechat sucks" im IRC Channel #weechat enthalten:
+  filter lines containing "weechat sucks" on IRC channel #weechat:
     /filter add sucks irc.freenode.#weechat * weechat sucks
 ........................................
 
diff --git a/doc/de/autogen/user/weechat_options.txt b/doc/de/autogen/user/weechat_options.txt
index 185860ffc..b2c5c6af1 100644
--- a/doc/de/autogen/user/weechat_options.txt
+++ b/doc/de/autogen/user/weechat_options.txt
@@ -118,6 +118,11 @@
 ** Typ: Farbe
 ** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute werden vor einer Farbe gesetzt (ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `brown`)
 
+* *weechat.color.chat_tags*
+** Beschreibung: `text color for tags after messages (displayed with command /debug tags)`
+** Typ: Farbe
+** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute werden vor einer Farbe gesetzt (ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `red`)
+
 * *weechat.color.chat_text_found*
 ** Beschreibung: `Farbe zur Hervorhebung des gesuchten Textes in einer Zeile`
 ** Typ: Farbe
diff --git a/doc/en/autogen/user/weechat_commands.txt b/doc/en/autogen/user/weechat_commands.txt
index ce6e4eb5c..edac790da 100644
--- a/doc/en/autogen/user/weechat_commands.txt
+++ b/doc/en/autogen/user/weechat_commands.txt
@@ -145,7 +145,7 @@ command: command to execute (a '/' is automatically added if not found at beginn
 /debug  list
         set <plugin> <level>
         dump [<plugin>]
-        buffer|color|hdata|infolists|memory|term|windows
+        buffer|color|hdata|infolists|memory|tags|term|windows
 
      list: list plugins with debug levels
       set: set debug level for plugin
@@ -157,6 +157,7 @@ command: command to execute (a '/' is automatically added if not found at beginn
     hdata: display infos about hdata
 infolists: display infos about infolists
    memory: display infos about memory usage
+     tags: display tags for lines
      term: display infos about terminal
   windows: display windows tree
 ........................................
@@ -195,6 +196,7 @@ Tags most commonly used:
   nick_xxx (xxx is nick in message),
   irc_xxx (xxx is command name or number, see /server raw),
   irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, irc_smart_filter, away_info.
+To see tags for lines in buffers: /debug tags
 
 Examples:
   use IRC smart filter on all buffers:
diff --git a/doc/en/autogen/user/weechat_options.txt b/doc/en/autogen/user/weechat_options.txt
index 4aba75e7e..eccdc5dc6 100644
--- a/doc/en/autogen/user/weechat_options.txt
+++ b/doc/en/autogen/user/weechat_options.txt
@@ -118,6 +118,11 @@
 ** type: color
 ** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "_" for underline (default value: `brown`)
 
+* *weechat.color.chat_tags*
+** description: `text color for tags after messages (displayed with command /debug tags)`
+** type: color
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "_" for underline (default value: `red`)
+
 * *weechat.color.chat_text_found*
 ** description: `text color for marker on lines where text sought is found`
 ** type: color
diff --git a/doc/fr/autogen/user/weechat_commands.txt b/doc/fr/autogen/user/weechat_commands.txt
index 4b648eedb..4417483bc 100644
--- a/doc/fr/autogen/user/weechat_commands.txt
+++ b/doc/fr/autogen/user/weechat_commands.txt
@@ -145,7 +145,7 @@ extension: nom de l'extension ('weechat' pour une commande interne WeeChat)
 /debug  list
         set <extension> <niveau>
         dump [<extension>]
-        buffer|color|hdata|infolists|memory|term|windows
+        buffer|color|hdata|infolists|memory|tags|term|windows
 
      list: lister les extensions avec leur niveau de debug
       set: définir le niveau de debug pour l'extension
@@ -157,6 +157,7 @@ extension: nom de l'extension ("core" pour le coeur de WeeChat)
     hdata: afficher des infos sur les hdata
 infolists: afficher des infos sur les infolists
    memory: afficher des infos sur l'utilisation de la mémoire
+     tags: afficher les étiquettes pour les lignes
      term: afficher des infos sur le terminal
   windows: afficher l'arbre des fenêtres
 ........................................
@@ -195,6 +196,7 @@ Les tags les plus couramment utilisés:
   nick_xxx (xxx est le pseudo dans le message),
   irc_xxx (xxx est un nom de commande ou nombre, voir /server raw),
   irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, irc_smart_filter, away_info.
+Pour voir les tags des lignes affichées: /debug tags
 
 Exemples:
   utiliser le filtre intelligent IRC sur tous les tampons:
diff --git a/doc/fr/autogen/user/weechat_options.txt b/doc/fr/autogen/user/weechat_options.txt
index 865e7eb8b..3e47ef106 100644
--- a/doc/fr/autogen/user/weechat_options.txt
+++ b/doc/fr/autogen/user/weechat_options.txt
@@ -118,6 +118,11 @@
 ** type: couleur
 ** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour du gras, "!" pour la vidéo inverse, "_" pour du souligné (valeur par défaut: `brown`)
 
+* *weechat.color.chat_tags*
+** description: `couleur du texte pour les étiquettes après les messages (affichées avec la commande /debug tags)`
+** type: couleur
+** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour du gras, "!" pour la vidéo inverse, "_" pour du souligné (valeur par défaut: `red`)
+
 * *weechat.color.chat_text_found*
 ** description: `couleur du texte pour le marqueur sur les lignes où le texte demandé est trouvé`
 ** type: couleur
diff --git a/doc/it/autogen/user/weechat_commands.txt b/doc/it/autogen/user/weechat_commands.txt
index 5face207d..00e976e08 100644
--- a/doc/it/autogen/user/weechat_commands.txt
+++ b/doc/it/autogen/user/weechat_commands.txt
@@ -145,7 +145,7 @@ comando: comando da eseguire (una '/' viene aggiunta automaticamente se non trov
 /debug  list
         set <plugin> <level>
         dump [<plugin>]
-        buffer|color|hdata|infolists|memory|term|windows
+        buffer|color|hdata|infolists|memory|tags|term|windows
 
      list: list plugins with debug levels
       set: set debug level for plugin
@@ -157,6 +157,7 @@ comando: comando da eseguire (una '/' viene aggiunta automaticamente se non trov
     hdata: display infos about hdata
 infolists: display infos about infolists
    memory: display infos about memory usage
+     tags: display tags for lines
      term: display infos about terminal
   windows: display windows tree
 ........................................
@@ -168,51 +169,52 @@ infolists: display infos about infolists
          add <nome> <buffer>[,<buffer>...] <tag> <regex>]
          del <nome>|-all
 
-         list: elenca tutti i filtri
-       enable: abilita filtri (i filtri sono abilitati di default)
-      disable: disabilita filtri
-       toggle: abilita/disabilita filtri
-         nome: nome del filtro
-          add: aggiunge un filtro
-          del: elimina un filtro
-         -all: elimina tutti i filtri
-       buffer: elenco separato da virgole di buffer in cui il filtro è attivo:
-               - nome completo che include il plugin (esempio: "irc.freenode.#weechat)
-               - "*" indica tutti i buffer
-               - un nome preceduto da '!' viene escluso
-               - un nome può iniziare o terminare con '*' per includere più buffer
-          tag: elenco di tag separati da virgole, per esempio: "irc_join,irc_part,irc_quit"
-        regex: espressione regolare da cercare nella riga
-               - usare '\t' per separare il prefisso dal messaggio, caratteri speciali come "|" vanno preceduti dal carattere escape: '\|')
-               - se l'espressione regolare inizia con '!', il risultato corrispondente viene invertito (usare '\!' per iniziare con '!')
-
-               -vengono create due espressioni regolari: una per il prefisso e l'altra per il messaggio
-
-Il tasto predefinito alt+'=' abilita/disabilita il filtro.
-
-Tag utilizzati di frequente:
-  no_filter, no_highlight, no_log, log0..log9 (livello di log),
+   list: list all filters
+ enable: enable filters (filters are enabled by default)
+disable: disable filters
+ toggle: toggle filters
+   name: filter name
+    add: add a filter
+    del: delete a filter
+   -all: delete all filters
+ buffer: comma separated list of buffers where filter is active:
+         - this is full name including plugin (example: "irc.freenode.#weechat")
+         - "*" means all buffers
+         - a name starting with '!' is excluded
+         - name can start or end with '*' to match many buffers
+   tags: comma separated list of tags, for example: "irc_join,irc_part,irc_quit"
+  regex: regular expression to search in line
+         - use '\t' to separate prefix from message, special chars like '|' must be escaped: '\|'
+         - if regex starts with '!', then matching result is reversed (use '\!' to start with '!')
+         - two regular expressions are created: one for prefix and one for message
+
+The default key alt+'=' toggles filtering on/off.
+
+Tags most commonly used:
+  no_filter, no_highlight, no_log, log0..log9 (log level),
   notify_none, notify_message, notify_private, notify_highlight,
-  nick_xxx (xxx è il nick nel messaggio),
-  irc_xxx (xxx è il nome comando o il numero, consultare /server raw),   irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, irc_smart_filter, away_info.
+  nick_xxx (xxx is nick in message),
+  irc_xxx (xxx is command name or number, see /server raw),
+  irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, irc_smart_filter, away_info.
+To see tags for lines in buffers: /debug tags
 
-Esempi:
-  usa il filtro intelligente IRC per tutti i buffer:
-     /filter add irc_smart * irc_smart_filter *
-  usa il filtro intelligente IRC su tutti i buffer tranne quelli che contengono "#weechat" nel nome:
-     /filter add irc_smart *,!*weechat* irc_smart_filter
-  filtra tutti i messaggi entrata/uscita/abbandono di IRC:
-     /filter add joinquit * irc_join,irc_part,irc_quit *
-  filtra i nick visualizzati all'ingresso in un canale o con /names:
+Examples:
+  use IRC smart filter on all buffers:
+    /filter add irc_smart * irc_smart_filter *
+  use IRC smart filter on all buffers except those with "#weechat" in name:
+    /filter add irc_smart *,!*#weechat* irc_smart_filter *
+  filter all IRC join/part/quit messages:
+    /filter add joinquit * irc_join,irc_part,irc_quit *
+  filter nicks displayed when joining channels or with /names:
     /filter add nicks * irc_366 *
-  filtra il nick "tizio" sul canale IRC #weechat
-    /filter add tizio irc.freenode.#esempio * tizio\t
-  filtra solo il nick "caio" sul canale IRC #test:
-    /filter add caio irc.freenode.#test * !caio\t
-  filtra le righe contententi la parola "spam":
+  filter nick "toto" on IRC channel #weechat:
+    /filter add toto irc.freenode.#weechat * toto\t
+  keep only nick "titi" on IRC channel #test:
+    /filter add titi irc.freenode.#test * !titi\t
+  filter lines containing word "spam":
     /filter add filterspam * * spam
-  filtra le righe contententi "weechat fa schifo" sul canale IRC #weechat:
-    /filter add schifo irc.freenode.#weechat * weechat fa schifo
+  filter lines containing "weechat sucks" on IRC channel #weechat:
+    /filter add sucks irc.freenode.#weechat * weechat sucks
 ........................................
 
 [command]*`help`* visualizza l'aiuto su comandi e opzioni::
diff --git a/doc/it/autogen/user/weechat_options.txt b/doc/it/autogen/user/weechat_options.txt
index 6cf8fd763..8d6bb9f37 100644
--- a/doc/it/autogen/user/weechat_options.txt
+++ b/doc/it/autogen/user/weechat_options.txt
@@ -118,6 +118,11 @@
 ** tipo: colore
 ** valori: un nome colore di WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numero colore del terminale o un alias; attributi consentiti prima del colore (solo per il colore del testo, non lo sfondo): "*" per il grassetto, "!" per l'inverso, "_" per la sottolineatura (valore predefinito: `brown`)
 
+* *weechat.color.chat_tags*
+** descrizione: `text color for tags after messages (displayed with command /debug tags)`
+** tipo: colore
+** valori: un nome colore di WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numero colore del terminale o un alias; attributi consentiti prima del colore (solo per il colore del testo, non lo sfondo): "*" per il grassetto, "!" per l'inverso, "_" per la sottolineatura (valore predefinito: `red`)
+
 * *weechat.color.chat_text_found*
 ** descrizione: `colore del testo per l'evidenziatore sulle righe per il testo trovato`
 ** tipo: colore
diff --git a/po/cs.po b/po/cs.po
index 875648b2c..6ae78bb17 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.6-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-06-13 12:56+0200\n"
+"POT-Creation-Date: 2011-06-13 15:19+0200\n"
 "PO-Revision-Date: 2011-05-15 10:51+0200\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1072,7 +1072,7 @@ msgstr "spřáva ladění pro jádro/pluginy"
 #, fuzzy
 msgid ""
 "list || set <plugin> <level> || dump [<plugin>] || buffer|color|hdata|"
-"infolists|memory|term|windows"
+"infolists|memory|tags|term|windows"
 msgstr ""
 "list || set <plugin> <level> || dump [<plugin>] || buffer|color|memory|term|"
 "windows"
@@ -1090,6 +1090,7 @@ msgid ""
 "    hdata: display infos about hdata\n"
 "infolists: display infos about infolists\n"
 "   memory: display infos about memory usage\n"
+"     tags: display tags for lines\n"
 "     term: display infos about terminal\n"
 "  windows: display windows tree"
 msgstr ""
@@ -1118,6 +1119,7 @@ msgstr ""
 "list || enable|disable|toggle [<jméno>] || add <jméno> <buffer>[,"
 "<buffer>...] <tags> <regex> || del <jméno>|-all"
 
+#, fuzzy
 msgid ""
 "   list: list all filters\n"
 " enable: enable filters (filters are enabled by default)\n"
@@ -1152,6 +1154,7 @@ msgid ""
 "  irc_xxx (xxx is command name or number, see /server raw),\n"
 "  irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, "
 "irc_smart_filter, away_info.\n"
+"To see tags for lines in buffers: /debug tags\n"
 "\n"
 "Examples:\n"
 "  use IRC smart filter on all buffers:\n"
@@ -2433,6 +2436,10 @@ msgstr "barva textu pro značku nepřečtených dat"
 msgid "background color for unread data marker"
 msgstr "barva pozadí pro značku nepřečtených dat"
 
+#, fuzzy
+msgid "text color for tags after messages (displayed with command /debug tags)"
+msgstr "barva textu pro počet ostatních zpráv v hostlistu (stavový řádek)"
+
 msgid "text color for marker on lines where text sought is found"
 msgstr "barva textu pro značku na řádcích, kde je nalezen hledaný text"
 
diff --git a/po/de.po b/po/de.po
index 9b5097a71..017334d02 100644
--- a/po/de.po
+++ b/po/de.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.6-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-06-13 12:56+0200\n"
+"POT-Creation-Date: 2011-06-13 15:19+0200\n"
 "PO-Revision-Date: 2011-05-15 10:51+0200\n"
 "Last-Translator: Nils G.\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1091,7 +1091,7 @@ msgstr "Debug-Kontrolle für Hauptprogramm und/oder Erweiterung"
 #, fuzzy
 msgid ""
 "list || set <plugin> <level> || dump [<plugin>] || buffer|color|hdata|"
-"infolists|memory|term|windows"
+"infolists|memory|tags|term|windows"
 msgstr ""
 "list || set <plugin> <level> || dump [<plugin>] || buffer|color|memory|term|"
 "windows"
@@ -1109,6 +1109,7 @@ msgid ""
 "    hdata: display infos about hdata\n"
 "infolists: display infos about infolists\n"
 "   memory: display infos about memory usage\n"
+"     tags: display tags for lines\n"
 "     term: display infos about terminal\n"
 "  windows: display windows tree"
 msgstr ""
@@ -1138,6 +1139,7 @@ msgstr ""
 "list || enable|disable|toggle [<name>] || add <name> <buffer>[,<buffer>...] "
 "<tags> <regex> || del <name>|-all"
 
+#, fuzzy
 msgid ""
 "   list: list all filters\n"
 " enable: enable filters (filters are enabled by default)\n"
@@ -1172,6 +1174,7 @@ msgid ""
 "  irc_xxx (xxx is command name or number, see /server raw),\n"
 "  irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, "
 "irc_smart_filter, away_info.\n"
+"To see tags for lines in buffers: /debug tags\n"
 "\n"
 "Examples:\n"
 "  use IRC smart filter on all buffers:\n"
@@ -2546,6 +2549,12 @@ msgstr "Farbe in der das Lesezeichen angezeigt werden soll"
 msgid "background color for unread data marker"
 msgstr "Hintergrundfarbe in der das Lesezeichen angezeigt werden soll"
 
+#, fuzzy
+msgid "text color for tags after messages (displayed with command /debug tags)"
+msgstr ""
+"Farbe für die Anzahl aller anderen Nachrichten die in der Hotlist  "
+"(Statusbar) dargestellt werden."
+
 msgid "text color for marker on lines where text sought is found"
 msgstr "Farbe zur Hervorhebung des gesuchten Textes in einer Zeile"
 
diff --git a/po/es.po b/po/es.po
index 04f4fa8a0..9f4e9c21a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.6-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-06-13 12:56+0200\n"
+"POT-Creation-Date: 2011-06-13 15:19+0200\n"
 "PO-Revision-Date: 2011-05-15 10:51+0200\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1078,7 +1078,7 @@ msgstr "controla los mensajes de depuración para el núcleo/plugins"
 #, fuzzy
 msgid ""
 "list || set <plugin> <level> || dump [<plugin>] || buffer|color|hdata|"
-"infolists|memory|term|windows"
+"infolists|memory|tags|term|windows"
 msgstr ""
 "list || set <plugin> <nivel> || dump [<plugin>] || buffer|color|memory|term|"
 "windows"
@@ -1096,6 +1096,7 @@ msgid ""
 "    hdata: display infos about hdata\n"
 "infolists: display infos about infolists\n"
 "   memory: display infos about memory usage\n"
+"     tags: display tags for lines\n"
 "     term: display infos about terminal\n"
 "  windows: display windows tree"
 msgstr ""
@@ -1125,6 +1126,7 @@ msgstr ""
 "list || enable|disable|toggle [<nombre>] || add <nombre> <buffer>[,"
 "<buffer>...] <etiquetas> <regex> || del <nombre>|-all"
 
+#, fuzzy
 msgid ""
 "   list: list all filters\n"
 " enable: enable filters (filters are enabled by default)\n"
@@ -1159,6 +1161,7 @@ msgid ""
 "  irc_xxx (xxx is command name or number, see /server raw),\n"
 "  irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, "
 "irc_smart_filter, away_info.\n"
+"To see tags for lines in buffers: /debug tags\n"
 "\n"
 "Examples:\n"
 "  use IRC smart filter on all buffers:\n"
@@ -2471,6 +2474,12 @@ msgstr "color para el marcador de datos sin leer"
 msgid "background color for unread data marker"
 msgstr "color de fondo para el marcador de datos sin leer"
 
+#, fuzzy
+msgid "text color for tags after messages (displayed with command /debug tags)"
+msgstr ""
+"color para el contador de otros mensajes en la lista de actividad (barra de "
+"estado)"
+
 msgid "text color for marker on lines where text sought is found"
 msgstr ""
 "color para el marcador en las líneas donde el texto buscado es encontrado"
diff --git a/po/fr.po b/po/fr.po
index f3891393d..f29c2584f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.6-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-06-13 12:56+0200\n"
-"PO-Revision-Date: 2011-06-13 12:56+0200\n"
+"POT-Creation-Date: 2011-06-13 15:19+0200\n"
+"PO-Revision-Date: 2011-06-13 15:20+0200\n"
 "Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: French\n"
@@ -1077,10 +1077,10 @@ msgstr "contrôle du debug pour le coeur/les extensions"
 
 msgid ""
 "list || set <plugin> <level> || dump [<plugin>] || buffer|color|hdata|"
-"infolists|memory|term|windows"
+"infolists|memory|tags|term|windows"
 msgstr ""
 "list || set <extension> <niveau> || dump [<extension>] || buffer|color|hdata|"
-"infolists|memory|term|windows"
+"infolists|memory|tags|term|windows"
 
 msgid ""
 "     list: list plugins with debug levels\n"
@@ -1094,6 +1094,7 @@ msgid ""
 "    hdata: display infos about hdata\n"
 "infolists: display infos about infolists\n"
 "   memory: display infos about memory usage\n"
+"     tags: display tags for lines\n"
 "     term: display infos about terminal\n"
 "  windows: display windows tree"
 msgstr ""
@@ -1109,6 +1110,7 @@ msgstr ""
 "    hdata: afficher des infos sur les hdata\n"
 "infolists: afficher des infos sur les infolists\n"
 "   memory: afficher des infos sur l'utilisation de la mémoire\n"
+"     tags: afficher les étiquettes pour les lignes\n"
 "     term: afficher des infos sur le terminal\n"
 "  windows: afficher l'arbre des fenêtres"
 
@@ -1159,6 +1161,7 @@ msgid ""
 "  irc_xxx (xxx is command name or number, see /server raw),\n"
 "  irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, "
 "irc_smart_filter, away_info.\n"
+"To see tags for lines in buffers: /debug tags\n"
 "\n"
 "Examples:\n"
 "  use IRC smart filter on all buffers:\n"
@@ -1214,6 +1217,7 @@ msgstr ""
 "  irc_xxx (xxx est un nom de commande ou nombre, voir /server raw),\n"
 "  irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, "
 "irc_smart_filter, away_info.\n"
+"Pour voir les tags des lignes affichées: /debug tags\n"
 "\n"
 "Exemples:\n"
 "  utiliser le filtre intelligent IRC sur tous les tampons:\n"
@@ -2126,7 +2130,12 @@ msgid ""
 "line char at end of each line, and then not break text when you copy/paste "
 "text from WeeChat to another application (this option is disabled by default "
 "because it can cause serious display bugs)"
-msgstr "si activé, le eat_newline_glitch sera positionné à 0; cela est utilisé pour ne pas ajouter de nouvelle ligne à la fin de chaque ligne, et donc ne pas couper le texte quand vous copiez/collez du texte depuis WeeChat vers une autre application (cette option est désactivée par défaut car elle peut causer de sérieux problèmes d'affichages)"
+msgstr ""
+"si activé, le eat_newline_glitch sera positionné à 0; cela est utilisé pour "
+"ne pas ajouter de nouvelle ligne à la fin de chaque ligne, et donc ne pas "
+"couper le texte quand vous copiez/collez du texte depuis WeeChat vers une "
+"autre application (cette option est désactivée par défaut car elle peut "
+"causer de sérieux problèmes d'affichages)"
 
 msgid ""
 "comma separated list of words to highlight (case insensitive comparison, "
@@ -2483,6 +2492,11 @@ msgstr "couleur du texte pour le marqueur de données non lues"
 msgid "background color for unread data marker"
 msgstr "couleur du fond pour le marqueur de données non lues"
 
+msgid "text color for tags after messages (displayed with command /debug tags)"
+msgstr ""
+"couleur du texte pour les étiquettes après les messages (affichées avec la "
+"commande /debug tags)"
+
 msgid "text color for marker on lines where text sought is found"
 msgstr ""
 "couleur du texte pour le marqueur sur les lignes où le texte demandé est "
diff --git a/po/hu.po b/po/hu.po
index 0c83444a3..25ed5713e 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.6-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-06-13 12:56+0200\n"
+"POT-Creation-Date: 2011-06-13 15:19+0200\n"
 "PO-Revision-Date: 2011-05-15 10:51+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1029,7 +1029,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "list || set <plugin> <level> || dump [<plugin>] || buffer|color|hdata|"
-"infolists|memory|term|windows"
+"infolists|memory|tags|term|windows"
 msgstr "dump | buffer | windows"
 
 #, fuzzy
@@ -1045,6 +1045,7 @@ msgid ""
 "    hdata: display infos about hdata\n"
 "infolists: display infos about infolists\n"
 "   memory: display infos about memory usage\n"
+"     tags: display tags for lines\n"
 "     term: display infos about terminal\n"
 "  windows: display windows tree"
 msgstr ""
@@ -1096,6 +1097,7 @@ msgid ""
 "  irc_xxx (xxx is command name or number, see /server raw),\n"
 "  irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, "
 "irc_smart_filter, away_info.\n"
+"To see tags for lines in buffers: /debug tags\n"
 "\n"
 "Examples:\n"
 "  use IRC smart filter on all buffers:\n"
@@ -2121,6 +2123,10 @@ msgid "background color for unread data marker"
 msgstr "olvasatlan adat jelölő háttere"
 
 #, fuzzy
+msgid "text color for tags after messages (displayed with command /debug tags)"
+msgstr "kiemelt üzenetet tartalmazó ablak színe (státuszsor)"
+
+#, fuzzy
 msgid "text color for marker on lines where text sought is found"
 msgstr "szerver nevének színe"
 
diff --git a/po/it.po b/po/it.po
index 026c20991..07a45b643 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.6-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-06-13 12:56+0200\n"
+"POT-Creation-Date: 2011-06-13 15:19+0200\n"
 "PO-Revision-Date: 2011-05-15 10:52+0200\n"
 "Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1070,7 +1070,7 @@ msgstr "attiva debug per core/plugin"
 #, fuzzy
 msgid ""
 "list || set <plugin> <level> || dump [<plugin>] || buffer|color|hdata|"
-"infolists|memory|term|windows"
+"infolists|memory|tags|term|windows"
 msgstr ""
 "list || set <plugin> <livello> || dump [<plugin>] || buffer|color|memory|"
 "term|windows"
@@ -1088,6 +1088,7 @@ msgid ""
 "    hdata: display infos about hdata\n"
 "infolists: display infos about infolists\n"
 "   memory: display infos about memory usage\n"
+"     tags: display tags for lines\n"
 "     term: display infos about terminal\n"
 "  windows: display windows tree"
 msgstr ""
@@ -1116,6 +1117,7 @@ msgstr ""
 "list || enable|disable|toggle [<nome>] || add <nome> <buffer>[,<buffer>...] "
 "<tag> <regex>] || del <nome>|-all"
 
+#, fuzzy
 msgid ""
 "   list: list all filters\n"
 " enable: enable filters (filters are enabled by default)\n"
@@ -1150,6 +1152,7 @@ msgid ""
 "  irc_xxx (xxx is command name or number, see /server raw),\n"
 "  irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, "
 "irc_smart_filter, away_info.\n"
+"To see tags for lines in buffers: /debug tags\n"
 "\n"
 "Examples:\n"
 "  use IRC smart filter on all buffers:\n"
@@ -2467,6 +2470,12 @@ msgstr "colore del testo per l'evidenziatore di dati non letti"
 msgid "background color for unread data marker"
 msgstr "colore di sfondo per l'evidenziatore di dati non letti"
 
+#, fuzzy
+msgid "text color for tags after messages (displayed with command /debug tags)"
+msgstr ""
+"colore del testo per il conteggio di altri messaggi nella hotlist (barra di "
+"stato)"
+
 msgid "text color for marker on lines where text sought is found"
 msgstr "colore del testo per l'evidenziatore sulle righe per il testo trovato"
 
diff --git a/po/pl.po b/po/pl.po
index eb16ff5c0..bbd8227d0 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.6-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-06-13 12:56+0200\n"
+"POT-Creation-Date: 2011-06-13 15:19+0200\n"
 "PO-Revision-Date: 2011-05-15 10:52+0200\n"
 "Last-Translator: Krzysztof Koroscik <soltys@szluug.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1080,7 +1080,7 @@ msgstr "kontrola debugu dla rdzenia/wtyczek"
 #, fuzzy
 msgid ""
 "list || set <plugin> <level> || dump [<plugin>] || buffer|color|hdata|"
-"infolists|memory|term|windows"
+"infolists|memory|tags|term|windows"
 msgstr ""
 "list || set <plugin> <poziom> || dump [<plugin>] || buffer|color|memory|term|"
 "windows"
@@ -1098,6 +1098,7 @@ msgid ""
 "    hdata: display infos about hdata\n"
 "infolists: display infos about infolists\n"
 "   memory: display infos about memory usage\n"
+"     tags: display tags for lines\n"
 "     term: display infos about terminal\n"
 "  windows: display windows tree"
 msgstr ""
@@ -1127,6 +1128,7 @@ msgstr ""
 "list || enable|disable|toggle [<nazwa>] || add <nazwa> <bufor>[,<bufor>...] "
 "<tagi> <regex> || del <nazwa>|-all"
 
+#, fuzzy
 msgid ""
 "   list: list all filters\n"
 " enable: enable filters (filters are enabled by default)\n"
@@ -1161,6 +1163,7 @@ msgid ""
 "  irc_xxx (xxx is command name or number, see /server raw),\n"
 "  irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, "
 "irc_smart_filter, away_info.\n"
+"To see tags for lines in buffers: /debug tags\n"
 "\n"
 "Examples:\n"
 "  use IRC smart filter on all buffers:\n"
@@ -2466,6 +2469,11 @@ msgstr "kolor znacznika nieprzeczytanych wiadomości"
 msgid "background color for unread data marker"
 msgstr "kolor tła znacznika nieprzeczytanych wiadomości"
 
+#, fuzzy
+msgid "text color for tags after messages (displayed with command /debug tags)"
+msgstr ""
+"kolor tekstu dla licznika innych wiadomości w hotliście (pasek statusu)"
+
 msgid "text color for marker on lines where text sought is found"
 msgstr "kolor znacznika linii, w których znaleziono szukany tekst"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8ce67ddbd..98d99973c 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.6-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-06-13 12:56+0200\n"
+"POT-Creation-Date: 2011-06-13 15:19+0200\n"
 "PO-Revision-Date: 2011-05-15 10:52+0200\n"
 "Last-Translator: Ivan Sichmann Freitas <ivansichfreitas@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1092,7 +1092,7 @@ msgstr "cotrolar depuração para core/plugins"
 #, fuzzy
 msgid ""
 "list || set <plugin> <level> || dump [<plugin>] || buffer|color|hdata|"
-"infolists|memory|term|windows"
+"infolists|memory|tags|term|windows"
 msgstr "[list | set plugin level | dump [plugin] | buffer | windows | term]"
 
 # find a better translation to dump?
@@ -1110,6 +1110,7 @@ msgid ""
 "    hdata: display infos about hdata\n"
 "infolists: display infos about infolists\n"
 "   memory: display infos about memory usage\n"
+"     tags: display tags for lines\n"
 "     term: display infos about terminal\n"
 "  windows: display windows tree"
 msgstr ""
@@ -1171,6 +1172,7 @@ msgid ""
 "  irc_xxx (xxx is command name or number, see /server raw),\n"
 "  irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, "
 "irc_smart_filter, away_info.\n"
+"To see tags for lines in buffers: /debug tags\n"
 "\n"
 "Examples:\n"
 "  use IRC smart filter on all buffers:\n"
@@ -2428,6 +2430,9 @@ msgstr ""
 msgid "background color for unread data marker"
 msgstr ""
 
+msgid "text color for tags after messages (displayed with command /debug tags)"
+msgstr ""
+
 msgid "text color for marker on lines where text sought is found"
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index c2ae5383a..e973a82d6 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.6-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-06-13 12:56+0200\n"
+"POT-Creation-Date: 2011-06-13 15:19+0200\n"
 "PO-Revision-Date: 2011-05-15 10:52+0200\n"
 "Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1036,7 +1036,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "list || set <plugin> <level> || dump [<plugin>] || buffer|color|hdata|"
-"infolists|memory|term|windows"
+"infolists|memory|tags|term|windows"
 msgstr "dump | buffer | windows"
 
 #, fuzzy
@@ -1052,6 +1052,7 @@ msgid ""
 "    hdata: display infos about hdata\n"
 "infolists: display infos about infolists\n"
 "   memory: display infos about memory usage\n"
+"     tags: display tags for lines\n"
 "     term: display infos about terminal\n"
 "  windows: display windows tree"
 msgstr ""
@@ -1104,6 +1105,7 @@ msgid ""
 "  irc_xxx (xxx is command name or number, see /server raw),\n"
 "  irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, "
 "irc_smart_filter, away_info.\n"
+"To see tags for lines in buffers: /debug tags\n"
 "\n"
 "Examples:\n"
 "  use IRC smart filter on all buffers:\n"
@@ -2139,6 +2141,10 @@ msgid "background color for unread data marker"
 msgstr "фон маркера непрочитанных сообщений"
 
 #, fuzzy
+msgid "text color for tags after messages (displayed with command /debug tags)"
+msgstr "цвет окна с подсвеченным сообщением (в строке состояния)"
+
+#, fuzzy
 msgid "text color for marker on lines where text sought is found"
 msgstr "цвет названия сервера"
 
diff --git a/po/weechat.pot b/po/weechat.pot
index 721d36b7f..c04ef7d6e 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-06-13 12:56+0200\n"
+"POT-Creation-Date: 2011-06-13 15:19+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -892,7 +892,7 @@ msgstr ""
 
 msgid ""
 "list || set <plugin> <level> || dump [<plugin>] || buffer|color|hdata|"
-"infolists|memory|term|windows"
+"infolists|memory|tags|term|windows"
 msgstr ""
 
 msgid ""
@@ -907,6 +907,7 @@ msgid ""
 "    hdata: display infos about hdata\n"
 "infolists: display infos about infolists\n"
 "   memory: display infos about memory usage\n"
+"     tags: display tags for lines\n"
 "     term: display infos about terminal\n"
 "  windows: display windows tree"
 msgstr ""
@@ -954,6 +955,7 @@ msgid ""
 "  irc_xxx (xxx is command name or number, see /server raw),\n"
 "  irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, "
 "irc_smart_filter, away_info.\n"
+"To see tags for lines in buffers: /debug tags\n"
 "\n"
 "Examples:\n"
 "  use IRC smart filter on all buffers:\n"
@@ -1832,6 +1834,9 @@ msgstr ""
 msgid "background color for unread data marker"
 msgstr ""
 
+msgid "text color for tags after messages (displayed with command /debug tags)"
+msgstr ""
+
 msgid "text color for marker on lines where text sought is found"
 msgstr ""
 
diff --git a/src/core/wee-command.c b/src/core/wee-command.c
index b30371862..85a8ec15e 100644
--- a/src/core/wee-command.c
+++ b/src/core/wee-command.c
@@ -1164,6 +1164,11 @@ COMMAND_CALLBACK(debug)
     {
         debug_memory ();
     }
+    else if (string_strcasecmp (argv[1], "tags") == 0)
+    {
+        gui_chat_display_tags ^= 1;
+        gui_window_ask_refresh (2);
+    }
     else if (string_strcasecmp (argv[1], "term") == 0)
     {
         gui_window_term_display_infos ();
@@ -4841,7 +4846,8 @@ command_init ()
                   N_("list"
                      " || set <plugin> <level>"
                      " || dump [<plugin>]"
-                     " || buffer|color|hdata|infolists|memory|term|windows"),
+                     " || buffer|color|hdata|infolists|memory|tags|term"
+                     "|windows"),
                   N_("     list: list plugins with debug levels\n"
                      "      set: set debug level for plugin\n"
                      "   plugin: name of plugin (\"core\" for WeeChat core)\n"
@@ -4854,6 +4860,7 @@ command_init ()
                      "    hdata: display infos about hdata\n"
                      "infolists: display infos about infolists\n"
                      "   memory: display infos about memory usage\n"
+                     "     tags: display tags for lines\n"
                      "     term: display infos about terminal\n"
                      "  windows: display windows tree"),
                   "list"
@@ -4864,6 +4871,7 @@ command_init ()
                   " || hdata"
                   " || infolists"
                   " || memory"
+                  " || tags"
                   " || term"
                   " || windows",
                   &command_debug, NULL);
@@ -4908,7 +4916,8 @@ command_init ()
                      "  nick_xxx (xxx is nick in message),\n"
                      "  irc_xxx (xxx is command name or number, see /server raw),\n"
                      "  irc_numeric, irc_error, irc_action, irc_ctcp, "
-                     "irc_ctcp_reply, irc_smart_filter, away_info.\n\n"
+                     "irc_ctcp_reply, irc_smart_filter, away_info.\n"
+                     "To see tags for lines in buffers: /debug tags\n\n"
                      "Examples:\n"
                      "  use IRC smart filter on all buffers:\n"
                      "    /filter add irc_smart * irc_smart_filter *\n"
diff --git a/src/core/wee-config.c b/src/core/wee-config.c
index b21fa1fea..6402adbad 100644
--- a/src/core/wee-config.c
+++ b/src/core/wee-config.c
@@ -157,6 +157,7 @@ struct t_config_option *config_color_chat_highlight;
 struct t_config_option *config_color_chat_highlight_bg;
 struct t_config_option *config_color_chat_read_marker;
 struct t_config_option *config_color_chat_read_marker_bg;
+struct t_config_option *config_color_chat_tags;
 struct t_config_option *config_color_chat_text_found;
 struct t_config_option *config_color_chat_text_found_bg;
 struct t_config_option *config_color_chat_value;
@@ -2106,6 +2107,13 @@ config_weechat_init_options ()
         N_("background color for unread data marker"),
         NULL, -1, 0, "default", NULL, 0,
         NULL, NULL, &config_change_color, NULL, NULL, NULL);
+    config_color_chat_tags = config_file_new_option (
+        weechat_config_file, ptr_section,
+        "chat_tags", "color",
+        N_("text color for tags after messages (displayed with command /debug "
+           "tags)"),
+        NULL, GUI_COLOR_CHAT_TAGS, 0, "red", NULL, 0,
+        NULL, NULL, &config_change_color, NULL, NULL, NULL);
     config_color_chat_text_found = config_file_new_option (
         weechat_config_file, ptr_section,
         "chat_text_found", "color",
diff --git a/src/core/wee-config.h b/src/core/wee-config.h
index 9b2e44d15..8c4804130 100644
--- a/src/core/wee-config.h
+++ b/src/core/wee-config.h
@@ -180,6 +180,7 @@ extern struct t_config_option *config_color_chat_highlight;
 extern struct t_config_option *config_color_chat_highlight_bg;
 extern struct t_config_option *config_color_chat_read_marker;
 extern struct t_config_option *config_color_chat_read_marker_bg;
+extern struct t_config_option *config_color_chat_tags;
 extern struct t_config_option *config_color_chat_text_found;
 extern struct t_config_option *config_color_chat_text_found_bg;
 extern struct t_config_option *config_color_chat_value;
diff --git a/src/gui/curses/gui-curses-chat.c b/src/gui/curses/gui-curses-chat.c
index c9173fdb1..6c380f051 100644
--- a/src/gui/curses/gui-curses-chat.c
+++ b/src/gui/curses/gui-curses-chat.c
@@ -712,7 +712,7 @@ gui_chat_display_line (struct t_gui_window *window, struct t_gui_line *line,
     int word_start_offset, word_end_offset;
     int word_length_with_spaces, word_length;
     char *ptr_data, *ptr_end_offset, *next_char;
-    char *ptr_style;
+    char *ptr_style, *message_with_tags;
     
     if (!line)
         return 0;
@@ -762,7 +762,10 @@ gui_chat_display_line (struct t_gui_window *window, struct t_gui_line *line,
     }
     else
     {
-        ptr_data = line->data->message;
+        message_with_tags = (gui_chat_display_tags) ?
+            gui_chat_build_string_message_tags (line) : NULL;
+        ptr_data = (message_with_tags) ?
+            message_with_tags : line->data->message;
         while (ptr_data && ptr_data[0])
         {
             gui_chat_get_word_info (window,
@@ -838,6 +841,8 @@ gui_chat_display_line (struct t_gui_window *window, struct t_gui_line *line,
                 ptr_data = NULL;
             }
         }
+        if (message_with_tags)
+            free (message_with_tags);
     }
     
     if (marker_line)
diff --git a/src/gui/curses/gui-curses-color.c b/src/gui/curses/gui-curses-color.c
index c85961bfc..9f1a9f359 100644
--- a/src/gui/curses/gui-curses-color.c
+++ b/src/gui/curses/gui-curses-color.c
@@ -1379,6 +1379,7 @@ gui_color_init_weechat ()
     gui_color_build (GUI_COLOR_CHAT_TEXT_FOUND, CONFIG_COLOR(config_color_chat_text_found), CONFIG_COLOR(config_color_chat_text_found_bg));
     gui_color_build (GUI_COLOR_CHAT_VALUE, CONFIG_COLOR(config_color_chat_value), CONFIG_COLOR(config_color_chat_bg));
     gui_color_build (GUI_COLOR_CHAT_PREFIX_BUFFER, CONFIG_COLOR(config_color_chat_prefix_buffer), CONFIG_COLOR(config_color_chat_bg));
+    gui_color_build (GUI_COLOR_CHAT_TAGS, CONFIG_COLOR(config_color_chat_tags), CONFIG_COLOR(config_color_chat_bg));
     
     /*
      * define old nick colors for compatibility on /upgrade with previous
diff --git a/src/gui/gui-chat.c b/src/gui/gui-chat.c
index a12d127e7..514506cd8 100644
--- a/src/gui/gui-chat.c
+++ b/src/gui/gui-chat.c
@@ -52,6 +52,7 @@ char gui_chat_prefix_empty[] = "";              /* empty prefix             */
 int gui_chat_time_length = 0;    /* length of time for each line (in chars) */
 int gui_chat_mute = GUI_CHAT_MUTE_DISABLED;     /* mute mode                */
 struct t_gui_buffer *gui_chat_mute_buffer = NULL; /* mute buffer            */
+int gui_chat_display_tags = 0;                  /* display tags?            */
 
 
 /*
@@ -481,6 +482,45 @@ gui_chat_build_string_prefix_message (struct t_gui_line *line)
 }
 
 /*
+ * gui_chat_build_string_prefix_message: build a string with message and tags
+ */
+
+
+char *
+gui_chat_build_string_message_tags (struct t_gui_line *line)
+{
+    int i, length;
+    char *buf;
+    
+    length = 64 + 2;
+    if (line->data->message)
+        length += strlen (line->data->message);
+    for (i = 0; i < line->data->tags_count; i++)
+    {
+        length += strlen (line->data->tags_array[i]) + 1;
+    }
+    length += 2;
+    
+    buf = malloc (length);
+    buf[0] = '\0';
+    if (line->data->message)
+        strcat (buf, line->data->message);
+    strcat (buf, GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS));
+    strcat (buf, " [");
+    strcat (buf, GUI_COLOR(GUI_COLOR_CHAT_TAGS));
+    for (i = 0; i < line->data->tags_count; i++)
+    {
+        strcat (buf, line->data->tags_array[i]);
+        if (i < line->data->tags_count - 1)
+            strcat (buf, ",");
+    }
+    strcat (buf, GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS));
+    strcat (buf, "]");
+    
+    return buf;
+}
+
+/*
  * gui_chat_printf_date_tags: display a message in a buffer with optional
  *                            date and tags
  *                            Info: this function works only with formatted
diff --git a/src/gui/gui-chat.h b/src/gui/gui-chat.h
index 15e6263e8..009877f3c 100644
--- a/src/gui/gui-chat.h
+++ b/src/gui/gui-chat.h
@@ -52,6 +52,7 @@ extern char gui_chat_prefix_empty[];
 extern int gui_chat_time_length;
 extern int gui_chat_mute;
 extern struct t_gui_buffer *gui_chat_mute_buffer;
+extern int gui_chat_display_tags;
 
 /* chat functions */
 
@@ -70,6 +71,7 @@ extern char *gui_chat_get_time_string (time_t date);
 extern int gui_chat_get_time_length ();
 extern void gui_chat_change_time_format ();
 extern char *gui_chat_build_string_prefix_message (struct t_gui_line *line);
+extern char *gui_chat_build_string_message_tags (struct t_gui_line *line);
 extern void gui_chat_printf_date_tags (struct t_gui_buffer *buffer,
                                        time_t date, const char *tags,
                                        const char *message, ...);
diff --git a/src/gui/gui-color.h b/src/gui/gui-color.h
index 5774ecb77..d4c6fb633 100644
--- a/src/gui/gui-color.h
+++ b/src/gui/gui-color.h
@@ -61,6 +61,7 @@ enum t_gui_color_enum
     GUI_COLOR_CHAT_TEXT_FOUND,
     GUI_COLOR_CHAT_VALUE,
     GUI_COLOR_CHAT_PREFIX_BUFFER,
+    GUI_COLOR_CHAT_TAGS,
     
     /* number of colors */
     GUI_COLOR_NUM_COLORS,