diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php
index 9d8b593ad..fe2e5c6a2 100644
--- a/controllers/front/OrderOpcController.php
+++ b/controllers/front/OrderOpcController.php
@@ -405,9 +405,11 @@ class OrderOpcControllerCore extends ParentOrderController
 		if (!$this->isLogged)
 		{
 			$carriers = $this->context->cart->simulateCarriersOutput();
+			$oldMessage = Message::getMessageByCartId((int)($this->context->cart->id));
 			$this->context->smarty->assign(array(
 				'HOOK_EXTRACARRIER' => null,
 				'HOOK_EXTRACARRIER_ADDR' => null,
+				'oldMessage' => isset($oldMessage['message'])? $oldMessage['message'] : '',
 				'HOOK_BEFORECARRIER' => Hook::exec('displayBeforeCarrier', array(
 					'carriers' => $carriers,
 					'checked' => $this->context->cart->simulateCarrierSelectedOutput(),
@@ -494,6 +496,7 @@ class OrderOpcControllerCore extends ParentOrderController
 
 		$wrapping_fees = $this->context->cart->getGiftWrappingPrice(false);
 		$wrapping_fees_tax_inc = $wrapping_fees = $this->context->cart->getGiftWrappingPrice();
+		$oldMessage = Message::getMessageByCartId((int)($this->context->cart->id));
 
 		$vars = array(
 			'free_shipping' => false, // Deprecated since a cart rule can be applied the specific carriers only
@@ -513,6 +516,7 @@ class OrderOpcControllerCore extends ParentOrderController
 			'delivery_option' => $delivery_option,
 			'address_collection' => $this->context->cart->getAddressCollection(),
 			'opc' => true,
+			'oldMessage' => isset($oldMessage['message'])? $oldMessage['message'] : '',
 			'HOOK_BEFORECARRIER' => Hook::exec('displayBeforeCarrier', array(
 				'carriers' => $carriers,
 				'delivery_option_list' => $this->context->cart->getDeliveryOptionList(),
@@ -538,6 +542,7 @@ class OrderOpcControllerCore extends ParentOrderController
 				)),
 				'carrier_block' => $this->context->smarty->fetch(_PS_THEME_DIR_.'order-carrier.tpl')
 			);
+
 			Cart::addExtraCarriers($result);
 			return $result;
 		}
diff --git a/themes/default/css/global.css b/themes/default/css/global.css
index bf02f5f8b..110c7b506 100644
--- a/themes/default/css/global.css
+++ b/themes/default/css/global.css
@@ -1267,10 +1267,11 @@ a.iframe {font-weight:bold}
 	width:723px;
 	border:1px solid #ccc
 }
-
+#order-opc #opc_delivery_methods #message {
+	width: 757px;
+}
 #order-opc #opc_payment_methods {margin-bottom:20px}
 #order-opc #opc_payment_methods #opc_payment_methods-content p{margin:0}
-
 .delivery_option_carrier td {width:200px}
 .delivery_option_carrier td + td {width:280px;}
 .delivery_option_carrier td + td + td {width:200px}
diff --git a/themes/default/order-carrier.tpl b/themes/default/order-carrier.tpl
index c2c83f13d..25e164044 100644
--- a/themes/default/order-carrier.tpl
+++ b/themes/default/order-carrier.tpl
@@ -293,7 +293,7 @@
 	<h3>{l s='Leave a message'}</h3>
 	<div>
 		<p>{l s='If you would like to add a comment about your order, please write it in the field below.'}</p>
-		<p><textarea cols="120" rows="3" name="message" id="message">{if isset($oldMessage)}{$oldMessage}{/if}</textarea></p>
+		<p><textarea cols="120" rows="3" name="message" id="message">{if isset($oldMessage)}{$oldMessage|escape:'htmlall':'UTF-8'}{/if}</textarea></p>
 	</div>
 </div>
 {/if}