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 b262cec..5e52a03 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
@@ -731,12 +731,10 @@ public class ShareUpdateServiceImpl extends RemoteServiceServlet implements	Shar
 		LinkPreview toReturn = null;
 		_log.info("to check " + linkToCheck);
 		//look for a url in text
-		URL url = URLToken.isURL(linkToCheck);
-		if (url == null) {
+		linkToCheck = Utils.extractURL(linkToCheck);
+		if (linkToCheck == null)
 			return null; //no url
-		}
-		linkToCheck = url.toString();
-		
+
 		String[] schemes = {"http","https"};
 		UrlValidator urlValidator = new UrlValidator(schemes);
 		if (! urlValidator.isValid(linkToCheck)) {