update for mail_session fix with sorting of properties