issue #31 mail formatting