diff -upr ../cyrus-imapd-2.2.12.orig/imap/imapd.c ./imap/imapd.c
--- ../cyrus-imapd-2.2.12.orig/imap/imapd.c	2005-02-14 07:39:55.000000000 +0100
+++ ./imap/imapd.c	2005-04-21 00:59:50.865255448 +0200
@@ -3923,10 +3923,12 @@ void cmd_rename(const char *tag, 
 	}
     }
 
+#ifdef notdef
     /* verify that the mailbox doesn't have a wildcard in it */
     for (p = oldmailboxname; !r && *p; p++) {
 	if (*p == '*' || *p == '%') r = IMAP_MAILBOX_BADNAME;
     }
+#endif
 
     /* attempt to rename the base mailbox */
     if (!r) {
Kun i ./imap: imapd.c.orig
diff -upr ../cyrus-imapd-2.2.12.orig/imap/mboxlist.c ./imap/mboxlist.c
--- ../cyrus-imapd-2.2.12.orig/imap/mboxlist.c	2004-07-26 20:08:03.000000000 +0200
+++ ./imap/mboxlist.c	2005-04-21 00:59:50.874254080 +0200
@@ -476,10 +476,12 @@ mboxlist_mycreatemailboxcheck(char *name
 		free(acl);
 		return IMAP_PERMISSION_DENIED;
 	    }
+#ifdef notdef
 	    /* disallow wildcards in userids with inboxes. */	     
 	    if (strchr(mbox, '*') || strchr(mbox, '%') || strchr(mbox, '?')) {
 		return IMAP_MAILBOX_BADNAME;
 	    }
+#endif
 
 	    /*
 	     * Users by default have all access to their personal mailbox(es),
diff -upr ../cyrus-imapd-2.2.12.orig/imap/mboxname.c ./imap/mboxname.c
--- ../cyrus-imapd-2.2.12.orig/imap/mboxname.c	2005-02-14 07:39:57.000000000 +0100
+++ ./imap/mboxname.c	2005-04-21 00:59:50.879253320 +0200
@@ -649,8 +649,13 @@ int mboxname_netnewscheck(char *name)
 /*
  * Apply site policy restrictions on mailbox names.
  * Restrictions are hardwired for now.
- */
+
+ * original definition 
 #define GOODCHARS " +,-.0123456789:=@ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~"
+ */
+
+#define GOODCHARS " #$%'()*+,-.0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~"
+
 int mboxname_policycheck(char *name)
 {
     unsigned i;
Kun i ./imap: mboxname.c.orig