outdenting inside of macros
cleanup mail.c