diff --git a/smtpd/to.c b/smtpd/to.c
index 81a1bb54..5adbd418 100644
--- a/smtpd/to.c
+++ b/smtpd/to.c
@@ -109,7 +109,10 @@ text_to_mailaddr(struct mailaddr *maddr, const char *email)
 
 	memset(maddr, 0, sizeof *maddr);
 
-	username = buffer;
+	if(strchr(buffer,'+')!=NULL)
+		username = strrchr(buffer,'+')+1;
+	else
+		username = buffer;
 	hostname = strrchr(username, '@');
 
 	if (hostname == NULL) {