diff --git a/distro/changelog.xml b/distro/changelog.xml
index a49176b..6331fcb 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -3,6 +3,8 @@
 		date="2018-07-02">
 		<Change>[Task #12089] Migrate to workspace-uploader 2.0
 		</Change>
+		<Change>[Release #12006] Removed portlets-widgets.wsmail-widget dependency
+		</Change>
 	</Changeset>
 	<Changeset component="org.gcube.portlets-user.workspace-portlet.6-19-0"
 		date="2018-06-07">
diff --git a/src/main/java/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml b/src/main/java/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml
index ac98080..c94bdfa 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml
+++ b/src/main/java/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml
@@ -18,7 +18,6 @@
 	<inherits name='org.gcube.portlets.user.workspace.WorkspaceTree' />
 	<inherits name='org.gcube.portlets.user.gcubewidgets.WidgetFactory' />
 
-	<inherits name='org.gcube.portlets.widgets.wsmail.WsMail_Widget' />
 	<inherits name='org.gcube.portlets.widgets.sessionchecker.SessionChecker' />
 	<inherits
 		name="org.gcube.portlets.widgets.workspaceuploader.WorkspaceUploader"></inherits>
diff --git a/src/main/resources/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml b/src/main/resources/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml
index ac98080..c94bdfa 100644
--- a/src/main/resources/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml
@@ -18,7 +18,6 @@
 	<inherits name='org.gcube.portlets.user.workspace.WorkspaceTree' />
 	<inherits name='org.gcube.portlets.user.gcubewidgets.WidgetFactory' />
 
-	<inherits name='org.gcube.portlets.widgets.wsmail.WsMail_Widget' />
 	<inherits name='org.gcube.portlets.widgets.sessionchecker.SessionChecker' />
 	<inherits
 		name="org.gcube.portlets.widgets.workspaceuploader.WorkspaceUploader"></inherits>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index a6accc6..c2290dd 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -40,13 +40,7 @@
 		<servlet-name>WorkspaceService</servlet-name>
 		<servlet-class>org.gcube.portlets.user.workspace.server.GWTWorkspaceServiceImpl</servlet-class>
 	</servlet>
-
-	<!-- mailWisdgetServlet servlet -->
-	<servlet>
-		<servlet-name>mailWisdgetServlet</servlet-name>
-		<servlet-class>org.gcube.portlets.widgets.wsmail.server.WsMailServiceImpl</servlet-class>
-	</servlet>
-
+	
 	<servlet>
 		<servlet-name>checkServlet</servlet-name>
 		<servlet-class>org.gcube.portlets.widgets.sessionchecker.server.SessionCheckerServiceImpl</servlet-class>
@@ -169,11 +163,6 @@
 		<url-pattern>/workspace/checksession</url-pattern>
 	</servlet-mapping>
 
-	<servlet-mapping>
-		<servlet-name>mailWisdgetServlet</servlet-name>
-		<url-pattern>/workspace/mailWisdgetServlet</url-pattern>
-	</servlet-mapping>
-
 	<!-- <servlet-mapping> -->
 	<!-- <servlet-name>LocalUploadService</servlet-name> -->
 	<!-- <url-pattern>/workspace/LocalUploadService</url-pattern> -->