Fixed EmailFolder regression