diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/EditItemComments.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/EditItemComments.ascx.cs
index 16def0cd..65843410 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/EditItemComments.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/EditItemComments.ascx.cs
@@ -125,7 +125,7 @@ namespace WebsitePanel.Portal
 
         public string WrapComment(string text)
         {
-            return (text != null) ? PortalAntiXSS.EncodeOld(text.Replace("\n", "<br/>")) : text;
+            return (text != null) ? Server.HtmlEncode(text).Replace("\n", "<br/>") : text;
         }
 
         protected void gvComments_RowDeleting(object sender, GridViewDeleteEventArgs e)