diff --git a/inc/caldav-client.php b/inc/caldav-client.php
index b32c5c91..62b2a747 100644
--- a/inc/caldav-client.php
+++ b/inc/caldav-client.php
@@ -119,12 +119,13 @@ class CalDAVClient {
    */
   function ParseResponse( $response ) {
       $pos = strpos($response, '<?xml');
+      $epos = strrpos($response, '>');
       if ($pos === false) {
         $this->httpResponse = trim($response);
       }
       else {
         $this->httpResponse = trim(substr($response, 0, $pos));
-        $this->xmlResponse = trim(substr($response, $pos));
+        $this->xmlResponse = trim(substr($response, $pos, $epos-$pos+1));
       }
   }