diff --git a/code_comments/subscription.py b/code_comments/subscription.py
index cbe14dc..259cfeb 100644
--- a/code_comments/subscription.py
+++ b/code_comments/subscription.py
@@ -6,11 +6,11 @@
 from trac.admin import IAdminCommandProvider
 from trac.attachment import Attachment, IAttachmentChangeListener
 from trac.core import Component, implements
-from trac.util.html import html as tag
 from trac.versioncontrol import (
     RepositoryManager, NoSuchChangeset, IRepositoryChangeListener)
 from trac.web.api import HTTPNotFound, IRequestHandler, ITemplateStreamFilter
 
+from genshi.builder import tag
 from genshi.filters import Transformer
 
 from code_comments.api import ICodeCommentChangeListener