diff --git a/phpgwapi/inc/horde/Horde/iCalendar.php b/phpgwapi/inc/horde/Horde/iCalendar.php
index 50577221af..120f251a20 100644
--- a/phpgwapi/inc/horde/Horde/iCalendar.php
+++ b/phpgwapi/inc/horde/Horde/iCalendar.php
@@ -822,17 +822,15 @@ class Horde_iCalendar {
 	                case 'ORG':
 		                $value = trim($value);
 		                // As of rfc 2426 2.4.2 semicolon, comma, and colon must
-		                // be escaped (comma is unescaped after splitting below).
-		                $value = str_replace(array('\\n', '\\N', '\\;', '\\:'),
-			                array("\n", "\n", ';', ':'),
+		                // be escaped (semicolon is unescaped after splitting below).
+		                $value = str_replace(array('\\n', '\\N', '\\,', '\\:'),
+			                array("\n", "\n", ',', ':'),
 							$value);
 
 		                // Split by unescaped semicolons:
 		                $values = preg_split('/(?<!\\\\);/', $value);
 		                $value = str_replace('\\;', ';', $value);
 		                $values = str_replace('\\;', ';', $values);
-		                $value = str_replace('\\,', ',', $value);
-		                $values = str_replace('\\,', ',', $values);
 		                $this->setAttribute($tag, trim($value), $params, true, $values);
 		                break;
 
@@ -841,15 +839,13 @@ class Horde_iCalendar {
 	                case 'CATEGORIES':
 		                $value = trim($value);
 		                // As of rfc 2426 2.4.2 semicolon, comma, and colon must
-		                // be escaped (semicolon is unescaped after splitting below).
-		                $value = str_replace(array('\\n', '\\N', '\\,', '\\:'),
-			                array("\n", "\n", ',', ':'),
+		                // be escaped (comma is unescaped after splitting below).
+		                $value = str_replace(array('\\n', '\\N', '\\;', '\\:'),
+			                array("\n", "\n", ';', ':'),
 							$value);
 
 		                // Split by unescaped commas:
 		                $values = preg_split('/(?<!\\\\),/', $value);
-		                $value = str_replace('\\;', ';', $value);
-		                $values = str_replace('\\;', ';', $values);
 		                $value = str_replace('\\,', ',', $value);
 		                $values = str_replace('\\,', ',', $values);
 		                $this->setAttribute($tag, trim($value), $params, true, $values);
@@ -861,16 +857,14 @@ class Horde_iCalendar {
 			                $value = trim($value);
 			                // vCalendar 1.0 and vCard 2.1 only escape semicolons
 			                // and use unescaped semicolons to create lists.
-			                $value = str_replace(array('\\n', '\\N', '\\;', '\\:'),
-				                array("\n", "\n", ';', ':'),
+			                $value = str_replace(array('\\n', '\\N', '\\,', '\\:'),
+				                array("\n", "\n", ',', ':'),
 								$value);
 
 			                // Split by unescaped semicolons:
 			                $values = preg_split('/(?<!\\\\);/', $value);
 			                $value = str_replace('\\;', ';', $value);
 			                $values = str_replace('\\;', ';', $values);
-			                $value = str_replace('\\,', ',', $value);
-			                $values = str_replace('\\,', ',', $values);
 			                $this->setAttribute($tag, trim($value), $params, true, $values);
 		                } else {
 			                $value = trim($value);