diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/property/PortalUrlGroupGatewayProperty.java b/src/main/java/org/gcube/portlets/user/workspace/server/property/PortalUrlGroupGatewayProperty.java
index 3df9250..58139b9 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/server/property/PortalUrlGroupGatewayProperty.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/server/property/PortalUrlGroupGatewayProperty.java
@@ -6,8 +6,8 @@ import java.util.Properties;
 import org.apache.log4j.Logger;
 
 /**
- * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
- * @Jun 26, 2013
+ * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it
+ * Jun 26, 2013
  *
  */
 public class PortalUrlGroupGatewayProperty {
diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/property/PropertyFileNotFoundException.java b/src/main/java/org/gcube/portlets/user/workspace/server/property/PropertyFileNotFoundException.java
index 3c59dac..5901ef4 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/server/property/PropertyFileNotFoundException.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/server/property/PropertyFileNotFoundException.java
@@ -4,8 +4,8 @@
 package org.gcube.portlets.user.workspace.server.property;
 
 /**
- * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
- * @Jun 26, 2013
+ * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it
+ * Jun 26, 2013
  *
  */
 public class PropertyFileNotFoundException extends Exception {
diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/reader/ApplicationProfile.java b/src/main/java/org/gcube/portlets/user/workspace/server/reader/ApplicationProfile.java
index 3a01ee4..4bf6be1 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/server/reader/ApplicationProfile.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/server/reader/ApplicationProfile.java
@@ -5,7 +5,7 @@ import java.io.Serializable;
 /**
  * The Class ApplicationProfile.
  *
- * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
+ * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it
  * Jan 14, 2016
  */
 public class ApplicationProfile implements Serializable {
diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/reader/ApplicationProfileNotFoundException.java b/src/main/java/org/gcube/portlets/user/workspace/server/reader/ApplicationProfileNotFoundException.java
index a2e4b02..543c60d 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/server/reader/ApplicationProfileNotFoundException.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/server/reader/ApplicationProfileNotFoundException.java
@@ -3,7 +3,7 @@ package org.gcube.portlets.user.workspace.server.reader;
 /**
  * The Class ApplicationProfileException.
  *
- * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
+ * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it
  * Sep 6, 2016
  */
 @SuppressWarnings("serial")
diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/reader/ApplicationProfileReader.java b/src/main/java/org/gcube/portlets/user/workspace/server/reader/ApplicationProfileReader.java
index 9de00f9..5ef5228 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/server/reader/ApplicationProfileReader.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/server/reader/ApplicationProfileReader.java
@@ -22,7 +22,7 @@ import org.xml.sax.InputSource;
 /**
  * The Class ApplicationProfileReader.
  *
- * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
+ * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it
  * Sep 14, 2016
  */
 public class ApplicationProfileReader {
diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/resolver/UriResolverReaderParameterForResolverIndex.java b/src/main/java/org/gcube/portlets/user/workspace/server/resolver/UriResolverReaderParameterForResolverIndex.java
index f636ead..739ed73 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/server/resolver/UriResolverReaderParameterForResolverIndex.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/server/resolver/UriResolverReaderParameterForResolverIndex.java
@@ -26,7 +26,7 @@ import org.gcube.resources.discovery.client.queries.impl.XQuery;
 /**
  * The Class UriResolverReaderParameter.
  *
- * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
+ * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it
  * Jan 12, 2016
  */
 public class UriResolverReaderParameterForResolverIndex {
@@ -48,7 +48,7 @@ public class UriResolverReaderParameterForResolverIndex {
 	/**
 	 * The Enum RESOLVER_TYPE.
 	 *
-	 * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
+	 * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it
 	 * Jan 12, 2016
 	 */
 	public static enum RESOLVER_TYPE {SMP_URI, SMP_ID};
diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/tostoragehub/ObjectStorageHubToWorkpaceMapper.java b/src/main/java/org/gcube/portlets/user/workspace/server/tostoragehub/ObjectStorageHubToWorkpaceMapper.java
index 94a70aa..9e00f47 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/server/tostoragehub/ObjectStorageHubToWorkpaceMapper.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/server/tostoragehub/ObjectStorageHubToWorkpaceMapper.java
@@ -23,7 +23,7 @@ import org.gcube.vomanagement.usermanagement.model.GCubeUser;
 /**
  * The Class StorageHubToWorkpaceConveter.
  *
- * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it)
+ * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapaATisti.cnr.it)
  * Sep 20, 2018
  */
 public class ObjectStorageHubToWorkpaceMapper {
diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/tostoragehub/StorageHubToWorkpaceConverter.java b/src/main/java/org/gcube/portlets/user/workspace/server/tostoragehub/StorageHubToWorkpaceConverter.java
index f466e30..494c456 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/server/tostoragehub/StorageHubToWorkpaceConverter.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/server/tostoragehub/StorageHubToWorkpaceConverter.java
@@ -20,9 +20,9 @@ import org.gcube.portlets.user.workspace.client.model.FileModel;
 import org.gcube.portlets.user.workspace.client.model.FileTrashedModel;
 import org.gcube.portlets.user.workspace.client.model.FileVersionModel;
 import org.gcube.portlets.user.workspace.client.model.FolderModel;
-import org.gcube.portlets.user.workspace.client.model.InfoContactModel;
 import org.gcube.portlets.user.workspace.server.GWTWorkspaceBuilder;
 import org.gcube.portlets.user.workspace.server.util.UserUtil;
+import org.gcube.portlets.widgets.workspacesharingwidget.shared.InfoContactModel;
 import org.gcube.vomanagement.usermanagement.model.GCubeUser;
 
 
@@ -31,7 +31,7 @@ import org.gcube.vomanagement.usermanagement.model.GCubeUser;
 /**
  * The Class StorageHubToWorkpaceConverter.
  *
- * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it)
+ * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapaATisti.cnr.it)
  * Sep 20, 2018
  */
 public class StorageHubToWorkpaceConverter implements Serializable{