diff --git a/debian/changelog b/debian/changelog
index f0fdcc5f..96ea1c39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-hedera-web (1.408.1) stable; urgency=low
+hedera-web (1.408.2) stable; urgency=low
 
   * Initial Release.
 
diff --git a/package.json b/package.json
index e7f1945e..193dc72c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hedera-web",
-  "version": "1.408.1",
+  "version": "1.408.2",
   "description": "Verdnatura web page",
   "license": "GPL-3.0",
   "repository": {
diff --git a/rest/edi/load.php b/rest/edi/load.php
index 31e6e8e6..9a290895 100644
--- a/rest/edi/load.php
+++ b/rest/edi/load.php
@@ -54,15 +54,6 @@ class Load extends Edi\Method {
 			else
 				$sender = NULL;
 
-			$db->query('CALL mail_new(#messageId, #sender, @mailFk)', [
-				'messageId' => $messageId,
-				'sender' => $sender
-			]);
-			$mailId = $db->getValue("SELECT @mailFk");
-
-			echo "Message from: $sender\n";
-			echo " -> Message id: $messageId\n";
-
 			if ($this->restrictToSenders) {
 				$isAllowed = $db->getValue(
 					"SELECT COUNT(*) > 0 FROM mailSender WHERE mail = #",
@@ -72,7 +63,16 @@ class Load extends Edi\Method {
 				if (!$isAllowed)
 					throw new Exception('Mail processing from unknown senders is disabled');
 			}
-			
+
+			$db->query('CALL mail_new(#messageId, #sender, @mailFk)', [
+				'messageId' => $messageId,
+				'sender' => $sender
+			]);
+			$mailId = $db->getValue("SELECT @mailFk");
+
+			echo "Message from: $sender\n";
+			echo " -> Message id: $messageId\n";
+
 			// Searches the EDI message on mail parts
 
 			$matchTypes = [TYPEAPPLICATION, TYPETEXT];
@@ -97,6 +97,14 @@ class Load extends Edi\Method {
 
 				if (!Edi\Message::isEdiString($ediString))
 					continue;
+
+				$db->query(
+					'UPDATE ekt
+						SET source = #source
+						WHERE id = #mailId', [
+					'source' => $ediString,
+					'mailId' => $mailId
+				]);
 		
 				// Creates the EDI object and loads its exchanges
 
diff --git a/rest/edi/sql/exchange-new.sql b/rest/edi/sql/exchange-new.sql
index 4e69f281..245cdc01 100644
--- a/rest/edi/sql/exchange-new.sql
+++ b/rest/edi/sql/exchange-new.sql
@@ -3,6 +3,7 @@ CALL exchange_new (
 	#art,
 	#bgm,
 	#batchNumber,
+	#vendorOrderNumber,
 	#aaj,
 	#fec,
 	#hor,