Index: .
===================================================================
--- .	(revision 610729)
+++ .	(working copy)
@@ -40,6 +40,7 @@
 import javax.mail.internet.InternetHeaders;
 import javax.mail.internet.MimeMessage;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Enumeration;
 import java.util.HashSet;
@@ -44,6 +45,7 @@
 import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Vector;
 
 /**
@@ -296,12 +298,19 @@
      * @param userName
      */
     private MailRepository getRepository(String userName) {
-        MailRepository userInbox;
-        if (repositoryUrl == null) {
+    	MailRepository userInbox;
+    	if (repositoryUrl == null) {
             userInbox = mailServer.getUserInbox(userName);
         } else {
+        	if (!repositoryUrl.endsWith("/")) {
+        		repositoryUrl += "/";
+        	}
+        	
+        	// find the username for delivery to that user - localname, ignore the rest
+        	String[] addressParts = userName.split("@");
+        	
             StringBuffer destinationBuffer = new StringBuffer(192).append(
-                    repositoryUrl).append(userName).append("/");
+                    repositoryUrl).append(addressParts[0]).append("/");
             String destination = destinationBuffer.toString();
             DefaultConfiguration mboxConf = new DefaultConfiguration(
                     "repository", "generated:ToMultiRepository.getUserInbox()");