diff --git a/distro/changelog.xml b/distro/changelog.xml
index 613e1e5..d2548e2 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,8 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.portal.social-mail-servlet.2-3-0"
+		date="2018-08-30">
+		<Change>Fix for Incident #12351 Email Parser stuck on AGINFRA Gateway</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portal.social-mail-servlet.2-1-1"
 		date="2017-02-03">
 		<Change>Minor refactor for comment replies</Change>
diff --git a/pom.xml b/pom.xml
index f536c15..16f1422 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 	<groupId>org.gcube.portal</groupId>
 	<artifactId>social-mail-servlet</artifactId>
 	<packaging>war</packaging>
-	<version>2.2.0-SNAPSHOT</version>
+	<version>2.3.0-SNAPSHOT</version>
 
 	<name>social-mail-servlet Webapp</name>
 	<description>This component read periodically email replies from user wanting to reply to a post via email</description>
diff --git a/src/main/java/org/gcube/portal/socialmail/PeriodicTask.java b/src/main/java/org/gcube/portal/socialmail/PeriodicTask.java
index 1b48929..b31f441 100644
--- a/src/main/java/org/gcube/portal/socialmail/PeriodicTask.java
+++ b/src/main/java/org/gcube/portal/socialmail/PeriodicTask.java
@@ -485,7 +485,8 @@ public class PeriodicTask implements Runnable {
 		for (int i = 0; i < emails.length; i++) {
 			String toParse = emails[i].toString();
 			int plus = toParse.lastIndexOf('+');
-			int at = toParse.indexOf('@');
+			int at = toParse.lastIndexOf('@');
+			_log.debug("EMAIL Address to Parse = " + toParse + " plus=" + plus + " at="+at);
 			if (plus >= 0) {
 				subAddressToReturn =  toParse.substring(plus+1, at);
 				break;