diff --git a/apps/syndie/java/src/net/i2p/syndie/sml/HTMLRenderer.java b/apps/syndie/java/src/net/i2p/syndie/sml/HTMLRenderer.java
index 7f8de09b9..3496690ef 100644
--- a/apps/syndie/java/src/net/i2p/syndie/sml/HTMLRenderer.java
+++ b/apps/syndie/java/src/net/i2p/syndie/sml/HTMLRenderer.java
@@ -900,7 +900,9 @@ public class HTMLRenderer extends EventReceiverImpl {
     }
     
     public static final String sanitizeString(String str) { return sanitizeString(str, true); }
-    public static final String sanitizeString(String str, boolean allowNL) {
+    public static final String sanitizeString(String str, int maxLen) { return sanitizeString(str, true, maxLen); }
+    public static final String sanitizeString(String str, boolean allowNL) { return sanitizeString(str, allowNL, -1); }
+    public static final String sanitizeString(String str, boolean allowNL, int maxLen) {
         if (str == null) return null;
         boolean unsafe = false;
         unsafe = unsafe || str.indexOf('<') >= 0;
@@ -910,21 +912,24 @@ public class HTMLRenderer extends EventReceiverImpl {
             unsafe = unsafe || str.indexOf('\r') >= 0;
             unsafe = unsafe || str.indexOf('\f') >= 0;
         }
-        if (!unsafe) return str;
-        
-        //str = str.replace('<', '_'); // this should be &lt;
-        //str = str.replace('>', '-'); // this should be &gt;
-        str = str.replaceAll("<", "&lt;");
-        str = str.replaceAll(">", "&gt;");
-        if (!allowNL) {
-            //str = str.replace('\n', ' ');
-            //str = str.replace('\r', ' ');
-            //str = str.replace('\f', ' ');
-            str = str.replaceAll("\n", "<br />"); // no class
-            str = str.replaceAll("\r", "<br />"); // no class
-            str = str.replaceAll("\f", "<br />"); // no class
+        if (unsafe) {
+            //str = str.replace('<', '_'); // this should be &lt;
+            //str = str.replace('>', '-'); // this should be &gt;
+            str = str.replaceAll("<", "&lt;");
+            str = str.replaceAll(">", "&gt;");
+            if (!allowNL) {
+                //str = str.replace('\n', ' ');
+                //str = str.replace('\r', ' ');
+                //str = str.replace('\f', ' ');
+                str = str.replaceAll("\n", "<br />"); // no class
+                str = str.replaceAll("\r", "<br />"); // no class
+                str = str.replaceAll("\f", "<br />"); // no class
+            }
         }
-        return str;
+        if ( (maxLen > 0) && (str.length() > maxLen) )
+            return str.substring(0, maxLen) + "...";
+        else
+            return str;
     }
 
     public static final String sanitizeURL(String str) { 
diff --git a/apps/syndie/java/src/net/i2p/syndie/sml/ThreadedHTMLRenderer.java b/apps/syndie/java/src/net/i2p/syndie/sml/ThreadedHTMLRenderer.java
index 68426eb29..31274d997 100644
--- a/apps/syndie/java/src/net/i2p/syndie/sml/ThreadedHTMLRenderer.java
+++ b/apps/syndie/java/src/net/i2p/syndie/sml/ThreadedHTMLRenderer.java
@@ -294,7 +294,7 @@ public class ThreadedHTMLRenderer extends HTMLRenderer {
                     _postBodyBuffer.append("schema=").append(sanitizeURL(l.schema)).append('&');
                 if (l.location != null)
                     _postBodyBuffer.append("location=").append(sanitizeURL(l.location)).append('&');
-                _postBodyBuffer.append("\">").append(sanitizeString(l.location));
+                _postBodyBuffer.append("\">").append(sanitizeString(l.location, 60));
                 _postBodyBuffer.append(getSpan("summDetailExternalNet")).append(" (").append(sanitizeString(l.schema)).append(")</span></a> ");
             }
             _postBodyBuffer.append("<br />\n");
diff --git a/core/java/src/net/i2p/client/naming/PetName.java b/core/java/src/net/i2p/client/naming/PetName.java
index 73ee4edf5..8b5fdda91 100644
--- a/core/java/src/net/i2p/client/naming/PetName.java
+++ b/core/java/src/net/i2p/client/naming/PetName.java
@@ -32,7 +32,7 @@ public class PetName {
         _groups = new ArrayList();
         StringTokenizer tok = new StringTokenizer(dbLine, ":\n", true);
         int tokens = tok.countTokens();
-        System.out.println("Tokens: " + tokens);
+        //System.out.println("Tokens: " + tokens);
         if (tokens < 7) {
             return;
         }