diff --git a/calendar/inc/class.calendar_ical.inc.php b/calendar/inc/class.calendar_ical.inc.php
index ba6930a2a4..2d4f7acd10 100644
--- a/calendar/inc/class.calendar_ical.inc.php
+++ b/calendar/inc/class.calendar_ical.inc.php
@@ -987,8 +987,8 @@ class calendar_ical extends calendar_boupdate
                     		translation::charset(),$charset);
                     $content = $valueData . implode(';', $valuesData);
 
-					if (preg_match('/[^\x20-\x7F]/', $content) ||
-						($paramData['CN'] && preg_match('/[^\x20-\x7F]/', $paramData['CN'])))
+					if ($version == '1.0' && (preg_match('/[^\x20-\x7F]/', $content) ||
+						($paramData['CN'] && preg_match('/[^\x20-\x7F]/', $paramData['CN']))))
 					{
 						$paramData['CHARSET'] = $charset;
 						switch ($this->productManufacturer)
@@ -998,7 +998,6 @@ class calendar_ical extends calendar_boupdate
 								{
 									$paramData['ENCODING'] = 'QUOTED-PRINTABLE';
 								}
-								/* disable automatic QP encoding eg. for new-lines as it also encodes non-ascii/utf-8 which TB does NOT decode
 								else
 								{
 									$paramData['CHARSET'] = '';
@@ -1010,7 +1009,7 @@ class calendar_ical extends calendar_boupdate
 									{
 										$paramData['ENCODING'] = '';
 									}
-								}*/
+								}
 								break;
 							case 'funambol':
 								$paramData['ENCODING'] = 'FUNAMBOL-QP';
diff --git a/infolog/inc/class.infolog_ical.inc.php b/infolog/inc/class.infolog_ical.inc.php
index 365d395245..261c8d2934 100644
--- a/infolog/inc/class.infolog_ical.inc.php
+++ b/infolog/inc/class.infolog_ical.inc.php
@@ -281,7 +281,7 @@ class infolog_ical extends infolog_bo
 				$options = array();
 			}
 
-			if (preg_match('/[^\x20-\x7F]/', $value))
+			if ($_version == '1.0' && preg_match('/[^\x20-\x7F]/', $value))
 			{
 				$options['CHARSET']	= $charset;
 				switch ($this->productManufacturer)