diff --git a/RFXtoRP_HsaDispute.ftl b/RFXtoRP_HsaDispute.ftl
index e2c6966..18ea1ec 100644
--- a/RFXtoRP_HsaDispute.ftl
+++ b/RFXtoRP_HsaDispute.ftl
@@ -29,21 +29,6 @@
               "datas" :
               <#include "RFXtoRP_HsaDispute_MessageSent.ftl">
             }
-            <#if dispute.dispute_item??>
-            ,
-            {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimMessageSent>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsaDispute_MessageSent2.ftl">
-            }
-            </#if>,
-            {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimMessageSent>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsaDispute_MessageSent3.ftl">
-            }
             <#else>
               <#stop>
           </#if>
diff --git a/RFXtoRP_HsaDispute_MessageSent.ftl b/RFXtoRP_HsaDispute_MessageSent.ftl
index 32f8edd..dd73318 100644
--- a/RFXtoRP_HsaDispute_MessageSent.ftl
+++ b/RFXtoRP_HsaDispute_MessageSent.ftl
@@ -24,6 +24,50 @@
                 </#if>
             </#if>
 
+        }
+    },
+    {
+        "Header": {
+            "ProjectID": "${projectRP}"
+        },
+        "ID": {
+               <#if dispute.dispute_preparation??>
+                "RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?json_string}${dispute.dispute_preparation.preparation_activity_code?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?json_string}${dispute.dispute_year_number?json_string}${dispute.dispute_number?json_string}"
+            <#else>
+                <#if dispute.dispute_reception??>
+                "RefID": "${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_year_number?json_string}${dispute.dispute_number?json_string}"
+                </#if>
+            </#if>
+        },
+        "Payload": {
+
+            <#if dispute.dispute_quantity!=0 && dispute.dispute_item??>
+                "Message": "${dispute.dispute_item.item_code?trim?json_string} - ${dispute.dispute_quantity}${dispute.dispute_quantity_unit}"
+                <#elseif dispute.dispute_item??>
+                    "Message": "${dispute.dispute_item.item_code?trim?json_string}"
+                <#elseif dispute.dispute_quantity!=0>
+                    "Message": "${dispute.dispute_quantity}${dispute.dispute_quantity_unit}"
+            </#if>
+        }
+    },
+    {
+        "Header": {
+            "ProjectID": "${projectRP}"
+        },
+        "ID": {
+               <#if dispute.dispute_preparation??>
+                "RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?json_string}${dispute.dispute_preparation.preparation_activity_code?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?json_string}${dispute.dispute_year_number?json_string}${dispute.dispute_number?json_string}"
+            <#else>
+                <#if dispute.dispute_reception??>
+                "RefID": "${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_year_number?json_string}${dispute.dispute_number?json_string}"
+                </#if>
+            </#if>
+        },
+        "Payload": {
+
+            "Message": " ${dispute.dispute_description?trim?json_string}"
+
         }
     }
+
 ]
\ No newline at end of file
diff --git a/RFXtoRP_HsaDispute_MessageSent2.ftl b/RFXtoRP_HsaDispute_MessageSent2.ftl
deleted file mode 100644
index bb68b17..0000000
--- a/RFXtoRP_HsaDispute_MessageSent2.ftl
+++ /dev/null
@@ -1,26 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-[
-    {
-        "Header": {
-            "ProjectID": "${projectRP}"
-        },
-        "ID": {
-               <#if dispute.dispute_preparation??>
-                "RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?json_string}${dispute.dispute_preparation.preparation_activity_code?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?json_string}${dispute.dispute_year_number?json_string}${dispute.dispute_number?json_string}"
-            <#else>
-                <#if dispute.dispute_reception??>
-                "RefID": "${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_year_number?json_string}${dispute.dispute_number?json_string}"
-                </#if>
-            </#if>
-        },
-        "Payload": {
-
-            <#if dispute.dispute_quantity!=0>
-                "Message": "${dispute.dispute_item.item_code?trim?json_string} - ${dispute.dispute_quantity}${dispute.dispute_quantity_unit}"
-            <#else>
-                "Message": "${dispute.dispute_item.item_code?trim?json_string}"
-            </#if>
-        }
-    }
-]
\ No newline at end of file
diff --git a/RFXtoRP_HsaDispute_MessageSent3.ftl b/RFXtoRP_HsaDispute_MessageSent3.ftl
deleted file mode 100644
index 438613c..0000000
--- a/RFXtoRP_HsaDispute_MessageSent3.ftl
+++ /dev/null
@@ -1,23 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-[
-    {
-        "Header": {
-            "ProjectID": "${projectRP}"
-        },
-        "ID": {
-               <#if dispute.dispute_preparation??>
-                "RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?json_string}${dispute.dispute_preparation.preparation_activity_code?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?json_string}${dispute.dispute_year_number?json_string}${dispute.dispute_number?json_string}"
-            <#else>
-                <#if dispute.dispute_reception??>
-                "RefID": "${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_year_number?json_string}${dispute.dispute_number?json_string}"
-                </#if>
-            </#if>
-        },
-        "Payload": {
-
-            "Message": " ${dispute.dispute_description?trim?json_string}"
-
-        }
-    }
-]
\ No newline at end of file