diff --git a/testing/tests/regression-suite/237-Moz-REPORT.result b/testing/tests/regression-suite/237-Moz-REPORT.result
index 86ab2fa7..1973dc82 100644
--- a/testing/tests/regression-suite/237-Moz-REPORT.result
+++ b/testing/tests/regression-suite/237-Moz-REPORT.result
@@ -8,7 +8,7 @@
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
+     <href>mailto:user1@example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
     <C:schedule-inbox-URL>
diff --git a/testing/tests/regression-suite/240-Moz-PROPFIND-sub.result b/testing/tests/regression-suite/240-Moz-PROPFIND-sub.result
index 72dbb0ca..340e1d06 100644
--- a/testing/tests/regression-suite/240-Moz-PROPFIND-sub.result
+++ b/testing/tests/regression-suite/240-Moz-PROPFIND-sub.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "597efa7e88a1a1b92b2e4992c06dec37"
-Content-Length: 743
+ETag: "0df5049284c13eae94d8f8ddc52d521b"
+Content-Length: 739
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -15,7 +15,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/davical/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
+     <href>mailto:user1@example.net</href>
      <href>/davical/caldav.php/user1/</href>
     </C:calendar-user-address-set>
     <C:schedule-inbox-URL>
diff --git a/testing/tests/regression-suite/240-Moz-PROPFIND.result b/testing/tests/regression-suite/240-Moz-PROPFIND.result
index 696db281..d1efa50b 100644
--- a/testing/tests/regression-suite/240-Moz-PROPFIND.result
+++ b/testing/tests/regression-suite/240-Moz-PROPFIND.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "ae38bedeae4ae0a4098c7b48fd69deec"
-Content-Length: 703
+ETag: "9b84304066ad932fa860037c4905711a"
+Content-Length: 699
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -15,7 +15,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
+     <href>mailto:user1@example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
     <C:schedule-inbox-URL>
diff --git a/testing/tests/regression-suite/501-iCal-PROPFIND.result b/testing/tests/regression-suite/501-iCal-PROPFIND.result
index e901498c..f2b44c44 100644
--- a/testing/tests/regression-suite/501-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/501-iCal-PROPFIND.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "5ed08314fb5ad0e07c85d57eb71be31b"
-Content-Length: 973
+ETag: "ba72f57f10a42d6b3d94e346924be098"
+Content-Length: 969
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -15,7 +15,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
+     <href>mailto:user1@example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
     <C:schedule-inbox-URL>
diff --git a/testing/tests/regression-suite/502-iCal-PROPFIND.result b/testing/tests/regression-suite/502-iCal-PROPFIND.result
index 5e800c09..df5b881d 100644
--- a/testing/tests/regression-suite/502-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/502-iCal-PROPFIND.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "749c1102d1fa2c3e72690999c1301e66"
-Content-Length: 3273
+ETag: "a05ad6040b4257724f861b2940830057"
+Content-Length: 2432
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -69,46 +69,6 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
  </response>
- <response>
-  <href>/caldav.php/user1/.in/</href>
-  <propstat>
-   <prop>
-    <resourcetype>
-     <collection/>
-     <C:schedule-inbox/>
-    </resourcetype>
-    <displayname>User 1 Inbox</displayname>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <C:calendar-description/>
-    <A:calendar-color/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/.out/</href>
-  <propstat>
-   <prop>
-    <resourcetype>
-     <collection/>
-     <C:schedule-outbox/>
-    </resourcetype>
-    <displayname>User 1 Outbox</displayname>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <C:calendar-description/>
-    <A:calendar-color/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
  <response>
   <href>/caldav.php/user1/calendar-proxy-read/</href>
   <propstat>
diff --git a/testing/tests/regression-suite/510-iCal-PROPFIND.result b/testing/tests/regression-suite/510-iCal-PROPFIND.result
index 7f2ad6f4..55eade7d 100644
--- a/testing/tests/regression-suite/510-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/510-iCal-PROPFIND.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "8d5cadaff927bedecef893cc26763bdc"
-Content-Length: 937
+ETag: "2a9abfc44969a1ca9913a13bc2008f1b"
+Content-Length: 933
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -22,7 +22,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/.out/</href>
     </C:schedule-outbox-URL>
     <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
