Made some more minor mail changes