More work on formatting of e-mail