+     <href>mailto:user1@example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
diff --git a/testing/tests/regression-suite/511-iCal-PROPFIND.result b/testing/tests/regression-suite/511-iCal-PROPFIND.result
index 6215a4fe..6ef1a548 100644
--- a/testing/tests/regression-suite/511-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/511-iCal-PROPFIND.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "37f4b022746b844ddd617319bd5e7d56"
-Content-Length: 926
+ETag: "6a5ca17c5e140b8e593cf5fd51a10003"
+Content-Length: 922
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -22,7 +22,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/.out/</href>
     </C:schedule-outbox-URL>
     <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
+     <href>mailto:user1@example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
diff --git a/testing/tests/regression-suite/520-iCal-PROPFIND.result b/testing/tests/regression-suite/520-iCal-PROPFIND.result
index c4870056..bbdcbb26 100644
--- a/testing/tests/regression-suite/520-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/520-iCal-PROPFIND.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "20ec64aa0f486554b4a15959dbab091b"
-Content-Length: 779
+ETag: "baa6a205310ac96ddbd3954eb242fecc"
+Content-Length: 780
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -16,7 +16,7 @@ Content-Type: text/xml; charset="utf-8"
      <C:schedule-inbox/>
     </resourcetype>
     <displayname>User 2 Inbox</displayname>
-    <A:getctag>""</A:getctag>
+    <A:getctag>"1"</A:getctag>
     <C:calendar-free-busy-set>
      <href>/caldav.php/user2/home/</href>
     </C:calendar-free-busy-set>
diff --git a/testing/tests/regression-suite/521-iCal-PROPFIND.result b/testing/tests/regression-suite/521-iCal-PROPFIND.result
index 316e16bb..8d25c332 100644
--- a/testing/tests/regression-suite/521-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/521-iCal-PROPFIND.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "2c9f6e94493f48b14831bb934f6c0e2d"
-Content-Length: 709
+ETag: "1c93928013374ad94bae2178d8bbf0dc"
+Content-Length: 710
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -16,7 +16,7 @@ Content-Type: text/xml; charset="utf-8"
      <C:schedule-outbox/>
     </resourcetype>
     <displayname>User 2 Outbox</displayname>
-    <A:getctag>""</A:getctag>
+    <A:getctag>"1"</A:getctag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
diff --git a/testing/tests/regression-suite/522-iCal-PROPFIND.result b/testing/tests/regression-suite/522-iCal-PROPFIND.result
index 8428a6c8..07489cff 100644
--- a/testing/tests/regression-suite/522-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/522-iCal-PROPFIND.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "91a8cf2fbee879465adb012a3716f2a6"
-Content-Length: 3520
+ETag: "ec88014cba0afd797ef66e9a50f7bd0d"
+Content-Length: 2427
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -54,54 +54,6 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
  </response>
- <response>
-  <href>/caldav.php/user2/.in/</href>
-  <propstat>
-   <prop>
-    <resourcetype>
-     <collection/>
-     <C1:schedule-inbox/>
-    </resourcetype>
-    <displayname>User 2 Inbox</displayname>
-    <C:getctag>""</C:getctag>
-    <C1:calendar-free-busy-set>
-     <href>/caldav.php/user2/home/</href>
-    </C1:calendar-free-busy-set>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <C1:calendar-description/>
-    <A:calendar-color/>
-    <A:calendar-order/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user2/.out/</href>
-  <propstat>
-   <prop>
-    <resourcetype>
-     <collection/>
-     <C1:schedule-outbox/>
-    </resourcetype>
-    <displayname>User 2 Outbox</displayname>
-    <C:getctag>""</C:getctag>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <C1:calendar-free-busy-set/>
-    <C1:calendar-description/>
-    <A:calendar-color/>
-    <A:calendar-order/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
  <response>
   <href>/caldav.php/user2/calendar-proxy-read/</href>
   <propstat>
diff --git a/testing/tests/regression-suite/523-iCal-PROPFIND.result b/testing/tests/regression-suite/523-iCal-PROPFIND.result
index d3a401c4..5151bdf4 100644
--- a/testing/tests/regression-suite/523-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/523-iCal-PROPFIND.result
@@ -2,8 +2,8 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 Content-Location: /caldav.php/user2/
-ETag: "3d87b8794e2cae8ab98077c4b2b1ca40"
-Content-Length: 973
+ETag: "0571e155467c02b24084f14ba5288184"
+Content-Length: 969
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -16,7 +16,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user2/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto%3Auser2%40example.net</href>
+     <href>mailto:user2@example.net</href>
      <href>/caldav.php/user2/</href>
     </C:calendar-user-address-set>
     <C:schedule-inbox-URL>
