diff --git a/.classpath b/.classpath
index 1d55106..b28af71 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/news-feed-1.6.4-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/news-feed-1.7.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -31,5 +31,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/news-feed-1.6.4-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/news-feed-1.7.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs
index 4e87f2d..6dcd5bd 100644
--- a/.settings/com.google.gdt.eclipse.core.prefs
+++ b/.settings/com.google.gdt.eclipse.core.prefs
@@ -1,5 +1,5 @@
 eclipse.preferences.version=1
 jarsExcludedFromWebInfLib=
-lastWarOutDir=/Users/massi/Documents/workspace/news-feed/target/news-feed-1.6.4-SNAPSHOT
+lastWarOutDir=/Users/massi/Documents/workspace/news-feed/target/news-feed-1.7.0-SNAPSHOT
 warSrcDir=src/main/webapp
 warSrcDirIsOutput=false
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 0d1dd63..798c90f 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -7,9 +7,6 @@
         <dependent-module archiveName="pickuser-widget-0.4.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/pickuser-widget/pickuser-widget">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="wsmail-widget-1.4.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wsmail-widget/wsmail-widget">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
     <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
         <property name="context-root" value="news-feed"/>
   </wb-module>
diff --git a/distro/changelog.xml b/distro/changelog.xml
index f13a9c3..4c2aefe 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,14 +1,21 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.portlets.user.NewsFeed.1-7-0"
+		date="2014-05-22">
+		Fixed bug loosing session when messaging user from the news feed
+		</Changeset>
 	<Changeset component="org.gcube.portlets.user.NewsFeed.1-6-4"
 		date="2014-05-07">
 		<Change>Implemented the automatic scroll back in time for feeds (in
-			VRE scope)</Change>
+			VRE scope)
+		</Change>
 		<Change>Added possibility to unlike alread liked posts</Change>
 		<Change>Added possibility to mention users in comments</Change>
-		<Change>Added default comment inputbox at the bottom of feed comments, if any</Change>
+		<Change>Added default comment inputbox at the bottom of feed comments,
+			if any</Change>
 		<Change>Added avatar replacement if user has no avatar</Change>
 		<Change>Fixed double notifications for post owner who commented his
-			post</Change>
+			post
+		</Change>
 		<Change>Fixed double notifications for post owner who liked his post
 		</Change>
 		<Change>Fixed user referral problem when post was deleted </Change>
diff --git a/pom.xml b/pom.xml
index f3a72e6..0035ae4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>news-feed</artifactId>
 	<packaging>war</packaging>
-	<version>1.6.4-SNAPSHOT</version>
+	<version>1.7.0-SNAPSHOT</version>
 
 	<name>gCube News Feed Portlet</name>
 	<description>
@@ -66,7 +66,7 @@
 			<groupId>com.google.gwt</groupId>
 			<artifactId>gwt-servlet</artifactId>
 			<scope>provided</scope>
-		</dependency>
+		</dependency>		
 		<dependency>
 			<groupId>org.gcube.applicationsupportlayer</groupId>
 			<artifactId>aslcore</artifactId>
@@ -75,6 +75,7 @@
 		<dependency>
 			<groupId>org.gcube.applicationsupportlayer</groupId>
 			<artifactId>accesslogger</artifactId>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.portlets.widgets</groupId>
@@ -94,7 +95,6 @@
 		<dependency>
 			<groupId>org.gcube.portal</groupId>
 			<artifactId>social-networking-library</artifactId>
-			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>