@@ -390,11 +390,11 @@
 
 	acceptProlog = NO;
 
 	pi = [pi substringFromIndex: 3
 			    toIndex: [pi length]];
-	pi = [pi stringByDeletingLeadingAndTrailingWhitespaces];
+	pi = [pi stringByDeletingEnclosingWhitespaces];
 
 	cString = [pi cString];
 	length = [pi cStringLength];
 
 	for (i = last = 0; i < length; i++) {
@@ -768,11 +768,11 @@
 		return;
 
 	if ((length = *i - *last) > 0)
 		cache_append(cache, buffer + *last, encoding, length);
 
-	[cache deleteLeadingAndTrailingWhitespaces];
+	[cache deleteEnclosingWhitespaces];
 
 	cacheCString = [cache cString];
 	cacheLength = [cache cStringLength];
 
 	if ((tmp = memchr(cacheCString, ':', cacheLength)) != NULL) {