1 files changed, 6 insertions, 2 deletions

diff --git a/realrcptto.c b/realrcptto.c
index f5f6f15..5ae9684 100644
--- a/realrcptto.c
+++ b/realrcptto.c
@@ -264,10 +264,14 @@ int depth;
   /* found a single dovecot-rda line. stop lookup */
   if (count == 1 && username && found_rda)
   {
-    /* special case mailbox forward */
-    if (username && !str_diff(username, "$EXT2")
+    /* special case: mailbox forward */
+    if (!str_diff(username, "$EXT2")
         && extension && !str_diffn(extension, "mailbox-", 8))
       username = extension + 8;
+
+    /* remove plus-addressing */
+    username[str_chr(username, '+')] = '\0';
+
     env_put2("DTUSER", username);
     return 1;
   }