diff --git a/classes/extravar/Extravar.class.php b/classes/extravar/Extravar.class.php
index df235ca97..e56cc1517 100644
--- a/classes/extravar/Extravar.class.php
+++ b/classes/extravar/Extravar.class.php
@@ -249,7 +249,7 @@ class ExtraItem
 
 				for($i = 0, $c = count($values); $i < $c; $i++)
 				{
-					$values[$i] = trim(htmlspecialchars($values[$i], ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
+					$values[$i] = htmlspecialchars($values[$i], ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 				}
 
 				return $values;
@@ -306,15 +306,21 @@ class ExtraItem
 			case 'textarea' :
 				return nl2br($value);
 				
+			case 'checkbox' :
+				if(is_array($value))
+				{
+					return implode(', ', $value);
+				}
+				return $value;
+				
 			case 'date' :
 				return zdate($value, "Y-m-d");
 
-			case 'checkbox' :
 			case 'select' :
 			case 'radio' :
 				if(is_array($value))
 				{
-					return implode(',', $value);
+					return implode(', ', $value);
 				}
 				return $value;