diff --git a/MailMessage.php b/MailMessage.php
new file mode 100644
index 0000000..ffa0eb4
--- /dev/null
+++ b/MailMessage.php
@@ -0,0 +1,415 @@
+<?php 
+if (! defined('_PS_VERSION_')){
+	exit();
+}
+
+/**
+ * This class represents a mail message.
+ * 
+ * @author Thomas Hunziker
+ *
+ */
+class MailMessage {
+	
+	private $langId;
+	
+	private $templateName;
+	
+	private $subject;
+	
+	private $templateVariables;
+	
+	private $toEmailAddress;
+	
+	private $toName;
+	
+	private $fromEmailAddress;
+	
+	private $fromName;
+	
+	private $fileAttachment = null;
+
+	private $modeSmtp;
+	
+	private $templateFolderPath;
+	
+	private $shopId;
+	
+	private $bcc;
+	
+	private $replyTo;
+	
+	private $replyToName;
+	
+	/**
+	 * Constructor. Allows to copy the input (copy contructor).
+	 * 
+	 * @param MailMessage $input (Optional)Message to copy
+	 */
+	public function __construct($input = null) {
+		if ($input instanceof MailMessage) {
+			if ($input->fileAttachment !== null) {
+				$this->fileAttachment = new MailMessageAttachment($input->fileAttachment);
+			}
+			$this->fromEmailAddress = $input->fromEmailAddress;
+			$this->fromName = $input->fromName;
+			$this->langId = $input->langId;
+			$this->shopId = $input->shopId;
+			$this->subject = $input->subject;
+			$this->templateFolderPath = $input->templateFolderPath;
+			$this->modeSmtp = $input->modeSmtp;
+			$this->templateName = $input->templateName;
+			$this->templateVariables = $input->templateVariables;
+			$this->toEmailAddress = $input->toEmailAddress;
+			$this->toName = $input->toName;
+			$this->bcc = $input->bcc;
+			$this->replyTo = $input->replyTo;
+			$this->replyToName = $input->replyToName;
+		}
+	}
+
+	/**
+	 * Returns the id of the language of the mail message.
+	 * 
+	 * @return string
+	 */
+	public function getLangId(){
+		return $this->langId;
+	}
+
+	/**
+	 * Sets the language id for the message.
+	 * 
+	 * @param int $langId
+	 * @return MailMessage
+	 */
+	public function setLangId($langId){
+		$this->langId = $langId;
+		return $this;
+	}
+
+	/**
+	 * Returns the name of the template to use for this message.
+	 * 
+	 * @return string
+	 */
+	public function getTemplateName(){
+		return $this->templateName;
+	}
+
+	/**
+	 * Sets the template to be used for this message.
+	 * 
+	 * @param string $templateName
+	 * @return MailMessage
+	 */
+	public function setTemplateName($templateName){
+		$this->templateName = $templateName;
+		return $this;
+	}
+
+	/**
+	 * Returns the message subject.
+	 * 
+	 * @return string
+	 */
+	public function getSubject(){
+		return $this->subject;
+	}
+
+	/**
+	 * Sets the subject of the message. The subject will be modified
+	 * by the sending method by prepending the following string:
+	 * [Shop Name]
+	 * 
+	 * The prefix can not be removed.
+	 * 
+	 * @param string $subject
+	 * @return MailMessage
+	 */
+	public function setSubject($subject){
+		$this->subject = $subject;
+		return $this;
+	}
+
+	/**
+	 * Returns the variables for the template. The variables
+	 * will be replaced in the template. The result is the 
+	 * body of the message.
+	 * 
+	 * e.g. array (
+	 *   '{delivery_company}',
+	 *   '{carrier}',
+	 * )
+	 * 
+	 * @return array
+	 */
+	public function getTemplateVariables(){
+		return $this->templateVariables;
+	}
+
+	/**
+	 * Sets the variables for the template. The variables are replaced
+	 * in the body of the message.
+	 * 
+	 * e.g. array (
+	 *   '{delivery_company}',
+	 *   '{carrier}',
+	 * )
+	 * 
+	 * @param array $templateVariables
+	 * @return MailMessage
+	 */
+	public function setTemplateVariables(array $templateVariables){
+		$this->templateVariables = $templateVariables;
+		return $this;
+	}
+	
+	/**
+	 * Adds the given template variable. 
+	 * 
+	 * Sample Name: {delivery_company}
+	 * Sample Value: Some Name of a Company
+	 * 
+	 * The value should be also a string.
+	 * 
+	 * @param string $name
+	 * @param string $value
+	 * @return MailMessage
+	 */
+	public function addTemplateVariable($name, $value) {
+		$this->templateVariables[$name] = $value;
+		return $this;
+	}
+
+	/**
+	 * Returns the mail address to which the mail is 
+	 * sent to.
+	 * 
+	 * @return string
+	 */
+	public function getToEmailAddress(){
+		return $this->toEmailAddress;
+	}
+
+	/**
+	 * Sets the mail address to which the mail is sent to.
+	 * 
+	 * @param string $toEmailAddress
+	 * @return MailMessage
+	 */
+	public function setToEmailAddress($toEmailAddress){
+		$this->toEmailAddress = $toEmailAddress;
+		return $this;
+	}
+
+	/**
+	 * Returns the name to which the mail is sent to. E.g. the 
+	 * customer name in case of the order confirmation.
+	 * 
+	 * @return string
+	 */
+	public function getToName(){
+		return $this->toName;
+	}
+
+	/**
+	 * Sets the name to which the mail is sent to. E.g. the customer
+	 * name in case of the order confirmation.
+	 * 
+	 * @param string $toName
+	 * @return MailMessage
+	 */
+	public function setToName($toName){
+		$this->toName = $toName;
+		return $this;
+	}
+
+	/**
+	 * Returns the e-mail address of the sender. In most cases
+	 * this is the store e-mail address.
+	 * 
+	 * @return string
+	 */
+	public function getFromEmailAddress(){
+		return $this->fromEmailAddress;
+	}
+
+	/**
+	 * Sets the e-mail address of the sender. In most cases
+	 * this is the store e-mail address.
+	 * 
+	 * @param string $fromEmailAddress
+	 * @return MailMessage
+	 */
+	public function setFromEmailAddress($fromEmailAddress){
+		$this->fromEmailAddress = $fromEmailAddress;
+		return $this;
+	}
+
+	/**
+	 * Returns the name of the sender. 
+	 * 
+	 * @return string
+	 */
+	public function getFromName(){
+		return $this->fromName;
+	}
+
+	/**
+	 * Sets the name of the sender.
+	 * 
+	 * @param string $fromName
+	 * @return MailMessage
+	 */
+	public function setFromName($fromName){
+		$this->fromName = $fromName;
+		return $this;
+	}
+
+	/**
+	 * Returns the file attachment of the mail. See MailMessageAttachment for more
+	 * information about the format etc.
+	 * 
+	 * @return MailMessageAttachment
+	 */
+	public function getFileAttachment(){
+		return $this->fileAttachment;
+	}
+
+	/**
+	 * Sets the mail attachment.
+	 * 
+	 * @param MailMessageAttachment $fileAttachment
+	 * @return MailMessage
+	 */
+	public function setFileAttachment(MailMessageAttachment $fileAttachment){
+		$this->fileAttachment = $fileAttachment;
+		return $this;
+	}
+
+	/**
+	 * Sets the path in which the mail template is searched. By default it points 
+	 * to _PS_MAIL_DIR_.
+	 * 
+	 * @return string
+	 */
+	public function getTemplateFolderPath(){
+		return $this->templateFolderPath;
+	}
+
+	/**
+	 * Sets the path in which the mail template is searched. By default it points
+	 * to _PS_MAIL_DIR_.
+	 * 
+	 * @param string $templateFolderPath
+	 * @return MailMessage
+	 */
+	public function setTemplateFolderPath($templateFolderPath){
+		$this->templateFolderPath = $templateFolderPath;
+		return $this;
+	}
+
+
+	/**
+	 * Gets the SMTP mode.
+	 * 
+	 * @return string
+	 */
+	public function getModeSMTP(){
+		return $this->modeSmtp;
+	}
+
+	/**
+	 * Sets the SMTP mode.
+	 * 
+	 * @param string $modeSmtp
+	 * @return MailMessage
+	 */
+	public function setModeSMTP($modeSmtp){
+		$this->modeSmtp = $modeSmtp;
+		return $this;
+	}
+
+
+	/**
+	 * Returns the shop id.
+	 * 
+	 * @return int
+	 */
+	public function getShopId(){
+		return $this->shopId;
+	}
+
+	/**
+	 * Sets the shop id.
+	 * 
+	 * @param int $shopId
+	 * @return MailMessage
+	 */
+	public function setShopId($shopId){
+		$this->shopId = $shopId;
+		return $this;
+	}
+	
+	/**
+	 * Returns the BCC of the message.
+	 * 
+	 * @return string
+	 */
+	public function getBcc() {
+		return $this->bcc;
+	}
+	
+	/**
+	 * Sets the BCC of the message.
+	 * 
+	 * @param string $bcc
+	 * @return MailMessage
+	 */
+	public function setBcc($bcc) {
+		$this->bcc = $bcc;
+		return $this;
+	}
+	
+	/**
+	 * Returns the reply to header of the e-mail message.
+	 * 
+	 * @return the reply to header of the e-mail message.
+	 */
+	public function getReplyTo() {
+		return $this->replyTo;
+	}
+	
+	/**
+	 * Sets the reply to header of the e-mail message.
+	 * 
+	 * @param string $replyTo the reply to header of the e-mail message.
+	 * @return MailMessage this message object.
+	 */
+	public function setReplyTo($replyTo) {
+		$this->replyTo = $replyTo;
+		return $this;
+	}
+	
+	/**
+	 * Returns the name of the reply to receipient.
+	 * 
+	 * @return string 
+	 */
+	public function getReplyToName() {
+		return $this->replyToName;
+	}
+	
+	/**
+	 * Sets the name of the reply to recipient.
+	 * 
+	 * @param string $replyToName the name of the reply to receipient.
+	 * @return MailMessage this message object.
+	 */
+	public function setReplyToName($replyToName) {
+		$this->replyToName = $replyToName;
+		return $this;
+	}
+	
+}
\ No newline at end of file
diff --git a/MailMessageAttachment.php b/MailMessageAttachment.php
new file mode 100644
index 0000000..7fdcee2
--- /dev/null
+++ b/MailMessageAttachment.php
@@ -0,0 +1,122 @@
+<?php 
+if (! defined('_PS_VERSION_')){
+	exit();
+}
+/**
+ * Represents a mail attachment.
+ * 
+ * @author Thomas Hunziker
+ *
+ */
+class MailMessageAttachment {
+	
+	private $content;
+	
+	private $name;
+	
+	private $mimeType;
+	
+	/**
+	 * Constructor.
+	 * 
+	 * Either the input as defined by Mail::send() for mail attachment
+	 * or a mail attachment. In later case the attachment is copied.
+	 * 
+	 * @param array|MailMessageAttachment $input
+	 */
+	public function __construct($input = null) {
+		if ($input instanceof MailMessageAttachment) {
+			$this->content = $input->content;
+			$this->name = $input->name;
+			$this->mimeType = $input->mimeType;
+		}
+		else if (is_array($input)) {
+			if (isset($input['content'])) {
+				$this->setContent($input['content']);
+			}
+			if (isset($input['name'])) {
+				$this->setName($input['name']);
+			}
+			if (isset($input['mime'])) {
+				$this->setMimeType($input['mime']);
+			}
+		}
+	}
+
+	/**
+	 * Returns the attachment content.
+	 * 
+	 * @return string
+	 */
+	public function getContent(){
+		return $this->content;
+	}
+
+	/**
+	 * Sets the attachment content. This may be binary data.
+	 * 
+	 * @param string $content
+	 * @return MailMessageAttachment
+	 */
+	public function setContent($content){
+		$this->content = $content;
+		return $this;
+	}
+
+	/**
+	 * Returns the name shown to the customer in the mail message.
+	 * 
+	 * @return string
+	 */
+	public function getName(){
+		return $this->name;
+	}
+
+	/**
+	 * Sets the name shown to the customer in the mail message.
+	 * 
+	 * @param string $name
+	 * @return MailMessageAttachment
+	 */
+	public function setName($name){
+		$this->name = $name;
+		return $this;
+	}
+
+	/**
+	 * Returns the mime type of the attachment. E.g. application/pdf, text/html.
+	 * 
+	 * @return string
+	 */
+	public function getMimeType(){
+		return $this->mimeType;
+	}
+
+	/**
+	 * Sets the mime type of the mail attachment. E.g. application/pdf, text/html.
+	 * 
+	 * @param string $mimeType
+	 * @return MailMessageAttachment
+	 */
+	public function setMimeType($mimeType){
+		$this->mimeType = $mimeType;
+		return $this;
+	}
+	
+	/**
+	 * Returns the attachment as an array. This method is 
+	 * need to provide the correct input for Mail::send().
+	 * 
+	 * @return array
+	 */
+	public function toArray() {
+		return array(
+			'content' => $this->getContent(),
+			'name' => $this->getName(),
+			'mime' => $this->getMimeType(),
+		);
+	}
+	
+	
+	
+}
\ No newline at end of file
diff --git a/MailMessageEvent.php b/MailMessageEvent.php
new file mode 100644
index 0000000..f0df7ef
--- /dev/null
+++ b/MailMessageEvent.php
@@ -0,0 +1,124 @@
+<?php
+if (! defined('_PS_VERSION_')){
+	exit();
+}
+/**
+ * This class represents a mail message sending event. An object
+ * of this class is propagated in case an e-mail is sent.
+ * 
+ * @author Thomas Hunziker
+ *
+ */
+class MailMessageEvent {
+
+	/**
+	 * @var string
+	 */
+	private $name;
+	
+	/**
+	 * @var boolean
+	 */
+	private $die = false;
+	
+	/**
+	 * @var MailMessage[]
+	 */
+	private $messages = array();
+	
+	/**
+	 * Constructor.
+	 * 
+	 * The name is used as identification of the event. It is normally 
+	 * the name of the template. 
+	 * 
+	 * @param string $name
+	 */
+	public function __construct($name) {
+		$this->name = (string)$name;
+	}
+	
+	/**
+	 * In case this method returns true, any error will stop the PHP 
+	 * process. Otherwise in case of an error the mail is not sent and 
+	 * the error is logged. But the process continues.
+	 * 
+	 * By default this method returns false.
+	 *
+	 * @return boolean
+	 */
+	public function isDie(){
+		return $this->die;
+	}
+	
+	/**
+	 * Sets the behaviour in case of an error. See MailMessageEvent::isDie() for
+	 * more information.
+	 * 
+	 * By default it is set to false. In most cases this should not be changed.
+	 * 
+	 * @param string $die
+	 * @return MailMessageEvent
+	 */
+	public function setDie($die = true){
+		$this->die = $die;
+		return $this;
+	}
+
+	/**
+	 * Returns the name of the e-mail event. This is the original template name of the
+	 * e-mail. E.g. order_conf in case of the order confirmation. The name 
+	 * should be used to identify the event. For example if something should be changed
+	 * in case of order confirmation the hook should filter with the expression:
+	 * 
+	 * <code>
+	 * if ($event->getName() == 'order_conf') {
+	 *    // Change messages
+	 * }
+	 * </code>
+	 * 
+	 * @return string
+	 */
+	public function getName(){
+		return $this->name;
+	}
+
+	/**
+	 * Returns a list of MailMessage send by this event. By default the list contains
+	 * exaclty one message. In case the hook whats to suppress the sending of the message,
+	 * the list should be set to an empty array. In case more than one message should be send
+	 * more messages can be added.
+	 * 
+	 * @return MailMessage[]
+	 */
+	public function getMessages(){
+		return $this->messages;
+	}
+
+	/**
+	 * Returns the list of messages sent by the event. By default the list contains
+	 * one message. Listeners of the event may add more messages or remove all message, which 
+	 * does prevent sending any mail message.
+	 * 
+	 * @param MailMessage[] $messages
+	 * @return MailMessageEvent
+	 */
+	public function setMessages(array $messages){
+		$this->messages = $messages;
+		return $this;
+	}
+	
+	/**
+	 * Adds the given message to the event. See MailMessageEvent::setMessages() for more information
+	 * about the behaviour of multiple messages.
+	 * 
+	 * @param MailMessage $message
+	 * @return MailMessageEvent
+	 */
+	public function addMessage(MailMessage $message) {
+		$this->messages[] = $message;
+		return $this;
+	}
+	
+	
+}
\ No newline at end of file
diff --git a/README.md b/README.md
index 2937a42..837a042 100644
--- a/README.md
+++ b/README.md
@@ -1,17 +1,18 @@
 # PrestaShop 8 wallee Integration
 This repository contains the PrestaShop wallee payment module that enables the shop to process payments with [wallee](https://www.wallee.com).
 
+## To install module manually by dragging up zip file, please download [.zip archive](https://plugin-documentation.wallee.com/wallee-payment/prestashop-8/1.0.1/wallee.zip) of module with correct structure required by Prestashop installation
+
 ##### To use this extension, a [wallee](https://app-wallee.com/user/signup) account is required.
 
 ## Requirements
 
 * [PrestaShop](https://www.prestashop.com/) 8
 * [PHP](http://php.net/) 8.1 or later
-* [Mailhook](https://github.com/wallee-payment/prestashop-mailhook/releases) to modify PrestaShop email behavior.
 
 ## Documentation
 
-* [English](https://plugin-documentation.wallee.com/wallee-payment/prestashop-8/1.0.0/docs/en/documentation.html)
+* [English](https://plugin-documentation.wallee.com/wallee-payment/prestashop-8/1.0.1/docs/en/documentation.html)
 
 ## Support
 
@@ -19,10 +20,8 @@ Support queries can be issued on the [wallee support site](https://app-wallee.co
 
 ## License
 
-Please see the [license file](https://github.com/wallee-payment/prestashop-8/blob/1.0.0/LICENSE) for more information.
+Please see the [license file](https://github.com/wallee-payment/prestashop-8/blob/1.0.1/LICENSE) for more information.
 
 ## Other PrestaShop Versions
 
 Find the module for different PrestaShop versions [here](../../../prestashop).
-
-## To install module manually by dragging up zip file, please download [.zip archive](https://plugin-documentation.wallee.com/wallee-payment/prestashop-8/1.0.0/wallee.zip) of module with correct structure required by Prestashop installation
diff --git a/docs/en/documentation.html b/docs/en/documentation.html
index ee6f1fc..97e00f0 100644
--- a/docs/en/documentation.html
+++ b/docs/en/documentation.html
@@ -22,7 +22,7 @@ <h2>Documentation</h2>				</div>
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/wallee-payment/prestashop-8/releases/tag/1.0.0/">
+		<a href="https://github.com/wallee-payment/prestashop-8/releases/tag/1.0.1/">
 			Source
 		</a>
 	</li>
@@ -51,7 +51,7 @@ <h1>
 					<div class="olist arabic">
 <ol class="arabic">
 <li>
-<p><a href="https://github.com/wallee-payment/prestashop-8/releases/tag/1.0.0/">Download</a> the module.</p>
+<p><a href="https://github.com/wallee-payment/prestashop-8/releases/tag/1.0.1/">Download</a> the module.</p>
 </li>
 <li>
 <p>Login to the backend of your PrestsShop store.</p>
diff --git a/inc/Basemodule.php b/inc/Basemodule.php
index 9a46a05..4b1d69f 100644
--- a/inc/Basemodule.php
+++ b/inc/Basemodule.php
@@ -133,14 +133,6 @@ private static function getOrder(array $params)
 
     public static function checkRequirements(Wallee $module)
     {
-        if (!Module::isInstalled('mailhook')) {
-            $module->addError(
-                Tools::displayError(
-                    'The module mailhook is required.'
-                )
-            );
-            return false;
-        }
         try {
             \Wallee\Sdk\Http\HttpClientFactory::getClient();
         } catch (Exception $e) {
@@ -255,27 +247,6 @@ public static function displayHelpButtons(Wallee $module)
         return $module->display(dirname(dirname(__FILE__)), 'views/templates/admin/admin_help_buttons.tpl');
     }
 
-    public static function getMailHookActiveWarning(Wallee $module)
-    {
-        $output = "";
-        if (! Module::isInstalled('mailhook') || ! Module::isEnabled('mailhook')) {
-            $error = "<b>" . $module->l('The module "Mail Hook" is not active.', 'basemodule') . "</b>";
-            $error .= "<br/>";
-            $error .= $module->l(
-                'This module is recommend for handling the shop emails. Otherwise the mail sending behavior may be inappropriate.',
-                'basemodule'
-            );
-            $error .= "<br/>";
-            $error .= sprintf(
-                $module->l('You can download the module %shere%s.', 'basemodule'),
-                '<a href="https://github.com/wallee-payment/prestashop-mailhook/releases" target="_blank">',
-                '</a>'
-            );
-            $output .= $module->displayError($error);
-        }
-        return $output;
-    }
-
     public static function handleSaveAll(Wallee $module)
     {
         $output = "";
diff --git a/override/classes/Mail.php b/override/classes/Mail.php
new file mode 100644
index 0000000..3b4d73b
--- /dev/null
+++ b/override/classes/Mail.php
@@ -0,0 +1,143 @@
+<?php
+if (! defined('_PS_VERSION_')){
+	exit();
+}
+
+$modulePath = rtrim(_PS_MODULE_DIR_, '/') . '/wallee/';
+
+require_once $modulePath . 'MailMessage.php';
+require_once $modulePath . 'MailMessageAttachment.php';
+require_once $modulePath . 'MailMessageEvent.php';
+
+/**
+ * We override the core Mail class to introduce a trigger an event in case
+ * an e-mail is sent.
+ * 
+ * We provide this hook to allow multiple modules to change the behaviour of 
+ * the system in case of an e-mail event.
+ * 
+ * @author Thomas Hunziker
+ *
+ */
+class Mail extends MailCore{
+	// These lines prevents an error when copied by the system.
+	// @see ModuleCore::addOverride()
+
+	/**
+	 * Overrides the default send method. The method returns the number of successful recipients of the
+	 * message or false, in case the message could not be sent.
+	 * 
+	 * @return int|boolean 
+	 */
+	public static function Send($id_lang, $template, $subject, $template_vars, $to, $to_name = null, $from = null, $from_name = null, 
+			$file_attachment = null, $mode_smtp = null, $template_path = _PS_MAIL_DIR_, $die = false, $id_shop = null, $bcc = null, $reply_to = null,
+		$replyToName = null) {
+		
+
+		$message = new MailMessage();
+		$message
+			->setLangId($id_lang)
+			->setTemplateName($template)
+			->setSubject($subject)
+			->setTemplateVariables($template_vars)
+			->setToEmailAddress($to)
+			->setToName($to_name)
+			->setFromEmailAddress($from)
+			->setFromName($from_name)
+			->setTemplateFolderPath($template_path)
+			->setModeSMTP($mode_smtp)
+			->setShopId($id_shop)
+			->setBcc($bcc)
+			->setReplyTo($reply_to)
+			->setReplyToName($replyToName)
+		;
+		if ($file_attachment !== null) {
+			$message->setFileAttachment(new MailMessageAttachment($file_attachment));
+		}
+		
+		$event = new MailMessageEvent($template);
+		$event->setDie($die);
+		$event->addMessage($message);
+		
+		self::executeMailSendingHook($event);
+		return self::processMailEvent($event);
+	}
+	
+	/**
+	 * Sends an e-mail without the invocation of the hook system. 
+	 * 
+	 * @return int|boolean
+	 */
+	public static function sendMailWithoutHook($id_lang, $template, $subject, $template_vars, $to, $to_name = null, $from = null, $from_name = null, 
+		$file_attachment = null, $mode_smtp = null, $template_path = _PS_MAIL_DIR_, $die = false, $id_shop = null, $bcc = null, $reply_to = null, $replyToName = null) {
+		return parent::Send($id_lang, $template, $subject, $template_vars, $to, $to_name, $from, $from_name, $file_attachment, $mode_smtp, $template_path, $die, $id_shop, $bcc, $reply_to, $replyToName);
+	}
+	
+	/**
+	 * Sends an e-mail message without the invocation of the hook system.
+	 * 
+	 * @param MailMessage $message
+	 */
+	public static function sendMailMessageWithoutHook(MailMessage $message, $isDie) {
+		$file_attachment = null;
+		if ($message->getFileAttachment() !== null) {
+			$file_attachment = $message->getFileAttachment()->toArray();
+		}
+		return self::sendMailWithoutHook(
+			$message->getLangId(),
+			$message->getTemplateName(),
+			$message->getSubject(),
+			$message->getTemplateVariables(),
+			$message->getToEmailAddress(),
+			$message->getToName(),
+			$message->getFromEmailAddress(),
+			$message->getFromName(),
+			$file_attachment,
+			$message->getModeSMTP(),
+			$message->getTemplateFolderPath(),
+			$isDie,
+			$message->getShopId(),
+			$message->getBcc(),
+			$message->getReplyTo(),
+			$message->getReplyToName()
+		);
+	}
+	
+	/**
+	 * Executes the given event by calling the hook system of PrestaShop.
+	 * 
+	 * @param MailMessageEvent $event
+	 */
+	protected static function executeMailSendingHook(MailMessageEvent $event) {
+		Hook::exec('actionMailSend', array(
+			'event' => $event
+		));
+	}
+
+	/**
+	 * This method processes the given event object and sending the e-mail messages
+	 * provided by event object. 
+	 * 
+	 * For the sending the parent::Send() method is used.
+	 * 
+	 * @param MailMessageEvent $event
+	 * @return number|boolean
+	 */
+	protected static function processMailEvent(MailMessageEvent $event) {
+		$numberOfSuccessfulRecipients = 0;
+		foreach ($event->getMessages() as $message) {
+			$rs = self::sendMailMessageWithoutHook($message, $event->isDie());
+			if ($rs !== false) {
+				$numberOfSuccessfulRecipients = $rs + $numberOfSuccessfulRecipients;
+			}
+		}
+		
+		if ($numberOfSuccessfulRecipients > 0) {
+			return $numberOfSuccessfulRecipients;
+		}
+		else {
+			return false;
+		}
+	}
+	
+}
diff --git a/override/classes/index.php b/override/classes/index.php
new file mode 100644
index 0000000..e062832
--- /dev/null
+++ b/override/classes/index.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ *  HeaderLicense
+ */
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../');
+exit();
diff --git a/override/index.php b/override/index.php
new file mode 100644
index 0000000..e062832
--- /dev/null
+++ b/override/index.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ *  HeaderLicense
+ */
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../');
+exit();
diff --git a/views/templates/admin/admin_help_buttons.tpl b/views/templates/admin/admin_help_buttons.tpl
index da77cf2..7f2199e 100644
--- a/views/templates/admin/admin_help_buttons.tpl
+++ b/views/templates/admin/admin_help_buttons.tpl
@@ -10,5 +10,5 @@
 <div class="alert alert-info">
 <img src="../modules/wallee/logo.png" style="float:left; margin-right:15px;" height="50">
 <p><strong>{l s='This module requires an %s account.' sprintf='wallee' mod='wallee'}</strong></p>
-<p><a class="btn btn-default" href="https://app-wallee.com/user/signup" target="_blank">{l s='Sign Up' mod='wallee'}</a> <a class="btn btn-default" href="https://plugin-documentation.wallee.com/wallee-payment/prestashop-8/1.0.0/docs/en/documentation.html" target="_blank">{l s='Documentation' mod='wallee'}</a></p>
+<p><a class="btn btn-default" href="https://app-wallee.com/user/signup" target="_blank">{l s='Sign Up' mod='wallee'}</a> <a class="btn btn-default" href="https://plugin-documentation.wallee.com/wallee-payment/prestashop-8/1.0.1/docs/en/documentation.html" target="_blank">{l s='Documentation' mod='wallee'}</a></p>
 </div>
\ No newline at end of file
diff --git a/wallee.php b/wallee.php
index 3069da4..dee1b66 100644
--- a/wallee.php
+++ b/wallee.php
@@ -32,7 +32,7 @@ public function __construct()
         $this->author = 'wallee AG';
         $this->bootstrap = true;
         $this->need_instance = 0;
-        $this->version = '1.0.0';
+        $this->version = '1.0.1';
         $this->displayName = 'wallee';
         $this->description = $this->l('This PrestaShop module enables to process payments with %s.');
         $this->description = sprintf($this->description, 'wallee');
@@ -141,8 +141,7 @@ public function uninstallConfigurationValues()
 
     public function getContent()
     {
-        $output = WalleeBasemodule::getMailHookActiveWarning($this);
-        $output .= WalleeBasemodule::handleSaveAll($this);
+        $output = WalleeBasemodule::handleSaveAll($this);
         $output .= WalleeBasemodule::handleSaveApplication($this);
         $output .= WalleeBasemodule::handleSaveEmail($this);
         $output .= WalleeBasemodule::handleSaveCartRecreation($this);
diff --git a/wallee.zip b/wallee.zip
index cf3510c..7921725 100644
Binary files a/wallee.zip and b/wallee.zip differ