Index: program/include/rcube_vcard.php
===================================================================
--- program/include/rcube_vcard.php	(revision 58510fc58fdf4903aa9b80aa2c2a402874edb5c8)
+++ program/include/rcube_vcard.php	(revision 99fc468d40ec342c05be2aec3a0adb6b2d2820fb)
@@ -105,8 +105,8 @@
     $this->organization = $this->raw['ORG'][0][0];
     $this->business = ($this->raw['X-ABSHOWAS'][0][0] == 'COMPANY') || (join('', (array)$this->raw['N'][0]) == '' && !empty($this->organization));
-    
+
     foreach ((array)$this->raw['EMAIL'] as $i => $raw_email)
       $this->email[$i] = is_array($raw_email) ? $raw_email[0] : $raw_email;
-    
+
     // make the pref e-mail address the first entry in $this->email
     $pref_index = $this->get_type_index('EMAIL', 'pref');
@@ -135,5 +135,5 @@
     $out = array('name' => $this->displayname);
     $typemap = $this->typemap;
-    
+
     // copy name fields to output array
     foreach (array('firstname','surname','middlename','nickname','organization') as $col) {
@@ -141,10 +141,10 @@
         $out[$col] = $this->$col;
     }
-    
+
     if ($this->raw['N'][0][3])
       $out['prefix'] = $this->raw['N'][0][3];
     if ($this->raw['N'][0][4])
       $out['suffix'] = $this->raw['N'][0][4];
-    
+
     // convert from raw vcard data into associative data for Roundcube
     foreach (array_flip($this->fieldmap) as $tag => $col) {
@@ -153,9 +153,9 @@
           $k = -1;
           $key = $col;
-          
+
           $subtype = $typemap[$raw['type'][++$k]] ? $typemap[$raw['type'][$k]] : strtolower($raw['type'][$k]);
           while ($k < count($raw['type']) && ($subtype == 'internet' || $subtype == 'pref'))
             $subtype = $typemap[$raw['type'][++$k]] ? $typemap[$raw['type'][$k]] : strtolower($raw['type'][$k]);
-          
+
           // read vcard 2.1 subtype
           if (!$subtype) {
@@ -171,5 +171,5 @@
           if (preg_match('/^(email|phone|address|website)/', $key) && !$subtype)
             $subtype = 'other';
-          
+
           if ($subtype)
             $key .= ':' . $subtype;
@@ -188,5 +188,5 @@
       }
     }
-    
+
     // handle special IM fields as used by Apple
     foreach ($this->immap as $tag => $type) {
@@ -195,9 +195,9 @@
       }
     }
-    
+
     // copy photo data
     if ($this->raw['PHOTO'])
       $out['photo'] = $this->raw['PHOTO'][0][0];
-    
+
     return $out;
   }
@@ -212,6 +212,6 @@
     return $folded ? self::rfc2425_fold($vcard) : $vcard;
   }
