@@ -840,10 +840,11 @@
 - (void)of_inAttributeValueState
 {
 	void *pool;
 	OFString *attributeValue;
 	size_t length;
+	OFXMLAttribute *attribute;
 
 	if (_data[_i] != _delimiter)
 		return;
 
 	if ((length = _i - _last) > 0)
@@ -857,14 +858,15 @@
 					     forKey: @""];
 	if ([_attributePrefix isEqual: @"xmlns"])
 		[[_namespaces lastObject] setObject: attributeValue
 					     forKey: _attributeName];
 
-	[_attributes addObject:
-	    [OFXMLAttribute attributeWithName: _attributeName
-				    namespace: _attributePrefix
-				  stringValue: attributeValue]];
+	attribute = [OFXMLAttribute attributeWithName: _attributeName
+					    namespace: _attributePrefix
+					  stringValue: attributeValue];
+	attribute->_useDoubleQuotes = (_delimiter == '"');
+	[_attributes addObject: attribute];
 
 	objc_autoreleasePoolPop(pool);
 
 	[_buffer removeAllItems];
 	[_attributeName release];