diff --git a/mails/de/order_conf.html b/mails/de/order_conf.html
index e5923b6e0..1fdbaf55c 100644
--- a/mails/de/order_conf.html
+++ b/mails/de/order_conf.html
@@ -1,10 +1,10 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<title>Message from {shop_name}</title>
-</head>
-<body>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<title>Message from {shop_name}</title>
+</head>
+<body>
 	<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
 <tbody>
 <tr>
@@ -103,10 +103,10 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td align="left">Sie k&ouml;nnen diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}history.php">"Bestellverlauf"</a> Ihres Kontos downloaden, indem Sie auf unserer Webseite auf <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}my-account.php">"Mein Konto"</a> klicken.</td>
+<td align="left">Sie k&ouml;nnen diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=history">"Bestellverlauf"</a> Ihres Kontos downloaden, indem Sie auf unserer Webseite auf <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=my-account">"Mein Konto"</a> klicken.</td>
 </tr>
 <tr>
-<td align="left">Wenn Sie ein Gast-Konto haben, k&ouml;nnen Sie Ihre Bestellung im Abschnitt <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}guest-tracking.php">"Bestellverfolgung Gast"</a> auf unserer Webseite verfolgen.</td>
+<td align="left">Wenn Sie ein Gast-Konto haben, k&ouml;nnen Sie Ihre Bestellung im Abschnitt <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=guest-tracking">"Bestellverfolgung Gast"</a> auf unserer Webseite verfolgen.</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
@@ -115,6 +115,6 @@
 <td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
 </tr>
 </tbody>
-</table>
-</body>
+</table>
+</body>
 </html>
\ No newline at end of file
diff --git a/mails/es/order_conf.html b/mails/es/order_conf.html
index 29ea724e4..9163dd82b 100644
--- a/mails/es/order_conf.html
+++ b/mails/es/order_conf.html
@@ -1,10 +1,10 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<title>Mensaje desde {shop_name}</title>
-</head>
-<body>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<title>Mensaje desde {shop_name}</title>
+</head>
+<body>
 	<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
 <tbody>
 <tr>
@@ -98,10 +98,10 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td align="left">Puedes revisar tu pedido y descargar la factura aqu&iacute;: <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}history.php">"Historial de Pedidos"</a> dentro de tu cuenta <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}my-account.php">"Entrar en Mi Cuenta"</a> de nuestro sitio web.</td>
+<td align="left">Puedes revisar tu pedido y descargar la factura aqu&iacute;: <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=history">"Historial de Pedidos"</a> dentro de tu cuenta <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=my-account">"Entrar en Mi Cuenta"</a> de nuestro sitio web.</td>
 </tr>
 <tr>
-<td align="left">If you have guest account, you can follow your order at <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}guest-tracking.php">"Guest Tracking"</a> section on our Website.</td>
+<td align="left">If you have guest account, you can follow your order at <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=guest-tracking">"Guest Tracking"</a> section on our Website.</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
@@ -110,6 +110,6 @@
 <td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> desarrollado por <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
 </tr>
 </tbody>
-</table>
-</body>
+</table>
+</body>
 </html>
\ No newline at end of file
diff --git a/mails/it/order_conf.html b/mails/it/order_conf.html
index 21966e98b..fbe14ae59 100644
--- a/mails/it/order_conf.html
+++ b/mails/it/order_conf.html
@@ -1,10 +1,10 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<title>Messaggio da {shop_name}</title>
-</head>
-<body>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<title>Messaggio da {shop_name}</title>
+</head>
+<body>
 		<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
 <tbody>
 <tr>
@@ -103,10 +103,10 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td align="left">Puoi rivedere l&#039;ordine e scaricare la fattura dalla sezione&nbsp;<a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}history.php">"Cronologia ordine"</a> del tuo account cliccando su&nbsp;<a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}my-account.php">"Il mio account"</a> nel nostro sito web.</td>
+<td align="left">Puoi rivedere l&#039;ordine e scaricare la fattura dalla sezione&nbsp;<a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=history">"Cronologia ordine"</a> del tuo account cliccando su&nbsp;<a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=my-account">"Il mio account"</a> nel nostro sito web.</td>
 </tr>
 <tr>
-<td align="left">Se hai un account ospite, puoi seguire il tuo ordine nella sezione&nbsp;<a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}guest-tracking.php">"Controllo ordini ospite"</a> del nostro sito web.</td>
+<td align="left">Se hai un account ospite, puoi seguire il tuo ordine nella sezione&nbsp;<a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=guest-tracking">"Controllo ordini ospite"</a> del nostro sito web.</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
@@ -116,6 +116,6 @@
 </tr>
 </tbody>
 </table>
-
-</body>
+
+</body>
 </html>
\ No newline at end of file


Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken.	Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken.
Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen.	Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen.
	{shop_name} powered with PrestaShop™

Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web.	Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web.
If you have guest account, you can follow your order at "Guest Tracking" section on our Website.	If you have guest account, you can follow your order at "Guest Tracking" section on our Website.
	{shop_name} desarrollado por PrestaShop™

Puoi rivedere l'ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web.	Puoi rivedere l'ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web.
Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite" del nostro sito web.	Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite" del nostro sito web.