diff --git a/i2p2www/formatters.py b/i2p2www/formatters.py
index 96d02fe2ade630c81c9edce1e8346f9e2fbb64ef..59b47e04531aeca5327f4ec20f97fbd127d67a14 100644
--- a/i2p2www/formatters.py
+++ b/i2p2www/formatters.py
@@ -716,6 +716,10 @@ class I2PHtmlFormatter(Formatter):
 
             if tagsfile and ttype in Token.Name.Class:
                 filename, kind = self._lookup_ctag(value)
+                # Handle message types
+                if not kind and value.endswith('Message'):
+                    value = value[:-7]
+                    filename, kind = self._lookup_ctag(value)
                 if kind:
                     base, filename = os.path.split(filename)
                     if base: