Complete fix bugs mail