(fixes #34) Email formatting changes