more mail changes