diff --git a/src/helma/util/HtmlEncoder.java b/src/helma/util/HtmlEncoder.java
index 9c769e4b..bcdb48d1 100644
--- a/src/helma/util/HtmlEncoder.java
+++ b/src/helma/util/HtmlEncoder.java
@@ -545,6 +545,12 @@ public final class HtmlEncoder {
 	        case '&':
 	            ret.append ("&");
 	            break;
+	        case '"':
+	            ret.append (""");
+	            break;
+	        case '\'':
+	            ret.append ("'");
+	            break;
 	        default:
 	            if (c < 0x20) {
 	                // sort out invalid XML characters below 0x20 - all but 0x9, 0xA and 0xD.