[FIX] mail: misc bug fixing

Should not be done in 7.