A couple more minor steps toward supporting Mail.