Set classic email sender as fallback,+ little fixes