diff --git a/pom.xml b/pom.xml
index 6dcb654..081b621 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>share-updates</artifactId>
 	<packaging>war</packaging>
-	<version>2.6.2-SNAPSHOT</version>
+	<version>2.6.3-SNAPSHOT</version>
 	<name>gCube Share Updates Portlet</name>
 	<description>
 		gCube Share Updates for exchanging updates with other users of VREs.
diff --git a/src/main/java/org/gcube/portlets/user/shareupdates/server/ShareUpdateServiceImpl.java b/src/main/java/org/gcube/portlets/user/shareupdates/server/ShareUpdateServiceImpl.java
index dec0258..dcc5ac8 100644
--- a/src/main/java/org/gcube/portlets/user/shareupdates/server/ShareUpdateServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/shareupdates/server/ShareUpdateServiceImpl.java
@@ -55,6 +55,7 @@ import org.gcube.portlets.user.shareupdates.shared.MentionedDTO;
 import org.gcube.portlets.user.shareupdates.shared.UploadedFile;
 import org.gcube.portlets.user.shareupdates.shared.UserSettings;
 import org.gcube.portlets.widgets.pickitem.shared.ItemBean;
+import org.gcube.social_networking.socialutillibrary.MessageParser;
 import org.gcube.social_networking.socialutillibrary.Utils;
 import org.gcube.vomanagement.usermanagement.GroupManager;
 import org.gcube.vomanagement.usermanagement.RoleManager;
@@ -126,6 +127,7 @@ public class ShareUpdateServiceImpl extends RemoteServiceServlet implements	Shar
 	public ClientFeed sharePostWithLinkPreview(String postText, FeedType feedType,	PrivacyLevel pLevel, 
 			Long vreOrgId, LinkPreview preview, String urlThumbnail, ArrayList<MentionedDTO> mentionedItems, boolean notifyGroup) {
 
+		/*
 		// escape text
 		String escapedFeedText = Utils.escapeHtmlAndTransformUrl(postText);
 
@@ -140,7 +142,18 @@ public class ShareUpdateServiceImpl extends RemoteServiceServlet implements	Shar
 			mentionedUsers = getMentionsBean(mentionedItems);
 			escapedFeedText = Utils.convertMentionPeopleAnchorHTML(escapedFeedText, mentionedUsers, getThreadLocalRequest());
 		}
-
+		*/
+		
+		ArrayList<ItemBean> mentionedUsers = null;
+		if (mentionedItems != null && ! mentionedItems.isEmpty()) {
+			mentionedUsers = getMentionsBean(mentionedItems);
+		}
+		MessageParser messageParser = new MessageParser(postText);
+		String siteLandingPagePath = PortalContext.getConfiguration().getSiteLandingPagePath(getThreadLocalRequest());
+		String escapedFeedText = messageParser.getParsedMessage(mentionedUsers, siteLandingPagePath);
+		List<String> hashtags = messageParser.getHashtags();
+		
+		
 		PortalContext context = PortalContext.getConfiguration();
 		GCubeUser currUser = context.getCurrentUser(getThreadLocalRequest());
 
@@ -236,6 +249,7 @@ public class ShareUpdateServiceImpl extends RemoteServiceServlet implements	Shar
 			PrivacyLevel pLevel, Long vreOrgId, ArrayList<UploadedFile> uploadedFiles,
 			ArrayList<MentionedDTO> mentionedItems, boolean notifyGroup, boolean saveCopyWokspace) {
 
+		/*
 		// escape text
 		String escapedFeedText = Utils.escapeHtmlAndTransformUrl(feedText);
 
@@ -250,6 +264,19 @@ public class ShareUpdateServiceImpl extends RemoteServiceServlet implements	Shar
 			mentionedUsers = getMentionsBean(mentionedItems);
 			escapedFeedText = Utils.convertMentionPeopleAnchorHTML(escapedFeedText, mentionedUsers, getThreadLocalRequest());
 		}
+		*/
+		
+		ArrayList<ItemBean> mentionedUsers = null;
+		if (mentionedItems != null && ! mentionedItems.isEmpty()) {
+			mentionedUsers = getMentionsBean(mentionedItems);
+		}
+		MessageParser messageParser = new MessageParser(feedText);
+		String siteLandingPagePath = PortalContext.getConfiguration().getSiteLandingPagePath(getThreadLocalRequest());
+		String escapedFeedText = messageParser.getParsedMessage(mentionedUsers, siteLandingPagePath);
+		List<String> hashtags = messageParser.getHashtags();
+		
+		
+		
 
 		PortalContext context = PortalContext.getConfiguration();
 		GCubeUser currUser = context.getCurrentUser(getThreadLocalRequest());