diff --git a/g1sms/functions.sh b/g1sms/functions.sh
index 815fe01..f1a537d 100755
--- a/g1sms/functions.sh
+++ b/g1sms/functions.sh
@@ -50,16 +50,6 @@ $2"
 }
 
 
-#################################################################################################################################
-function log_history () { # TODO REMOVE
-    log "__SUB:log_history: history ($1, $2)"
-	PHONE="$1"
-	HISTFILE="./history.$IPFSNODEID.log.csv"
-
-	echo "$(date +%Y%m%d), $(date +%H:%M:%S), $1, $2" >> "$HISTFILE"
-}
-
-
 #################################################################################################################################
 function security () {
 
@@ -201,7 +191,6 @@ function sms_uid2key (){
 		INIT=$(silkaj -p "$duniter_server" -af --file /home/$YOU/.zen/g1sms_wallets/$PHONE/secret.dunikey tx --output $DESTRIB --amount 1 --comment "[G1sms+] Porte Monnaie $(cat $UIDNAFILE) ->  $(cat $NAMEFILE)" -y)
 
 		log "__SUB:sms_uid2key: INIT = $INIT | Create Connection with related Wallet."
-		log_history "$PHONE" "MEMBER, $ASKWALLET"
 		sms_SEND "$ADMINPHONE" "ADMIN! LOG: $PHONE Nouveau compte lié $UIDNA -- $ASKWALLET ($INIT)"
     else
     	sms_SEND "$ADMINPHONE" "ADMIN! LOG: $PHONE / $ASKWALLET ABSENT"
@@ -322,7 +311,6 @@ log "__SUB:sms_INIT_ACCOUNT: ($1=phone, $2=NOSMS)"
 		echo "$PUBKEY" > "$PUBKEYFILE"
 		echo "$COIN" > "$UNITFILE"
         echo "$MASTERPHONE" > "$SMSNODE"
-		log_history "$PHONE" "NEW, $PUBKEY"
 
         # ADD WALLET TO IPFS
         I=$(ipfs_node_wallets_add)
diff --git a/g1sms/sms_BILLET.sh b/g1sms/sms_BILLET.sh
index 2e6a9c9..4be14ce 100755
--- a/g1sms/sms_BILLET.sh
+++ b/g1sms/sms_BILLET.sh
@@ -28,7 +28,7 @@ Envoyez N suivi de votre pseudo membre (en respectant Majuscule et minuscule)."
 	exit
 fi
 
-if [[ $MAIL == "" ]]; then
+if [[ $SMSEMAIL == "" ]]; then
 	sms_ERROR "$phone" "Impossible de réaliser votre commande.
 Envoyez \"EMAIL votre_email\" pour pouvoir recevoir vos billets..."
 	exit
@@ -97,7 +97,6 @@ then
         /home/$YOU/.zen/astroport/zen/tools/natools.py encrypt -p $NODE_G1PUBKEY -i "/tmp/secret.dunikey" -o "/home/$YOU/.zen/g1billets/$bpath/note.dunikey.$NODE_UIDNA.crypt"
         rm -f /tmp/secret.dunikey
 
-		log_history $PHONE "G1BILLET, $TRANSAC, $BILLETPUBKEY"
 		sleep 3
 		# Fill BILLET with TRANSAC amount
         duniter_server=$(./tools/duniter_getnode.sh)
@@ -126,7 +125,7 @@ then
 			sms_ERROR "$PHONE" "Un problème est survenu. Contactez $ADMINPSEUDO au $ADMINPHONE"
             # Copy & Send produced files
             zip /tmp/$PHONE_Bills_$bpath.zip /home/$YOU/.zen/g1billets/MEMBERS/$MEMBER/*.*
-            mpack -s "[G1sms+]_G1Billets ($bpath) Erreur... création G1Billets..." -d /tmp/message_body.txt /tmp/$PHONE_Bills_$bpath.zip $MAIL && mv /tmp/$PHONE_Bills_$bpath.zip /home/$YOU/.zen/g1billets/MEMBERS/$MEMBER/ && log "__SUB:sms_BILLET.sh: ALERT sent....."
+            mpack -s "[G1sms+]_G1Billets ($bpath) Erreur... création G1Billets..." -d /tmp/message_body.txt /tmp/$PHONE_Bills_$bpath.zip $SMSEMAIL && mv /tmp/$PHONE_Bills_$bpath.zip /home/$YOU/.zen/g1billets/MEMBERS/$MEMBER/ && log "__SUB:sms_BILLET.sh: ALERT sent....."
 
             log "__SUB:sms_BILLET.sh: ERROR SILKAJ $(cat ./silkaj/src/constants.py)"
             exit
@@ -151,19 +150,19 @@ Envoyez-nous vos remarques...
 
 https://g1sms.fr" > /tmp/message_body.txt
 
-    mpack -s "[G1sms+]_G1Billets ($bpath) A IMPRIMER et détruire cet email..." -d /tmp/message_body.txt /tmp/$PHONE_Bills_$bpath.zip $MAIL && log "__SUB:sms_BILLET.sh: EMAIL sent....."
+    mpack -s "[G1sms+]_G1Billets ($bpath) A IMPRIMER et détruire cet email..." -d /tmp/message_body.txt /tmp/$PHONE_Bills_$bpath.zip $SMSEMAIL && log "__SUB:sms_BILLET.sh: EMAIL sent....."
 
-    log "__SUB:sms_BILLET.sh: G1Billets $PHONE_Bills_$bpath.pdf envoyé par email à $MEMBER : $MAIL "
+    log "__SUB:sms_BILLET.sh: G1Billets $PHONE_Bills_$bpath.pdf envoyé par email à $MEMBER : $SMSEMAIL "
 	mess="[G1SMS]
 $NBbillets G1Billets de $VALbillet $UNIT ($TRANSAC G1) créé(s).
-Envoyés vers $MAIL, vérifiez vos SPAM...
+Envoyés vers $SMSEMAIL, vérifiez vos SPAM...
 Support: $ADMINPSEUDO ($ADMINPHONE)
 "
 	
 	sms_SEND "$phone" "$mess"
     # ADMIN ALERT SMS + TODO Add ADMINEMAIL parameter in "install.sh"
-    sms_SEND "$ADMINPHONE" "$MEMBER vient de créer $NBbillets G1Billets de $VALbillet $UNIT ($TRANSAC G1): $MAIL"
-    cat ./email.txt | sed s/EMAIL/support@qo-op.com/g | sed s/SUBJECT/Creation_G1Billets/g | sed s/MESSAGE/"$MEMBER ($PHONE) vient de creer $NBbillets G1Billets de $VALbillet $UNIT ($TRANSAC G1) vers $MAIL"/g | ssmtp "frenault@linkeo.com"
+    sms_SEND "$ADMINPHONE" "$MEMBER vient de créer $NBbillets G1Billets de $VALbillet $UNIT ($TRANSAC G1): $SMSEMAIL"
+    cat ./email.txt | sed s/EMAIL/support@qo-op.com/g | sed s/SUBJECT/Creation_G1Billets/g | sed s/MESSAGE/"$MEMBER ($PHONE) vient de creer $NBbillets G1Billets de $VALbillet $UNIT ($TRANSAC G1) vers $SMSEMAIL"/g | ssmtp "frenault@linkeo.com"
 
 #####################################
 # Amount too High, solde insuffisant
diff --git a/g1sms/sms_BILLETCHK.sh b/g1sms/sms_BILLETCHK.sh
index a33af07..eb72e8d 100755
--- a/g1sms/sms_BILLETCHK.sh
+++ b/g1sms/sms_BILLETCHK.sh
@@ -43,8 +43,7 @@ Billet de $VALbillet $UNIT Valide!
 Valeur: $AMOUNTG1 G1
 https://www.g1sms.fr/contact"
 		sms_SEND "$PHONE" "$mess"
-		log "BILLETCHK: $VALbillet $UNIT ($AMOUNTG1 G1)"
-		log_history $PHONE "BILLET_CHK, $AMOUNTG1, $bpath"
+		log "BILLETCHK: $VALbillet $UNIT ($AMOUNTG1 G1) $bpath"
 	else
 		# TRANSFER & DESTROY
 		sms_INIT_ACCOUNT "$PHONE" "NOSMS"
@@ -75,14 +74,12 @@ Solde: $SOLDE G1"
 			sms_SEND "$PHONE" "$mess"
 			log "BILLETCHK DESTROY: $VALbillet $UNIT ($AMOUNTG1 G1)"
 			log "=> $PUBKEY"
-			log_history $PHONE "BILLET_CHK, $AMOUNTG1, $bpath, $PUBKEY"
 		else
 			sms_ERROR "$PHONE" "Erreur! Transaction Impossible! Valeur du G1Billet $AMOUNTG1 G1. Contactez $ADMINPSEUDO : $ADMINPHONE"
 		fi
 	fi
 else
 	sms_SEND "$PHONE" "BILLET \"$CODE\" INCONNU !!"
-	log_history $PHONE "BILLET_CHK, ERROR, $bpath"
 fi
 
 log "END sms_BILLETCHK.sh"
diff --git a/g1sms/sms_COUNT.sh b/g1sms/sms_COUNT.sh
index 2e17cb5..82da8cf 100755
--- a/g1sms/sms_COUNT.sh
+++ b/g1sms/sms_COUNT.sh
@@ -64,7 +64,6 @@ $(echo $todo | head -n 2)
 
 $(echo $todo | tail -n 1)";
         fi
-	    log_history $PHONE "SOLDE, $AMOUNTG1"
     else
         sms_ERROR "$PHONE" "Problème de dialogue silkaj... Essayez dans qq minutes SVP..."
     fi
diff --git a/g1sms/sms_EMAIL.sh b/g1sms/sms_EMAIL.sh
index 15fa0fc..4f270f6 100755
--- a/g1sms/sms_EMAIL.sh
+++ b/g1sms/sms_EMAIL.sh
@@ -32,7 +32,7 @@ if [[ "$mail" != "" ]]; then
     echo "" > "$MAILFILE"
     log "__SUB:sms_EMAIL.sh.sh: EMAIL $MEMBER ($PHONE) NOUVEAU: $mail..."
 else
-    mail="$MAIL"
+    mail="$SMSEMAIL"
 fi
 
 # SEND EMAIL WITH ssmtp
@@ -42,7 +42,6 @@ cat ./email.txt | sed s/EMAIL/"${mail}"/g | sed s/SUBJECT/"${SUBJECT}"/g | sed s
 mpack -s "[G1sms+] $PHONE, $UIDNA :: Envoyer 'BILL nnn' à $MASTERPHONE pour fabriquer des G1Billets (ci-joint exemple de verso)" ./Dos_G1Billets.odt ${mail}
 
 log "__SUB:sms_EMAIL.sh.sh: Send welcome EMAIL to $mail via ssmtp"
-log_history $PHONE "EMAIL, $mail"
 
 mess="[G1sms+]
 $MEMBER
diff --git a/g1sms/sms_NEW.sh b/g1sms/sms_NEW.sh
index b733a61..4641787 100755
--- a/g1sms/sms_NEW.sh
+++ b/g1sms/sms_NEW.sh
@@ -41,7 +41,7 @@ Solde: $AMOUNT $UNIT
 sms_SEND "$PHONE" "$mess"
 sleep 2
 sms_SEND "$PHONE" "$PUBKEY"
-[[ $MEMRIB != "" ]] && sms_SEND "$PHONE" "Compte Atttaché: $MEMBER $MAIL
+[[ $MEMRIB != "" ]] && sms_SEND "$PHONE" "Compte Atttaché: $MEMBER $SMSEMAIL
 $MEMRIB"
 
 # Add contact to database
diff --git a/g1sms/sms_PAY.sh b/g1sms/sms_PAY.sh
index 93883f5..f3e669f 100755
--- a/g1sms/sms_PAY.sh
+++ b/g1sms/sms_PAY.sh
@@ -69,9 +69,8 @@ if [[ "$(echo $COM | grep 'successful')" == "" || "$PAY" == "" ]]; then
     exit
 fi
 
-# LOG ACCOUNT HISTORY EVENTS
+# LOG 
 log "__SUB:sms_PAY.sh: $1 => $2 = $3 $UNIT / SILKAJ == TxPay $PAY + TxCom $COM /"
-log_history $phone "PAY, $VIR, $PHONEDEST, $PUBKEYDEST"
 
 # Send response SMS
 mess_src="[G1sms+]
diff --git a/g1sms/sms_REC.sh b/g1sms/sms_REC.sh
index 0b8b1b7..f9c540d 100755
--- a/g1sms/sms_REC.sh
+++ b/g1sms/sms_REC.sh
@@ -154,7 +154,6 @@ $DESTRIB"
 
     sms_SEND "$PHONE" "$mess"
 
-    log_history "$PHONE" "REC, $VIR, $DESTRIB, $DESTMEM, $PERIOD, $TIME"
 	# Send DESTPHONE sms
 	if [[ "$DESTPHONE" != "" ]]; then
 		sms_SEND "$DESTPHONE" "[G1sms+] Bonjour $DESTMEM. Vous recev(r)ez un payement de $VIR G1 (pendant $TIME $PERIOD) de la part du portefeuille: $MEMBER $UIDNA."
diff --git a/g1sms/sms_VIR.sh b/g1sms/sms_VIR.sh
index 71647af..0df565e 100755
--- a/g1sms/sms_VIR.sh
+++ b/g1sms/sms_VIR.sh
@@ -84,7 +84,6 @@ if [[ "$DESTRIB" != "" ]]; then
 		mess="[G1sms+] $MEMBER
 $PAY"
 		sms_SEND "$PHONE" "$mess"
-		log_history "$PHONE" "VIR, $VIR, $DESTRIB, $DESTMEM"
 		# Send DESTPHONE sms
 		if [[ "$DESTPHONE" != "" ]]; then
 			sms_SEND "$DESTPHONE" "Bonjour $DESTMEM. Vous venez de recevoir un virement de $AMOUNT $UNIT ($VIR G1) de la part de $member portefeuille $UIDNA"
diff --git a/g1sms/sms_WHERE.sh b/g1sms/sms_WHERE.sh
index cfd5c46..8664503 100755
--- a/g1sms/sms_WHERE.sh
+++ b/g1sms/sms_WHERE.sh
@@ -35,7 +35,6 @@ if [[ -f $nodeuidnafile && "$uidna" != "" ]]; then
     echo $uidna > /home/$YOU/.zen/g1sms_wallets/$PHONE/uidna.G1TAGNODE
     echo $ipfsnodeid > /home/$YOU/.zen/g1sms_wallets/$PHONE/ipfsid.G1TAGNODE
     log "__SUB:sms_WHERE.sh: Distributeur de G1Tag  $uidna : $ipfsnodeid "
-    log_history $PHONE "G1TagNode, $uidna, $ipfsnodeid"
 else
     log "__SUB:sms_WHERE.sh: ERROR Distributeur de G1Tag $askeduidna inconnu ???"
     sms_ERROR "$PHONE" "Désolé. Aucun Distributeur de G1Tag : $askeduidna !!!"
diff --git a/g1sms/sms_received.sh b/g1sms/sms_received.sh
index e1167cb..076c19d 100755
--- a/g1sms/sms_received.sh
+++ b/g1sms/sms_received.sh
@@ -107,9 +107,9 @@ case "$CMD" in
 		;;
 	EMAIL)
     # RECUPERE EMAIL ASSOCIE AU G1SMS WALLET
-    	MAIL=$(echo "$TEXT" | awk '{print tolower($2)}' | grep -E "[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}")
-    	if [[ "$MAIL" != "" ]]; then
-			./sms_EMAIL.sh "$PHONE" "$MAIL" &
+    	ZMAIL=$(echo "$TEXT" | awk '{print tolower($2)}' | grep -E "[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}")
+    	if [[ "$ZMAIL" != "" ]]; then
+			./sms_EMAIL.sh "$PHONE" "$ZMAIL" &
 		else
 			./sms_ERROR.sh "$PHONE" "$TEXT votre adresse est incorrecte..." &
 		fi