diff --git a/testing/tests/regression-suite/552-iPhone-PROPFIND.result b/testing/tests/regression-suite/552-iPhone-PROPFIND.result
index 4b635c59..bef6dd6d 100644
--- a/testing/tests/regression-suite/552-iPhone-PROPFIND.result
+++ b/testing/tests/regression-suite/552-iPhone-PROPFIND.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "c5d6273274dc9ecf811c954f41947619"
-Content-Length: 979
+ETag: "829c9b48fb62f9c48556924d548ded4a"
+Content-Length: 975
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -15,7 +15,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
+     <href>mailto:user1@example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
     <C:schedule-inbox-URL>
diff --git a/testing/tests/regression-suite/553-iPhone-PROPFIND.result b/testing/tests/regression-suite/553-iPhone-PROPFIND.result
index 33f780b4..352d2652 100644
--- a/testing/tests/regression-suite/553-iPhone-PROPFIND.result
+++ b/testing/tests/regression-suite/553-iPhone-PROPFIND.result
@@ -1,7 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "d0eafee2ab4fcc3c0368447335612cd4"
+ETag: "67c73d7155944138de99f14a0872e727"
 Transfer-Encoding: chunked
 Content-Type: text/xml; charset="utf-8"
 
@@ -201,138 +201,6 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
  </response>
- <response>
-  <href>/caldav.php/user1/.in/</href>
-  <propstat>
-   <prop>
-    <C1:supported-calendar-component-set>
-     <C1:comp name="VEVENT"/>
-     <C1:comp name="VTODO"/>
-     <C1:comp name="VJOURNAL"/>
-     <C1:comp name="VTIMEZONE"/>
-     <C1:comp name="VFREEBUSY"/>
-    </C1:supported-calendar-component-set>
-    <resourcetype>
-     <collection/>
-     <C1:schedule-inbox/>
-    </resourcetype>
-    <displayname>User 1 Inbox</displayname>
-    <C:getctag>""</C:getctag>
-    <current-user-privilege-set>
-     <privilege>
-      <all/>
-     </privilege>
-     <privilege>
-      <C1:read-free-busy/>
-     </privilege>
-     <privilege>
-      <read/>
-     </privilege>
-     <privilege>
-      <write/>
-     </privilege>
-     <privilege>
-      <bind/>
-     </privilege>
-     <privilege>
-      <unbind/>
-     </privilege>
-     <privilege>
-      <write-content/>
-     </privilege>
-     <privilege>
-      <write-properties/>
-     </privilege>
-     <privilege>
-      <lock/>
-     </privilege>
-     <privilege>
-      <unlock/>
-     </privilege>
-     <privilege>
-      <read-acl/>
-     </privilege>
-     <privilege>
-      <read-current-user-privilege-set/>
-     </privilege>
-    </current-user-privilege-set>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <C1:calendar-description/>
-    <A:calendar-color/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/.out/</href>
-  <propstat>
-   <prop>
-    <C1:supported-calendar-component-set>
-     <C1:comp name="VEVENT"/>
-     <C1:comp name="VTODO"/>
-     <C1:comp name="VJOURNAL"/>
-     <C1:comp name="VTIMEZONE"/>
-     <C1:comp name="VFREEBUSY"/>
-    </C1:supported-calendar-component-set>
-    <resourcetype>
-     <collection/>
-     <C1:schedule-outbox/>
-    </resourcetype>
-    <displayname>User 1 Outbox</displayname>
-    <C:getctag>""</C:getctag>
-    <current-user-privilege-set>
-     <privilege>
-      <all/>
-     </privilege>
-     <privilege>
-      <C1:read-free-busy/>
-     </privilege>
-     <privilege>
-      <read/>
-     </privilege>
-     <privilege>
-      <write/>
-     </privilege>
-     <privilege>
-      <bind/>
-     </privilege>
-     <privilege>
-      <unbind/>
-     </privilege>
-     <privilege>
-      <write-content/>
-     </privilege>
-     <privilege>
-      <write-properties/>
-     </privilege>
-     <privilege>
-      <lock/>
-     </privilege>
-     <privilege>
-      <unlock/>
-     </privilege>
-     <privilege>
-      <read-acl/>
-     </privilege>
-     <privilege>
-      <read-current-user-privilege-set/>
-     </privilege>
-    </current-user-privilege-set>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <C1:calendar-description/>
-    <A:calendar-color/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
  <response>
   <href>/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/</href>
   <propstat>
