diff -Nur typo3_src-4.0rc3/typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php typo3_src-4.0rc3-eb/typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php
--- typo3_src-4.0rc3/typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php	2006-04-04 14:04:36.000000000 +0200
+++ typo3_src-4.0rc3-eb/typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php	2006-04-05 16:27:26.347439000 +0200
@@ -645,6 +645,7 @@
 			// How much space will the image-block occupy?
 		$imageBlockWidth = max($imageRowsFinalWidths)+ $colspacing*($colCount-1) + $colCount*$border*($borderSpace+$borderThickness)*2;
 		$GLOBALS['TSFE']->register['rowwidth'] = $imageBlockWidth;
+		$GLOBALS['TSFE']->register['rowwidthwithtextmargin'] = $imageBlockWidth + $textMargin;
 
 			// noRows is in fact just one ROW, with the amount of columns specified, where the images are placed in.
 			// noCols is just one COLUMN, each images placed side by side on each row
diff -Nur typo3_src-4.0rc3/typo3/sysext/css_styled_content/static/setup.txt typo3_src-4.0rc3-eb/typo3/sysext/css_styled_content/static/setup.txt
--- typo3_src-4.0rc3/typo3/sysext/css_styled_content/static/setup.txt	2006-04-04 14:04:36.000000000 +0200
+++ typo3_src-4.0rc3-eb/typo3/sysext/css_styled_content/static/setup.txt	2006-04-05 16:33:29.701186694 +0200
@@ -1304,11 +1304,11 @@
 		18.value = <div class="csc-textpic csc-textpic-intext-left###CLASSES###">###IMAGES######TEXT###</div>
 		# intext-right-nowrap
 		25 = TEXT
-		25.value = <div class="csc-textpic csc-textpic-intext-right-nowrap###CLASSES###">###IMAGES###<div style="margin-right:{register:rowwidth}px;">###TEXT###</div></div><div class="csc-textpic-clear"><!-- --></div>
+		25.value = <div class="csc-textpic csc-textpic-intext-right-nowrap###CLASSES###">###IMAGES###<div style="margin-right:{register:rowwidthwithtextmargin}px;">###TEXT###</div></div><div class="csc-textpic-clear"><!-- --></div>
 		25.insertData = 1
 		# intext-left-nowrap
 		26 = TEXT
-		26.value = <div class="csc-textpic csc-textpic-intext-left-nowrap###CLASSES###">###IMAGES###<div style="margin-left:{register:rowwidth}px;">###TEXT###</div></div><div class="csc-textpic-clear"><!-- --></div>
+		26.value = <div class="csc-textpic csc-textpic-intext-left-nowrap###CLASSES###">###IMAGES###<div style="margin-left:{register:rowwidthwithtextmargin}px;">###TEXT###</div></div><div class="csc-textpic-clear"><!-- --></div>
 		26.insertData = 1
 	}