updated to work with postfix
cleanup tabs