message and mail changes