Improve mail layout, testing with letter opener