fix mail
EF 6.0 & other packeges