diff -Nurad uw-imap-2007b~dfsg/src/dmail/dmail.c imap-2007d/src/dmail/dmail.c
--- uw-imap-2007b~dfsg/src/dmail/dmail.c	2007-09-11 01:57:46.000000000 +0200
+++ imap-2007d/src/dmail/dmail.c	2008-10-30 22:59:39.000000000 +0100
@@ -228,7 +228,7 @@
 				/* have a mailbox specifier? */
   if (mailbox = strchr (user,'+')) {
     *mailbox++ = '\0';		/* yes, tie off user name */
-    if (!*mailbox || !strcmp ("INBOX",ucase (strcpy (tmp,mailbox))))
+    if (!*mailbox || !compare_cstring ((unsigned char *) mailbox,"INBOX"))
       mailbox = NIL;		/* user+ and user+INBOX same as user */
   }
   if (!*user) user = myusername ();
diff -Nurad uw-imap-2007b~dfsg/src/tmail/tmail.c imap-2007d/src/tmail/tmail.c
--- uw-imap-2007b~dfsg/src/tmail/tmail.c	2007-09-17 22:58:56.000000000 +0200
+++ imap-2007d/src/tmail/tmail.c	2008-10-30 22:59:39.000000000 +0100
@@ -602,11 +602,10 @@
 
 char *getusername (char *s,char **t)
 {
-  char tmp[MAILTMPLEN];
   if (*t = strchr (s,'+')) {	/* have a mailbox specifier? */
     *(*t)++ = '\0';		/* yes, tie off user name */
 				/* user+ and user+INBOX same as user */
-    if (!**t || !strcmp ("INBOX",ucase (strcpy (tmp,*t)))) *t = NIL;
+    if (!**t || !compare_cstring ((unsigned char *) *t,"INBOX")) *t = NIL;
   }
   return s;			/* return user name */
 }