diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/smtp/commands/RcptCommand.java b/greenmail-core/src/main/java/com/icegreen/greenmail/smtp/commands/RcptCommand.java
index 1a81a873e..91dda6d0f 100644
--- a/greenmail-core/src/main/java/com/icegreen/greenmail/smtp/commands/RcptCommand.java
+++ b/greenmail-core/src/main/java/com/icegreen/greenmail/smtp/commands/RcptCommand.java
@@ -26,7 +26,7 @@
  */
 public class RcptCommand
         extends SmtpCommand {
-    static Pattern param = Pattern.compile("RCPT TO:\\s?<([^>]+)>",
+    static Pattern param = Pattern.compile("RCPT TO:\\s?<([^>]*)>.*",
             Pattern.CASE_INSENSITIVE);
 
     @Override