diff --git a/classes/Customer.php b/classes/Customer.php
index 2a6ece49a..7aa14a3c6 100644
--- a/classes/Customer.php
+++ b/classes/Customer.php
@@ -672,7 +672,7 @@ class CustomerCore extends ObjectModel
 				null,
 				null,
 				null,
-				_PS_THEME_DIR_,
+				_PS_MAIL_DIR_,
 				false,
 				(int)$this->id_shop
 			);
diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php
index 30dedb3d5..b309936a6 100644
--- a/classes/PaymentModule.php
+++ b/classes/PaymentModule.php
@@ -461,7 +461,7 @@ abstract class PaymentModuleCore extends Module
 									$params,
 									$this->context->customer->email,
 									$this->context->customer->firstname.' '.$this->context->customer->lastname,
-									null, null, null, null, _PS_THEME_DIR_, false, (int)$order->id_shop
+									null, null, null, null, _PS_MAIL_DIR_, false, (int)$order->id_shop
 								);
 							}
 						}
@@ -628,7 +628,7 @@ abstract class PaymentModuleCore extends Module
 								null,
 								null,
 								$file_attachement,
-								null, _PS_THEME_DIR_, false, (int)$order->id_shop
+								null, _PS_MAIL_DIR_, false, (int)$order->id_shop
 							);
 					}
 
diff --git a/classes/order/OrderHistory.php b/classes/order/OrderHistory.php
index 23fb936d7..1aa520304 100644
--- a/classes/order/OrderHistory.php
+++ b/classes/order/OrderHistory.php
@@ -364,12 +364,12 @@ class OrderHistoryCore extends ObjectModel
 				// If there's at least one downloadable file
 				if (!empty($assign))
 					Mail::Send((int)$order->id_lang, 'download_product', Mail::l('Virtual product to download', $order->id_lang), $data, $result['email'], $result['firstname'].' '.$result['lastname'],
-						null, null, null, null, _PS_THEME_DIR_, false, (int)$order->id_shop);
+						null, null, null, null, _PS_MAIL_DIR_, false, (int)$order->id_shop);
 			}
 
 			if (Validate::isLoadedObject($order))
 				Mail::Send((int)$order->id_lang, $result['template'], $topic, $data, $result['email'], $result['firstname'].' '.$result['lastname'],
-					null, null, null, null, _PS_THEME_DIR_, false, (int)$order->id_shop);
+					null, null, null, null, _PS_MAIL_DIR_, false, (int)$order->id_shop);
 		}
 
 		// Update id_order_state attribute in Order