Index: branches/1.2.x/in-commerce/elements/content_boxes/checkout/shipping_address.elm.tpl
===================================================================
diff -u -N -r14274 -r14857
--- branches/1.2.x/in-commerce/elements/content_boxes/checkout/shipping_address.elm.tpl	(.../shipping_address.elm.tpl)	(revision 14274)
+++ branches/1.2.x/in-commerce/elements/content_boxes/checkout/shipping_address.elm.tpl	(.../shipping_address.elm.tpl)	(revision 14857)
@@ -31,7 +31,7 @@
 			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="ShippingZip" title="lu_fld_Zip"/>
 			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="ShippingCountry" title="lu_fld_Country"/>
 			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="ShippingPhone" title="lu_fld_Phone"/>
-			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="ShippingEmail" title="lu_fld_Email" is_last="1"/>
+			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingEmail" title="lu_fld_Email" is_last="1"/>
 		<inp2:m_else/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingTo" title="lu_fld_FullName" style="width: 300px;" />
 			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCompany" title="lu_fld_Company" style="width: 300px;" />
@@ -42,7 +42,7 @@
 			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingZip" title="lu_fld_Zip" style="width: 100px;" />
 			<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="ShippingCountry" title="lu_fld_Country" style="width: 300px;" has_empty="1"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingPhone" title="lu_fld_Phone" style="width: 150px;" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingEmail" title="lu_fld_Email" style="width: 150px;" is_last="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingEmail" title="lu_fld_Email" style="width: 150px;" is_last="1"/>
 		</inp2:m_if>
 
 		<inp2:m_RenderElement design="inp_edit_buttons" width="200">