diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php
index d7e75b7d2..98c00d8c3 100644
--- a/classes/PaymentModule.php
+++ b/classes/PaymentModule.php
@@ -1152,16 +1152,6 @@ abstract class PaymentModuleCore extends Module
$this->context->currency,
false
),
- '{delivery_block_txt}' => $this->_getFormatedAddress($delivery, "\n"),
- '{invoice_block_txt}' => $this->_getFormatedAddress($invoice, "\n"),
- '{delivery_block_html}' => $this->_getFormatedAddress($delivery, '
', array(
- 'firstname' => '%s',
- 'lastname' => '%s'
- )),
- '{invoice_block_html}' => $this->_getFormatedAddress($invoice, '
', array(
- 'firstname' => '%s',
- 'lastname' => '%s'
- )),
'{delivery_company}' => $delivery->company,
'{delivery_firstname}' => $delivery->firstname,
'{delivery_lastname}' => $delivery->lastname,
diff --git a/mails/en/order_conf.html b/mails/en/order_conf.html
index 1f701f139..c5990d109 100755
--- a/mails/en/order_conf.html
+++ b/mails/en/order_conf.html
@@ -317,36 +317,6 @@
-
-
-
-
- | |
-
-
-
- | |
-
-
-
- Customer address
-
- {invoice_block_html}
-
-
-
- |
- |
-
-
- |
-
-
- |
-
-
-
-
diff --git a/mails/en/order_conf.txt b/mails/en/order_conf.txt
index 06eeabbb7..2f6384972 100644
--- a/mails/en/order_conf.txt
+++ b/mails/en/order_conf.txt
@@ -37,9 +37,6 @@ Extra Services Tax
Final Booking Amount
{total_paid}
-Customer address
-{invoice_block_html}
-
You can review your order and download your invoice from the
"Order history" [{history_url}] section of your
customer account by clicking "My account"
diff --git a/mails/en/overbooking.html b/mails/en/overbooking.html
index 4fc0e43c6..95631ee77 100755
--- a/mails/en/overbooking.html
+++ b/mails/en/overbooking.html
@@ -318,35 +318,6 @@
-
-
-
-
-
-
-
- | |
-
-
-
- Customer address
-
- {invoice_block_html}
-
-
-
- |
- |
-
-
- |
-
-
- |
-
-
-
-
|
diff --git a/mails/en/overbooking.txt b/mails/en/overbooking.txt
index a6bd05b32..6a8f8975a 100644
--- a/mails/en/overbooking.txt
+++ b/mails/en/overbooking.txt
@@ -43,9 +43,6 @@ Extra Services Tax
Final Booking Amount
{total_paid}
-Customer address
-{invoice_block_html}
-
You can review your order and download your invoice from the
"Order history" [{history_url}] section of your
customer account by clicking "My account"
| |