Mail module porting

Sure it makes the code harder to read. An explicit assignation, then a return should be better.