Index: trunk/wb/modules/form/save_field.php
===================================================================
--- trunk/wb/modules/form/save_field.php	(revision 306)
+++ trunk/wb/modules/form/save_field.php	(revision 307)
@@ -61,7 +61,7 @@
 	$values = array();
 	for($i = 1; $i <= $list_count; $i++) {
 		if($admin->get_post('value'.$i) != '') {
-			$values[] = $admin->get_post('value'.$i);
+			$values[] = str_replace(",","&#44;",$admin->get_post('value'.$i));
 		}
 	}
 	$value = implode(',', $values);
@@ -101,4 +101,4 @@
 // Print admin footer
 $admin->print_footer();
 
-?>
\ No newline at end of file
+?>
Index: trunk/wb/modules/form/view.php
===================================================================
--- trunk/wb/modules/form/view.php	(revision 306)
+++ trunk/wb/modules/form/view.php	(revision 307)
@@ -318,7 +318,7 @@
 			// Now send the email
 			if($email_to != '') {
 				if($email_from != '') {
-					if($wb->wb_mail($email_from,$email_to,$email_subject,$email_body)) { $success = true; }
+					if($wb->mail($email_from,$email_to,$email_subject,$email_body)) { $success = true; }
 				}
 			}				
 			// Write submission to database
@@ -360,4 +360,4 @@
 	
 }
 
-?>
\ No newline at end of file
+?>