Index: typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php
===================================================================
--- typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php	(revision 6570)
+++ typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php	(working copy)
@@ -810,7 +810,7 @@
 		}
 		$borderClass = '';
 		if ($border)	{
-			$borderClass = 'csc-textpic-border';
+			$borderClass = $conf['borderClass']?$conf['borderClass']:'csc-textpic-border';
 		}
 
 			// Multiple classes with all properties, to be styled in CSS