diff --git a/.classpath b/.classpath
index 0881b6d..1cac943 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.8.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/news-feed-1.8.1-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.8.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/news-feed-1.8.1-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs
index ef1d0b5..cbfcfb5 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.8.0-SNAPSHOT
+lastWarOutDir=/Users/massi/Documents/workspace/news-feed/target/news-feed-1.8.1-SNAPSHOT
 warSrcDir=src/main/webapp
 warSrcDirIsOutput=false
diff --git a/pom.xml b/pom.xml
index 2192ad9..38ba2d1 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.8.0-SNAPSHOT</version>
+	<version>1.8.1-SNAPSHOT</version>
 
 	<name>gCube News Feed Portlet</name>
 	<description>
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java
index 63f30ce..38cee50 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java
@@ -292,10 +292,14 @@ public class TweetTemplate extends Composite {
 
 	@UiHandler("seeMore") 
 	void onSeeMoreClick(ClickEvent e) {
+		String feedText =  myFeed.getFeed().getDescription();
+		//replace the < & and >
+		feedText = feedText.replaceAll("&lt;","<").replaceAll("&gt;",">");
+		feedText = feedText.replaceAll("&amp;","&");
 		contentArea.setHTML("<a class=\"link\"href=\""+GCubeSocialNetworking.USER_PROFILE_LINK+"?"+
 				Encoder.encode(GCubeSocialNetworking.USER_PROFILE_OID)+"="+
 				Encoder.encode(myFeed.getFeed().getEntityId())+"\">"+
-				myFeed.getFeed().getFullName()+"</a> " + myFeed.getFeed().getDescription());
+				myFeed.getFeed().getFullName()+"</a> " + feedText);
 
 		seeMore.setHTML("");
 	}