[MERGE] [FIX] mail: make the detection of Content-Type based on filename instead...