diff --git a/mitterlib/ui/helpers/gtk_messagegrid.py b/mitterlib/ui/helpers/gtk_messagegrid.py
index cbe970d..4fc1036 100644
--- a/mitterlib/ui/helpers/gtk_messagegrid.py
+++ b/mitterlib/ui/helpers/gtk_messagegrid.py
@@ -180,7 +180,7 @@ class MessageGrid(gtk.ScrolledWindow, gobject.GObject):
         message_values['message_age'] = time
 
         # highlight URLs
-        mask = r'<span foreground="%s">\1</span>' % (self.link_color)
+        mask = r'<u><span foreground="%s">\1</span></u>' % (self.link_color)
         message_values['message'] = URL_RE.sub(mask,
                 message_values['message'])