this should be a bit more liberal about locally submitted mail