diff --git a/testing/tests/regression-suite/554-iPhone-PROPFIND.result b/testing/tests/regression-suite/554-iPhone-PROPFIND.result
index 33f780b4..352d2652 100644
--- a/testing/tests/regression-suite/554-iPhone-PROPFIND.result
+++ b/testing/tests/regression-suite/554-iPhone-PROPFIND.result
@@ -1,7 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "d0eafee2ab4fcc3c0368447335612cd4"
+ETag: "67c73d7155944138de99f14a0872e727"
 Transfer-Encoding: chunked
 Content-Type: text/xml; charset="utf-8"
 
@@ -201,138 +201,6 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
  </response>
- <response>
-  <href>/caldav.php/user1/.in/</href>
-  <propstat>
-   <prop>
-    <C1:supported-calendar-component-set>
-     <C1:comp name="VEVENT"/>
-     <C1:comp name="VTODO"/>
-     <C1:comp name="VJOURNAL"/>
-     <C1:comp name="VTIMEZONE"/>
-     <C1:comp name="VFREEBUSY"/>
-    </C1:supported-calendar-component-set>
-    <resourcetype>
-     <collection/>
-     <C1:schedule-inbox/>
-    </resourcetype>
-    <displayname>User 1 Inbox</displayname>
-    <C:getctag>""</C:getctag>
-    <current-user-privilege-set>
-     <privilege>
-      <all/>
-     </privilege>
-     <privilege>
-      <C1:read-free-busy/>
-     </privilege>
-     <privilege>
-      <read/>
-     </privilege>
-     <privilege>
-      <write/>
-     </privilege>
-     <privilege>
-      <bind/>
-     </privilege>
-     <privilege>
-      <unbind/>
-     </privilege>
-     <privilege>
-      <write-content/>
-     </privilege>
-     <privilege>
-      <write-properties/>
-     </privilege>
-     <privilege>
-      <lock/>
-     </privilege>
-     <privilege>
-      <unlock/>
-     </privilege>
-     <privilege>
-      <read-acl/>
-     </privilege>
-     <privilege>
-      <read-current-user-privilege-set/>
-     </privilege>
-    </current-user-privilege-set>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <C1:calendar-description/>
-    <A:calendar-color/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/.out/</href>
-  <propstat>
-   <prop>
-    <C1:supported-calendar-component-set>
-     <C1:comp name="VEVENT"/>
-     <C1:comp name="VTODO"/>
-     <C1:comp name="VJOURNAL"/>
-     <C1:comp name="VTIMEZONE"/>
-     <C1:comp name="VFREEBUSY"/>
-    </C1:supported-calendar-component-set>
-    <resourcetype>
-     <collection/>
-     <C1:schedule-outbox/>
-    </resourcetype>
-    <displayname>User 1 Outbox</displayname>
-    <C:getctag>""</C:getctag>
-    <current-user-privilege-set>
-     <privilege>
-      <all/>
-     </privilege>
-     <privilege>
-      <C1:read-free-busy/>
-     </privilege>
-     <privilege>
-      <read/>
-     </privilege>
-     <privilege>
-      <write/>
-     </privilege>
-     <privilege>
-      <bind/>
-     </privilege>
-     <privilege>
-      <unbind/>
-     </privilege>
-     <privilege>
-      <write-content/>
-     </privilege>
-     <privilege>
-      <write-properties/>
-     </privilege>
-     <privilege>
-      <lock/>
-     </privilege>
-     <privilege>
-      <unlock/>
-     </privilege>
-     <privilege>
-      <read-acl/>
-     </privilege>
-     <privilege>
-      <read-current-user-privilege-set/>
-     </privilege>
-    </current-user-privilege-set>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <C1:calendar-description/>
-    <A:calendar-color/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
  <response>
   <href>/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/</href>
   <propstat>
