DEVIDM-54 - Treat mail as single value & update mailLocalAddress on setMail