fix mail & prop