--- deliantra/Deliantra-Client/DC/Protocol.pm	2006/06/23 20:28:20	1.40
+++ deliantra/Deliantra-Client/DC/Protocol.pm	2006/06/23 22:35:16	1.41
@@ -820,11 +820,21 @@
       my ($msg, @kw) = split /\x00/, $msg;
       $self->{kw}{$_} = 1 for @kw;
 
-      $msg = CFClient::UI::Label::escape $msg;
+      $msg = "\n" . CFClient::UI::Label::escape $msg;
       my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
-      $msg =~ s/($match)/<span foreground='#c0c0ff' underline='none'>$1<\/span>/gi; # underline when http-ready, huh.
+      my @link;
+      $msg =~ s{
+         ($match)
+      }{
+         push @link, new CFClient::UI::Label
+            markup     => "<span foreground='#c0c0ff' underline='single'>$1</span>",
+            can_hover  => 1,
+            can_events => 1;
+
+         chr 0xfffc
+      }giex;
       
-      $self->{textview}->add_paragraph ([1, 1, 1, 1], "\n$msg");
+      $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]);
       $self->update_options;
    } else {
       $self->destroy;