Mail test and layout improved