more mail changes and formatting fixes