diff --git a/app/src/main/java/com/herbron/moodl/Activities/RecordTransactionActivity.java b/app/src/main/java/com/herbron/moodl/Activities/RecordTransactionActivity.java
index 5234e0f..5c72977 100644
--- a/app/src/main/java/com/herbron/moodl/Activities/RecordTransactionActivity.java
+++ b/app/src/main/java/com/herbron/moodl/Activities/RecordTransactionActivity.java
@@ -87,6 +87,8 @@ public class RecordTransactionActivity extends AppCompatActivity implements Curr
 
     private boolean isGlobalLayoutVisible;
 
+    private Intent callingIntent;
+
     private TextWatcher coinTextWatcher = new TextWatcher() {
         @Override
         public void beforeTextChanged(CharSequence s, int start, int count, int after) {
@@ -145,10 +147,20 @@ public class RecordTransactionActivity extends AppCompatActivity implements Curr
         setupBackButton();
     }
 
+    @Override
+    protected void onStop() {
+        super.onStop();
+
+        if(callingIntent != null)
+        {
+            callingIntent.removeExtra("transactionId");
+        }
+    }
+
     private void checkCallingIntent()
     {
-        Intent intent = getIntent();
-        int transactionId = intent.getIntExtra("transactionId", -1);
+        callingIntent = getIntent();
+        int transactionId = callingIntent.getIntExtra("transactionId", -1);
 
         if(transactionId != -1)
         {
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 35046e9..af42838 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -134,6 +134,11 @@
         <item>Autre / Inconnu</item>
     </string-array>
 
+    <string-array name="fees_options">
+        <item>Pourcentage</item>
+        <item>Fixe</item>
+    </string-array>
+
     <string name="emitedPlaceholder">Pourcentage de coin émis : %1$s%%</string>
     <string name="edit_transaction">Edition d\'une transaction de %1$s</string>
     <string name="new_transaction">Nouvelle transaction</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f9ca46b..5c9c16d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -174,6 +174,11 @@
         <item>Other / Unknown</item>
     </string-array>
 
+    <string-array name="fees_options">
+        <item>Percentage</item>
+        <item>Fixed</item>
+    </string-array>
+
     <!--Cardview placeholders-->
     <string name="currencySymbolPlaceholder" translatable="false">(%1$s)</string>
     <string name="currencyBalancePlaceholder" translatable="false">%1$s%2$s</string>
@@ -291,5 +296,6 @@
     <string name="activity_sell_price">Sell price</string>
     <string name="activity_sell_date">Sell date</string>
     <string name="activity_transfert_date">Date of transfert</string>
+    <string name="error_no_valid_from_to">This transaction is not valid</string>
 
 </resources>