diff --git a/zen/gchange_INIT.sh b/zen/gchange_INIT.sh
index 2cb6e25..3eb9509 100755
--- a/zen/gchange_INIT.sh
+++ b/zen/gchange_INIT.sh
@@ -112,6 +112,5 @@ do
 	[[ $friend_of_mine != null ]] && ./jaklis.py send -d $liking_me -t "ipfstryme" -f ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr
 done
 cd -
-# TODO: This message should be regularly deleted by receiver and sent again to refresh changing IP
 
 exit 0
diff --git a/zen/gchange_IPFS_swarm.sh b/zen/gchange_IPFS_swarm.sh
index 3b4c0cd..3ba0230 100755
--- a/zen/gchange_IPFS_swarm.sh
+++ b/zen/gchange_IPFS_swarm.sh
@@ -73,8 +73,23 @@ do
             ipfsadd=$((ipfsadd+1))
         done;
 
-	# Friend of mine with no ipfstryme message
-    [[ $friend_of_mine != null && $ipfsadd == 0 ]] && echo "No ipfstryme message..." && echo "$liking_me" >> ~/.zen/A_liking_me_NO_ipfstryme.txt
+	if [[ $friend_of_mine != null]]; then
+		if [[ $ipfsadd == 0 ]]; then
+			# Friend of mine with no ipfstryme message (did not install astroport)
+			echo "No ipfstryme message..." 
+			echo "$liking_me" >> ~/.zen/A_liking_me_NO_ipfstryme.txt
+		
+		else
+			echo "Delete OLD 'ipfstryme' messages from $liking_me"
+			nbmessage=0
+			for messageid in $(./jaklis.py read -n50 -j | jq -r --arg friendKEY "$liking_me" '.[] | select(.pubkey == $friendKEY)' | jq -r '.id')
+			do
+				nbmessage=$((nbmessage+1))
+				[ $nbmessage -gt 1 ] && ./jaklis.py delete -i $messageid
+			done
+		fi
+
+	fi
 
 	# Automatic level_1 like from oasis.astroport.com (TODO add other default bootstrap)
 	# TODO get $g1pub from ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_g1.pubkey ??