some email formatting repair (need more)