diff --git a/adm/tabs/AdminOrders.php b/adm/tabs/AdminOrders.php
index 28be25f0..0925e4a6 100755
--- a/adm/tabs/AdminOrders.php
+++ b/adm/tabs/AdminOrders.php
@@ -3018,12 +3018,24 @@ class AdminOrders extends AdminTab
                     AND `MR_Selected_Num` IS NOT NULL
                 ');
                 if($mr) {
+                	switch ($res['MR_Selected_Pays']) {
+						case 'FR':
+							$mr['MR_Selected_Pays_Display'] = 'FRANCE';
+							break;
+						case 'ES':
+							$mr['MR_Selected_Pays_Display'] = 'ESPAGNE';
+							break;
+						default:
+							$mr['MR_Selected_Pays_Display'] = '..';
+							break;
+					}
+
                     $order_address = nl2br(preg_replace("/(\r\n){2,}/", "\r\n", implode("\r\n", array(
                         $mr['MR_Selected_LgAdr1'],
                         $mr['MR_Selected_LgAdr2'],
                         $mr['MR_Selected_LgAdr3'] . ' ' . $mr['MR_Selected_LgAdr4'],
                         $mr['MR_Selected_CP'] . ' ' . $mr['MR_Selected_Ville'],
-                        'FRANCE',
+                        $mr['MR_Selected_Pays_Display'],
                         'Point Relais : '.$mr['MR_Selected_Num']
                     ))));
                 } else {
diff --git a/modules/mondialrelay/mondialrelay.php b/modules/mondialrelay/mondialrelay.php
index ea4b9e27..97c5d8cf 100755
--- a/modules/mondialrelay/mondialrelay.php
+++ b/modules/mondialrelay/mondialrelay.php
@@ -485,29 +485,39 @@ class MondialRelay extends Module
 			WHERE s.`id_cart` = '.(int)$params['order']->id_cart;
 		$res = Db::getInstance()->getRow($sql);
 
-		if (!$res)
+		if (!$res) {
 			return;
+		}
 
 		$point_relais = $res['MR_Selected_LgAdr1'].
-					($res['MR_Selected_LgAdr1'] ? ' <br/> ' : '').$res['MR_Selected_LgAdr2'].
-					($res['MR_Selected_LgAdr2'] ? ' <br/> ' : '').$res['MR_Selected_LgAdr3'].
-					($res['MR_Selected_LgAdr3'] ? ' <br/> ' : '').$res['MR_Selected_LgAdr4'].
-					($res['MR_Selected_LgAdr4'] ? ' <br/> ' : '').$res['MR_Selected_CP'].' '.
-					$res['MR_Selected_Ville'].' <br/> '.$res['MR_Selected_Pays'];
-
-
-		if (($res['dlv_mode'] == 'LD1') || ($res['dlv_mode'] == 'LDS') || ($res['dlv_mode'] == 'HOM'))
-			$this->context->smarty->assign(
-				array(
-						'mr_url' => $res['url_suivi']
-						));
-		else
-			$this->context->smarty->assign(
-				array(
-					'mr_addr' => $point_relais,
-					'mr_url' => $res['url_suivi']
-				));
-
+			($res['MR_Selected_LgAdr1'] ? ' <br/> ' : '').$res['MR_Selected_LgAdr2'].
+			($res['MR_Selected_LgAdr2'] ? ' <br/> ' : '').$res['MR_Selected_LgAdr3'].
+			($res['MR_Selected_LgAdr3'] ? ' <br/> ' : '').$res['MR_Selected_LgAdr4'].
+			($res['MR_Selected_LgAdr4'] ? ' <br/> ' : '').$res['MR_Selected_CP'].' '.
+			$res['MR_Selected_Ville'].' <br/> ';
+		
+		switch ($res['MR_Selected_Pays']) {
+			case 'FR':
+				$point_relais .= 'FRANCE';
+				break;
+			case 'ES':
+				$point_relais .= 'ESPAGNE';
+				break;
+			default:
+				$point_relais .= '..';
+				break;
+		}
+			
+		if (($res['dlv_mode'] == 'LD1') || ($res['dlv_mode'] == 'LDS') || ($res['dlv_mode'] == 'HOM')) {
+			$this->context->smarty->assign(array('mr_url' => $res['url_suivi']));
+		}
+		else {
+			$this->context->smarty->assign(array(
+				'mr_addr' => $point_relais,
+				'mr_url' => $res['url_suivi']
+			));
+		}
+		
 		return $this->fetchTemplate('/views/templates/front/', 'order_detail');
 	}
 
diff --git a/modules/mondialrelay/views/templates/front/order_detail.tpl b/modules/mondialrelay/views/templates/front/order_detail.tpl
index 9d216e57..6d91a2b3 100755
--- a/modules/mondialrelay/views/templates/front/order_detail.tpl
+++ b/modules/mondialrelay/views/templates/front/order_detail.tpl
@@ -28,7 +28,9 @@
     	<li class="address_title">Mondial Relay</li>
     	<li>
     {if isset($mr_addr) && $mr_addr}
-    	<p id="dateofdelivery"><b style="text-transform:none;">{l s='Delivery to your Point Relais®' mod='mondialrelay'}</b> <br />{$mr_addr|escape:'UTF-8'}</p>
+    	<p id="dateofdelivery">
+    	<b style="text-transform:none;">{l s='Delivery to your Point Relais®' mod='mondialrelay'}</b> <br />
+    	{$mr_addr|escape:'UTF-8'}</p>
     {/if}
     {if $mr_url}
     	<a href="{$mr_url|escape:'htmlall':'UTF-8'}" target="_blank">{l s='Follow my package on Mondial Relay website' mod='mondialrelay'}.</a>