diff --git a/testing/tests/regression-suite/602-Soho-PROPFIND.result b/testing/tests/regression-suite/602-Soho-PROPFIND.result
index 8b6117a0..007903f8 100644
--- a/testing/tests/regression-suite/602-Soho-PROPFIND.result
+++ b/testing/tests/regression-suite/602-Soho-PROPFIND.result
@@ -1,7 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "47d77c3661bd0c6f5c7b50a4a6c4d59e"
+ETag: "6d6148f70715665afa09075dff4049a1"
 Transfer-Encoding: chunked
 Content-Type: text/xml; charset="utf-8"
 
@@ -15,7 +15,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
+     <href>mailto:user1@example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -37,7 +37,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
+     <href>mailto:user1@example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -59,7 +59,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
+     <href>mailto:user1@example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -81,7 +81,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
+     <href>mailto:user1@example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -103,7 +103,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
+     <href>mailto:user1@example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -125,7 +125,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
+     <href>mailto:user1@example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -147,7 +147,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
+     <href>mailto:user1@example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -169,7 +169,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
+     <href>mailto:user1@example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -191,7 +191,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
+     <href>mailto:user1@example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -213,7 +213,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
+     <href>mailto:user1@example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -235,7 +235,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
+     <href>mailto:user1@example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -257,7 +257,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
+     <href>mailto:user1@example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -279,7 +279,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
+     <href>mailto:user1@example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -301,7 +301,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
+     <href>mailto:user1@example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -323,7 +323,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
+     <href>mailto:user1@example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -345,7 +345,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
+     <href>mailto:user1@example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -367,7 +367,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
+     <href>mailto:user1@example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -389,51 +389,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-user-address-set>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <A:dropbox-home-URL/>
-    <A:notifications-URL/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/.in/</href>
-  <propstat>
-   <prop>
-    <C:calendar-home-set>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-home-set>
-    <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-user-address-set>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <A:dropbox-home-URL/>
-    <A:notifications-URL/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/.out/</href>
-  <propstat>
-   <prop>
-    <C:calendar-home-set>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-home-set>
-    <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
+     <href>mailto:user1@example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -455,7 +411,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
+     <href>mailto:user1@example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -477,7 +433,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
+     <href>mailto:user1@example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -499,7 +455,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
+     <href>mailto:user1@example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -521,7 +477,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
+     <href>mailto:user1@example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -543,7 +499,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
+     <href>mailto:user1@example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
diff --git a/testing/tests/regression-suite/603-Soho-PROPFIND.result b/testing/tests/regression-suite/603-Soho-PROPFIND.result
index 4661466f..d6556071 100644
--- a/testing/tests/regression-suite/603-Soho-PROPFIND.result
+++ b/testing/tests/regression-suite/603-Soho-PROPFIND.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "4ab67c78dc7e5125f42cc92c6b177711"
-Content-Length: 4508
+ETag: "f477c30d0e4406cb4f36301dcd3e1002"
+Content-Length: 3415
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -15,7 +15,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
+     <href>mailto:user1@example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -37,7 +37,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
+     <href>mailto:user1@example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -59,51 +59,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-user-address-set>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <A:dropbox-home-URL/>
-    <A:notifications-URL/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/.in/</href>
-  <propstat>
-   <prop>
-    <C:calendar-home-set>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-home-set>
-    <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-user-address-set>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <A:dropbox-home-URL/>
-    <A:notifications-URL/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/.out/</href>
-  <propstat>
-   <prop>
-    <C:calendar-home-set>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-home-set>
-    <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
+     <href>mailto:user1@example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -125,7 +81,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
+     <href>mailto:user1@example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -147,7 +103,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
+     <href>mailto:user1@example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -169,7 +125,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
+     <href>mailto:user1@example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
diff --git a/testing/tests/regression-suite/604-Soho-PROPFIND.result b/testing/tests/regression-suite/604-Soho-PROPFIND.result
index 72b49963..74cad25b 100644
--- a/testing/tests/regression-suite/604-Soho-PROPFIND.result
+++ b/testing/tests/regression-suite/604-Soho-PROPFIND.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "9b3ad28580551b6dea6a665dfa82b379"
-Content-Length: 698
+ETag: "600c4b10a558bf4dcaff71d767733dbc"
+Content-Length: 694
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -15,7 +15,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto%3Auser1%40example.net</href>
+     <href>mailto:user1@example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>