MAILBOX_PROTOCOL is back.

svn path=/trunk/; revision=3266