diff --git a/themes/default/mobile/js/opc.js b/themes/default/mobile/js/opc.js
index ff319e6d2..4f2c93825 100644
--- a/themes/default/mobile/js/opc.js
+++ b/themes/default/mobile/js/opc.js
@@ -88,6 +88,20 @@ function initEvent()
 	});
 }
 
+function updateCarrierList(json)
+{
+	var html = json.carrier_block;
+	
+	// @todo  check with theme 1.4
+	//if ($('#HOOK_EXTRACARRIER').length == 0 && json.HOOK_EXTRACARRIER !== null && json.HOOK_EXTRACARRIER != undefined)
+	//	html += json.HOOK_EXTRACARRIER;
+	
+	$('#carrier_area').replaceWith(html);
+	bindInputs();
+	/* update hooks for carrier module */
+	$('#HOOK_BEFORECARRIER').html(json.HOOK_BEFORECARRIER);
+}
+
 function giftShowDiv()
 {
 	if ($('#gift').is(':checked'))
@@ -134,3 +148,161 @@ function updateCarrierSection(elm)
 		}
 	});
 }
+
+function bindInputs()
+{
+	// Order message update
+	$('#message').blur(function() {
+		$('#opc_delivery_methods-overlay').fadeIn('slow');
+		$.ajax({
+			type: 'POST',
+			headers: { "cache-control": "no-cache" },
+			url: orderOpcUrl + '?rand=' + new Date().getTime(),
+			async: false,
+			cache: false,
+			dataType : "json",
+			data: 'ajax=true&method=updateMessage&message=' + encodeURIComponent($('#message').val()) + '&token=' + static_token ,
+			success: function(jsonData)
+			{
+				if (jsonData.hasError)
+				{
+					var errors = '';
+					for(var error in jsonData.errors)
+						//IE6 bug fix
+						if(error !== 'indexOf')
+							errors += jsonData.errors[error] + "\n";
+					alert(errors);
+				}
+			else
+				$('#opc_delivery_methods-overlay').fadeOut('slow');
+			},
+			error: function(XMLHttpRequest, textStatus, errorThrown) {
+				if (textStatus !== 'abort')
+					alert("TECHNICAL ERROR: unable to save message \n\nDetails:\nError thrown: " + XMLHttpRequest + "\n" + 'Text status: ' + textStatus);
+				$('#opc_delivery_methods-overlay').fadeOut('slow');
+			}
+		});
+	});
+	
+	// Recyclable checkbox
+	$('#recyclable').click(function() {
+		updateCarrierSelectionAndGift();
+	});
+	
+	// Gift checkbox update
+	$('#gift').click(function() {
+		if ($('#gift').is(':checked'))
+			$('#gift_div').show();
+		else
+			$('#gift_div').hide();
+		updateCarrierSelectionAndGift();
+	});
+	
+	if ($('#gift').is(':checked'))
+		$('#gift_div').show();
+	else
+		$('#gift_div').hide();
+
+	// Gift message update
+	$('#gift_message').change(function() {
+		updateCarrierSelectionAndGift();
+	});
+	
+	// Term Of Service (TOS)
+	$('#cgv').click(function() {
+		updatePaymentMethodsDisplay();
+	});
+}
+
+function updateCarrierSelectionAndGift()
+{
+	var recyclablePackage = 0;
+	var gift = 0;
+	var giftMessage = '';
+	
+	var delivery_option_radio = $('.delivery_option_radio');
+	var delivery_option_params = '&';
+	$.each(delivery_option_radio, function(i) {
+		if ($(this).prop('checked'))
+			delivery_option_params += $(delivery_option_radio[i]).attr('name') + '=' + $(delivery_option_radio[i]).val() + '&';
+	});
+	if (delivery_option_params == '&')
+		delivery_option_params = '&delivery_option=&';
+
+	if ($('input#recyclable:checked').length)
+		recyclablePackage = 1;
+	if ($('input#gift:checked').length)
+	{
+		gift = 1;
+		giftMessage = encodeURIComponent($('#gift_message').val());
+	}
+	
+	$('#opc_delivery_methods-overlay, #opc_payment_methods-overlay').fadeOut('slow');
+	$.ajax({
+		type: 'POST',
+		headers: { "cache-control": "no-cache" },
+		url: orderOpcUrl + '?rand=' + new Date().getTime(),
+		async: true,
+		cache: false,
+		dataType : "json",
+		data: 'ajax=true&method=updateCarrierAndGetPayments' + delivery_option_params + 'recyclable=' + recyclablePackage + '&gift=' + gift + '&gift_message=' + giftMessage + '&token=' + static_token ,
+		success: function(jsonData)
+		{
+			if (jsonData.hasError)
+			{
+				var errors = '';
+				for(var error in jsonData.errors)
+					//IE6 bug fix
+					if(error !== 'indexOf')
+						errors += jsonData.errors[error] + "\n";
+				alert(errors);
+			}
+			else
+			{
+				updateCartSummary(jsonData.summary);
+				updatePaymentMethods(jsonData);
+				updateHookShoppingCart(jsonData.summary.HOOK_SHOPPING_CART);
+				updateHookShoppingCartExtra(jsonData.summary.HOOK_SHOPPING_CART_EXTRA);
+				updateCarrierList(jsonData.carrier_data);
+				$('#opc_delivery_methods-overlay, #opc_payment_methods-overlay').fadeOut('slow');
+				refreshDeliveryOptions();
+			}
+		},
+		error: function(XMLHttpRequest, textStatus, errorThrown) {
+			if (textStatus !== 'abort')
+				alert("TECHNICAL ERROR: unable to save carrier \n\nDetails:\nError thrown: " + XMLHttpRequest + "\n" + 'Text status: ' + textStatus);
+			$('#opc_delivery_methods-overlay, #opc_payment_methods-overlay').fadeOut('slow');
+		}
+	});
+}
+
+function updatePaymentMethods(json)
+{
+	$('#HOOK_TOP_PAYMENT').html(json.HOOK_TOP_PAYMENT);
+	$('#opc_payment_methods-content #HOOK_PAYMENT').html(json.HOOK_PAYMENT);
+}
+
+function updatePaymentMethodsDisplay()
+{
+	var checked = '';
+	if ($('#cgv:checked').length !== 0)
+		checked = 1;
+	else
+		checked = 0;
+	$('#opc_payment_methods-overlay').fadeIn('slow', function(){
+		$.ajax({
+			type: 'POST',
+			headers: { "cache-control": "no-cache" },
+			url: orderOpcUrl + '?rand=' + new Date().getTime(),
+			async: true,
+			cache: false,
+			dataType : "json",
+			data: 'ajax=true&method=updateTOSStatusAndGetPayments&checked=' + checked + '&token=' + static_token,
+			success: function(json)
+			{
+				updatePaymentMethods(json);
+			}
+		});
+		$(this).fadeOut('slow');		
+	});
+}
diff --git a/themes/default/mobile/order-carrier.tpl b/themes/default/mobile/order-carrier.tpl
index 90533c2d7..2b8ab93d7 100644
--- a/themes/default/mobile/order-carrier.tpl
+++ b/themes/default/mobile/order-carrier.tpl
@@ -143,7 +143,7 @@
 											</div>
 										</div>
 									</span>
