diff --git a/src/main/java/org/gcube/applicationsupportlayer/social/mailing/SocialMailingUtil.java b/src/main/java/org/gcube/applicationsupportlayer/social/mailing/SocialMailingUtil.java
index 4ebe9be..270bd6e 100644
--- a/src/main/java/org/gcube/applicationsupportlayer/social/mailing/SocialMailingUtil.java
+++ b/src/main/java/org/gcube/applicationsupportlayer/social/mailing/SocialMailingUtil.java
@@ -435,7 +435,7 @@ public class SocialMailingUtil {
 
 			for (int i = 0; i < comments.size(); i++) {
 
-				String commentTextNoHtml = convertHTML2Text(comments.get(i).getText());
+				String commentTextNoHtml = comments.get(i).getText().replaceAll("&amp;", "&");
 
 				if((commentKey != null && comments.get(i).getKey().equals(commentKey)) && !(notification2Save.getType() == NotificationType.POST_ALERT)){
 					htmlPost += "<div style=\"margin-top: 10px;  margin-bottom: 10px;  margin-left: 50px;  padding-left: 15px;  "