--- psi/src/common.cpp.orig	2005-02-02 03:08:24.000000000 +0000
+++ psi/src/common.cpp	2005-02-02 03:09:39.262163576 +0000
@@ -567,7 +567,10 @@
 
 			// find whitespace (or end)
 			for(x2 = n; x2 < (int)out.length(); ++x2) {
-				if(out.at(x2).isSpace() || out.at(x2) == '<')
+				//if(out.at(x2).isSpace() || out.at(x2) == '<')
+				if(out.at(x2).isSpace() || linkify_isOneOf(out.at(x2), "\"\'`<>") ||
+					linkify_pmatch(out, x2, "&quot;")  || linkify_pmatch(out, x2, "&apos;") ||
+					linkify_pmatch(out, x2, "&gt;") || linkify_pmatch(out, x2, "&lt;")  )
 					break;
 			}
 			int len = x2-x1;