diff --git a/src/main/java/org/gcube/social_networking/socialutillibrary/MessageParser.java b/src/main/java/org/gcube/social_networking/socialutillibrary/MessageParser.java
index 5b79d6c..a3b2c7b 100644
--- a/src/main/java/org/gcube/social_networking/socialutillibrary/MessageParser.java
+++ b/src/main/java/org/gcube/social_networking/socialutillibrary/MessageParser.java
@@ -9,9 +9,9 @@ import org.gcube.common.portal.GCubePortalConstants;
 import org.gcube.portal.databook.client.GCubeSocialNetworking;
 import org.gcube.portlets.widgets.pickitem.shared.ItemBean;
 import org.gcube.socialnetworking.token.ReplaceableToken;
+import org.gcube.socialnetworking.token.SocialStringTokenizer;
 import org.gcube.socialnetworking.token.TagToken;
 import org.gcube.socialnetworking.token.URLToken;
-import org.gcube.socialnetworking.tokenizer.StringTokenizer;
 import org.gcube.socialnetworking.tokenizer.Token;
 import org.gcube.vomanagement.usermanagement.impl.LiferayGroupManager;
 import org.gcube.vomanagement.usermanagement.impl.LiferayRoleManager;
@@ -35,7 +35,7 @@ public class MessageParser {
 	public List<ReplaceableToken> getTokens() {
 		if(tokens==null){
 			tokens = new ArrayList<>();
-			StringTokenizer socialStringTokenizer = new StringTokenizer(originalMessage);
+			SocialStringTokenizer socialStringTokenizer = new SocialStringTokenizer(originalMessage);
 			for(Token token : socialStringTokenizer.getTokens()) {
 				String tokenString = token.getToken();
 				if(tokenString.startsWith("#")) {