diff --git a/distro/changelog.xml b/distro/changelog.xml
index 14d63e2..184b634 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -2,6 +2,7 @@
 	<Changeset component="org.gcube.portlets-user.shareupdates.2-4-0"
 		date="2017-05-03">
 		<Change>Ported to Java8</Change>
+		<Change>Fix for bug #7630</Change>
 	</Changeset>
 	<Changeset component="org.gcube.portlets-user.shareupdates.2-3-1"
 		date="2017-04-12">
diff --git a/src/main/java/org/gcube/portlets/user/shareupdates/client/view/ShareUpdateForm.java b/src/main/java/org/gcube/portlets/user/shareupdates/client/view/ShareUpdateForm.java
index ae1393b..64ce409 100644
--- a/src/main/java/org/gcube/portlets/user/shareupdates/client/view/ShareUpdateForm.java
+++ b/src/main/java/org/gcube/portlets/user/shareupdates/client/view/ShareUpdateForm.java
@@ -539,7 +539,7 @@ public class ShareUpdateForm extends Composite {
 					linkPreviewer = null;
 				}
 
-				public void onSuccess(ClientFeed feed) {
+				public void onSuccess(ClientFeed post) {
 					enableSubmitButtons(true);
 					shareTextArea.setEnabled(true);
 					shareTextArea.setText(SHARE_UPDATE_TEXT);
@@ -547,13 +547,13 @@ public class ShareUpdateForm extends Composite {
 					preview.clear();
 					linkPreviewer = null;
 
-					if (feed == null)
+					if (post == null)
 						Window.alert("Ops! we encountered some problems delivering your message, please try again in a short while.");
 					else {
 						// publish a message with the refresh notification
 						try {
 
-							pageBusAdapter.PageBusPublish("org.gcube.portal.databook.shared", feed, (Jsonizer)GWT.create(ClientFeedJsonizer.class));
+							pageBusAdapter.PageBusPublish("org.gcube.portal.databook.shared", post, (Jsonizer)GWT.create(ClientFeedJsonizer.class));
 
 						} catch (PageBusAdapterException ex) {
 							GWT.log(ex.getMessage());
diff --git a/src/main/java/org/gcube/portlets/user/shareupdates/server/ShareUpdateServiceImpl.java b/src/main/java/org/gcube/portlets/user/shareupdates/server/ShareUpdateServiceImpl.java
index f366774..b944d25 100644
--- a/src/main/java/org/gcube/portlets/user/shareupdates/server/ShareUpdateServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/shareupdates/server/ShareUpdateServiceImpl.java
@@ -210,7 +210,7 @@ public class ShareUpdateServiceImpl extends RemoteServiceServlet implements	Shar
 
 		//everything went fine
 		ClientFeed cf = new  ClientFeed(toShare.getKey(), toShare.getType().toString(), username, feedDate, toShare.getUri(),
-				TextTransfromUtils.replaceAmpersand(toShare.getDescription()), fullName, email, thumbnailAvatarURL, toShare.getLinkTitle(), toShare.getLinkDescription(), 
+				toShare.getDescription(), fullName, email, thumbnailAvatarURL, toShare.getLinkTitle(), toShare.getLinkDescription(), 
 				toShare.getUriThumbnail(), toShare.getLinkHost(), null);
 
 
@@ -385,7 +385,7 @@ public class ShareUpdateServiceImpl extends RemoteServiceServlet implements	Shar
 
 		//everything went fine
 		ClientFeed cf = new  ClientFeed(toShare.getKey(), toShare.getType().toString(), username, feedDate, toShare.getUri(),
-				TextTransfromUtils.replaceAmpersand(toShare.getDescription()), fullName, email, thumbnailAvatarURL, toShare.getLinkTitle(), toShare.getLinkDescription(), 
+				toShare.getDescription(), fullName, email, thumbnailAvatarURL, toShare.getLinkTitle(), toShare.getLinkDescription(), 
 				toShare.getUriThumbnail(), toShare.getLinkHost(), attachments);