Index: branches/RC/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r11281 -r11412
--- branches/RC/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 11281)
+++ branches/RC/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 11412)
@@ -719,23 +719,44 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="edit_tabs" preset_name="Default">
-	<inp2:m_if check="{$prefix}_HasEditTabs" preset_name="$preset_name">
-		<table cellpadding="0" cellspacing="0" border="0" width="100%">
-			<tr>
-				<td align="right" width="100%">
-				  	<table cellpadding="0" cellspacing="0" border="0" height="23">
-						<tr>
-							<inp2:m_DefineElement name="edit_tab">
-								<inp2:m_RenderElement name="tab" title="$title" t="$template" main_prefix="$PrefixSpecial"/>
-							</inp2:m_DefineElement>
+<inp2:m_DefineElement name="tabs_container" tabs_render_as="">
+	<table cellpadding="0" style="width: 100%;" cellspacing="0" cellpadding="0">
+		<tr>
+			<td style="width: 20px;">
+				<img src="<inp2:m_TemplatesBase/>/img/spacer.gif" width="20" height="0" alt=""/><br/>
+				<a href="#" class="scroll-left disabled"></a>
+			</td>
 
-							<inp2:{$prefix}_PrintEditTabs render_as="edit_tab" preset_name="$preset_name"/>
+			<td height="23" align="right">
+				<div id="tab-measure" style="display: none; width: 100%; height: 23px;">&nbsp;</div>
+				<div style="overflow: hidden; height: 23px;" class="tab-viewport">
+					<table class="tabs" cellpadding="0" cellspacing="0" height="23">
+						<tr>
+							<inp2:m_RenderElement name="$tabs_render_as" />
 						</tr>
 					</table>
-				</td>
-			</tr>
-		</table>
+				</div>
+			</td>
+
+			<td style="width: 20px;">
+				<img src="<inp2:m_TemplatesBase/>/img/spacer.gif" width="20" height="0" alt=""/><br/>
+				<a href="#" class="scroll-right disabled"></a>
+			</td>
+		</tr>
+	</table>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="edit_tabs_element">
+	<inp2:m_DefineElement name="edit_tab">
+		<inp2:m_RenderElement name="tab" title="$title" t="$template" main_prefix="$PrefixSpecial"/>
+	</inp2:m_DefineElement>
+
+	<inp2:{$prefix}_PrintEditTabs render_as="edit_tab" preset_name="$preset_name"/>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="edit_tabs" preset_name="Default">
+	<inp2:m_if check="{$prefix}_HasEditTabs" preset_name="$preset_name">
+		<inp2:m_RenderElement name="tabs_container" tabs_render_as="edit_tabs_element" pass_params="1"/>
 	</inp2:m_if>
 </inp2:m_DefineElement>