Some nits w/ mail_protocol