Move smtp config back out