-									<span class="delivery_option_carrier ui-block-b {if isset($delivery_option[$id_address]) && $delivery_option[$id_address] == $key}selected{/if} {if $option.unique_carrier}not-displayable{/if}">
+									<span class="delivery_option_carrier_desc ui-block-b {if isset($delivery_option[$id_address]) && $delivery_option[$id_address] == $key}selected{/if} {if $option.unique_carrier}not-displayable{/if}">
 										{foreach $option.carrier_list as $carrier}
 										<tr>
 											{if !$option.unique_carrier}
diff --git a/themes/default/mobile/order-opc-carrier.tpl b/themes/default/mobile/order-opc-carrier.tpl
index 8ff7ee6ea..e5b3e64f0 100644
--- a/themes/default/mobile/order-opc-carrier.tpl
+++ b/themes/default/mobile/order-opc-carrier.tpl
@@ -26,6 +26,34 @@
 {capture assign='page_title'}{l s='Shipping:'}{/capture}
 {include file='./page-title.tpl'}
 
+
+<script type="text/javascript">
+	// <![CDATA[
+	var orderProcess = 'order';
+	var currencySign = '{$currencySign|html_entity_decode:2:"UTF-8"}';
+	var currencyRate = '{$currencyRate|floatval}';
+	var currencyFormat = '{$currencyFormat|intval}';
+	var currencyBlank = '{$currencyBlank|intval}';
+	var txtProduct = "{l s='product' js=1}";
+	var txtProducts = "{l s='products' js=1}";
+	var orderUrl = '{$link->getPageLink("order", true)}';
+
+	var msg = "{l s='You must agree to the terms of service before continuing.' js=1}";
+	{literal}
+	function acceptCGV()
+	{
+		if ($('#cgv').length && !$('input#cgv:checked').length)
+		{
+			alert(msg);
+			return false;
+		}
+		else
+			return true;
+	}
+	{/literal}
+	//]]>
+</script>
+	
 <div data-role="content" id="delivery_choose">
 	<h3  class="bg">{l s='Choose your delivery method'}</h3>
 	<fieldset data-role="controlgroup">
@@ -70,7 +98,7 @@
 									</div>
 								</div>
 							</span>
-							<span class="delivery_option_carrier ui-block-b {if isset($delivery_option[$id_address]) && $delivery_option[$id_address] == $key}selected{/if} {if $option.unique_carrier}not-displayable{/if}">
+							<span class="delivery_option_carrier_desc ui-block-b {if isset($delivery_option[$id_address]) && $delivery_option[$id_address] == $key}selected{/if} {if $option.unique_carrier}not-displayable{/if}">
 								{foreach $option.carrier_list as $carrier}
 								<tr>
 									{if !$option.unique_carrier}
diff --git a/themes/default/mobile/order-opc.tpl b/themes/default/mobile/order-opc.tpl
index 36bfb256a..b1122b0c7 100644
--- a/themes/default/mobile/order-opc.tpl
+++ b/themes/default/mobile/order-opc.tpl
@@ -69,6 +69,7 @@
 	var errorCarrier = "{$errorCarrier}";
 	var errorTOS = "{$errorTOS}";
 	var checkedCarrier = "{if isset($checked)}{$checked}{else}0{/if}";
+	var freeShippingTranslation = "{l s='Free shipping!' js=1}";
 
 	var addresses = new Array();
 	var isLogged = {$isLogged|intval};