fixes with mail sender