diff --git a/phpgwapi/inc/horde/Horde/SyncML/Command/Get.php b/phpgwapi/inc/horde/Horde/SyncML/Command/Get.php
index f40ffc171a..2ffa10133b 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Command/Get.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Command/Get.php
@@ -106,8 +106,12 @@ class Horde_SyncML_Command_Get extends Horde_SyncML_Command {
                                    array('text/plain' => '1.0'));
             $this->_writeDataStore('./contacts', 'text/vcard', '3.0', $output,
                                    array('text/x-vcard' => '2.1'));
+            $this->_writeDataStore('./card', 'text/vcard', '3.0', $output,
+                                   array('text/x-vcard' => '2.1'));
             $this->_writeDataStore('./tasks', 'text/calendar', '2.0', $output,
                                    array('text/x-vcalendar' => '1.0'));
+            $this->_writeDataStore('./jobs', 'text/calendar', '2.0', $output,
+                                   array('text/x-vcalendar' => '1.0'));
             $this->_writeDataStore('./calendar', 'text/calendar', '2.0', $output,
                                    array('text/x-vcalendar' => '1.0'));
             $this->_writeDataStore('./events', 'text/calendar', '2.0', $output,
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Command/Put.php b/phpgwapi/inc/horde/Horde/SyncML/Command/Put.php
index 58e1fb8a4f..ea67a48996 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Command/Put.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Command/Put.php
@@ -159,6 +159,7 @@ class Horde_SyncML_Command_Put extends Horde_SyncML_Command {
 							switch ($this->_sourceReference)
 							{
 								case 'contact':
+								case 'card':
 									if ($this->_contentType != "text/x-s4j-sifc")
 									{
 										error_log("forcing 'contact' content type to 'text/x-s4j-sifc' instead of '".$this->_contentType."'");
diff --git a/phpgwapi/inc/horde/Horde/SyncML/State.php b/phpgwapi/inc/horde/Horde/SyncML/State.php
index b4df4e09a2..e695a256f0 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/State.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/State.php
@@ -153,17 +153,17 @@ define('SERVER_SYNC_FINNISHED',		5);
 define('SERVER_SYNC_ACKNOWLEDGED',	6);
 
 // conflict management
-define('CONFLICT_CLIENT_WINNING',		0);
-define('CONFLICT_SERVER_WINNING',		1);
-define('CONFLICT_MERGE_DATA',			2);
+define('CONFLICT_CLIENT_WINNING',			0);
+define('CONFLICT_SERVER_WINNING',			1);
+define('CONFLICT_MERGE_DATA',				2);
 define('CONFLICT_RESOLVED_WITH_DUPLICATE',	3);
 define('CONFLICT_CLIENT_CHANGES_IGNORED',	4);
 define('CONFLICT_CLIENT_REFRESH_ENFORCED',	5);
 
 define('MAX_DATA',			19);
-define('MAX_ENTRIES',			10); // default
-define('MAX_GUID_SIZE',			64);
-define('MIN_MSG_LEFT',		       200); // Overhead
+define('MAX_ENTRIES',		10); // default
+define('MAX_GUID_SIZE',		64);
+define('MIN_MSG_LEFT',		200); // Overhead
 
 /**
  * The Horde_SyncML_State class provides a SyncML state object.
@@ -846,6 +846,7 @@ class Horde_SyncML_State {
 		$_type = str_replace('./','',$type);
 		switch (strtolower($_type)) {
 			case 'contacts':
+			case 'card':
 				return 'text/vcard';
 				break;
 
@@ -856,6 +857,7 @@ class Horde_SyncML_State {
 			case 'calendar':
 			case 'events':
 			case 'tasks':
+			case 'jobs':
 			case 'caltasks':
 				return 'text/calendar';
 				break;
@@ -892,6 +894,7 @@ class Horde_SyncML_State {
 		switch(strtolower($_type))
 		{
 			case 'contacts':
+			case 'card':
 				return 'contacts';
 				break;
 
@@ -900,6 +903,7 @@ class Horde_SyncML_State {
 				break;
 
 			case 'tasks':
+			case 'jobs':
 				return 'tasks';
 				break;