Simplify and fix if mailbox doesn't contain delimiter