Index: typo3/sysext/cms/tslib/class.tslib_pibase.php
===================================================================
--- typo3/sysext/cms/tslib/class.tslib_pibase.php	(revision 6754)
+++ typo3/sysext/cms/tslib/class.tslib_pibase.php	(working copy)
@@ -802,10 +802,12 @@
 	 * @return	string		HTML content wrapped, ready to return to the parent object.
 	 */
 	function pi_wrapInBaseClass($str)	{
-		$content = '<div class="'.str_replace('_','-',$this->prefixId).'">
-		'.$str.'
-	</div>
-	';
+		if (isset($this->conf['stdWrap.'])) {
+			$content = $this->cObj->stdWrap($str, $this->conf['stdWrap.']);
+		} else {
+			$content = '<div class="' . str_replace('_', '-', $this->prefixId) . '">
+			' . $str . chr(10) . '</div>';
+		}
 
 		if(!$GLOBALS['TSFE']->config['config']['disablePrefixComment'])	{
 			$content = '