diff --git a/inc/caldav-PUT-vcard.php b/inc/caldav-PUT-vcard.php
index 419e2bc5..727bf960 100644
--- a/inc/caldav-PUT-vcard.php
+++ b/inc/caldav-PUT-vcard.php
@@ -103,8 +103,7 @@ elseif( !preg_match('{^\d{8}T\d{6}Z$}', $last_modified) ) {
   $vcard->ClearProperties('REV');
   $vcard->AddProperty('REV',$last_modified);
 }
-
-$rendered_card = $vcard->Render(); 
+$rendered_card = $vcard->Render();
 $etag = md5($rendered_card);
 $params = array(
     ':user_no' => $user_no,
diff --git a/inc/vcard.php b/inc/vcard.php
index bccf7874..7fc890dc 100644
--- a/inc/vcard.php
+++ b/inc/vcard.php
@@ -93,7 +93,9 @@ CREATE TABLE addressbook_address_adr (
       $type = $adr->GetParameterValue('TYPE');
       if ( is_array($type) ) $type = implode('~|~',$type);
       $params[':type'] = $type;
-      $address = explode(';',$adr->Value());
+      //explode on ; that is not preceeded by an \
+      $address = preg_split( '{(?<!\\\\);}', $adr->Value());
+      //$address = explode(';',$adr->Value());
 
       // We use @ to suppress the warnings here, because the NULL in the database suits us well.
       @$params[':box_no']   = $address[0];