mail reading fixes