Fixed all mail sending mechanisms