Jag/group mail fixes 3.5