Index: src/java/org/apache/jetspeed/portal/portlets/WebClippingPortlet.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/WebClippingPortlet.java,v
retrieving revision 1.2
diff -u -r1.2 WebClippingPortlet.java
--- src/java/org/apache/jetspeed/portal/portlets/WebClippingPortlet.java	23 Feb 2004 04:03:34 -0000	1.2
+++ src/java/org/apache/jetspeed/portal/portlets/WebClippingPortlet.java	2 Jun 2004 13:23:23 -0000
@@ -25,6 +25,7 @@
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Iterator;
+import java.util.StringTokenizer;
 
 import org.apache.ecs.ConcreteElement;
 import org.apache.jetspeed.portal.PortletConfig;
@@ -134,14 +135,29 @@
 		}
 
 		long pageExpiration = pageConn.getExpiration();
-		String encoding = pageConn.getContentEncoding();
+		String encoding = "iso-8859-1";
+		String contentType = pageConn.getContentType();
 		String tempString = null;
 		String noCache = "no-cache";
 
-		if (encoding == null)
+		if (contentType != null)
 		{
-			// Standard HTTP encoding
-			encoding = "iso-8859-1";
+			StringTokenizer st = new StringTokenizer(contentType, "; =");
+			while (st.hasMoreTokens())
+			{
+				if (st.nextToken().equalsIgnoreCase("charset"))
+				{
+					try
+					{
+						encoding = st.nextToken();
+						break;
+					}
+					catch (Exception e)
+					{
+						break;
+					}
+				}
+			}
 		}
 
 		/*