-  
-  
+
+
   /**
    * Clear the given fields in the loaded vcard data
@@ -223,5 +223,5 @@
     if (!$fields)
       $fields = array_merge(array_values($this->fieldmap), array_keys($this->immap), array('FN','N','ORG','NICKNAME','EMAIL','ADR','BDAY'));
-    
+
     foreach ($fields as $f)
       unset($this->raw[$f]);
@@ -231,5 +231,5 @@
     if (!$this->raw['FN'])
       $this->raw['FN'] = array();
-      
+
     $this->email = array();
   }
@@ -248,5 +248,5 @@
     $type = strtoupper($type);
     $typemap = array_flip($this->typemap);
-    
+
     switch ($field) {
       case 'name':
@@ -254,33 +254,33 @@
         $this->raw['FN'][0][0] = $value;
         break;
-        
+
       case 'surname':
         $this->raw['N'][0][0] = $value;
         break;
-        
+
       case 'firstname':
         $this->raw['N'][0][1] = $value;
         break;
-        
+
       case 'middlename':
         $this->raw['N'][0][2] = $value;
         break;
-        
+
       case 'prefix':
         $this->raw['N'][0][3] = $value;
         break;
-        
+
       case 'suffix':
         $this->raw['N'][0][4] = $value;
         break;
-        
+
       case 'nickname':
         $this->raw['NICKNAME'][0][0] = $value;
         break;
-        
+
       case 'organization':
         $this->raw['ORG'][0][0] = $value;
         break;
-        
+
       case 'photo':
         if (strpos($value, 'http:') === 0) {
@@ -293,10 +293,10 @@
         }
         break;
-        
+
       case 'email':
         $this->raw['EMAIL'][] = array(0 => $value, 'type' => array_filter(array('INTERNET', $type)));
         $this->email[] = $value;
         break;
-        
+
       case 'im':
         // save IM subtypes into extension fields
@@ -351,9 +351,9 @@
       }
     }
-    
+
     return $result;
   }
-  
-  
+
+
   /**
    * Convert a whole vcard (array) to UTF-8.
@@ -447,5 +447,5 @@
     // Remove cruft like item1.X-AB*, item1.ADR instead of ADR, and empty lines
     $vcard = preg_replace(array('/^item\d*\.X-AB.*$/m', '/^item\d*\./m', "/\n+/"), array('', '', "\n"), $vcard);
-    
+
     // convert X-WAB-GENDER to X-GENDER
     if (preg_match('/X-WAB-GENDER:(\d)/', $vcard, $matches)) {
@@ -459,5 +459,5 @@
     return $vcard;
   }
-  
+
   private static function x_abrelatednames_callback($matches)
   {
@@ -498,13 +498,15 @@
   private static function vcard_decode($vcard)
   {
-    // Perform RFC2425 line unfolding
+    // Perform RFC2425 line unfolding and split lines
     $vcard = preg_replace(array("/\r/", "/\n\s+/"), '', $vcard);
-    
-    $lines = preg_split('/\r?\n/', $vcard);
-    $data = array();
-    
+    $lines = explode("\n", $vcard);
+    $data  = array();
+
     for ($i=0; $i < count($lines); $i++) {
-      if (!preg_match('/^([^\\:]*):(.+)$/', $lines[$i], $line))
-          continue;
+      if (!preg_match('/^([^:]+):(.+)$/', $lines[$i], $line))
+        continue;
+
+      if (preg_match('/^(BEGIN|END)$/i', $line[1]))
+        continue;
 
       // convert 2.1-style "EMAIL;internet;home:" to 3.0-style "EMAIL;TYPE=internet;TYPE=home:"
@@ -515,5 +517,5 @@
       }
 
-      if (!preg_match('/^(BEGIN|END)$/i', $line[1]) && preg_match_all('/([^\\;]+);?/', $line[1], $regs2)) {
+      if (preg_match_all('/([^\\;]+);?/', $line[1], $regs2)) {
         $entry = array();
         $field = strtoupper($regs2[1][0]);
@@ -526,5 +528,5 @@
               while ($value == 'QUOTED-PRINTABLE' && preg_match('/=$/', $lines[$i]))
                   $line[2] .= "\n" . $lines[++$i];
-              
+
               $line[2] = self::decode_value($line[2], $value);
             }
@@ -544,26 +546,4 @@
     unset($data['VERSION']);
     return $data;
-  }
-
-
-  /**
-   * Split quoted string
-   *
-   * @param string vCard string to split
-   * @param string Separator char/string
-   * @return array List with splitted values
-   */
-  private static function vcard_unquote($s, $sep = ';')
-  {
-    // break string into parts separated by $sep, but leave escaped $sep alone
-    if (count($parts = explode($sep, strtr($s, array("\\$sep" => "\007")))) > 1) {
-      foreach($parts as $s) {
-        $result[] = self::vcard_unquote(strtr($s, array("\007" => "\\$sep")), $sep);
-      }
-      return $result;
-    }
-    else {
-      return strtr($s, array("\r" => '', '\\\\' => '\\', '\n' => "\n", '\,' => ',', '\;' => ';', '\:' => ':'));
-    }
   }
 
@@ -649,5 +629,27 @@
     }
     else {
-      return strtr($s, array('\\' => '\\\\', "\r" => '', "\n" => '\n', ';' => '\;', ':' => '\:'));
+      return strtr($s, array('\\' => '\\\\', "\r" => '', "\n" => '\n', ',' => '\,', ';' => '\;'));
+    }
+  }
+
+
+  /**
+   * Split quoted string
+   *
+   * @param string vCard string to split
+   * @param string Separator char/string
+   * @return array List with splitted values
+   */
+  private static function vcard_unquote($s, $sep = ';')
+  {
+    // break string into parts separated by $sep, but leave escaped $sep alone
+    if (count($parts = explode($sep, strtr($s, array("\\$sep" => "\007")))) > 1) {
+      foreach($parts as $s) {
+        $result[] = self::vcard_unquote(strtr($s, array("\007" => "\\$sep")), $sep);
+      }
+      return $result;
+    }
+    else {
+      return strtr($s, array("\r" => '', '\\\\' => '\\', '\n' => "\n", '\N' => "\n", '\,' => ',', '\;' => ';'));
     }
   }
@@ -701,4 +703,2 @@
 
 }
-
-