diff --git a/claimManagement/build.gradle b/claimManagement/build.gradle
index 5bc67aa0..48e8a574 100644
--- a/claimManagement/build.gradle
+++ b/claimManagement/build.gradle
@@ -188,6 +188,7 @@ android {
             returnDefaultValues = true
         }
     }
+    namespace 'org.openimis.imisclaims'
 }
 
 apollo {
diff --git a/claimManagement/src/main/AndroidManifest.xml b/claimManagement/src/main/AndroidManifest.xml
index 62201dbb..0c20604e 100644
--- a/claimManagement/src/main/AndroidManifest.xml
+++ b/claimManagement/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="org.openimis.imisclaims">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/SynchronizeService.java b/claimManagement/src/main/java/org/openimis/imisclaims/SynchronizeService.java
index 10430787..0b25448a 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/SynchronizeService.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/SynchronizeService.java
@@ -119,7 +119,7 @@ protected void handleUploadClaims() {
             if (postNewClaims == null) {
                 postNewClaims = new PostNewClaims();
             }
-            List<PostNewClaims.Result> results = postNewClaims.execute(PendingClaim.fromJson(claims));
+            List<PostNewClaims.Result> results = postNewClaims.execute(this,PendingClaim.fromJson(claims));
             JSONArray claimStatus = processClaimResponse(results);
             broadcastSyncSuccess(claimStatus);
         } catch (Exception e) {
@@ -142,10 +142,11 @@ protected JSONArray processClaimResponse(List<PostNewClaims.Result> results) {
             } else {
                 if (claimResponseCode == PostNewClaims.Result.Status.REJECTED) {
                     sqlHandler.insertClaimUploadStatus(claimUUID, date, SQLHandler.CLAIM_UPLOAD_STATUS_REJECTED, null);
+                    jsonResults.put(String.format(claimResponseLine, claimCode, getResources().getString(R.string.ClaimRejected)));
                 } else {
                     sqlHandler.insertClaimUploadStatus(claimUUID, date, SQLHandler.CLAIM_UPLOAD_STATUS_ERROR, result.getMessage());
+                    jsonResults.put(String.format(claimResponseLine, claimCode, result.getMessage()));
                 }
-                jsonResults.put(String.format(claimResponseLine, claimCode, result.getMessage()));
             }
         }
         return jsonResults;
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/usecase/PostNewClaims.java b/claimManagement/src/main/java/org/openimis/imisclaims/usecase/PostNewClaims.java
index c89bf9b5..26259597 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/usecase/PostNewClaims.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/usecase/PostNewClaims.java
@@ -1,11 +1,14 @@
 package org.openimis.imisclaims.usecase;
 
+import android.content.Context;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.openimis.imisclaims.R;
 import org.openimis.imisclaims.domain.entity.PendingClaim;
 import org.openimis.imisclaims.network.exception.HttpException;
 import org.openimis.imisclaims.network.request.PostNewClaimRequest;
@@ -29,7 +32,7 @@ public PostNewClaims(
     }
 
     @WorkerThread
-    public List<Result> execute(@NonNull List<PendingClaim> pendingClaims) throws Exception {
+    public List<Result> execute(@NonNull Context context, @NonNull List<PendingClaim> pendingClaims) throws Exception {
         List<Result> results = new ArrayList<>();
         for (PendingClaim pendingClaim : pendingClaims) {
             try {
@@ -38,7 +41,7 @@ public List<Result> execute(@NonNull List<PendingClaim> pendingClaims) throws Ex
                         new Result(
                                 /* claimCode = */ pendingClaim.getClaimCode(),
                                 /* status = */ isAccepted ? Result.Status.SUCCESS : Result.Status.REJECTED,
-                                /* message = */ null
+                                /* message = */ isAccepted ? context.getResources().getString(R.string.ClaimAccepted) : context.getResources().getString(R.string.ClaimRejected)
                         )
                 );
             } catch (HttpException e) {
diff --git a/claimManagement/src/main/res/layout/activity_claim.xml b/claimManagement/src/main/res/layout/activity_claim.xml
index 09c4edb3..7e9579bd 100644
--- a/claimManagement/src/main/res/layout/activity_claim.xml
+++ b/claimManagement/src/main/res/layout/activity_claim.xml
@@ -35,7 +35,7 @@
                     android:layout_height="50dp"
                     android:ems="10"
                     android:fontFamily="sans-serif-light"
-                    android:maxLength="8"></EditText>
+                    android:maxLength="8"/>
             </com.google.android.material.textfield.TextInputLayout>
 
 
@@ -52,7 +52,7 @@
                     android:layout_height="50dp"
                     android:ems="10"
                     android:fontFamily="sans-serif-light"
-                    android:maxLength="8"></EditText>
+                    android:maxLength="8"/>
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textfield.TextInputLayout
@@ -84,7 +84,7 @@
                     android:layout_height="50dp"
                     android:ems="10"
                     android:fontFamily="sans-serif-light"
-                    android:maxLength="8"></EditText>
+                    android:maxLength="8"/>
             </com.google.android.material.textfield.TextInputLayout>
 
             <LinearLayout
@@ -105,8 +105,8 @@
                         android:layout_weight="1"
                         android:ems="10"
                         android:fontFamily="sans-serif-light"
-                        android:inputType="number"
-                        android:maxLength="12"></EditText>
+                        android:inputType="text"
+                        android:maxLength="12"/>
 
                 </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/claimManagement/src/main/res/values-fr/strings.xml b/claimManagement/src/main/res/values-fr/strings.xml
index b1300bb1..7bc93497 100644
--- a/claimManagement/src/main/res/values-fr/strings.xml
+++ b/claimManagement/src/main/res/values-fr/strings.xml
@@ -221,4 +221,6 @@
   <string name="NoItemsPricelist">La formation sanitaire n\'a pas de liste de prix pour les produits </string>
   <string name="entered">Entrée</string>
   <string name="News">Nouveautés:</string>
+  <string name="ClaimAccepted">Prestation acceptée</string>
+  <string name="ClaimRejected">Prestation rejetée</string>
 </resources>
diff --git a/claimManagement/src/main/res/values/strings.xml b/claimManagement/src/main/res/values/strings.xml
index 9e4c04d2..f0856052 100644
--- a/claimManagement/src/main/res/values/strings.xml
+++ b/claimManagement/src/main/res/values/strings.xml
@@ -256,4 +256,6 @@
     <string name="NoServicesPricelist">This healthfacility don\'t have services pricelist</string>
     <string name="NoItemsPricelist">This healthfacility don\'t have items pricelist</string>
     <string name="News">New changes:</string>
+    <string name="ClaimAccepted">Claim accepted</string>
+    <string name="ClaimRejected">Claim rejected</string>
 </resources>
diff --git a/gradle.properties b/gradle.properties
index dbb7bf70..98241225 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,5 @@
+android.defaults.buildfeatures.buildconfig=true
 android.enableJetifier=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
 android.useAndroidX=true