diff -ur scuttle-orig/bookmarks.php scuttle/bookmarks.php
--- scuttle-orig/bookmarks.php	2005-08-10 19:38:53.000000000 -0400
+++ scuttle/bookmarks.php	2005-08-11 01:03:13.303335848 -0400
@@ -144,7 +144,7 @@
 			$categories = trim($_POST['tags']);
       $del = trim($_POST['del']);
 			$saved = true;
-			$bId = addBookmark($address, $title, $description, $status, $categories, NULL, false, $del);
+			$bId = addBookmark($address, $title, $description, $status, $categories, NULL, false, $del, $userInfo['space_delim']);
 ?>
 
 <p class="success">Bookmark saved.</p>
@@ -185,7 +185,7 @@
 	<tr valign="top">
 		<th align="left">Tags</th>
 		<td><input type="text" name="tags" size="75" value="<?= $_GET['tags'] ?>" /></td>
-		<td>&larr; Comma-separated.</td>
+		<td>&larr; <?= $userInfo['space_delim'] ? 'Space' : 'Comma' ?>-separated.</td>
 	</tr>
 	<tr valign="top">
 		<th align="left">Privacy</th>
diff -ur scuttle-orig/functions.inc.php scuttle/functions.inc.php
--- scuttle-orig/functions.inc.php	2005-08-10 19:38:53.000000000 -0400
+++ scuttle/functions.inc.php	2005-08-10 23:35:56.000000000 -0400
@@ -316,7 +316,7 @@
 	return $tagarray;
 }
 
-function addBookmark($address, $title, $description, $status, $categories, $date = NULL, $fromApi = false, $post_to_delicious = false) {
+function addBookmark($address, $title, $description, $status, $categories, $date = NULL, $fromApi = false, $post_to_delicious = false, $space_delim = true) {
 	//	Adds a bookmark to the database; assumes that the DB connection is already up and running.
 	//	Note that date is expected to be a string that's interpretable by strtotime().
 	global $sId, $sName, $USE_DELICIOUS, $PHP_CLI_PATH;
@@ -325,7 +325,7 @@
 	if (!is_array($categories)) {
 		$categories = trim($categories);
 		if (substr($categories, -1) == ',') $categories = substr($categories, 0, -1);
-		if ($fromApi)
+		if ($fromApi || !$space_delim)
 			$categories = explode(' ', $categories);
 		else
 			$categories = explode(',', $categories);
diff -ur scuttle-orig/profile.php scuttle/profile.php
--- scuttle-orig/profile.php	2005-08-10 19:38:53.000000000 -0400
+++ scuttle/profile.php	2005-08-10 23:40:58.000000000 -0400
@@ -59,6 +59,7 @@
 	$detDesc = filter($_POST['pDesc']);
   $detDelUser = trim($_POST['pDelUser']);
   $detDelPass = trim($_POST['pDelPass']);
+  $detSpaceDelim = trim($_POST['pSpaceDelim']) ? 1 : 0;
 	if ($detName == "" || $detMail == "") {
 		$error = true;
 		$errorMsg .= '<p class="error">Your name and e-mail address are required and must be completed.</p>';
@@ -82,9 +83,9 @@
 	if (!$error) {
 		$datetime = date('Y-m-d H:i:s', time());
 		if ($detPass != "")
-			$query = "UPDATE scUsers SET uModified = '". $datetime ."', password = '". sha1($detPass) ."', name='". mysql_escape_string($detName) ."', email='". mysql_escape_string($detMail) ."', homepage='". mysql_escape_string($detPage) ."', uContent='". mysql_escape_string($detDesc). "', delicious_username='" . mysql_escape_string($detDelUser) . "', delicious_password='" . mysql_escape_string($detDelPass) . "' WHERE username = '". mysql_escape_string($user) ."'";
+			$query = "UPDATE scUsers SET uModified = '". $datetime ."', password = '". sha1($detPass) ."', name='". mysql_escape_string($detName) ."', email='". mysql_escape_string($detMail) ."', homepage='". mysql_escape_string($detPage) ."', uContent='". mysql_escape_string($detDesc). "', delicious_username='" . mysql_escape_string($detDelUser) . "', delicious_password='" . mysql_escape_string($detDelPass) . "', space_delim = " . intval($detSpaceDelim) . " WHERE username = '". mysql_escape_string($user) ."'";
 		else
-			$query = "UPDATE scUsers SET uModified = '". $datetime ."', name='". mysql_escape_string($detName) ."', email='". mysql_escape_string($detMail) ."', homepage='". mysql_escape_string($detPage) ."', uContent='". mysql_escape_string($detDesc). "', delicious_username='" . mysql_escape_string($detDelUser) . "', delicious_password='" . mysql_escape_string($detDelPass) . "' WHERE username = '". mysql_escape_string($user) ."'";
+			$query = "UPDATE scUsers SET uModified = '". $datetime ."', name='". mysql_escape_string($detName) ."', email='". mysql_escape_string($detMail) ."', homepage='". mysql_escape_string($detPage) ."', uContent='". mysql_escape_string($detDesc). "', delicious_username='" . mysql_escape_string($detDelUser) . "', delicious_password='" . mysql_escape_string($detDelPass) . "', space_delim = " . intval($detSpaceDelim) . " WHERE username = '". mysql_escape_string($user) ."'";
 		$result = mysql_query($query) or die ("Invalid query");
 ?>
 
@@ -176,6 +177,8 @@
     <dd><input type="text" name="pDelUser" size="75" value="<?= $row['delicious_username'] ?>" /></dd>
     <dt>Delicious Password</dt>
     <dd><input type="password" name="pDelPass" size="75" value="<?= $row['delicious_password'] ?>" /></dd>
+    <dt>Space-Delimited Categories?</dt>
+    <dd><input type="checkbox" id='pSpaceDelim' name="pSpaceDelim" "<?= $row['space_delim'] ? 'checked="1"' : '' ?>" /><label for='pSpaceDelim'>Space-Delimited Categories?</label></dd>
 		<?php
 		$watchnames = getWatchNames($user);
 		if ($watchnames) {
diff -ur scuttle-orig/tables.sql scuttle/tables.sql
--- scuttle-orig/tables.sql	2005-08-10 23:33:34.000000000 -0400
+++ scuttle/tables.sql	2005-08-10 23:34:22.000000000 -0400
@@ -57,6 +57,7 @@
   `homepage` varchar(100) default NULL,
   `delicious_username` varchar(64) NOT NULL DEFAULT '',
   `delicious_password` varchar(64) NOT NULL DEFAULT '',
+  `space_delim` BOOLEAN NOT NULL DEFAULT 0,
   `uContent` text,
   PRIMARY KEY  (`uId`)
 ) TYPE=MyISAM PACK_KEYS=0;

